fixes to handling of focus changes for toplevel windows

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 80c4c23856bf5b6e885e0d61386aa46538e1b8a3..56acb506408c11545cf31dde107ab14020a948ab 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -45,8 +45,6 @@ extern "C" {
 static void
 gtkcombo_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (combo->m_ignoreNextUpdate)
     {
         combo->m_ignoreNextUpdate = false;
@@ -118,8 +116,6 @@ extern "C" {
 static void
 gtkcombo_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!combo->m_hasVMT) return;
 
     if (g_blockEventsOnDrag) return;
@@ -136,12 +132,12 @@ gtkcombo_combo_select_child_callback( GtkList *WXUNUSED(list), GtkWidget *WXUNUS
     // Quickly set the value of the combo box
     // as GTK+ does that only AFTER the event
     // is sent.
-    g_signal_handlers_disconnect_by_func (GTK_COMBO (combo->GetHandle())->entry,
-                                          (gpointer) gtkcombo_text_changed_callback,
-                                          combo);
+    GtkWidget* entry = GTK_COMBO(combo->GetHandle())->entry;
+    g_signal_handlers_block_by_func(
+        entry, (gpointer)gtkcombo_text_changed_callback, combo);
     combo->SetValue( combo->GetStringSelection() );
-    g_signal_connect_after (GTK_COMBO (combo->GetHandle())->entry, "changed",
-                            G_CALLBACK (gtkcombo_text_changed_callback), combo);
+    g_signal_handlers_unblock_by_func(
+        entry, (gpointer)gtkcombo_text_changed_callback, combo);
 
     // throw a SELECTED event only if the combobox popup is hidden (wxID_NONE)
     // because when combobox popup is shown, gtkcombo_combo_select_child_callback is
@@ -171,8 +167,6 @@ extern "C" {
 static void
 gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!combo->m_hasVMT) return;
 
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
@@ -186,8 +180,6 @@ extern "C" {
 static void
 gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
-
     if (!combo->m_hasVMT) return;
 
     if (combo->GetSelection() == -1)
@@ -201,29 +193,6 @@ gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 }
 }
 
-extern "C" {
-static
-void gtkcombobox_size_callback( GtkWidget *widget,
-                               GtkAllocation *alloc,
-                               wxWindow *win )
-{
-    if (win->GetParent()->m_wxwindow) return;
-    
-    // we are probably a wxToolBar
-    
-    wxSize size = win->GetEffectiveMinSize();
-    if (size.y != alloc->height)
-    {
-        GtkAllocation alloc2;
-        alloc2.x = alloc->x;
-        alloc2.y = (alloc->height - size.y + 3) / 2;
-        alloc2.width = alloc->width;
-        alloc2.height = size.y;
-        gtk_widget_size_allocate( widget, &alloc2 );
-    }
-}
-}
-
 #endif
 
 //-----------------------------------------------------------------------------
@@ -273,8 +242,6 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          const wxString& name )
 {
     m_ignoreNextUpdate = false;
-    m_needParent = true;
-    m_acceptsFocus = true;
     m_prevSelection = 0;
 
     if (!PreCreation( parent, pos, size ) ||
@@ -372,10 +339,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
         g_signal_connect_after (m_widget, "changed",
                             G_CALLBACK (gtkcombobox_changed_callback), this);
-                            
-        // Connect to in order to correct size_allocate events
-        g_signal_connect_after (m_widget, "size_allocate",
-                          G_CALLBACK (gtkcombobox_size_callback), this);
+
     }
     else
 #endif
@@ -461,9 +425,9 @@ int wxComboBox::DoAppend( const wxString &item )
         GtkRcStyle *style = CreateWidgetStyle();
         if (style)
         {
-            gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
+            gtk_widget_modify_style(list_item, style);
             GtkBin *bin = GTK_BIN( list_item );
-            GtkWidget *label = GTK_WIDGET( bin->child );
+            GtkWidget *label = bin->child;
             gtk_widget_modify_style( label, style );
             gtk_rc_style_unref( style );
         }
@@ -982,7 +946,10 @@ void wxComboBox::SetValue( const wxString& value )
 
     wxString tmp;
     if (!value.IsNull()) tmp = value;
+    
+    DisableEvents();
     gtk_entry_set_text( entry, wxGTK_CONV( tmp ) );
+    EnableEvents();
 
     InvalidateBestSize();
 }
@@ -1150,12 +1117,14 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
     if (value.IsNull()) return;
     gint pos = (gint)to;
 
-#if wxUSE_UNICODE
-    wxCharBuffer buffer = wxConvUTF8.cWX2MB( value );
-    gtk_editable_insert_text( GTK_EDITABLE(entry), (const char*) buffer, strlen( (const char*) buffer ), &pos );
+    // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
+#if wxUSE_UNICODE_UTF8
+    const char *utf8 = value.utf8_str();
 #else
-    gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.length(), &pos );
+    wxCharBuffer buffer(value.utf8_str());
+    const char *utf8 = buffer;
 #endif
+    gtk_editable_insert_text(GTK_EDITABLE(entry), utf8, strlen(utf8), &pos);
 }
 
 void wxComboBox::SetSelection( long from, long to )
@@ -1245,20 +1214,20 @@ void wxComboBox::DisableEvents()
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
-        g_signal_handlers_disconnect_by_func (GTK_BIN(m_widget)->child,
-                (gpointer)gtkcombobox_text_changed_callback, this);
+        g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
+            (gpointer)gtkcombobox_text_changed_callback, this);
 
-        g_signal_handlers_disconnect_by_func (m_widget,
-                (gpointer)gtkcombobox_changed_callback, this);
+        g_signal_handlers_block_by_func(m_widget,
+            (gpointer)gtkcombobox_changed_callback, this);
     }
     else
 #endif
     {
-        g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->list,
-                (gpointer) gtkcombo_combo_select_child_callback, this);
+        g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->list,
+            (gpointer) gtkcombo_combo_select_child_callback, this);
 
-        g_signal_handlers_disconnect_by_func (GTK_COMBO(m_widget)->entry,
-                (gpointer) gtkcombo_text_changed_callback, this);
+        g_signal_handlers_block_by_func(GTK_COMBO(m_widget)->entry,
+            (gpointer) gtkcombo_text_changed_callback, this);
     }
 }
 
@@ -1267,21 +1236,20 @@ void wxComboBox::EnableEvents()
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
-        g_signal_connect_after (GTK_BIN(m_widget)->child, "changed",
-                            G_CALLBACK (gtkcombobox_text_changed_callback), this);
+        g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
+            (gpointer)gtkcombobox_text_changed_callback, this);
 
-        g_signal_connect_after (m_widget, "changed",
-                            G_CALLBACK (gtkcombobox_changed_callback), this);
+        g_signal_handlers_unblock_by_func(m_widget,
+            (gpointer)gtkcombobox_changed_callback, this);
     }
     else
 #endif
     {
-        g_signal_connect_after (GTK_COMBO(m_widget)->list, "select-child",
-                            G_CALLBACK (gtkcombo_combo_select_child_callback),
-                            this);
-        g_signal_connect_after (GTK_COMBO(m_widget)->entry, "changed",
-                            G_CALLBACK (gtkcombo_text_changed_callback),
-                            this );
+        g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->list,
+            (gpointer) gtkcombo_combo_select_child_callback, this);
+
+        g_signal_handlers_unblock_by_func(GTK_COMBO(m_widget)->entry,
+            (gpointer) gtkcombo_text_changed_callback, this);
     }
 }