Child positioning fixes and font adjustments

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

diff --git a/src/gtk/button.cpp b/src/gtk/button.cpp
index 5b16248fcd89cf06327b3dfe344d0476729cf1bd..d594d37e2663b95b54b137557ca7f3fa15606a44 100644 (file)
--- a/src/gtk/button.cpp
+++ b/src/gtk/button.cpp
@@ -4,13 +4,17 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "button.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_BUTTON
+
 #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") );
-           return FALSE;
+        return FALSE;
     }
 
 /*
@@ -85,7 +89,7 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
     for (size_t i = 0; i < label2.Len(); i++)
     {
         if (label2.GetChar(i) == wxT('&'))
-           label2.SetChar(i,wxT('_'));
+        label2.SetChar(i,wxT('_'));
     }
     
     GtkWidget *accel_label = gtk_accel_label_new( label2.mb_str() );
@@ -118,8 +122,6 @@ bool wxButton::Create(  wxWindow *parent, wxWindowID id, const wxString &label,
   
     PostCreation();
   
-    ApplyWidgetStyle();
-
     SetFont( parent->GetFont() );
 
     wxSize best_size( DoGetBestSize() );
@@ -184,7 +186,14 @@ void wxButton::ApplyWidgetStyle()
 wxSize wxButton::DoGetBestSize() const
 {
     wxSize ret( wxControl::DoGetBestSize() );
-    if (ret.x < 80) ret.x = 80;
+    
+    if (!HasFlag(wxBU_EXACTFIT))
+    {
+        if (ret.x < 80) ret.x = 80;
+    }
+    
     return ret;
 }
 
+#endif // wxUSE_BUTTON
+