X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/button.h?ds=sidebyside diff --git a/include/wx/button.h b/include/wx/button.h index 83f0fede26..0959a68e37 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -6,7 +6,7 @@ // Created: 15.08.00 // RCS-ID: $Id$ // Copyright: (c) Vadim Zetlin -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BUTTON_H_BASE_ @@ -14,21 +14,29 @@ #include "wx/defs.h" -#if wxUSE_BUTTON - // ---------------------------------------------------------------------------- -// wxButton flags +// wxButton flags shared with other classes // ---------------------------------------------------------------------------- -// These two flags are obsolete -#define wxBU_NOAUTODRAW 0x0000 -#define wxBU_AUTODRAW 0x0004 +#if wxUSE_TOGGLEBTN || wxUSE_BUTTON // These flags affect label alignment #define wxBU_LEFT 0x0040 #define wxBU_TOP 0x0080 #define wxBU_RIGHT 0x0100 #define wxBU_BOTTOM 0x0200 +#define wxBU_ALIGN_MASK ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM ) +#endif + +#if wxUSE_BUTTON + +// ---------------------------------------------------------------------------- +// wxButton specific flags +// ---------------------------------------------------------------------------- + +// These two flags are obsolete +#define wxBU_NOAUTODRAW 0x0000 +#define wxBU_AUTODRAW 0x0004 // 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 @@ -37,9 +45,9 @@ #include "wx/control.h" -class WXDLLEXPORT wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBitmap; -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxButtonNameStr[]; // ---------------------------------------------------------------------------- // wxButton: a push button @@ -56,9 +64,10 @@ public: // set the margins around the image virtual void SetImageMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { } - // this wxButton method is called when the button becomes the default one - // on its panel - virtual void SetDefault() { } + // make this button the default button in its top level window + // + // returns the old default item (possibly NULL) + virtual wxWindow *SetDefault(); // Buttons on MSW can look bad if they are not native colours, because // then they become owner-drawn and not theme-drawn. Disable it here @@ -68,6 +77,7 @@ public: // returns the default button size for this platform static wxSize GetDefaultSize(); +protected: DECLARE_NO_COPY_CLASS(wxButtonBase) }; @@ -77,14 +87,18 @@ public: #include "wx/msw/button.h" #elif defined(__WXMOTIF__) #include "wx/motif/button.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/button.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/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(__WXPALMOS__) + #include "wx/palmos/button.h" #endif #endif // wxUSE_BUTTON