AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hacks for wine.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell 2006-09-04 16:36:47 +00:00
parent e562de4db7
commit 24aab8e81a
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/wx/msw/missing.h
View File

@ -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_

2
src/msw/display.cpp
View File

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

5
src/msw/ole/dataobj.cpp
View File

@ -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

2
src/msw/window.cpp
View File

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