X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0cc1d4ff2a0c78666f35bbfa34fcc609d7862709..b4626104e5a68430c5c7c4f3a0b79425be9945e8:/include/wx/motif/button.h diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index d9bb8faedc..dc2feeb89d 100644 --- a/include/wx/motif/button.h +++ b/include/wx/motif/button.h @@ -12,7 +12,7 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "button.h" #endif @@ -25,7 +25,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 +34,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,6 +49,7 @@ public: // Implementation private: virtual wxSize DoGetBestSize() const; + wxSize OldGetBestSize() const; void SetDefaultShadowThicknessAndResize(); };