X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d3e7b52d84580c28df8f754b81363502f917ac7..f87584b55268e165f15de6f8ae34c99df72e5896:/include/wx/gauge.h

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 74e55c38c6..cb1cffb25b 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -12,10 +12,6 @@
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "gaugebase.h"
-#endif
-
 #include "wx/defs.h"
 
 #if wxUSE_GAUGE
@@ -32,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
 
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxGaugeNameStr[];
 
 // ----------------------------------------------------------------------------
 // wxGauge: a progress bar
@@ -92,16 +90,14 @@ protected:
 #if defined(__WXUNIVERSAL__)
     #include "wx/univ/gauge.h"
 #elif defined(__WXMSW__)
-    #ifdef __WIN95__
-        #include "wx/msw/gauge95.h"
-        #define wxGauge wxGauge95
-    #else // !__WIN95__
-        // Gauge no longer supported on 16-bit Windows
-    #endif
+    #include "wx/msw/gauge95.h"
+    #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__)