fixed IO redirection to work in wxExecute() in console applications (including the...

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

diff --git a/include/wx/variant.h b/include/wx/variant.h
index bee2b4a6465281e47b151cd168971afdd7dc18b4..89cb6c437d73444f1e307e751efd4796007227d1 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -26,10 +26,6 @@
     #include "wx/datetime.h"
 #endif // wxUSE_DATETIME
 
     #include "wx/datetime.h"
 #endif // wxUSE_DATETIME
 

-#if wxUSE_ODBC
-    #include "wx/db.h"  // will #include sqltypes.h
-#endif //ODBC
-

 #include "wx/iosfwrap.h"
 
 /*
 #include "wx/iosfwrap.h"
 
 /*


@@ -81,6 +77,10 @@ public:
     // If it based on wxObject return the ClassInfo.
     virtual wxClassInfo* GetValueClassInfo() { return NULL; }
 
     // If it based on wxObject return the ClassInfo.
     virtual wxClassInfo* GetValueClassInfo() { return NULL; }
 

+    // Implement this to make wxVariant::AllocExcusive work. Returns
+    // a copy of the data.
+    virtual wxVariantData* Clone() const { return NULL; }
+

     void IncRef() { m_count++; }
     void DecRef()
     {
     void IncRef() { m_count++; }
     void DecRef()
     {


@@ -104,7 +104,7 @@ private:
  * wxVariant can store any kind of data, but has some basic types
  * built in.
  */
  * wxVariant can store any kind of data, but has some basic types
  * built in.
  */

- 
+

 class WXDLLIMPEXP_FWD_BASE wxVariant;
 
 WX_DECLARE_LIST_WITH_DECL(wxVariant, wxVariantList, class WXDLLIMPEXP_BASE);
 class WXDLLIMPEXP_FWD_BASE wxVariant;
 
 WX_DECLARE_LIST_WITH_DECL(wxVariant, wxVariantList, class WXDLLIMPEXP_BASE);


@@ -146,6 +146,9 @@ public:
     // destroy a reference
     void UnRef();
 
     // destroy a reference
     void UnRef();
 

+    // ensure that the data is exclusive to this variant, and not shared
+    bool Unshare();
+

     // Make NULL (i.e. delete the data)
     void MakeNull();
 
     // Make NULL (i.e. delete the data)
     void MakeNull();
 


@@ -195,19 +198,9 @@ public:
     // wxDateTime
 #if wxUSE_DATETIME
     wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString);
     // wxDateTime
 #if wxUSE_DATETIME
     wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString);

-#if wxUSE_ODBC
-    wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString);
-    wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString);
-    wxVariant(const TIMESTAMP_STRUCT* valptr, const wxString& name = wxEmptyString);
-#endif

     bool operator== (const wxDateTime& value) const;
     bool operator!= (const wxDateTime& value) const;
     void operator= (const wxDateTime& value) ;
     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

     inline operator wxDateTime () const { return GetDateTime(); }
     wxDateTime GetDateTime() const;
 #endif
     inline operator wxDateTime () const { return GetDateTime(); }
     wxDateTime GetDateTime() const;
 #endif


@@ -290,14 +283,14 @@ public:
     // list operations
     // ------------------------------
 
     // list operations
     // ------------------------------
 

-    wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants
-    bool operator== (const wxList& value) const;
-    bool operator!= (const wxList& value) const;
-    void operator= (const wxList& value) ;
+    wxVariant(const wxVariantList& val, const wxString& name = wxEmptyString); // List of variants
+    bool operator== (const wxVariantList& value) const;
+    bool operator!= (const wxVariantList& value) const;
+    void operator= (const wxVariantList& value) ;

     // Treat a list variant as an array
     wxVariant operator[] (size_t idx) const;
     wxVariant& operator[] (size_t idx) ;
     // Treat a list variant as an array
     wxVariant operator[] (size_t idx) const;
     wxVariant& operator[] (size_t idx) ;

-    wxList& GetList() const ;
+    wxVariantList& GetList() const ;

 
     // Return the number of elements in a list
     size_t GetCount() const;
 
     // Return the number of elements in a list
     size_t GetCount() const;


@@ -365,6 +358,8 @@ public:\
 \
     virtual wxString GetType() const; \
     virtual wxClassInfo* GetValueClassInfo(); \
 \
     virtual wxString GetType() const; \
     virtual wxClassInfo* GetValueClassInfo(); \

+\
+    virtual wxVariantData* Clone() const { return new classname##VariantData(m_value); } \

 \
 protected:\
     classname m_value; \
 \
 protected:\
     classname m_value; \


@@ -436,6 +431,9 @@ bool classname##VariantData::Eq(wxVariantData& data) const \
     ((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\
                   var.GetWxObjectPtr() : NULL));
 
     ((classname*)(var.IsValueKindOf(&classname::ms_classInfo) ?\
                   var.GetWxObjectPtr() : NULL));
 

+// Replacement for using wxDynamicCast on a wxVariantData object
+#define wxDynamicCastVariantData(data, classname) dynamic_cast<classname*>(data)
+

 extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 #endif // wxUSE_VARIANT
 extern wxVariant WXDLLIMPEXP_BASE wxNullVariant;
 
 #endif // wxUSE_VARIANT