diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index f339c494e4..97cbfb477a 100644
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -122,7 +122,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     GtkCombo *combo = GTK_COMBO(m_widget);
     
     // Disable GTK's broken events ...
-    gtk_signal_disconnect( combo->entry, GTK_COMBO(m_widget)->entry_change_id );
+    gtk_signal_disconnect( GTK_OBJECT(combo->entry), combo->entry_change_id );
     // ... and add surogate handler.
     combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed",
 			      (GtkSignalFunc) gtk_dummy_callback, combo);
@@ -366,9 +366,7 @@ void wxComboBox::Delete( int n )
 
     node = m_clientDataList.Nth( n );
     if (node)
-    {
         m_clientDataList.DeleteNode( node );
-    }
     
     EnableEvents();
 }
diff --git a/src/gtk1/combobox.cpp b/src/gtk1/combobox.cpp
index f339c494e4..97cbfb477a 100644
--- a/src/gtk1/combobox.cpp
+++ b/src/gtk1/combobox.cpp
@@ -122,7 +122,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     GtkCombo *combo = GTK_COMBO(m_widget);
     
     // Disable GTK's broken events ...
-    gtk_signal_disconnect( combo->entry, GTK_COMBO(m_widget)->entry_change_id );
+    gtk_signal_disconnect( GTK_OBJECT(combo->entry), combo->entry_change_id );
     // ... and add surogate handler.
     combo->entry_change_id = gtk_signal_connect (GTK_OBJECT (combo->entry), "changed",
 			      (GtkSignalFunc) gtk_dummy_callback, combo);
@@ -366,9 +366,7 @@ void wxComboBox::Delete( int n )
 
     node = m_clientDataList.Nth( n );
     if (node)
-    {
         m_clientDataList.DeleteNode( node );
-    }
     
     EnableEvents();
 }