fixes to previous commit

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 801dab194354263a08351171f8c2b0cd5a61efe4..260f16e2c07fa43812fda116e18ab38bb254efd5 100644 (file)
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -12,8 +12,8 @@
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 
 #ifndef _WX_GAUGE_H_BASE_
 #define _WX_GAUGE_H_BASE_
 

-#ifdef __GNUG__
-    #pragma implementation "gaugebase.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+    #pragma interface "gaugebase.h"

 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"


@@ -31,9 +31,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:
 class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:

-#ifdef __DARWIN__
-    virtual ~wxGaugeBase() { }
-#endif
+    virtual ~wxGaugeBase();
+

     bool Create(wxWindow *parent,
                 wxWindowID id,
                 int range,
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 int range,


@@ -78,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"


@@ -90,8 +87,6 @@ protected:
     #include "wx/mac/gauge.h"
 #elif defined(__WXPM__)
     #include "wx/os2/gauge.h"
     #include "wx/mac/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