showing a bevel button for a multiline label (is not multline on the OS level, but...

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index 8e548b420cd1bd3195c27df59e9168192d73eb92..2c7762f095f50ce27ca3ccd6c182dabbbc6fc92f 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -144,19 +144,17 @@ bool wxBitmapButton::Create( wxWindow *parent,
 
     m_widget = gtk_button_new();
 
 
     m_widget = gtk_button_new();
 

-#if (GTK_MINOR_VERSION > 0)

     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
     if (style & wxNO_BORDER)
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );

-#endif

 
     if (m_bmpNormal.Ok())
     {
         wxSize newSize = size;
 
     if (m_bmpNormal.Ok())
     {
         wxSize newSize = size;

-        int border = (style & wxNO_BORDER) ? 4 : 10;
+        wxSize bestSize = DoGetBestSize();

         if (newSize.x == -1)
         if (newSize.x == -1)

-            newSize.x = m_bmpNormal.GetWidth()+border;
+            newSize.x = bestSize.x;

         if (newSize.y == -1)
         if (newSize.y == -1)

-            newSize.y = m_bmpNormal.GetHeight()+border;
+            newSize.y = bestSize.y;

         SetSize( newSize.x, newSize.y );
         OnSetBitmap();
     }
         SetSize( newSize.x, newSize.y );
         OnSetBitmap();
     }


@@ -176,8 +174,7 @@ bool wxBitmapButton::Create( wxWindow *parent,
     m_parent->DoAddChild( this );
 
     PostCreation();
     m_parent->DoAddChild( this );
 
     PostCreation();

-
-    SetBackgroundColour( parent->GetBackgroundColour() );
+    InheritAttributes();

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -261,6 +258,19 @@ void wxBitmapButton::OnSetBitmap()
     }
 }
 
     }
 }
 

+wxSize wxBitmapButton::DoGetBestSize() const
+{
+    wxSize best;
+    
+    if (m_bmpNormal.Ok())
+    {
+        int border = HasFlag(wxNO_BORDER) ? 4 : 10;
+        best.x = m_bmpNormal.GetWidth()+border;
+        best.y = m_bmpNormal.GetHeight()+border;
+    }
+    return best;
+}
+

 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )
 bool wxBitmapButton::Enable( bool enable )
 {
     if ( !wxWindow::Enable(enable) )