wxFrame size bug

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

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index ec26307409e22c4d89311c350befde294841c677..c1f3fcc165742d2fd1fceef5b56c96cd4e7fef4f 100644 (file)
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -2,9 +2,8 @@
 // Name:        radiobox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        radiobox.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -81,9 +80,11 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
   int y = m_y+15;
   int maxLen = 0;
   int height = 20;
   int y = m_y+15;
   int maxLen = 0;
   int height = 20;

+  int width = 0;

   
   

-//  if (((m_style & wxRA_VERTICAL) == wxRA_VERTICAL) && (n > 0))
-  if (n > 0)
+  GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
+  
+  if (m_windowStyle & wxRA_VERTICAL)

   {
     GSList *radio_button_group = (GSList *) NULL;
     for (int i = 0; i < n; i++)
   {
     GSList *radio_button_group = (GSList *) NULL;
     for (int i = 0; i < n; i++)


@@ -92,6 +93,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
       
       m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i] ) );
       
       
       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 );
       ConnectWidget( GTK_WIDGET(m_radio) );
   
       if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );


@@ -101,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 );
       
        
       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;
       
       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 );
       
       if (size.x == -1) width = tmp;
       gtk_widget_set_usize( GTK_WIDGET(m_radio), width, 20 );
       


@@ -112,20 +115,77 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
       height += 20;
       
     }
       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;
   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 );
   
   if (newSize.y == -1) newSize.y = height;
   SetSize( newSize.x, newSize.y );
   

+  m_parent->AddChild( this );
+
+  (m_parent->m_insertCallback)( m_parent, this );
+  

   PostCreation();
   
   PostCreation();
   

+  SetLabel( title );
+  
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+

   Show( TRUE );
     
   return TRUE;
 }
 
   Show( TRUE );
     
   return TRUE;
 }
 

+wxRadioBox::~wxRadioBox(void)
+{
+  wxNode *node = m_boxes.First();
+  while (node)
+  {
+    GtkWidget *button = GTK_WIDGET( node->Data() );
+    gtk_widget_destroy( button );
+    node = node->Next();
+  }
+}
+

 void wxRadioBox::OnSize( wxSizeEvent &event )
 {
   wxControl::OnSize( event );
 void wxRadioBox::OnSize( wxSizeEvent &event )
 {
   wxControl::OnSize( event );


@@ -133,29 +193,68 @@ void wxRadioBox::OnSize( wxSizeEvent &event )
   int x = m_x+5;
   int y = m_y+15;
   
   int x = m_x+5;
   int y = m_y+15;
   

-  GSList *item = gtk_radio_button_group( m_radio );
-  while (item)
+  if (m_windowStyle & wxRA_VERTICAL)

   {
   {

-    GtkWidget *button = GTK_WIDGET( item->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 );
+      int w = m_width-10;
+      if (w < 15) w = 15;
+      gtk_widget_set_usize( button, w, 20 );
+      
+      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();
+    }

     
     

-    y += 20;
+    node = m_boxes.First();
+    while (node)
+    {
+      GtkWidget *button = GTK_WIDGET( node->Data() );

     
     

-    item = item->next;
+      gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, x, y );
+      x += max;
+      gtk_widget_set_usize( button, max, 20 );
+      
+      node = node->Next();
+    }

   }
 }
 
 bool wxRadioBox::Show( bool show )
 {
   }
 }
 
 bool wxRadioBox::Show( bool show )
 {

+  wxCHECK_MSG( m_widget != NULL, FALSE, "invalid radiobox" );
+  

   wxWindow::Show( show );
 
   wxWindow::Show( show );
 

-  GSList *item = gtk_radio_button_group( m_radio );
-  while (item)
+  wxNode *node = m_boxes.First();
+  while (node)

   {
   {

-    GtkWidget *w = GTK_WIDGET( item->data );
-    if (show) gtk_widget_show( w ); else gtk_widget_hide( w );
-    item = item->next;
+    GtkWidget *button = GTK_WIDGET( node->Data() );
+    
+    if (show) gtk_widget_show( button ); else gtk_widget_hide( button );
+    
+    node = node->Next();

   }
 
   return TRUE;
   }
 
   return TRUE;


@@ -163,67 +262,75 @@ bool wxRadioBox::Show( bool show )
 
 int wxRadioBox::FindString( const wxString &s ) const
 {
 
 int wxRadioBox::FindString( const wxString &s ) const
 {

-  GSList *item = gtk_radio_button_group( m_radio );
+  wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );

   
   

-  int count = g_slist_length(item)-1;
+  int count = 0;

   
   

-  while (item)
+  wxNode *node = m_boxes.First();
+  while (node)

   {
   {

-    GtkButton *b = GTK_BUTTON( item->data );
-    GtkLabel *l = GTK_LABEL( b->child );
-    if (s == l->label) return count;
-    count--;
-    item = item->next;
+    GtkButton *button = GTK_BUTTON( node->Data() );
+    
+    GtkLabel *label = GTK_LABEL( button->child );
+    if (s == label->label) return count;
+    count++;
+    
+    node = node->Next();

   }
   }

-
+  

   return -1;
 }
 
 void wxRadioBox::SetSelection( int n )
 {
   return -1;
 }
 
 void wxRadioBox::SetSelection( int n )
 {

-  GSList *item = gtk_radio_button_group( m_radio );
-  item = g_slist_nth( item, g_slist_length(item)-n-1 );
+  wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
+  
+  wxNode *node = m_boxes.Nth( n );

   
   

-  if (!item)
+  if (!node)

   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return;
   }
   
   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return;
   }
   

-  GtkToggleButton *button = GTK_TOGGLE_BUTTON( item->data );
+  GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );

   
   gtk_toggle_button_set_state( button, 1 );
 }
 
 int wxRadioBox::GetSelection(void) const
 {
   
   gtk_toggle_button_set_state( button, 1 );
 }
 
 int wxRadioBox::GetSelection(void) const
 {

-  GSList *item = gtk_radio_button_group( m_radio );
+  wxCHECK_MSG( m_widget != NULL, -1, "invalid radiobox" );
+  

   int count = 0;
   int count = 0;

-  int found = -1;
-  while (item)
+  
+  wxNode *node = m_boxes.First();
+  while (node)

   {
   {

-    GtkButton *button = GTK_BUTTON( item->data );
-    if (GTK_TOGGLE_BUTTON(button)->active) found = count;
+    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+    if (button->active) return count;

     count++;
     count++;

-    item = item->next;
+    node = node->Next();

   }
   
   }
   

-  return found != -1 ? count-found-1 : -1;
+  wxFAIL_MSG( "wxRadioBox none selected" );
+  
+  return -1;

 }
 
 wxString wxRadioBox::GetString( int n ) const
 {
 }
 
 wxString wxRadioBox::GetString( int n ) const
 {

-  GSList *item = gtk_radio_button_group( m_radio );
+  wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );

   
   

-  item = g_slist_nth( item, g_slist_length(item)-n-1 );
+  wxNode *node = m_boxes.Nth( n );

   
   

-  if (!item)
+  if (!node)

   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return "";
   }
   
   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return "";
   }
   

-  GtkButton *button = GTK_BUTTON( item->data );
+  GtkButton *button = GTK_BUTTON( node->Data() );

   GtkLabel *label = GTK_LABEL( button->child );
   
   return wxString( label->label );
   GtkLabel *label = GTK_LABEL( button->child );
   
   return wxString( label->label );


@@ -231,28 +338,33 @@ wxString wxRadioBox::GetString( int n ) const
 
 wxString wxRadioBox::GetLabel( int item ) const
 {
 
 wxString wxRadioBox::GetLabel( int item ) const
 {

+  wxCHECK_MSG( m_widget != NULL, "", "invalid radiobox" );
+  

   return GetString( item );
 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 {
   return GetString( item );
 }
 
 void wxRadioBox::SetLabel( const wxString& label )
 {

+  wxCHECK_RET( m_widget != NULL, "invalid radiobox" );
+  

   wxControl::SetLabel( label );
   wxControl::SetLabel( label );

-  GtkFrame *frame = GTK_FRAME( m_widget );
-  gtk_frame_set_label( frame, wxControl::GetLabel() );
+  
+  gtk_frame_set_label( GTK_FRAME(m_widget), wxControl::GetLabel() );

 }
 
 void wxRadioBox::SetLabel( int item, const wxString& label )
 {
 }
 
 void wxRadioBox::SetLabel( int item, const wxString& label )
 {

-  GSList *list = gtk_radio_button_group( m_radio );
-  list = g_slist_nth( list, g_slist_length(list)-item-1 );
+  wxCHECK_RET( m_widget != NULL, "invalid radiobox" );

   
   

-  if (!list)
+  wxNode *node = m_boxes.Nth( item );
+  
+  if (!node)

   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return;
   }
   
   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return;
   }
   

-  GtkButton *button = GTK_BUTTON( list->data );
+  GtkButton *button = GTK_BUTTON( node->Data() );

   GtkLabel *g_label = GTK_LABEL( button->child );
   
   gtk_label_set( g_label, label );
   GtkLabel *g_label = GTK_LABEL( button->child );
   
   gtk_label_set( g_label, label );


@@ -267,30 +379,28 @@ void wxRadioBox::Enable( bool enable )
 {
   wxControl::Enable( enable );
   
 {
   wxControl::Enable( enable );
   

-  GSList *item = gtk_radio_button_group( m_radio );
-  while (item)
+  wxNode *node = m_boxes.First();
+  while (node)

   {
   {

-    GtkButton *button = GTK_BUTTON( item->data );
+    GtkButton *button = GTK_BUTTON( node->Data() );

     GtkWidget *label = button->child;
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     gtk_widget_set_sensitive( label, enable );
     GtkWidget *label = button->child;
     gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
     gtk_widget_set_sensitive( label, enable );

-    item = item->next;
+    node = node->Next();

   }
 }
 
 void wxRadioBox::Enable( int item, bool enable )
 {
   }
 }
 
 void wxRadioBox::Enable( int item, bool enable )
 {

-  GSList *list = gtk_radio_button_group( m_radio );
-  list = g_slist_nth( list, g_slist_length(list)-item-1 );
+  wxNode *node = m_boxes.Nth( item );

   
   

-  if (!list)
+  if (!node)

   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return;
   }
   
   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return;
   }
   

-  GtkButton *button = GTK_BUTTON( list->data );
-  
+  GtkButton *button = GTK_BUTTON( node->Data() );

   GtkWidget *label = button->child;
   gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
   gtk_widget_set_sensitive( label, enable );
   GtkWidget *label = button->child;
   gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
   gtk_widget_set_sensitive( label, enable );


@@ -298,16 +408,15 @@ void wxRadioBox::Enable( int item, bool enable )
 
 void wxRadioBox::Show( int item, bool show )
 {
 
 void wxRadioBox::Show( int item, bool show )
 {

-  GSList *list = gtk_radio_button_group( m_radio );
-  list = g_slist_nth( list, g_slist_length(list)-item-1 );
+  wxNode *node = m_boxes.Nth( item );

   
   

-  if (!list)
+  if (!node)

   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return;
   }
   
   {
     wxFAIL_MSG( "wxRadioBox wrong index" );
     return;
   }
   

-  GtkWidget *button = GTK_WIDGET( list->data );
+  GtkWidget *button = GTK_WIDGET( node->Data() );

 
   if (show)
     gtk_widget_show( button );
 
   if (show)
     gtk_widget_show( button );


@@ -317,17 +426,19 @@ void wxRadioBox::Show( int item, bool show )
 
 wxString wxRadioBox::GetStringSelection(void) const
 {
 
 wxString wxRadioBox::GetStringSelection(void) const
 {

-  GSList *item = gtk_radio_button_group( m_radio );
-  while (item)
+  wxNode *node = m_boxes.First();
+  while (node)

   {
   {

-    GtkButton *button = GTK_BUTTON( item->data );
-    if (GTK_TOGGLE_BUTTON(button)->active)
+    GtkToggleButton *button = GTK_TOGGLE_BUTTON( node->Data() );
+    if (button->active)

     {
     {

-      GtkLabel *label = GTK_LABEL( button->child );
+      GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );

       return label->label;
     }
       return label->label;
     }

-    item = item->next;
+    node = node->Next();

   }
   }

+  
+  wxFAIL_MSG( "wxRadioBox none selected" );

   return "";
 }
 
   return "";
 }
 


@@ -341,14 +452,7 @@ bool wxRadioBox::SetStringSelection( const wxString&s )
 
 int wxRadioBox::Number(void) const
 {
 
 int wxRadioBox::Number(void) const
 {

-  int count = 0;
-  GSList *item = gtk_radio_button_group( m_radio );
-  while (item)
-  {
-    item = item->next;
-    count++;
-  }
-  return count;
+  return m_boxes.Number();

 }
 
 int wxRadioBox::GetNumberOfRowsOrCols(void) const
 }
 
 int wxRadioBox::GetNumberOfRowsOrCols(void) const


@@ -361,20 +465,22 @@ void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
   wxFAIL_MSG("wxRadioBox::SetNumberOfRowsOrCols not implemented.");
 }
 
   wxFAIL_MSG("wxRadioBox::SetNumberOfRowsOrCols not implemented.");
 }
 

-void wxRadioBox::SetFont( const wxFont &font )
+void wxRadioBox::ApplyWidgetStyle()

 {
 {

-  wxWindow::SetFont( font );
-   
-  GSList *item = gtk_radio_button_group( m_radio );
-  while (item)
+  SetWidgetStyle();
+  
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+  
+  wxNode *node = m_boxes.First();
+  while (node)

   {
   {

-    GtkButton *button = GTK_BUTTON( item->data );
+    GtkWidget *widget = GTK_WIDGET( node->Data() );
+    gtk_widget_set_style( widget, m_widgetStyle );

     
     

-    gtk_widget_set_style( button->child, 
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) ); 
+    GtkButton *button = GTK_BUTTON( node->Data() );
+    gtk_widget_set_style( button->child, m_widgetStyle );

     
     

-    item = item->next;
+    node = node->Next();

   }
 }
 
   }
 }
 


@@ -382,12 +488,14 @@ bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
 {
   if (window == m_widget->window) return TRUE;
   
 {
   if (window == m_widget->window) return TRUE;
   

-  GSList *item = gtk_radio_button_group( m_radio );
-  while (item)
+  wxNode *node = m_boxes.First();
+  while (node)

   {
   {

-    GtkWidget *button = GTK_WIDGET( item->data );
+    GtkWidget *button = GTK_WIDGET( node->Data() );
+    

     if (window == button->window) return TRUE;
     if (window == button->window) return TRUE;

-    item = item->next;
+    
+    node = node->Next();

   }
   
   return FALSE;
   }
   
   return FALSE;