wxMenu doesn't anylonger call the callback if the

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index f4efa3d603df13af9d8e5b04ab71a9144f4a8a65..31e9a8e85687b23a87f0ba88c375f4154576886b 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -18,12 +18,21 @@
 #include "wx/frame.h"
 #include "wx/gtk/win_gtk.h"
 
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
-void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
+static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )
 {
+  if (!rb->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
   if (rb->m_alreadySent)
   {
     rb->m_alreadySent = FALSE;
@@ -38,36 +47,32 @@ void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *
   event.SetString( WXSTRINGCAST(tmp) );
   event.SetEventObject( rb );
   rb->GetEventHandler()->ProcessEvent(event);
-};
+}
 
 //-----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 
-wxRadioBox::wxRadioBox(void)
-{
-};
+BEGIN_EVENT_TABLE(wxRadioBox, wxControl)
+  EVT_SIZE(wxRadioBox::OnSize)
+END_EVENT_TABLE()
 
-wxRadioBox::wxRadioBox( wxWindow *parent, wxWindowID id, const wxString& title,
-      const wxPoint &pos, const wxSize &size,
-      int n, const wxString choices[],
-      int majorDim, long style,
-      const wxString &name )
+wxRadioBox::wxRadioBox(void)
 {
-  Create( parent, id, title, pos, size, n, choices, majorDim, style, name );
-};
+}
 
 bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
       const wxPoint &pos, const wxSize &size,
-      int n, const wxString choices[],
-      int WXUNUSED(majorDim), long style,
-      const wxString &name )
+      int n, const wxString choices[], int WXUNUSED(majorDim), 
+      long style, const wxValidator& validator, const wxString &name )
 {
   m_alreadySent = FALSE;
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
 
+  SetValidator( validator );
+
   m_widget = gtk_frame_new( title );
   
   int x = m_x+5;
@@ -78,7 +83,7 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
 //  if (((m_style & wxRA_VERTICAL) == wxRA_VERTICAL) && (n > 0))
   if (n > 0)
   {
-    GSList *radio_button_group = NULL;
+    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) );
@@ -102,8 +107,8 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
       y += 20;
       height += 20;
       
-    };
-  };
+    }
+  }
 
   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = maxLen+10;
@@ -115,7 +120,25 @@ bool wxRadioBox::Create( wxWindow *parent, wxWindowID id, const wxString& title,
   Show( TRUE );
     
   return TRUE;
-};
+}
+
+void wxRadioBox::OnSize( wxSizeEvent &WXUNUSED(event) )
+{
+  int x = m_x+5;
+  int y = m_y+15;
+  
+  GSList *item = gtk_radio_button_group( m_radio );
+  while (item)
+  {
+    GtkWidget *button = GTK_WIDGET( item->data );
+    
+    gtk_myfixed_move( GTK_MYFIXED(m_parent->m_wxwindow), button, x, y );
+    
+    y += 20;
+    
+    item = item->next;
+  }
+}
 
 bool wxRadioBox::Show( bool show )
 {
@@ -127,10 +150,10 @@ bool wxRadioBox::Show( bool show )
     GtkWidget *w = GTK_WIDGET( item->data );
     if (show) gtk_widget_show( w ); else gtk_widget_hide( w );
     item = item->next;
-  };
+  }
 
   return TRUE;
-};
+}
 
 int wxRadioBox::FindString( const wxString &s ) const
 {
@@ -145,10 +168,10 @@ int wxRadioBox::FindString( const wxString &s ) const
     if (s == l->label) return count;
     count--;
     item = item->next;
-  };
+  }
 
   return -1;
-};
+}
 
 void wxRadioBox::SetSelection( int n )
 {
@@ -159,21 +182,23 @@ void wxRadioBox::SetSelection( int n )
   GtkToggleButton *button = GTK_TOGGLE_BUTTON( item->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)
   {
     GtkButton *button = GTK_BUTTON( item->data );
-    if (GTK_TOGGLE_BUTTON(button)->active) return count;
+    if (GTK_TOGGLE_BUTTON(button)->active) found = count;
     count++;
     item = item->next;
-  };
-  return -1;
-};
+  }
+  
+  return found != -1 ? count-found-1 : -1;
+}
 
 wxString wxRadioBox::GetString( int n ) const
 {
@@ -187,41 +212,48 @@ wxString wxRadioBox::GetString( int n ) const
   GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
   
   return wxString( label->label );
-};
+}
 
 wxString wxRadioBox::GetLabel(void) const
 {
   return wxControl::GetLabel();
-};
+}
 
 void wxRadioBox::SetLabel( const wxString& WXUNUSED(label) )
 {
-};
+  wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+}
 
 void wxRadioBox::SetLabel( int WXUNUSED(item), const wxString& WXUNUSED(label) )
 {
-};
+  wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+}
 
 void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
 {
-};
+  wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+}
 
 wxString wxRadioBox::GetLabel( int WXUNUSED(item) ) const
 {
+  wxFAIL_MSG("wxRadioBox::GetLabel not implemented.");
   return "";
-};
+}
 
 void wxRadioBox::Enable( bool WXUNUSED(enable) )
 {
-};
+  wxFAIL_MSG("wxRadioBox::Enable not implemented.");
+}
 
 void wxRadioBox::Enable( int WXUNUSED(item), bool WXUNUSED(enable) )
 {
-};
+  wxFAIL_MSG("wxRadioBox::Enable not implemented.");
+}
 
 void wxRadioBox::Show( int WXUNUSED(item), bool WXUNUSED(show) )
 {
-};
+  wxFAIL_MSG("wxRadioBox::Show not implemented.");
+}
 
 wxString wxRadioBox::GetStringSelection(void) const
 {
@@ -233,11 +265,11 @@ wxString wxRadioBox::GetStringSelection(void) const
     {
       GtkLabel *label = GTK_LABEL( button->child );
       return label->label;
-    };
+    }
     item = item->next;
-  };
+  }
   return "";
-};
+}
 
 bool wxRadioBox::SetStringSelection( const wxString&s )
 {
@@ -245,7 +277,7 @@ bool wxRadioBox::SetStringSelection( const wxString&s )
   if (res == -1) return FALSE;
   SetSelection( res );
   return TRUE;
-};
+}
 
 int wxRadioBox::Number(void) const
 {
@@ -255,16 +287,33 @@ int wxRadioBox::Number(void) const
   {
     item = item->next;
     count++;
-  };
+  }
   return count;
-};
+}
 
 int wxRadioBox::GetNumberOfRowsOrCols(void) const
 {
   return 1;
-};
+}
 
 void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )
 {
-};
+  wxFAIL_MSG("wxRadioBox::SetNumberOfRowsOrCols not implemented.");
+}
 
+void wxRadioBox::SetFont( const wxFont &font )
+{
+  wxWindow::SetFont( font );
+   
+  GSList *item = gtk_radio_button_group( m_radio );
+  while (item)
+  {
+    GtkButton *button = GTK_BUTTON( item->data );
+    
+    gtk_widget_set_style( button->child, 
+      gtk_style_ref(
+        gtk_widget_get_style( m_widget ) ) ); 
+    
+    item = item->next;
+  }
+}