Use font encoding

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 382b52a18eb8bd582d993c530c461fe87ceb039b..936f383894f0b5d74be07367d6bf19a8f75b2031 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -16,13 +16,11 @@
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"

+    #include "wx/settings.h"
+    #include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
+    #include "wx/arrstr.h"

 #endif
 
 #endif
 

-#include "wx/settings.h"
-#include "wx/arrstr.h"
-
-#include "wx/textctrl.h"    // for wxEVT_COMMAND_TEXT_UPDATED
-

 // We use GtkCombo which has been deprecated since GTK+ 2.3.0
 // in favour of GtkComboBox for <GTK2.4 runtime
 // We also use GtkList
 // We use GtkCombo which has been deprecated since GTK+ 2.3.0
 // in favour of GtkComboBox for <GTK2.4 runtime
 // We also use GtkList


@@ -192,6 +190,9 @@ gtkcombobox_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 
     if (!combo->m_hasVMT) return;
 
 
     if (!combo->m_hasVMT) return;
 

+    if (combo->GetSelection() == -1)
+        return;
+

     wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
     event.SetInt( combo->GetSelection() );
     event.SetString( combo->GetStringSelection() );
     wxCommandEvent event( wxEVT_COMMAND_COMBOBOX_SELECTED, combo->GetId() );
     event.SetInt( combo->GetSelection() );
     event.SetString( combo->GetStringSelection() );


@@ -377,7 +378,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 //        gtk_widget_set_size_request( m_widget, setsize.x, setsize.y );
     }
 
 //        gtk_widget_set_size_request( m_widget, setsize.x, setsize.y );
     }
 

-    SetBestSize(size); // need this too because this is a wxControlWithItems
+    SetInitialSize(size); // need this too because this is a wxControlWithItems

 
 
     return true;
 
 
     return true;


@@ -1327,21 +1328,23 @@ GtkWidget* wxComboBox::GetConnectWidget()
     return GTK_WIDGET( entry );
 }
 
     return GTK_WIDGET( entry );
 }
 

-bool wxComboBox::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const

 {
 {

-    GtkEntry *entry = NULL;

 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {

-        entry = GTK_ENTRY( GTK_BIN(m_widget)->child );
-        return (window == entry->text_area);
+        wxUnusedVar(windows);
+
+        return GTK_ENTRY(GTK_BIN(m_widget)->child)->text_area;

     }
     else
     }
     else

-#endif
+#endif // GTK+ 2.4

     {
     {

-        entry = GTK_ENTRY( GTK_COMBO(m_widget)->entry );
-        return ( (window == entry->text_area) ||
-                 (window == GTK_COMBO(m_widget)->button->window ) );
+        windows.push_back(GTK_ENTRY(GTK_COMBO(m_widget)->entry)->text_area);
+        windows.push_back(GTK_COMBO(m_widget)->button->window);
+
+        // indicate that we return multiple windows in the windows array
+        return NULL;

     }
 }
 
     }
 }