Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't compile DirectDraw code when wxUSE_DIRECTDRAW==0 (patch 1461271); set wxUSE_DIRECTDRAW to 0 by default

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38457 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-30 23:49:34 +00:00
parent 82d492f145
commit b3825734fc
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/msw/display.cpp
View File

@@ -39,18 +39,12 @@
#include "wx/display.h" #include "wx/display.h"
#include "wx/display_impl.h" #include "wx/display_impl.h"
// Mingw's w32api headers don't include ddraw.h, though the user may have // define this to use DirectDraw for display mode switching: this is disabled
// installed it. If using configure, we actually probe for ddraw.h there // by default because ddraw.h is now always available and also it's not really
// and set wxUSE_DIRECTDRAW. Otherwise, assume we don't have it if using // clear what are the benefits of using DirectDraw compared to the standard API
// the w32api headers, and that we do otherwise.
#if !defined HAVE_W32API_H && !defined HAVE_DDRAW_H
#define HAVE_DDRAW_H
#endif
// user may disable compilation of DirectDraw code by setting #if !defined(wxUSE_DIRECTDRAW)
// wxUSE_DIRECTDRAW to 0 in the makefile/project settings #define wxUSE_DIRECTDRAW 0
#if defined(HAVE_DDRAW_H) && !defined(wxUSE_DIRECTDRAW)
#define wxUSE_DIRECTDRAW 1
#endif #endif
#ifndef __WXWINCE__ #ifndef __WXWINCE__
@@ -80,13 +74,13 @@
#endif #endif
#endif // !__WXWINCE__ #endif // !__WXWINCE__
#ifdef wxUSE_DIRECTDRAW #if wxUSE_DIRECTDRAW
#include <ddraw.h> #include <ddraw.h>
// we don't want to link with ddraw.lib which contains the real // we don't want to link with ddraw.lib which contains the real
// IID_IDirectDraw2 definition // IID_IDirectDraw2 definition
const GUID wxIID_IDirectDraw2 = const GUID wxIID_IDirectDraw2 =
{ 0xB3A6F3E0, 0x2B43, 0x11CF, { 0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 } }; { 0xB3A6F3E0, 0x2B43, 0x11CF, { 0xA2,0xDE,0x00,0xAA,0x00,0xB9,0x33,0x56 } };
#endif // wxUSE_DIRECTDRAW #endif // wxUSE_DIRECTDRAW
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -99,7 +93,7 @@ typedef LONG (WINAPI *ChangeDisplaySettingsEx_t)(LPCTSTR lpszDeviceName,
DWORD dwFlags, DWORD dwFlags,
LPVOID lParam); LPVOID lParam);
#ifdef wxUSE_DIRECTDRAW #if wxUSE_DIRECTDRAW
typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid, typedef BOOL (PASCAL *DDEnumExCallback_t)(GUID *pGuid,
LPTSTR driverDescription, LPTSTR driverDescription,
LPTSTR driverName, LPTSTR driverName,
@@ -297,7 +291,7 @@ private:
// wxDisplay implementation using DirectDraw // wxDisplay implementation using DirectDraw
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#ifdef wxUSE_DIRECTDRAW #if wxUSE_DIRECTDRAW
struct wxDisplayInfoDirectDraw : wxDisplayInfo struct wxDisplayInfoDirectDraw : wxDisplayInfo
{ {
@@ -396,7 +390,7 @@ private:
// and another using DirectDraw, the choice between them is done using a // and another using DirectDraw, the choice between them is done using a
// system option // system option
#ifdef wxUSE_DIRECTDRAW #if wxUSE_DIRECTDRAW
if ( wxSystemOptions::GetOptionInt(_T("msw.display.directdraw")) ) if ( wxSystemOptions::GetOptionInt(_T("msw.display.directdraw")) )
{ {
wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw; wxDisplayFactoryDirectDraw *factoryDD = new wxDisplayFactoryDirectDraw;