X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..04fdd8736a403bb3c6b2bd1430e48178dd8b7e45:/src/univ/bmpbuttn.cpp diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp index e844a65d67..396dc3040a 100644 --- a/src/univ/bmpbuttn.cpp +++ b/src/univ/bmpbuttn.cpp @@ -5,8 +5,8 @@ // Modified by: // Created: 25.08.00 // RCS-ID: $Id$ -// Copyright: (c) 2000 Vadim Zeitlin -// Licence: wxWindows license +// Copyright: (c) 2000 SciTech Software, Inc. (www.scitechsoft.com) +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "univbmpbuttn.h" #endif @@ -61,8 +61,11 @@ bool wxBitmapButton::Create(wxWindow *parent, const wxValidator& validator, const wxString &name) { + // 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(""), - pos, size, style, validator, name) ) + pos, size, style | wxBU_EXACTFIT, validator, name) ) return FALSE; m_bmpNormal = bitmap;