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

Remove MSVC6 support.

Browse Source 
Don't support this compiler any more, this allows to get rid of tons of
MSVC6-specific workarounds, in particular we can now use Bind() and natural
template functions calls in the library code.

Also remove MSVC6 project and solution files and don't generate them when
bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj
from the bakefiles results in weird bake-time errors, so it's simpler to just
leave them there).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-15 22:32:17 +00:00
parent 28f9670787
commit f4b80e5337
289 changed files with 394 additions and 38949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/msw/ole/oleutils.cpp
View File

@@ -146,7 +146,7 @@ bool wxVariantDataCurrency::GetAsAny(wxAny* any) const
wxVariantData* wxVariantDataCurrency::VariantDataFactory(const wxAny& any)
{
return new wxVariantDataCurrency(wxANY_AS(any, CURRENCY));
return new wxVariantDataCurrency(any.As<CURRENCY>());
}
REGISTER_WXANY_CONVERSION(CURRENCY, wxVariantDataCurrency)
@@ -199,7 +199,7 @@ bool wxVariantDataErrorCode::GetAsAny(wxAny* any) const
wxVariantData* wxVariantDataErrorCode::VariantDataFactory(const wxAny& any)
{
return new wxVariantDataErrorCode(wxANY_AS(any, SCODE));
return new wxVariantDataErrorCode(any.As<SCODE>());
}
REGISTER_WXANY_CONVERSION(SCODE, wxVariantDataErrorCode)
@@ -247,7 +247,7 @@ bool wxVariantDataSafeArray::GetAsAny(wxAny* any) const
wxVariantData* wxVariantDataSafeArray::VariantDataFactory(const wxAny& any)
{
return new wxVariantDataSafeArray(wxANY_AS(any, SAFEARRAY*));
return new wxVariantDataSafeArray(any.As<SAFEARRAY*>());
}
REGISTER_WXANY_CONVERSION(SAFEARRAY*, wxVariantDataSafeArray)
@@ -331,13 +331,7 @@ WXDLLEXPORT bool wxConvertVariantToOle(const wxVariant& variant, VARIANTARG& ole
oleVariant.vt = VT_I4;
oleVariant.lVal = variant.GetLong() ;
}
// Original VC6 came with SDK too old to contain VARIANT::llVal declaration
// and there doesn't seem to be any way to test for it as Microsoft simply
// added it to the later version of oaidl.h without changing anything else.
// So assume it's not present for VC6, even though it might be if an
// updated SDK is used. In this case the user would need to disable this
// check himself.
#if wxUSE_LONGLONG && !defined(__VISUALC6__)
#if wxUSE_LONGLONG
else if (type == wxT("longlong"))
{
oleVariant.vt = VT_I8;
@@ -513,8 +507,7 @@ wxConvertOleToVariant(const VARIANTARG& oleVariant, wxVariant& variant, long fla
#endif // wxUSE_DATETIME
break;
// See the comment before the __VISUALC6__ test above.
#if wxUSE_LONGLONG && !defined(__VISUALC6__)
#if wxUSE_LONGLONG
case VT_I8:
variant = wxLongLong(oleVariant.llVal);
break;