Another one bites the dust.

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

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index ad725d2e13629431ea1df5eca09445ec272f6e53..48a709bd5ffd8ceb260aca113f2c864bc371d0e6 100644 (file)
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -457,6 +457,7 @@ bool wxVariantDataReal::Read(wxString& str)
     return TRUE;
 }
 
     return TRUE;
 }
 

+#ifdef HAVE_BOOL

 /*
  * wxVariantDataBool
  */
 /*
  * wxVariantDataBool
  */


@@ -547,6 +548,7 @@ bool wxVariantDataBool::Read(wxString& str)
     m_value = (atol((const char*) str) != 0);
     return TRUE;
 }
     m_value = (atol((const char*) str) != 0);
     return TRUE;
 }

+#endif // HAVE_BOOL

 
 /*
  * wxVariantDataChar
 
 /*
  * wxVariantDataChar


@@ -991,11 +993,13 @@ wxVariant::wxVariant(long val, const wxString& name)
     m_name = name;
 }
 
     m_name = name;
 }
 

+#ifdef HAVE_BOOL

 wxVariant::wxVariant(bool val, const wxString& name)
 {
     m_data = new wxVariantDataBool(val);
     m_name = name;
 }
 wxVariant::wxVariant(bool val, const wxString& name)
 {
     m_data = new wxVariantDataBool(val);
     m_name = name;
 }

+#endif

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


@@ -1205,6 +1209,7 @@ void wxVariant::operator= (char value)
     }
 }
 
     }
 }
 

+#ifdef HAVE_BOOL

 bool wxVariant::operator== (bool value) const
 {
     bool thisValue;
 bool wxVariant::operator== (bool value) const
 {
     bool thisValue;


@@ -1232,6 +1237,7 @@ void wxVariant::operator= (bool value)
         m_data = new wxVariantDataBool(value);
     }
 }
         m_data = new wxVariantDataBool(value);
     }
 }

+#endif // HAVE_BOOL

 
 bool wxVariant::operator== (const wxString& value) const
 {
 
 bool wxVariant::operator== (const wxString& value) const
 {


@@ -1680,8 +1686,10 @@ bool wxVariant::Convert(long* value) const
         *value = (long) (((wxVariantDataReal*)GetData())->GetValue());
     else if (type == "long")
         *value = ((wxVariantDataLong*)GetData())->GetValue();
         *value = (long) (((wxVariantDataReal*)GetData())->GetValue());
     else if (type == "long")
         *value = ((wxVariantDataLong*)GetData())->GetValue();

+#ifdef HAVE_BOOL

     else if (type == "bool")
         *value = (long) (((wxVariantDataBool*)GetData())->GetValue());
     else if (type == "bool")
         *value = (long) (((wxVariantDataBool*)GetData())->GetValue());

+#endif

     else if (type == "string")
         *value = atol((const char*) ((wxVariantDataString*)GetData())->GetValue());
     else
     else if (type == "string")
         *value = atol((const char*) ((wxVariantDataString*)GetData())->GetValue());
     else


@@ -1697,8 +1705,10 @@ bool wxVariant::Convert(bool* value) const
         *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
     else if (type == "long")
         *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
         *value = ((int) (((wxVariantDataReal*)GetData())->GetValue()) != 0);
     else if (type == "long")
         *value = (((wxVariantDataLong*)GetData())->GetValue() != 0);

+#ifdef HAVE_BOOL

     else if (type == "bool")
         *value = ((wxVariantDataBool*)GetData())->GetValue();
     else if (type == "bool")
         *value = ((wxVariantDataBool*)GetData())->GetValue();

+#endif

     else if (type == "string")
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
     else if (type == "string")
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());


@@ -1723,8 +1733,10 @@ bool wxVariant::Convert(double* value) const
         *value = ((wxVariantDataReal*)GetData())->GetValue();
     else if (type == "long")
         *value = (double) (((wxVariantDataLong*)GetData())->GetValue());
         *value = ((wxVariantDataReal*)GetData())->GetValue();
     else if (type == "long")
         *value = (double) (((wxVariantDataLong*)GetData())->GetValue());

+#ifdef HAVE_BOOL

     else if (type == "bool")
         *value = (double) (((wxVariantDataBool*)GetData())->GetValue());
     else if (type == "bool")
         *value = (double) (((wxVariantDataBool*)GetData())->GetValue());

+#endif

     else if (type == "string")
         *value = (double) atof((const char*) ((wxVariantDataString*)GetData())->GetValue());
     else
     else if (type == "string")
         *value = (double) atof((const char*) ((wxVariantDataString*)GetData())->GetValue());
     else


@@ -1740,8 +1752,10 @@ bool wxVariant::Convert(char* value) const
         *value = ((wxVariantDataChar*)GetData())->GetValue();
     else if (type == "long")
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());
         *value = ((wxVariantDataChar*)GetData())->GetValue();
     else if (type == "long")
         *value = (char) (((wxVariantDataLong*)GetData())->GetValue());

+#ifdef HAVE_BOOL

     else if (type == "bool")
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());
     else if (type == "bool")
         *value = (char) (((wxVariantDataBool*)GetData())->GetValue());

+#endif

     else
         return FALSE;
 
     else
         return FALSE;