X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72a7edf007f57bc9dacea77c408adb86a57d41f7..e72b421324f29e199e3321245fa5a92136233a85:/src/gtk1/radiobox.cpp

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 0e61498721..a65b078435 100644
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -18,9 +18,10 @@
 #include "wx/dialog.h"
 #include "wx/frame.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
-#include "gdk/gdkkeysyms.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
 #include "wx/gtk/win_gtk.h"
 
 //-----------------------------------------------------------------------------
@@ -179,6 +180,16 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
                          m_x+10, m_y+10+(i*24), 10, 10 );
     }
 
+    m_parent->DoAddChild( this );
+
+    PostCreation();
+    
+    ApplyWidgetStyle();
+
+    SetLabel( title );
+
+    SetFont( parent->GetFont() );
+
     wxSize ls = LayoutItems();
 
     wxSize newSize = size;
@@ -186,15 +197,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
     if (newSize.y == -1) newSize.y = ls.y;
     SetSize( newSize.x, newSize.y );
 
-    m_parent->DoAddChild( this );
-
-    PostCreation();
-
-    SetLabel( title );
-
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
 
     Show( TRUE );
 
@@ -261,13 +265,17 @@ wxSize wxRadioBox::LayoutItems()
             for (int i1 = 0; i1< num_of_rows; i1++)
             {
                 GtkWidget *button = GTK_WIDGET( node->Data() );
-                GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
-                GdkFont *font = m_widget->style->font;
-                int len = 22+gdk_string_measure( font, label->label );
-                if (len > max_len) max_len = len;
+		
+                GtkRequisition req;
+                req.width = 2;
+                req.height = 2;
+                (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+                      (button, &req );
+		
+                if (req.width > max_len) max_len = req.width;
 
                 gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
-                y += 22;
+                y += req.height;
 
                 node = node->Next();
                 if (!node) break;
@@ -292,7 +300,7 @@ wxSize wxRadioBox::LayoutItems()
         }
 
         res.x = x+4;
-        res.y += 9;
+        res.y += 4;
     }
     else
     {
@@ -301,12 +309,15 @@ wxSize wxRadioBox::LayoutItems()
         wxNode *node = m_boxes.First();
         while (node)
         {
-            GtkButton *button = GTK_BUTTON( node->Data() );
-            GtkLabel *label = GTK_LABEL( button->child );
+            GtkWidget *button = GTK_WIDGET( node->Data() );
+
+            GtkRequisition req;
+            req.width = 2;
+            req.height = 2;
+            (* GTK_WIDGET_CLASS( GTK_OBJECT(button)->klass )->size_request )
+                  (button, &req );
 
-            GdkFont *font = m_widget->style->font;
-            int len = 22+gdk_string_measure( font, label->label );
-            if (len > max) max = len;
+            if (req.width > max) max = req.width;
 
             node = node->Next();
         }