X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8933fbc62e616831f1708b063f6a369221b1934c..fa5f4858288ebd8e031b9d3e89d4ec89e8f212e7:/src/gtk/combobox.cpp diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp index fb9623a2ba..3abab97145 100644 --- a/src/gtk/combobox.cpp +++ b/src/gtk/combobox.cpp @@ -172,7 +172,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value, g_signal_connect_after (m_widget, "changed", G_CALLBACK (gtkcombobox_changed_callback), this); - if ( gtk_check_version(2,10,0) ) + if ( !gtk_check_version(2,10,0) ) { g_signal_connect (m_widget, "notify::popup-shown", G_CALLBACK (gtkcombobox_popupshown_callback), this); @@ -251,10 +251,8 @@ GtkWidget* wxComboBox::GetConnectWidget() return GTK_WIDGET( GetEntry() ); } -GdkWindow *wxComboBox::GTKGetWindow(wxArrayGdkWindows& windows) const +GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const { - wxUnusedVar(windows); - return GetEntry()->text_area; } @@ -339,4 +337,13 @@ void wxComboBox::OnUpdateSelectAll(wxUpdateUIEvent& event) event.Enable(!wxTextEntry::IsEmpty()); } +void wxComboBox::Popup() +{ + gtk_combo_box_popup( GTK_COMBO_BOX(m_widget) ); +} + +void wxComboBox::Dismiss() +{ + gtk_combo_box_popdown( GTK_COMBO_BOX(m_widget) ); +} #endif // wxUSE_COMBOBOX