Fix wx[Sorted]ArrayString::Index when wxUSE_STL=1, because

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 3e69e5bd406f225df53e9dbd19784e9b2adb3e7d..830fecf778c052283a017c230250ecbbe9a21e05 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -77,9 +77,7 @@ protected:
         #define wxGauge wxGauge95
         #define sm_classwxGauge sm_classwxGauge95
     #else // !__WIN95__
         #define wxGauge wxGauge95
         #define sm_classwxGauge sm_classwxGauge95
     #else // !__WIN95__

-        #include "wx/msw/gaugemsw.h"
-        #define wxGauge wxGaugeMSW
-        #define sm_classwxGauge sm_classwxGaugeMSW
+        // Gauge no longer supported on 16-bit Windows

     #endif
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"
     #endif
 #elif defined(__WXMOTIF__)
     #include "wx/motif/gauge.h"


@@ -87,10 +85,10 @@ protected:
     #include "wx/gtk/gauge.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"
     #include "wx/gtk/gauge.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/gauge.h"

+#elif defined(__WXCOCOA__)
+    #include "wx/cocoa/gauge.h"

 #elif defined(__WXPM__)
     #include "wx/os2/gauge.h"
 #elif defined(__WXPM__)
     #include "wx/os2/gauge.h"

-#elif defined(__WXSTUBS__)
-    #include "wx/stubs/gauge.h"

 #endif
 
 #endif // wxUSE_GAUGE
 #endif
 
 #endif // wxUSE_GAUGE