X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dcf40a56e7b09fc5472edc1d4471e7954c0da40d..2bc1aa1174ee3ddd68615827c3531549cf204918:/src/gtk/listbox.cpp

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index d434764ba4..bdf69d7e36 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -2,9 +2,8 @@
 // Name:        listbox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -13,48 +12,248 @@
 #pragma implementation "listbox.h"
 #endif
 
-#include "wx/dynarray.h"
 #include "wx/listbox.h"
+
+#if wxUSE_LISTBOX
+
+#include "wx/dynarray.h"
 #include "wx/utils.h"
-#include <wx/intl.h>
+#include "wx/intl.h"
+#include "wx/checklst.h"
+#include "wx/settings.h"
+
+#if wxUSE_TOOLTIPS
+#include "wx/tooltip.h"
+#endif
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+#include "gdk/gdkkeysyms.h"
+
+//-----------------------------------------------------------------------------
+// idle system
+//-----------------------------------------------------------------------------
+
+extern void wxapp_install_idle_handler();
+extern bool g_isIdle;
+
+//-------------------------------------------------------------------------
+// conditional compilation
+//-------------------------------------------------------------------------
+
+#if (GTK_MINOR_VERSION > 0)
+    #define NEW_GTK_SCROLL_CODE
+#endif
+
+//-----------------------------------------------------------------------------
+// private functions
+//-----------------------------------------------------------------------------
+
+#if wxUSE_CHECKLISTBOX
+
+#define CHECKBOX_STRING "[-] "
+
+// checklistboxes have "[±] " prepended to their lables, this macro removes it
+// (NB: 4 below is the length of CHECKBOX_STRING above)
+//
+// 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_blockEventsOnDrag;
+extern bool       g_blockEventsOnScroll;
+extern wxCursor   g_globalCursor;
+
+static bool       g_hasDoubleClicked = FALSE;
+
+//-----------------------------------------------------------------------------
+// "button_release_event"
+//-----------------------------------------------------------------------------
+
+/* we would normally emit a wxEVT_COMMAND_LISTBOX_DOUBLECLICKED event once
+   a GDK_2BUTTON_PRESS occurs, but this has the particular problem of the
+   listbox keeping the focus until it receives a GDK_BUTTON_RELEASE event.
+   this can lead to race conditions so that we emit the dclick event
+   after the GDK_BUTTON_RELEASE event after the GDK_2BUTTON_PRESS event */
+
+static gint
+gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
+                                     GdkEventButton * WXUNUSED(gdk_event),
+                                     wxListBox *listbox )
+{
+    if (g_isIdle) wxapp_install_idle_handler();
+
+    if (g_blockEventsOnDrag) return FALSE;
+    if (g_blockEventsOnScroll) return FALSE;
+
+    if (!listbox->m_hasVMT) return FALSE;
+
+    if (!g_hasDoubleClicked) return FALSE;
+
+    wxCommandEvent event( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
+    event.SetEventObject( listbox );
+
+    wxArrayInt aSelections;
+    int n, count = listbox->GetSelections(aSelections);
+    if ( count > 0 )
+    {
+        n = aSelections[0];
+        if ( listbox->HasClientObjectData() )
+            event.SetClientObject( listbox->GetClientObject(n) );
+        else if ( listbox->HasClientUntypedData() )
+            event.SetClientData( listbox->GetClientData(n) );
+        event.SetString( listbox->GetString(n) );
+    }
+    else
+    {
+        n = -1;
+    }
+
+    event.m_commandInt = n;
+
+    listbox->GetEventHandler()->ProcessEvent( event );
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "button_press_event"
+//-----------------------------------------------------------------------------
+
+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;
+
+    int sel = listbox->GtkGetIndex( widget );
+
+#if wxUSE_CHECKLISTBOX
+    if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS))
+    {
+        wxCheckListBox *clb = (wxCheckListBox *)listbox;
+
+        clb->Check( sel, !clb->IsChecked(sel) );
+
+        wxCommandEvent event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+        event.SetEventObject( listbox );
+        event.SetInt( sel );
+        listbox->GetEventHandler()->ProcessEvent( event );
+    }
+#endif // wxUSE_CHECKLISTBOX
+
+    /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
+    g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
+
+    return FALSE;
+}
+
+//-----------------------------------------------------------------------------
+// "key_press_event"
+//-----------------------------------------------------------------------------
+
+static gint
+gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
+{
+    if (g_isIdle) 
+        wxapp_install_idle_handler();
+
+    if (g_blockEventsOnDrag) 
+        return FALSE;
+
+    bool ret = FALSE;
+
+    if ((gdk_event->keyval == GDK_Tab) || (gdk_event->keyval == GDK_ISO_Left_Tab))
+    {
+        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 );
+
+        wxCheckListBox *clb = (wxCheckListBox *)listbox;
+
+        clb->Check( sel, !clb->IsChecked(sel) );
+
+        wxCommandEvent new_event( wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, listbox->GetId() );
+        new_event.SetEventObject( listbox );
+        new_event.SetInt( sel );
+        ret = listbox->GetEventHandler()->ProcessEvent( new_event );
+    }
+#endif // wxUSE_CHECKLISTBOX
+
+    if (ret)
+    {
+        gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
+        return TRUE;
+    }
+
+    return FALSE;
+}
 
 //-----------------------------------------------------------------------------
 // "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 (!listbox->HasVMT()) return;
-  if (g_blockEventsOnDrag) return;
+    if (g_isIdle) wxapp_install_idle_handler();
 
-  wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
+    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 != "")
-        event.m_commandString = copystring((char *)(const char *)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 = copystring("") ;
+        n = -1;
     }
 
-  event.SetEventObject( listbox );
+    event.m_commandInt = n;
 
-  listbox->GetEventHandler()->ProcessEvent( event );
-  if (event.m_commandString) delete[] event.m_commandString ;
+    listbox->GetEventHandler()->ProcessEvent( event );
 }
 
 //-----------------------------------------------------------------------------
@@ -63,386 +262,680 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
 
 IMPLEMENT_DYNAMIC_CLASS(wxListBox,wxControl)
 
-wxListBox::wxListBox(void)
+// ----------------------------------------------------------------------------
+// construction
+// ----------------------------------------------------------------------------
+
+wxListBox::wxListBox()
 {
-  m_list = (GtkList *) NULL;
+    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 )
+                        const wxPoint &pos, const wxSize &size,
+                        int n, const wxString choices[],
+                        long style, const wxValidator& validator,
+                        const wxString &name )
 {
-  m_needParent = TRUE;
+    m_needParent = TRUE;
+    m_acceptsFocus = TRUE;
+
+    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)
+    {
+      gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
+        GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS );
+    }
+    else
+    {
+      gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
+        GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+    }
 
-  PreCreation( parent, id, pos, size, style, name );
+    m_list = GTK_LIST( gtk_list_new() );
 
-  SetValidator( validator );
+    GtkSelectionMode mode = GTK_SELECTION_BROWSE;
+    if (style & wxLB_MULTIPLE)
+        mode = GTK_SELECTION_MULTIPLE;
+    else if (style & wxLB_EXTENDED)
+        mode = GTK_SELECTION_EXTENDED;
 
-  m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL );
-  gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(m_widget),
-    GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
+    gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
 
-  m_list = GTK_LIST( gtk_list_new() );
+#ifdef NEW_GTK_SCROLL_CODE
+    gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) );
+#else
+    gtk_container_add( GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
+#endif
 
-  GtkSelectionMode mode = GTK_SELECTION_BROWSE;
-  if (style & wxLB_MULTIPLE)
-    mode = GTK_SELECTION_MULTIPLE;
-  else if (style & wxLB_EXTENDED)
-    mode = GTK_SELECTION_EXTENDED;
+    /* 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_list_set_selection_mode( GTK_LIST(m_list), mode );
+    gtk_widget_show( GTK_WIDGET(m_list) );
 
-  gtk_container_add (GTK_CONTAINER(m_widget), GTK_WIDGET(m_list) );
-  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 );
 
-  wxSize newSize = size;
-  if (newSize.x == -1) newSize.x = 100;
-  if (newSize.y == -1) newSize.y = 110;
-  SetSize( newSize.x, newSize.y );
+    if ( style & wxLB_SORT )
+    {
+        // this will change DoAppend() behaviour
+        m_strings = new wxSortedArrayString;
+    }
+    else
+    {
+        m_strings = (wxSortedArrayString *)NULL;
+    }
 
-  for (int i = 0; i < n; i++)
-  {
-    GtkWidget *list_item;
-    list_item = gtk_list_item_new_with_label( choices[i] );
+    for (int i = 0; i < n; i++)
+    {
+        // add one by one
+        DoAppend(choices[i]);
+    }
 
-    gtk_container_add( GTK_CONTAINER(m_list), list_item );
+    m_parent->DoAddChild( this );
 
-    gtk_signal_connect( GTK_OBJECT(list_item), "select",
-      GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+    PostCreation();
 
-    if (style & wxLB_MULTIPLE)
-      gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
-        GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+    SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );
 
-    m_clientData.Append( (wxObject*)NULL );
+    Show( TRUE );
 
-    gtk_widget_show( list_item );
-  }
+    return TRUE;
+}
 
-  PostCreation();
+wxListBox::~wxListBox()
+{
+    Clear();
+}
+
+void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+{
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+
+    // VZ: notice that InsertItems knows nothing about sorting, so calling it
+    //     from outside (and not from our own Append) is likely to break
+    //     everything
+
+    // 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, wxT("invalid index in wxListBox::InsertItems") );
+
+    size_t nItems = items.GetCount();
 
-  gtk_widget_realize( GTK_WIDGET(m_list) );
+    if (pos == length)
+    {
+        for ( size_t n = 0; n < nItems; n++ )
+        {
+            GtkAddItem( items[n] );
+
+            m_clientList.Append((wxObject *)NULL);
+        }
+    }
+    else
+    {
+        wxNode *node = m_clientList.Nth( pos );
+        for ( size_t n = 0; n < nItems; n++ )
+        {
+            GtkAddItem( items[n], pos+n );
 
-  Show( TRUE );
+            m_clientList.Insert( node, (wxObject *)NULL );
+        }
+    }
 
-  return TRUE;
+    wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(),
+                      wxT("bug in client data management") );
 }
 
-void wxListBox::Append( const wxString &item )
+int wxListBox::DoAppend( const wxString& item )
 {
-  Append( item, (char*)NULL );
+    if (m_strings)
+    {
+        // 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);
+
+    m_clientList.Append((wxObject *)NULL);
+
+    return GetCount() - 1;
 }
 
-void wxListBox::Append( const wxString &item, char *clientData )
+void wxListBox::GtkAddItem( const wxString &item, int pos )
 {
-  GtkWidget *list_item = gtk_list_item_new_with_label( item );
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+
+    GtkWidget *list_item;
 
-  if (m_hasOwnStyle)
-  {
-    GtkBin *bin = GTK_BIN( list_item );
-    gtk_widget_set_style( bin->child,
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) );
-  }
+    wxString label(item);
+#if wxUSE_CHECKLISTBOX
+    if (m_hasCheckBoxes)
+    {
+        label.Prepend(CHECKBOX_STRING);
+    }
+#endif // wxUSE_CHECKLISTBOX
 
-  gtk_signal_connect( GTK_OBJECT(list_item), "select",
-    GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+    list_item = gtk_list_item_new_with_label( label.mbc_str() );
+
+    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 );
 
-  if (GetWindowStyleFlag() & wxLB_MULTIPLE)
-    gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
+    gtk_signal_connect( GTK_OBJECT(list_item), "select",
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
-  m_clientData.Append( (wxObject*)clientData );
+    if (HasFlag(wxLB_MULTIPLE))
+        gtk_signal_connect( GTK_OBJECT(list_item), "deselect",
+          GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+
+    gtk_signal_connect( GTK_OBJECT(list_item),
+                        "button_press_event",
+                        (GtkSignalFunc)gtk_listbox_button_press_callback,
+                        (gpointer) this );
 
-  gtk_container_add( GTK_CONTAINER(m_list), list_item );
+    gtk_signal_connect_after( GTK_OBJECT(list_item),
+                        "button_release_event",
+                        (GtkSignalFunc)gtk_listbox_button_release_callback,
+                        (gpointer) this );
 
-  gtk_widget_show( list_item );
+    gtk_signal_connect( GTK_OBJECT(list_item),
+                           "key_press_event",
+                           (GtkSignalFunc)gtk_listbox_key_press_callback,
+                           (gpointer)this );
 
-  ConnectWidget( list_item );
+    gtk_widget_show( list_item );
 
-  ConnectDnDWidget( list_item );
+    ConnectWidget( list_item );
 
+    if (GTK_WIDGET_REALIZED(m_widget))
+    {
+        gtk_widget_realize( list_item );
+        gtk_widget_realize( GTK_BIN(list_item)->child );
+
+        // 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 );
+#endif
+    }
 }
 
-void wxListBox::Clear(void)
+void wxListBox::DoSetItems( const wxArrayString& items,
+                            void **clientData)
 {
-  gtk_list_clear_items( m_list, 0, Number() );
+    Clear();
 
-  m_clientData.Clear();
+    DoInsertItems(items, 0);
+
+    if ( clientData )
+    {
+        size_t count = items.GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            SetClientData(n, clientData[n]);
+        }
+    }
 }
 
-void wxListBox::Delete( int n )
-{
-  GList *child = g_list_nth( m_list->children, n );
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
 
-  if (!child)
-  {
-    wxFAIL_MSG("wrong listbox index");
-    return;
-  }
+void wxListBox::DoSetItemClientData( int n, void* clientData )
+{
+    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
 
-  GList *list = g_list_append( NULL, child->data );
-  gtk_list_remove_items( m_list, list );
-  g_list_free( list );
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") );
 
-  wxNode *node = m_clientData.Nth( n );
-  if (!node)
-  {
-    wxFAIL_MSG("wrong listbox index");
-  }
-  else
-    m_clientData.DeleteNode( node );
+    node->SetData( (wxObject*) clientData );
 }
 
-void wxListBox::Deselect( int n )
+void* wxListBox::DoGetItemClientData( int n ) const
 {
-  gtk_list_unselect_item( m_list, n );
+    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
+
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );
+
+    return node->Data();
 }
 
-int wxListBox::FindString( const wxString &item ) const
+void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
 {
-  GList *child = m_list->children;
-  int count = 0;
-  while (child)
-  {
-    GtkBin *bin = GTK_BIN( child->data );
-    GtkLabel *label = GTK_LABEL( bin->child );
-    if (item == label->label) return count;
-    count++;
-    child = child->next;
-  }
+    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
+
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
 
-  // it's not an error if the string is not found - this function may be used to
-  // test for existence of the string in the listbox, so don't give any
-  // errors/assert failures.
+    wxClientData *cd = (wxClientData*) node->Data();
+    delete cd;
 
-  return -1;
+    node->SetData( (wxObject*) clientData );
 }
 
-char *wxListBox::GetClientData( int n ) const
+wxClientData* wxListBox::DoGetItemClientObject( int n ) const
 {
-  wxNode *node = m_clientData.Nth( n );
-  if (node) return ((char*)node->Data());
+    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
 
-  wxFAIL_MSG("wrong listbox index");
-  return (char *) NULL;
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_MSG( node, (wxClientData *)NULL,
+                 wxT("invalid index in wxListBox::DoGetItemClientObject") );
+
+    return (wxClientData*) node->Data();
 }
 
-int wxListBox::GetSelection(void) const
+void wxListBox::Clear()
 {
-  GList *child = m_list->children;
-  int count = 0;
-  while (child)
-  {
-    if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count;
-    count++;
-    child = child->next;
-  }
-  return -1;
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+
+    gtk_list_clear_items( m_list, 0, Number() );
+
+    if ( HasClientObjectData() )
+    {
+        // destroy the data (due to Robert's idea of using wxList<wxObject>
+        // and not wxList<wxClientData> we can't just say
+        // m_clientList.DeleteContents(TRUE) - this would crash!
+        wxNode *node = m_clientList.First();
+        while ( node )
+        {
+            delete (wxClientData *)node->Data();
+            node = node->Next();
+        }
+    }
+    m_clientList.Clear();
+
+    if ( m_strings )
+        m_strings->Clear();
 }
 
-int wxListBox::GetSelections(wxArrayInt& aSelections) const
+void wxListBox::Delete( int n )
 {
-  // get the number of selected items first
-  GList *child = m_list->children;
-  int count = 0;
-  for ( child = m_list->children; child != NULL; child = child->next )
-  {
-    if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED )
-      count++;
-  }
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+
+    GList *child = g_list_nth( m_list->children, n );
 
-  aSelections.Empty();
+    wxCHECK_RET( child, wxT("wrong listbox index") );
 
-  if ( count > 0 ) {
-    // now fill the list
-    aSelections.Alloc(count); // optimization attempt
-    int i = 0;
-    for ( child = m_list->children; child != NULL; child = child->next, i++ )
+    GList *list = g_list_append( (GList*) NULL, child->data );
+    gtk_list_remove_items( m_list, list );
+    g_list_free( list );
+
+    wxNode *node = m_clientList.Nth( n );
+    if ( node )
     {
-      if ( GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED )
-        aSelections.Add(i);
+        if ( m_clientDataItemsType == ClientData_Object )
+        {
+            wxClientData *cd = (wxClientData*)node->Data();
+            delete cd;
+        }
+
+        m_clientList.DeleteNode( node );
     }
-  }
 
-  return count;
+    if ( m_strings )
+        m_strings->Remove(n);
 }
 
-wxString wxListBox::GetString( int n ) const
+// ----------------------------------------------------------------------------
+// string list access
+// ----------------------------------------------------------------------------
+
+void wxListBox::SetString( int n, const wxString &string )
 {
-  GList *child = g_list_nth( m_list->children, n );
-  if (child)
-  {
-    GtkBin *bin = GTK_BIN( child->data );
-    GtkLabel *label = GTK_LABEL( bin->child );
-    return label->label;
-  }
-  wxFAIL_MSG("wrong listbox index");
-  return "";
+    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+
+    GList *child = g_list_nth( m_list->children, n );
+    if (child)
+    {
+        GtkBin *bin = GTK_BIN( child->data );
+        GtkLabel *label = GTK_LABEL( bin->child );
+
+        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::GetStringSelection(void) const
+wxString wxListBox::GetString( int n ) const
 {
-  GList *selection = m_list->selection;
-  if (selection)
-  {
-    GtkBin *bin = GTK_BIN( selection->data );
-    wxString tmp = GTK_LABEL( bin->child )->label;
-    return tmp;
-  }
-  wxFAIL_MSG("no listbox selection available");
-  return "";
+    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("");
 }
 
-int wxListBox::Number(void)
+int wxListBox::GetCount() const
 {
-  GList *child = m_list->children;
-  int count = 0;
-  while (child) { count++; child = child->next; }
-  return count;
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+
+    GList *children = m_list->children;
+    return g_list_length(children);
 }
 
-bool wxListBox::Selected( int n )
+int wxListBox::FindString( const wxString &item ) const
 {
-  GList *target = g_list_nth( m_list->children, n );
-  if (target)
-  {
-    GList *child = m_list->selection;
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+
+    GList *child = m_list->children;
+    int count = 0;
     while (child)
     {
-      if (child->data == target->data) return TRUE;
-      child = child->next;
+        GtkBin *bin = GTK_BIN( child->data );
+        GtkLabel *label = GTK_LABEL( bin->child );
+
+        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
+
+        if (str == item)
+            return count;
+
+        count++;
+        child = child->next;
     }
-  }
-  wxFAIL_MSG("wrong listbox index");
-  return FALSE;
+
+    // it's not an error if the string is not found -> no wxCHECK
+
+    return wxNOT_FOUND;
 }
 
-void wxListBox::Set( int WXUNUSED(n), const wxString *WXUNUSED(choices) )
+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------
+
+int wxListBox::GetSelection() const
 {
-  wxFAIL_MSG("wxListBox::Set not implemented");
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+
+    GList *child = m_list->children;
+    int count = 0;
+    while (child)
+    {
+        if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED) return count;
+        count++;
+        child = child->next;
+    }
+    return -1;
 }
 
-void wxListBox::SetClientData( int n, char *clientData )
+int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {
-  wxNode *node = m_clientData.Nth( n );
-  if (node)
-  {
-    node->SetData( (wxObject*)clientData );
-  }
-  else
-  {
-    wxFAIL_MSG("wrong listbox index");
-  }
+    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+
+    // get the number of selected items first
+    GList *child = m_list->children;
+    int count = 0;
+    for (child = m_list->children; child != NULL; child = child->next)
+    {
+        if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED)
+            count++;
+    }
+
+    aSelections.Empty();
+
+    if (count > 0)
+    {
+        // now fill the list
+        aSelections.Alloc(count); // optimization attempt
+        int i = 0;
+        for (child = m_list->children; child != NULL; child = child->next, i++)
+        {
+            if (GTK_WIDGET(child->data)->state == GTK_STATE_SELECTED)
+                 aSelections.Add(i);
+        }
+    }
+
+    return count;
 }
 
-void wxListBox::SetFirstItem( int WXUNUSED(n) )
+bool wxListBox::IsSelected( int n ) const
 {
-  wxFAIL_MSG("wxListBox::SetFirstItem not implemented");
+    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(wxT("wrong listbox index"));
+
+    return FALSE;
 }
 
-void wxListBox::SetFirstItem( const wxString &WXUNUSED(item) )
+void wxListBox::SetSelection( int n, bool select )
 {
-  wxFAIL_MSG("wxListBox::SetFirstItem not implemented");
+    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 );
+
+    GtkEnableEvents();
 }
 
-void wxListBox::SetSelection( int n, bool select )
+void wxListBox::DoSetFirstItem( int WXUNUSED(n) )
 {
-  if (select)
-    gtk_list_select_item( m_list, n );
-  else
-    gtk_list_unselect_item( m_list, n );
+    wxFAIL_MSG(wxT("wxListBox::SetFirstItem not implemented"));
 }
 
-void wxListBox::SetString( int n, const wxString &string )
+// ----------------------------------------------------------------------------
+// helpers
+// ----------------------------------------------------------------------------
+
+int wxListBox::GtkGetIndex( GtkWidget *item ) const
 {
-  GList *child = g_list_nth( m_list->children, n );
-  if (child)
-  {
-    GtkBin *bin = GTK_BIN( child->data );
-    GtkLabel *label = GTK_LABEL( bin->child );
-    gtk_label_set( label, string );
-  }
-  else
-  {
-    wxFAIL_MSG("wrong listbox index");
-  }
+    if (item)
+    {
+        GList *child = m_list->children;
+        int count = 0;
+        while (child)
+        {
+            if (GTK_WIDGET(child->data) == item) return count;
+            count++;
+            child = child->next;
+        }
+    }
+    return -1;
 }
 
-void wxListBox::SetStringSelection( const wxString &string, bool select )
+#if wxUSE_TOOLTIPS
+void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 {
-  SetSelection( FindString(string), select );
+    GList *child = m_list->children;
+    while (child)
+    {
+        gtk_tooltips_set_tip( tips, GTK_WIDGET( child->data ), wxConvCurrent->cWX2MB(tip), (gchar*) NULL );
+        child = child->next;
+    }
 }
+#endif // wxUSE_TOOLTIPS
 
-int wxListBox::GetIndex( GtkWidget *item ) const
+void wxListBox::GtkDisableEvents()
 {
-  if (item)
-  {
     GList *child = m_list->children;
-    int count = 0;
     while (child)
     {
-      if (GTK_WIDGET(child->data) == item) return count;
-      count++;
-      child = child->next;
+        gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
+          GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
+
+        if (HasFlag(wxLB_MULTIPLE))
+            gtk_signal_disconnect_by_func( GTK_OBJECT(child->data),
+              GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
+
+        child = child->next;
     }
-  }
-  return -1;
 }
 
-void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
+void wxListBox::GtkEnableEvents()
 {
-  GList *child = m_list->children;
-  while (child)
-  {
-    DisconnectDnDWidget( GTK_WIDGET( child->data ) );
-    child = child->next;
-  }
+    GList *child = m_list->children;
+    while (child)
+    {
+        gtk_signal_connect( GTK_OBJECT(child->data), "select",
+          GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );
 
-  wxWindow::SetDropTarget( dropTarget  );
+        if (HasFlag(wxLB_MULTIPLE))
+            gtk_signal_connect( GTK_OBJECT(child->data), "deselect",
+              GTK_SIGNAL_FUNC(gtk_listitem_deselect_callback), (gpointer)this );
 
-  child = m_list->children;
-  while (child)
-  {
-    ConnectDnDWidget( GTK_WIDGET( child->data ) );
-    child = child->next;
-  }
+        child = child->next;
+    }
 }
 
-GtkWidget *wxListBox::GetConnectWidget(void)
+GtkWidget *wxListBox::GetConnectWidget()
 {
-  return GTK_WIDGET(m_list);
+    return GTK_WIDGET(m_list);
 }
 
-void wxListBox::SetFont( const wxFont &font )
+bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
-  wxWindow::SetFont( font );
+    if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
+
+    GList *child = m_list->children;
+    while (child)
+    {
+        GtkWidget *bin = GTK_WIDGET( child->data );
+        if (bin->window == window) return TRUE;
+        child = child->next;
+    }
 
-  GList *child = m_list->children;
-  while (child)
-  {
-    GtkBin *bin = (GtkBin*) child->data;
-    gtk_widget_set_style( bin->child,
-      gtk_style_ref(
-        gtk_widget_get_style( m_widget ) ) );
-    child = child->next;
-  }
+    return FALSE;
 }
 
-bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
+void wxListBox::ApplyWidgetStyle()
 {
-  if (wxWindow::IsOwnGtkWindow( window )) return TRUE;
+    SetWidgetStyle();
+
+    if (m_backgroundColour.Ok())
+    {
+        GdkWindow *window = GTK_WIDGET(m_list)->window;
+        if ( window )
+        {
+            m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+            gdk_window_set_background( window, m_backgroundColour.GetColor() );
+            gdk_window_clear( window );
+        }
+    }
+
+    GList *child = m_list->children;
+    while (child)
+    {
+        gtk_widget_set_style( GTK_WIDGET(child->data), m_widgetStyle );
 
-  GList *child = m_list->children;
-  while (child)
-  {
-    GtkBin *bin = (GtkBin*) child->data;
-    if (bin->child->window == window) return TRUE;
-    child = child->next;
-  }
+        GtkBin *bin = GTK_BIN( child->data );
+        GtkWidget *label = GTK_WIDGET( bin->child );
+        gtk_widget_set_style( label, m_widgetStyle );
 
-  return FALSE;
+        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();
+}
 
+#endif