X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caf6e6dee8d177844bb633786ec8c05eba6972bc..0fb2e8796de0ed029abdcdc370ffc600fe775888:/src/gtk1/listbox.cpp

diff --git a/src/gtk1/listbox.cpp b/src/gtk1/listbox.cpp
index 8e307362d1..ca9fb3016c 100644
--- a/src/gtk1/listbox.cpp
+++ b/src/gtk1/listbox.cpp
@@ -13,16 +13,20 @@
 #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"
+
+#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
-#include "wx/tooltip.h"
+    #include "wx/tooltip.h"
 #endif
 
 #include <gdk/gdk.h>
@@ -71,7 +75,7 @@ static 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;
-    if ( data->m_item < lbox->GetCount() )
+    if ( data->m_item < (int)lbox->GetCount() )
     {
         lbox->SetFirstItem( data->m_item );
     }
@@ -573,7 +577,7 @@ wxListBox::~wxListBox()
 // adding items
 // ----------------------------------------------------------------------------
 
-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
@@ -583,26 +587,26 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
 
     // code elsewhere supposes we have as many items in m_clientList as items
     // in the listbox
-    wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(),
+    wxASSERT_MSG( m_clientList.GetCount() == GetCount(),
                   wxT("bug in client data management") );
 
     InvalidateBestSize();
 
     GList *children = m_list->children;
-    int length = g_list_length(children);
+    unsigned int length = g_list_length(children);
 
     wxCHECK_RET( pos <= length, wxT("invalid index in wxListBox::InsertItems") );
 
-    size_t nItems = items.GetCount();
+    unsigned int nItems = items.GetCount();
     int index;
 
     if (m_strings)
     {
-        for (size_t n = 0; n < nItems; n++)
+        for (unsigned int n = 0; n < nItems; n++)
         {
             index = m_strings->Add( items[n] );
 
-            if (index != GetCount())
+            if (index != (int)GetCount())
             {
                 GtkAddItem( items[n], index );
                 wxList::compatibility_iterator node = m_clientList.Item( index );
@@ -619,7 +623,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
     {
         if (pos == length)
         {
-            for ( size_t n = 0; n < nItems; n++ )
+            for ( unsigned int n = 0; n < nItems; n++ )
             {
                 GtkAddItem( items[n] );
 
@@ -629,7 +633,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
         else
         {
             wxList::compatibility_iterator node = m_clientList.Item( pos );
-            for ( size_t n = 0; n < nItems; n++ )
+            for ( unsigned int n = 0; n < nItems; n++ )
             {
                 GtkAddItem( items[n], pos+n );
 
@@ -638,7 +642,7 @@ void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
         }
     }
 
-    wxASSERT_MSG( m_clientList.GetCount() == (size_t)GetCount(),
+    wxASSERT_MSG( m_clientList.GetCount() == GetCount(),
                       wxT("bug in client data management") );
 }
 
@@ -652,7 +656,7 @@ int wxListBox::DoAppend( const wxString& item )
         int index = m_strings->Add( item );
 
         // only if not at the end anyway
-        if (index != GetCount())
+        if (index != (int)GetCount())
         {
            GtkAddItem( item, index );
 
@@ -757,8 +761,8 @@ void wxListBox::DoSetItems( const wxArrayString& items,
 
     if ( clientData )
     {
-        size_t count = items.GetCount();
-        for ( size_t n = 0; n < count; n++ )
+        unsigned int count = items.GetCount();
+        for ( unsigned int n = 0; n < count; n++ )
         {
             SetClientData(n, clientData[n]);
         }
@@ -773,7 +777,7 @@ void wxListBox::Clear()
 {
     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  )
     {
@@ -799,7 +803,7 @@ void wxListBox::Clear()
         m_strings->Clear();
 }
 
-void wxListBox::Delete( int n )
+void wxListBox::Delete(unsigned int n)
 {
     wxCHECK_RET( m_list != NULL, wxT("invalid listbox") );
 
@@ -831,7 +835,7 @@ void wxListBox::Delete( int n )
 // 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") );
 
@@ -841,7 +845,7 @@ void wxListBox::DoSetItemClientData( int n, void* 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") );
 
@@ -851,7 +855,7 @@ void* wxListBox::DoGetItemClientData( int n ) const
     return node->GetData();
 }
 
-void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
+void wxListBox::DoSetItemClientObject(unsigned int n, wxClientData* clientData)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid listbox control") );
 
@@ -863,7 +867,7 @@ void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
     node->SetData( (wxObject*) clientData );
 }
 
-wxClientData* wxListBox::DoGetItemClientObject( int n ) const
+wxClientData* wxListBox::DoGetItemClientObject(unsigned int n) const
 {
     wxCHECK_MSG( m_widget != NULL, (wxClientData*) NULL, wxT("invalid listbox control") );
 
@@ -898,7 +902,7 @@ wxString wxListBox::GetRealLabel(GList *item) const
     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") );
 
@@ -923,7 +927,7 @@ 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, wxEmptyString, wxT("invalid listbox") );
 
@@ -938,9 +942,9 @@ wxString wxListBox::GetString( int n ) const
     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);
@@ -972,7 +976,7 @@ int wxListBox::FindString( const wxString &item, bool bCase ) 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;
@@ -982,12 +986,12 @@ int wxListBox::GetSelection() const
         count++;
         child = child->next;
     }
-    return -1;
+    return wxNOT_FOUND;
 }
 
 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;
@@ -1216,7 +1220,7 @@ wxSize wxListBox::DoGetBestSize() const
     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);