renamed GlobalPtr to GlobalPtrLock

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 7c1b224c80405454631326c08d68e8a7af2064b5..a7fe791e8d271ee6e90d393415490baf76d079c1 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -5,20 +5,21 @@
 // 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_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#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/arrstr.h"
 #include "wx/list.h"
 
 #if wxUSE_DATETIME
@@ -45,13 +46,13 @@
  * overloading wxVariant with unnecessary functionality.
  */
 
-class WXDLLEXPORT wxVariantData: public wxObject
+class WXDLLIMPEXP_BASE wxVariantData: public wxObject
 {
 DECLARE_ABSTRACT_CLASS(wxVariantData)
 public:
 
 // Construction & destruction
-    wxVariantData() {};
+    wxVariantData() {}
 
 // Override these to provide common functionality
     // Copy to data
@@ -79,7 +80,7 @@ public:
  * this class too much.
  */
 
-class WXDLLEXPORT wxVariant: public wxObject
+class WXDLLIMPEXP_BASE wxVariant: public wxObject
 {
 DECLARE_DYNAMIC_CLASS(wxVariant)
 public:
@@ -94,12 +95,13 @@ 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(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(wxObject* ptr, const wxString& name = wxEmptyString); //wxObject
     wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data
-//TODO: Need to document
 #if wxUSE_DATETIME
     wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); // Date
 #endif // wxUSE_DATETIME
@@ -109,8 +111,7 @@ public:
     wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime
     wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime
 #endif
-//TODO: End of Need to document
-    
+
     wxVariant(const wxVariant& variant);
     ~wxVariant();
 
@@ -118,7 +119,6 @@ public:
     // Assignment
     void operator= (const wxVariant& variant);
 
-//TODO: Need to document
 #if wxUSE_DATETIME
     bool operator== (const wxDateTime& value) const;
     bool operator!= (const wxDateTime& value) const;
@@ -133,7 +133,6 @@ public:
     void operator= (const TIME_STRUCT* value) ;
     void operator= (const TIMESTAMP_STRUCT* value) ;
 #endif
-//TODO: End of Need to document
 
     // Assignment using data, e.g.
     // myVariant = new wxStringVariantData("hello");
@@ -160,9 +159,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 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) ;
@@ -187,11 +188,9 @@ public:
     // No implicit conversion to wxObject, as that would really
     //  confuse people between conversion to our contained data
     //  and downcasting to see our base type.
-//TODO: Need to document
 #if wxUSE_DATETIME
     inline operator wxDateTime () const { return GetDateTime(); }
 #endif // wxUSE_DATETIME
-//TODO: End of Need to document
 
 // Accessors
     // Sets/gets name
@@ -223,16 +222,15 @@ public:
     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()  ;
-//TODO: Need to document
 #if wxUSE_DATETIME
     wxDateTime GetDateTime() const ;
 #endif // wxUSE_DATETIME
     wxArrayString GetArrayString() const;
-//TODO: End of Need to document
 
 // Operations
     // Make NULL (i.e. delete the data)
@@ -247,7 +245,7 @@ public:
     // Insert at front of list
     void Insert(const wxVariant& value);
 
-    // Returns TRUE if the variant is a member of the list
+    // Returns true if the variant is a member of the list
     bool Member(const wxVariant& value) const;
 
     // Deletes the nth element of the list
@@ -264,11 +262,9 @@ public:
     bool Convert(double* value) const;
     bool Convert(wxString* value) const;
     bool Convert(char* value) const;
-//TODO: Need to document
 #if wxUSE_DATETIME
     bool Convert(wxDateTime* value) const;
 #endif // wxUSE_DATETIME
-//TODO: End of Need to document
 
 // Attributes
 protected:
@@ -277,14 +273,14 @@ protected:
 };
 
 //Since we want type safety wxVariant we need to fetch and dynamic_cast
-//in a seemingly safe way so the compiler can check, so we define 
+//in a seemingly safe way so the compiler can check, so we define
 //a dynamic_cast /wxDynamicCast analogue.
 
 #define wxGetVariantCast(var,classname) \
-       ((classname*)(var.IsValueKindOf(&classname::sm_class##classname) ?\
-                     var.GetWxObjectPtr() : NULL));
+    ((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\
+                  var.GetWxObjectPtr() : NULL));
 
-extern wxVariant WXDLLEXPORT wxNullVariant;
+extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 #endif
     // _WX_VARIANT_H_