X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ef2f095a5ff3c545e84d9afbfa9432f5fed7bcfe..69659fd770f615210efac4b4fa741b3ad6223616:/src/univ/bmpbuttn.cpp?ds=sidebyside diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp index f73fb8cd96..2a9f873ccc 100644 --- a/src/univ/bmpbuttn.cpp +++ b/src/univ/bmpbuttn.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/bmpbuttn.cpp +// Name: src/univ/bmpbuttn.cpp // Purpose: wxBitmapButton implementation // Author: Vadim Zeitlin // Modified by: // Created: 25.08.00 // RCS-ID: $Id$ // Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "univbmpbuttn.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ @@ -29,9 +25,10 @@ #if wxUSE_BMPBUTTON +#include "wx/bmpbuttn.h" + #ifndef WX_PRECOMP #include "wx/dc.h" - #include "wx/bmpbuttn.h" #include "wx/validate.h" #endif @@ -64,13 +61,13 @@ bool wxBitmapButton::Create(wxWindow *parent, // we add wxBU_EXACTFIT because the bitmap buttons are not the standard // ones and so shouldn't be forced to be of the standard size which is // typically too big for them - if ( !wxButton::Create(parent, id, bitmap, _T(""), + if ( !wxButton::Create(parent, id, bitmap, wxEmptyString, pos, size, style | wxBU_EXACTFIT, validator, name) ) - return FALSE; + return false; m_bmpNormal = bitmap; - return TRUE; + return true; } void wxBitmapButton::OnSetBitmap() @@ -99,25 +96,23 @@ void wxBitmapButton::OnSetBitmap() bool wxBitmapButton::ChangeBitmap(const wxBitmap& bmp) { wxBitmap bitmap = bmp.Ok() ? bmp : m_bmpNormal; - if ( bitmap != m_bitmap ) - { - m_bitmap = bitmap; + if ( bitmap.IsSameAs(m_bitmap) ) + return false; - return TRUE; - } + m_bitmap = bitmap; - return FALSE; + return true; } 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) @@ -158,4 +153,3 @@ void wxBitmapButton::Release() } #endif // wxUSE_BMPBUTTON -