X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/936f635341e9b92b37db93cc7781d564babbe25f..a703012aedeb8064c8294c6aeeea95e6950ad170:/include/wx/gauge.h?ds=inline diff --git a/include/wx/gauge.h b/include/wx/gauge.h index 6a6317a5f2..be03e7e8e7 100644 --- a/include/wx/gauge.h +++ b/include/wx/gauge.h @@ -41,13 +41,13 @@ #define wxGAUGE_EMULATE_INDETERMINATE_MODE 0 #endif -extern WXDLLEXPORT_DATA(const char) wxGaugeNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxGaugeNameStr[]; // ---------------------------------------------------------------------------- // wxGauge: a progress bar // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxGaugeBase : public wxControl +class WXDLLIMPEXP_CORE wxGaugeBase : public wxControl { public: wxGaugeBase() { m_rangeMax = m_gaugePos = 0; } @@ -84,7 +84,7 @@ public: virtual void SetBezelFace(int w); virtual int GetBezelFace() const; - // overriden base class virtuals + // overridden base class virtuals virtual bool AcceptsFocus() const { return false; } protected: @@ -100,7 +100,7 @@ protected: int m_nDirection; // can be wxRIGHT or wxLEFT #endif - DECLARE_NO_COPY_CLASS(wxGaugeBase) + wxDECLARE_NO_COPY_CLASS(wxGaugeBase); }; #if defined(__WXUNIVERSAL__) @@ -114,7 +114,7 @@ protected: #elif defined(__WXGTK__) #include "wx/gtk1/gauge.h" #elif defined(__WXMAC__) - #include "wx/mac/gauge.h" + #include "wx/osx/gauge.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/gauge.h" #elif defined(__WXPM__)