root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Aggiunta selezione multipla su treelist

Browse Source 
git-svn-id: svn://10.65.10.50/branches/R_10_00@22650 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2012-04-24 10:28:43 +00:00
parent 30a4b60bb3
commit b7afe8715d
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xvaga/xvt_ssa.cpp
View File

@ -25,11 +25,17 @@ static const char* xvt_dongle_sa_id()
return id;
}
static BOOLEAN xvt_dongle_sa_is_remote()
static BOOLEAN xvt_dongle_sa_is_remote_ba0()
{
char ssaagent[128];
const int len = xvt_sys_get_profile_string("ssa.ini", "", "SSA-PORT", "", ssaagent, sizeof(ssaagent));
return len > 0;
BOOLEAN yes = FALSE;
const wxFileName argv0 = __argv[0];
if (wxStricmp(argv0.GetName(), "ba0") == 0)
{
char ssaagent[128];
const int len = xvt_sys_get_profile_string("ssa.ini", "", "SSA-PORT", "", ssaagent, sizeof(ssaagent));
yes = len > 0;
}
return yes;
}
///////////////////////////////////////////////////////////
@ -75,7 +81,7 @@ int xvt_dongle_sa_login(const char* module)
{
err = _ssa_serial = SSA_NumeroSerie("Campo");
if (_ssa_timer == NULL && xvt_dongle_sa_is_remote())
if (_ssa_timer == NULL && xvt_dongle_sa_is_remote_ba0())
_ssa_timer = new TSSA_Pinger;
}
}

16
xvaga/xvtctl.cpp
View File

@ -1534,15 +1534,6 @@ static const wxColour ModulateColour(const wxColour& col, int percent)
return wxColour(r, g, b);
}
/*
static const wxColour MeanColour(const wxColour& c1, const wxColour& c2, int percent = 50)
{
const double p = percent / 100.0;
const double i = 1.0-p;
return wxColour(c1.Red()*i+c2.Red()*p, c1.Green()*i+c2.Green()*p, c1.Blue()*i+c2.Blue()*p);
}
*/
void TwxOutlookBar::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t u) const
{
const int n = u; // Anti warning
@ -1583,7 +1574,7 @@ void TwxOutlookBar::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t u) con
}
}
if (xvt_sys_get_oem_int("OEM", -1) == 0)
#if wxCHECK_VERSION(2,8,12)
{
const wxColour color0 = ModulateColour(color2, +20);
const int delta = 2*rect.height/5;
@ -1601,8 +1592,9 @@ void TwxOutlookBar::OnDrawBackground(wxDC& dc, const wxRect& rect, size_t u) con
dc.SetPen(pen2);
dc.DrawLine(rect.x, rect.GetBottom(), rect.GetRight(), rect.GetBottom());
}
else
dc.GradientFillLinear(rect, color1, color2, wxDOWN);
#else
dc.GradientFillLinear(rect, color1, color2, wxDOWN);
#endif
}
void TwxOutlookBar::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const