Fixed various wxMSW compile problems that came down the telephone line...

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

diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index 2e892f7e3ab0c2bf7d854d018619add2f8a5f652..1ac91ffdd4338d25e12b5de5dba87f7a4783e70c 100644 (file)
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -29,6 +29,9 @@ extern bool   g_blockEventsOnDrag;
 
 static void gtk_combo_clicked_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
+  if (!combo->HasVMT()) return;
+  if (g_blockEventsOnDrag) return;
+  
   if (combo->m_alreadySent)
   {
     combo->m_alreadySent = FALSE;
@@ -90,14 +93,14 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, const wxString& value,
     GtkWidget *list_item;
     list_item = gtk_list_item_new_with_label( choices[i] ); 
   
-    gtk_signal_connect( GTK_OBJECT(list_item), "select", 
-      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
-  
     gtk_container_add( GTK_CONTAINER(list), list_item );
     
     m_clientData.Append( (wxObject*)NULL );
     
     gtk_widget_show( list_item );
+    
+    gtk_signal_connect( GTK_OBJECT(list_item), "select", 
+      GTK_SIGNAL_FUNC(gtk_combo_clicked_callback), (gpointer)this );
   };
   
   PostCreation();