fixing 'id' objc.h collisions, listbox rewrite

[wxWidgets.git] / include / wx / variant.h

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 707b009d43bcef299d9524e51fdfc6f61d1e558c..c8d99a3de8f6ecfddafdd328ff9e07455d4f2f4f 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        variant.h
+// Name:        wx/variant.h

 // Purpose:     wxVariant class, container for any type
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxVariant class, container for any type
 // Author:      Julian Smart
 // Modified by:


@@ -207,7 +207,7 @@ public:
     bool IsValueKindOf(const wxClassInfo* type) const;
 
     // Return the number of elements in a list
     bool IsValueKindOf(const wxClassInfo* type) const;
 
     // Return the number of elements in a list

-    int GetCount() const;
+    size_t GetCount() const;

 
 // Value accessors
     double GetReal() const ;
 
 // Value accessors
     double GetReal() const ;


@@ -245,7 +245,7 @@ public:
     bool Member(const wxVariant& value) const;
 
     // Deletes the nth element of the list
     bool Member(const wxVariant& value) const;
 
     // Deletes the nth element of the list

-    bool Delete(int item);
+    bool Delete(size_t item);

 
     // Clear list
     void ClearList();
 
     // Clear list
     void ClearList();