Hacks for wine.

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

include/wx/msw/missing.h

@@ -418,5 +418,18 @@ typedef struct _OSVERSIONINFOEX {
     #include "wx/msw/wince/missing.h"
 #endif
 
+ /*
+  * The following are specifically required for Wine
+  */
+
+#ifdef __WINE__
+    #ifndef ENUM_CURRENT_SETTINGS
+        #define ENUM_CURRENT_SETTINGS   ((DWORD)-1)
+    #endif
+    #ifndef BROADCAST_QUERY_DENY
+        #define BROADCAST_QUERY_DENY    1112363332
+    #endif
+#endif  // defined __WINE__
+
 #endif
     // _WX_MISSING_H_

src/msw/display.cpp

@@ -33,6 +33,8 @@
     #include "wx/frame.h"
 #endif
 
+#include "wx/msw/missing.h"
+
 #include "wx/dynload.h"
 #include "wx/sysopt.h"
 

src/msw/ole/dataobj.cpp

@@ -686,7 +686,10 @@ size_t wxDataObject::GetBufferOffset(const wxDataFormat& format )
 const void* wxDataObject::GetSizeFromBuffer( const void* buffer, size_t* size,
                                                const wxDataFormat& format )
 {
-    size_t realsz = ::HeapSize(::GetProcessHeap(), 0, buffer);
+    // hack: the third parameter is declared non-const in Wine's headers so
+    // cast away the const
+    size_t realsz = ::HeapSize(::GetProcessHeap(), 0,
+                               wx_const_cast(void*, buffer));
     if ( realsz == (size_t)-1 )
     {
         // note that HeapSize() does not set last error

src/msw/window.cpp

@@ -106,7 +106,7 @@
 // include <commctrl.h> "properly"
 #include "wx/msw/wrapcctl.h"
 
-#ifndef __WXWINCE__
+#if !defined __WXWINCE__ && !defined __WINE__
     #include <pbt.h>
 #endif