X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8e24dfa9322702d56a125586a7d4a37f4a5dfd7..31ad423e4fb556ec225a63b161154d3bf3445c1b:/src/gtk/radiobox.cpp?ds=sidebyside

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 1fd590f205..a2f712302d 100644
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -168,6 +168,19 @@ void wxRadioBox::Init()
     m_lostFocus = FALSE;
 }
 
+bool wxRadioBox::Create( wxWindow *parent, wxWindowID id,
+                         const wxString& title,
+                         const wxPoint &pos, const wxSize &size,
+                         const wxArrayString& choices, int majorDim,
+                         long style, const wxValidator& validator,
+                         const wxString &name )
+{
+    wxCArrayString chs(choices);
+
+    return Create( parent, id, title, pos, size, chs.GetCount(),
+                   chs.GetStrings(), majorDim, style, validator, name );
+}
+
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
                          const wxPoint &pos, const wxSize &size,
                          int n, const wxString choices[], int majorDim,
@@ -230,29 +243,16 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 
     m_parent->DoAddChild( this );
 
-    PostCreation();
-    InheritAttributes();
-
-    ApplyWidgetStyle();
+    bool wasShown = IsShown();
+    if ( wasShown )
+        Hide(); // prevent PostCreation() from showing us
 
     SetLabel( title );
 
-    SetFont( parent->GetFont() );
+    PostCreation(size);
 
-    wxSize ls = LayoutItems();
-
-    GtkRequisition req;
-    req.width = 2;
-    req.height = 2;
-    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
-    if (req.width > ls.x) ls.x = req.width;
-
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = ls.x;
-    if (newSize.y == -1) newSize.y = ls.y;
-    SetSize( newSize.x, newSize.y );
-
-    Show( TRUE );
+    if ( wasShown )
+        Show();
 
     return TRUE;
 }
@@ -272,25 +272,35 @@ void wxRadioBox::DoSetSize( int x, int y, int width, int height, int sizeFlags )
 {
     wxWindow::DoSetSize( x, y, width, height, sizeFlags );
 
-    LayoutItems();
+    LayoutItems(false);
 }
 
-wxSize wxRadioBox::LayoutItems()
+wxSize wxRadioBox::DoGetBestSize() const
 {
-    int x = 7;
-    int y = 15;
+    wxSize size = LayoutItems(true);
 
-    if ( m_majorDim == 0 )
-    {
-        // avoid dividing by 0 below
-        wxFAIL_MSG( wxT("dimension of radiobox should not be 0!") );
+    GtkRequisition req;
+    req.width = 2;
+    req.height = 2;
+    (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req );
+    if (req.width > size.x)
+        size.x = req.width;
 
-        m_majorDim = 1;
-    }
+    CacheBestSize(size);
+    return size;
+}
+
+wxSize wxRadioBox::LayoutItems(bool justCalc) const
+{
+    wxSize res( 0, 0 );
+
+    // avoid dividing by 0 below
+    wxCHECK_MSG( m_majorDim, res, wxT("dimension of radiobox should not be 0!") );
 
     int num_per_major = (m_boxes.GetCount() - 1) / m_majorDim +1;
 
-    wxSize res( 0, 0 );
+    int x = 7;
+    int y = 15;
 
     int num_of_cols = 0;
     int num_of_rows = 0;
@@ -304,13 +314,16 @@ wxSize wxRadioBox::LayoutItems()
         num_of_cols = num_per_major;
         num_of_rows = m_majorDim;
     }
-
+    
+    int lineheight = GetCharHeight()+2;
+    
     if ( HasFlag(wxRA_SPECIFY_COLS) ||
          (HasFlag(wxRA_SPECIFY_ROWS) && (num_of_cols > 1)) )
     {
         for (int j = 0; j < num_of_cols; j++)
         {
-            y = 15;
+            y = 3;
+            y += lineheight;
 
             int max_len = 0;
             wxList::compatibility_iterator node = m_boxes.Item( j*num_of_rows );
@@ -323,10 +336,11 @@ wxSize wxRadioBox::LayoutItems()
                 req.height = 2;
                 (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(button) )->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 );
+                if ( !justCalc )
+                    gtk_pizza_move( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y );
                 y += req.height;
 
                 node = node->GetNext();
@@ -340,7 +354,8 @@ wxSize wxRadioBox::LayoutItems()
             {
                 GtkWidget *button = GTK_WIDGET( node->GetData() );
 
-                gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, 20 );
+                if ( !justCalc )
+                    gtk_pizza_resize( GTK_PIZZA(m_parent->m_wxwindow), button, max_len, lineheight );
 
                 node = node->GetNext();
                 if (!node) break;
@@ -379,7 +394,8 @@ wxSize wxRadioBox::LayoutItems()
         {
             GtkWidget *button = GTK_WIDGET( node->GetData() );
 
-            gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, 20 );
+            if ( !justCalc )
+                gtk_pizza_set_size( GTK_PIZZA(m_parent->m_wxwindow), button, m_x+x, m_y+y, max, lineheight );
             x += max;
 
             node = node->GetNext();
@@ -401,7 +417,7 @@ bool wxRadioBox::Show( bool show )
         return FALSE;
     }
 
-    if ((m_windowStyle & wxNO_BORDER) != 0)
+    if ( HasFlag(wxNO_BORDER) )
         gtk_widget_hide( m_widget );
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
@@ -666,19 +682,17 @@ void wxRadioBox::GtkEnableEvents()
     }
 }
 
-void wxRadioBox::ApplyWidgetStyle()
+void wxRadioBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
-    SetWidgetStyle();
-
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_modify_style( m_widget, style );
 
     wxList::compatibility_iterator node = m_boxes.GetFirst();
     while (node)
     {
         GtkWidget *widget = GTK_WIDGET( node->GetData() );
-        gtk_widget_set_style( widget, m_widgetStyle );
 
-        gtk_widget_set_style( BUTTON_CHILD(node->GetData()), m_widgetStyle );
+        gtk_widget_modify_style( widget, style );
+        gtk_widget_modify_style( BUTTON_CHILD(node->GetData()), style );
 
         node = node->GetNext();
     }
@@ -737,5 +751,16 @@ void wxRadioBox::OnInternalIdle()
     }
 }
 
+// static
+wxVisualAttributes
+wxRadioBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    wxVisualAttributes attr;
+    GtkWidget* widget = gtk_radio_button_new_with_label(NULL, "");
+    attr = GetDefaultAttributesFromGTKWidget(widget);
+    gtk_widget_destroy(widget);
+    return attr;
+}
+
 #endif // wxUSE_RADIOBOX