X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..fe8f794343fc22d3da1e6f003fdd754d2bdf9339:/include/wx/button.h diff --git a/include/wx/button.h b/include/wx/button.h index b9b1f0388b..443402f23a 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -12,8 +12,29 @@ #ifndef _WX_BUTTON_H_BASE_ #define _WX_BUTTON_H_BASE_ +#include "wx/defs.h" + #if wxUSE_BUTTON +// ---------------------------------------------------------------------------- +// wxButton flags +// ---------------------------------------------------------------------------- + +// 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 +#define wxBU_BOTTOM 0x0200 + +// 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 +// small as possible +#define wxBU_EXACTFIT 0x0001 + #include "wx/control.h" class WXDLLEXPORT wxBitmap; @@ -28,10 +49,10 @@ class WXDLLEXPORT wxButtonBase : public wxControl { public: // show the image in the button in addition to the label - virtual void SetImageLabel(const wxBitmap& bitmap) { } + virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { } // set the margins around the image - virtual void SetImageMargins(wxCoord x, wxCoord y) { } + virtual void SetImageMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { } // this wxButton method is called when the button becomes the default one // on its panel @@ -49,14 +70,12 @@ public: #include "wx/motif/button.h" #elif defined(__WXGTK__) #include "wx/gtk/button.h" -#elif defined(__WXQT__) - #include "wx/qt/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