X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..28be2e8a170979d476a5ea4f585505b8a2f5af27:/src/gtk1/checkbox.cpp

diff --git a/src/gtk1/checkbox.cpp b/src/gtk1/checkbox.cpp
index c6cf5f5d7f..8bc24ddf9e 100644
--- a/src/gtk1/checkbox.cpp
+++ b/src/gtk1/checkbox.cpp
@@ -16,8 +16,8 @@
 
 #if wxUSE_CHECKBOX
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -77,7 +77,7 @@ bool wxCheckBox::Create(wxWindow *parent,
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxCheckBox creation failed") );
-	return FALSE;
+	    return FALSE;
     }
 
     wxControl::SetLabel( label );
@@ -106,8 +106,6 @@ bool wxCheckBox::Create(wxWindow *parent,
         m_widget = m_widgetCheckbox;
     }
 
-    SetSizeOrDefault( size );
-
     gtk_signal_connect( GTK_OBJECT(m_widgetCheckbox),
                         "clicked",
                         GTK_SIGNAL_FUNC(gtk_checkbox_clicked_callback),
@@ -117,9 +115,19 @@ bool wxCheckBox::Create(wxWindow *parent,
 
     PostCreation();
 
+    SetFont( parent->GetFont() );
+
+    wxSize size_best( DoGetBestSize() );
+    wxSize new_size( size );
+    if (new_size.x == -1)
+        new_size.x = size_best.x;
+    if (new_size.y == -1)
+        new_size.y = size_best.y;
+    if ((new_size.x != size.x) || (new_size.y != size.y))
+        SetSize( new_size.x, new_size.y );
+
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
 
     Show( TRUE );
 
@@ -191,11 +199,11 @@ void wxCheckBox::OnInternalIdle()
     if (GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window && cursor.Ok())
     {
         /* I now set the cursor the anew in every OnInternalIdle call
-	   as setting the cursor in a parent window also effects the
-	   windows above so that checking for the current cursor is
-	   not possible. */
+	       as setting the cursor in a parent window also effects the
+	       windows above so that checking for the current cursor is
+	       not possible. */
 	   
-	gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window, cursor.GetCursor() );
+	   gdk_window_set_cursor( GTK_TOGGLE_BUTTON(m_widgetCheckbox)->event_window, cursor.GetCursor() );
     }
 
     UpdateWindowUI();
@@ -203,8 +211,7 @@ void wxCheckBox::OnInternalIdle()
 
 wxSize wxCheckBox::DoGetBestSize() const
 {
-    return wxSize( 25 + gdk_string_measure( m_widgetCheckbox->style->font,
-                                            m_label.mbc_str() ), 26 );
+    return wxControl::DoGetBestSize();
 }
 
 #endif