From: J. Russell Smyth <drfish@cox.net>
Date: Mon, 15 Mar 1999 09:33:49 +0000 (+0000)
Subject: Completed Vadims HAVE_BOOL changes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/862416e006a5ebbb04ee63ac6110f0699cfbe4d6?hp=68ad65f8569c6fef3a3fb906becaaf161c77fb85

Completed Vadims HAVE_BOOL changes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/common/variant.cpp b/src/common/variant.cpp
index fdaf53ef99..48a709bd5f 100644
--- a/src/common/variant.cpp
+++ b/src/common/variant.cpp
@@ -1686,8 +1686,10 @@ bool wxVariant::Convert(long* value) const
         *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());
+#endif
     else if (type == "string")
         *value = atol((const char*) ((wxVariantDataString*)GetData())->GetValue());
     else
@@ -1703,8 +1705,10 @@ bool wxVariant::Convert(bool* value) const
         *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();
+#endif
     else if (type == "string")
     {
         wxString val(((wxVariantDataString*)GetData())->GetValue());
@@ -1729,8 +1733,10 @@ bool wxVariant::Convert(double* value) const
         *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());
+#endif
     else if (type == "string")
         *value = (double) atof((const char*) ((wxVariantDataString*)GetData())->GetValue());
     else
@@ -1746,8 +1752,10 @@ bool wxVariant::Convert(char* value) const
         *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());
+#endif
     else
         return FALSE;