Browse Source

Merge remote branch 'refs/remotes/svn/trunk' into svn

0.8
Gavin Andresen 14 years ago
parent
commit
5ccee900a0
  1. 2
      headers.h
  2. 2
      ui.cpp

2
headers.h

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
#ifdef _WIN32_WINNT
#undef _WIN32_WINNT
#endif
#define _WIN32_WINNT 0x0400
#define _WIN32_WINNT 0x0500
#ifdef _WIN32_IE
#undef _WIN32_IE
#endif

2
ui.cpp

@ -109,6 +109,8 @@ void SetItemTextColour(wxListCtrl* listCtrl, int nIndex, const wxColour& colour) @@ -109,6 +109,8 @@ void SetItemTextColour(wxListCtrl* listCtrl, int nIndex, const wxColour& colour)
// so don't want to set it unless it's different. Default colour has
// alpha 0 transparent, so our colours don't match using operator==.
wxColour c1 = listCtrl->GetItemTextColour(nIndex);
if (!c1.IsOk())
c1 = wxColour(0,0,0);
if (colour.Red() != c1.Red() || colour.Green() != c1.Green() || colour.Blue() != c1.Blue())
listCtrl->SetItemTextColour(nIndex, colour);
}

Loading…
Cancel
Save