From: Vadim Zeitlin Date: Mon, 30 Oct 2006 19:11:31 +0000 (+0000) Subject: compilation fix for wxUSE_UNICODE_MSLU && !WXWIN_COMPATIBILITY_2_6 (bug 1587408) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/dddf9e14ede299e2da0a40eae445b8cab0389087 compilation fix for wxUSE_UNICODE_MSLU && !WXWIN_COMPATIBILITY_2_6 (bug 1587408) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index 83511b7be1..68b4e5c1d0 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -1057,7 +1057,7 @@ size_t wxFileDataObject::GetDataSize() const #if wxUSE_UNICODE_MSLU size_t sizeOfChar; - if ( wxGetOsVersion() == wxWIN95 ) + if ( wxGetOsVersion() == wxOS_WINDOWS_9X ) { // Win9x always uses ANSI file names and MSLU doesn't help with this sizeOfChar = sizeof(char); @@ -1111,7 +1111,7 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const pDrop->pFiles = sizeof(DROPFILES); pDrop->fNC = FALSE; // not non-client coords #if wxUSE_UNICODE_MSLU - pDrop->fWide = wxGetOsVersion() != wxWIN95 ? TRUE : FALSE; + pDrop->fWide = wxGetOsVersion() != wxOS_WINDOWS_9X ? TRUE : FALSE; #else pDrop->fWide = wxUSE_UNICODE; #endif