X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74505862d04cb1d8459d4a49a393381d388ee5bf..13588544c5fd50e15240c30b0d0e0b533ffe7d1a:/src/gtk/listbox.cpp

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 50145c9978..8ff7ab4cd1 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -12,8 +12,17 @@
 #pragma implementation "listbox.h"
 #endif
 
-#include "wx/dynarray.h"
+#ifdef __VMS
+#define gtk_scrolled_window_add_with_viewport gtk_scrolled_window_add_with_vi
+#define gtk_container_set_focus_vadjustment gtk_container_set_focus_vadjust
+#define gtk_scrolled_window_get_vadjustment gtk_scrolled_window_get_vadjust
+#endif
+
 #include "wx/listbox.h"
+
+#if wxUSE_LISTBOX
+
+#include "wx/dynarray.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"
@@ -23,12 +32,9 @@
 #include "wx/tooltip.h"
 #endif
 
-#if wxUSE_DRAG_AND_DROP
-#include "wx/dnd.h"
-#endif
-
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+# include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
 //-----------------------------------------------------------------------------
 // idle system
@@ -42,13 +48,15 @@ extern bool g_isIdle;
 //-------------------------------------------------------------------------
 
 #if (GTK_MINOR_VERSION > 0)
-#define NEW_GTK_SCROLL_CODE
+    #define NEW_GTK_SCROLL_CODE
 #endif
 
 //-----------------------------------------------------------------------------
 // private functions
 //-----------------------------------------------------------------------------
 
+#if wxUSE_CHECKLISTBOX
+
 #define CHECKBOX_STRING "[-] "
 
 // checklistboxes have "[±] " prepended to their lables, this macro removes it
@@ -57,14 +65,21 @@ extern bool g_isIdle;
 // the argument to it is a "const char *" pointer
 #define GET_REAL_LABEL(label) ((m_hasCheckBoxes)?(label)+4 : (label))
 
+#else // !wxUSE_CHECKLISTBOX
+
+#define GET_REAL_LABEL(label) (label)
+
+#endif // wxUSE_CHECKLISTBOX
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
-extern bool   g_blockEventsOnDrag;
-extern bool   g_blockEventsOnScroll;
+extern bool       g_blockEventsOnDrag;
+extern bool       g_blockEventsOnScroll;
+extern wxCursor   g_globalCursor;
 
-static bool   g_hasDoubleClicked = FALSE;
+static bool       g_hasDoubleClicked = FALSE;
 
 //-----------------------------------------------------------------------------
 // "button_release_event"
@@ -77,7 +92,9 @@ static bool   g_hasDoubleClicked = FALSE;
    after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */
 
 static gint
-gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
+gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
+                                     GdkEventButton * WXUNUSED(gdk_event),
+                                     wxListBox *listbox )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
@@ -88,25 +105,28 @@ gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_even
 
     if (!g_hasDoubleClicked) return FALSE;
 
-        wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
-        event.SetEventObject( listbox );
+    wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+    event.SetEventObject( listbox );
 
-        wxArrayInt aSelections;
-        int count = listbox->GetSelections(aSelections);
-        if ( count > 0 )
-        {
-            event.m_commandInt = aSelections[0] ;
-            event.m_clientData = listbox->GetClientData( event.m_commandInt );
-            wxString str(listbox->GetString(event.m_commandInt));
-            if (!str.IsEmpty()) event.m_commandString = str;
-        }
-        else
-        {
-            event.m_commandInt = -1 ;
-            event.m_commandString.Empty();
-        }
+    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;
+    }
 
-        listbox->GetEventHandler()->ProcessEvent( event );
+    event.m_commandInt = n;
+
+    listbox->GetEventHandler()->ProcessEvent( event );
 
     return FALSE;
 }
@@ -116,7 +136,9 @@ gtk_listbox_button_release_callback( GtkWidget *widget, GdkEventButton *gdk_even
 //-----------------------------------------------------------------------------
 
 static gint
-gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event, wxListBox *listbox )
+gtk_listbox_button_press_callback( GtkWidget *widget,
+                                   GdkEventButton *gdk_event,
+                                   wxListBox *listbox )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
@@ -125,8 +147,9 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
 
     if (!listbox->m_hasVMT) return FALSE;
 
-    int sel = listbox->GetIndex( widget );
+    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;
@@ -138,7 +161,8 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
         event.SetInt( sel );
         listbox->GetEventHandler()->ProcessEvent( event );
     }
-    
+#endif // wxUSE_CHECKLISTBOX
+
     /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
     g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
 
@@ -152,24 +176,46 @@ gtk_listbox_button_press_callback( GtkWidget *widget, GdkEventButton *gdk_event,
 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {
-    if (g_isIdle) wxapp_install_idle_handler();
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
 
-    if (g_blockEventsOnDrag) return FALSE;
+    if (g_blockEventsOnDrag) 
+        return FALSE;
 
-    if (!listbox->m_hasVMT) return FALSE;
+    bool ret = FALSE;
 
-    if (gdk_event->keyval != ' ') return FALSE;
+    if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
+    {
+        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 wxUSE_CHECKLISTBOX
+    if ((gdk_event->keyval == ' ') && (listbox->m_hasCheckBoxes) && (!ret))
+    {
+        int sel = listbox->GtkGetIndex( widget );
 
-    int sel = listbox->GetIndex( widget );
+        wxCheckListBox *clb = (wxCheckListBox *)listbox;
 
-    wxCheckListBox *clb = (wxCheckListBox *)listbox;
+        clb->Check( sel, !clb->IsChecked(sel) );
 
-    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
 
-    wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
-    event.SetEventObject( listbox );
-    event.SetInt( sel );
-    listbox->GetEventHandler()->ProcessEvent( event );
+    if (ret)
+    {
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+        return TRUE;
+    }
 
     return FALSE;
 }
@@ -178,33 +224,43 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 // "select" and "deselect"
 //-----------------------------------------------------------------------------
 
+static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox );
+
+static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
+{
+    gtk_listitem_select_callback( widget, listbox );
+}
+
 static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox *listbox )
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
-
+    
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+    event.SetEventObject( listbox );
 
     wxArrayInt aSelections;
-    int count = listbox->GetSelections(aSelections);
+    int n, count = listbox->GetSelections(aSelections);
     if ( count > 0 )
     {
-        event.m_commandInt = aSelections[0] ;
-        event.m_clientData = listbox->GetClientData( event.m_commandInt );
-        wxString str(listbox->GetString(event.m_commandInt));
-        if (!str.IsEmpty()) event.m_commandString = str;
+        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
     {
-        event.m_commandInt = -1 ;
-        event.m_commandString.Empty();
+        n = -1;
     }
 
-    event.SetEventObject( listbox );
+    event.m_commandInt = n;
 
-    listbox->GetEventHandler()->ProcessEvent( event );
+    listbox->GetEventHandler()->AddPendingEvent( event );
+//    listbox->GetEventHandler()->ProcessEvent( event );
 }
 
 //-----------------------------------------------------------------------------
@@ -213,23 +269,33 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
 
+// ----------------------------------------------------------------------------
+// construction
+// ----------------------------------------------------------------------------
+
 wxListBox::wxListBox()
 {
     m_list = (GtkList *) NULL;
+#if wxUSE_CHECKLISTBOX
     m_hasCheckBoxes = FALSE;
+#endif // wxUSE_CHECKLISTBOX
 }
 
 bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                         const wxPoint &pos, const wxSize &size,
                         int n, const wxString choices[],
-                        long style, const wxValidator& validator, const wxString &name )
+                        long style, const wxValidator& validator,
+                        const wxString &name )
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 
-    PreCreation( parent, id, pos, size, style, name );
-
-    SetValidator( validator );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, validator, name ))
+    {
+        wxFAIL_MSG( wxT("wxListBox creation failed") );
+        return FALSE;
+    }
 
     m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
     if (style & wxLB_ALWAYS_SB)
@@ -259,65 +325,37 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
 #endif
 
+    /* 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)));
+
     gtk_widget_show( GTK_WIDGET(m_list) );
 
-    wxSize newSize = size;
-    if (newSize.x == -1) newSize.x = 100;
-    if (newSize.y == -1) newSize.y = 110;
-    SetSize( newSize.x, newSize.y );
+    SetSizeOrDefault( size );
 
-    for (int i = 0; i < n; i++)
+    if ( style & wxLB_SORT )
     {
-        m_clientDataList.Append( (wxObject*) NULL );
-        m_clientObjectList.Append( (wxObject*) NULL );
-
-        GtkWidget *list_item;
-
-        wxString str(choices[i]);
-        if (m_hasCheckBoxes)
-        {
-            str.Prepend(CHECKBOX_STRING);
-        }
-
-        list_item = gtk_list_item_new_with_label( str.mbc_str() );
-
-        gtk_container_add( GTK_CONTAINER(m_list), list_item );
-
-        gtk_signal_connect( GTK_OBJECT(list_item), "select",
-          GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
-
-        if (style & wxLB_MULTIPLE)
-            gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
-              GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
-
-        gtk_signal_connect( GTK_OBJECT(list_item),
-                            "button_press_event",
-                            (GtkSignalFunc)gtk_listbox_button_press_callback,
-                            (gpointer) this );
-
-        gtk_signal_connect_after( GTK_OBJECT(list_item),
-                            "button_release_event",
-                            (GtkSignalFunc)gtk_listbox_button_release_callback,
-                            (gpointer) this );
-
-        if (m_hasCheckBoxes)
-        {
-            gtk_signal_connect( GTK_OBJECT(list_item),
-                            "key_press_event",
-                            (GtkSignalFunc)gtk_listbox_key_press_callback,
-                            (gpointer)this );
-        }
-
-        ConnectWidget( list_item );
+        // this will change DoAppend() behaviour
+        m_strings = new wxSortedArrayString;
+    }
+    else
+    {
+        m_strings = (wxSortedArrayString *)NULL;
+    }
 
-        gtk_widget_show( list_item );
+    for (int i = 0; i < n; i++)
+    {
+        // add one by one
+        DoAppend(choices[i]);
     }
 
     m_parent->DoAddChild( this );
 
     PostCreation();
 
-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
@@ -331,126 +369,106 @@ wxListBox::~wxListBox()
     Clear();
 }
 
-void wxListBox::InsertItems(int nItems, const wxString items[], int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    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
+
+    // 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") );
 
     GList *children = m_list->children;
     int length = g_list_length(children);
-    wxCHECK_RET( pos <= length, _T("invalid index in wxListBox::InsertItems") );
+		  
+    wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
 
-    // VZ: it seems that GTK 1.0.6 doesn't has a function to insert an item
-    //     into a listbox at the given position, this is why we first delete
-    //     all items after this position, then append these items and then
-    //     reappend back the old ones.
+    size_t nItems = items.GetCount();
 
-    // first detach the old items
-    int n; // loop var
-
-    if ( pos == length )
+    if (pos == length)
     {
-        // no need to do anything complicated
-        for ( n = 0; n < nItems; n++ )
+        for ( size_t n = 0; n < nItems; n++ )
         {
-            Append(items[n]);
-        }
+            GtkAddItem( items[n] );
 
-        return;
+            m_clientList.Append((wxObject *)NULL);
+        }
     }
-    
-    wxArrayString deletedLabels;
-    wxArrayPtrVoid deletedData;
-    wxArrayInt deletedChecks;   // only for check list boxes
-
-    GList *child = g_list_nth( children, pos );
-    for ( n = 0; child != NULL; n++, child = child->next )
+    else
     {
-        // save label
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-
-        wxString str(GET_REAL_LABEL(label->label));
-        deletedLabels.Add(str);
-
-        // save data
-        void *clientData = NULL;
-        wxNode *node = NULL;
-       
-        if ( n < (int)m_clientObjectList.GetCount() )
-            node = m_clientObjectList.Nth( n );
-
-        if ( node )
+        wxNode *node = m_clientList.Nth( pos );
+        for ( size_t n = 0; n < nItems; n++ )
         {
-            clientData = node->GetData();
-            m_clientObjectList.DeleteNode( node );
-        }
-
-        if ( !clientData )
-        {
-            if ( n < (int)m_clientDataList.GetCount() )
-                node = m_clientDataList.Nth( n );        
-
-            if ( node )
-            {
-                clientData = node->GetData();
-                node = m_clientDataList.Nth( n );
-            }
-        }
-
-        deletedData.Add(clientData);
+            GtkAddItem( items[n], pos+n );
 
-        // save check state
-        if ( m_hasCheckBoxes )
-        {
-            deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n));
+            m_clientList.Insert( node, (wxObject *)NULL );
         }
     }
 
-    int nDeletedCount = n;
-
-    gtk_list_clear_items( m_list, pos, length );
+    wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(),
+                      wxT("bug in client data management") );
+}
 
-    // now append the new items
-    for ( n = 0; n < nItems; n++ )
+int wxListBox::DoAppend( const wxString& item )
+{
+    if (m_strings)
     {
-        Append(items[n]);
+        // need to determine the index
+        int index = m_strings->Add( item );
+	
+	// only if not at the end anyway
+	if (index != GetCount())
+	{
+	   GtkAddItem( item, index );
+	   
+	   wxNode *node = m_clientList.Nth( index );
+           m_clientList.Insert( node, (wxObject *)NULL );
+	   
+	   return index;
+	}
     }
+    
+    GtkAddItem(item);
 
-    // and append the old items too
-    pos += nItems;  // now the indices are shifter
-    for ( n = 0; n < nDeletedCount; n++ )
-    {
-        Append(deletedLabels[n], deletedData[n]);
+    m_clientList.Append((wxObject *)NULL);
 
-        if ( m_hasCheckBoxes )
-        {
-            ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]);
-        }
-    }
+    return GetCount() - 1;
 }
 
-void wxListBox::AppendCommon( const wxString &item )
+void wxListBox::GtkAddItem( const wxString &item, int pos )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     GtkWidget *list_item;
 
     wxString label(item);
+#if wxUSE_CHECKLISTBOX
     if (m_hasCheckBoxes)
     {
         label.Prepend(CHECKBOX_STRING);
     }
+#endif // wxUSE_CHECKLISTBOX
 
     list_item = gtk_list_item_new_with_label( label.mbc_str() );
 
-    gtk_container_add( GTK_CONTAINER(m_list), list_item );
+    GList *gitem_list = g_list_alloc ();
+    gitem_list->data = list_item;
+  
+    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 );
 
     gtk_signal_connect( GTK_OBJECT(list_item), "select",
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
     if (HasFlag(wxLB_MULTIPLE))
         gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
-          GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+          GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(list_item),
                         "button_press_event",
@@ -462,30 +480,28 @@ void wxListBox::AppendCommon( const wxString &item )
                         (GtkSignalFunc)gtk_listbox_button_release_callback,
                         (gpointer) this );
 
-    if (m_hasCheckBoxes)
-    {
-       gtk_signal_connect( GTK_OBJECT(list_item),
+    gtk_signal_connect( GTK_OBJECT(list_item),
                            "key_press_event",
                            (GtkSignalFunc)gtk_listbox_key_press_callback,
                            (gpointer)this );
-    }
-
-    gtk_widget_show( list_item );
 
     ConnectWidget( list_item );
 
+    gtk_widget_show( list_item );
+
     if (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
-	
-        if (m_widgetStyle) ApplyWidgetStyle();
 
-#if wxUSE_DRAG_AND_DROP
-#ifndef NEW_GTK_DND_CODE
-        if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
-#endif
-#endif
+        // Apply current widget style to the new list_item
+        if (m_widgetStyle) 
+	{
+            gtk_widget_set_style( GTK_WIDGET( list_item ), m_widgetStyle );
+            GtkBin *bin = GTK_BIN( list_item );
+            GtkWidget *label = GTK_WIDGET( bin->child );
+            gtk_widget_set_style( label, m_widgetStyle );
+        }
 
 #if wxUSE_TOOLTIPS
         if (m_tooltip) m_tooltip->Apply( this );
@@ -493,128 +509,183 @@ void wxListBox::AppendCommon( const wxString &item )
     }
 }
 
-void wxListBox::Append( const wxString &item )
+void wxListBox::DoSetItems( const wxArrayString& items,
+                            void **clientData)
 {
-    m_clientDataList.Append( (wxObject*) NULL );
-    m_clientObjectList.Append( (wxObject*) NULL );
+    Clear();
 
-    AppendCommon( item );
-}
+    DoInsertItems(items, 0);
 
-void wxListBox::Append( const wxString &item, void *clientData )
-{
-    m_clientDataList.Append( (wxObject*) clientData );
-    m_clientObjectList.Append( (wxObject*) NULL );
-
-    AppendCommon( item );
+    if ( clientData )
+    {
+        size_t count = items.GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            SetClientData(n, clientData[n]);
+        }
+    }
 }
 
-void wxListBox::Append( const wxString &item, wxClientData *clientData )
-{
-    m_clientObjectList.Append( (wxObject*) clientData );
-    m_clientDataList.Append( (wxObject*) NULL );
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
 
-    AppendCommon( item );
-}
-
-void wxListBox::SetClientData( int n, void* clientData )
+void wxListBox::DoSetItemClientData( int n, void* clientData )
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
 
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return;
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") );
 
     node->SetData( (wxObject*) clientData );
 }
 
-void* wxListBox::GetClientData( int n )
+void* wxListBox::DoGetItemClientData( int n ) const
 {
-    wxCHECK_MSG( m_widget != NULL, NULL, _T("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
 
-    wxNode *node = m_clientDataList.Nth( n );
-    if (!node) return NULL;
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );
 
     return node->Data();
 }
 
-void wxListBox::SetClientObject( int n, wxClientData* clientData )
+void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
 {
-    wxCHECK_RET( m_widget != NULL, _T("invalid combobox") );
+    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
 
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return;
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
 
     wxClientData *cd = (wxClientData*) node->Data();
-    if (cd) delete cd;
+    delete cd;
 
     node->SetData( (wxObject*) clientData );
 }
 
-wxClientData* wxListBox::GetClientObject( int n )
+wxClientData* wxListBox::DoGetItemClientObject( int n ) const
 {
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*)NULL, _T("invalid combobox") );
+    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
 
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (!node) return (wxClientData*) NULL;
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_MSG( node, (wxClientData *)NULL,
+                 wxT("invalid index in wxListBox::DoGetItemClientObject") );
 
     return (wxClientData*) node->Data();
 }
 
 void wxListBox::Clear()
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     gtk_list_clear_items( m_list, 0, Number() );
 
-    wxNode *node = m_clientObjectList.First();
-    while (node)
+    if ( HasClientObjectData() )
     {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        node = node->Next();
+        // 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!
+        wxNode *node = m_clientList.First();
+        while ( node )
+        {
+            delete (wxClientData *)node->Data();
+            node = node->Next();
+        }
     }
-    m_clientObjectList.Clear();
+    m_clientList.Clear();
 
-    m_clientDataList.Clear();
+    if ( m_strings )
+        m_strings->Clear();
 }
 
 void wxListBox::Delete( int n )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     GList *child = g_list_nth( m_list->children, n );
 
-    wxCHECK_RET( child, _T("wrong listbox index") );
+    wxCHECK_RET( child, wxT("wrong listbox index") );
 
     GList *list = g_list_append( (GList*) NULL, child->data );
     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 
-    wxNode *node = m_clientObjectList.Nth( n );
-    if (node)
+    wxNode *node = m_clientList.Nth( n );
+    if ( node )
     {
-        wxClientData *cd = (wxClientData*)node->Data();
-        if (cd) delete cd;
-        m_clientObjectList.DeleteNode( node );
+        if ( m_clientDataItemsType == ClientData_Object )
+        {
+            wxClientData *cd = (wxClientData*)node->Data();
+            delete cd;
+        }
+
+        m_clientList.DeleteNode( node );
     }
 
-    node = m_clientDataList.Nth( n );
-    if (node)
+    if ( m_strings )
+        m_strings->Remove(n);
+}
+
+// ----------------------------------------------------------------------------
+// string list access
+// ----------------------------------------------------------------------------
+
+void wxListBox::SetString( int n, const wxString &string )
+{
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+
+    GList *child = g_list_nth( m_list->children, n );
+    if (child)
     {
-        m_clientDataList.DeleteNode( node );
+        GtkBin *bin = GTK_BIN( child->data );
+        GtkLabel *label = GTK_LABEL( bin->child );
+
+        wxString str;
+#if wxUSE_CHECKLISTBOX
+        if (m_hasCheckBoxes)
+            str += CHECKBOX_STRING;
+#endif // wxUSE_CHECKLISTBOX
+        str += string;
+
+        gtk_label_set( label, str.mbc_str() );
+    }
+    else
+    {
+        wxFAIL_MSG(wxT("wrong listbox index"));
+    }
+}
+
+wxString wxListBox::GetString( int n ) const
+{
+    wxCHECK_MSG( m_list != NULL, wxT(""), 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 );
+
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
+
+        return str;
     }
+
+    wxFAIL_MSG(wxT("wrong listbox index"));
+
+    return wxT("");
 }
 
-void wxListBox::Deselect( int n )
+int wxListBox::GetCount() const
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 
-    gtk_list_unselect_item( m_list, n );
+    GList *children = m_list->children;
+    return g_list_length(children);
 }
 
 int wxListBox::FindString( const wxString &item ) const
 {
-    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 
     GList *child = m_list->children;
     int count = 0;
@@ -623,7 +694,7 @@ int wxListBox::FindString( const wxString &item ) const
         GtkBin *bin = GTK_BIN( child->data );
         GtkLabel *label = GTK_LABEL( bin->child );
 
-        wxString str = GET_REAL_LABEL(label->label);
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
 
         if (str == item)
             return count;
@@ -632,14 +703,18 @@ int wxListBox::FindString( const wxString &item ) const
         child = child->next;
     }
 
-  // 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 -1;
+    return wxNOT_FOUND;
 }
 
+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------
+
 int wxListBox::GetSelection() const
 {
-    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 
     GList *child = m_list->children;
     int count = 0;
@@ -654,7 +729,7 @@ int wxListBox::GetSelection() const
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {
-    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 
     // get the number of selected items first
     GList *child = m_list->children;
@@ -682,129 +757,41 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
     return count;
 }
 
-wxString wxListBox::GetString( int n ) const
+bool wxListBox::IsSelected( int n ) const
 {
-    wxCHECK_MSG( m_list != NULL, _T(""), _T("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 );
-
-        wxString str = GET_REAL_LABEL(label->label);
-
-        return str;
-    }
-    
-    wxFAIL_MSG(_T("wrong listbox index"));
-
-    return _T("");
-}
-
-wxString wxListBox::GetStringSelection() const
-{
-    wxCHECK_MSG( m_list != NULL, _T(""), _T("invalid listbox") );
-
-    GList *selection = m_list->selection;
-    if (selection)
-    {
-        GtkBin *bin = GTK_BIN( selection->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-
-        wxString str = GET_REAL_LABEL(label->label);
-
-        return str;
-    }
-
-    wxFAIL_MSG(_T("no listbox selection available"));
-    return _T("");
-}
-
-int wxListBox::Number()
-{
-    wxCHECK_MSG( m_list != NULL, -1, _T("invalid listbox") );
-
-    GList *child = m_list->children;
-    int count = 0;
-    while (child) { count++; child = child->next; }
-    return count;
-}
-
-bool wxListBox::Selected( int n )
-{
-    wxCHECK_MSG( m_list != NULL, FALSE, _T("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
 
     GList *target = g_list_nth( m_list->children, n );
-    if (target)
-    {
-        GList *child = m_list->selection;
-        while (child)
-        {
-            if (child->data == target->data) return TRUE;
-            child = child->next;
-        }
-    }
-    wxFAIL_MSG(_T("wrong listbox index"));
-    return FALSE;
-}
-
-void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
-{
-    wxFAIL_MSG(_T("wxListBox::Set not implemented"));
-}
-
-void wxListBox::SetFirstItem( int WXUNUSED(n) )
-{
-    wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented"));
-}
-
-void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
-{
-    wxFAIL_MSG(_T("wxListBox::SetFirstItem not implemented"));
+    
+    wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") );
+    
+    return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ;
 }
 
 void wxListBox::SetSelection( int n, bool select )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+
+    GtkDisableEvents();
 
     if (select)
         gtk_list_select_item( m_list, n );
     else
         gtk_list_unselect_item( m_list, n );
-}
-
-void wxListBox::SetString( int n, const wxString &string )
-{
-    wxCHECK_RET( m_list != NULL, _T("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 );
-
-        wxString str;
-        if (m_hasCheckBoxes)
-            str += CHECKBOX_STRING;
-        str += string;
 
-        gtk_label_set( label, str.mbc_str() );
-    }
-    else
-    {
-        wxFAIL_MSG(_T("wrong listbox index"));
-    }
+    GtkEnableEvents();
 }
 
-void wxListBox::SetStringSelection( const wxString &string, bool select )
+void wxListBox::DoSetFirstItem( int WXUNUSED(n) )
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
-
-    SetSelection( FindString(string), select );
+    wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
 }
 
-int wxListBox::GetIndex( GtkWidget *item ) const
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+int wxListBox::GtkGetIndex( GtkWidget *item ) const
 {
     if (item)
     {
@@ -826,44 +813,43 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
     GList *child = m_list->children;
     while (child)
     {
-        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConv_local.cWX2MB(tip), (gchar*) NULL );
+        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
         child = child->next;
     }
 }
 #endif // wxUSE_TOOLTIPS
 
-#if wxUSE_DRAG_AND_DROP
-void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
+void wxListBox::GtkDisableEvents()
 {
-    wxCHECK_RET( m_list != NULL, _T("invalid listbox") );
-
-#ifndef NEW_GTK_DND_CODE
-    if (m_dropTarget)
+    GList *child = m_list->children;
+    while (child)
     {
-        GList *child = m_list->children;
-        while (child)
-        {
-            m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) );
-            child = child->next;
-        }
-    }
-#endif
+        gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
+          GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
-    wxWindow::SetDropTarget( dropTarget );
+        if (HasFlag(wxLB_MULTIPLE))
+            gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
+              GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
 
-#ifndef NEW_GTK_DND_CODE
-    if (m_dropTarget)
+        child = child->next;
+    }
+}
+
+void wxListBox::GtkEnableEvents()
+{
+    GList *child = m_list->children;
+    while (child)
     {
-        GList *child = m_list->children;
-        while (child)
-        {
-            m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) );
-            child = child->next;
-        }
+        gtk_signal_connect( GTK_OBJECT(child->data), "select",
+          GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+
+        if (HasFlag(wxLB_MULTIPLE))
+            gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
+              GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+
+        child = child->next;
     }
-#endif
 }
-#endif
 
 GtkWidget *wxListBox::GetConnectWidget()
 {
@@ -872,7 +858,7 @@ GtkWidget *wxListBox::GetConnectWidget()
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
-    if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
+    if (GTK_WIDGET(m_list)->window == window) return TRUE;
 
     GList *child = m_list->children;
     while (child)
@@ -912,3 +898,42 @@ void wxListBox::ApplyWidgetStyle()
         child = child->next;
     }
 }
+
+void wxListBox::OnInternalIdle()
+{
+    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() );
+
+            child = child->next;
+        }
+    }
+
+    UpdateWindowUI();
+}
+
+wxSize wxListBox::DoGetBestSize() const
+{
+    return wxSize(100, 110);
+}
+
+#endif