X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ed57eb790d9e1f18adb50ec122f1ee17152018c..438e3558adf77a68f56b6e4d30b359f8361facac:/include/wx/variant.h

diff --git a/include/wx/variant.h b/include/wx/variant.h
index de915f8f7d..ff5797ec1a 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;
@@ -77,22 +81,22 @@ public:
 
 // Construction & destruction
     wxVariant();
-    wxVariant(double val, const wxString& name = g_szNul);
-    wxVariant(long val, const wxString& name = g_szNul);
+    wxVariant(double val, const wxString& name = wxEmptyString);
+    wxVariant(long val, const wxString& name = wxEmptyString);
 #ifdef HAVE_BOOL
-    wxVariant(bool val, const wxString& name = g_szNul);
+    wxVariant(bool val, const wxString& name = wxEmptyString);
 #endif
-    wxVariant(char val, const wxString& name = g_szNul);
-    wxVariant(const wxString& val, const wxString& name = g_szNul);
-    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
+    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
 #if wxUSE_TIMEDATE
-    wxVariant(const wxTime& val, const wxString& name = g_szNul); // Time
-    wxVariant(const wxDate& val, const wxString& name = g_szNul); // Date
+    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 = g_szNul); // void* (general purpose)
-    wxVariant(wxVariantData* data, const wxString& name = g_szNul); // User-defined data
+    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();