reSWIGged

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

diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index e844a65d674671afd07fc1b43389c52983e1ad0a..5efb9f76a320246e53a088dbb9f7bc284c5add96 100644 (file)
--- 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
 
@@ -52,6 +52,32 @@ END_EVENT_TABLE()
 // wxBitmapButton
 // ----------------------------------------------------------------------------
 
+wxBitmapButtonBase::wxBitmapButtonBase()
+                                      : m_bmpNormal(), 
+                                        m_bmpSelected(), 
+                                        m_bmpFocus(), 
+                                        m_bmpDisabled(), 
+                                        m_marginX(0), 
+                                        m_marginY(0)
+{
+}
+
+wxBitmapButton::wxBitmapButton()
+{
+}
+
+wxBitmapButton::wxBitmapButton(wxWindow *parent,
+                               wxWindowID id,
+                               const wxBitmap& bitmap,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               long style,
+                               const wxValidator& validator,
+                               const wxString& name)
+{
+    Create(parent, id, bitmap, pos, size, style, validator, name);
+}
+
 bool wxBitmapButton::Create(wxWindow *parent,
                             wxWindowID id,
                             const wxBitmap& bitmap,
@@ -61,8 +87,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;