wxFrame size bug

[wxWidgets.git] / src / gtk1 / radiobox.cpp

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index e07e0e413d27610e3f368148213d192e2c89d441..c1f3fcc165742d2fd1fceef5b56c96cd4e7fef4f 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -80,11 +80,11 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
   int y = m_y+15;
   int maxLen = 0;
   int height = 20;
+  int width = 0;
   
   GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
   
-//  if (((m_style & wxRA_VERTICAL) == wxRA_VERTICAL) && (n > 0))
-  if (n > 0)
+  if (m_windowStyle & wxRA_VERTICAL)
   {
     GSList *radio_button_group = (GSList *) NULL;
     for (int i = 0; i < n; i++)
@@ -104,10 +104,10 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
        
       gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), GTK_WIDGET(m_radio), x, y );
       
-      int tmp = 22+gdk_string_measure( GTK_WIDGET(m_radio)->style->font, choices[i] );
+      int tmp = 25+gdk_string_measure( GTK_WIDGET(m_radio)->style->font, choices[i] );
       if (tmp > maxLen) maxLen = tmp;
       
-      int width = m_width-10;
+      width = m_width-10;
       if (size.x == -1) width = tmp;
       gtk_widget_set_usize( GTK_WIDGET(m_radio), width, 20 );
       
@@ -115,18 +115,60 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
       height += 20;
       
     }
+    width = maxLen + 10;
+  }
+  else
+  {
+    int max = 0;
+    for (int i = 0; i < n; i++)
+    {
+      GdkFont *font = m_widget->style->font;
+      int len = 27+gdk_string_measure( font, choices[i] );
+      if (len > max) max = len;
+    }
+  
+    GSList *radio_button_group = (GSList *) NULL;
+    for (int i = 0; i < n; i++)
+    {
+      if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
+      
+      m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i] ) );
+      
+      m_boxes.Append( (wxObject*) m_radio );
+      
+      ConnectWidget( GTK_WIDGET(m_radio) );
+  
+      if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
+      
+      gtk_signal_connect( GTK_OBJECT(m_radio), "clicked", 
+        GTK_SIGNAL_FUNC(gtk_radiobutton_clicked_callback), (gpointer*)this );
+       
+      gtk_myfixed_put( GTK_MYFIXED(m_parent->m_wxwindow), GTK_WIDGET(m_radio), x, y );
+      
+      gtk_widget_set_usize( GTK_WIDGET(m_radio), max, 20 );
+      
+      x += max;
+    }
+    
+    width = max*n + 10;
+    height = 40;
   }
   
   wxSize newSize = size;
-  if (newSize.x == -1) newSize.x = maxLen+10;
+  if (newSize.x == -1) newSize.x = width;
   if (newSize.y == -1) newSize.y = height;
   SetSize( newSize.x, newSize.y );
   
+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  
   PostCreation();
   
   SetLabel( title );
   
   SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
 
   Show( TRUE );
     
@@ -151,19 +193,51 @@ void wxRadioBox::OnSize( wxSizeEvent &event )
   int x = m_x+5;
   int y = m_y+15;
   
-  wxNode *node = m_boxes.First();
-  while (node)
+  if (m_windowStyle & wxRA_VERTICAL)
   {
-    GtkWidget *button = GTK_WIDGET( node->Data() );
+    wxNode *node = m_boxes.First();
+    while (node)
+    {
+      GtkWidget *button = GTK_WIDGET( node->Data() );
     
-    gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, x, y );
-    y += 20;
+      gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, x, y );
+      y += 20;
     
-    int w = m_width-10;
-    if (w < 15) w = 15;
-    gtk_widget_set_usize( button, w, 20 );
+      int w = m_width-10;
+      if (w < 15) w = 15;
+      gtk_widget_set_usize( button, w, 20 );
       
-    node = node->Next();
+      node = node->Next();
+    }
+  }
+  else
+  {
+    int max = 0;
+
+    wxNode *node = m_boxes.First();
+    while (node)
+    {
+      GtkButton *button = GTK_BUTTON( node->Data() );
+      GtkLabel *label = GTK_LABEL( button->child );
+      
+      GdkFont *font = m_widget->style->font;
+      int len = 27+gdk_string_measure( font, label->label );
+      if (len > max) max = len;
+      
+      node = node->Next();
+    }
+    
+    node = m_boxes.First();
+    while (node)
+    {
+      GtkWidget *button = GTK_WIDGET( node->Data() );
+    
+      gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, x, y );
+      x += max;
+      gtk_widget_set_usize( button, max, 20 );
+      
+      node = node->Next();
+    }
   }
 }
 
@@ -391,43 +465,20 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
   wxFAIL_MSG("wxRadioBox::SetNumberOfRowsOrCols not implemented.");
 }
 
-void wxRadioBox::SetFont( const wxFont &font )
-{
-  wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
-  wxControl::SetFont( font );
-   
-  wxNode *node = m_boxes.First();
-  while (node)
-  {
-    GtkButton *button = GTK_BUTTON( node->Data() );
-    
-    gtk_widget_set_style( button->child, 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
-    
-    node = node->Next();
-  }
-}
-
-void wxRadioBox::SetBackgroundColour( const wxColour &colour )
+void wxRadioBox::ApplyWidgetStyle()
 {
-  return;
-
-  wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
-  
-  wxControl::SetBackgroundColour( colour );
+  SetWidgetStyle();
   
-  if (!m_backgroundColour.Ok()) return;
+  gtk_widget_set_style( m_widget, m_widgetStyle );
   
   wxNode *node = m_boxes.First();
   while (node)
   {
-    GtkWidget *button = GTK_WIDGET( node->Data() );
+    GtkWidget *widget = GTK_WIDGET( node->Data() );
+    gtk_widget_set_style( widget, m_widgetStyle );
     
-    gtk_widget_set_style( button, 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
+    GtkButton *button = GTK_BUTTON( node->Data() );
+    gtk_widget_set_style( button->child, m_widgetStyle );
     
     node = node->Next();
   }