Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove tests for bool and {const,static,reinterpret}_cast in configure and wx/defs.h, all supported compilers have them

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-02 02:16:09 +00:00
parent 94bc35dc33
commit 4c1d5d5ae2
8 changed files with 4 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/variant.cpp
View File

@@ -517,8 +517,6 @@ double wxVariant::GetDouble() const
// wxVariantBoolData
// -----------------------------------------------------------------
#ifdef HAVE_BOOL
class WXDLLIMPEXP_BASE wxVariantDataBool: public wxVariantData
{
public:
@@ -654,8 +652,6 @@ bool wxVariant::GetBool() const
}
}
#endif // HAVE_BOOL
// -----------------------------------------------------------------
// wxVariantDataChar
// -----------------------------------------------------------------
@@ -1728,10 +1724,8 @@ bool wxVariant::Convert(long* value) const
*value = (long) (((wxVariantDoubleData*)GetData())->GetValue());
else if (type == wxT("long"))
*value = ((wxVariantDataLong*)GetData())->GetValue();
#ifdef HAVE_BOOL
else if (type == wxT("bool"))
*value = (long) (((wxVariantDataBool*)GetData())->GetValue());
#endif
else if (type == wxT("string"))
*value = wxAtol(((wxVariantDataString*)GetData())->GetValue());
else
@@ -1747,10 +1741,8 @@ bool wxVariant::Convert(bool* value) const
*value = ((int) (((wxVariantDoubleData*)GetData())->GetValue()) != 0);
else if (type == wxT("long"))
*value = (((wxVariantDataLong*)GetData())->GetValue() != 0);
#ifdef HAVE_BOOL
else if (type == wxT("bool"))
*value = ((wxVariantDataBool*)GetData())->GetValue();
#endif
else if (type == wxT("string"))
{
wxString val(((wxVariantDataString*)GetData())->GetValue());
@@ -1775,10 +1767,8 @@ bool wxVariant::Convert(double* value) const
*value = ((wxVariantDoubleData*)GetData())->GetValue();
else if (type == wxT("long"))
*value = (double) (((wxVariantDataLong*)GetData())->GetValue());
#ifdef HAVE_BOOL
else if (type == wxT("bool"))
*value = (double) (((wxVariantDataBool*)GetData())->GetValue());
#endif
else if (type == wxT("string"))
*value = (double) wxAtof(((wxVariantDataString*)GetData())->GetValue());
else
@@ -1794,10 +1784,8 @@ bool wxVariant::Convert(wxUniChar* value) const
*value = ((wxVariantDataChar*)GetData())->GetValue();
else if (type == wxT("long"))
*value = (char) (((wxVariantDataLong*)GetData())->GetValue());
#ifdef HAVE_BOOL
else if (type == wxT("bool"))
*value = (char) (((wxVariantDataBool*)GetData())->GetValue());
#endif
else
return false;