X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e04b7e8e715c8ae3d42ed462a7302225f28bf35d..968f291be6686f70b259d9449089be204e51080e:/include/wx/motif/button.h diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index 32958d5753..a0034575bc 100644 --- a/include/wx/motif/button.h +++ b/include/wx/motif/button.h @@ -12,10 +12,6 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "button.h" -#endif - // Pushbutton class WXDLLEXPORT wxButton: public wxButtonBase { @@ -25,7 +21,7 @@ public: wxButton() { } wxButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -34,7 +30,8 @@ public: Create(parent, id, label, pos, size, style, validator, name); } - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + bool Create(wxWindow *parent, wxWindowID id, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -48,7 +45,9 @@ public: // Implementation private: virtual wxSize DoGetBestSize() const; + virtual wxSize GetMinSize() const; wxSize OldGetBestSize() const; + wxSize OldGetMinSize() const; void SetDefaultShadowThicknessAndResize(); };