Cleaned up remains of outdated 3D effect handling.

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 801dab194354263a08351171f8c2b0cd5a61efe4..925cca91dd7ebca48cc2a9a3ee5a8ff8042d946b 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_
 
-#ifdef __GNUG__
-    #pragma implementation "gaugebase.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "gaugebase.h"
 #endif
 
 #include "wx/defs.h"
@@ -31,9 +31,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:
-#ifdef __DARWIN__
-    virtual ~wxGaugeBase() { }
-#endif
+    wxGaugeBase() { }
+    virtual ~wxGaugeBase();
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 int range,
@@ -68,6 +68,8 @@ protected:
 
     // the current position
     int m_gaugePos;
+
+    DECLARE_NO_COPY_CLASS(wxGaugeBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -78,9 +80,7 @@ protected:
         #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"
@@ -88,10 +88,10 @@ protected:
     #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(__WXSTUBS__)
-    #include "wx/stubs/gauge.h"
 #endif
 
 #endif // wxUSE_GAUGE