X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbc535ff084f61ec376f339c515d96d74065c18b..33d28952b29818b6931d91984a7b612a072d843d:/include/wx/variant.h

diff --git a/include/wx/variant.h b/include/wx/variant.h
index b2e1673301..58f4bf2380 100644
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -6,7 +6,7 @@
 // Created:     10/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c)
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_VARIANT_H_
@@ -21,14 +21,12 @@
 #include "wx/string.h"
 #include "wx/list.h"
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#  ifdef _MSC_VER
-      using namespace std;
-#  endif
-#endif
+#if wxUSE_TIMEDATE
+    #include "wx/time.h"
+    #include "wx/date.h"
+#endif // time/date
+
+#include "wx/ioswrap.h"
 
 /*
  * wxVariantData stores the actual data in a wxVariant object,
@@ -79,18 +77,23 @@ public:
 
 // Construction & destruction
     wxVariant();
-    wxVariant(double val);
-    wxVariant(long val);
-    wxVariant(bool val);
-    wxVariant(char val);
-    wxVariant(const wxString& val);
-    wxVariant(const char* val); // Necessary or VC++ assumes bool!
-/* Causes ambiguity
-    wxVariant(const wxStringList& val);
-*/
-    wxVariant(const wxList& val); // List of variants
+    wxVariant(double val, const wxString& name = g_szNul);
+    wxVariant(long val, const wxString& name = g_szNul);
+#ifdef HAVE_BOOL
+    wxVariant(bool val, const wxString& name = g_szNul);
+#endif
+    wxVariant(char val, const wxString& name = g_szNul);
+    wxVariant(const wxString& val, const wxString& name = g_szNul);
+    wxVariant(const char* val, const wxString& name = g_szNul); // Necessary or VC++ assumes bool!
+    wxVariant(const wxStringList& val, const wxString& name = g_szNul);
+    wxVariant(const wxList& val, const wxString& name = g_szNul); // List of variants
+#if wxUSE_TIMEDATE
+    wxVariant(const wxTime& val, const wxString& name = g_szNul); // Time
+    wxVariant(const wxDate& val, const wxString& name = g_szNul); // Date
+#endif
+    wxVariant(void* ptr, const wxString& name = g_szNul); // void* (general purpose)
+    wxVariant(wxVariantData* data, const wxString& name = g_szNul); // User-defined data
     wxVariant(const wxVariant& variant);
-    wxVariant(wxVariantData* data); // User-defined data
     ~wxVariant();
 
 // Generic operators
@@ -113,9 +116,11 @@ public:
     bool operator== (char value) const;
     bool operator!= (char value) const;
     void operator= (char value) ;
+#ifdef HAVE_BOOL
     bool operator== (bool value) const;
     bool operator!= (bool value) const;
     void operator= (bool value) ;
+#endif
     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;
     void operator= (const wxString& value) ;
@@ -126,6 +131,17 @@ public:
     bool operator== (const wxList& value) const;
     bool operator!= (const wxList& value) const;
     void operator= (const wxList& value) ;
+#if wxUSE_TIMEDATE
+    bool operator== (const wxTime& value) const;
+    bool operator!= (const wxTime& value) const;
+    void operator= (const wxTime& value) ;
+    bool operator== (const wxDate& value) const;
+    bool operator!= (const wxDate& value) const;
+    void operator= (const wxDate& value) ;
+#endif
+    bool operator== (void* value) const;
+    bool operator!= (void* value) const;
+    void operator= (void* value) ;
 
     // Treat a list variant as an array
     wxVariant operator[] (size_t idx) const;
@@ -137,10 +153,20 @@ public:
 
     // Other implicit conversions
     inline operator double () const {  return GetDouble(); }
+    inline operator char () const {  return GetChar(); }
     inline operator long () const {  return GetLong(); }
     inline operator bool () const {  return GetBool(); }
+#if wxUSE_TIMEDATE
+    inline operator wxTime () const {  return GetTime(); }
+    inline operator wxDate () const {  return GetDate(); }
+#endif
+    inline operator void* () const {  return GetVoidPtr(); }
 
 // Accessors
+    // Sets/gets name
+    inline void SetName(const wxString& name) { m_name = name; }
+    inline const wxString& GetName() const { return m_name; }
+
     // Tests whether there is data
     inline bool IsNull() const { return (m_data == (wxVariantData*) NULL); }
 
@@ -166,6 +192,11 @@ public:
     wxString GetString() const ;
     wxList& GetList() const ;
     wxStringList& GetStringList() const ;
+#if wxUSE_TIMEDATE
+    wxTime GetTime() const ;
+    wxDate GetDate() const ;
+#endif
+    void* GetVoidPtr() const ;
 
 // Operations
     // Make NULL (i.e. delete the data)
@@ -189,17 +220,26 @@ public:
     // Clear list
     void ClearList();
 
+// Implementation
+protected:
 // Type conversion
     bool Convert(long* value) const;
     bool Convert(bool* value) const;
     bool Convert(double* value) const;
     bool Convert(wxString* value) const;
     bool Convert(char* value) const;
+#if wxUSE_TIMEDATE
+    bool Convert(wxTime* value) const;
+    bool Convert(wxDate* value) const;
+#endif
 
 // Attributes
 protected:
     wxVariantData*  m_data;
+    wxString        m_name;
 };
 
+extern wxVariant WXDLLEXPORT wxNullVariant;
+
 #endif
     // _WX_VARIANT_H_