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

extracted code including gdiplus.h in a separate header

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-03-15 03:41:52 +00:00
parent 8c64c153a0
commit 0024ec5086
2 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
include/wx/msw/wrapgdip.h Normal file
View File

@@ -0,0 +1,32 @@
///////////////////////////////////////////////////////////////////////////////
// Name: wx/msw/wrapgdip.h
// Purpose: wrapper around <gdiplus.h> header
// Author: Vadim Zeitlin
// Created: 2007-03-15
// RCS-ID: $Id$
// Copyright: (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_MSW_WRAPGDIP_H_
#define _WX_MSW_WRAPGDIP_H_
#include "wx/msw/wrapwin.h"
// these macros must be defined before gdiplus.h is included but we explicitly
// prevent windows.h from defining them in wx/msw/wrapwin.h as they conflict
// with standard functions of the same name elsewhere, so we have to pay for it
// by manually redefining them ourselves here
#ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#include <gdiplus.h>
using namespace Gdiplus;
#endif // _WX_MSW_WRAPGDIP_H_

19
src/msw/graphics.cpp
View File

@@ -17,6 +17,8 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_GRAPHICS_CONTEXT
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/msw/wrapcdlg.h" #include "wx/msw/wrapcdlg.h"
#include "wx/image.h" #include "wx/image.h"
@@ -35,12 +37,12 @@
#include "wx/graphics.h" #include "wx/graphics.h"
#if wxUSE_GRAPHICS_CONTEXT
#include <vector> #include <vector>
using namespace std; using namespace std;
#include "wx/msw/wrapgdip.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// constants // constants
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -79,19 +81,6 @@ static inline double RadToDeg(double deg) { return (deg * 180.0) / M_PI; }
#include <commdlg.h> #include <commdlg.h>
#endif #endif
// TODO remove this dependency (gdiplus needs the macros)
#ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#include "gdiplus.h"
using namespace Gdiplus;
class WXDLLIMPEXP_CORE wxGDIPlusPathData : public wxGraphicsPathData class WXDLLIMPEXP_CORE wxGDIPlusPathData : public wxGraphicsPathData
{ {
public : public :