X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3f4a0c5be34be837210768501c13dbcff81e533c..27ea1d8aae3055025b2ebac9d9f7e93feee7569d:/include/wx/variant.h

diff --git a/include/wx/variant.h b/include/wx/variant.h
index a52b72239c..ac685e092c 100644
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -54,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;
@@ -79,10 +83,12 @@ public:
     wxVariant();
     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 wxChar* 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
@@ -114,13 +120,15 @@ 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) ;