remove unused private member m_ordered from wxDataViewVirtualListModel

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 8ff0dc6b7976a735b44be44e6ff141e0cb67d60e..40c437fa2334029f7c43780406693d18fde347ea 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


@@ -31,8 +33,6 @@ extern "C" {
 static void
 gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {
 static void
 gtkcombobox_text_changed_callback( GtkWidget *WXUNUSED(widget), wxComboBox *combo )
 {

-    if (!combo->m_hasVMT) return;
-

     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
     event.SetString( combo->GetValue() );
     event.SetEventObject( combo );
     wxCommandEvent event( wxEVT_COMMAND_TEXT_UPDATED, combo->GetId() );
     event.SetString( combo->GetValue() );
     event.SetEventObject( combo );


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

+

 }
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxComboBox
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxChoice)
-

 BEGIN_EVENT_TABLE(wxComboBox, wxChoice)
     EVT_CHAR(wxComboBox::OnChar)
 
 BEGIN_EVENT_TABLE(wxComboBox, wxChoice)
     EVT_CHAR(wxComboBox::OnChar)
 


@@ -86,6 +85,12 @@ BEGIN_EVENT_TABLE(wxComboBox, wxChoice)
     EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
 END_EVENT_TABLE()
 
     EVT_UPDATE_UI(wxID_SELECTALL, wxComboBox::OnUpdateSelectAll)
 END_EVENT_TABLE()
 

+wxComboBox::~wxComboBox()
+{
+    if (m_entry)
+        GTKDisconnect(m_entry);
+}
+

 void wxComboBox::Init()
 {
     m_entry = NULL;
 void wxComboBox::Init()
 {
     m_entry = NULL;


@@ -118,7 +123,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
     }
 
     if (HasFlag(wxCB_SORT))
     }
 
     if (HasFlag(wxCB_SORT))

-        m_strings = new wxSortedArrayString();
+        m_strings = new wxGtkCollatedArrayString();

 
     GTKCreateComboBoxWidget();
 
 
     GTKCreateComboBoxWidget();
 


@@ -136,7 +141,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
         gtk_entry_set_activates_default( entry,
                                          !HasFlag(wxTE_PROCESS_ENTER) );
 
         gtk_entry_set_activates_default( entry,
                                          !HasFlag(wxTE_PROCESS_ENTER) );
 

-        gtk_entry_set_editable( entry, TRUE );
+        gtk_editable_set_editable(GTK_EDITABLE(entry), true);

     }
 
     Append(n, choices);
     }
 
     Append(n, choices);


@@ -157,7 +162,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
             // wxMSW and also because it doesn't make sense to have a string
             // which is not a possible choice in a read-only combobox)
             SetStringSelection(value);
             // wxMSW and also because it doesn't make sense to have a string
             // which is not a possible choice in a read-only combobox)
             SetStringSelection(value);

-            gtk_entry_set_editable( entry, FALSE );
+            gtk_editable_set_editable(GTK_EDITABLE(entry), false);

         }
         else // editable combobox
         {
         }
         else // editable combobox
         {


@@ -167,33 +172,39 @@ 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);
     }
 

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

     return true;
 }
 
 void wxComboBox::GTKCreateComboBoxWidget()
 {
     return true;
 }
 
 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);
 
     g_object_ref(m_widget);
 

-    m_entry = GTK_ENTRY(GTK_BIN(m_widget)->child);
+    m_entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(m_widget)));

 }
 
 GtkEditable *wxComboBox::GetEditable() const
 {
 }
 
 GtkEditable *wxComboBox::GetEditable() const
 {

-    return GTK_EDITABLE( GTK_BIN(m_widget)->child );
+    return GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(m_widget)));

 }
 
 void wxComboBox::OnChar( wxKeyEvent &event )
 }
 
 void wxComboBox::OnChar( wxKeyEvent &event )


@@ -229,12 +240,12 @@ void wxComboBox::EnableTextChangedEvents(bool enable)
 
     if ( enable )
     {
 
     if ( enable )
     {

-        g_signal_handlers_unblock_by_func(GTK_BIN(m_widget)->child,
+        g_signal_handlers_unblock_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),

             (gpointer)gtkcombobox_text_changed_callback, this);
     }
     else // disable
     {
             (gpointer)gtkcombobox_text_changed_callback, this);
     }
     else // disable
     {

-        g_signal_handlers_block_by_func(GTK_BIN(m_widget)->child,
+        g_signal_handlers_block_by_func(gtk_bin_get_child(GTK_BIN(m_widget)),

             (gpointer)gtkcombobox_text_changed_callback, this);
     }
 }
             (gpointer)gtkcombobox_text_changed_callback, this);
     }
 }


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

-    return GetEntry()->text_area;
+#ifdef __WXGTK3__
+    // no access to internal GdkWindows
+    return NULL;
+#else
+    return gtk_entry_get_text_window(GetEntry());
+#endif

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

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

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


@@ -284,6 +304,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
 // ----------------------------------------------------------------------------


@@ -367,4 +404,21 @@ void wxComboBox::Dismiss()
 {
     gtk_combo_box_popdown( GTK_COMBO_BOX(m_widget) );
 }
 {
     gtk_combo_box_popdown( GTK_COMBO_BOX(m_widget) );
 }

+
+wxSize wxComboBox::DoGetSizeFromTextSize(int xlen, int ylen) const
+{
+    wxSize tsize( wxChoice::DoGetSizeFromTextSize(xlen, ylen) );
+
+    GtkEntry* entry = GetEntry();
+    if (entry)
+    {
+        // Add the margins we have previously set, but only the horizontal border
+        // as vertical one has been taken account in the previous call.
+        // Also get other GTK+ margins.
+        tsize.IncBy(GTKGetEntryMargins(entry).x, 0);
+    }
+
+    return tsize;
+}
+

 #endif // wxUSE_COMBOBOX
 #endif // wxUSE_COMBOBOX