X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a290fa5a7deebe9d96c0c0089d18e27d4bd9b624..5ac1d44aa499901b1a2e194292ba7a93112196ae:/src/univ/bmpbuttn.cpp diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp index 638d441937..0230a0674f 100644 --- a/src/univ/bmpbuttn.cpp +++ b/src/univ/bmpbuttn.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: univ/bmpbuttn.cpp +// Name: src/univ/bmpbuttn.cpp // Purpose: wxBitmapButton implementation // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #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,7 +61,7 @@ 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; @@ -158,4 +155,3 @@ void wxBitmapButton::Release() } #endif // wxUSE_BMPBUTTON -