X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0a302dcba6d7f6828f221f7341ee8a8cbcd8e96..5ecdc7ab6d10222bcf88610198771b5f3aee10a7:/include/wx/variant.h diff --git a/include/wx/variant.h b/include/wx/variant.h index 157259cc5f..7c1b224c80 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -6,13 +6,13 @@ // Created: 10/09/98 // RCS-ID: $Id$ // Copyright: (c) -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_VARIANT_H_ #define _WX_VARIANT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "variant.h" #endif @@ -21,19 +21,15 @@ #include "wx/string.h" #include "wx/list.h" -#if wxUSE_TIMEDATE -#include "wx/time.h" -#include "wx/date.h" -#endif +#if wxUSE_DATETIME + #include "wx/datetime.h" +#endif // wxUSE_DATETIME -#if wxUSE_IOSTREAMH -#include -#else -#include -# ifdef _MSC_VER - using namespace std; -# endif -#endif +#if wxUSE_ODBC + #include "wx/db.h" // will #include sqltypes.h +#endif //ODBC + +#include "wx/iosfwrap.h" /* * wxVariantData stores the actual data in a wxVariant object, @@ -61,12 +57,18 @@ 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; + // If it based on wxObject return the ClassInfo. + virtual wxClassInfo* GetValueClassInfo() { return NULL; } }; /* @@ -86,18 +88,29 @@ public: wxVariant(); 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 char* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool! + 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 -#if wxUSE_TIMEDATE - 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(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 + wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString); // String array +#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 +//TODO: End of Need to document + wxVariant(const wxVariant& variant); ~wxVariant(); @@ -105,6 +118,23 @@ 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; + void operator= (const wxDateTime& value) ; +#endif // wxUSE_DATETIME + + bool operator== (const wxArrayString& value) const; + bool operator!= (const wxArrayString& value) const; + void operator= (const wxArrayString& 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,27 +151,21 @@ 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 - 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) ; @@ -159,11 +183,15 @@ public: 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(); } + // 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 @@ -181,6 +209,7 @@ public: wxString GetType() const; bool IsType(const wxString& type) const; + bool IsValueKindOf(const wxClassInfo* type) const; // Return the number of elements in a list int GetCount() const; @@ -195,11 +224,15 @@ public: wxString GetString() const ; wxList& GetList() const ; wxStringList& GetStringList() const ; -#if wxUSE_TIMEDATE - wxTime GetTime() const ; - wxDate GetDate() 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) @@ -224,17 +257,18 @@ public: void ClearList(); // Implementation -protected: +public: // 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 +//TODO: Need to document +#if wxUSE_DATETIME + bool Convert(wxDateTime* value) const; +#endif // wxUSE_DATETIME +//TODO: End of Need to document // Attributes protected: @@ -242,7 +276,15 @@ protected: wxString m_name; }; -extern wxVariant wxNullVariant; +//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 +//a dynamic_cast /wxDynamicCast analogue. + +#define wxGetVariantCast(var,classname) \ + ((classname*)(var.IsValueKindOf(&classname::sm_class##classname) ?\ + var.GetWxObjectPtr() : NULL)); + +extern wxVariant WXDLLEXPORT wxNullVariant; #endif // _WX_VARIANT_H_