cleanup - fixed warnings, reformatting

[wxWidgets.git] / include / wx / slider.h

diff --git a/include/wx/slider.h b/include/wx/slider.h
index a58b942be47eb86c612bcf8fe1fbb923d5874274..a3c114f06431715a46610b96aa5ec021ee5832f1 100644 (file)
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -44,7 +44,7 @@
 #define wxSL_NOTIFY_DRAG     0x0000
 
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxSliderNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxSliderNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxSliderBase: define wxSlider interface
@@ -130,8 +130,10 @@ private:
     #endif
 #elif defined(__WXMOTIF__)
     #include "wx/motif/slider.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/slider.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/slider.h"
 #elif defined(__WXCOCOA__)