Compile fix for VC

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

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index cd8381475d619449c8a77b5b83543ac9e5c5ee48..cc241866a7df76d25770104ee3b5f4b40fd3ede2 100644 (file)
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -13,8 +13,11 @@
 
 #if wxUSE_LISTBOX
 
 
 #if wxUSE_LISTBOX
 

+#ifndef WX_PRECOMP
+    #include "wx/dynarray.h"
+#endif
+

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

-#include "wx/dynarray.h"

 #include "wx/arrstr.h"
 #include "wx/utils.h"
 #include "wx/intl.h"
 #include "wx/arrstr.h"
 #include "wx/utils.h"
 #include "wx/intl.h"


@@ -25,7 +28,7 @@
 #include "wx/gtk/treeentry_gtk.h"
 
 #if wxUSE_TOOLTIPS
 #include "wx/gtk/treeentry_gtk.h"
 
 #if wxUSE_TOOLTIPS

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

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


@@ -467,6 +470,9 @@ bool wxListBox::Create( wxWindow *parent, wxWindowID id,
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     }
 
         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
     }
 

+
+    GtkScrolledWindowSetBorder(m_widget, style);
+

     m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );
 
     //wxListBox doesn't have a header :)
     m_treeview = GTK_TREE_VIEW( gtk_tree_view_new( ) );
 
     //wxListBox doesn't have a header :)


@@ -591,7 +597,7 @@ wxListBox::~wxListBox()
 // ----------------------------------------------------------------------------
 
 void wxListBox::GtkInsertItems(const wxArrayString& items,
 // ----------------------------------------------------------------------------
 
 void wxListBox::GtkInsertItems(const wxArrayString& items,

-                               void** clientData, size_t pos)
+                               void** clientData, unsigned int pos)

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


@@ -599,8 +605,8 @@ void wxListBox::GtkInsertItems(const wxArrayString& items,
 
     // Create and set column ids and GValues
 
 
     // Create and set column ids and GValues
 

-    size_t nNum = items.GetCount();
-    size_t nCurCount = wxListBox::GetCount();
+    unsigned int nNum = items.GetCount();
+    unsigned int nCurCount = wxListBox::GetCount();

     wxASSERT_MSG(pos <= nCurCount, wxT("Invalid index passed to wxListBox"));
 
     GtkTreeIter* pIter = NULL; // append by default
     wxASSERT_MSG(pos <= nCurCount, wxT("Invalid index passed to wxListBox"));
 
     GtkTreeIter* pIter = NULL; // append by default


@@ -620,7 +626,7 @@ void wxListBox::GtkInsertItems(const wxArrayString& items,
         pIter = &iter;
     }
 
         pIter = &iter;
     }
 

-    for (size_t i = 0; i < nNum; ++i)
+    for (unsigned int i = 0; i < nNum; ++i)

     {
         wxString label = items[i];
 
     {
         wxString label = items[i];
 


@@ -660,17 +666,17 @@ void wxListBox::GtkInsertItems(const wxArrayString& items,
     }
 }
 
     }
 }
 

-void wxListBox::DoInsertItems(const wxArrayString& items, int pos)
+void wxListBox::DoInsertItems(const wxArrayString& items, unsigned int pos)

 {
     wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") );
 
 {
     wxCHECK_RET( IsValidInsert(pos), wxT("invalid index in wxListBox::InsertItems") );
 

-    GtkInsertItems(items, NULL, (size_t)pos);
+    GtkInsertItems(items, NULL, pos);

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

-    int nWhere = (int)wxListBox::GetCount();
+    unsigned int nWhere = wxListBox::GetCount();

     wxArrayString aItems;
     aItems.Add(item);
     wxListBox::DoInsertItems(aItems, nWhere);
     wxArrayString aItems;
     aItems.Add(item);
     wxListBox::DoInsertItems(aItems, nWhere);


@@ -697,7 +703,7 @@ void wxListBox::Clear()
     gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */
 }
 
     gtk_list_store_clear( m_liststore ); /* well, THAT was easy :) */
 }
 

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

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


@@ -708,7 +714,7 @@ void wxListBox::Delete( int n )
                         GTK_TREE_MODEL(m_liststore),
                         &iter, NULL, //NULL = parent = get first
                         n
                         GTK_TREE_MODEL(m_liststore),
                         &iter, NULL, //NULL = parent = get first
                         n

-                                                );
+                   );

 
     wxCHECK_RET( res, wxT("wrong listbox index") );
 
 
     wxCHECK_RET( res, wxT("wrong listbox index") );
 


@@ -749,9 +755,9 @@ struct _GtkTreeEntry* wxListBox::GtkGetEntry(int n) const
 // client data
 // ----------------------------------------------------------------------------
 
 // client data
 // ----------------------------------------------------------------------------
 

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

 {
 {

-    wxCHECK_MSG( n >= 0 && (size_t)n < wxListBox::GetCount(), NULL,
+    wxCHECK_MSG( IsValid(n), NULL,

                  wxT("Invalid index passed to GetItemClientData") );
 
     GtkTreeEntry* entry = GtkGetEntry(n);
                  wxT("Invalid index passed to GetItemClientData") );
 
     GtkTreeEntry* entry = GtkGetEntry(n);


@@ -762,14 +768,14 @@ void* wxListBox::DoGetItemClientData( int n ) const
     return userdata;
 }
 
     return userdata;
 }
 

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

 {
     return (wxClientData*) wxListBox::DoGetItemClientData(n);
 }
 
 {
     return (wxClientData*) wxListBox::DoGetItemClientData(n);
 }
 

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

 {
 {

-    wxCHECK_RET( n >= 0 && (size_t)n < wxListBox::GetCount(),
+    wxCHECK_RET( IsValid(n),

                  wxT("Invalid index passed to SetItemClientData") );
 
     GtkTreeEntry* entry = GtkGetEntry(n);
                  wxT("Invalid index passed to SetItemClientData") );
 
     GtkTreeEntry* entry = GtkGetEntry(n);


@@ -779,7 +785,7 @@ void wxListBox::DoSetItemClientData( int n, void* clientData )
     g_object_unref(G_OBJECT(entry));
 }
 
     g_object_unref(G_OBJECT(entry));
 }
 

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

 {
     // wxItemContainer already deletes data for us
     wxListBox::DoSetItemClientData(n, (void*) clientData);
 {
     // wxItemContainer already deletes data for us
     wxListBox::DoSetItemClientData(n, (void*) clientData);


@@ -789,7 +795,7 @@ void wxListBox::DoSetItemClientObject( int n, wxClientData* clientData )
 // string list access
 // ----------------------------------------------------------------------------
 
 // string list access
 // ----------------------------------------------------------------------------
 

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

 {
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") );
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );
 {
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxListBox::SetString") );
     wxCHECK_RET( m_treeview != NULL, wxT("invalid listbox") );


@@ -816,12 +822,12 @@ void wxListBox::SetString( int n, const wxString &string )
 
     wxArrayString aItems;
     aItems.Add(label);
 
     wxArrayString aItems;
     aItems.Add(label);

-    GtkInsertItems(aItems, &userdata, (size_t)n);
+    GtkInsertItems(aItems, &userdata, n);

     if (bWasSelected)
         wxListBox::GtkSetSelection(n, true, true);
 }
 
     if (bWasSelected)
         wxListBox::GtkSetSelection(n, true, true);
 }
 

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

 {
     wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );
 
 {
     wxCHECK_MSG( m_treeview != NULL, wxEmptyString, wxT("invalid listbox") );
 


@@ -842,11 +848,11 @@ wxString wxListBox::GetString( int n ) const
     return label;
 }
 
     return label;
 }
 

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

 {
     wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") );
 
 {
     wxCHECK_MSG( m_treeview != NULL, 0, wxT("invalid listbox") );
 

-    return (size_t)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL);
+    return (unsigned int)gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_liststore), NULL);

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


@@ -854,9 +860,9 @@ int wxListBox::FindString( const wxString &item, bool bCase ) const
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
     //Sort of hackish - maybe there is a faster way
     wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
 
     //Sort of hackish - maybe there is a faster way

-    size_t nCount = wxListBox::GetCount();
+    unsigned int nCount = wxListBox::GetCount();

 
 

-    for(size_t i = 0; i < nCount; ++i)
+    for(unsigned int i = 0; i < nCount; ++i)

     {
         if( item.IsSameAs( wxListBox::GetString(i), bCase ) )
             return (int)i;
     {
         if( item.IsSameAs( wxListBox::GetString(i), bCase ) )
             return (int)i;


@@ -997,6 +1003,11 @@ void wxListBox::DoSetFirstItem( int n )
 
 int wxListBox::DoListHitTest(const wxPoint& point) const
 {
 
 int wxListBox::DoListHitTest(const wxPoint& point) const
 {

+    // gtk_tree_view_get_path_at_pos() also gets items that are not visible and
+    // we only want visible items we need to check for it manually here
+    if ( !GetClientRect().Inside(point) )
+        return wxNOT_FOUND;
+

     // need to translate from master window since it is in client coords
     gint binx, biny;
     gdk_window_get_geometry(gtk_tree_view_get_bin_window(m_treeview),
     // need to translate from master window since it is in client coords
     gint binx, biny;
     gdk_window_get_geometry(gtk_tree_view_get_bin_window(m_treeview),


@@ -1054,7 +1065,7 @@ void wxListBox::DoApplyWidgetStyle(GtkRcStyle *style)
         GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
         if (window)
         {
         GdkWindow *window = gtk_tree_view_get_bin_window(m_treeview);
         if (window)
         {

-            m_backgroundColour.CalcPixel( gdk_window_get_colormap( window ) );
+            m_backgroundColour.CalcPixel( gdk_drawable_get_colormap( window ) );

             gdk_window_set_background( window, m_backgroundColour.GetColor() );
             gdk_window_clear( window );
         }
             gdk_window_set_background( window, m_backgroundColour.GetColor() );
             gdk_window_clear( window );
         }


@@ -1095,13 +1106,13 @@ wxSize wxListBox::DoGetBestSize() const
 
     // Get the visible area of the tree view (limit to the 10th item
     // so that it isn't too big)
 
     // Get the visible area of the tree view (limit to the 10th item
     // so that it isn't too big)

-    size_t count = GetCount();
+    unsigned int count = GetCount();

     if (count)
     {
         int wLine;
 
         // Find the widest line
     if (count)
     {
         int wLine;
 
         // Find the widest line

-        for(size_t i = 0; i < count; i++) {
+        for(unsigned int i = 0; i < count; 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);


@@ -1119,8 +1130,8 @@ wxSize wxListBox::DoGetBestSize() const
         }
 #endif
 
         }
 #endif
 

-    // don't make the listbox too tall (limit height to around 10 items) but don't
-    // make it too small neither
+        // don't make the listbox too tall (limit height to around 10 items) but don't
+        // make it too small neither

         lbHeight = (cy+4) * wxMin(wxMax(count, 3), 10);
     }
 
         lbHeight = (cy+4) * wxMin(wxMax(count, 3), 10);
     }