X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dc797d8e1b4ef10be4f5c9cd73151406f459706d..7e08bc5acd8ee4e2f0756f50bf98937a118f9951:/include/wx/button.h?ds=sidebyside diff --git a/include/wx/button.h b/include/wx/button.h index 58f8ab55fe..25d56365f0 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -47,13 +47,13 @@ class WXDLLIMPEXP_FWD_CORE wxBitmap; -extern WXDLLEXPORT_DATA(const char) wxButtonNameStr[]; +extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxButton: a push button // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxButtonBase : public wxControl +class WXDLLIMPEXP_CORE wxButtonBase : public wxControl { public: wxButtonBase() { } @@ -81,7 +81,7 @@ protected: // choose the default border for this window virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - DECLARE_NO_COPY_CLASS(wxButtonBase) + wxDECLARE_NO_COPY_CLASS(wxButtonBase); }; #if defined(__WXUNIVERSAL__) @@ -95,7 +95,7 @@ protected: #elif defined(__WXGTK__) #include "wx/gtk1/button.h" #elif defined(__WXMAC__) - #include "wx/mac/button.h" + #include "wx/osx/button.h" #elif defined(__WXCOCOA__) #include "wx/cocoa/button.h" #elif defined(__WXPM__)