don't use deprecated wxMenuItem methods

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

diff --git a/src/gtk/combobox.cpp b/src/gtk/combobox.cpp
index 80c4c23856bf5b6e885e0d61386aa46538e1b8a3..91207fc70a763bd145aba1b853685fbe186722c6 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 )
 {
 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;
     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 )
 {
 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;
     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.
     // 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() );
     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
 
     // 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 )
 {
 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() );
     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 )
 {
 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)
     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
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -272,9 +241,8 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
                          long style, const wxValidator& validator,
                          const wxString& name )
 {
                          long style, const wxValidator& validator,
                          const wxString& name )
 {

+    m_strings = NULL;

     m_ignoreNextUpdate = false;
     m_ignoreNextUpdate = false;

-    m_needParent = true;
-    m_acceptsFocus = true;

     m_prevSelection = 0;
 
     if (!PreCreation( parent, pos, size ) ||
     m_prevSelection = 0;
 
     if (!PreCreation( parent, pos, size ) ||


@@ -284,21 +252,15 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
         return false;
     }
 
         return false;
     }
 

+    if(HasFlag(wxCB_SORT))
+        m_strings = new wxSortedArrayString();
+

 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         m_widget = gtk_combo_box_entry_new_text();
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         m_widget = gtk_combo_box_entry_new_text();

-        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );

 
         gtk_entry_set_editable( GTK_ENTRY( GTK_BIN(m_widget)->child ), TRUE );
 
         gtk_entry_set_editable( GTK_ENTRY( GTK_BIN(m_widget)->child ), TRUE );

-
-        for (int i = 0; i < n; i++)
-        {
-            gtk_combo_box_append_text( combobox,  wxGTK_CONV( choices[i] ) );
-
-            m_clientDataList.Append( (wxObject*)NULL );
-            m_clientObjectList.Append( (wxObject*)NULL );
-        }

     }
     else
 #endif
     }
     else
 #endif


@@ -321,22 +283,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
         if (style & wxNO_BORDER)
             g_object_set (combo->entry, "has-frame", FALSE, NULL );
 
         if (style & wxNO_BORDER)
             g_object_set (combo->entry, "has-frame", FALSE, NULL );

-
-        GtkWidget *list = combo->list;
-
-        for (int i = 0; i < n; i++)
-        {
-            GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( choices[i] ) );
-
-            m_clientDataList.Append( (wxObject*)NULL );
-            m_clientObjectList.Append( (wxObject*)NULL );
-
-            gtk_container_add( GTK_CONTAINER(list), list_item );
-
-            gtk_widget_show( list_item );
-        }

     }
 
     }
 

+    Append(n, choices);

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -372,10 +321,7 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
         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);

-                            
-        // 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
     }
     else
 #endif


@@ -408,16 +354,9 @@ bool wxComboBox::Create( wxWindow *parent, wxWindowID id, const wxString& value,
 
 wxComboBox::~wxComboBox()
 {
 
 wxComboBox::~wxComboBox()
 {

-    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        node = node->GetNext();
-    }
-    m_clientObjectList.Clear();
+    Clear();

 
 

-    m_clientDataList.Clear();
+    delete m_strings;

 }
 
 void wxComboBox::SetFocus()
 }
 
 void wxComboBox::SetFocus()


@@ -431,15 +370,36 @@ void wxComboBox::SetFocus()
     gtk_widget_grab_focus( m_focusWidget );
 }
 
     gtk_widget_grab_focus( m_focusWidget );
 }
 

-int wxComboBox::DoAppend( const wxString &item )
+int wxComboBox::DoInsertItems(const wxArrayStringsAdapter & items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type)

 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 
 {
     wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
 

+    wxASSERT_MSG( !IsSorted() || (pos == GetCount()),
+                 _T("In a sorted combobox data could only be appended"));
+
+    const int count = items.GetCount();
+
+    int n = wxNOT_FOUND;
+

 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
         GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );

-        gtk_combo_box_append_text( combobox,  wxGTK_CONV( item ) );
+        for( int i = 0; i < count; ++i )
+        {
+            n = pos + i;
+            // If sorted, use this wxSortedArrayStrings to determine
+            // the right insertion point
+            if(m_strings)
+                n = m_strings->Add(items[i]);
+
+            gtk_combo_box_insert_text( combobox, n, wxGTK_CONV( items[i] ) );
+
+            m_clientData.Insert( NULL, n );
+            AssignNewItemClientData(n, clientData, i, type);
+        }

     }
     else
 #endif
     }
     else
 #endif


@@ -447,141 +407,54 @@ int wxComboBox::DoAppend( const wxString &item )
         DisableEvents();
 
         GtkWidget *list = GTK_COMBO(m_widget)->list;
         DisableEvents();
 
         GtkWidget *list = GTK_COMBO(m_widget)->list;

-        GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
-
-        gtk_container_add( GTK_CONTAINER(list), list_item );
-
-        if (GTK_WIDGET_REALIZED(m_widget))
-        {
-            gtk_widget_realize( list_item );
-            gtk_widget_realize( GTK_BIN(list_item)->child );
-        }
-
-        // Apply current widget style to the new list_item
-        GtkRcStyle *style = CreateWidgetStyle();
-        if (style)
+        for( int i = 0; i < count; ++i )

         {
         {

-            gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
-            GtkBin *bin = GTK_BIN( list_item );
-            GtkWidget *label = GTK_WIDGET( bin->child );
-            gtk_widget_modify_style( label, style );
-            gtk_rc_style_unref( style );
-        }
-
-        gtk_widget_show( list_item );
+            n = pos + i;
+            // If sorted, use this wxSortedArrayStrings to determine
+            // the right insertion point
+            if(m_strings)
+                n = m_strings->Add(items[i]);

 
 

-        EnableEvents();
-    }
+            GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( items[i] ) );

 
 

-    const unsigned int count = GetCount();
-
-    if ( m_clientDataList.GetCount() < count )
-        m_clientDataList.Append( (wxObject*) NULL );
-    if ( m_clientObjectList.GetCount() < count )
-        m_clientObjectList.Append( (wxObject*) NULL );
-
-    InvalidateBestSize();
-
-    return count - 1;
-}
-
-int wxComboBox::DoInsert(const wxString &item, unsigned int pos)
-{
-    wxCHECK_MSG( !(GetWindowStyle() & wxCB_SORT), -1,
-                    wxT("can't insert into sorted list"));
-
-    wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid combobox") );
-    wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index") );
+            // TODO construct a list with all items and call gtk_list_insert_items once?
+            GList *gitem_list = g_list_alloc ();
+            gitem_list->data = list_item;
+            gtk_list_insert_items( GTK_LIST (list), gitem_list, n );

 
 

-    unsigned int count = GetCount();
+            m_clientData.Insert( NULL, n );
+            AssignNewItemClientData(n, clientData, i, type);

 
 

-    if (pos == count)
-        return Append(item);
-
-#ifdef __WXGTK24__
-    if (!gtk_check_version(2,4,0))
-    {
-        GtkComboBox* combobox = GTK_COMBO_BOX( m_widget );
-        gtk_combo_box_insert_text( combobox, pos, wxGTK_CONV( item ) );
-    }
-    else
-#endif
-    {
-        DisableEvents();
-
-        GtkWidget *list = GTK_COMBO(m_widget)->list;
-        GtkWidget *list_item = gtk_list_item_new_with_label( wxGTK_CONV( item ) );
-
-        GList *gitem_list = g_list_alloc ();
-        gitem_list->data = list_item;
-        gtk_list_insert_items( GTK_LIST (list), gitem_list, pos );
+            if (GTK_WIDGET_REALIZED(m_widget))
+            {
+                gtk_widget_realize( list_item );
+                gtk_widget_realize( GTK_BIN(list_item)->child );

 
 

-        if (GTK_WIDGET_REALIZED(m_widget))
-        {
-            gtk_widget_realize( list_item );
-            gtk_widget_realize( GTK_BIN(list_item)->child );
+                ApplyWidgetStyle();
+            }

 
 

-            ApplyWidgetStyle();
+            gtk_widget_show( list_item );

         }
 
         }
 

-        gtk_widget_show( list_item );
-

         EnableEvents();
     }
 
         EnableEvents();
     }
 

-    count = GetCount();
-
-    if ( m_clientDataList.GetCount() < count )
-        m_clientDataList.Insert( pos, (wxObject*) NULL );
-    if ( m_clientObjectList.GetCount() < count )
-        m_clientObjectList.Insert( pos, (wxObject*) NULL );
-

     InvalidateBestSize();
 
     InvalidateBestSize();
 

-    return pos;
+    return n;

 }
 
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
 }
 
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientDataList.Item( n );
-    if (!node) return;
-
-    node->SetData( (wxObject*) clientData );
+    m_clientData[n] = clientData;

 }
 
 void* wxComboBox::DoGetItemClientData(unsigned int n) const
 {
 }
 
 void* wxComboBox::DoGetItemClientData(unsigned int n) const
 {

-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientDataList.Item( n );
-
-    return node ? node->GetData() : NULL;
+    return m_clientData[n];

 }
 
 }
 

-void wxComboBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-    if (!node) return;
-
-    // wxItemContainer already deletes data for us
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxComboBox::DoGetItemClientObject(unsigned int n) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, wxT("invalid combobox") );
-
-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-
-    return node ? (wxClientData*) node->GetData() : NULL;
-}
-
-void wxComboBox::Clear()
+void wxComboBox::DoClear()

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 


@@ -602,23 +475,17 @@ void wxComboBox::Clear()
         gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
     }
 
         gtk_list_clear_items( GTK_LIST(list), 0, GetCount() );
     }
 

-    wxList::compatibility_iterator node = m_clientObjectList.GetFirst();
-    while (node)
-    {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        delete cd;
-        node = node->GetNext();
-    }
-    m_clientObjectList.Clear();
+    m_clientData.Clear();

 
 

-    m_clientDataList.Clear();
+    if(m_strings)
+        m_strings->Clear();

 
     EnableEvents();
 
     InvalidateBestSize();
 }
 
 
     EnableEvents();
 
     InvalidateBestSize();
 }
 

-void wxComboBox::Delete(unsigned int n)
+void wxComboBox::DoDeleteOneItem(unsigned int n)

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid combobox") );
 


@@ -652,17 +519,9 @@ void wxComboBox::Delete(unsigned int n)
         EnableEvents();
     }
 
         EnableEvents();
     }
 

-    wxList::compatibility_iterator node = m_clientObjectList.Item( n );
-    if (node)
-    {
-        wxClientData *cd = (wxClientData*)node->GetData();
-        if (cd) delete cd;
-        m_clientObjectList.Erase( node );
-    }
-
-    node = m_clientDataList.Item( n );
-    if (node)
-        m_clientDataList.Erase( node );
+    m_clientData.RemoveAt( n );
+    if(m_strings)
+        m_strings->RemoveAt( n );

 
     InvalidateBestSize();
 }
 
     InvalidateBestSize();
 }


@@ -982,7 +841,10 @@ void wxComboBox::SetValue( const wxString& value )
 
     wxString tmp;
     if (!value.IsNull()) tmp = value;
 
     wxString tmp;
     if (!value.IsNull()) tmp = value;

+
+    DisableEvents();

     gtk_entry_set_text( entry, wxGTK_CONV( tmp ) );
     gtk_entry_set_text( entry, wxGTK_CONV( tmp ) );

+    EnableEvents();

 
     InvalidateBestSize();
 }
 
     InvalidateBestSize();
 }


@@ -1150,12 +1012,14 @@ void wxComboBox::Replace( long from, long to, const wxString& value )
     if (value.IsNull()) return;
     gint pos = (gint)to;
 
     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
 #else

-    gtk_editable_insert_text( GTK_EDITABLE(entry), value.c_str(), value.length(), &pos );
+    wxCharBuffer buffer(value.utf8_str());
+    const char *utf8 = buffer;

 #endif
 #endif

+    gtk_editable_insert_text(GTK_EDITABLE(entry), utf8, strlen(utf8), &pos);

 }
 
 void wxComboBox::SetSelection( long from, long to )
 }
 
 void wxComboBox::SetSelection( long from, long to )


@@ -1245,20 +1109,20 @@ void wxComboBox::DisableEvents()
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 #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
     {
     }
     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 +1131,20 @@ void wxComboBox::EnableEvents()
 #ifdef __WXGTK24__
     if (!gtk_check_version(2,4,0))
     {
 #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
     {
     }
     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);

     }
 }
 
     }
 }