Build fix for wxMSWUniv makefile driven builds. univ/setup0.h should be autoregenerat...

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index a7fe791e8d271ee6e90d393415490baf76d079c1..d6bd548ca7cf05e2670b3d518c5d379afb0418c6 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:


@@ -12,11 +12,10 @@
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "variant.h"
-#endif
-

 #include "wx/defs.h"
 #include "wx/defs.h"

+
+#if wxUSE_VARIANT
+

 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/arrstr.h"
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/arrstr.h"


@@ -113,7 +112,7 @@ public:
 #endif
 
     wxVariant(const wxVariant& variant);
 #endif
 
     wxVariant(const wxVariant& variant);

-    ~wxVariant();
+    virtual ~wxVariant();

 
 // Generic operators
     // Assignment
 
 // Generic operators
     // Assignment


@@ -211,7 +210,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 ;


@@ -249,7 +248,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();


@@ -282,5 +281,6 @@ protected:
 
 extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 
 extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 

-#endif
-    // _WX_VARIANT_H_
+#endif // wxUSE_VARIANT
+
+#endif // _WX_VARIANT_H_