X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47908e25f992135fbc8c9573870784c62654e9e9..406291e530b14c6a2f4537ce59647d88b3ccde7c:/src/gtk/choice.cpp

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index 180bbb17d3..033c4201bd 100644
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -15,19 +15,28 @@
 
 #include "wx/choice.h"
 
+//-----------------------------------------------------------------------------
+// data
+//-----------------------------------------------------------------------------
+
+extern bool   g_blockEventsOnDrag;
+
 //-----------------------------------------------------------------------------
 // wxChoice
 //-----------------------------------------------------------------------------
 
-void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
+static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice )
 {
+  if (!choice->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
   wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, choice->GetId() );
   event.SetInt( choice->GetSelection() );
   wxString tmp( choice->GetStringSelection() );
   event.SetString( WXSTRINGCAST(tmp) );
   event.SetEventObject(choice);
   choice->GetEventHandler()->ProcessEvent(event);
-};
+}
 
 //-----------------------------------------------------------------------------
 
@@ -35,25 +44,19 @@ IMPLEMENT_DYNAMIC_CLASS(wxChoice,wxControl)
 
 wxChoice::wxChoice(void)
 {
-};
-
-wxChoice::wxChoice( wxWindow *parent, wxWindowID id,
-      const wxPoint &pos, const wxSize &size,
-      int n, const wxString choices[],
-      long style, const wxString &name )
-{
-  Create( parent, id, pos, size, n, choices, style, name );
-};
+}
 
 bool wxChoice::Create( wxWindow *parent, wxWindowID id,
       const wxPoint &pos, const wxSize &size,
       int n, const wxString choices[],
-      long style, const wxString &name )
+      long style, const wxValidator& validator, const wxString &name )
 {
   m_needParent = TRUE;
   
   PreCreation( parent, id, pos, size, style, name );
   
+  SetValidator( validator );
+
   m_widget = gtk_option_menu_new();
   
   wxSize newSize = size;
@@ -72,7 +75,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
     gtk_menu_append( GTK_MENU(menu), item );
     gtk_widget_show( item );
-  };
+  }
   gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
   
   PostCreation();
@@ -80,7 +83,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
   Show( TRUE );
     
   return TRUE;
-};
+}
       
 void wxChoice::Append( const wxString &item )
 {
@@ -91,14 +94,14 @@ void wxChoice::Append( const wxString &item )
     GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
   gtk_menu_append( GTK_MENU(menu), menu_item );
   gtk_widget_show( menu_item );
-};
+}
  
 void wxChoice::Clear(void)
 {
   gtk_option_menu_remove_menu( GTK_OPTION_MENU(m_widget) );
   GtkWidget *menu = gtk_menu_new();
   gtk_option_menu_set_menu( GTK_OPTION_MENU(m_widget), menu );
-};
+}
 
 int wxChoice::FindString( const wxString &string ) const
 {
@@ -113,18 +116,24 @@ int wxChoice::FindString( const wxString &string ) const
     GtkBin *bin = GTK_BIN( child->data );
     GtkLabel *label = NULL;
     if (bin->child) label = GTK_LABEL(bin->child);
+    
+    wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
+    
     if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
     if (string == label->label) return count;
     child = child->next;
     count++;
-  };
+  }
+  
+  wxFAIL_MSG( "wxChoice: string not found" );
+  
   return -1;
-};
+}
 
 int wxChoice::GetColumns(void) const
 {
   return 1;
-};
+}
 
 int wxChoice::GetSelection(void)
 {
@@ -137,9 +146,12 @@ int wxChoice::GetSelection(void)
     if (!bin->child) return count;
     child = child->next;
     count++;
-  };
+  }
+  
+  wxFAIL_MSG( "wxChoice: no selection" );
+  
   return -1;
-};
+}
 
 wxString wxChoice::GetString( int n ) const
 {
@@ -153,37 +165,46 @@ wxString wxChoice::GetString( int n ) const
     {
       GtkLabel *label = NULL;
       if (bin->child) label = GTK_LABEL(bin->child);
+      
+      wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
+      
       if (!label) label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
       return label->label;
-    };
+    }
     child = child->next;
     count++;
-  };
+  }
+  
+  wxFAIL_MSG( "wxChoice: string not found" );
+  
   return "";
-};
+}
 
 wxString wxChoice::GetStringSelection(void) const
 {
   GtkLabel *label = GTK_LABEL( GTK_BUTTON(m_widget)->child );
+  
+  wxASSERT_MSG( label != NULL , "wxChoice: invalid label" );
+  
   return label->label;
-};
+}
 
 int wxChoice::Number(void) const
 {
-  GtkMenu *menu = GTK_MENU( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
+  GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
   int count = 0;
-  GList *child = menu->children;
+  GList *child = menu_shell->children;
   while (child)
   {
     count++;
     child = child->next;
-  };
+  }
   return count;
-};
+}
 
 void wxChoice::SetColumns( int WXUNUSED(n) )
 {
-};
+}
 
 void wxChoice::SetSelection( int n )
 {
@@ -191,11 +212,11 @@ void wxChoice::SetSelection( int n )
   gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
   
   gtk_choice_clicked_callback( NULL, this );
-};
+}
 
 void wxChoice::SetStringSelection( const wxString &string )
 {
   int n = FindString( string );
   if (n != -1) SetSelection( n );
-};
+}