Fix deprecating warning introduced in r72446.

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 045c6166ba478c697e6651a2bee894aafd52d198..35a5e0fec81560896a0fb2a21167b88f5a2f50d2 100644 (file)
--- a/src/gtk/combobox.cpp
+++ b/src/gtk/combobox.cpp
@@ -21,7 +21,9 @@
     #include "wx/arrstr.h"
 #endif
 
     #include "wx/arrstr.h"
 #endif
 

+#include <gtk/gtk.h>

 #include "wx/gtk/private.h"
 #include "wx/gtk/private.h"

+#include "wx/gtk/private/gtk2-compat.h"

 
 // ----------------------------------------------------------------------------
 // GTK callbacks
 
 // ----------------------------------------------------------------------------
 // GTK callbacks


@@ -58,6 +60,7 @@ gtkcombobox_popupshown_callback(GObject *WXUNUSED(gobject),
     event.SetEventObject( combo );
     combo->HandleWindowEvent( event );
 }
     event.SetEventObject( combo );
     combo->HandleWindowEvent( event );
 }

+

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -165,12 +168,16 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
         g_signal_connect_after (entry, "changed",
                                 G_CALLBACK (gtkcombobox_text_changed_callback), this);
 
         g_signal_connect_after (entry, "changed",
                                 G_CALLBACK (gtkcombobox_text_changed_callback), this);

+
+        GTKConnectClipboardSignals(GTK_WIDGET(entry));

     }
 
     g_signal_connect_after (m_widget, "changed",
                         G_CALLBACK (gtkcombobox_changed_callback), this);
 
     }
 
     g_signal_connect_after (m_widget, "changed",
                         G_CALLBACK (gtkcombobox_changed_callback), this);
 

+#ifndef __WXGTK3__

     if ( !gtk_check_version(2,10,0) )
     if ( !gtk_check_version(2,10,0) )

+#endif

     {
         g_signal_connect (m_widget, "notify::popup-shown",
                           G_CALLBACK (gtkcombobox_popupshown_callback), this);
     {
         g_signal_connect (m_widget, "notify::popup-shown",
                           G_CALLBACK (gtkcombobox_popupshown_callback), this);


@@ -183,7 +190,11 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
 void wxComboBox::GTKCreateComboBoxWidget()
 {
 
 void wxComboBox::GTKCreateComboBoxWidget()
 {

+#ifdef __WXGTK3__
+    m_widget = gtk_combo_box_text_new_with_entry();
+#else

     m_widget = gtk_combo_box_entry_new_text();
     m_widget = gtk_combo_box_entry_new_text();

+#endif

     g_object_ref(m_widget);
 
     m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));
     g_object_ref(m_widget);
 
     m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));


@@ -264,14 +275,23 @@ GtkWidget* wxComboBox::GetConnectWidget()
 
 GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const
 {
 
 GdkWindow* wxComboBox::GTKGetWindow(wxArrayGdkWindows& /* windows */) const
 {

+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    return NULL;
+#else

     return gtk_entry_get_text_window(GetEntry());
     return gtk_entry_get_text_window(GetEntry());

+#endif

 }
 
 // static
 wxVisualAttributes
 wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 }
 
 // static
 wxVisualAttributes
 wxComboBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

+#ifdef __WXGTK3__
+    return GetDefaultAttributesFromGTKWidget(gtk_combo_box_new_with_entry, true);
+#else

     return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true);
     return GetDefaultAttributesFromGTKWidget(gtk_combo_box_entry_new, true);

+#endif

 }
 
 void wxComboBox::SetValue(const wxString& value)
 }
 
 void wxComboBox::SetValue(const wxString& value)


@@ -282,6 +302,23 @@ void wxComboBox::SetValue(const wxString& value)
         wxTextEntry::SetValue(value);
 }
 
         wxTextEntry::SetValue(value);
 }
 

+void wxComboBox::SetString(unsigned int n, const wxString& text)
+{
+    wxChoice::SetString(n, text);
+
+    if ( static_cast<int>(n) == GetSelection() )
+    {
+        // We also need to update the currently shown text, for consistency
+        // with wxMSW and also because it makes sense as leaving the old string
+        // in the text but not in the list would be confusing to the user.
+        SetValue(text);
+
+        // And we need to keep the selection unchanged, modifying the item is
+        // not supposed to deselect it.
+        SetSelection(n);
+    }
+}
+

 // ----------------------------------------------------------------------------
 // standard event handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // standard event handling
 // ----------------------------------------------------------------------------