X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..5fae57de3aac82d13204d825e2901cdd45c1adda:/include/wx/univ/bmpbuttn.h diff --git a/include/wx/univ/bmpbuttn.h b/include/wx/univ/bmpbuttn.h index 4199b5038f..aea430dc1c 100644 --- a/include/wx/univ/bmpbuttn.h +++ b/include/wx/univ/bmpbuttn.h @@ -19,7 +19,7 @@ class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase { public: - wxBitmapButton(); + wxBitmapButton() { } wxBitmapButton(wxWindow *parent, wxWindowID id, @@ -28,7 +28,10 @@ public: const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); + const wxString& name = wxButtonNameStr) + { + Create(parent, id, bitmap, pos, size, style, validator, name); + } bool Create(wxWindow *parent, wxWindowID id, @@ -46,9 +49,9 @@ public: wxBitmapButtonBase::SetMargins(x, y); } - virtual bool Enable(bool enable = TRUE); + virtual bool Enable(bool enable = true); - virtual bool SetCurrent(bool doit = TRUE); + virtual bool SetCurrent(bool doit = true); virtual void Press(); virtual void Release(); @@ -61,7 +64,7 @@ protected: virtual void OnSetBitmap(); // set bitmap to the given one if it's ok or to m_bmpNormal and return - // TRUE if the bitmap really changed + // true if the bitmap really changed bool ChangeBitmap(const wxBitmap& bmp); private: