X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/853bbd9e35fd613d892ee0d4ff30bf20e2be4eee..4170c465f409cc08c4fa22c971634edd52d83c29:/include/wx/button.h diff --git a/include/wx/button.h b/include/wx/button.h index 3ddac2830e..66c31c5a47 100644 --- a/include/wx/button.h +++ b/include/wx/button.h @@ -12,10 +12,6 @@ #ifndef _WX_BUTTON_H_BASE_ #define _WX_BUTTON_H_BASE_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "buttonbase.h" -#endif - #include "wx/defs.h" // ---------------------------------------------------------------------------- @@ -29,7 +25,7 @@ #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 @@ -48,7 +44,6 @@ #define wxBU_EXACTFIT 0x0001 #include "wx/control.h" -#include "wx/stockitem.h" class WXDLLEXPORT wxBitmap; @@ -82,16 +77,6 @@ public: static wxSize GetDefaultSize(); protected: -#if !defined(__WXGTK20__) || defined(__WXUNIVERSAL__) - // create stock button (generic implementation) - bool CreateStock(wxWindow *parent, wxWindowID id, wxStockItemID stock, - const wxString& descriptiveLabel = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); -#endif - DECLARE_NO_COPY_CLASS(wxButtonBase) };