X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f36e602b3f4cccedfa2d8932c288f3dfed7b549e..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/scrolbar.h diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h index fc46906736..2d01bcae4b 100644 --- a/include/wx/scrolbar.h +++ b/include/wx/scrolbar.h @@ -18,13 +18,13 @@ #include "wx/control.h" -extern WXDLLEXPORT_DATA(const char) wxScrollBarNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxScrollBarNameStr[]; // ---------------------------------------------------------------------------- // wxScrollBar: a scroll bar control // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxScrollBarBase : public wxControl +class WXDLLIMPEXP_CORE wxScrollBarBase : public wxControl { public: wxScrollBarBase() { } @@ -56,7 +56,7 @@ public: bool IsNeeded() const { return GetRange() > GetThumbSize(); } private: - DECLARE_NO_COPY_CLASS(wxScrollBarBase) + wxDECLARE_NO_COPY_CLASS(wxScrollBarBase); }; #if defined(__WXUNIVERSAL__) @@ -70,7 +70,7 @@ private: #elif defined(__WXGTK__) #include "wx/gtk1/scrolbar.h" #elif defined(__WXMAC__) - #include "wx/mac/scrolbar.h" + #include "wx/osx/scrolbar.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/scrolbar.h" #elif defined(__WXPM__)