X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82cddbd97a4dfbd0dcf5c44c9336173d6dd386ef..c220de0b393b5098c705c1a62ef7fc4698e2fa52:/include/wx/button.h diff --git a/include/wx/button.h b/include/wx/button.h index a88d717614..519d0b7ffe 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -34,11 +34,9 @@ // wxButton specific flags // ---------------------------------------------------------------------------- -#if WXWIN_COMPATIBILITY_2_8 // These two flags are obsolete #define wxBU_NOAUTODRAW 0x0000 #define wxBU_AUTODRAW 0x0004 -#endif // by default, the buttons will be created with some (system dependent) // minimal size to make them look nicer, giving this style will make them as @@ -49,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() { } @@ -97,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__)