X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5051902e561cc97c6bb06a6c80a23ed852da8c5e..e14d10b039e68a701a447043a4031cf43e9fa90b:/include/wx/gauge.h diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 8177c3de27..830fecf778 100644 --- 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,9 +31,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxGaugeNameStr; class WXDLLEXPORT wxGaugeBase : public wxControl { public: -#ifdef __WXMAC_X__ - virtual ~wxGaugeBase() { } -#endif + virtual ~wxGaugeBase(); + bool Create(wxWindow *parent, wxWindowID id, int range, @@ -78,22 +77,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