GetLabelTop should return the stripped label, for compatibility.

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 70203eb2db04f41625f84543cf32cb0c00fe3147..93815ed498c7e74d37900ab990322024a9e59619 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        listbox.cpp
+// Name:        src/gtk1/listbox.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,29 +7,26 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "listbox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#include "wx/defs.h"
-

 #if wxUSE_LISTBOX
 
 #include "wx/listbox.h"
 #if wxUSE_LISTBOX
 
 #include "wx/listbox.h"

-#include "wx/dynarray.h"
-#include "wx/arrstr.h"
-#include "wx/utils.h"
-#include "wx/intl.h"
-#include "wx/checklst.h"
-#include "wx/settings.h"
-#include "wx/gtk/private.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+    #include "wx/intl.h"
+    #include "wx/utils.h"
+    #include "wx/settings.h"
+    #include "wx/checklst.h"
+    #include "wx/arrstr.h"
+#endif
+
+#include "wx/gtk1/private.h"

 
 #if wxUSE_TOOLTIPS
 
 #if wxUSE_TOOLTIPS

-#include "wx/tooltip.h"
+    #include "wx/tooltip.h"

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


@@ -54,7 +51,7 @@ extern wxWindowGTK   *g_delayedFocus;
 extern wxWindowGTK   *g_focusWindow;
 extern wxWindowGTK   *g_focusWindowLast;
 
 extern wxWindowGTK   *g_focusWindow;
 extern wxWindowGTK   *g_focusWindowLast;
 

-static bool       g_hasDoubleClicked = FALSE;
+static bool       g_hasDoubleClicked = false;

 
 //-----------------------------------------------------------------------------
 // idle callback for SetFirstItem
 
 //-----------------------------------------------------------------------------
 // idle callback for SetFirstItem


@@ -67,7 +64,8 @@ struct wxlistbox_idle_struct
     gint         m_tag;
 };
 
     gint         m_tag;
 };
 

-extern "C" gint wxlistbox_idle_callback( gpointer gdata )
+extern "C" {
+static gint wxlistbox_idle_callback( gpointer gdata )

 {
     wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
     gdk_threads_enter();
 {
     wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
     gdk_threads_enter();


@@ -77,7 +75,7 @@ extern "C" gint wxlistbox_idle_callback( gpointer gdata )
     // check that the items haven't been deleted from the listbox since we had
     // installed this callback
     wxListBox *lbox = data->m_listbox;
     // check that the items haven't been deleted from the listbox since we had
     // installed this callback
     wxListBox *lbox = data->m_listbox;

-    if ( data->m_item < lbox->GetCount() )
+    if ( data->m_item < (int)lbox->GetCount() )

     {
         lbox->SetFirstItem( data->m_item );
     }
     {
         lbox->SetFirstItem( data->m_item );
     }


@@ -88,11 +86,13 @@ extern "C" gint wxlistbox_idle_callback( gpointer gdata )
 
     return TRUE;
 }
 
     return TRUE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "focus_in_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "focus_in_event"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
                                           GdkEvent *WXUNUSED(event),
                                           wxWindow *win )
 static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
                                           GdkEvent *WXUNUSED(event),
                                           wxWindow *win )


@@ -107,8 +107,8 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
     if ( !win->m_hasFocus )
     {
         // not yet, notify it
     if ( !win->m_hasFocus )
     {
         // not yet, notify it

-        win->m_hasFocus = TRUE;
-        
+        win->m_hasFocus = true;
+

         wxChildFocusEvent eventChildFocus(win);
         (void)win->GetEventHandler()->ProcessEvent(eventChildFocus);
 
         wxChildFocusEvent eventChildFocus(win);
         (void)win->GetEventHandler()->ProcessEvent(eventChildFocus);
 


@@ -120,11 +120,13 @@ static gint gtk_listitem_focus_in_callback( GtkWidget *widget,
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "focus_out_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "focus_out_event"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win )
 {
     if (g_isIdle)
 static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *gdk_event, wxWindowGTK *win )
 {
     if (g_isIdle)


@@ -136,7 +138,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g
     // have focus already
     if ( win->m_hasFocus )
     {
     // have focus already
     if ( win->m_hasFocus )
     {

-        win->m_hasFocus = FALSE;
+        win->m_hasFocus = false;

 
         wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
         event.SetEventObject( win );
 
         wxFocusEvent event( wxEVT_KILL_FOCUS, win->GetId() );
         event.SetEventObject( win );


@@ -150,6 +152,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_release_event"
 
 //-----------------------------------------------------------------------------
 // "button_release_event"


@@ -161,6 +164,7 @@ static gint gtk_listitem_focus_out_callback( GtkWidget *widget, GdkEventFocus *g
    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 */
 
    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 */
 

+extern "C" {

 static gint
 gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
                                      GdkEventButton * WXUNUSED(gdk_event),
 static gint
 gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
                                      GdkEventButton * WXUNUSED(gdk_event),


@@ -200,11 +204,13 @@ gtk_listbox_button_release_callback( GtkWidget * WXUNUSED(widget),
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "button_press_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "button_press_event"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 static gint
 gtk_listbox_button_press_callback( GtkWidget *widget,
                                    GdkEventButton *gdk_event,
 static gint
 gtk_listbox_button_press_callback( GtkWidget *widget,
                                    GdkEventButton *gdk_event,


@@ -233,16 +239,34 @@ gtk_listbox_button_press_callback( GtkWidget *widget,
     }
 #endif // wxUSE_CHECKLISTBOX
 
     }
 #endif // wxUSE_CHECKLISTBOX
 

+    if ((gdk_event->state == 0) &&
+         (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
+          ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
+    {
+            listbox->m_blockEvent = true;
+
+            int i;
+            for (i = 0; i < (int)listbox->GetCount(); i++)
+                if (i != sel)
+                    gtk_list_unselect_item( GTK_LIST(listbox->m_list), i );
+
+            listbox->m_blockEvent = false;
+
+            return false;
+    }
+

     /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
     g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
 
     return FALSE;
 }
     /* emit wxEVT_COMMAND_LISTBOX_DOUBLECLICKED later */
     g_hasDoubleClicked = (gdk_event->type == GDK_2BUTTON_PRESS);
 
     return FALSE;
 }

+}

 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // "key_press_event"
 //-----------------------------------------------------------------------------
 

+extern "C" {

 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 )
 {


@@ -252,7 +276,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
     if (g_blockEventsOnDrag)
         return FALSE;
 
     if (g_blockEventsOnDrag)
         return FALSE;
 

-    bool ret = FALSE;
+    bool ret = false;

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


@@ -268,7 +292,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
     if ((gdk_event->keyval == GDK_Return) && (!ret))
     {
         // eat return in all modes
     if ((gdk_event->keyval == GDK_Return) && (!ret))
     {
         // eat return in all modes

-        ret = TRUE;
+        ret = true;

     }
 
 #if wxUSE_CHECKLISTBOX
     }
 
 #if wxUSE_CHECKLISTBOX


@@ -288,21 +312,21 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 #endif // wxUSE_CHECKLISTBOX
 
     // Check or uncheck item with SPACE
 #endif // wxUSE_CHECKLISTBOX
 
     // Check or uncheck item with SPACE

-    if ((gdk_event->keyval == ' ') && (!ret) && 
+    if ((gdk_event->keyval == ' ') && (!ret) &&

          (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
           ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
     {
         int sel = listbox->GtkGetIndex( widget );
          (((listbox->GetWindowStyleFlag() & wxLB_MULTIPLE) != 0) ||
           ((listbox->GetWindowStyleFlag() & wxLB_EXTENDED) != 0)) )
     {
         int sel = listbox->GtkGetIndex( widget );

-        
+

         if (sel != -1)
         {
         if (sel != -1)
         {

-            ret = TRUE;
-            
+            ret = true;
+

             if (listbox->IsSelected( sel ))
                 gtk_list_unselect_item( listbox->m_list, sel );
             else
                 gtk_list_select_item( listbox->m_list, sel );
             if (listbox->IsSelected( sel ))
                 gtk_list_unselect_item( listbox->m_list, sel );
             else
                 gtk_list_select_item( listbox->m_list, sel );

-            
+

             wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
             new_event.SetEventObject( listbox );
             wxArrayInt aSelections;
             wxCommandEvent new_event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
             new_event.SetEventObject( listbox );
             wxArrayInt aSelections;


@@ -324,7 +348,7 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
             listbox->GetEventHandler()->ProcessEvent( new_event );
         }
     }
             listbox->GetEventHandler()->ProcessEvent( new_event );
         }
     }

-    
+

     if (ret)
     {
         gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );
     if (ret)
     {
         gtk_signal_emit_stop_by_name( GTK_OBJECT(widget), "key_press_event" );


@@ -333,23 +357,12 @@ gtk_listbox_key_press_callback( GtkWidget *widget, GdkEventKey *gdk_event, wxLis
 
     return FALSE;
 }
 
     return FALSE;
 }

+}

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

-static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool is_selection );
-
-static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox )
-{
-    gtk_listitem_select_cb( widget, listbox, TRUE );
-}
-
-static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
-{
-    gtk_listitem_select_cb( widget, listbox, FALSE );
-}
-

 static void gtk_listitem_select_cb( GtkWidget *widget,
                                     wxListBox *listbox,
                                     bool is_selection )
 static void gtk_listitem_select_cb( GtkWidget *widget,
                                     wxListBox *listbox,
                                     bool is_selection )


@@ -400,6 +413,39 @@ static void gtk_listitem_select_cb( GtkWidget *widget,
     listbox->GetEventHandler()->ProcessEvent( event );
 }
 
     listbox->GetEventHandler()->ProcessEvent( event );
 }
 

+extern "C" {
+static void gtk_listitem_select_callback( GtkWidget *widget, wxListBox *listbox )
+{
+    gtk_listitem_select_cb( widget, listbox, TRUE );
+}
+}
+
+extern "C" {
+static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbox )
+{
+    gtk_listitem_select_cb( widget, listbox, FALSE );
+}
+}
+
+//-----------------------------------------------------------------------------
+// wxListBox
+//-----------------------------------------------------------------------------
+
+extern "C" {
+static gint
+gtk_listbox_realized_callback( GtkWidget *m_widget, wxListBox *win )
+{
+    if (g_isIdle)
+        wxapp_install_idle_handler();
+
+    GList *child = win->m_list->children;
+    for (child = win->m_list->children; child != NULL; child = child->next)
+        gtk_widget_show( GTK_WIDGET(child->data) );
+
+    return false;
+}
+}
+

 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxListBox
 //-----------------------------------------------------------------------------


@@ -414,7 +460,7 @@ wxListBox::wxListBox()
 {
     m_list = (GtkList *) NULL;
 #if wxUSE_CHECKLISTBOX
 {
     m_list = (GtkList *) NULL;
 #if wxUSE_CHECKLISTBOX

-    m_hasCheckBoxes = FALSE;
+    m_hasCheckBoxes = false;

 #endif // wxUSE_CHECKLISTBOX
 }
 
 #endif // wxUSE_CHECKLISTBOX
 }
 


@@ -436,16 +482,16 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
                         long style, const wxValidator& validator,
                         const wxString &name )
 {
                         long style, const wxValidator& validator,
                         const wxString &name )
 {

-    m_needParent = TRUE;
-    m_acceptsFocus = TRUE;
+    m_needParent = true;
+    m_acceptsFocus = true;

     m_prevSelection = 0;  // or -1 ??
     m_prevSelection = 0;  // or -1 ??

-    m_blockEvent = FALSE;
+    m_blockEvent = false;

 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxListBox creation failed") );
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, validator, name ))
     {
         wxFAIL_MSG( wxT("wxListBox creation failed") );

-        return FALSE;
+        return false;

     }
 
     m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );
     }
 
     m_widget = gtk_scrolled_window_new( (GtkAdjustment*) NULL, (GtkAdjustment*) NULL );


@@ -475,7 +521,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
     {
         // if style was 0 set single mode
         m_windowStyle |= wxLB_SINGLE;
     {
         // if style was 0 set single mode
         m_windowStyle |= wxLB_SINGLE;

-        mode = GTK_SELECTION_MULTIPLE;
+        mode = GTK_SELECTION_SINGLE;

     }
 
     gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
     }
 
     gtk_list_set_selection_mode( GTK_LIST(m_list), mode );


@@ -490,9 +536,12 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 
 
     gtk_widget_show( GTK_WIDGET(m_list) );
 

+    gtk_signal_connect( GTK_OBJECT(m_list), "realize",
+                        GTK_SIGNAL_FUNC(gtk_listbox_realized_callback), (gpointer) this );
+

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

-        // this will change DoAppend() behaviour
+        // this will change Append() behaviour

         m_strings = new wxSortedArrayString;
     }
     else
         m_strings = new wxSortedArrayString;
     }
     else


@@ -500,23 +549,19 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         m_strings = (wxSortedArrayString *)NULL;
     }
 
         m_strings = (wxSortedArrayString *)NULL;
     }
 

-    for (int i = 0; i < n; i++)
-    {
-        // add one by one
-        DoAppend(choices[i]);
-    }
+    Append(n, choices);

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

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

 
 

-    return TRUE;
+    return true;

 }
 
 wxListBox::~wxListBox()
 {
 }
 
 wxListBox::~wxListBox()
 {

-    m_hasVMT = FALSE;
+    m_hasVMT = false;

 
     Clear();
 
 
     Clear();
 


@@ -528,101 +573,44 @@ wxListBox::~wxListBox()
 // adding items
 // ----------------------------------------------------------------------------
 
 // adding items
 // ----------------------------------------------------------------------------
 

-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
+                             unsigned int pos,
+                             void **clientData,
+                             wxClientDataType type)

 {
 {

-    wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxNOT_FOUND, 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
+    const unsigned count = GetCount();
+    wxCHECK_MSG( pos <= count, wxNOT_FOUND,
+                    wxT("invalid index in wxListBox::InsertItems") );

 
     // code elsewhere supposes we have as many items in m_clientList as items
     // in the listbox
 
     // 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") );
+    wxASSERT_MSG( m_clientList.GetCount() == count,
+                      wxT("bug in client data management") );

 
     InvalidateBestSize();
 
 
     InvalidateBestSize();
 

-    GList *children = m_list->children;
-    int length = g_list_length(children);
-
-    wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
+    const unsigned numItems = items.GetCount();

 
 

-    size_t nItems = items.GetCount();
-    int index;
-
-    if (m_strings)
+    for ( unsigned int n = 0; n < numItems; ++n, ++pos )

     {
     {

-        for (size_t n = 0; n < nItems; n++)
-        {
-            index = m_strings->Add( items[n] );
+        const wxString& item = items[n];

 
 

-            if (index != GetCount())
-            {
-                GtkAddItem( items[n], index );
-                wxList::compatibility_iterator node = m_clientList.Item( index );
-                m_clientList.Insert( node, (wxObject*) NULL );
-            }
-            else
-            {
-                GtkAddItem( items[n] );
-                m_clientList.Append( (wxObject*) NULL );
-            }
-        }
-    }
-    else
-    {
-        if (pos == length)
-        {
-            for ( size_t n = 0; n < nItems; n++ )
-            {
-                GtkAddItem( items[n] );
-
-                m_clientList.Append((wxObject *)NULL);
-            }
-        }
-        else
-        {
-            wxList::compatibility_iterator node = m_clientList.Item( pos );
-            for ( size_t n = 0; n < nItems; n++ )
-            {
-                GtkAddItem( items[n], pos+n );
-
-                m_clientList.Insert( node, (wxObject *)NULL );
-            }
-        }
-    }
+        const unsigned idx = m_strings ? m_strings->Add(item)
+                                       : pos;

 
 

-    wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(),
-                      wxT("bug in client data management") );
-}
-
-int wxListBox::DoAppend( const wxString& item )
-{
-    InvalidateBestSize();
-
-    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 );
+        GtkAddItem(item, idx == GetCount() ? -1 : idx);

 
 

-           wxList::compatibility_iterator node = m_clientList.Item( index );
-           m_clientList.Insert( node, (wxObject *)NULL );
+        m_clientList.Insert(idx, NULL);

 
 

-           return index;
-        }
+        AssignNewItemClientData(idx, clientData, n, type);

     }
 
     }
 

-    GtkAddItem(item);
-
-    m_clientList.Append((wxObject *)NULL);
+    wxASSERT_MSG( m_clientList.GetCount() == GetCount(),
+                      wxT("bug in client data management") );

 
 

-    return GetCount() - 1;
+    return pos - 1;

 }
 
 void wxListBox::GtkAddItem( const wxString &item, int pos )
 }
 
 void wxListBox::GtkAddItem( const wxString &item, int pos )


@@ -678,13 +666,12 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     gtk_signal_connect( GTK_OBJECT(list_item), "focus_out_event",
             GTK_SIGNAL_FUNC(gtk_listitem_focus_out_callback), (gpointer)this );
 
     gtk_signal_connect( GTK_OBJECT(list_item), "focus_out_event",
             GTK_SIGNAL_FUNC(gtk_listitem_focus_out_callback), (gpointer)this );
 

-

     ConnectWidget( list_item );
 
     ConnectWidget( list_item );
 

-    gtk_widget_show( list_item );
-

     if (GTK_WIDGET_REALIZED(m_widget))
     {
     if (GTK_WIDGET_REALIZED(m_widget))
     {

+        gtk_widget_show( list_item );
+

         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 
         gtk_widget_realize( list_item );
         gtk_widget_realize( GTK_BIN(list_item)->child );
 


@@ -699,38 +686,20 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     {
         gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
         GtkBin *bin = GTK_BIN( list_item );
     {
         gtk_widget_modify_style( GTK_WIDGET( list_item ), style );
         GtkBin *bin = GTK_BIN( list_item );

-        GtkWidget *label = GTK_WIDGET( bin->child );
-        gtk_widget_modify_style( label, style );
+        gtk_widget_modify_style( GTK_WIDGET( bin->child ), style );

         gtk_rc_style_unref( style );
     }
 }
 
         gtk_rc_style_unref( style );
     }
 }
 

-void wxListBox::DoSetItems( const wxArrayString& items,
-                            void **clientData)
-{
-    Clear();
-
-    DoInsertItems(items, 0);
-
-    if ( clientData )
-    {
-        size_t count = items.GetCount();
-        for ( size_t n = 0; n < count; n++ )
-        {
-            SetClientData(n, clientData[n]);
-        }
-    }
-}
-

 // ----------------------------------------------------------------------------
 // deleting items
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // deleting items
 // ----------------------------------------------------------------------------
 

-void wxListBox::Clear()
+void wxListBox::DoClear()

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

-    gtk_list_clear_items( m_list, 0, GetCount() );
+    gtk_list_clear_items( m_list, 0, (int)GetCount() );

 
     if ( GTK_LIST(m_list)->last_focus_child != NULL  )
     {
 
     if ( GTK_LIST(m_list)->last_focus_child != NULL  )
     {


@@ -738,25 +707,13 @@ void wxListBox::Clear()
         GTK_LIST(m_list)->last_focus_child = NULL;
     }
 
         GTK_LIST(m_list)->last_focus_child = NULL;
     }
 

-    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!
-        wxList::compatibility_iterator node = m_clientList.GetFirst();
-        while ( node )
-        {
-            delete (wxClientData *)node->GetData();
-            node = node->GetNext();
-        }
-    }

     m_clientList.Clear();
 
     if ( m_strings )
         m_strings->Clear();
 }
 
     m_clientList.Clear();
 
     if ( m_strings )
         m_strings->Clear();
 }
 

-void wxListBox::Delete( int n )
+void wxListBox::DoDeleteOneItem(unsigned int n)

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


@@ -771,12 +728,6 @@ void wxListBox::Delete( int n )
     wxList::compatibility_iterator node = m_clientList.Item( n );
     if ( node )
     {
     wxList::compatibility_iterator node = m_clientList.Item( n );
     if ( node )
     {

-        if ( m_clientDataItemsType == wxClientData_Object )
-        {
-            wxClientData *cd = (wxClientData*)node->GetData();
-            delete cd;
-        }
-

         m_clientList.Erase( node );
     }
 
         m_clientList.Erase( node );
     }
 


@@ -788,7 +739,7 @@ void wxListBox::Delete( int n )
 // client data
 // ----------------------------------------------------------------------------
 
 // client data
 // ----------------------------------------------------------------------------
 

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

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


@@ -798,7 +749,7 @@ void wxListBox::DoSetItemClientData( int n, void* clientData )
     node->SetData( (wxObject*) clientData );
 }
 
     node->SetData( (wxObject*) clientData );
 }
 

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

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


@@ -808,29 +759,6 @@ void* wxListBox::DoGetItemClientData( int n ) const
     return node->GetData();
 }
 
     return node->GetData();
 }
 

-void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
-
-    // wxItemContainer already deletes data for us
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxListBox::DoGetItemClientObject( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
-
-    wxList::compatibility_iterator node = m_clientList.Item( n );
-    wxCHECK_MSG( node, (wxClientData *)NULL,
-                 wxT("invalid index in wxListBox::DoGetItemClientObject") );
-
-    return (wxClientData*) node->GetData();
-}
-

 // ----------------------------------------------------------------------------
 // string list access
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // string list access
 // ----------------------------------------------------------------------------


@@ -842,16 +770,12 @@ wxString wxListBox::GetRealLabel(GList *item) const
 
     wxString str;
 
 
     wxString str;
 

-#ifdef __WXGTK20__
-    str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
-#else

     str = wxString( label->label );
     str = wxString( label->label );

-#endif

 
 #if wxUSE_CHECKLISTBOX
     // checklistboxes have "[±] " prepended to their lables, remove it
     //
 
 #if wxUSE_CHECKLISTBOX
     // checklistboxes have "[±] " prepended to their lables, remove it
     //

-    // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk/checklst.h
+    // NB: 4 below is the length of wxCHECKLBOX_STRING from wx/gtk1/checklst.h

     if ( m_hasCheckBoxes )
         str.erase(0, 4);
 #endif // wxUSE_CHECKLISTBOX
     if ( m_hasCheckBoxes )
         str.erase(0, 4);
 #endif // wxUSE_CHECKLISTBOX


@@ -859,7 +783,7 @@ wxString wxListBox::GetRealLabel(GList *item) const
     return str;
 }
 
     return str;
 }
 

-void wxListBox::SetString( int n, const wxString &string )
+void wxListBox::SetString(unsigned int n, const wxString &string)

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


@@ -884,9 +808,9 @@ void wxListBox::SetString( int n, const wxString &string )
     }
 }
 
     }
 }
 

-wxString wxListBox::GetString( int n ) const
+wxString wxListBox::GetString(unsigned int n) const

 {
 {

-    wxCHECK_MSG( m_list != NULL, wxT(""), wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, wxEmptyString, wxT("invalid listbox") );

 
     GList *child = g_list_nth( m_list->children, n );
     if (child)
 
     GList *child = g_list_nth( m_list->children, n );
     if (child)


@@ -896,26 +820,26 @@ wxString wxListBox::GetString( int n ) const
 
     wxFAIL_MSG(wxT("wrong listbox index"));
 
 
     wxFAIL_MSG(wxT("wrong listbox index"));
 

-    return wxT("");
+    return wxEmptyString;

 }
 
 }
 

-int wxListBox::GetCount() const
+unsigned int wxListBox::GetCount() const

 {
 {

-    wxCHECK_MSG( m_list != NULL, -1, wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, 0, wxT("invalid listbox") );

 
     GList *children = m_list->children;
     return g_list_length(children);
 }
 
 
     GList *children = m_list->children;
     return g_list_length(children);
 }
 

-int wxListBox::FindString( const wxString &item ) const
+int wxListBox::FindString( const wxString &item, bool bCase ) const

 {
 {

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

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

-        if ( GetRealLabel(child) == item )
+        if ( item.IsSameAs( GetRealLabel(child), bCase ) )

             return count;
 
         count++;
             return count;
 
         count++;


@@ -933,7 +857,7 @@ int wxListBox::FindString( const wxString &item ) const
 
 int wxListBox::GetSelection() const
 {
 
 int wxListBox::GetSelection() const
 {

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

 
     GList *child = m_list->children;
     int count = 0;
 
     GList *child = m_list->children;
     int count = 0;


@@ -943,12 +867,12 @@ int wxListBox::GetSelection() const
         count++;
         child = child->next;
     }
         count++;
         child = child->next;
     }

-    return -1;
+    return wxNOT_FOUND;

 }
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {
 }
 
 int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 {

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

 
     // get the number of selected items first
     GList *child = m_list->children;
 
     // get the number of selected items first
     GList *child = m_list->children;


@@ -978,20 +902,20 @@ int wxListBox::GetSelections( wxArrayInt& aSelections ) const
 
 bool wxListBox::IsSelected( int n ) const
 {
 
 bool wxListBox::IsSelected( int n ) const
 {

-    wxCHECK_MSG( m_list != NULL, FALSE, wxT("invalid listbox") );
+    wxCHECK_MSG( m_list != NULL, false, wxT("invalid listbox") );

 
     GList *target = g_list_nth( m_list->children, n );
 
 
     GList *target = g_list_nth( m_list->children, n );
 

-    wxCHECK_MSG( target, FALSE, wxT("invalid listbox index") );
+    wxCHECK_MSG( target, false, wxT("invalid listbox index") );

 
     return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ;
 }
 
 
     return (GTK_WIDGET(target->data)->state == GTK_STATE_SELECTED) ;
 }
 

-void wxListBox::SetSelection( int n, bool select )
+void wxListBox::DoSetSelection( int n, bool select )

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

-    m_blockEvent = TRUE;
+    m_blockEvent = true;

 
     if (select)
     {
 
     if (select)
     {


@@ -1003,7 +927,7 @@ void wxListBox::SetSelection( int n, bool select )
     else
         gtk_list_unselect_item( m_list, n );
 
     else
         gtk_list_unselect_item( m_list, n );
 

-    m_blockEvent = FALSE;
+    m_blockEvent = false;

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


@@ -1083,22 +1007,22 @@ GtkWidget *wxListBox::GetConnectWidget()
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {

-    return TRUE;
+    return true;

 
 

-#if 0    
-    if (m_widget->window == window) return TRUE;
+#if 0
+    if (m_widget->window == window) return true;

 
 

-    if (GTK_WIDGET(m_list)->window == window) return TRUE;
+    if (GTK_WIDGET(m_list)->window == window) return true;

 
     GList *child = m_list->children;
     while (child)
     {
         GtkWidget *bin = GTK_WIDGET( child->data );
 
     GList *child = m_list->children;
     while (child)
     {
         GtkWidget *bin = GTK_WIDGET( child->data );

-        if (bin->window == window) return TRUE;
+        if (bin->window == window) return true;

         child = child->next;
     }
 
         child = child->next;
     }
 

-    return FALSE;
+    return false;

 #endif
 }
 
 #endif
 }
 


@@ -1177,7 +1101,7 @@ wxSize wxListBox::DoGetBestSize() const
     int wLine;
 
     // Find the widest line
     int wLine;
 
     // Find the widest line

-    for(int i = 0; i < GetCount(); i++) {
+    for(unsigned int i = 0; i < GetCount(); i++) {

         wxString str(GetString(i));
         GetTextExtent(str, &wLine, NULL);
         lbWidth = wxMax(lbWidth, wLine);
         wxString str(GetString(i));
         GetTextExtent(str, &wLine, NULL);
         lbWidth = wxMax(lbWidth, wLine);


@@ -1196,7 +1120,7 @@ wxSize wxListBox::DoGetBestSize() const
     lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
 
     wxSize best(lbWidth, lbHeight);
     lbHeight = (cy+4) * wxMin(wxMax(GetCount(), 3), 10);
 
     wxSize best(lbWidth, lbHeight);

-    CacheBestSize(best);        
+    CacheBestSize(best);

     return best;
 }
 
     return best;
 }
 


@@ -1217,4 +1141,3 @@ wxListBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 }
 
 #endif // wxUSE_LISTBOX
 }
 
 #endif // wxUSE_LISTBOX

-