switching to CreateXXX methods for Controls and to Hit Event Processing, thus support...

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

diff --git a/src/gtk1/bmpbuttn.cpp b/src/gtk1/bmpbuttn.cpp
index eeb89d7163cd565f18ed6cfa97d897bb10ba2d53..2c7762f095f50ce27ca3ccd6c182dabbbc6fc92f 100644 (file)
--- a/src/gtk1/bmpbuttn.cpp
+++ b/src/gtk1/bmpbuttn.cpp
@@ -112,16 +112,6 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
 

-wxBitmapButtonBase::wxBitmapButtonBase()
-                                      : m_bmpNormal(), 
-                                        m_bmpSelected(), 
-                                        m_bmpFocus(), 
-                                        m_bmpDisabled(), 
-                                        m_marginX(0), 
-                                        m_marginY(0)
-{
-}
-

 void wxBitmapButton::Init()
 {
     m_hasFocus =
 void wxBitmapButton::Init()
 {
     m_hasFocus =


@@ -154,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();
     }


@@ -270,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) )