Return NULL from wxWindow::GetCapture() when the capture is being lost.

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 66669dfdc21d8bed9a6f76bfbfaaf9c7f363c6e8..ef4042412babfb2513976368e34c7484bed0d6ce 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -3,7 +3,6 @@
 // Purpose:
 // Author:      Robert Roebling
 // Modified By: Ryan Norton (GtkTreeView implementation)
 // Purpose:
 // Author:      Robert Roebling
 // Modified By: Ryan Norton (GtkTreeView implementation)

-// Id:          $Id$

 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -25,15 +24,20 @@
     #include "wx/arrstr.h"
 #endif
 
     #include "wx/arrstr.h"
 #endif
 

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

 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 
 #include <gtk/gtk.h>
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 
 #include <gtk/gtk.h>

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

 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkkeysyms.h>

+#ifdef __WXGTK3__
+#include <gdk/gdkkeysyms-compat.h>
+#endif

 
 //-----------------------------------------------------------------------------
 // data
 
 //-----------------------------------------------------------------------------
 // data


@@ -56,6 +60,29 @@ extern bool           g_blockEventsOnScroll;
 
 #define WXLISTBOX_DATACOLUMN    WXLISTBOX_DATACOLUMN_ARG(this)
 
 
 #define WXLISTBOX_DATACOLUMN    WXLISTBOX_DATACOLUMN_ARG(this)
 

+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------
+
+namespace
+{
+
+// Return the entry for the given listbox item.
+wxTreeEntry *
+GetEntry(GtkListStore *store, GtkTreeIter *iter, const wxListBox *listbox)
+{
+    wxTreeEntry* entry;
+    gtk_tree_model_get(GTK_TREE_MODEL(store),
+                       iter,
+                       WXLISTBOX_DATACOLUMN_ARG(listbox),
+                       &entry,
+                       -1);
+    g_object_unref(entry);
+    return entry;
+}
+
+} // anonymous namespace
+

 //-----------------------------------------------------------------------------
 // "row-activated"
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // "row-activated"
 //-----------------------------------------------------------------------------


@@ -74,37 +101,7 @@ gtk_listbox_row_activated_callback(GtkTreeView        * WXUNUSED(treeview),
 
     int sel = gtk_tree_path_get_indices(path)[0];
 
 
     int sel = gtk_tree_path_get_indices(path)[0];
 

-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
-    event.SetEventObject( listbox );
-
-    if (listbox->IsSelected(sel))
-    {
-        GtkTreeEntry* entry = listbox->GtkGetEntry(sel);
-
-        if (entry)
-        {
-            event.SetInt(sel);
-            event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
-
-            if ( listbox->HasClientObjectData() )
-                event.SetClientObject( (wxClientData*) gtk_tree_entry_get_userdata(entry) );
-            else if ( listbox->HasClientUntypedData() )
-                event.SetClientData( gtk_tree_entry_get_userdata(entry) );
-
-            g_object_unref (entry);
-        }
-        else
-        {
-            wxLogSysError(wxT("Internal error - could not get entry for double-click"));
-            event.SetInt(-1);
-        }
-    }
-    else
-    {
-        event.SetInt(-1);
-    }
-
-    listbox->HandleWindowEvent( event );
+    listbox->GTKOnActivated(sel);

 }
 }
 
 }
 }
 


@@ -112,17 +109,6 @@ gtk_listbox_row_activated_callback(GtkTreeView        * WXUNUSED(treeview),
 // "changed"
 //-----------------------------------------------------------------------------
 
 // "changed"
 //-----------------------------------------------------------------------------
 

-static void SendEvent( wxCommandEvent &event, wxListBox *listbox, int item )
-{
-    event.SetInt( item );
-    event.SetString( listbox->GetString( item ) );
-    if ( listbox->HasClientObjectData() )
-        event.SetClientObject( listbox->GetClientObject(item) );
-    else if ( listbox->HasClientUntypedData() )
-        event.SetClientData( listbox->GetClientData(item) );
-    listbox->HandleWindowEvent( event );
-}
-

 extern "C" {
 static void
 gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
 extern "C" {
 static void
 gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),


@@ -130,130 +116,9 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
 {
     if (g_blockEventsOnDrag) return;
 
 {
     if (g_blockEventsOnDrag) return;
 

-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
-    event.SetEventObject( listbox );
-
-    if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED))
-    {
-        wxArrayInt selections;
-        listbox->GetSelections( selections );
-        
-        if ((selections.GetCount() == 0) && (listbox->m_oldSelection.GetCount() == 0))
-        {
-            // nothing changed, just leave
-            return;
-        }
-        
-        if (selections.GetCount() == listbox->m_oldSelection.GetCount())
-        {
-            bool changed = false;
-            size_t idx;
-            for (idx = 0; idx < selections.GetCount(); idx++)
-            {
-                if (selections[idx] != listbox->m_oldSelection[idx])
-                {
-                    changed = true;
-                    break;
-                }
-            }
-            
-            // nothing changed, just leave
-            if (!changed)
-               return;
-        }
-
-        if (selections.GetCount() == 0)
-        {
-            // indicate that this is a deselection
-            event.SetExtraLong( 0 );
-            int item = listbox->m_oldSelection[0];
-            listbox->m_oldSelection = selections;
-            SendEvent( event, listbox, item );
-            return;
-        }
-        
-        int item;
-        // Now test if any new item is selected
-        bool any_new_selected = false;
-        size_t idx;
-        for (idx = 0; idx < selections.GetCount(); idx++)
-        {
-            item = selections[idx];
-            if (listbox->m_oldSelection.Index(item) == wxNOT_FOUND)
-            {
-                any_new_selected = true;
-                break;
-            }
-        }
-        
-        if (any_new_selected)
-        {
-            // indicate that this is a selection
-            event.SetExtraLong( 1 );
-            listbox->m_oldSelection = selections;
-            SendEvent( event, listbox, item );
-            return;
-        }
-        
-        // Now test if any new item is deselected
-        bool any_new_deselected = false;
-        for (idx = 0; idx < listbox->m_oldSelection.GetCount(); idx++)
-        {
-            item = listbox->m_oldSelection[idx];
-            if (selections.Index(item) == wxNOT_FOUND)
-            {
-                any_new_deselected = true;
-                break;
-            }
-        }
-        
-        if (any_new_deselected)
-        {
-            // indicate that this is a selection
-            event.SetExtraLong( 0 );
-            listbox->m_oldSelection = selections;
-            SendEvent( event, listbox, item );
-            return;
-        }
-        
-        wxLogError( wxT("Wrong wxListBox selection") );
-    }
-    else
-    {
-        int index = listbox->GetSelection();
-        if (index == wxNOT_FOUND)
-        {
-            // indicate that this is a deselection
-            event.SetExtraLong( 0 );
-            event.SetInt( -1 );
-
-            listbox->HandleWindowEvent( event );
-
-            return;
-        }
-        else
-        {
-            GtkTreeEntry* entry = listbox->GtkGetEntry( index );
-
-            // indicate that this is a selection
-            event.SetExtraLong( 1 );
-
-            event.SetInt( index );
-            event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
-
-            if ( listbox->HasClientObjectData() )
-                event.SetClientObject(
-                    (wxClientData*) gtk_tree_entry_get_userdata(entry)
-                                 );
-            else if ( listbox->HasClientUntypedData() )
-                event.SetClientData( gtk_tree_entry_get_userdata(entry) );
-
-            listbox->HandleWindowEvent( event );
-
-            g_object_unref (entry);
-        }
-    }
+    listbox->GTKOnSelectionChanged();

 }
 }

+

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


@@ -261,41 +126,30 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gint
+static gboolean

 gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )
 {
 gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )
 {

-    if ((gdk_event->keyval == GDK_Return) || 
+    if ((gdk_event->keyval == GDK_Return) ||

         (gdk_event->keyval == GDK_ISO_Enter) ||
         (gdk_event->keyval == GDK_KP_Enter))
     {
         (gdk_event->keyval == GDK_ISO_Enter) ||
         (gdk_event->keyval == GDK_KP_Enter))
     {

-        int index = listbox->GetSelection();
-        if (index != wxNOT_FOUND)
+        int index = -1;
+        if (!listbox->HasMultipleSelection())
+            index = listbox->GetSelection();
+        else

         {
         {

-        
-            wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
-            event.SetEventObject( listbox );
-            
-            GtkTreeEntry* entry = listbox->GtkGetEntry( index );
-
-            // indicate that this is a selection
-            event.SetExtraLong( 1 );
-
-            event.SetInt( index );
-            event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
-
-            if ( listbox->HasClientObjectData() )
-                event.SetClientObject(
-                    (wxClientData*) gtk_tree_entry_get_userdata(entry)
-                                 );
-            else if ( listbox->HasClientUntypedData() )
-                event.SetClientData( gtk_tree_entry_get_userdata(entry) );
+            wxArrayInt sels;
+            if (listbox->GetSelections( sels ) < 1)
+                return FALSE;
+            index = sels[0];
+        }

 
 

-            /* bool ret = */ listbox->HandleWindowEvent( event );
+        if (index != wxNOT_FOUND)
+        {
+            listbox->GTKOnActivated(index);

 
 

-            g_object_unref (entry);
-            

 //          wxMac and wxMSW always invoke default action
 //          if (!ret)
             {
 //          wxMac and wxMSW always invoke default action
 //          if (!ret)
             {


@@ -308,13 +162,13 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
                         gtk_window_activate_default( gtk_window );
                 }
             }
                         gtk_window_activate_default( gtk_window );
                 }
             }

-            
+

             // Always intercept, otherwise we'd get another dclick
             // event from row_activated
             return TRUE;
         }
     }
             // Always intercept, otherwise we'd get another dclick
             // event from row_activated
             return TRUE;
         }
     }

-    
+

     return FALSE;
 }
 }
     return FALSE;
 }
 }


@@ -324,12 +178,12 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry,
+static void tree_entry_destroy_cb(wxTreeEntry* entry,

                                       wxListBox* listbox)
 {
     if (listbox->HasClientObjectData())
     {
                                       wxListBox* listbox)
 {
     if (listbox->HasClientObjectData())
     {

-        gpointer userdata = gtk_tree_entry_get_userdata(entry);
+        void* userdata = wx_tree_entry_get_userdata(entry);

         if (userdata)
             delete (wxClientData *)userdata;
     }
         if (userdata)
             delete (wxClientData *)userdata;
     }


@@ -346,29 +200,16 @@ static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model),
                                       GtkTreeIter  *b,
                                       wxListBox    *listbox)
 {
                                       GtkTreeIter  *b,
                                       wxListBox    *listbox)
 {

-    GtkTreeEntry* entry;
-    GtkTreeEntry* entry2;
-
-    gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore),
-                             a,
-                             WXLISTBOX_DATACOLUMN_ARG(listbox),
-                             &entry, -1);
-    gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore),
-                             b,
-                             WXLISTBOX_DATACOLUMN_ARG(listbox),
-                             &entry2, -1);
-    wxCHECK_MSG(entry, 0, wxT("Could not get entry"));
-    wxCHECK_MSG(entry2, 0, wxT("Could not get entry2"));
-
-    //We compare collate keys here instead of calling g_utf8_collate
-    //as it is rather slow (and even the docs reccommend this)
-    int ret = strcmp(gtk_tree_entry_get_collate_key(entry),
-                     gtk_tree_entry_get_collate_key(entry2));
+    wxTreeEntry* entry1 = GetEntry(listbox->m_liststore, a, listbox);
+    wxCHECK_MSG(entry1, 0, wxT("Could not get first entry"));

 
 

-    g_object_unref (entry);
-    g_object_unref (entry2);
+    wxTreeEntry* entry2 = GetEntry(listbox->m_liststore, b, listbox);
+    wxCHECK_MSG(entry2, 0, wxT("Could not get second entry"));

 
 

-    return ret;
+    //We compare collate keys here instead of calling g_utf8_collate
+    //as it is rather slow (and even the docs recommend this)
+    return strcmp(wx_tree_entry_get_collate_key(entry1),
+                  wx_tree_entry_get_collate_key(entry2)) >= 0;

 }
 }
 
 }
 }
 


@@ -383,21 +224,12 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
                                                  GtkTreeIter* iter,
                                                  wxListBox* listbox)
 {
                                                  GtkTreeIter* iter,
                                                  wxListBox* listbox)
 {

-    GtkTreeEntry* entry;
-
-    gtk_tree_model_get(GTK_TREE_MODEL(listbox->m_liststore),
-                             iter,
-                             WXLISTBOX_DATACOLUMN_ARG(listbox),
-                             &entry, -1);
+    wxTreeEntry* entry = GetEntry(listbox->m_liststore, iter, listbox);

     wxCHECK_MSG(entry, 0, wxT("Could not get entry"));
     wxCHECK_MSG(entry, 0, wxT("Could not get entry"));

-    wxGtkString keycollatekey(g_utf8_collate_key(key, -1));

 
 

-    int ret = strcmp(keycollatekey,
-                     gtk_tree_entry_get_collate_key(entry));
-
-    g_object_unref (entry);
+    wxGtkString keycollatekey(g_utf8_collate_key(key, -1));

 
 

-    return ret != 0;
+    return strcmp(keycollatekey, wx_tree_entry_get_collate_key(entry)) != 0;

 }
 }
 
 }
 }
 


@@ -405,15 +237,13 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
 // wxListBox
 //-----------------------------------------------------------------------------
 
 // wxListBox
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControlWithItems)
-

 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 
 void wxListBox::Init()
 {
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 
 void wxListBox::Init()
 {

-    m_treeview = (GtkTreeView*) NULL;
+    m_treeview = NULL;

 #if wxUSE_CHECKLISTBOX
     m_hasCheckBoxes = false;
 #endif // wxUSE_CHECKLISTBOX
 #if wxUSE_CHECKLISTBOX
     m_hasCheckBoxes = false;
 #endif // wxUSE_CHECKLISTBOX


@@ -444,7 +274,8 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         return false;
     }
 
         return false;
     }
 

-    m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
+    m_widget = gtk_scrolled_window_new( NULL, NULL );
+    g_object_ref(m_widget);

     if (style & wxLB_ALWAYS_SB)
     {
       gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
     if (style & wxLB_ALWAYS_SB)
     {
       gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),


@@ -457,7 +288,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     }
 
 
     }
 
 

-    GtkScrolledWindowSetBorder(m_widget, style);
+    GTKScrolledWindowSetBorder(m_widget, style);

 
     m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );
 
 
     m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );
 


@@ -480,10 +311,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 #if wxUSE_CHECKLISTBOX
     if(m_hasCheckBoxes)
         m_liststore = gtk_list_store_new(2, G_TYPE_BOOLEAN,
 #if wxUSE_CHECKLISTBOX
     if(m_hasCheckBoxes)
         m_liststore = gtk_list_store_new(2, G_TYPE_BOOLEAN,

-                                            GTK_TYPE_TREE_ENTRY);
+                                            WX_TYPE_TREE_ENTRY);

     else
 #endif
     else
 #endif

-        m_liststore = gtk_list_store_new(1, GTK_TYPE_TREE_ENTRY);
+        m_liststore = gtk_list_store_new(1, WX_TYPE_TREE_ENTRY);

 
     gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore));
 
 
     gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore));
 


@@ -504,19 +335,20 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_tree_view_set_enable_search(m_treeview, FALSE);
 
     GtkSelectionMode mode;
     gtk_tree_view_set_enable_search(m_treeview, FALSE);
 
     GtkSelectionMode mode;

-    if (style & wxLB_MULTIPLE)
+    // GTK_SELECTION_EXTENDED is a deprecated synonym for GTK_SELECTION_MULTIPLE
+    if ( style & (wxLB_MULTIPLE | wxLB_EXTENDED) )

     {
         mode = GTK_SELECTION_MULTIPLE;
     }
     {
         mode = GTK_SELECTION_MULTIPLE;
     }

-    else if (style & wxLB_EXTENDED)
-    {
-        mode = GTK_SELECTION_EXTENDED;
-    }
-    else
+    else // no multi-selection flags specified

     {
     {

-        // if style was 0 set single mode

         m_windowStyle |= wxLB_SINGLE;
         m_windowStyle |= wxLB_SINGLE;

-        mode = GTK_SELECTION_SINGLE;
+
+        // Notice that we must use BROWSE and not GTK_SELECTION_SINGLE because
+        // the latter allows to not select any items at all while a single
+        // selection listbox is supposed to always have a selection (at least
+        // once the user selected something, it might not have any initially).
+        mode = GTK_SELECTION_BROWSE;

     }
 
     GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
     }
 
     GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );


@@ -562,18 +394,24 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     g_signal_connect_after (selection, "changed",
                             G_CALLBACK (gtk_listitem_changed_callback), this);
 
     g_signal_connect_after (selection, "changed",
                             G_CALLBACK (gtk_listitem_changed_callback), this);

- 
+

     return true;
 }
 
 wxListBox::~wxListBox()
 {
     return true;
 }
 
 wxListBox::~wxListBox()
 {

-    m_hasVMT = false;
+    if (m_treeview)
+    {
+        GTKDisconnect(m_treeview);
+        GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
+        if (selection)
+            GTKDisconnect(selection);
+    }

 
     Clear();
 }
 
 
     Clear();
 }
 

-void wxListBox::GtkDisableEvents()
+void wxListBox::GTKDisableEvents()

 {
     GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
 
 {
     GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
 


@@ -581,14 +419,23 @@ void wxListBox::GtkDisableEvents()
                                 (gpointer) gtk_listitem_changed_callback, this);
 }
 
                                 (gpointer) gtk_listitem_changed_callback, this);
 }
 

-void wxListBox::GtkEnableEvents()
+void wxListBox::GTKEnableEvents()

 {
     GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
 
     g_signal_handlers_unblock_by_func(selection,
                                 (gpointer) gtk_listitem_changed_callback, this);
 {
     GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
 
     g_signal_handlers_unblock_by_func(selection,
                                 (gpointer) gtk_listitem_changed_callback, this);

-                                
-    GtkUpdateOldSelection();
+
+    UpdateOldSelections();
+}
+
+
+void wxListBox::Update()
+{
+    wxWindow::Update();
+
+    if (m_treeview)
+        gdk_window_process_updates(gtk_widget_get_window(GTK_WIDGET(m_treeview)), true);

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


@@ -603,38 +450,26 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
     InvalidateBestSize();
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
     InvalidateBestSize();

+    int n = DoInsertItemsInLoop(items, pos, clientData, type);
+    UpdateOldSelections();
+    return n;
+}

 
 

-    GtkTreeIter* pIter = NULL; // append by default
-    GtkTreeIter iter;
-    if ( pos != GetCount() )
-    {
-        wxCHECK_MSG( GtkGetIteratorFor(pos, &iter), wxNOT_FOUND,
-                     wxT("internal wxListBox error in insertion") );
-
-        pIter = &iter;
-    }
-
-    const unsigned int numItems = items.GetCount();
-    for ( unsigned int i = 0; i < numItems; ++i )
-    {
-        GtkTreeEntry* entry = gtk_tree_entry_new();
-        gtk_tree_entry_set_label(entry, wxGTK_CONV(items[i]));
-        gtk_tree_entry_set_destroy_func(entry,
-                (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
-                            this);
-
-        GtkTreeIter itercur;
-        gtk_list_store_insert_before(m_liststore, &itercur, pIter);
-
-        GtkSetItem(itercur, entry);
-
-        g_object_unref (entry);
+int wxListBox::DoInsertOneItem(const wxString& item, unsigned int pos)
+{
+    wxTreeEntry* entry = wx_tree_entry_new();
+    wx_tree_entry_set_label(entry, wxGTK_CONV(item));
+    wx_tree_entry_set_destroy_func(entry, (wxTreeEntryDestroy)tree_entry_destroy_cb, this);

 
 

-        if (clientData)
-            AssignNewItemClientData(GtkGetIndexFor(itercur), clientData, i, type);
-    }
+#if wxUSE_CHECKLISTBOX
+    int entryCol = int(m_hasCheckBoxes);
+#else
+    int entryCol = 0;
+#endif
+    gtk_list_store_insert_with_values(m_liststore, NULL, pos, entryCol, entry, -1);
+    g_object_unref(entry);

 
 

-    return pos + numItems - 1;
+    return pos;

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


@@ -645,9 +480,15 @@ void wxListBox::DoClear()
 {
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 
 {
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 

+    GTKDisableEvents(); // just in case
+

     InvalidateBestSize();
 
     gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */
     InvalidateBestSize();
 
     gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */

+
+    GTKEnableEvents();
+
+    UpdateOldSelections();

 }
 
 void wxListBox::DoDeleteOneItem(unsigned int n)
 }
 
 void wxListBox::DoDeleteOneItem(unsigned int n)


@@ -656,19 +497,23 @@ void wxListBox::DoDeleteOneItem(unsigned int n)
 
     InvalidateBestSize();
 
 
     InvalidateBestSize();
 

+    GTKDisableEvents(); // just in case
+

     GtkTreeIter iter;
     GtkTreeIter iter;

-    wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("wrong listbox index") );
+    wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("wrong listbox index") );

 
     // this returns false if iter is invalid (e.g. deleting item at end) but
     // since we don't use iter, we ignore the return value
     gtk_list_store_remove(m_liststore, &iter);
 
     // this returns false if iter is invalid (e.g. deleting item at end) but
     // since we don't use iter, we ignore the return value
     gtk_list_store_remove(m_liststore, &iter);

+
+    GTKEnableEvents();

 }
 
 // ----------------------------------------------------------------------------
 // helper functions for working with iterators
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // helper functions for working with iterators
 // ----------------------------------------------------------------------------
 

-bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const
+bool wxListBox::GTKGetIteratorFor(unsigned pos, GtkTreeIter *iter) const

 {
     if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore),
                                         iter, NULL, pos) )
 {
     if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore),
                                         iter, NULL, pos) )


@@ -680,14 +525,14 @@ bool wxListBox::GtkGetIteratorFor(unsigned pos, GtkTreeIter *iter) const
     return true;
 }
 
     return true;
 }
 

-int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const
+int wxListBox::GTKGetIndexFor(GtkTreeIter& iter) const

 {
     GtkTreePath *path =
         gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);
 
     gint* pIntPath = gtk_tree_path_get_indices(path);
 
 {
     GtkTreePath *path =
         gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);
 
     gint* pIntPath = gtk_tree_path_get_indices(path);
 

-    wxCHECK_MSG( pIntPath, wxNOT_FOUND, _T("failed to get iterator path") );
+    wxCHECK_MSG( pIntPath, wxNOT_FOUND, wxT("failed to get iterator path") );

 
     int idx = pIntPath[0];
 
 
     int idx = pIntPath[0];
 


@@ -697,35 +542,13 @@ int wxListBox::GtkGetIndexFor(GtkTreeIter& iter) const
 }
 
 // get GtkTreeEntry from position (note: you need to g_unref it if valid)
 }
 
 // get GtkTreeEntry from position (note: you need to g_unref it if valid)

-GtkTreeEntry *wxListBox::GtkGetEntry(unsigned n) const
+wxTreeEntry* wxListBox::GTKGetEntry(unsigned n) const

 {
     GtkTreeIter iter;
 {
     GtkTreeIter iter;

-    if ( !GtkGetIteratorFor(n, &iter) )
+    if ( !GTKGetIteratorFor(n, &iter) )

         return NULL;
 
         return NULL;
 

-
-    GtkTreeEntry* entry = NULL;
-    gtk_tree_model_get(GTK_TREE_MODEL(m_liststore), &iter,
-                       WXLISTBOX_DATACOLUMN, &entry, -1);
-
-    return entry;
-}
-
-void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry)
-{
-#if wxUSE_CHECKLISTBOX
-    if ( m_hasCheckBoxes )
-    {
-        gtk_list_store_set(m_liststore, &iter,
-                           0, FALSE, // FALSE == not toggled
-                           1, entry,
-                           -1);
-    }
-    else
-#endif // wxUSE_CHECKLISTBOX
-    {
-        gtk_list_store_set(m_liststore, &iter, 0, entry, -1);
-    }
+    return GetEntry(m_liststore, &iter, this);

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


@@ -734,27 +557,18 @@ void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry)
 
 void* wxListBox::DoGetItemClientData(unsigned int n) const
 {
 
 void* wxListBox::DoGetItemClientData(unsigned int n) const
 {

-    wxCHECK_MSG( IsValid(n), NULL,
-                 wxT("Invalid index passed to GetItemClientData") );
-
-    GtkTreeEntry* entry = GtkGetEntry(n);
+    wxTreeEntry* entry = GTKGetEntry(n);

     wxCHECK_MSG(entry, NULL, wxT("could not get entry"));
 
     wxCHECK_MSG(entry, NULL, wxT("could not get entry"));
 

-    void* userdata = gtk_tree_entry_get_userdata( entry );
-    g_object_unref (entry);
-    return userdata;
+    return wx_tree_entry_get_userdata(entry);

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

-    wxCHECK_RET( IsValid(n),
-                 wxT("Invalid index passed to SetItemClientData") );
-
-    GtkTreeEntry* entry = GtkGetEntry(n);
+    wxTreeEntry* entry = GTKGetEntry(n);

     wxCHECK_RET(entry, wxT("could not get entry"));
 
     wxCHECK_RET(entry, wxT("could not get entry"));
 

-    gtk_tree_entry_set_userdata( entry, clientData );
-    g_object_unref (entry);
+    wx_tree_entry_set_userdata(entry, clientData);

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


@@ -763,35 +577,30 @@ void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
 
 void wxListBox::SetString(unsigned int n, const wxString& label)
 {
 
 void wxListBox::SetString(unsigned int n, const wxString& label)
 {

-    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") );

     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 

-    GtkTreeEntry* entry = GtkGetEntry(n);
-    wxCHECK_RET( entry, wxT("wrong listbox index") );
-
-    // update the item itself
-    gtk_tree_entry_set_label(entry, wxGTK_CONV(label));
-
-    // and update the model which will refresh the tree too

     GtkTreeIter iter;
     GtkTreeIter iter;

-    wxCHECK_RET( GtkGetIteratorFor(n, &iter), _T("failed to get iterator") );
+    wxCHECK_RET(GTKGetIteratorFor(n, &iter), "invalid index");
+    wxTreeEntry* entry = GetEntry(m_liststore, &iter, this);

 
 

-    // FIXME: this resets the checked status of a wxCheckListBox item
+    // update the item itself
+    wx_tree_entry_set_label(entry, wxGTK_CONV(label));

 
 

-    GtkSetItem(iter, entry);
+    // signal row changed
+    GtkTreeModel* tree_model = GTK_TREE_MODEL(m_liststore);
+    GtkTreePath* path = gtk_tree_model_get_path(tree_model, &iter);
+    gtk_tree_model_row_changed(tree_model, path, &iter);
+    gtk_tree_path_free(path);

 }
 
 wxString wxListBox::GetString(unsigned int n) const
 {
     wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );
 
 }
 
 wxString wxListBox::GetString(unsigned int n) const
 {
     wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );
 

-    GtkTreeEntry* entry = GtkGetEntry(n);
+    wxTreeEntry* entry = GTKGetEntry(n);

     wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") );
 
     wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") );
 

-    wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) );
-
-    g_object_unref (entry);
-    return label;
+    return wxGTK_CONV_BACK(wx_tree_entry_get_label(entry));

 }
 
 unsigned int wxListBox::GetCount() const
 }
 
 unsigned int wxListBox::GetCount() const


@@ -823,6 +632,25 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
 // selection
 // ----------------------------------------------------------------------------
 
 // selection
 // ----------------------------------------------------------------------------
 

+void wxListBox::GTKOnActivated(int item)
+{
+    SendEvent(wxEVT_LISTBOX_DCLICK, item, IsSelected(item));
+}
+
+void wxListBox::GTKOnSelectionChanged()
+{
+    if ( HasFlag(wxLB_MULTIPLE | wxLB_EXTENDED) )
+    {
+        CalcAndSendEvent();
+    }
+    else // single selection
+    {
+        const int item = GetSelection();
+        if ( DoChangeSingleSelection(item) )
+            SendEvent(wxEVT_LISTBOX, item, true);
+    }
+}
+

 int wxListBox::GetSelection() const
 {
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox"));
 int wxListBox::GetSelection() const
 {
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox"));


@@ -836,7 +664,7 @@ int wxListBox::GetSelection() const
     if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
         return wxNOT_FOUND;
 
     if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
         return wxNOT_FOUND;
 

-    return GtkGetIndexFor(iter);
+    return GTKGetIndexFor(iter);

 }
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 }
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const


@@ -845,7 +673,7 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 
     aSelections.Empty();
 
 
     aSelections.Empty();
 

-        int i = 0;
+    int i = 0;

     GtkTreeIter iter;
     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 
     GtkTreeIter iter;
     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 


@@ -870,32 +698,32 @@ bool wxListBox::IsSelected( int n ) const
     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 
     GtkTreeIter iter;
     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 
     GtkTreeIter iter;

-    wxCHECK_MSG( GtkGetIteratorFor(n, &iter), false, wxT("Invalid index") );
+    wxCHECK_MSG( GTKGetIteratorFor(n, &iter), false, wxT("Invalid index") );

 
 

-    return gtk_tree_selection_iter_is_selected(selection, &iter);
+    return gtk_tree_selection_iter_is_selected(selection, &iter) != 0;

 }
 
 void wxListBox::DoSetSelection( int n, bool select )
 {
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 
 }
 
 void wxListBox::DoSetSelection( int n, bool select )
 {
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 

-    GtkDisableEvents();
-    
+    GTKDisableEvents();
+

     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 
     // passing -1 to SetSelection() is documented to deselect all items
     if ( n == wxNOT_FOUND )
     {
         gtk_tree_selection_unselect_all(selection);
     GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
 
     // passing -1 to SetSelection() is documented to deselect all items
     if ( n == wxNOT_FOUND )
     {
         gtk_tree_selection_unselect_all(selection);

-        GtkEnableEvents();
+        GTKEnableEvents();

         return;
     }
 
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") );
 
         return;
     }
 
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") );
 

-    
+

     GtkTreeIter iter;
     GtkTreeIter iter;

-    wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") );
+    wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("Invalid index") );

 
     if (select)
         gtk_tree_selection_select_iter(selection, &iter);
 
     if (select)
         gtk_tree_selection_select_iter(selection, &iter);


@@ -909,13 +737,7 @@ void wxListBox::DoSetSelection( int n, bool select )
 
     gtk_tree_path_free(path);
 
 
     gtk_tree_path_free(path);
 

-    GtkEnableEvents();
-}
-
-void wxListBox::GtkUpdateOldSelection()
-{
-    if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
-        GetSelections( m_oldSelection );
+    GTKEnableEvents();

 }
 
 void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
 }
 
 void wxListBox::DoScrollToCell(int n, float alignY, float alignX)


@@ -924,11 +746,11 @@ void wxListBox::DoScrollToCell(int n, float alignY, float alignX)
     wxCHECK_RET( IsValid(n), wxT("invalid index"));
 
     //RN: I have no idea why this line is needed...
     wxCHECK_RET( IsValid(n), wxT("invalid index"));
 
     //RN: I have no idea why this line is needed...

-    if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_treeview))
+    if (gtk_widget_has_grab(GTK_WIDGET(m_treeview)))

         return;
 
     GtkTreeIter iter;
         return;
 
     GtkTreeIter iter;

-    if ( !GtkGetIteratorFor(n, &iter) )
+    if ( !GTKGetIteratorFor(n, &iter) )

         return;
 
     GtkTreePath* path = gtk_tree_model_get_path(
         return;
 
     GtkTreePath* path = gtk_tree_model_get_path(


@@ -965,7 +787,7 @@ int wxListBox::DoListHitTest(const wxPoint& point) const
     // need to translate from master window since it is in client coords
     gint binx, biny;
     gdk_window_get_geometry(gtk_tree_view_get_bin_window(m_treeview),
     // need to translate from master window since it is in client coords
     gint binx, biny;
     gdk_window_get_geometry(gtk_tree_view_get_bin_window(m_treeview),

-                            &binx, &biny, NULL, NULL, NULL);
+                            &binx, &biny, NULL, NULL);

 
     GtkTreePath* path;
     if ( !gtk_tree_view_get_path_at_pos
 
     GtkTreePath* path;
     if ( !gtk_tree_view_get_path_at_pos


@@ -992,14 +814,6 @@ int wxListBox::DoListHitTest(const wxPoint& point) const
 // helpers
 // ----------------------------------------------------------------------------
 
 // helpers
 // ----------------------------------------------------------------------------
 

-#if wxUSE_TOOLTIPS
-void wxListBox::ApplyToolTip( GtkTooltips *tips, const gchar *tip )
-{
-    // RN: Is this needed anymore?
-    gtk_tooltips_set_tip( tips, GTK_WIDGET( m_treeview ), tip, (gchar*) NULL );
-}
-#endif // wxUSE_TOOLTIPS
-

 GtkWidget *wxListBox::GetConnectWidget()
 {
     // the correct widget for listbox events (such as mouse clicks for example)
 GtkWidget *wxListBox::GetConnectWidget()
 {
     // the correct widget for listbox events (such as mouse clicks for example)


@@ -1014,7 +828,10 @@ GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
 
 void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 
 void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    if (m_hasBgCol && m_backgroundColour.Ok())
+#ifdef __WXGTK3__
+    // don't know if this is even necessary, or how to do it
+#else
+    if (m_hasBgCol && m_backgroundColour.IsOk())

     {
         GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
         if (window)
     {
         GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
         if (window)


@@ -1024,8 +841,9 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
             gdk_window_clear( window );
         }
     }
             gdk_window_clear( window );
         }
     }

+#endif

 
 

-    gtk_widget_modify_style( GTK_WIDGET(m_treeview), style );
+    GTKApplyStyle(GTK_WIDGET(m_treeview), style);

 }
 
 wxSize wxListBox::DoGetBestSize() const
 }
 
 wxSize wxListBox::DoGetBestSize() const


@@ -1078,7 +896,7 @@ wxSize wxListBox::DoGetBestSize() const
 wxVisualAttributes
 wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 wxVisualAttributes
 wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

-    return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new, true);
+    return GetDefaultAttributesFromGTKWidget(gtk_tree_view_new(), true);

 }
 
 #endif // wxUSE_LISTBOX
 }
 
 #endif // wxUSE_LISTBOX