removed stray return from SetFont()

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index a8d8ab56454205c459f6b221aec20f361a9c0835..95636a79d5d4a0d31d3bbcbb39c914995ddd9cea 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -20,11 +20,11 @@
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/utils.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
 
 #endif
 

-#include "wx/arrstr.h"
-#include "wx/checklst.h"
-#include "wx/settings.h"

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


@@ -42,7 +42,6 @@
 
 extern bool           g_blockEventsOnDrag;
 extern bool           g_blockEventsOnScroll;
 
 extern bool           g_blockEventsOnDrag;
 extern bool           g_blockEventsOnScroll;

-extern wxCursor       g_globalCursor;

 
 
 
 
 
 


@@ -50,11 +49,11 @@ extern wxCursor       g_globalCursor;
 // Macro to tell which row the strings are in (1 if native checklist, 0 if not)
 //-----------------------------------------------------------------------------
 
 // Macro to tell which row the strings are in (1 if native checklist, 0 if not)
 //-----------------------------------------------------------------------------
 

-#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#if wxUSE_CHECKLISTBOX

 #   define WXLISTBOX_DATACOLUMN_ARG(x)  (x->m_hasCheckBoxes ? 1 : 0)
 #else
 #   define WXLISTBOX_DATACOLUMN_ARG(x)  (0)
 #   define WXLISTBOX_DATACOLUMN_ARG(x)  (x->m_hasCheckBoxes ? 1 : 0)
 #else
 #   define WXLISTBOX_DATACOLUMN_ARG(x)  (0)

-#endif // wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#endif // wxUSE_CHECKLISTBOX

 
 #define WXLISTBOX_DATACOLUMN    WXLISTBOX_DATACOLUMN_ARG(this)
 
 
 #define WXLISTBOX_DATACOLUMN    WXLISTBOX_DATACOLUMN_ARG(this)
 


@@ -74,123 +73,41 @@ gtk_listbox_row_activated_callback(GtkTreeView        *treeview,
     if (g_blockEventsOnDrag) return;
     if (g_blockEventsOnScroll) return;
 
     if (g_blockEventsOnDrag) return;
     if (g_blockEventsOnScroll) return;
 

-    if (!listbox->m_hasVMT) return;
-
-    //Notes:
-    //1) This is triggered by either a double-click or a space press
-    //2) We handle both here because
-    //2a) in the case of a space/keypress we can't really know
-    //    which item was pressed on because we can't get coords
-    //    from a keyevent
-    //2b) It seems more correct
+    // This is triggered by either a double-click or a space press

 
     int sel = gtk_tree_path_get_indices(path)[0];
 
 
     int sel = gtk_tree_path_get_indices(path)[0];
 

-    if(!listbox->m_spacePressed)
-    {
-        //Assume it was double-click
-        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);
+    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+    event.SetEventObject( listbox );

 
 

-        listbox->GetEventHandler()->ProcessEvent( event );
-    }
-    else
+    if (listbox->IsSelected(sel))

     {
     {

-        listbox->m_spacePressed = false; //don't block selection behaviour anymore
-
-        //Space was pressed - toggle the appropriate checkbox and the selection
-#if wxUSE_CHECKLISTBOX //Do it for both native and non-native
-        if (listbox->m_hasCheckBoxes)
+        GtkTreeEntry* entry = listbox->GtkGetEntry(sel);
+        
+        if (entry)

         {
         {

-            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 );
-            listbox->GetEventHandler()->ProcessEvent( new_event );
+            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);

         }
         }

-#endif // wxUSE_CHECKLISTBOX
-
-        if(  (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
-              ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
+        else

         {
         {

-            //toggle the selection + send event
-            listbox->GtkSetSelection(sel, !listbox->IsSelected( sel ), false);
+            wxLogSysError(wxT("Internal error - could not get entry for double-click"));
+            event.SetInt(-1);

         }
     }
         }
     }

-}
-}
-
-//-----------------------------------------------------------------------------
-// "button_press_event"
-//-----------------------------------------------------------------------------
-
-extern "C" {
-static gint
-gtk_listbox_button_press_callback( GtkWidget *widget,
-                                   GdkEventButton *gdk_event,
-                                   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;
-
-    //Just to be on the safe side - it should be unset in the activate callback
-    //but we don't want any obscure bugs if it doesn't get called somehow...
-    listbox->m_spacePressed = false;
-
-#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST
-    if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS))
+    else

     {
     {

-        GtkTreePath* path;
-        gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget),
-                                  (gint)gdk_event->x, (gint)gdk_event->y,
-                                  &path, NULL, NULL, NULL);
-        int sel = gtk_tree_path_get_indices(path)[0];
-        gtk_tree_path_free(path);
-
-        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 );
+        event.SetInt(-1);

     }
     }

-#endif // wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST

 
 

-    return FALSE;
+    listbox->GetEventHandler()->ProcessEvent( event );

 }
 }
 
 }
 }
 


@@ -204,13 +121,8 @@ gtk_listbox_key_press_callback( GtkWidget *widget,
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )
 {
                                 GdkEventKey *gdk_event,
                                 wxListBox *listbox )
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-

     if (g_blockEventsOnDrag) return FALSE;
 
     if (g_blockEventsOnDrag) return FALSE;
 

-
-    bool ret = false;
-

     if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
     {
         wxNavigationKeyEvent new_event;
     if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
     {
         wxNavigationKeyEvent new_event;


@@ -219,32 +131,8 @@ gtk_listbox_key_press_callback( GtkWidget *widget,
         /* CTRL-TAB changes the (parent) window, i.e. switch notebook page */
         new_event.SetWindowChange( (gdk_event->state & GDK_CONTROL_MASK) );
         new_event.SetCurrentFocus( listbox );
         /* 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 (RN:WHY?)
-        ret = true;
-    }
-
-    // Check or uncheck item with SPACE
-    if (gdk_event->keyval == ' ')
-        {
-        //In the keyevent we don't know the index of the item
-        //and the activated event gets called anyway...
-        //
-        //Also, activating with the space causes the treeview to
-        //unselect all the items and then select the item in question
-        //wx's behaviour is to just toggle the item's selection state
-        //and leave the others alone
-        listbox->m_spacePressed = true;
-    }
-
-    if (ret)
-    {
-        g_signal_stop_emission_by_name (widget, "key_press_event");
-        return TRUE;
+        if (listbox->GetEventHandler()->ProcessEvent( new_event ))
+            return TRUE;

     }
 
     return FALSE;
     }
 
     return FALSE;


@@ -252,79 +140,79 @@ gtk_listbox_key_press_callback( GtkWidget *widget,
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// "select" and "deselect"
+// "changed"

 //-----------------------------------------------------------------------------
 
 extern "C" {
 //-----------------------------------------------------------------------------
 
 extern "C" {

-static gboolean gtk_listitem_select_cb( GtkTreeSelection* selection,
-                                        GtkTreeModel* model,
-                                        GtkTreePath* path,
-                                        gboolean is_selected,
-                                        wxListBox *listbox )
+static void
+gtk_listitem_changed_callback( GtkTreeSelection* selection, wxListBox *listbox )

 {
 {

-    if (g_isIdle) wxapp_install_idle_handler();
-
-    if (!listbox->m_hasVMT) return TRUE;
-    if (g_blockEventsOnDrag) return TRUE;
-
-    if (listbox->m_spacePressed) return FALSE; //see keyevent callback
-    if (listbox->m_blockEvent) return TRUE;
-
-    // NB: wxdocs explicitly say that this event only gets sent when
-    // something is actually selected, plus the controls example
-    // assumes so and passes -1 to the dogetclientdata funcs if not
-
-    // OK, so basically we need to do a bit of a run-around here as
-    // 1) is_selected says whether the item(s?) are CURRENTLY selected -
-    //    i.e. if is_selected is FALSE then the item is going to be
-    //    selected right now!
-    // 2) However, since it is not already selected and the user
-    //    will expect it to be we need to manually select it and
-    //    return FALSE telling GTK we handled the selection
-    if (is_selected) return TRUE;
-
-    int nIndex = gtk_tree_path_get_indices(path)[0];
-    GtkTreeEntry* entry = listbox->GtkGetEntry(nIndex);
+    if (g_blockEventsOnDrag) return;
+    
+    if (listbox->m_blockEvent) return;
+    
+    wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+    event.SetEventObject( listbox );

 
 

-    if(entry)
+    if (listbox->HasFlag(wxLB_MULTIPLE) || listbox->HasFlag(wxLB_EXTENDED))

     {
     {

-        //Now, as mentioned above, we manually select the row that is/was going
-        //to be selected anyway by GTK
-        listbox->m_blockEvent = true; //if we don't block events we will lock the
-                                      //app due to recursion!!
-
-        GtkTreeSelection* selection =
-            gtk_tree_view_get_selection(listbox->m_treeview);
-        GtkTreeIter iter;
-        gtk_tree_model_get_iter(GTK_TREE_MODEL(listbox->m_liststore), &iter, path);
-        gtk_tree_selection_select_iter(selection, &iter);
-
-        listbox->m_blockEvent = false;
-
-        //Finally, send the wx event
-        wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
-        event.SetEventObject( listbox );
+        wxArrayInt selections;
+        listbox->GetSelections( selections );
+        
+        if (selections.GetCount() == 0)
+        {
+            // indicate that this is a deselection
+            event.SetExtraLong( 0 );
+            event.SetInt( -1 );
+        
+            listbox->GetEventHandler()->ProcessEvent( event );
+        
+            return;
+        }
+        else
+        {
+            // indicate that this is a selection
+            event.SetExtraLong( 1 );
+            event.SetInt( selections[0] );
+        
+            listbox->GetEventHandler()->ProcessEvent( event );
+        }
+    }
+    else
+    {
+        int index = listbox->GetSelection();
+        if (index == wxNOT_FOUND)
+        {
+            // indicate that this is a deselection
+            event.SetExtraLong( 0 );
+            event.SetInt( -1 );
+        
+            listbox->GetEventHandler()->ProcessEvent( event );
+        
+            return;
+        }
+        else
+        {
+            GtkTreeEntry* entry = listbox->GtkGetEntry( index );

 
 

-        // indicate whether this is a selection or a deselection
-        event.SetExtraLong( 1 );
+            // indicate that this is a selection
+            event.SetExtraLong( 1 );

 
 

-        event.SetInt(nIndex);
-        event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));
+            event.SetInt( index );
+            event.SetString(wxConvUTF8.cMB2WX(gtk_tree_entry_get_label(entry)));

 
 

-        if ( listbox->HasClientObjectData() )
-            event.SetClientObject(
+            if ( listbox->HasClientObjectData() )
+                event.SetClientObject(

                     (wxClientData*) gtk_tree_entry_get_userdata(entry)
                                  );
                     (wxClientData*) gtk_tree_entry_get_userdata(entry)
                                  );

-        else if ( listbox->HasClientUntypedData() )
-            event.SetClientData( gtk_tree_entry_get_userdata(entry) );
+            else if ( listbox->HasClientUntypedData() )
+                event.SetClientData( gtk_tree_entry_get_userdata(entry) );

 
 

-        listbox->GetEventHandler()->ProcessEvent( event );
+            listbox->GetEventHandler()->ProcessEvent( event );

 
 

-        g_object_unref (entry);
-        return FALSE;  //We handled it/did it manually
+            g_object_unref (entry);
+        }

     }
     }

-
-    return TRUE; //allow selection to change

 }
 }
 
 }
 }
 


@@ -336,10 +224,10 @@ extern "C" {
 static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry,
                                       wxListBox* listbox)
 {
 static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry,
                                       wxListBox* listbox)
 {

-    if(listbox->HasClientObjectData())
+    if (listbox->HasClientObjectData())

     {
         gpointer userdata = gtk_tree_entry_get_userdata(entry);
     {
         gpointer userdata = gtk_tree_entry_get_userdata(entry);

-        if(userdata)
+        if (userdata)

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


@@ -399,12 +287,11 @@ static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model,
                              WXLISTBOX_DATACOLUMN_ARG(listbox),
                              &entry, -1);
     wxCHECK_MSG(entry, 0, wxT("Could not get entry"));
                              WXLISTBOX_DATACOLUMN_ARG(listbox),
                              &entry, -1);
     wxCHECK_MSG(entry, 0, wxT("Could not get entry"));

-    gchar* keycollatekey = g_utf8_collate_key(key, -1);
+    wxGtkString keycollatekey(g_utf8_collate_key(key, -1));

 
     int ret = strcasecmp(keycollatekey,
                          gtk_tree_entry_get_collate_key(entry));
 
 
     int ret = strcasecmp(keycollatekey,
                          gtk_tree_entry_get_collate_key(entry));
 

-    g_free(keycollatekey);

     g_object_unref (entry);
 
     return ret != 0;
     g_object_unref (entry);
 
     return ret != 0;


@@ -427,7 +314,6 @@ void wxListBox::Init()
 #if wxUSE_CHECKLISTBOX
     m_hasCheckBoxes = false;
 #endif // wxUSE_CHECKLISTBOX
 #if wxUSE_CHECKLISTBOX
     m_hasCheckBoxes = false;
 #endif // wxUSE_CHECKLISTBOX

-    m_spacePressed = false;

 }
 
 bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 }
 
 bool wxListBox::Create( wxWindow *parent, wxWindowID id,


@@ -480,10 +366,10 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     //NB: If enabled SetFirstItem doesn't work correctly
     gtk_tree_view_set_headers_visible(m_treeview, FALSE);
 
     //NB: If enabled SetFirstItem doesn't work correctly
     gtk_tree_view_set_headers_visible(m_treeview, FALSE);
 

-#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#if wxUSE_CHECKLISTBOX

     if(m_hasCheckBoxes)
         ((wxCheckListBox*)this)->DoCreateCheckList();
     if(m_hasCheckBoxes)
         ((wxCheckListBox*)this)->DoCreateCheckList();

-#endif // wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#endif // wxUSE_CHECKLISTBOX

 
     // Create the data column
     gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "",
 
     // Create the data column
     gtk_tree_view_insert_column_with_attributes(m_treeview, -1, "",


@@ -492,7 +378,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                                                 WXLISTBOX_DATACOLUMN, NULL);
 
     // Now create+set the model (GtkListStore) - first argument # of columns
                                                 WXLISTBOX_DATACOLUMN, NULL);
 
     // Now create+set the model (GtkListStore) - first argument # of columns

-#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#if wxUSE_CHECKLISTBOX

     if(m_hasCheckBoxes)
         m_liststore = gtk_list_store_new(2, G_TYPE_BOOLEAN,
                                             GTK_TYPE_TREE_ENTRY);
     if(m_hasCheckBoxes)
         m_liststore = gtk_list_store_new(2, G_TYPE_BOOLEAN,
                                             GTK_TYPE_TREE_ENTRY);


@@ -520,9 +406,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
 
     GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );
 
 
     GtkTreeSelection* selection = gtk_tree_view_get_selection( m_treeview );

-    gtk_tree_selection_set_select_function(selection,
-                     (GtkTreeSelectionFunc)gtk_listitem_select_cb,
-                                           this, NULL); //NULL == destroycb
+    
+    g_signal_connect_after (selection, "changed",
+                            G_CALLBACK (gtk_listitem_changed_callback), this);

 
     GtkSelectionMode mode;
     if (style & wxLB_MULTIPLE)
 
     GtkSelectionMode mode;
     if (style & wxLB_MULTIPLE)


@@ -542,15 +428,15 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_tree_selection_set_mode( selection, mode );
 
 
     gtk_tree_selection_set_mode( selection, mode );
 

-    //Handle sortable stuff
+    // Handle sortable stuff

     if(style & wxLB_SORT)
     {
     if(style & wxLB_SORT)
     {

-        //Setup sorting in ascending (wx) order
+        // Setup sorting in ascending (wx) order

         gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m_liststore),
                                              WXLISTBOX_DATACOLUMN,
                                              GTK_SORT_ASCENDING);
 
         gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(m_liststore),
                                              WXLISTBOX_DATACOLUMN,
                                              GTK_SORT_ASCENDING);
 

-        //Set the sort callback
+        // Set the sort callback

         gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(m_liststore),
                                         WXLISTBOX_DATACOLUMN,
                    (GtkTreeIterCompareFunc) gtk_listbox_sort_callback,
         gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(m_liststore),
                                         WXLISTBOX_DATACOLUMN,
                    (GtkTreeIterCompareFunc) gtk_listbox_sort_callback,


@@ -563,17 +449,15 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) );
 
     gtk_widget_show( GTK_WIDGET(m_treeview) );
     gtk_container_add (GTK_CONTAINER (m_widget), GTK_WIDGET(m_treeview) );
 
     gtk_widget_show( GTK_WIDGET(m_treeview) );

+    m_focusWidget = GTK_WIDGET(m_treeview);

 
     wxListBox::DoInsertItems(wxArrayString(n, choices), 0); // insert initial items
 
 
     wxListBox::DoInsertItems(wxArrayString(n, choices), 0); // insert initial items
 

-    //treeview-specific events
-    g_signal_connect(m_treeview, "row-activated",
+    // generate dclick events
+    g_signal_connect_after(m_treeview, "row-activated",

                      G_CALLBACK(gtk_listbox_row_activated_callback), this);
 
                      G_CALLBACK(gtk_listbox_row_activated_callback), this);
 

-    // other events
-    g_signal_connect (m_treeview, "button_press_event",
-                      G_CALLBACK (gtk_listbox_button_press_callback),
-                      this);
+    // for panel navigation

     g_signal_connect (m_treeview, "key_press_event",
                       G_CALLBACK (gtk_listbox_key_press_callback),
                            this);
     g_signal_connect (m_treeview, "key_press_event",
                       G_CALLBACK (gtk_listbox_key_press_callback),
                            this);


@@ -581,7 +465,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     m_parent->DoAddChild( this );
 
     PostCreation(size);
     m_parent->DoAddChild( this );
 
     PostCreation(size);

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

 
     return true;
 }
 
     return true;
 }


@@ -631,16 +515,8 @@ void wxListBox::GtkInsertItems(const wxArrayString& items,
     {
         wxString label = items[i];
 
     {
         wxString label = items[i];
 

-#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST
-        if (m_hasCheckBoxes)
-        {
-            label.Prepend(wxCHECKLBOX_STRING);
-        }
-#endif // wxUSE_CHECKLISTBOX
-
-

         GtkTreeEntry* entry = gtk_tree_entry_new();
         GtkTreeEntry* entry = gtk_tree_entry_new();

-        gtk_tree_entry_set_label(entry, wxConvUTF8.cWX2MB(label));
+        gtk_tree_entry_set_label(entry, wxGTK_CONV(label));

         gtk_tree_entry_set_destroy_func(entry,
                 (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
                             this);
         gtk_tree_entry_set_destroy_func(entry,
                 (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
                             this);


@@ -651,7 +527,7 @@ void wxListBox::GtkInsertItems(const wxArrayString& items,
         GtkTreeIter itercur;
         gtk_list_store_insert_before(m_liststore, &itercur, pIter);
 
         GtkTreeIter itercur;
         gtk_list_store_insert_before(m_liststore, &itercur, pIter);
 

-#if wxUSE_CHECKLISTBOX && wxUSE_NATIVEGTKCHECKLIST
+#if wxUSE_CHECKLISTBOX

         if (m_hasCheckBoxes)
         {
             gtk_list_store_set(m_liststore, &itercur,
         if (m_hasCheckBoxes)
         {
             gtk_list_store_set(m_liststore, &itercur,


@@ -676,12 +552,50 @@ void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
 
 int wxListBox::DoAppend( const wxString& item )
 {
 
 int wxListBox::DoAppend( const wxString& item )
 {

-    // Call DoInsertItems
-    unsigned int nWhere = wxListBox::GetCount();
-    wxArrayString aItems;
-    aItems.Add(item);
-    wxListBox::DoInsertItems(aItems, nWhere);
-    return nWhere;
+    wxCHECK_MSG( m_treeview != NULL, -1, wxT("invalid listbox") );
+
+    InvalidateBestSize();
+
+    GtkTreeEntry* entry = gtk_tree_entry_new();
+    gtk_tree_entry_set_label( entry, wxGTK_CONV(item) );
+    gtk_tree_entry_set_destroy_func(entry,
+                (GtkTreeEntryDestroy)gtk_tree_entry_destroy_cb,
+                            this);
+
+    GtkTreeIter itercur;
+    gtk_list_store_insert_before( m_liststore, &itercur, NULL );
+
+#if wxUSE_CHECKLISTBOX
+    if (m_hasCheckBoxes)
+    {
+            gtk_list_store_set(  m_liststore, &itercur,
+                                 0, FALSE, //FALSE == not toggled
+                                 1, entry, -1);
+    }
+    else
+#endif
+        gtk_list_store_set(m_liststore, &itercur,
+                                 0, entry, -1);
+
+    g_object_unref (entry); //liststore always refs :)
+
+    GtkTreePath* path = gtk_tree_model_get_path(
+                                GTK_TREE_MODEL(m_liststore),
+                                &itercur);
+
+    gint* pIntPath = gtk_tree_path_get_indices(path);
+
+    if (pIntPath == NULL)
+    {
+        wxLogSysError(wxT("internal wxListBox error in insertion"));
+        return wxNOT_FOUND;
+    }
+
+    int index = pIntPath[0];
+
+    gtk_tree_path_free( path );
+
+    return index;

 }
 
 void wxListBox::DoSetItems( const wxArrayString& items,
 }
 
 void wxListBox::DoSetItems( const wxArrayString& items,


@@ -806,11 +720,6 @@ void wxListBox::SetString(unsigned int n, const wxString &string)
 
     wxString label = string;
 
 
     wxString label = string;
 

-#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST
-    if (m_hasCheckBoxes)
-        label.Prepend(wxCHECKLBOX_STRING);
-#endif // wxUSE_CHECKLISTBOX
-

     // RN: This may look wierd but the problem is that the TreeView
     // doesn't resort or update when changed above and there is no real
     // notification function...
     // RN: This may look wierd but the problem is that the TreeView
     // doesn't resort or update when changed above and there is no real
     // notification function...


@@ -837,14 +746,6 @@ wxString wxListBox::GetString(unsigned int n) const
 
     wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) );
 
 
     wxString label = wxGTK_CONV_BACK( gtk_tree_entry_get_label(entry) );
 

-#if wxUSE_CHECKLISTBOX && !wxUSE_NATIVEGTKCHECKLIST
-    // 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 )
-        label.erase(0, 4);
-#endif // wxUSE_CHECKLISTBOX
-

     g_object_unref (entry);
     return label;
 }
     g_object_unref (entry);
     return label;
 }


@@ -880,8 +781,8 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
 
 int wxListBox::GetSelection() const
 {
 
 int wxListBox::GetSelection() const
 {

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

                     wxT("must be single selection listbox"));
 
     GtkTreeIter iter;
                     wxT("must be single selection listbox"));
 
     GtkTreeIter iter;


@@ -889,7 +790,7 @@ int wxListBox::GetSelection() const
 
     // only works on single-sel
     if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
 
     // only works on single-sel
     if (!gtk_tree_selection_get_selected(selection, NULL, &iter))

-        return -1;
+        return wxNOT_FOUND;

 
     GtkTreePath* path =
         gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);
 
     GtkTreePath* path =
         gtk_tree_model_get_path(GTK_TREE_MODEL(m_liststore), &iter);


@@ -903,7 +804,7 @@ int wxListBox::GetSelection() const
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {

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

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


@@ -944,7 +845,31 @@ bool wxListBox::IsSelected( int n ) const
 
 void wxListBox::DoSetSelection( int n, bool select )
 {
 
 void wxListBox::DoSetSelection( int n, bool select )
 {

-    return GtkSetSelection(n, select, true); //docs say no events here
+    // passing -1 to SetSelection() is documented to deselect all items
+    if ( n == wxNOT_FOUND )
+    {
+        // ... and not generate any events in the process
+        GtkDeselectAll();
+        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)
 }
 
 void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent)


@@ -1006,7 +931,7 @@ int wxListBox::DoListHitTest(const wxPoint& point) const
 {
     // 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
 {
     // 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().Inside(point) )
+    if ( !GetClientRect().Contains(point) )

         return wxNOT_FOUND;
 
     // need to translate from master window since it is in client coords
         return wxNOT_FOUND;
 
     // need to translate from master window since it is in client coords


@@ -1054,9 +979,9 @@ GtkWidget *wxListBox::GetConnectWidget()
     return GTK_WIDGET(m_treeview);
 }
 
     return GTK_WIDGET(m_treeview);
 }
 

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

 {
 {

-    return (window == gtk_tree_view_get_bin_window(m_treeview));
+    return gtk_tree_view_get_bin_window(m_treeview);

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


@@ -1075,26 +1000,6 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
     gtk_widget_modify_style( GTK_WIDGET(m_treeview), style );
 }
 
     gtk_widget_modify_style( GTK_WIDGET(m_treeview), style );
 }
 

-void wxListBox::OnInternalIdle()
-{
-    //RN: Is this needed anymore?
-    wxCursor cursor = m_cursor;
-    if (g_globalCursor.Ok()) cursor = g_globalCursor;
-
-    if (GTK_WIDGET(m_treeview)->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. */
-        GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
-        gdk_window_set_cursor( window, cursor.GetCursor() );
-    }
-
-    if (wxUpdateUIEvent::CanUpdate(this))
-        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);
-}
-

 wxSize wxListBox::DoGetBestSize() const
 {
     wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view"));
 wxSize wxListBox::DoGetBestSize() const
 {
     wxCHECK_MSG(m_treeview, wxDefaultSize, wxT("invalid tree view"));


@@ -1123,7 +1028,7 @@ wxSize wxListBox::DoGetBestSize() const
 
         // 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 && wxUSE_NATIVEGTKCHECKLIST
+#if wxUSE_CHECKLISTBOX

         if ( m_hasCheckBoxes )
         {
             lbWidth += 35;
         if ( m_hasCheckBoxes )
         {
             lbWidth += 35;