Fix typo in last commit

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 37154d6edaf17c94dcc63c8d03043d189a416269..d76523b68111b840d93de6d76dbf365b3a262c5e 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -1,47 +1,44 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        listbox.cpp
+// Name:        src/gtk/listbox.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

+// Modified By: Ryan Norton (GtkTreeView implementation)

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

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "listbox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_LISTBOX
 
 #include "wx/listbox.h"
 #if wxUSE_LISTBOX
 
 #include "wx/listbox.h"

-#include "wx/dynarray.h"
-#include "wx/arrstr.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/checklst.h"
-#include "wx/settings.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/checklst.h"
+    #include "wx/arrstr.h"
+#endif
+

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

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

 
 #if wxUSE_TOOLTIPS
 
 #if wxUSE_TOOLTIPS

-#include "wx/tooltip.h"
+    #include "wx/tooltip.h"

 #endif
 
 #endif
 

-#include <gdk/gdk.h>

 #include <gtk/gtk.h>
 #include <gtk/gtk.h>

-#include <gdk/gdkkeysyms.h>
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------

 
 

-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
+#include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+#include <gdk/gdkkeysyms-compat.h>
+#endif

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


@@ -49,308 +46,210 @@ extern bool g_isIdle;
 
 extern bool           g_blockEventsOnDrag;
 extern bool           g_blockEventsOnScroll;
 
 extern bool           g_blockEventsOnDrag;
 extern bool           g_blockEventsOnScroll;

-extern wxCursor       g_globalCursor;
-extern wxWindowGTK   *g_delayedFocus;

 
 

-static bool       g_hasDoubleClicked = FALSE;
+

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// idle callback for SetFirstItem
+// Macro to tell which row the strings are in (1 if native checklist, 0 if not)

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-struct wxlistbox_idle_struct
-{
-    wxListBox   *m_listbox;
-    int          m_item;
-    gint         m_tag;
-};
-
-extern "C" gint wxlistbox_idle_callback( gpointer gdata )
-{
-    wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
-    gdk_threads_enter();
+#if wxUSE_CHECKLISTBOX
+#   define WXLISTBOX_DATACOLUMN_ARG(x)  (x->m_hasCheckBoxes ? 1 : 0)
+#else
+#   define WXLISTBOX_DATACOLUMN_ARG(x)  (0)
+#endif // wxUSE_CHECKLISTBOX

 
 

-    gtk_idle_remove( data->m_tag );
+#define WXLISTBOX_DATACOLUMN    WXLISTBOX_DATACOLUMN_ARG(this)

 
 

-    // check that the items haven't been deleted from the listbox since we had
-    // installed this callback
-    wxListBox *lbox = data->m_listbox;
-    if ( data->m_item < lbox->GetCount() )
-    {
-        lbox->SetFirstItem( data->m_item );
-    }
+// ----------------------------------------------------------------------------
+// helper functions
+// ----------------------------------------------------------------------------

 
 

-    delete data;
+namespace
+{

 
 

-    gdk_threads_leave();
+// Return the entry for the given listbox item.
+//
+// Return value must be released by caller if non-NULL.
+GtkTreeEntry *
+GetEntry(GtkListStore *store, GtkTreeIter *iter, const wxListBox *listbox)
+{
+    GtkTreeEntry* entry;
+    gtk_tree_model_get(GTK_TREE_MODEL(store),
+                       iter,
+                       WXLISTBOX_DATACOLUMN_ARG(listbox),
+                       &entry,
+                       -1);

 
 

-    return TRUE;
+    return entry;

 }
 
 }
 

+} // anonymous namespace
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// "button_release_event"
+// "row-activated"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once
-   a GDK_2BUTTON_PRESS occurs, but this has the particular problem of the
-   listbox keeping the focus until it receives a GDK_BUTTON_RELEASE event.
-   this can lead to race conditions so that we emit the dclick event
-   after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */
-
-static gint
-gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
-                                     GdkEventButton * WXUNUSED(gdk_event),
-                                     wxListBox *listbox )
+extern "C" {
+static void
+gtk_listbox_row_activated_callback(GtkTreeView        * WXUNUSED(treeview),
+                                   GtkTreePath        *path,
+                                   GtkTreeViewColumn  * WXUNUSED(col),
+                                   wxListBox          *listbox)

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (g_blockEventsOnDrag) return FALSE;
-    if (g_blockEventsOnScroll) return FALSE;
-
-    if (!listbox->m_hasVMT) return FALSE;
-
-    if (!g_hasDoubleClicked) return FALSE;
-
-    wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
-    event.SetEventObject( listbox );
-
-    wxArrayInt aSelections;
-    int n, count = listbox->GetSelections(aSelections);
-    if ( count > 0 )
-    {
-        n = aSelections[0];
-        if ( listbox->HasClientObjectData() )
-            event.SetClientObject( listbox->GetClientObject(n) );
-        else if ( listbox->HasClientUntypedData() )
-            event.SetClientData( listbox->GetClientData(n) );
-        event.SetString( listbox->GetString(n) );
-    }
-    else
-    {
-        n = -1;
-    }
+    if (g_blockEventsOnDrag) return;
+    if (g_blockEventsOnScroll) return;

 
 

-    event.m_commandInt = n;
+    // This is triggered by either a double-click or a space press

 
 

-    listbox->GetEventHandler()->ProcessEvent( event );
+    int sel = gtk_tree_path_get_indices(path)[0];

 
 

-    return FALSE;
+    listbox->GTKOnActivated(sel);
+}

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

-// "button_press_event"
+// "changed"

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-static gint
-gtk_listbox_button_press_callback( GtkWidget *widget,
-                                   GdkEventButton *gdk_event,
-                                   wxListBox *listbox )
+extern "C" {
+static void
+gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
+                              wxListBox *listbox )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (g_blockEventsOnDrag) return FALSE;
-    if (g_blockEventsOnScroll) return FALSE;
-
-    if (!listbox->m_hasVMT) return FALSE;
-
-    int sel = listbox->GtkGetIndex( widget );
-
-#if wxUSE_CHECKLISTBOX
-    if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS))
-    {
-        wxCheckListBox *clb = (wxCheckListBox *)listbox;
-
-        clb->Check( sel, !clb->IsChecked(sel) );
-
-        wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
-        event.SetEventObject( listbox );
-        event.SetInt( sel );
-        listbox->GetEventHandler()->ProcessEvent( event );
-    }
-#endif // wxUSE_CHECKLISTBOX
+    if (g_blockEventsOnDrag) return;

 
 

-    /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
-    g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
+    listbox->GTKOnSelectionChanged();
+}

 
 

-    return FALSE;

 }
 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 

-static gint
-gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
+extern "C" {
+static gboolean
+gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
+                                GdkEventKey *gdk_event,
+                                wxListBox *listbox )

 {
 {

-    if (g_isIdle)
-        wxapp_install_idle_handler();
-
-    if (g_blockEventsOnDrag)
-        return FALSE;
-
-    bool ret = FALSE;
-
-    if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
+    if ((gdk_event->keyval == GDK_Return) ||
+        (gdk_event->keyval == GDK_ISO_Enter) ||
+        (gdk_event->keyval == GDK_KP_Enter))

     {
     {

-        wxNavigationKeyEvent new_event;
-        /* GDK reports GDK_ISO_Left_Tab for SHIFT-TAB */
-        new_event.SetDirection( (gdk_event->keyval == GDK_Tab) );
-        /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
-        new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
-        new_event.SetCurrentFocus( listbox );
-        ret = listbox->GetEventHandler()->ProcessEvent( new_event );
-    }
-
-    if ((gdk_event->keyval == GDK_Return) && (!ret))
-    {
-        // eat return in all modes
-        ret = TRUE;
-    }
-
-#if wxUSE_CHECKLISTBOX
-    if ((gdk_event->keyval == ' ') && (listbox->m_hasCheckBoxes) && (!ret))
-    {
-        int sel = listbox->GtkGetIndex( widget );
-
-        wxCheckListBox *clb = (wxCheckListBox *)listbox;
-
-        clb->Check( sel, !clb->IsChecked(sel) );
-
-        wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
-        new_event.SetEventObject( listbox );
-        new_event.SetInt( sel );
-        ret = listbox->GetEventHandler()->ProcessEvent( new_event );
-    }
-#endif // wxUSE_CHECKLISTBOX
+        int index = -1;
+        if (!listbox->HasMultipleSelection())
+            index = listbox->GetSelection();
+        else
+        {
+            wxArrayInt sels;
+            if (listbox->GetSelections( sels ) < 1)
+                return FALSE;
+            index = sels[0];
+        }

 
 

-    // Check or uncheck item with SPACE
-    if ((gdk_event->keyval == ' ') && (!ret) && 
-         (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
-          ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
-    {
-        int sel = listbox->GtkGetIndex( widget );
-        
-        if (sel != -1)
+        if (index != wxNOT_FOUND)

         {
         {

-            ret = TRUE;
-            
-            if (listbox->IsSelected( sel ))
-                gtk_list_unselect_item( listbox->m_list, sel );
-            else
-                gtk_list_select_item( listbox->m_list, sel );
-            
-            wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
-            new_event.SetEventObject( listbox );
-            wxArrayInt aSelections;
-            int n, count = listbox->GetSelections(aSelections);
-            if ( count > 0 )
-            {
-                n = aSelections[0];
-                if ( listbox->HasClientObjectData() )
-                    new_event.SetClientObject( listbox->GetClientObject(n) );
-                else if ( listbox->HasClientUntypedData() )
-                    new_event.SetClientData( listbox->GetClientData(n) );
-                new_event.SetString( listbox->GetString(n) );
-            }
-            else
+            listbox->GTKOnActivated(index);
+
+//          wxMac and wxMSW always invoke default action
+//          if (!ret)

             {
             {

-                n = -1;
+                // DClick not handled -> invoke default action
+                wxWindow *tlw = wxGetTopLevelParent( listbox );
+                if (tlw)
+                {
+                    GtkWindow *gtk_window = GTK_WINDOW( tlw->GetHandle() );
+                    if (gtk_window)
+                        gtk_window_activate_default( gtk_window );
+                }

             }
             }

-            new_event.m_commandInt = n;
-            listbox->GetEventHandler()->ProcessEvent( new_event );
+
+            // Always intercept, otherwise we'd get another dclick
+            // event from row_activated
+            return TRUE;

         }
     }
         }
     }

-    
-    if (ret)
-    {
-        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
-        return TRUE;
-    }

 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------

-// "select" and "deselect"
+// GtkTreeEntry destruction (to destroy client data)

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection );
-
-static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox )
+extern "C" {
+static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry,
+                                      wxListBox* listbox)

 {
 {

-    gtk_listitem_select_cb( widget, listbox, TRUE );
+    if (listbox->HasClientObjectData())
+    {
+        gpointer userdata = gtk_tree_entry_get_userdata(entry);
+        if (userdata)
+            delete (wxClientData *)userdata;
+    }

 }
 }

-
-static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
-{
-    gtk_listitem_select_cb( widget, listbox, FALSE );

 }
 
 }
 

-static void gtk_listitem_select_cb( GtkWidget *widget,
-                                    wxListBox *listbox,
-                                    bool is_selection )
-{
-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!listbox->m_hasVMT) return;
-    if (g_blockEventsOnDrag) return;
-
-    if (listbox->m_blockEvent) return;
+//-----------------------------------------------------------------------------
+// Sorting callback (standard CmpNoCase return value)
+//-----------------------------------------------------------------------------

 
 

-    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
-    event.SetEventObject( listbox );
+extern "C" {
+static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model),
+                                      GtkTreeIter  *a,
+                                      GtkTreeIter  *b,
+                                      wxListBox    *listbox)
+{
+    wxGtkObject<GtkTreeEntry> entry1(GetEntry(listbox->m_liststore, a, listbox));
+    wxCHECK_MSG(entry1, 0, wxT("Could not get first entry"));

 
 

-    // indicate whether this is a selection or a deselection
-    event.SetExtraLong( is_selection );
+    wxGtkObject<GtkTreeEntry> entry2(GetEntry(listbox->m_liststore, b, listbox));
+    wxCHECK_MSG(entry2, 0, wxT("Could not get second entry"));

 
 

-    if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0)
-    {
-        int sel = listbox->GtkGetIndex( widget );
-
-        if (listbox->m_prevSelection != sel)
-            gtk_list_unselect_item( listbox->m_list, listbox->m_prevSelection );
+    //We compare collate keys here instead of calling g_utf8_collate
+    //as it is rather slow (and even the docs reccommend this)
+    return strcmp(gtk_tree_entry_get_collate_key(entry1),
+                  gtk_tree_entry_get_collate_key(entry2)) >= 0;
+}
+}

 
 

-        listbox->m_prevSelection = sel;
-    }
+//-----------------------------------------------------------------------------
+// Searching callback (TRUE == not equal, FALSE == equal)
+//-----------------------------------------------------------------------------

 
 

-    wxArrayInt aSelections;
-    int n, count = listbox->GetSelections(aSelections);
-    if ( count > 0 )
-    {
-        n = aSelections[0];
-        if ( listbox->HasClientObjectData() )
-            event.SetClientObject( listbox->GetClientObject(n) );
-        else if ( listbox->HasClientUntypedData() )
-            event.SetClientData( listbox->GetClientData(n) );
-        event.SetString( listbox->GetString(n) );
-    }
-    else
-    {
-        n = -1;
-    }
+extern "C" {
+static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
+                                                 gint WXUNUSED(column),
+                                                 const gchar* key,
+                                                 GtkTreeIter* iter,
+                                                 wxListBox* listbox)
+{
+    wxGtkObject<GtkTreeEntry>
+        entry(GetEntry(listbox->m_liststore, iter, listbox));
+    wxCHECK_MSG(entry, 0, wxT("Could not get entry"));

 
 

-    event.m_commandInt = n;
+    wxGtkString keycollatekey(g_utf8_collate_key(key, -1));

 
 

-//    No longer required with new code in wxLB_SINGLE
-//    listbox->GetEventHandler()->AddPendingEvent( event );
-    listbox->GetEventHandler()->ProcessEvent( event );
+    return strcmp(keycollatekey, gtk_tree_entry_get_collate_key(entry)) != 0;
+}

 }
 
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
-

 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // construction
 // ----------------------------------------------------------------------------
 

-wxListBox::wxListBox()
+void wxListBox::Init()

 {
 {

-    m_list = (GtkList *) NULL;
+    m_treeview = NULL;

 #if wxUSE_CHECKLISTBOX
 #if wxUSE_CHECKLISTBOX

-    m_hasCheckBoxes = FALSE;
+    m_hasCheckBoxes = false;

 #endif // wxUSE_CHECKLISTBOX
 }
 
 #endif // wxUSE_CHECKLISTBOX
 }
 


@@ -372,19 +271,15 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
                         long style, const wxValidator& validator,
                         const wxString &name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
-    m_prevSelection = 0;  // or -1 ??
-    m_blockEvent = FALSE;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxListBox creation failed") );
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxListBox creation failed") );

-        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),


@@ -396,462 +291,367 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     }
 
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     }
 

-    m_list = GTK_LIST( gtk_list_new() );

 
 

-    GtkSelectionMode mode;
-    if (style & wxLB_MULTIPLE)
-    {
-        mode = GTK_SELECTION_MULTIPLE;
-    }
-    else if (style & wxLB_EXTENDED)
-    {
-        mode = GTK_SELECTION_EXTENDED;
-    }
-    else
-    {
-        // if style was 0 set single mode
-        m_windowStyle |= wxLB_SINGLE;
-        mode = GTK_SELECTION_MULTIPLE;
-    }
+    GTKScrolledWindowSetBorder(m_widget, style);

 
 

-    gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
+    m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );

 
 

-    gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) );
+    //wxListBox doesn't have a header :)
+    //NB: If enabled SetFirstItem doesn't work correctly
+    gtk_tree_view_set_headers_visible(m_treeview, FALSE);

 
 

-    /* make list scroll when moving the focus down using cursor keys */
-    gtk_container_set_focus_vadjustment(
-        GTK_CONTAINER(m_list),
-        gtk_scrolled_window_get_vadjustment(
-            GTK_SCROLLED_WINDOW(m_widget)));
+#if wxUSE_CHECKLISTBOX
+    if(m_hasCheckBoxes)
+        ((wxCheckListBox*)this)->DoCreateCheckList();
+#endif // wxUSE_CHECKLISTBOX

 
 

-    gtk_widget_show( GTK_WIDGET(m_list) );
+    // Create the data column
+    gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "",
+                                                gtk_cell_renderer_text_new(),
+                                                "text",
+                                                WXLISTBOX_DATACOLUMN, NULL);

 
 

-    if ( style & wxLB_SORT )
-    {
-        // this will change DoAppend() behaviour
-        m_strings = new wxSortedArrayString;
-    }
+    // Now create+set the model (GtkListStore) - first argument # of columns
+#if wxUSE_CHECKLISTBOX
+    if(m_hasCheckBoxes)
+        m_liststore = gtk_list_store_new(2, G_TYPE_BOOLEAN,
+                                            GTK_TYPE_TREE_ENTRY);

     else
     else

-    {
-        m_strings = (wxSortedArrayString *)NULL;
-    }
-
-    for (int i = 0; i < n; i++)
-    {
-        // add one by one
-        DoAppend(choices[i]);
-    }
-
-    m_parent->DoAddChild( this );
-
-    PostCreation(size);
-    SetBestSize(size); // need this too because this is a wxControlWithItems
-
-    return TRUE;
-}
-
-wxListBox::~wxListBox()
-{
-    m_hasVMT = FALSE;
-
-    Clear();
-
-    if (m_strings)
-      delete m_strings;
-}
-
-// ----------------------------------------------------------------------------
-// adding items
-// ----------------------------------------------------------------------------
-
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
-{
-    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
-
-    // VZ: notice that InsertItems knows nothing about sorting, so calling it
-    //     from outside (and not from our own Append) is likely to break
-    //     everything
+#endif
+        m_liststore = gtk_list_store_new(1, GTK_TYPE_TREE_ENTRY);

 
 

-    // code elsewhere supposes we have as many items in m_clientList as items
-    // in the listbox
-    wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(),
-                  wxT("bug in client data management") );
+    gtk_tree_view_set_model(m_treeview, GTK_TREE_MODEL(m_liststore));

 
 

-    InvalidateBestSize();
+    g_object_unref (m_liststore); //free on treeview destruction

 
 

-    GList *children = m_list->children;
-    int length = g_list_length(children);
+    // Disable the pop-up textctrl that enables searching - note that
+    // the docs specify that even if this disabled (which we are doing)
+    // the user can still have it through the start-interactive-search
+    // key binding...either way we want to provide a searchequal callback
+    // NB: If this is enabled a doubleclick event (activate) gets sent
+    //     on a successful search
+    gtk_tree_view_set_search_column(m_treeview, WXLISTBOX_DATACOLUMN);
+    gtk_tree_view_set_search_equal_func(m_treeview,
+       (GtkTreeViewSearchEqualFunc) gtk_listbox_searchequal_callback,
+                                        this,
+                                        NULL);

 
 

-    wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
+    gtk_tree_view_set_enable_search(m_treeview, FALSE);

 
 

-    size_t nItems = items.GetCount();
-    int index;
-
-    if (m_strings)
+    GtkSelectionMode mode;
+    // GTK_SELECTION_EXTENDED is a deprecated synonym for GTK_SELECTION_MULTIPLE
+    if ( style & (wxLB_MULTIPLE | wxLB_EXTENDED) )

     {
     {

-        for (size_t n = 0; n < nItems; n++)
-        {
-            index = m_strings->Add( items[n] );
-
-            if (index != GetCount())
-            {
-                GtkAddItem( items[n], index );
-                wxList::compatibility_iterator node = m_clientList.Item( index );
-                m_clientList.Insert( node, (wxObject*) NULL );
-            }
-            else
-            {
-                GtkAddItem( items[n] );
-                m_clientList.Append( (wxObject*) NULL );
-            }
-        }
+        mode = GTK_SELECTION_MULTIPLE;

     }
     }

-    else
+    else // no multi-selection flags specified

     {
     {

-        if (pos == length)
-        {
-            for ( size_t n = 0; n < nItems; n++ )
-            {
-                GtkAddItem( items[n] );
+        m_windowStyle |= wxLB_SINGLE;

 
 

-                m_clientList.Append((wxObject *)NULL);
-            }
-        }
-        else
-        {
-            wxList::compatibility_iterator node = m_clientList.Item( pos );
-            for ( size_t n = 0; n < nItems; n++ )
-            {
-                GtkAddItem( items[n], pos+n );
+        // 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;
+    }

 
 

-                m_clientList.Insert( node, (wxObject *)NULL );
-            }
-        }
+    GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
+    gtk_tree_selection_set_mode( selection, mode );
+
+    // Handle sortable stuff
+    if(HasFlag(wxLB_SORT))
+    {
+        // Setup sorting in ascending (wx) order
+        gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m_liststore),
+                                             WXLISTBOX_DATACOLUMN,
+                                             GTK_SORT_ASCENDING);
+
+        // Set the sort callback
+        gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(m_liststore),
+                                        WXLISTBOX_DATACOLUMN,
+                   (GtkTreeIterCompareFunc) gtk_listbox_sort_callback,
+                                        this, //userdata
+                                        NULL //"destroy notifier"
+                                       );

     }
 
     }
 

-    wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(),
-                      wxT("bug in client data management") );
-}

 
 

-int wxListBox::DoAppend( const wxString& item )
-{
-    InvalidateBestSize();
+    gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) );

 
 

-    if (m_strings)
-    {
-        // need to determine the index
-        int index = m_strings->Add( item );
+    gtk_widget_show( GTK_WIDGET(m_treeview) );
+    m_focusWidget = GTK_WIDGET(m_treeview);

 
 

-        // only if not at the end anyway
-        if (index != GetCount())
-        {
-           GtkAddItem( item, index );
+    Append(n, choices); // insert initial items

 
 

-           wxList::compatibility_iterator node = m_clientList.Item( index );
-           m_clientList.Insert( node, (wxObject *)NULL );
+    // generate dclick events
+    g_signal_connect_after(m_treeview, "row-activated",
+                     G_CALLBACK(gtk_listbox_row_activated_callback), this);

 
 

-           return index;
-        }
-    }
+    // for intercepting dclick generation by <ENTER>
+    g_signal_connect (m_treeview, "key_press_event",
+                      G_CALLBACK (gtk_listbox_key_press_callback),
+                           this);
+    m_parent->DoAddChild( this );

 
 

-    GtkAddItem(item);
+    PostCreation(size);
+    SetInitialSize(size); // need this too because this is a wxControlWithItems

 
 

-    m_clientList.Append((wxObject *)NULL);
+    g_signal_connect_after (selection, "changed",
+                            G_CALLBACK (gtk_listitem_changed_callback), this);

 
 

-    return GetCount() - 1;
+    return true;

 }
 
 }
 

-void wxListBox::GtkAddItem( const wxString &item, int pos )
+wxListBox::~wxListBox()

 {
 {

-    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+    m_hasVMT = false;

 
 

-    GtkWidget *list_item;
+    Clear();
+}

 
 

-    wxString label(item);
-#if wxUSE_CHECKLISTBOX
-    if (m_hasCheckBoxes)
-    {
-        label.Prepend(wxCHECKLBOX_STRING);
-    }
-#endif // wxUSE_CHECKLISTBOX
+void wxListBox::GTKDisableEvents()
+{
+    GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );

 
 

-    list_item = gtk_list_item_new_with_label( wxGTK_CONV( label ) );
+    g_signal_handlers_block_by_func(selection,
+                                (gpointer) gtk_listitem_changed_callback, this);
+}

 
 

-    GList *gitem_list = g_list_alloc ();
-    gitem_list->data = list_item;
+void wxListBox::GTKEnableEvents()
+{
+    GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );

 
 

-    if (pos == -1)
-        gtk_list_append_items( GTK_LIST (m_list), gitem_list );
-    else
-        gtk_list_insert_items( GTK_LIST (m_list), gitem_list, pos );
+    g_signal_handlers_unblock_by_func(selection,
+                                (gpointer) gtk_listitem_changed_callback, this);

 
 

-    gtk_signal_connect( GTK_OBJECT(list_item), "select",
-      GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+    UpdateOldSelections();
+}

 
 

-    if (HasFlag(wxLB_MULTIPLE) || HasFlag(wxLB_EXTENDED))
-        gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
-          GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );

 
 

-    gtk_signal_connect( GTK_OBJECT(list_item),
-                        "button_press_event",
-                        (GtkSignalFunc)gtk_listbox_button_press_callback,
-                        (gpointer) this );
+void wxListBox::Update()
+{
+    wxWindow::Update();

 
 

-    gtk_signal_connect_after( GTK_OBJECT(list_item),
-                        "button_release_event",
-                        (GtkSignalFunc)gtk_listbox_button_release_callback,
-                        (gpointer) this );
+    if (m_treeview)
+        gdk_window_process_updates(gtk_widget_get_window(GTK_WIDGET(m_treeview)), true);
+}

 
 

-    gtk_signal_connect( GTK_OBJECT(list_item),
-                           "key_press_event",
-                           (GtkSignalFunc)gtk_listbox_key_press_callback,
-                           (gpointer)this );
+// ----------------------------------------------------------------------------
+// adding items
+// ----------------------------------------------------------------------------

 
 

-    ConnectWidget( list_item );
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                             unsigned int pos,
+                             void **clientData,
+                             wxClientDataType type)
+{
+    wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );

 
 

-    gtk_widget_show( list_item );
+    InvalidateBestSize();

 
 

-    if (GTK_WIDGET_REALIZED(m_widget))
+    GtkTreeIter* pIter = NULL; // append by default
+    GtkTreeIter iter;
+    if ( pos != GetCount() )

     {
     {

-        gtk_widget_realize( list_item );
-        gtk_widget_realize( GTK_BIN(list_item)->child );
+        wxCHECK_MSG( GTKGetIteratorFor(pos, &iter), wxNOT_FOUND,
+                     wxT("internal wxListBox error in insertion") );

 
 

-#if wxUSE_TOOLTIPS
-        if (m_tooltip) m_tooltip->Apply( this );
-#endif
+        pIter = &iter;

     }
 
     }
 

-    // Apply current widget style to the new list_item
-    GtkRcStyle *style = CreateWidgetStyle();
-    if (style)
+    const unsigned int numItems = items.GetCount();
+    for ( unsigned int i = 0; i < numItems; ++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 );
-    }
-}
+        wxGtkObject<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);

 
 

-void wxListBox::DoSetItems( const wxArrayString& items,
-                            void **clientData)
-{
-    Clear();
+        GtkTreeIter itercur;
+        gtk_list_store_insert_before(m_liststore, &itercur, pIter);

 
 

-    DoInsertItems(items, 0);
+        GTKSetItem(itercur, entry);

 
 

-    if ( clientData )
-    {
-        size_t count = items.GetCount();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            SetClientData(n, clientData[n]);
-        }
+        if (clientData)
+            AssignNewItemClientData(GTKGetIndexFor(itercur), clientData, i, type);

     }
     }

+
+    UpdateOldSelections();
+
+    return pos + numItems - 1;

 }
 
 // ----------------------------------------------------------------------------
 // deleting items
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // deleting items
 // ----------------------------------------------------------------------------
 

-void wxListBox::Clear()
+void wxListBox::DoClear()

 {
 {

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

 
 

-    gtk_list_clear_items( m_list, 0, GetCount() );
+    GTKDisableEvents(); // just in case

 
 

-    if ( GTK_LIST(m_list)->last_focus_child != NULL  )
-    {
-        // This should be NULL, I think.
-        GTK_LIST(m_list)->last_focus_child = NULL;
-    }
+    InvalidateBestSize();

 
 

-    if ( HasClientObjectData() )
-    {
-        // destroy the data (due to Robert's idea of using wxList<wxObject>
-        // and not wxList<wxClientData> we can't just say
-        // m_clientList.DeleteContents(TRUE) - this would crash!
-        wxList::compatibility_iterator node = m_clientList.GetFirst();
-        while ( node )
-        {
-            delete (wxClientData *)node->GetData();
-            node = node->GetNext();
-        }
-    }
-    m_clientList.Clear();
+    gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */

 
 

-    if ( m_strings )
-        m_strings->Clear();
+    GTKEnableEvents();

 }
 
 }
 

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

 {
 {

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

 
 

-    GList *child = g_list_nth( m_list->children, n );
+    InvalidateBestSize();

 
 

-    wxCHECK_RET( child, wxT("wrong listbox index") );
+    GTKDisableEvents(); // just in case

 
 

-    GList *list = g_list_append( (GList*) NULL, child->data );
-    gtk_list_remove_items( m_list, list );
-    g_list_free( list );
+    GtkTreeIter iter;
+    wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("wrong listbox index") );

 
 

-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    if ( node )
-    {
-        if ( m_clientDataItemsType == wxClientData_Object )
-        {
-            wxClientData *cd = (wxClientData*)node->GetData();
-            delete cd;
-        }
+    // 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);

 
 

-        m_clientList.Erase( node );
-    }
-
-    if ( m_strings )
-        m_strings->RemoveAt(n);
+    GTKEnableEvents();

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

-// client data
+// helper functions for working with iterators

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxListBox::DoSetItemClientData( int n, void* clientData )
+bool wxListBox::GTKGetIteratorFor(unsigned pos, GtkTreeIter *iter) const

 {
 {

-    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") );
+    if ( !gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(m_liststore),
+                                        iter, NULL, pos) )
+    {
+        wxLogDebug(wxT("gtk_tree_model_iter_nth_child(%u) failed"), pos);
+        return false;
+    }

 
 

-    node->SetData( (wxObject*) clientData );
+    return true;

 }
 
 }
 

-void* wxListBox::DoGetItemClientData( int n ) const
+int wxListBox::GTKGetIndexFor(GtkTreeIter& iter) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );
+    GtkTreePath *path =
+        gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);

 
 

-    return node->GetData();
-}
+    gint* pIntPath = gtk_tree_path_get_indices(path);

 
 

-void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
+    wxCHECK_MSG( pIntPath, wxNOT_FOUND, wxT("failed to get iterator path") );

 
 

-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
+    int idx = pIntPath[0];

 
 

-    // wxItemContainer already deletes data for us
+    gtk_tree_path_free( path );

 
 

-    node->SetData( (wxObject*) clientData );
+    return idx;

 }
 
 }
 

-wxClientData* wxListBox::DoGetItemClientObject( int n ) const
+// get GtkTreeEntry from position (note: you need to g_unref it if valid)
+GtkTreeEntry *wxListBox::GTKGetEntry(unsigned n) const

 {
 {

-    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
+    GtkTreeIter iter;
+    if ( !GTKGetIteratorFor(n, &iter) )
+        return NULL;

 
 

-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_MSG( node, (wxClientData *)NULL,
-                 wxT("invalid index in wxListBox::DoGetItemClientObject") );
+    return GetEntry(m_liststore, &iter, this);
+}

 
 

-    return (wxClientData*) node->GetData();
+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);
+    }

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

-// string list access
+// client data

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-wxString wxListBox::GetRealLabel(GList *item) const
+void* wxListBox::DoGetItemClientData(unsigned int n) const

 {
 {

-    GtkBin *bin = GTK_BIN( item->data );
-    GtkLabel *label = GTK_LABEL( bin->child );
-
-    wxString str;
+    wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n));
+    wxCHECK_MSG(entry, NULL, wxT("could not get entry"));

 
 

-#ifdef __WXGTK20__
-    str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
-#else
-    str = wxString( label->label );
-#endif
+    return gtk_tree_entry_get_userdata( entry );
+}

 
 

-#if wxUSE_CHECKLISTBOX
-    // checklistboxes have "[±] " prepended to their lables, remove it
-    //
-    // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk/checklst.h
-    if ( m_hasCheckBoxes )
-        str.erase(0, 4);
-#endif // wxUSE_CHECKLISTBOX
+void wxListBox::DoSetItemClientData(unsigned int n, void* clientData)
+{
+    wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n));
+    wxCHECK_RET(entry, wxT("could not get entry"));

 
 

-    return str;
+    gtk_tree_entry_set_userdata( entry, clientData );

 }
 
 }
 

-void wxListBox::SetString( int n, const wxString &string )
+// ----------------------------------------------------------------------------
+// string list access
+// ----------------------------------------------------------------------------
+
+void wxListBox::SetString(unsigned int n, const wxString& label)

 {
 {

-    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") );
+    wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );

 
 

-    GList *child = g_list_nth( m_list->children, n );
-    if (child)
-    {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
+    GtkTreeEntry* entry = GTKGetEntry(n);
+    wxCHECK_RET( entry, wxT("wrong listbox index") );

 
 

-        wxString str;
-#if wxUSE_CHECKLISTBOX
-        if (m_hasCheckBoxes)
-            str += wxCHECKLBOX_STRING;
-#endif // wxUSE_CHECKLISTBOX
-        str += string;
+    // update the item itself
+    gtk_tree_entry_set_label(entry, wxGTK_CONV(label));

 
 

-        gtk_label_set( label, wxGTK_CONV( str ) );
-    }
-    else
-    {
-        wxFAIL_MSG(wxT("wrong listbox index"));
-    }
+    // and update the model which will refresh the tree too
+    GtkTreeIter iter;
+    wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("failed to get iterator") );
+
+    // FIXME: this resets the checked status of a wxCheckListBox item
+
+    GTKSetItem(iter, entry);

 }
 
 }
 

-wxString wxListBox::GetString( int n ) const
+wxString wxListBox::GetString(unsigned int n) const

 {
 {

-    wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
-
-    GList *child = g_list_nth( m_list->children, n );
-    if (child)
-    {
-        return GetRealLabel(child);
-    }
+    wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );

 
 

-    wxFAIL_MSG(wxT("wrong listbox index"));
+    wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n));
+    wxCHECK_MSG( entry, wxEmptyString, wxT("wrong listbox index") );

 
 

-    return wxT("");
+    return wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) );

 }
 
 }
 

-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const

 {
 {

-    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+    wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") );

 
 

-    GList *children = m_list->children;
-    return g_list_length(children);
+    return (unsigned int)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL);

 }
 
 }
 

-int wxListBox::FindString( const wxString &item ) const
+int wxListBox::FindString( const wxString &item, bool bCase ) const

 {
 {

-    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+    wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );

 
 

-    GList *child = m_list->children;
-    int count = 0;
-    while (child)
-    {
-        if ( GetRealLabel(child) == item )
-            return count;
+    //Sort of hackish - maybe there is a faster way
+    unsigned int nCount = wxListBox::GetCount();

 
 

-        count++;
-        child = child->next;
+    for(unsigned int i = 0; i < nCount; ++i)
+    {
+        if( item.IsSameAs( wxListBox::GetString(i), bCase ) )
+            return (int)i;

     }
 
     }
 

-    // it's not an error if the string is not found -> no wxCHECK

 
 

+    // it's not an error if the string is not found -> no wxCHECK

     return wxNOT_FOUND;
 }
 
     return wxNOT_FOUND;
 }
 


@@ -859,290 +659,267 @@ int wxListBox::FindString( const wxString &item ) const
 // selection
 // ----------------------------------------------------------------------------
 
 // selection
 // ----------------------------------------------------------------------------
 

-int wxListBox::GetSelection() const
+void wxListBox::GTKOnActivated(int item)

 {
 {

-    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+    SendEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, item, IsSelected(item));
+}

 
 

-    GList *child = m_list->children;
-    int count = 0;
-    while (child)
+void wxListBox::GTKOnSelectionChanged()
+{
+    if ( HasFlag(wxLB_MULTIPLE | wxLB_EXTENDED) )
+    {
+        CalcAndSendEvent();
+    }
+    else // single selection

     {
     {

-        if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count;
-        count++;
-        child = child->next;
+        const int item = GetSelection();
+        if ( DoChangeSingleSelection(item) )
+            SendEvent(wxEVT_COMMAND_LISTBOX_SELECTED, item, true);

     }
     }

-    return -1;

 }
 
 }
 

-int wxListBox::GetSelections( wxArrayInt& aSelections ) const
+int wxListBox::GetSelection() const

 {
 {

-    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+    wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox"));
+    wxCHECK_MSG( HasFlag(wxLB_SINGLE), wxNOT_FOUND,
+                    wxT("must be single selection listbox"));

 
 

-    // get the number of selected items first
-    GList *child = m_list->children;
-    int count = 0;
-    for (child = m_list->children; child != NULL; child = child->next)
-    {
-        if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED)
-            count++;
-    }
+    GtkTreeIter iter;
+    GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
+
+    // only works on single-sel
+    if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
+        return wxNOT_FOUND;
+
+    return GTKGetIndexFor(iter);
+}
+
+int wxListBox::GetSelections( wxArrayInt& aSelections ) const
+{
+    wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );

 
     aSelections.Empty();
 
 
     aSelections.Empty();
 

-    if (count > 0)
-    {
-        // now fill the list
-        aSelections.Alloc(count); // optimization attempt
-        int i = 0;
-        for (child = m_list->children; child != NULL; child = child->next, i++)
+    int i = 0;
+    GtkTreeIter iter;
+    GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
+
+    if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(m_liststore), &iter))
+    { //gtk_tree_selection_get_selected_rows is GTK 2.2+ so iter instead
+        do

         {
         {

-            if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED)
-                 aSelections.Add(i);
-        }
+            if (gtk_tree_selection_iter_is_selected(selection, &iter))
+                aSelections.Add(i);
+
+            i++;
+        } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(m_liststore), &iter));

     }
 
     }
 

-    return count;
+    return aSelections.GetCount();

 }
 
 bool wxListBox::IsSelected( int n ) const
 {
 }
 
 bool wxListBox::IsSelected( int n ) const
 {

-    wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
+    wxCHECK_MSG( m_treeview != NULL, false, wxT("invalid listbox") );

 
 

-    GList *target = g_list_nth( m_list->children, n );
+    GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);

 
 

-    wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") );
+    GtkTreeIter iter;
+    wxCHECK_MSG( GTKGetIteratorFor(n, &iter), false, wxT("Invalid index") );

 
 

-    return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ;
+    return gtk_tree_selection_iter_is_selected(selection, &iter);

 }
 
 }
 

-void wxListBox::SetSelection( int n, bool select )
+void wxListBox::DoSetSelection( int n, bool select )

 {
 {

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

 
 

-    m_blockEvent = TRUE;
+    GTKDisableEvents();

 
 

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

     {
     {

-        if ((m_windowStyle & wxLB_SINGLE) != 0)
-            gtk_list_unselect_item( m_list, m_prevSelection );
-        gtk_list_select_item( m_list, n );
-        m_prevSelection = n;
+        gtk_tree_selection_unselect_all(selection);
+        GTKEnableEvents();
+        return;

     }
     }

+
+    wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetSelection") );
+
+
+    GtkTreeIter iter;
+    wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("Invalid index") );
+
+    if (select)
+        gtk_tree_selection_select_iter(selection, &iter);

     else
     else

-        gtk_list_unselect_item( m_list, n );
+        gtk_tree_selection_unselect_iter(selection, &iter);
+
+    GtkTreePath* path = gtk_tree_model_get_path(
+                        GTK_TREE_MODEL(m_liststore), &iter);

 
 

-    m_blockEvent = FALSE;
+    gtk_tree_view_scroll_to_cell(m_treeview, path, NULL, FALSE, 0.0f, 0.0f);
+
+    gtk_tree_path_free(path);
+
+    GTKEnableEvents();

 }
 
 }
 

-void wxListBox::DoSetFirstItem( int n )
+void wxListBox::DoScrollToCell(int n, float alignY, float alignX)

 {
 {

-    wxCHECK_RET( m_list, wxT("invalid listbox") );
+    wxCHECK_RET( m_treeview, wxT("invalid listbox") );
+    wxCHECK_RET( IsValid(n), wxT("invalid index"));

 
 

-    if (gdk_pointer_is_grabbed () && GTK_WIDGET_HAS_GRAB (m_list))
+    //RN: I have no idea why this line is needed...
+    if (gdk_pointer_is_grabbed () && gtk_widget_has_grab(GTK_WIDGET(m_treeview)))

         return;
 
         return;
 

-    // terribly efficient
-    const gchar *vadjustment_key = "gtk-vadjustment";
-    guint vadjustment_key_id = g_quark_from_static_string (vadjustment_key);
-
-    GtkAdjustment *adjustment =
-       (GtkAdjustment*) gtk_object_get_data_by_id (GTK_OBJECT (m_list), vadjustment_key_id);
-    wxCHECK_RET( adjustment, wxT("invalid listbox code") );
+    GtkTreeIter iter;
+    if ( !GTKGetIteratorFor(n, &iter) )
+        return;

 
 

-    GList *target = g_list_nth( m_list->children, n );
-    wxCHECK_RET( target, wxT("invalid listbox index") );
+    GtkTreePath* path = gtk_tree_model_get_path(
+                            GTK_TREE_MODEL(m_liststore), &iter);

 
 

-    GtkWidget *item = GTK_WIDGET(target->data);
-    wxCHECK_RET( item, wxT("invalid listbox code") );
+    // Scroll to the desired cell (0.0 == topleft alignment)
+    gtk_tree_view_scroll_to_cell(m_treeview, path, NULL,
+                                 TRUE, alignY, alignX);

 
 

-    if (item->allocation.y == -1)
-    {
-        wxlistbox_idle_struct* data = new wxlistbox_idle_struct;
-        data->m_listbox = this;
-        data->m_item = n;
-        data->m_tag = gtk_idle_add_priority( 800, wxlistbox_idle_callback, (gpointer) data );
+    gtk_tree_path_free(path);
+}

 
 

-        return;
-    }
+void wxListBox::DoSetFirstItem(int n)
+{
+    DoScrollToCell(n, 0, 0);
+}

 
 

-    float y = item->allocation.y;
-    if (y > adjustment->upper - adjustment->page_size)
-        y = adjustment->upper - adjustment->page_size;
-    gtk_adjustment_set_value( adjustment, y );
+void wxListBox::EnsureVisible(int n)
+{
+    DoScrollToCell(n, 0.5, 0);

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

-// helpers
+// hittest

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-int wxListBox::GtkGetIndex( GtkWidget *item ) const
+int wxListBox::DoListHitTest(const wxPoint& point) const

 {
 {

-    if (item)
-    {
-        GList *child = m_list->children;
-        int count = 0;
-        while (child)
-        {
-            if (GTK_WIDGET(child->data) == item) return count;
-            count++;
-            child = child->next;
-        }
-    }
-    return -1;
-}
+    // gtk_tree_view_get_path_at_pos() also gets items that are not visible and
+    // we only want visible items we need to check for it manually here
+    if ( !GetClientRect().Contains(point) )
+        return wxNOT_FOUND;

 
 

-#if wxUSE_TOOLTIPS
-void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
-{
-    GList *child = m_list->children;
-    while (child)
+    // 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);
+
+    GtkTreePath* path;
+    if ( !gtk_tree_view_get_path_at_pos
+          (
+            m_treeview,
+            point.x - binx,
+            point.y - biny,
+            &path,
+            NULL,   // [out] column (always 0 here)
+            NULL,   // [out] x-coord relative to the cell (not interested)
+            NULL    // [out] y-coord relative to the cell
+          ) )

     {
     {

-        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
-        child = child->next;
+        return wxNOT_FOUND;

     }
     }

+
+    int index = gtk_tree_path_get_indices(path)[0];
+    gtk_tree_path_free(path);
+
+    return index;

 }
 }

-#endif // wxUSE_TOOLTIPS
+
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------

 
 GtkWidget *wxListBox::GetConnectWidget()
 {
 
 GtkWidget *wxListBox::GetConnectWidget()
 {

-    // return GTK_WIDGET(m_list);
-    return m_widget;
+    // the correct widget for listbox events (such as mouse clicks for example)
+    // is m_treeview, not the parent scrolled window
+    return GTK_WIDGET(m_treeview);

 }
 
 }
 

-bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
+GdkWindow *wxListBox::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const

 {
 {

-    return TRUE;
-
-#if 0    
-    if (m_widget->window == window) return TRUE;
-
-    if (GTK_WIDGET(m_list)->window == window) return TRUE;
-
-    GList *child = m_list->children;
-    while (child)
-    {
-        GtkWidget *bin = GTK_WIDGET( child->data );
-        if (bin->window == window) return TRUE;
-        child = child->next;
-    }
-
-    return FALSE;
-#endif
+    return gtk_tree_view_get_bin_window(m_treeview);

 }
 
 void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {
 }
 
 void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
 {

-    if (m_hasBgCol && m_backgroundColour.Ok())
+    if (m_hasBgCol && m_backgroundColour.IsOk())

     {
     {

-        GdkWindow *window = GTK_WIDGET(m_list)->window;
-        if ( window )
+        GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
+        if (window)

         {
         {

-            m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+            m_backgroundColour.CalcPixel( gdk_drawable_get_colormap( window ) );

             gdk_window_set_background( window, m_backgroundColour.GetColor() );
             gdk_window_clear( window );
         }
     }
 
             gdk_window_set_background( window, m_backgroundColour.GetColor() );
             gdk_window_clear( window );
         }
     }
 

-    GList *child = m_list->children;
-    while (child)
-    {
-        gtk_widget_modify_style( GTK_WIDGET(child->data), style );
-
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkWidget *label = GTK_WIDGET( bin->child );
-        gtk_widget_modify_style( label, style );
-
-        child = child->next;
-    }
+    gtk_widget_modify_style( GTK_WIDGET(m_treeview), style );

 }
 
 }
 

-void wxListBox::OnInternalIdle()
+wxSize wxListBox::DoGetBestSize() const

 {
 {

-    wxCursor cursor = m_cursor;
-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
-
-    if (GTK_WIDGET(m_list)->window && cursor.Ok())
-    {
-        /* I now set the cursor the anew in every OnInternalIdle call
-           as setting the cursor in a parent window also effects the
-           windows above so that checking for the current cursor is
-           not possible. */
-
-        gdk_window_set_cursor( GTK_WIDGET(m_list)->window, cursor.GetCursor() );
-
-        GList *child = m_list->children;
-        while (child)
-        {
-            GtkBin *bin = GTK_BIN( child->data );
-            GtkWidget *label = GTK_WIDGET( bin->child );
-
-            if (!label->window)
-                break;
-            else
-                gdk_window_set_cursor( label->window, cursor.GetCursor() );
+    wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view"));

 
 

-            child = child->next;
-        }
-    }
+    // Start with a minimum size that's not too small
+    int cx, cy;
+    GetTextExtent( wxT("X"), &cx, &cy);
+    int lbWidth = 0;
+    int lbHeight = 10;

 
 

-    if (g_delayedFocus == this)
+    // Find the widest string.
+    const unsigned int count = GetCount();
+    if ( count )

     {
     {

-        if (GTK_WIDGET_REALIZED(m_widget))
+        int wLine;
+        for ( unsigned int i = 0; i < count; i++ )

         {
         {

-            gtk_widget_grab_focus( m_widget );
-            g_delayedFocus = NULL;
+            GetTextExtent(GetString(i), &wLine, NULL);
+            if ( wLine > lbWidth )
+                lbWidth = wLine;

         }
     }
 
         }
     }
 

-    if (wxUpdateUIEvent::CanUpdate(this))
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
+    lbWidth += 3 * cx;

 
 

-wxSize wxListBox::DoGetBestSize() const
-{
-    int lbWidth = 100;  // some defaults
-    int lbHeight = 110;
-    int wLine;
-
-    // Find the widest line
-    for(int i = 0; i < GetCount(); i++) {
-        wxString str(GetString(i));
-        GetTextExtent(str, &wLine, NULL);
-        lbWidth = wxMax(lbWidth, wLine);
+    // And just a bit more for the checkbox if present and then some
+    // (these are rough guesses)
+#if wxUSE_CHECKLISTBOX
+    if ( m_hasCheckBoxes )
+    {
+        lbWidth += 35;
+        cy = cy > 25 ? cy : 25; // rough height of checkbox

     }
     }

+#endif

 
     // Add room for the scrollbar
     lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
 
 
     // Add room for the scrollbar
     lbWidth += wxSystemSettings::GetMetric(wxSYS_VSCROLL_X);
 

-    // And just a bit more
-    int cx, cy;
-    GetTextExtent( wxT("X"), &cx, &cy);
-    lbWidth += 3 * cx;
-
-    // don't make the listbox too tall (limit height to around 10 items) but don't
-    // make it too small neither
-    lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
+    // Don't make the listbox too tall but don't make it too small neither
+    lbHeight = (cy+4) * wxMin(wxMax(count, 3), 10);

 
     wxSize best(lbWidth, lbHeight);
 
     wxSize best(lbWidth, lbHeight);

-    CacheBestSize(best);        
+    CacheBestSize(best);

     return best;
 }
 
     return best;
 }
 

-void wxListBox::FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y)
-{
-    // the mouse event coords are relative to the listbox items, we need to
-    // translate them to the normal client coords
-    x += widget->allocation.x;
-    y += widget->allocation.y;
-}
-
-

 // static
 wxVisualAttributes
 wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {
 // static
 wxVisualAttributes
 wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 {

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

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

-