Wine fixes

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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 3dfde0d6dd59efa63f2289d7115c9440664c3469..b00c977038370862018f99d16417b43543a4343c 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -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.

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 68b4e5c1d0ca446f6b899b36f385133e80d06b14..d4ec164a93c4a56b025534c9fb5feb0edf710b6b 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -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: