X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..ab6e49136690b92c4879f8f964f7523a775dc7ee:/include/wx/gauge.h diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 3e69e5bd40..925cca91dd 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -12,7 +12,7 @@ #ifndef _WX_GAUGE_H_BASE_ #define _WX_GAUGE_H_BASE_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "gaugebase.h" #endif @@ -31,6 +31,7 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; class WXDLLEXPORT wxGaugeBase : public wxControl { public: + wxGaugeBase() { } virtual ~wxGaugeBase(); bool Create(wxWindow *parent, @@ -67,6 +68,8 @@ protected: // the current position int m_gaugePos; + + DECLARE_NO_COPY_CLASS(wxGaugeBase) }; #if defined(__WXUNIVERSAL__) @@ -77,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" @@ -87,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