Corrected frame.cpp to recognise wxNO_BORDER properly

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index c09dca49777236760bddb87e5af6cd93fcabdb16..308faa01e1c4c99051149335004b2d82c9068d2f 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -26,12 +26,9 @@
 #include "wx/tooltip.h"
 #endif
 
 #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
 
 //-----------------------------------------------------------------------------
 // idle system


@@ -102,25 +99,28 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
 
     if (!g_hasDoubleClicked) return FALSE;
 
 
     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;
 }
 
     return FALSE;
 }


@@ -141,7 +141,7 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
 
     if (!listbox->m_hasVMT) return FALSE;
 
 
     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))
 
 #if wxUSE_CHECKLISTBOX
     if ((listbox->m_hasCheckBoxes) && (gdk_event->x < 15) && (gdk_event->type != GDK_2BUTTON_PRESS))


@@ -167,32 +167,52 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
 // "key_press_event"
 //-----------------------------------------------------------------------------
 
 // "key_press_event"
 //-----------------------------------------------------------------------------
 

-#if wxUSE_CHECKLISTBOX

 static gint
 gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxListBox *listbox )
 {
 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;
 }
 
     return FALSE;
 }

-#endif // wxUSE_CHECKLISTBOX

 
 //-----------------------------------------------------------------------------
 // "select" and "deselect"
 
 //-----------------------------------------------------------------------------
 // "select" and "deselect"


@@ -211,16 +231,20 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
 
     if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 
     if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;

-
+    

     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );

+    event.SetEventObject( listbox );

 
     wxArrayInt aSelections;
     int n, count = listbox->GetSelections(aSelections);
     if ( count > 0 )
     {
         n = aSelections[0];
 
     wxArrayInt aSelections;
     int n, count = listbox->GetSelections(aSelections);
     if ( count > 0 )
     {
         n = aSelections[0];

-        event.m_clientData = listbox->m_clientData.Item(n);
-        event.m_commandString = listbox->GetString(n);
+        if ( listbox->HasClientObjectData() )
+            event.SetClientObject( listbox->GetClientObject(n) );
+        else if ( listbox->HasClientUntypedData() )
+            event.SetClientData( listbox->GetClientData(n) );
+        event.SetString( listbox->GetString(n) );

     }
     else
     {
     }
     else
     {


@@ -229,9 +253,8 @@ static void gtk_listitem_select_callback( GtkWidget *WXUNUSED(widget), wxListBox
 
     event.m_commandInt = n;
 
 
     event.m_commandInt = n;
 

-    event.SetEventObject( listbox );
-
-    listbox->GetEventHandler()->ProcessEvent( event );
+    listbox->GetEventHandler()->AddPendingEvent( event );
+//    listbox->GetEventHandler()->ProcessEvent( event );

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


@@ -304,75 +327,29 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( 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 );
+    SetSizeOrDefault( size );

 
     if ( style & wxLB_SORT )
     {
         // this will change DoAppend() behaviour
         m_strings = new wxSortedArrayString;
     }
 
     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++)
     {
 
     for (int i = 0; i < n; i++)
     {

-        m_clientData.Append((wxObject *)NULL);
-
+        // add one by one

         DoAppend(choices[i]);
         DoAppend(choices[i]);

-
-#if 0
-        wxString str(choices[i]);
-
-#if wxUSE_CHECKLISTBOX
-        if (m_hasCheckBoxes)
-        {
-            str.Prepend(CHECKBOX_STRING);
-        }
-#endif // wxUSE_CHECKLISTBOX
-
-        GtkWidget *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_deselect_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 wxUSE_CHECKLISTBOX
-        if (m_hasCheckBoxes)
-        {
-            gtk_signal_connect( GTK_OBJECT(list_item),
-                            "key_press_event",
-                            (GtkSignalFunc)gtk_listbox_key_press_callback,
-                            (gpointer)this );
-        }
-#endif // wxUSE_CHECKLISTBOX
-
-        ConnectWidget( list_item );
-
-        gtk_widget_show( list_item );
-#endif // 0

     }
 
     m_parent->DoAddChild( this );
 
     PostCreation();
 
     }
 
     m_parent->DoAddChild( this );
 
     PostCreation();
 

-    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_WINDOW ) );
+    SetBackgroundColour( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_LISTBOX ) );

     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 
     SetForegroundColour( parent->GetForegroundColour() );
     SetFont( parent->GetFont() );
 


@@ -384,144 +361,81 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 wxListBox::~wxListBox()
 {
     Clear();
 wxListBox::~wxListBox()
 {
     Clear();

+    if (m_strings)
+      delete m_strings;

 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
 }
 
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 

-    // code elsewhere supposes we have as many items in m_clientData as items
+    // 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
     // in the listbox

-    wxASSERT_MSG( m_clientData.GetCount() == (size_t)GetCount(),
+    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);
                   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") );
 
     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.
-
-    // VZ: notice that InsertItems knows nothing about sorting, so calling it
-    //     from outside (and not from our own Append) is likely to break
-    //     everything
-

     size_t nItems = items.GetCount();
 
     size_t nItems = items.GetCount();
 

-    size_t n; // loop var
-
-    // optimise for this trivial case
-    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++ )

         {
         {

-            AppendWithoutSorting(items[n]);
+            GtkAddItem( items[n] );

 
 

-            m_clientData.Append((wxObject *)NULL);
+            m_clientList.Append((wxObject *)NULL);

         }
         }

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

     }
     }

-
-    // remove the old items
-    wxArrayString deletedLabels;
-    wxArrayPtrVoid deletedData;
-#if wxUSE_CHECKLISTBOX
-    wxArrayInt deletedChecks;
-#endif
-
-    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),*wxConvCurrent);
-        deletedLabels.Add(str);
-
-        // save data
-        deletedData.Add(m_clientData.Item(n));
-
-#if wxUSE_CHECKLISTBOX
-        // save check state
-        if ( m_hasCheckBoxes )
+        wxNode *node = m_clientList.Nth( pos );
+        for ( size_t n = 0; n < nItems; n++ )

         {
         {

-            deletedChecks.Add(((wxCheckListBox *)this)->IsChecked(pos + n));
-        }
-#endif // wxUSE_CHECKLISTBOX
-    }
-
-    // don't delete contents, the data will be reappended soon
-    m_clientData.Clear();
-
-    size_t nDeletedCount = n;
-
-    gtk_list_clear_items( m_list, pos, length );
-
-    // now append the new items
-    for ( n = 0; n < nItems; n++ )
-    {
-        AppendWithoutSorting(items[n]);
-
-        m_clientData.Append((wxObject *)NULL);
-    }
-
-    // and append the old items too
-    pos += nItems;  // now the indices are shifter
-    for ( n = 0; n < nDeletedCount; n++ )
-    {
-        AppendWithoutSorting(deletedLabels[n]);
-
-        m_clientData.Append((wxObject *)NULL);
-
-        if ( m_clientDataItemsType == ClientData_Object )
-            SetClientObject(n, (wxClientData *)deletedData[n]);
-        else if ( m_clientDataItemsType == ClientData_Void )
-            SetClientData(n, deletedData[n]);
+            GtkAddItem( items[n], pos+n );

 
 

-#if wxUSE_CHECKLISTBOX
-        if ( m_hasCheckBoxes )
-        {
-            ((wxCheckListBox *)this)->Check(pos + n, (bool)deletedChecks[n]);
+            m_clientList.Insert( node, (wxObject *)NULL );

         }
         }

-#endif // wxUSE_CHECKLISTBOX

     }
 
     }
 

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

 }
 
 int wxListBox::DoAppend( const wxString& item )
 {
 }
 
 int wxListBox::DoAppend( const wxString& item )
 {

-    int index;
-    if ( m_strings )
+    if (m_strings)

     {
         // need to determine the index
     {
         // need to determine the index

-        index = m_strings->Add(item);
-
-        InsertItems(1, &item, 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;
+       }

     }
     }

-    else
-    {
-        // not sorted, just append
-        AppendWithoutSorting(item);
+    
+    GtkAddItem(item);

 
 

-        m_clientData.Append((wxObject *)NULL);
+    m_clientList.Append((wxObject *)NULL);

 
 

-        index = GetCount() - 1;
-    }
-
-    return index;
+    return GetCount() - 1;

 }
 
 }
 

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

 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 


@@ -537,7 +451,13 @@ void wxListBox::AppendWithoutSorting( const wxString &item )
 
     list_item = gtk_list_item_new_with_label( label.mbc_str() );
 
 
     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 );
 
     gtk_signal_connect( GTK_OBJECT(list_item), "select",
       GTK_SIGNAL_FUNC(gtk_listitem_select_callback), (gpointer)this );


@@ -556,40 +476,29 @@ void wxListBox::AppendWithoutSorting( const wxString &item )
                         (GtkSignalFunc)gtk_listbox_button_release_callback,
                         (gpointer) this );
 
                         (GtkSignalFunc)gtk_listbox_button_release_callback,
                         (gpointer) this );
 

-#if wxUSE_CHECKLISTBOX
-    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 );
                            "key_press_event",
                            (GtkSignalFunc)gtk_listbox_key_press_callback,
                            (gpointer)this );

-    }
-#endif // wxUSE_CHECKLISTBOX
-
-    gtk_widget_show( list_item );

 
     ConnectWidget( 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 (GTK_WIDGET_REALIZED(m_widget))
     {
         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 

-        //if (m_widgetStyle) ApplyWidgetStyle();
-        if (m_widgetStyle) {
-            // Apply current widget style to the new list_item
+        // 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 );
         }
 
             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_DRAG_AND_DROP
-    #ifndef NEW_GTK_DND_CODE
-        if (m_dropTarget) m_dropTarget->RegisterWidget( list_item );
-    #endif
-#endif
-

 #if wxUSE_TOOLTIPS
         if (m_tooltip) m_tooltip->Apply( this );
 #endif
 #if wxUSE_TOOLTIPS
         if (m_tooltip) m_tooltip->Apply( this );
 #endif


@@ -617,32 +526,32 @@ void wxListBox::DoSetItems( const wxArrayString& items,
 // client data
 // ----------------------------------------------------------------------------
 
 // client data
 // ----------------------------------------------------------------------------
 

-void wxListBox::DoSetClientData( int n, void* clientData )
+void wxListBox::DoSetItemClientData( int n, void* clientData )

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
 

-    wxNode *node = m_clientData.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetClientData") );
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") );

 
     node->SetData( (wxObject*) clientData );
 }
 
 
     node->SetData( (wxObject*) clientData );
 }
 

-void* wxListBox::DoGetClientData( int n ) const
+void* wxListBox::DoGetItemClientData( int n ) const

 {
     wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
 
 {
     wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
 

-    wxNode *node = m_clientData.Nth( n );
-    wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetClientData") );
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );

 
     return node->Data();
 }
 
 
     return node->Data();
 }
 

-void wxListBox::DoSetClientObject( int n, wxClientData* clientData )
+void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )

 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
 
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
 

-    wxNode *node = m_clientData.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetClientObject") );
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );

 
     wxClientData *cd = (wxClientData*) node->Data();
     delete cd;
 
     wxClientData *cd = (wxClientData*) node->Data();
     delete cd;


@@ -650,13 +559,13 @@ void wxListBox::DoSetClientObject( int n, wxClientData* clientData )
     node->SetData( (wxObject*) clientData );
 }
 
     node->SetData( (wxObject*) clientData );
 }
 

-wxClientData* wxListBox::DoGetClientObject( int n ) const
+wxClientData* wxListBox::DoGetItemClientObject( int n ) const

 {
     wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
 
 {
     wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
 

-    wxNode *node = m_clientData.Nth( n );
+    wxNode *node = m_clientList.Nth( n );

     wxCHECK_MSG( node, (wxClientData *)NULL,
     wxCHECK_MSG( node, (wxClientData *)NULL,

-                 wxT("invalid index in wxListBox::DoGetClientObject") );
+                 wxT("invalid index in wxListBox::DoGetItemClientObject") );

 
     return (wxClientData*) node->Data();
 }
 
     return (wxClientData*) node->Data();
 }


@@ -667,9 +576,19 @@ void wxListBox::Clear()
 
     gtk_list_clear_items( m_list, 0, Number() );
 
 
     gtk_list_clear_items( m_list, 0, Number() );
 

-    if ( m_clientDataItemsType == ClientData_Object )
-        m_clientData.DeleteContents(TRUE);
-    m_clientData.Clear();
+    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();
 
     if ( m_strings )
         m_strings->Clear();


@@ -687,7 +606,7 @@ void wxListBox::Delete( int n )
     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 
     gtk_list_remove_items( m_list, list );
     g_list_free( list );
 

-    wxNode *node = m_clientData.Nth( n );
+    wxNode *node = m_clientList.Nth( n );

     if ( node )
     {
         if ( m_clientDataItemsType == ClientData_Object )
     if ( node )
     {
         if ( m_clientDataItemsType == ClientData_Object )


@@ -696,7 +615,7 @@ void wxListBox::Delete( int n )
             delete cd;
         }
 
             delete cd;
         }
 

-        m_clientData.DeleteNode( node );
+        m_clientList.DeleteNode( node );

     }
 
     if ( m_strings )
     }
 
     if ( m_strings )


@@ -756,15 +675,8 @@ int wxListBox::GetCount() const
 {
     wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 
 {
     wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
 

-    GList *child = m_list->children;
-    int count = 0;
-    while (child)
-    {
-        count++;
-        child = child->next;
-    }
-
-    return count;
+    GList *children = m_list->children;
+    return g_list_length(children);

 }
 
 int wxListBox::FindString( const wxString &item ) const
 }
 
 int wxListBox::FindString( const wxString &item ) const


@@ -846,33 +758,24 @@ bool wxListBox::IsSelected( int n ) const
     wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
 
     GList *target = g_list_nth( m_list->children, n );
     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;
+    
+    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, wxT("invalid listbox") );
 
 }
 
 void wxListBox::SetSelection( int n, bool select )
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 

-    DisableEvents();
+    GtkDisableEvents();

 
     if (select)
         gtk_list_select_item( m_list, n );
     else
         gtk_list_unselect_item( m_list, n );
 
 
     if (select)
         gtk_list_select_item( m_list, n );
     else
         gtk_list_unselect_item( m_list, n );
 

-    EnableEvents();
+    GtkEnableEvents();

 }
 
 void wxListBox::DoSetFirstItem( int WXUNUSED(n) )
 }
 
 void wxListBox::DoSetFirstItem( int WXUNUSED(n) )


@@ -884,7 +787,7 @@ void wxListBox::DoSetFirstItem( int WXUNUSED(n) )
 // helpers
 // ----------------------------------------------------------------------------
 
 // helpers
 // ----------------------------------------------------------------------------
 

-int wxListBox::GetIndex( GtkWidget *item ) const
+int wxListBox::GtkGetIndex( GtkWidget *item ) const

 {
     if (item)
     {
 {
     if (item)
     {


@@ -912,40 +815,7 @@ void wxListBox::ApplyToolTip( GtkTooltips *tips, const wxChar *tip )
 }
 #endif // wxUSE_TOOLTIPS
 
 }
 #endif // wxUSE_TOOLTIPS
 

-#if wxUSE_DRAG_AND_DROP
-void wxListBox::SetDropTarget( wxDropTarget *dropTarget )
-{
-    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
-
-#ifndef NEW_GTK_DND_CODE
-    if (m_dropTarget)
-    {
-        GList *child = m_list->children;
-        while (child)
-        {
-            m_dropTarget->UnregisterWidget( GTK_WIDGET( child->data ) );
-            child = child->next;
-        }
-    }
-#endif
-
-    wxWindow::SetDropTarget( dropTarget );
-
-#ifndef NEW_GTK_DND_CODE
-    if (m_dropTarget)
-    {
-        GList *child = m_list->children;
-        while (child)
-        {
-            m_dropTarget->RegisterWidget( GTK_WIDGET( child->data ) );
-            child = child->next;
-        }
-    }
-#endif
-}
-#endif
-
-void wxListBox::DisableEvents()
+void wxListBox::GtkDisableEvents()

 {
     GList *child = m_list->children;
     while (child)
 {
     GList *child = m_list->children;
     while (child)


@@ -961,7 +831,7 @@ void wxListBox::DisableEvents()
     }
 }
 
     }
 }
 

-void wxListBox::EnableEvents()
+void wxListBox::GtkEnableEvents()

 {
     GList *child = m_list->children;
     while (child)
 {
     GList *child = m_list->children;
     while (child)


@@ -984,7 +854,7 @@ GtkWidget *wxListBox::GetConnectWidget()
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 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)
 
     GList *child = m_list->children;
     while (child)


@@ -1057,4 +927,9 @@ void wxListBox::OnInternalIdle()
     UpdateWindowUI();
 }
 
     UpdateWindowUI();
 }
 

+wxSize wxListBox::DoGetBestSize() const
+{
+    return wxSize(100, 110);
+}
+

 #endif
 #endif