Add missing wxEVT_COMMAND_TEXT_ENTER

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 0f28034f816efc596d89b8c0744ce089887f46ba..788f1f4cb22cd9438f2ca39f1faf143799fe3105 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -25,15 +25,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/treeentry_gtk.h"
+

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

+#if GTK_CHECK_VERSION(3,0,0)
+#include <gdk/gdkkeysyms-compat.h>
+#endif

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


@@ -56,6 +61,31 @@ 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.
+//
+// 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 entry;
+}
+
+} // anonymous namespace
+

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


@@ -74,37 +104,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);

 }
 }
 
 }
 }
 


@@ -119,70 +119,60 @@ gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
 {
     if (g_blockEventsOnDrag) return;
 
 {
     if (g_blockEventsOnDrag) return;
 

-    if (listbox->m_blockEvent) 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 );
+    listbox->GTKOnSelectionChanged();
+}

 
 

-        if (selections.GetCount() == 0)
-        {
-            // indicate that this is a deselection
-            event.SetExtraLong( 0 );
-            event.SetInt( -1 );
+}

 
 

-            listbox->HandleWindowEvent( event );
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------

 
 

-            return;
-        }
+extern "C" {
+static gboolean
+gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
+                                GdkEventKey *gdk_event,
+                                wxListBox *listbox )
+{
+    if ((gdk_event->keyval == GDK_Return) ||
+        (gdk_event->keyval == GDK_ISO_Enter) ||
+        (gdk_event->keyval == GDK_KP_Enter))
+    {
+        int index = -1;
+        if (!listbox->HasMultipleSelection())
+            index = listbox->GetSelection();

         else
         {
         else
         {

-            // indicate that this is a selection
-            event.SetExtraLong( 1 );
-            event.SetInt( selections[0] );
-
-            listbox->HandleWindowEvent( event );
+            wxArrayInt sels;
+            if (listbox->GetSelections( sels ) < 1)
+                return FALSE;
+            index = sels[0];

         }
         }

-    }
-    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
+        if (index != wxNOT_FOUND)

         {
         {

-            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->GTKOnActivated(index);
+
+//          wxMac and wxMSW always invoke default action
+//          if (!ret)
+            {
+                // 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 );
+                }
+            }
+
+            // Always intercept, otherwise we'd get another dclick
+            // event from row_activated
+            return TRUE;

         }
     }
         }
     }

+
+    return FALSE;

 }
 }
 
 }
 }
 


@@ -213,29 +203,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"));
+    wxGtkObject<GtkTreeEntry> entry1(GetEntry(listbox->m_liststore, a, listbox));
+    wxCHECK_MSG(entry1, 0, wxT("Could not get first entry"));

 
 

-    //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));
+    wxGtkObject<GtkTreeEntry> entry2(GetEntry(listbox->m_liststore, b, listbox));
+    wxCHECK_MSG(entry2, 0, wxT("Could not get second entry"));

 
 

-    g_object_unref (entry);
-    g_object_unref (entry2);
-
-    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(gtk_tree_entry_get_collate_key(entry1),
+                  gtk_tree_entry_get_collate_key(entry2)) >= 0;

 }
 }
 
 }
 }
 


@@ -250,21 +227,13 @@ 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);
+    wxGtkObject<GtkTreeEntry>
+        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, gtk_tree_entry_get_collate_key(entry)) != 0;

 }
 }
 
 }
 }
 


@@ -272,15 +241,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


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

-    m_blockEvent = false;
-

     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {


@@ -313,7 +278,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),


@@ -326,7 +292,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( ) );
 


@@ -372,28 +338,24 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_tree_view_set_enable_search(m_treeview, FALSE);
 
 
     gtk_tree_view_set_enable_search(m_treeview, FALSE);
 

-
-    GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
-
-    g_signal_connect_after (selection, "changed",
-                            G_CALLBACK (gtk_listitem_changed_callback), this);
-

     GtkSelectionMode mode;
     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 );

     gtk_tree_selection_set_mode( selection, mode );
 
     // Handle sortable stuff
     gtk_tree_selection_set_mode( selection, mode );
 
     // Handle sortable stuff


@@ -425,11 +387,18 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     g_signal_connect_after(m_treeview, "row-activated",
                      G_CALLBACK(gtk_listbox_row_activated_callback), this);
 
     g_signal_connect_after(m_treeview, "row-activated",
                      G_CALLBACK(gtk_listbox_row_activated_callback), this);
 

+    // 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 );
 
     PostCreation(size);
     SetInitialSize(size); // need this too because this is a wxControlWithItems
 
     m_parent->DoAddChild( this );
 
     PostCreation(size);
     SetInitialSize(size); // need this too because this is a wxControlWithItems
 

+    g_signal_connect_after (selection, "changed",
+                            G_CALLBACK (gtk_listitem_changed_callback), this);
+

     return true;
 }
 
     return true;
 }
 


@@ -440,6 +409,33 @@ wxListBox::~wxListBox()
     Clear();
 }
 
     Clear();
 }
 

+void wxListBox::GTKDisableEvents()
+{
+    GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
+
+    g_signal_handlers_block_by_func(selection,
+                                (gpointer) gtk_listitem_changed_callback, this);
+}
+
+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);
+
+    UpdateOldSelections();
+}
+
+
+void wxListBox::Update()
+{
+    wxWindow::Update();
+
+    if (m_treeview)
+        gdk_window_process_updates(gtk_widget_get_window(GTK_WIDGET(m_treeview)), true);
+}
+

 // ----------------------------------------------------------------------------
 // adding items
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // adding items
 // ----------------------------------------------------------------------------


@@ -447,7 +443,7 @@ wxListBox::~wxListBox()
 int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
                              unsigned int pos,
                              void **clientData,
 int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
                              unsigned int pos,
                              void **clientData,

-                             wxClientDataType WXUNUSED(type))
+                             wxClientDataType type)

 {
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
 {
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 


@@ -457,7 +453,7 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
     GtkTreeIter iter;
     if ( pos != GetCount() )
     {
     GtkTreeIter iter;
     if ( pos != GetCount() )
     {

-        wxCHECK_MSG( GtkGetIteratorFor(pos, &iter), wxNOT_FOUND,
+        wxCHECK_MSG( GTKGetIteratorFor(pos, &iter), wxNOT_FOUND,

                      wxT("internal wxListBox error in insertion") );
 
         pIter = &iter;
                      wxT("internal wxListBox error in insertion") );
 
         pIter = &iter;


@@ -466,23 +462,23 @@ int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
     const unsigned int numItems = items.GetCount();
     for ( unsigned int i = 0; i < numItems; ++i )
     {
     const unsigned int numItems = items.GetCount();
     for ( unsigned int i = 0; i < numItems; ++i )
     {

-        GtkTreeEntry* entry = gtk_tree_entry_new();
+        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);
 
         gtk_tree_entry_set_label(entry, wxGTK_CONV(items[i]));
         gtk_tree_entry_set_destroy_func(entry,
                 (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
                             this);
 

-        if (clientData)
-            gtk_tree_entry_set_userdata(entry, clientData[i]);
-

         GtkTreeIter itercur;
         gtk_list_store_insert_before(m_liststore, &itercur, pIter);
 
         GtkTreeIter itercur;
         gtk_list_store_insert_before(m_liststore, &itercur, pIter);
 

-        GtkSetItem(itercur, entry);
+        GTKSetItem(itercur, entry);

 
 

-        g_object_unref (entry);
+        if (clientData)
+            AssignNewItemClientData(GTKGetIndexFor(itercur), clientData, i, type);

     }
 
     }
 

+    UpdateOldSelections();
+

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


@@ -494,9 +490,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)


@@ -505,19 +507,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) )


@@ -529,14 +535,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];
 


@@ -546,21 +552,16 @@ 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
+GtkTreeEntry *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;
+    return GetEntry(m_liststore, &iter, this);

 }
 
 }
 

-void wxListBox::GtkSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry)
+void wxListBox::GTKSetItem(GtkTreeIter& iter, const GtkTreeEntry *entry)

 {
 #if wxUSE_CHECKLISTBOX
     if ( m_hasCheckBoxes )
 {
 #if wxUSE_CHECKLISTBOX
     if ( m_hasCheckBoxes )


@@ -583,27 +584,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);
+    wxGtkObject<GtkTreeEntry> 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 gtk_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);
+    wxGtkObject<GtkTreeEntry> entry(GTKGetEntry(n));

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

-    g_object_unref (entry);

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


@@ -615,7 +607,7 @@ 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( IsValid(n), wxT("invalid index in wxListBox::SetString") );
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 

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

     wxCHECK_RET( entry, wxT("wrong listbox index") );
 
     // update the item itself
     wxCHECK_RET( entry, wxT("wrong listbox index") );
 
     // update the item itself


@@ -623,24 +615,21 @@ void wxListBox::SetString(unsigned int n, const wxString& label)
 
     // and update the model which will refresh the tree too
     GtkTreeIter iter;
 
     // and update the model which will refresh the tree too
     GtkTreeIter iter;

-    wxCHECK_RET( GtkGetIteratorFor(n, &iter), _T("failed to get iterator") );
+    wxCHECK_RET( GTKGetIteratorFor(n, &iter), wxT("failed to get iterator") );

 
     // FIXME: this resets the checked status of a wxCheckListBox item
 
 
     // FIXME: this resets the checked status of a wxCheckListBox item
 

-    GtkSetItem(iter, entry);
+    GTKSetItem(iter, entry);

 }
 
 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);
+    wxGtkObject<GtkTreeEntry> 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( gtk_tree_entry_get_label(entry) );

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


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

+void wxListBox::GTKOnActivated(int item)
+{
+    SendEvent(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, 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_COMMAND_LISTBOX_SELECTED, 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"));


@@ -685,7 +693,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


@@ -694,7 +702,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);
 


@@ -719,50 +727,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 )
 {
 }
 
 void wxListBox::DoSetSelection( int n, bool select )
 {

+    wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
+
+    GTKDisableEvents();
+
+    GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
+

     // passing -1 to SetSelection() is documented to deselect all items
     if ( n == wxNOT_FOUND )
     {
     // passing -1 to SetSelection() is documented to deselect all items
     if ( n == wxNOT_FOUND )
     {

-        // ... and not generate any events in the process
-        GtkDeselectAll();
+        gtk_tree_selection_unselect_all(selection);
+        GTKEnableEvents();

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

-    // don't generate the selection event
-    GtkSetSelection(n, select, true);
-}
-
-void wxListBox::GtkDeselectAll()
-{
-    wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
-
-    GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);
-
-    m_blockEvent = true;
-
-    gtk_tree_selection_unselect_all(selection);
-
-    m_blockEvent = false;
-}
-
-void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent)
-{
-    wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
-
-    GtkTreeSelection* selection = gtk_tree_view_get_selection(m_treeview);

 
     GtkTreeIter iter;
 
     GtkTreeIter iter;

-    wxCHECK_RET( GtkGetIteratorFor(n, &iter), wxT("Invalid index") );
-
-    m_blockEvent = blockEvent;
+    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);


@@ -776,20 +766,20 @@ void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent)
 
     gtk_tree_path_free(path);
 
 
     gtk_tree_path_free(path);
 

-    m_blockEvent = false;
+    GTKEnableEvents();

 }
 
 }
 

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

 {
     wxCHECK_RET( m_treeview, wxT("invalid listbox") );
     wxCHECK_RET( IsValid(n), wxT("invalid index"));
 
     //RN: I have no idea why this line is needed...
 {
     wxCHECK_RET( m_treeview, wxT("invalid listbox") );
     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 (gdk_pointer_is_grabbed () && 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(


@@ -797,11 +787,21 @@ void wxListBox::DoSetFirstItem( int n )
 
     // Scroll to the desired cell (0.0 == topleft alignment)
     gtk_tree_view_scroll_to_cell(m_treeview, path, NULL,
 
     // Scroll to the desired cell (0.0 == topleft alignment)
     gtk_tree_view_scroll_to_cell(m_treeview, path, NULL,

-                                 TRUE, 0.0f, 0.0f);
+                                 TRUE, alignY, alignX);

 
     gtk_tree_path_free(path);
 }
 
 
     gtk_tree_path_free(path);
 }
 

+void wxListBox::DoSetFirstItem(int n)
+{
+    DoScrollToCell(n, 0, 0);
+}
+
+void wxListBox::EnsureVisible(int n)
+{
+    DoScrollToCell(n, 0.5, 0);
+}
+

 // ----------------------------------------------------------------------------
 // hittest
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // hittest
 // ----------------------------------------------------------------------------


@@ -816,7 +816,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


@@ -843,14 +843,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)


@@ -865,7 +857,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)


@@ -875,8 +870,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


@@ -886,43 +882,40 @@ wxSize wxListBox::DoGetBestSize() const
     // Start with a minimum size that's not too small
     int cx, cy;
     GetTextExtent( wxT("X"), &cx, &cy);
     // Start with a minimum size that's not too small
     int cx, cy;
     GetTextExtent( wxT("X"), &cx, &cy);

-    int lbWidth = 3 * cx;
+    int lbWidth = 0;

     int lbHeight = 10;
 
     int lbHeight = 10;
 

-    // Get the visible area of the tree view (limit to the 10th item
-    // so that it isn't too big)
-    unsigned int count = GetCount();
-    if (count)
+    // Find the widest string.
+    const unsigned int count = GetCount();
+    if ( count )

     {
         int wLine;
     {
         int wLine;

-
-        // Find the widest line
-        for(unsigned int i = 0; i < count; i++) {
-            wxString str(GetString(i));
-            GetTextExtent(str, &wLine, NULL);
-            lbWidth = wxMax(lbWidth, wLine);
+        for ( unsigned int i = 0; i < count; i++ )
+        {
+            GetTextExtent(GetString(i), &wLine, NULL);
+            if ( wLine > lbWidth )
+                lbWidth = wLine;

         }
         }

+    }

 
 

-        lbWidth += 3 * cx;
+    lbWidth += 3 * cx;

 
 

-        // And just a bit more for the checkbox if present and then some
-        // (these are rough guesses)
+    // And just a bit more for the checkbox if present and then some
+    // (these are rough guesses)

 #if wxUSE_CHECKLISTBOX
 #if wxUSE_CHECKLISTBOX

-        if ( m_hasCheckBoxes )
-        {
-            lbWidth += 35;
-            cy = cy > 25 ? cy : 25; // rough height of checkbox
-        }
-#endif
-
-        // 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(count, 3), 10);
+    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);
 

+    // 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);
     CacheBestSize(best);
     return best;
     wxSize best(lbWidth, lbHeight);
     CacheBestSize(best);
     return best;