stop usign a deprecated method, and ensure that the imagelist

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

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index de25cc767e69da38ed150f6a3b268457f7f4ad91..fc1783f95459a5ac3fd05d00c10d44410636896f 100644 (file)
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -21,6 +21,7 @@
 #include "wx/intl.h"
 #include "wx/checklst.h"
 #include "wx/settings.h"
 #include "wx/intl.h"
 #include "wx/checklst.h"
 #include "wx/settings.h"

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

 
 #if wxUSE_TOOLTIPS
 #include "wx/tooltip.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/tooltip.h"


@@ -37,39 +38,14 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
 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
-
-// checklistboxes have "[±] " prepended to their lables, this macro removes it
-// (NB: 4 below is the length of wxCHECKLBOX_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
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 

-extern bool       g_blockEventsOnDrag;
-extern bool       g_blockEventsOnScroll;
-extern wxCursor   g_globalCursor;
+extern bool           g_blockEventsOnDrag;
+extern bool           g_blockEventsOnScroll;
+extern wxCursor       g_globalCursor;
+extern wxWindowGTK   *g_delayedFocus;

 
 static bool       g_hasDoubleClicked = FALSE;
 
 
 static bool       g_hasDoubleClicked = FALSE;
 


@@ -84,14 +60,20 @@ struct wxlistbox_idle_struct
     gint         m_tag;
 };
 
     gint         m_tag;
 };
 

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

 {
     wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
     gdk_threads_enter();
 
     gtk_idle_remove( data->m_tag );
 
 {
     wxlistbox_idle_struct* data = (wxlistbox_idle_struct*) gdata;
     gdk_threads_enter();
 
     gtk_idle_remove( data->m_tag );
 

-    data->m_listbox->SetFirstItem( data->m_item );
+    // 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() )
+    {
+        lbox->SetFirstItem( data->m_item );
+    }

 
     delete data;
 
 
     delete data;
 


@@ -261,21 +243,22 @@ static void gtk_listitem_deselect_callback( GtkWidget *widget, wxListBox *listbo
     gtk_listitem_select_cb( widget, listbox, FALSE );
 }
 
     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 )

 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;
 {
     if (g_isIdle) wxapp_install_idle_handler();
 
     if (!listbox->m_hasVMT) return;
     if (g_blockEventsOnDrag) return;

-    
+

     if (listbox->m_blockEvent) return;
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     event.SetEventObject( listbox );
     if (listbox->m_blockEvent) return;
 
     wxCommandEvent event(wxEVT_COMMAND_LISTBOX_SELECTED, listbox->GetId() );
     event.SetEventObject( listbox );

-    
-//    MSW doesn't do that either
-//    event.SetExtraLong( (long) is_selection );

 
 

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

 
     if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0)
     {
 
     if ((listbox->GetWindowStyleFlag() & wxLB_SINGLE) != 0)
     {


@@ -336,7 +319,6 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;
 {
     m_needParent = TRUE;
     m_acceptsFocus = TRUE;

-    m_isListBox = TRUE;

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


@@ -379,11 +361,7 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
 
     gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
 
 
     gtk_list_set_selection_mode( GTK_LIST(m_list), mode );
 

-#ifdef NEW_GTK_SCROLL_CODE

     gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW(m_widget), GTK_WIDGET(m_list) );
     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

 
     /* make list scroll when moving the focus down using cursor keys */
     gtk_container_set_focus_vadjustment(
 
     /* make list scroll when moving the focus down using cursor keys */
     gtk_container_set_focus_vadjustment(


@@ -436,6 +414,10 @@ wxListBox::~wxListBox()
       delete m_strings;
 }
 
       delete m_strings;
 }
 

+// ----------------------------------------------------------------------------
+// adding items
+// ----------------------------------------------------------------------------
+

 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") );


@@ -466,7 +448,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
             if (index != GetCount())
             {
                 GtkAddItem( items[n], index );
             if (index != GetCount())
             {
                 GtkAddItem( items[n], index );

-                wxNode *node = m_clientList.Nth( index );
+                wxList::compatibility_iterator node = m_clientList.Item( index );

                 m_clientList.Insert( node, (wxObject*) NULL );
             }
             else
                 m_clientList.Insert( node, (wxObject*) NULL );
             }
             else


@@ -489,7 +471,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
         }
         else
         {
         }
         else
         {

-            wxNode *node = m_clientList.Nth( pos );
+            wxList::compatibility_iterator node = m_clientList.Item( pos );

             for ( size_t n = 0; n < nItems; n++ )
             {
                 GtkAddItem( items[n], pos+n );
             for ( size_t n = 0; n < nItems; n++ )
             {
                 GtkAddItem( items[n], pos+n );


@@ -515,7 +497,7 @@ int wxListBox::DoAppend( const wxString& item )
         {
            GtkAddItem( item, index );
 
         {
            GtkAddItem( item, index );
 

-           wxNode *node = m_clientList.Nth( index );
+           wxList::compatibility_iterator node = m_clientList.Item( index );

            m_clientList.Insert( node, (wxObject *)NULL );
 
            return index;
            m_clientList.Insert( node, (wxObject *)NULL );
 
            return index;


@@ -543,7 +525,7 @@ void wxListBox::GtkAddItem( const wxString &item, int pos )
     }
 #endif // wxUSE_CHECKLISTBOX
 
     }
 #endif // wxUSE_CHECKLISTBOX
 

-    list_item = gtk_list_item_new_with_label( label.mbc_str() );
+    list_item = gtk_list_item_new_with_label( wxGTK_CONV( label ) );

 
     GList *gitem_list = g_list_alloc ();
     gitem_list->data = list_item;
 
     GList *gitem_list = g_list_alloc ();
     gitem_list->data = list_item;


@@ -617,59 +599,15 @@ void wxListBox::DoSetItems( const wxArrayString& items,
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// client data
+// deleting items

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-void wxListBox::DoSetItemClientData( int n, void* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
-
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientData") );
-
-    node->SetData( (wxObject*) clientData );
-}
-
-void* wxListBox::DoGetItemClientData( int n ) const
-{
-    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();
-}
-
-void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
-{
-    wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
-
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_RET( node, wxT("invalid index in wxListBox::DoSetItemClientObject") );
-
-    wxClientData *cd = (wxClientData*) node->Data();
-    delete cd;
-
-    node->SetData( (wxObject*) clientData );
-}
-
-wxClientData* wxListBox::DoGetItemClientObject( int n ) const
-{
-    wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
-
-    wxNode *node = m_clientList.Nth( n );
-    wxCHECK_MSG( node, (wxClientData *)NULL,
-                 wxT("invalid index in wxListBox::DoGetItemClientObject") );
-
-    return (wxClientData*) node->Data();
-}
-

 void wxListBox::Clear()
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     gtk_list_clear_items( m_list, 0, GetCount() );
 void wxListBox::Clear()
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
     gtk_list_clear_items( m_list, 0, GetCount() );

-    
+

     if ( GTK_LIST(m_list)->last_focus_child != NULL  )
     {
         // This should be NULL, I think.
     if ( GTK_LIST(m_list)->last_focus_child != NULL  )
     {
         // This should be NULL, I think.


@@ -681,11 +619,11 @@ void wxListBox::Clear()
         // 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!
         // 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();
+        wxList::compatibility_iterator node = m_clientList.GetFirst();

         while ( node )
         {
         while ( node )
         {

-            delete (wxClientData *)node->Data();
-            node = node->Next();
+            delete (wxClientData *)node->GetData();
+            node = node->GetNext();

         }
     }
     m_clientList.Clear();
         }
     }
     m_clientList.Clear();


@@ -706,26 +644,97 @@ 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_clientList.Nth( n );
+    wxList::compatibility_iterator node = m_clientList.Item( n );

     if ( node )
     {
         if ( m_clientDataItemsType == wxClientData_Object )
         {
     if ( node )
     {
         if ( m_clientDataItemsType == wxClientData_Object )
         {

-            wxClientData *cd = (wxClientData*)node->Data();
+            wxClientData *cd = (wxClientData*)node->GetData();

             delete cd;
         }
 
             delete cd;
         }
 

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

     }
 
     if ( m_strings )
     }
 
     if ( m_strings )

-        m_strings->Remove(n);
+        m_strings->RemoveAt(n);
+}
+
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+void wxListBox::DoSetItemClientData( int n, void* 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::DoSetItemClientData") );
+
+    node->SetData( (wxObject*) clientData );
+}
+
+void* wxListBox::DoGetItemClientData( int n ) const
+{
+    wxCHECK_MSG( m_widget != NULL, NULL, wxT("invalid listbox control") );
+
+    wxList::compatibility_iterator node = m_clientList.Item( n );
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxListBox::DoGetItemClientData") );
+
+    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
 // ----------------------------------------------------------------------------
 

+wxString wxListBox::GetRealLabel(GList *item) const
+{
+    GtkBin *bin = GTK_BIN( item->data );
+    GtkLabel *label = GTK_LABEL( bin->child );
+
+    wxString str;
+
+#ifdef __WXGTK20__
+    str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
+#else
+    str = wxString( label->label );
+#endif
+
+#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
+    if ( m_hasCheckBoxes )
+        str.erase(0, 4);
+#endif // wxUSE_CHECKLISTBOX
+
+    return str;
+}
+

 void wxListBox::SetString( int n, const wxString &string )
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 void wxListBox::SetString( int n, const wxString &string )
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );


@@ -743,7 +752,7 @@ void wxListBox::SetString( int n, const wxString &string )
 #endif // wxUSE_CHECKLISTBOX
         str += string;
 
 #endif // wxUSE_CHECKLISTBOX
         str += string;
 

-        gtk_label_set( label, str.mbc_str() );
+        gtk_label_set( label, wxGTK_CONV( str ) );

     }
     else
     {
     }
     else
     {


@@ -758,12 +767,7 @@ wxString wxListBox::GetString( int n ) const
     GList *child = g_list_nth( m_list->children, n );
     if (child)
     {
     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;
+        return GetRealLabel(child);

     }
 
     wxFAIL_MSG(wxT("wrong listbox index"));
     }
 
     wxFAIL_MSG(wxT("wrong listbox index"));


@@ -787,12 +791,7 @@ int wxListBox::FindString( const wxString &item ) const
     int count = 0;
     while (child)
     {
     int count = 0;
     while (child)
     {

-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-
-        wxString str = wxString(GET_REAL_LABEL(label->label),*wxConvCurrent);
-
-        if (str == item)
+        if ( GetRealLabel(child) == item )

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


@@ -880,7 +879,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 )


@@ -917,7 +916,7 @@ void wxListBox::DoSetFirstItem( int n )
     float y = item->allocation.y;
     if (y > adjustment->upper - adjustment->page_size)
         y = adjustment->upper - adjustment->page_size;
     float y = item->allocation.y;
     if (y > adjustment->upper - adjustment->page_size)
         y = adjustment->upper - adjustment->page_size;

-       gtk_adjustment_set_value( adjustment, y );
+    gtk_adjustment_set_value( adjustment, y );

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


@@ -959,6 +958,8 @@ GtkWidget *wxListBox::GetConnectWidget()
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {
 
 bool wxListBox::IsOwnGtkWindow( GdkWindow *window )
 {

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

     if (GTK_WIDGET(m_list)->window == window) return TRUE;
 
     GList *child = m_list->children;
     if (GTK_WIDGET(m_list)->window == window) return TRUE;
 
     GList *child = m_list->children;


@@ -1029,7 +1030,17 @@ void wxListBox::OnInternalIdle()
         }
     }
 
         }
     }
 

-    UpdateWindowUI();
+    if (g_delayedFocus == this)
+    {
+        if (GTK_WIDGET_REALIZED(m_widget))
+        {
+            gtk_widget_grab_focus( m_widget );
+            g_delayedFocus = NULL;
+        }
+    }
+
+    if (wxUpdateUIEvent::CanUpdate(this))
+        UpdateWindowUI(wxUPDATE_UI_FROMIDLE);

 }
 
 wxSize wxListBox::DoGetBestSize() const
 }
 
 wxSize wxListBox::DoGetBestSize() const


@@ -1050,7 +1061,7 @@ wxSize wxListBox::DoGetBestSize() const
 
     // And just a bit more
     int cx, cy;
 
     // And just a bit more
     int cx, cy;

-    GetTextExtent("X", &cx, &cy);
+    GetTextExtent( wxT("X"), &cx, &cy);

     lbWidth += 3 * cx;
 
     // don't make the listbox too tall (limit height to around 10 items) but don't
     lbWidth += 3 * cx;
 
     // don't make the listbox too tall (limit height to around 10 items) but don't


@@ -1060,4 +1071,13 @@ wxSize wxListBox::DoGetBestSize() const
     return wxSize(lbWidth, lbHeight);
 }
 
     return wxSize(lbWidth, lbHeight);
 }
 

-#endif
+void wxListBox::FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y)
+{
+    // the mouse event coords are relative to the listbox items, we need to
+    // translate them to the normal client coords
+    x += widget->allocation.x;
+    y += widget->allocation.y;
+}
+
+#endif // wxUSE_LISTBOX
+