regenerated with tmake

[wxWidgets.git] / src / gtk / button.cpp

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 90f8aa05c926847a826a7d4310ff616eef63b8f1..01b3283adcd389665996f97dd30995b20bc4bcd5 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -11,6 +11,10 @@
 #pragma implementation "button.h"
 #endif
 
 #pragma implementation "button.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_BUTTON
+

 #include "wx/button.h"
 
 #include <gdk/gdk.h>
 #include "wx/button.h"
 
 #include <gdk/gdk.h>


@@ -77,7 +81,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxButton creation failed") );
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxButton creation failed") );

-       return FALSE;
+           return FALSE;

     }
 
 /*
     }
 
 /*


@@ -111,24 +115,6 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 #endif
 
        gtk_button_set_relief( GTK_BUTTON(m_widget), GTK_RELIEF_NONE );
 #endif
 

-    int x = 0;  int y = 0;
-    wxFont new_font( parent->GetFont() );
-    GetTextExtent( m_label, &x, &y, (int*)NULL, (int*)NULL, &new_font );
-
-    wxSize newSize = size;
-    if (newSize.x == -1)
-    {  
-        newSize.x = 12+x;
-       if (newSize.x < 80) newSize.x = 80;
-    }
-    if (newSize.y == -1)
-    {
-        newSize.y = 11+y;
-       if (newSize.y < 26) newSize.y = 26;
-    }
-       
-    SetSize( newSize.x, newSize.y );
-

     gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 
     gtk_signal_connect( GTK_OBJECT(m_widget), "clicked",
       GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
 


@@ -136,9 +122,21 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
   
     PostCreation();
   
   
     PostCreation();
   

+    SetFont( parent->GetFont() );
+
+    wxSize best_size( DoGetBestSize() );
+    wxSize new_size( size );
+    if (new_size.x == -1)
+        new_size.x = best_size.x;
+    if (new_size.y == -1)
+        new_size.y = best_size.y;
+    if ((new_size.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );
+
+    SetSize( new_size );
+

     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

-    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -184,3 +182,13 @@ void wxButton::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
     gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }
     gtk_widget_set_style( m_widget, m_widgetStyle );
     gtk_widget_set_style( GTK_BUTTON(m_widget)->child, m_widgetStyle );
 }

+
+wxSize wxButton::DoGetBestSize() const
+{
+    wxSize ret( wxControl::DoGetBestSize() );
+    if (ret.x < 80) ret.x = 80;
+    return ret;
+}
+
+#endif // wxUSE_BUTTON
+