Add class factories for filter streams. Also filters now follow the convention

[wxWidgets.git] / src / common / variant.cpp

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index df261de03f2f1b867779335845c0cb8b8b78555c..870938c773cf025448efc7495f31f03a519dae87 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -290,7 +290,7 @@ bool wxVariantDataLong::Read(wxString& str)
     return true;
 }
 
     return true;
 }
 

-// wxVariant 
+// wxVariant

 
 wxVariant::wxVariant(long val, const wxString& name)
 {
 
 wxVariant::wxVariant(long val, const wxString& name)
 {


@@ -695,7 +695,7 @@ bool wxVariantDataChar::Write(wxString& str) const
 bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));
 bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str))
 {
     wxFAIL_MSG(wxT("Unimplemented"));

-    
+

     return false;
 }
 #endif
     return false;
 }
 #endif


@@ -705,7 +705,8 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const
 {
     wxTextOutputStream s(str);
 
 {
     wxTextOutputStream s(str);
 

-    s.Write8(m_value);
+    s << m_value;
+

     return true;
 }
 
     return true;
 }
 


@@ -733,7 +734,7 @@ wxVariant::wxVariant(wxChar val, const wxString& name)
 
 bool wxVariant::operator== (wxChar value) const
 {
 
 bool wxVariant::operator== (wxChar value) const
 {

-    char thisValue;
+    wxChar thisValue;

     if (!Convert(&thisValue))
         return false;
     else
     if (!Convert(&thisValue))
         return false;
     else


@@ -761,7 +762,7 @@ void wxVariant::operator= (wxChar value)
 
 wxChar wxVariant::GetChar() const
 {
 
 wxChar wxVariant::GetChar() const
 {

-    char value;
+    wxChar value;

     if (Convert(& value))
         return value;
     else
     if (Convert(& value))
         return value;
     else


@@ -854,7 +855,7 @@ bool wxVariantDataString::Read(wxString& str)
 IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
 
 // wxVariant ****
 IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
 
 // wxVariant ****

- 
+

 wxVariant::wxVariant(const wxString& val, const wxString& name)
 {
     m_data = new wxVariantDataString(val);
 wxVariant::wxVariant(const wxString& val, const wxString& name)
 {
     m_data = new wxVariantDataString(val);


@@ -1840,7 +1841,7 @@ void wxVariant::operator= (const wxStringList& value)
     }
 }
 
     }
 }
 

-// wxVariant 
+// wxVariant

 
 wxStringList& wxVariant::GetStringList() const
 {
 
 wxStringList& wxVariant::GetStringList() const
 {


@@ -1987,7 +1988,7 @@ bool wxVariant::Convert(double* value) const
     return true;
 }
 
     return true;
 }
 

-bool wxVariant::Convert(char* value) const
+bool wxVariant::Convert(wxChar* value) const

 {
     wxString type(GetType());
     if (type == wxT("char"))
 {
     wxString type(GetType());
     if (type == wxT("char"))


@@ -2026,7 +2027,4 @@ bool wxVariant::Convert(wxDateTime* value) const
 }
 #endif // wxUSE_DATETIME
 
 }
 #endif // wxUSE_DATETIME
 

-
-
-

 #endif // wxUSE_VARIANT
 #endif // wxUSE_VARIANT