Some make corrections for HP and related,

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index 5c565aba18a7588939e073be97c042a074b47674..f8c08df65577e5ba3f49b8fa0f5f80d72e0113e7 100644 (file)
--- 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,11 +21,12 @@
 #include "wx/string.h"
 #include "wx/list.h"
 
-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#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,
@@ -53,9 +54,13 @@ public:
     // Copy to data
     virtual void Copy(wxVariantData& data) = 0;
     virtual bool Eq(wxVariantData& data) const = 0;
+#if wxUSE_STD_IOSTREAM
     virtual bool Write(ostream& str) const = 0;
+#endif
     virtual bool Write(wxString& str) const = 0;
+#if wxUSE_STD_IOSTREAM
     virtual bool Read(istream& str) = 0;
+#endif
     virtual bool Read(wxString& str) = 0;
     // What type is it? Return a string name.
     virtual wxString GetType() const = 0;
@@ -76,18 +81,24 @@ 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 = wxEmptyString);
+    wxVariant(long val, const wxString& name = wxEmptyString);
+#ifdef HAVE_BOOL
+    wxVariant(bool val, const wxString& name = wxEmptyString);
+#endif
+    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);
+    wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
+    wxVariant(const wxTime& val, const wxString& name = wxEmptyString); // Time
+    wxVariant(const wxDate& val, const wxString& name = wxEmptyString); // Date
+#endif
+    wxVariant(void* ptr, const wxString& name = wxEmptyString); // void* (general purpose)
+    wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); // User-defined data
     wxVariant(const wxVariant& variant);
-    wxVariant(wxVariantData* data); // User-defined data
     ~wxVariant();
 
 // Generic operators
@@ -110,19 +121,33 @@ 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) ;
-    void operator= (const char* value) ; // Necessary or VC++ assumes bool!
+    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) ;
     bool operator== (const wxList& value) const;
     bool operator!= (const wxList& value) const;
     void operator= (const wxList& value) ;
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
+    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;
@@ -134,10 +159,21 @@ 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(); }
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
+    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); }
 
@@ -164,6 +200,13 @@ public:
     wxList& GetList() const ;
     wxStringList& GetStringList() const ;
 
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
+    wxTime GetTime() const ;
+    wxDate GetDate() const ;
+#endif
+    void* GetVoidPtr() const ;
+
 // Operations
     // Make NULL (i.e. delete the data)
     void MakeNull();
@@ -186,17 +229,27 @@ 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;
+// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
+#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
+    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_