X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3ba055acae99caf68da4bb201f66fc1030d2dbb0..3abf2c720bea956795f6958e21db292cde614f52:/include/wx/variant.h diff --git a/include/wx/variant.h b/include/wx/variant.h index 4956e3283a..34eb32c400 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_ @@ -22,18 +22,17 @@ #include "wx/list.h" #if wxUSE_TIMEDATE -#include "wx/time.h" -#include "wx/date.h" -#endif + #include "wx/time.h" + #include "wx/date.h" +#endif // time/date -#if wxUSE_IOSTREAMH -#include -#else -#include -# ifdef _MSC_VER - using namespace std; -# endif -#endif +#include "wx/datetime.h" + +#if wxUSE_ODBC + #include "wx/db.h" // will #include sqltypes.h +#endif //ODBC + +#include "wx/ioswrap.h" /* * wxVariantData stores the actual data in a wxVariant object, @@ -61,9 +60,13 @@ public: // Copy to data virtual void Copy(wxVariantData& data) = 0; virtual bool Eq(wxVariantData& data) const = 0; - virtual bool Write(ostream& str) const = 0; +#if wxUSE_STD_IOSTREAM + virtual bool Write(wxSTD ostream& str) const = 0; +#endif virtual bool Write(wxString& str) const = 0; - virtual bool Read(istream& str) = 0; +#if wxUSE_STD_IOSTREAM + virtual bool Read(wxSTD istream& str) = 0; +#endif virtual bool Read(wxString& str) = 0; // What type is it? Return a string name. virtual wxString GetType() const = 0; @@ -84,20 +87,32 @@ public: // Construction & destruction wxVariant(); - wxVariant(double val, const wxString& name = g_szNul); - wxVariant(long val, const wxString& name = g_szNul); - wxVariant(bool val, const wxString& name = g_szNul); - 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 + 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 +//TODO: Need to document + wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); // Date +#if wxUSE_ODBC + wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime + wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime + wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString); // DateTime #endif - wxVariant(void* ptr, const wxString& name = g_szNul); // void* (general purpose) - wxVariant(wxVariantData* data, const wxString& name = g_szNul); // User-defined data +//TODO: End of Need to document + wxVariant(const wxVariant& variant); ~wxVariant(); @@ -105,6 +120,17 @@ public: // Assignment void operator= (const wxVariant& variant); +//TODO: Need to document + bool operator== (const wxDateTime& value) const; + bool operator!= (const wxDateTime& value) const; + void operator= (const wxDateTime& value) ; +#if wxUSE_ODBC + void operator= (const DATE_STRUCT* value) ; + 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"); void operator= (wxVariantData* variantData); @@ -121,20 +147,23 @@ 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) ; -#if wxUSE_TIMEDATE +// 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) ; @@ -159,11 +188,15 @@ public: inline operator char () const { return GetChar(); } inline operator long () const { return GetLong(); } inline operator bool () const { return GetBool(); } -#if wxUSE_TIMEDATE +// 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(); } +//TODO: Need to document + inline operator wxDateTime () const { return GetDateTime(); } +//TODO: End of Need to document // Accessors // Sets/gets name @@ -195,11 +228,16 @@ public: wxString GetString() const ; wxList& GetList() const ; wxStringList& GetStringList() const ; -#if wxUSE_TIMEDATE + +// 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 ; +//TODO: Need to document + wxDateTime GetDateTime() const ; +//TODO: End of Need to document // Operations // Make NULL (i.e. delete the data) @@ -231,10 +269,14 @@ protected: bool Convert(double* value) const; bool Convert(wxString* value) const; bool Convert(char* value) const; -#if wxUSE_TIMEDATE +// 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 +//TODO: Need to document + bool Convert(wxDateTime* value) const; +//TODO: End of Need to document // Attributes protected: