support metal appearance

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

diff --git a/src/univ/bmpbuttn.cpp b/src/univ/bmpbuttn.cpp
index 597d65632345e4fbc79c3a7b4c757778e7ccf6c1..396dc3040a41b16cf5cd555023a510696a3214e6 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)
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univbmpbuttn.h"
 #endif
 
     #pragma implementation "univbmpbuttn.h"
 #endif
 


@@ -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;