Wine fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2006-11-12 15:54:06 +00:00
parent 601bee5ca2
commit 219b657fbe
2 changed files with 15 additions and 0 deletions

View File

@ -57,6 +57,15 @@
# define wxUSE_UNICODE_MSLU 0
#endif
/*
* Don't use MSLU if compiling with Wine
*/
#if wxUSE_UNICODE_MSLU && defined(__WINE__)
# undef wxUSE_UNICODE_MSLU
# define wxUSE_UNICODE_MSLU 0
#endif
/*
* All of the settings below require SEH support (__try/__catch) and can't work
* without it.

View File

@ -1159,6 +1159,12 @@ bool wxFileDataObject::GetDataHere(void *WXUNUSED_IN_WINCE(pData)) const
// wxURLDataObject
// ----------------------------------------------------------------------------
// Work around bug in Wine headers
#if defined(__WINE__) && defined(CFSTR_SHELLURL) && wxUSE_UNICODE
#undef CFSTR_SHELLURL
#define CFSTR_SHELLURL _T("CFSTR_SHELLURL")
#endif
class CFSTR_SHELLURLDataObject : public wxCustomDataObject
{
public: