X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d699f48ba33c96c24f7ab3764ad98ded0633c1c5..7e08bc5acd8ee4e2f0756f50bf98937a118f9951:/include/wx/button.h?ds=inline diff --git a/include/wx/button.h b/include/wx/button.h index 0a7ccc6a8b..25d56365f0 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -12,19 +12,31 @@ #ifndef _WX_BUTTON_H_BASE_ #define _WX_BUTTON_H_BASE_ -#if wxUSE_BUTTON +#include "wx/defs.h" // ---------------------------------------------------------------------------- -// wxButton flags +// wxButton flags shared with other classes // ---------------------------------------------------------------------------- -// all these 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 @@ -33,29 +45,43 @@ #include "wx/control.h" -class WXDLLEXPORT wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBitmap; -WXDLLEXPORT_DATA(extern const wxChar*) 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() { } + // show the image in the button in addition to the label virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { } // 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 + // in wxButtonBase to make it consistent. + virtual bool ShouldInheritColours() const { return false; } // returns the default button size for this platform static wxSize GetDefaultSize(); + +protected: + // choose the default border for this window + virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } + + wxDECLARE_NO_COPY_CLASS(wxButtonBase); }; #if defined(__WXUNIVERSAL__) @@ -64,16 +90,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(__WXQT__) - #include "wx/qt/button.h" +#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__) #include "wx/os2/button.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/button.h" +#elif defined(__WXPALMOS__) + #include "wx/palmos/button.h" #endif #endif // wxUSE_BUTTON