renamed to WX_DECLARE_LIST_WITH_DECL for consistency

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

diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index 884f126b84d9673a91aff7287e6880cbee1b1d53..e80001d06046036c6018403c3314b8261c238b20 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(__APPLE__)
+    #pragma interface "gaugebase.h"
 #endif
 
 #include "wx/defs.h"
@@ -31,6 +31,9 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr;
 class WXDLLEXPORT wxGaugeBase : public wxControl
 {
 public:
+    wxGaugeBase() { }
+    virtual ~wxGaugeBase();
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 int range,
@@ -65,6 +68,8 @@ protected:
 
     // the current position
     int m_gaugePos;
+
+    DECLARE_NO_COPY_CLASS(wxGaugeBase)
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -75,22 +80,18 @@ 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"
 #elif defined(__WXGTK__)
     #include "wx/gtk/gauge.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/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