X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..c27bcbd5a7cec9f03b15c69824da99c5bb75924a:/include/wx/univ/button.h?ds=sidebyside diff --git a/include/wx/univ/button.h b/include/wx/univ/button.h index 18831518d1..68a56beb8e 100644 --- a/include/wx/univ/button.h +++ b/include/wx/univ/button.h @@ -12,7 +12,7 @@ #ifndef _WX_UNIV_BUTTON_H_ #define _WX_UNIV_BUTTON_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univbutton.h" #endif @@ -40,7 +40,7 @@ public: wxButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -51,10 +51,10 @@ public: Create(parent, id, bitmap, label, pos, size, style, validator, name); } - + wxButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -68,7 +68,7 @@ public: bool Create(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -78,11 +78,11 @@ public: return Create(parent, id, wxNullBitmap, label, pos, size, style, validator, name); } - + bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -113,7 +113,7 @@ protected: virtual bool DoDrawBackground(wxDC& dc); virtual void DoDraw(wxControlRenderer *renderer); - virtual bool CanBeHighlighted() const { return TRUE; } + virtual bool CanBeHighlighted() const { return true; } // common part of all ctors void Init();