1. changed wxColourData default palette to NULL colours instead of white

[wxWidgets.git] / src / generic / listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 8c81811aaadc4a9ef8d4d4201781a87a3c6c740d..99fec5e45f73874ca4c4eb9d82357262dbed3918 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -75,6 +75,12 @@
 #ifdef __WXMAC__
     #include "wx/mac/private.h"
 #endif
+
+// NOTE: If using the wxListBox visual attributes works everywhere then this can
+// be removed, as well as the #else case below.
+#define _USE_VISATTR 0
+
+
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------
@@ -5243,11 +5249,10 @@ bool wxGenericListCtrl::SetFont( const wxFont &font )
 }
 
 
-// NOTE: If using the wxListBox visual attributes works everywhere then this can
-// be removed, as well as the #else case below.
-#define _USE_VISATTR 0
 
+#if _USE_VISATTR
 #include "wx/listbox.h"
+#endif
 
 //static
 wxVisualAttributes
@@ -5257,6 +5262,7 @@ wxGenericListCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
     // Use the same color scheme as wxListBox
     return wxListBox::GetClassDefaultAttributes(variant);
 #else
+    wxUnusedVar(variant);
     wxVisualAttributes attr;
     attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
     attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);