[ 1493780 ] wxOwnerDrawnComboBox warnings fixes.

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 3d3ad32484754f65746414ec5ebadcfae46bcfb8..c8d99a3de8f6ecfddafdd328ff9e07455d4f2f4f 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -1,21 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxVariant class, container for any type
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Purpose:     wxVariant class, container for any type
 // Author:      Julian Smart
 // Modified by:
 // Created:     10/09/98
 // RCS-ID:      $Id$

-// Copyright:   (c)
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VARIANT_H_
 #define _WX_VARIANT_H_
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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/object.h"
 #include "wx/string.h"
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"


@@ -95,7 +91,9 @@ public:
     wxVariant(char val, const wxString& name = wxEmptyString);
     wxVariant(const wxString& val, const wxString& name = wxEmptyString);
     wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool!
     wxVariant(char val, const wxString& name = wxEmptyString);
     wxVariant(const wxString& val, const wxString& name = wxEmptyString);
     wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool!

-    wxVariant(const wxStringList& val, const wxString& name = wxEmptyString);
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( wxVariant(const wxStringList& val, const wxString& name = wxEmptyString) );
+#endif

     wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants
     wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
     wxVariant(wxObject* ptr, const wxString& name = wxEmptyString); //wxObject
     wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants
     wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
     wxVariant(wxObject* ptr, const wxString& name = wxEmptyString); //wxObject


@@ -157,9 +155,11 @@ public:
     bool operator!= (const wxString& value) const;
     void operator= (const wxString& value) ;
     void operator= (const wxChar* value) ; // Necessary or VC++ assumes bool!
     bool operator!= (const wxString& value) const;
     void operator= (const wxString& value) ;
     void operator= (const wxChar* value) ; // Necessary or VC++ assumes bool!

-    bool operator== (const wxStringList& value) const;
-    bool operator!= (const wxStringList& value) const;
-    void operator= (const wxStringList& value) ;
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( bool operator== (const wxStringList& value) const );
+    wxDEPRECATED( bool operator!= (const wxStringList& value) const );
+    wxDEPRECATED( void operator= (const wxStringList& value) );
+#endif

     bool operator== (const wxList& value) const;
     bool operator!= (const wxList& value) const;
     void operator= (const wxList& value) ;
     bool operator== (const wxList& value) const;
     bool operator!= (const wxList& value) const;
     void operator= (const wxList& value) ;


@@ -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 ;


@@ -218,8 +218,9 @@ public:
     bool GetBool() const ;
     wxString GetString() const ;
     wxList& GetList() const ;
     bool GetBool() const ;
     wxString GetString() const ;
     wxList& GetList() const ;

-    wxStringList& GetStringList() const ;
-
+#if WXWIN_COMPATIBILITY_2_4
+    wxDEPRECATED( wxStringList& GetStringList() const );
+#endif

     void* GetVoidPtr() const ;
     wxObject* GetWxObjectPtr()  ;
 #if wxUSE_DATETIME
     void* GetVoidPtr() const ;
     wxObject* GetWxObjectPtr()  ;
 #if wxUSE_DATETIME


@@ -244,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();