X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f659fd6b10a8a5c899eaa99adc76a55322b33fd..0ab4b99cdfacdecc7356348aa1af2cebdc358e41:/src/gtk1/radiobox.cpp

diff --git a/src/gtk1/radiobox.cpp b/src/gtk1/radiobox.cpp
index 31e9a8e856..66a3e6f593 100644
--- a/src/gtk1/radiobox.cpp
+++ b/src/gtk1/radiobox.cpp
@@ -25,7 +25,7 @@
 extern bool   g_blockEventsOnDrag;
 
 //-----------------------------------------------------------------------------
-// wxRadioBox
+// "clicked"
 //-----------------------------------------------------------------------------
 
 static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
@@ -49,6 +49,8 @@ static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRad
   rb->GetEventHandler()->ProcessEvent(event);
 }
 
+//-----------------------------------------------------------------------------
+// wxRadioBox
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
@@ -80,6 +82,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
   int maxLen = 0;
   int height = 20;
   
+  GtkRadioButton *m_radio = (GtkRadioButton*) NULL;
+  
 //  if (((m_style & wxRA_VERTICAL) == wxRA_VERTICAL) && (n > 0))
   if (n > 0)
   {
@@ -90,6 +94,10 @@ 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_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", 
@@ -109,7 +117,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
       
     }
   }
-
+  
   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = maxLen+10;
   if (newSize.y == -1) newSize.y = height;
@@ -117,26 +125,44 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
   
   PostCreation();
   
+  SetLabel( title );
+  
   Show( TRUE );
     
   return TRUE;
 }
 
-void wxRadioBox::OnSize( wxSizeEvent &WXUNUSED(event) )
+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 );
+  
   int x = m_x+5;
   int y = m_y+15;
   
-  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() );
     
     gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, x, y );
-    
     y += 20;
     
-    item = item->next;
+    int w = m_width-10;
+    if (w < 15) w = 15;
+    gtk_widget_set_usize( button, w, 20 );
+      
+    node = node->Next();
   }
 }
 
@@ -144,12 +170,14 @@ bool wxRadioBox::Show( bool 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;
@@ -157,76 +185,98 @@ bool wxRadioBox::Show( bool show )
 
 int wxRadioBox::FindString( const wxString &s ) const
 {
-  GSList *item = gtk_radio_button_group( m_radio );
-  
-  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 )
 {
-  GSList *item = gtk_radio_button_group( m_radio );
-  item = g_slist_nth( item, g_slist_length(item)-n-1 );
-  if (!item) return;
+  wxNode *node = m_boxes.Nth( n );
+  
+  if (!node)
+  {
+    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
 {
-  GSList *item = gtk_radio_button_group( m_radio );
   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++;
-    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
 {
-  GSList *item = gtk_radio_button_group( m_radio );
+  wxNode *node = m_boxes.Nth( n );
   
-  item = g_slist_nth( item, g_slist_length(item)-n-1 );
-  if (!item) return "";
-  
-  GtkToggleButton *button = GTK_TOGGLE_BUTTON( item->data );
+  if (!node)
+  {
+    wxFAIL_MSG( "wxRadioBox wrong index" );
+    return "";
+  }
   
-  GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
+  GtkButton *button = GTK_BUTTON( node->Data() );
+  GtkLabel *label = GTK_LABEL( button->child );
   
   return wxString( label->label );
 }
 
-wxString wxRadioBox::GetLabel(void) const
+wxString wxRadioBox::GetLabel( int item ) const
 {
-  return wxControl::GetLabel();
+  return GetString( item );
 }
 
-void wxRadioBox::SetLabel( const wxString& WXUNUSED(label) )
+void wxRadioBox::SetLabel( const wxString& label )
 {
-  wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+  wxControl::SetLabel( label );
+  GtkFrame *frame = GTK_FRAME( m_widget );
+  gtk_frame_set_label( frame, wxControl::GetLabel() );
 }
 
-void wxRadioBox::SetLabel( int WXUNUSED(item), const wxString& WXUNUSED(label) )
+void wxRadioBox::SetLabel( int item, const wxString& label )
 {
-  wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+  wxNode *node = m_boxes.Nth( item );
+  
+  if (!node)
+  {
+    wxFAIL_MSG( "wxRadioBox wrong index" );
+    return;
+  }
+  
+  GtkButton *button = GTK_BUTTON( node->Data() );
+  GtkLabel *g_label = GTK_LABEL( button->child );
+  
+  gtk_label_set( g_label, label );
 }
 
 void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
@@ -234,40 +284,70 @@ void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
   wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
 }
 
-wxString wxRadioBox::GetLabel( int WXUNUSED(item) ) const
+void wxRadioBox::Enable( bool enable )
 {
-  wxFAIL_MSG("wxRadioBox::GetLabel not implemented.");
-  return "";
+  wxControl::Enable( enable );
+  
+  wxNode *node = m_boxes.First();
+  while (node)
+  {
+    GtkButton *button = GTK_BUTTON( node->Data() );
+    GtkWidget *label = button->child;
+    gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
+    gtk_widget_set_sensitive( label, enable );
+    node = node->Next();
+  }
 }
 
-void wxRadioBox::Enable( bool WXUNUSED(enable) )
+void wxRadioBox::Enable( int item, bool enable )
 {
-  wxFAIL_MSG("wxRadioBox::Enable not implemented.");
+  wxNode *node = m_boxes.Nth( item );
+  
+  if (!node)
+  {
+    wxFAIL_MSG( "wxRadioBox wrong index" );
+    return;
+  }
+  
+  GtkButton *button = GTK_BUTTON( node->Data() );
+  GtkWidget *label = button->child;
+  gtk_widget_set_sensitive( GTK_WIDGET(button), enable );
+  gtk_widget_set_sensitive( label, enable );
 }
 
-void wxRadioBox::Enable( int WXUNUSED(item), bool WXUNUSED(enable) )
+void wxRadioBox::Show( int item, bool show )
 {
-  wxFAIL_MSG("wxRadioBox::Enable not implemented.");
-}
+  wxNode *node = m_boxes.Nth( item );
+  
+  if (!node)
+  {
+    wxFAIL_MSG( "wxRadioBox wrong index" );
+    return;
+  }
+  
+  GtkWidget *button = GTK_WIDGET( node->Data() );
 
-void wxRadioBox::Show( int WXUNUSED(item), bool WXUNUSED(show) )
-{
-  wxFAIL_MSG("wxRadioBox::Show not implemented.");
+  if (show)
+    gtk_widget_show( button );
+  else
+    gtk_widget_hide( button );
 }
 
 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;
     }
-    item = item->next;
+    node = node->Next();
   }
+  
+  wxFAIL_MSG( "wxRadioBox none selected" );
   return "";
 }
 
@@ -281,14 +361,7 @@ bool wxRadioBox::SetStringSelection( const wxString&s )
 
 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
@@ -305,15 +378,32 @@ void wxRadioBox::SetFont( const wxFont &font )
 {
   wxWindow::SetFont( font );
    
-  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() );
     
     gtk_widget_set_style( button->child, 
       gtk_style_ref(
         gtk_widget_get_style( m_widget ) ) ); 
     
-    item = item->next;
+    node = node->Next();
   }
 }
+
+bool wxRadioBox::IsOwnGtkWindow( GdkWindow *window )
+{
+  if (window == m_widget->window) return TRUE;
+  
+  wxNode *node = m_boxes.First();
+  while (node)
+  {
+    GtkWidget *button = GTK_WIDGET( node->Data() );
+    
+    if (window == button->window) return TRUE;
+    
+    node = node->Next();
+  }
+  
+  return FALSE;
+}