make the string properly 0 terminated and allow for one char more on the output buffer

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

diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index b3a81143430316c2f361817685b3f1dcc37b5afa..221f44a26f5ab4e4355b4d22ed0ddbd6d3783832 100644 (file)
--- a/src/univ/bmpbuttn.cpp
+++ b/src/univ/bmpbuttn.cpp
@@ -6,7 +6,7 @@
 // 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 "bmpbuttn.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
@@ -61,13 +57,16 @@ bool wxBitmapButton::Create(wxWindow *parent,
                             const wxValidator& validator,
                             const wxString &name)
 {
-    if ( !wxButton::Create(parent, id, bitmap, _T(""),
-                           pos, size, style, validator, name) )
-        return FALSE;
+    // 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, wxEmptyString,
+                           pos, size, style | wxBU_EXACTFIT, validator, name) )
+        return false;
 
     m_bmpNormal = bitmap;
 
-    return TRUE;
+    return true;
 }
 
 void wxBitmapButton::OnSetBitmap()
@@ -100,21 +99,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)