X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e711d5c093dcc758e3f1670caf845612ea9fa92..f7d4537c2bcf5a935edacadb627b01dbc6523beb:/include/wx/button.h?ds=sidebyside diff --git a/include/wx/button.h b/include/wx/button.h index 4e75d97c33..d4032a3b6c 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -12,15 +12,19 @@ #ifndef _WX_BUTTON_H_BASE_ #define _WX_BUTTON_H_BASE_ +#include "wx/defs.h" + #if wxUSE_BUTTON // ---------------------------------------------------------------------------- // wxButton flags // ---------------------------------------------------------------------------- -// all these flags are obsolete +// These two flags are obsolete #define wxBU_NOAUTODRAW 0x0000 #define wxBU_AUTODRAW 0x0004 + +// These flags affect label alignment #define wxBU_LEFT 0x0040 #define wxBU_TOP 0x0080 #define wxBU_RIGHT 0x0100 @@ -44,6 +48,8 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; class WXDLLEXPORT wxButtonBase : public wxControl { public: + wxButtonBase() { } + // show the image in the button in addition to the label virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { } @@ -56,6 +62,8 @@ public: // returns the default button size for this platform static wxSize GetDefaultSize(); + + DECLARE_NO_COPY_CLASS(wxButtonBase) }; #if defined(__WXUNIVERSAL__) @@ -68,10 +76,10 @@ public: #include "wx/gtk/button.h" #elif defined(__WXMAC__) #include "wx/mac/button.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/button.h" #elif defined(__WXPM__) #include "wx/os2/button.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/button.h" #endif #endif // wxUSE_BUTTON