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

Applied patch [ 1039940 ] Prevent redefinition of MM_xxx mapping mode constants

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2004-10-07 16:42:11 +00:00
parent fd76d9633a
commit d2b1753d16
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/gtk/dc.h
View File

@@ -25,6 +25,7 @@ class wxDC;
// constants // constants
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MM_TEXT
#define MM_TEXT 0 #define MM_TEXT 0
#define MM_ISOTROPIC 1 #define MM_ISOTROPIC 1
#define MM_ANISOTROPIC 2 #define MM_ANISOTROPIC 2
@@ -33,6 +34,7 @@ class wxDC;
#define MM_TWIPS 5 #define MM_TWIPS 5
#define MM_POINTS 6 #define MM_POINTS 6
#define MM_METRIC 7 #define MM_METRIC 7
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDC // wxDC

2
include/wx/gtk1/dc.h
View File

@@ -25,6 +25,7 @@ class wxDC;
// constants // constants
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MM_TEXT
#define MM_TEXT 0 #define MM_TEXT 0
#define MM_ISOTROPIC 1 #define MM_ISOTROPIC 1
#define MM_ANISOTROPIC 2 #define MM_ANISOTROPIC 2
@@ -33,6 +34,7 @@ class wxDC;
#define MM_TWIPS 5 #define MM_TWIPS 5
#define MM_POINTS 6 #define MM_POINTS 6
#define MM_METRIC 7 #define MM_METRIC 7
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDC // wxDC

2
include/wx/mgl/dc.h
View File

@@ -28,6 +28,7 @@ class WXDLLEXPORT wxDC;
// constants // constants
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MM_TEXT
#define MM_TEXT 0 #define MM_TEXT 0
#define MM_ISOTROPIC 1 #define MM_ISOTROPIC 1
#define MM_ANISOTROPIC 2 #define MM_ANISOTROPIC 2
@@ -36,6 +37,7 @@ class WXDLLEXPORT wxDC;
#define MM_TWIPS 5 #define MM_TWIPS 5
#define MM_POINTS 6 #define MM_POINTS 6
#define MM_METRIC 7 #define MM_METRIC 7
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxDC // wxDC