X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa89a22b8e47000c98bff05c6f545f331f1c353..894d74dcc233b7f9a936767558f3e061593dd062:/src/univ/bmpbuttn.cpp diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp index 9c6227c33d..112dac3646 100644 --- a/src/univ/bmpbuttn.cpp +++ b/src/univ/bmpbuttn.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "univbmpbuttn.h" #endif @@ -64,13 +64,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() @@ -103,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)