From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 12 Nov 2006 15:54:06 +0000 (+0000)
Subject: Wine fixes
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/219b657fbe238ab34cf41394162b87bb5ada3456?ds=inline

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 3dfde0d6dd..b00c977038 100644
--- 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 68b4e5c1d0..d4ec164a93 100644
--- 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: