X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edc973b1749e09a437f8043e9833383b0f2457cb..62e819ee45059232300d598d9a85f9ad77a23c45:/src/gtk/listbox.cpp

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index c84fce5452..46808ec081 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -38,24 +38,6 @@
 extern void wxapp_install_idle_handler();
 extern bool g_isIdle;
 
-//-----------------------------------------------------------------------------
-// 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
 //-----------------------------------------------------------------------------
@@ -267,12 +249,12 @@ static void gtk_listitem_select_cb( GtkWidget *widget, wxListBox *listbox, bool
 
     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 );
-    
+
 //    MSW doesn't do that either
 //    event.SetExtraLong( (long) is_selection );
 
@@ -431,6 +413,10 @@ wxListBox::~wxListBox()
       delete m_strings;
 }
 
+// ----------------------------------------------------------------------------
+// adding items
+// ----------------------------------------------------------------------------
+
 void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
@@ -612,58 +598,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") );
-
-    // 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") );
-
-    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() );
-    
+
     if ( GTK_LIST(m_list)->last_focus_child != NULL  )
     {
         // This should be NULL, I think.
@@ -716,10 +659,81 @@ void wxListBox::Delete( int n )
         m_strings->Remove(n);
 }
 
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+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") );
+
+    // 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") );
+
+    wxNode *node = m_clientList.Nth( n );
+    wxCHECK_MSG( node, (wxClientData *)NULL,
+                 wxT("invalid index in wxListBox::DoGetItemClientObject") );
+
+    return (wxClientData*) node->Data();
+}
+
 // ----------------------------------------------------------------------------
 // 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") );
@@ -752,16 +766,7 @@ wxString wxListBox::GetString( int n ) const
     GList *child = g_list_nth( m_list->children, n );
     if (child)
     {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-
-#ifdef __WXGTK20__
-        wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
-#else
-        wxString str = wxString( label->label );
-#endif
-
-        return str;
+        return GetRealLabel(child);
     }
 
     wxFAIL_MSG(wxT("wrong listbox index"));
@@ -785,16 +790,7 @@ int wxListBox::FindString( const wxString &item ) const
     int count = 0;
     while (child)
     {
-        GtkBin *bin = GTK_BIN( child->data );
-        GtkLabel *label = GTK_LABEL( bin->child );
-
-#ifdef __WXGTK20__
-        wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) );
-#else
-        wxString str = wxString( label->label );
-#endif
-
-        if (str == item)
+        if ( GetRealLabel(child) == item )
             return count;
 
         count++;
@@ -882,7 +878,7 @@ void wxListBox::SetSelection( int n, bool select )
     else
         gtk_list_unselect_item( m_list, n );
 
-    m_blockEvent = FALSE;    
+    m_blockEvent = FALSE;
 }
 
 void wxListBox::DoSetFirstItem( int n )
@@ -919,7 +915,7 @@ void wxListBox::DoSetFirstItem( int n )
     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 );
 }
 
 // ----------------------------------------------------------------------------
@@ -1061,7 +1057,7 @@ wxSize wxListBox::DoGetBestSize() const
 
     // 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