Added samples.inc to DATAFILES in Makefile.in - is that enough?

[wxWidgets.git] / src / msw / listbox.cpp

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 3b42780fcb8d738636e758bb12f3aeba9cc2bc30..067fc11d9099b88a701f949a118d3eb7643ad822 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -48,10 +48,8 @@
 #endif
 
 #ifndef __TWIN32__
-    #if defined(__GNUWIN32__)
-        #ifndef wxUSE_NORLANDER_HEADERS
-            #include "wx/msw/gnuwin32/extra.h"
-        #endif
+    #ifdef __GNUWIN32_OLD__
+        #include "wx/msw/gnuwin32/extra.h"
     #endif
 #endif
 
@@ -138,7 +136,9 @@ bool wxListBox::Create(wxWindow *parent,
     m_selected = 0;
 
     SetName(name);
+#if wxUSE_VALIDATORS
     SetValidator(validator);
+#endif // wxUSE_VALIDATORS
 
     if (parent)
         parent->AddChild(this);