X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..6ea1280cb72eca20ee34d0c76e660d5cc0a482b7:/src/univ/bmpbuttn.cpp diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp index 5efb9f76a3..638d441937 100644 --- a/src/univ/bmpbuttn.cpp +++ b/src/univ/bmpbuttn.cpp @@ -52,32 +52,6 @@ END_EVENT_TABLE() // wxBitmapButton // ---------------------------------------------------------------------------- -wxBitmapButtonBase::wxBitmapButtonBase() - : m_bmpNormal(), - m_bmpSelected(), - m_bmpFocus(), - m_bmpDisabled(), - m_marginX(0), - m_marginY(0) -{ -} - -wxBitmapButton::wxBitmapButton() -{ -} - -wxBitmapButton::wxBitmapButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos, - const wxSize& size, - long style, - const wxValidator& validator, - const wxString& name) -{ - Create(parent, id, bitmap, pos, size, style, validator, name); -} - bool wxBitmapButton::Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, @@ -92,11 +66,11 @@ bool wxBitmapButton::Create(wxWindow *parent, // typically too big for them if ( !wxButton::Create(parent, id, bitmap, _T(""), pos, size, style | wxBU_EXACTFIT, validator, name) ) - return FALSE; + return false; m_bmpNormal = bitmap; - return TRUE; + return true; } void wxBitmapButton::OnSetBitmap() @@ -129,21 +103,21 @@ bool wxBitmapButton::ChangeBitmap(const wxBitmap& bmp) { m_bitmap = bitmap; - return TRUE; + return true; } - return FALSE; + return false; } bool wxBitmapButton::Enable(bool enable) { if ( !wxButton::Enable(enable) ) - return FALSE; + return false; if ( !enable && ChangeBitmap(m_bmpDisabled) ) Refresh(); - return TRUE; + return true; } bool wxBitmapButton::SetCurrent(bool doit)