GDI double-deletion fix, wxBitmap depth bug

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

diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp
index 5e839941947619a60055c3fa36e5d4ce34a2c5a7..e1e66d05c64824699bc23ac241e0df9111a30604 100644 (file)
--- a/src/gtk/radiobox.cpp
+++ b/src/gtk/radiobox.cpp
@@ -18,20 +18,36 @@
 #include "wx/frame.h"
 #include "wx/gtk/win_gtk.h"
 
 #include "wx/frame.h"
 #include "wx/gtk/win_gtk.h"
 

+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+

 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxRadioBox
 //-----------------------------------------------------------------------------
 

-void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), gpointer data )
+static void gtk_radiobutton_clicked_callback( GtkWidget *WXUNUSED(widget), wxRadioBox *rb )

 {
 {

-  wxRadioBox *rb = (wxRadioBox*)data;
+  if (!rb->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
+  if (rb->m_alreadySent)
+  {
+    rb->m_alreadySent = FALSE;
+    return;
+  }
+
+  rb->m_alreadySent = TRUE;
+  

   wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
   event.SetInt( rb->GetSelection() );
   wxString tmp( rb->GetStringSelection() );
   event.SetString( WXSTRINGCAST(tmp) );
   event.SetEventObject( rb );
   wxCommandEvent event( wxEVT_COMMAND_RADIOBOX_SELECTED, rb->GetId() );
   event.SetInt( rb->GetSelection() );
   wxString tmp( rb->GetStringSelection() );
   event.SetString( WXSTRINGCAST(tmp) );
   event.SetEventObject( rb );

-  rb->ProcessEvent(event);
-};
+  rb->GetEventHandler()->ProcessEvent(event);
+}

 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 


@@ -39,27 +55,20 @@ IMPLEMENT_DYNAMIC_CLASS(wxRadioBox,wxControl)
 
 wxRadioBox::wxRadioBox(void)
 {
 
 wxRadioBox::wxRadioBox(void)
 {

-};
+}

 
 

-wxRadioBox::wxRadioBox( wxWindow *parent, const wxWindowID id, const wxString& title,
-      const wxPoint &pos, const wxSize &size, 
-      const int n, const wxString choices[],
-      const int majorDim, const long style,
-      const wxString &name )
-{
-  Create( parent, id, title, pos, size, n, choices, majorDim, style, name );
-};
-
-bool wxRadioBox::Create( wxWindow *parent, const wxWindowID id, const wxString& title,
-      const wxPoint &pos, const wxSize &size, 
-      const int n, const wxString choices[],
-      const int WXUNUSED(majorDim), const long style,
-      const wxString &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 wxValidator& validator, const wxString &name )

 {
 {

+  m_alreadySent = FALSE;

   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
 
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
 

+  SetValidator( validator );
+

   m_widget = gtk_frame_new( title );
   
   int x = m_x+5;
   m_widget = gtk_frame_new( title );
   
   int x = m_x+5;


@@ -74,6 +83,7 @@ bool wxRadioBox::Create( wxWindow *parent, const wxWindowID id, const wxString&
     for (int i = 0; i < n; i++)
     {
       if (i) radio_button_group = gtk_radio_button_group( GTK_RADIO_BUTTON(m_radio) );
     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] ) );
       
       if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );
       m_radio = GTK_RADIO_BUTTON( gtk_radio_button_new_with_label( radio_button_group, choices[i] ) );
       
       if (!i) gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON(m_radio), TRUE );


@@ -93,8 +103,8 @@ bool wxRadioBox::Create( wxWindow *parent, const wxWindowID id, const wxString&
       y += 20;
       height += 20;
       
       y += 20;
       height += 20;
       

-    };
-  };
+    }
+  }

 
   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = maxLen+10;
 
   wxSize newSize = size;
   if (newSize.x == -1) newSize.x = maxLen+10;


@@ -106,9 +116,9 @@ bool wxRadioBox::Create( wxWindow *parent, const wxWindowID id, const wxString&
   Show( TRUE );
     
   return TRUE;
   Show( TRUE );
     
   return TRUE;

-};
+}

 
 

-bool wxRadioBox::Show( const bool show )
+bool wxRadioBox::Show( bool show )

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


@@ -118,72 +128,110 @@ bool wxRadioBox::Show( const bool show )
     GtkWidget *w = GTK_WIDGET( item->data );
     if (show) gtk_widget_show( w ); else gtk_widget_hide( w );
     item = item->next;
     GtkWidget *w = GTK_WIDGET( item->data );
     if (show) gtk_widget_show( w ); else gtk_widget_hide( w );
     item = item->next;

-  };
+  }

 
   return TRUE;
 
   return TRUE;

-};
+}

 
 

-int wxRadioBox::FindString( const wxString& WXUNUSED(s) ) const
+int wxRadioBox::FindString( const wxString &s ) const

 {
 {

-  return 0;
-};
+  GSList *item = gtk_radio_button_group( m_radio );
+  
+  int count = g_slist_length(item)-1;
+  
+  while (item)
+  {
+    GtkButton *b = GTK_BUTTON( item->data );
+    GtkLabel *l = GTK_LABEL( b->child );
+    if (s == l->label) return count;
+    count--;
+    item = item->next;
+  }
+
+  return -1;
+}

 
 

-void wxRadioBox::SetSelection( const int WXUNUSED(n) )
+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;
+  
+  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 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 );
   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;
     count++;
     item = item->next;

-  };
-  return -1;
-};
+  }
+  
+  return found != -1 ? count-found-1 : -1;
+}

 
 

-wxString wxRadioBox::GetString( const int WXUNUSED(n) ) const
+wxString wxRadioBox::GetString( int n ) const

 {
 {

-  return "";
-};
+  GSList *item = gtk_radio_button_group( m_radio );
+  
+  item = g_slist_nth( item, g_slist_length(item)-n-1 );
+  if (!item) return "";
+  
+  GtkToggleButton *button = GTK_TOGGLE_BUTTON( item->data );
+  
+  GtkLabel *label = GTK_LABEL( GTK_BUTTON(button)->child );
+  
+  return wxString( label->label );
+}

 
 wxString wxRadioBox::GetLabel(void) const
 {
   return wxControl::GetLabel();
 
 wxString wxRadioBox::GetLabel(void) const
 {
   return wxControl::GetLabel();

-};
+}

 
 void wxRadioBox::SetLabel( const wxString& WXUNUSED(label) )
 {
 
 void wxRadioBox::SetLabel( const wxString& WXUNUSED(label) )
 {

-};
+  wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+}

 
 

-void wxRadioBox::SetLabel( const int WXUNUSED(item), const wxString& WXUNUSED(label) )
+void wxRadioBox::SetLabel( int WXUNUSED(item), const wxString& WXUNUSED(label) )

 {
 {

-};
+  wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+}

 
 

-void wxRadioBox::SetLabel( const int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )
+void wxRadioBox::SetLabel( int WXUNUSED(item), wxBitmap *WXUNUSED(bitmap) )

 {
 {

-};
+  wxFAIL_MSG("wxRadioBox::SetLabel not implemented.");
+}

 
 

-wxString wxRadioBox::GetLabel( const int WXUNUSED(item) ) const
+wxString wxRadioBox::GetLabel( int WXUNUSED(item) ) const

 {
 {

+  wxFAIL_MSG("wxRadioBox::GetLabel not implemented.");

   return "";
   return "";

-};
+}

 
 

-void wxRadioBox::Enable( const bool WXUNUSED(enable) )
+void wxRadioBox::Enable( bool WXUNUSED(enable) )

 {
 {

-};
+  wxFAIL_MSG("wxRadioBox::Enable not implemented.");
+}

 
 

-void wxRadioBox::Enable( const int WXUNUSED(item), const bool WXUNUSED(enable) )
+void wxRadioBox::Enable( int WXUNUSED(item), bool WXUNUSED(enable) )

 {
 {

-};
+  wxFAIL_MSG("wxRadioBox::Enable not implemented.");
+}

 
 

-void wxRadioBox::Show( const int WXUNUSED(item), const bool WXUNUSED(show) )
+void wxRadioBox::Show( int WXUNUSED(item), bool WXUNUSED(show) )

 {
 {

-};
+  wxFAIL_MSG("wxRadioBox::Show not implemented.");
+}

 
 wxString wxRadioBox::GetStringSelection(void) const
 {
 
 wxString wxRadioBox::GetStringSelection(void) const
 {


@@ -195,16 +243,19 @@ wxString wxRadioBox::GetStringSelection(void) const
     {
       GtkLabel *label = GTK_LABEL( button->child );
       return label->label;
     {
       GtkLabel *label = GTK_LABEL( button->child );
       return label->label;

-    };
+    }

     item = item->next;
     item = item->next;

-  };
+  }

   return "";
   return "";

-};
+}

 
 

-bool wxRadioBox::SetStringSelection( const wxString& WXUNUSED(s) )
+bool wxRadioBox::SetStringSelection( const wxString&s )

 {
 {

+  int res = FindString( s );
+  if (res == -1) return FALSE;
+  SetSelection( res );

   return TRUE;
   return TRUE;

-};
+}

 
 int wxRadioBox::Number(void) const
 {
 
 int wxRadioBox::Number(void) const
 {


@@ -214,16 +265,17 @@ int wxRadioBox::Number(void) const
   {
     item = item->next;
     count++;
   {
     item = item->next;
     count++;

-  };
+  }

   return count;
   return count;

-};
+}

 
 int wxRadioBox::GetNumberOfRowsOrCols(void) const
 {
   return 1;
 
 int wxRadioBox::GetNumberOfRowsOrCols(void) const
 {
   return 1;

-};
+}

 
 

-void wxRadioBox::SetNumberOfRowsOrCols( const int WXUNUSED(n) )
+void wxRadioBox::SetNumberOfRowsOrCols( int WXUNUSED(n) )

 {
 {

-};
+  wxFAIL_MSG("wxRadioBox::SetNumberOfRowsOrCols not implemented.");
+}