don't give empty message box if Parse(FALSE) was called and there was --help on the...

[wxWidgets.git] / src / univ / bmpbuttn.cpp

diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index b3a81143430316c2f361817685b3f1dcc37b5afa..f73fb8cd96916391a26fc655bdc2ad81975cf6d8 100644 (file)
--- a/src/univ/bmpbuttn.cpp
+++ b/src/univ/bmpbuttn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "bmpbuttn.h"
+    #pragma implementation "univbmpbuttn.h"

 #endif
 
 #include "wx/wxprec.h"
 #endif
 
 #include "wx/wxprec.h"


@@ -61,8 +61,11 @@ bool wxBitmapButton::Create(wxWindow *parent,
                             const wxValidator& validator,
                             const wxString &name)
 {
                             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(""),
     if ( !wxButton::Create(parent, id, bitmap, _T(""),

-                           pos, size, style, validator, name) )
+                           pos, size, style | wxBU_EXACTFIT, validator, name) )

         return FALSE;
 
     m_bmpNormal = bitmap;
         return FALSE;
 
     m_bmpNormal = bitmap;