X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ed64378076af9e28d1c3f896d4b85bdc6aa1b2a..40b26d752de12e3e9f03172049c441de1a5e0276:/include/wx/gauge.h

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 0eb6adee67..cb1cffb25b 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -28,11 +28,13 @@
 // Win32 only, is default (and only) on some other platforms
 #define wxGA_SMOOTH          0x0020
 
-// obsolete style
-#define wxGA_PROGRESSBAR     0
+#if WXWIN_COMPATIBILITY_2_6
+    // obsolete style
+    #define wxGA_PROGRESSBAR     0
+#endif // WXWIN_COMPATIBILITY_2_6
 
 
-extern WXDLLEXPORT_DATA(const wxChar*) wxGaugeNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
@@ -92,8 +94,10 @@ protected:
     #define wxGauge wxGauge95
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"
-#elif defined(__WXGTK__)
+#elif defined(__WXGTK20__)
     #include "wx/gtk/gauge.h"
+#elif defined(__WXGTK__)
+    #include "wx/gtk1/gauge.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"
 #elif defined(__WXCOCOA__)