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

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 1bc4d18c56c24f4d4992f2738d369d19d6858afb..84c79d735301f0e7284814129f737d95b7c2b189 100644 (file)
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -25,6 +25,7 @@ class wxDC;
 // constants
 //-----------------------------------------------------------------------------
 
+#ifndef MM_TEXT
 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2
@@ -33,6 +34,7 @@ class wxDC;
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7
+#endif
 
 //-----------------------------------------------------------------------------
 // wxDC

diff --git a/include/wx/gtk1/dc.h b/include/wx/gtk1/dc.h
index 1bc4d18c56c24f4d4992f2738d369d19d6858afb..84c79d735301f0e7284814129f737d95b7c2b189 100644 (file)
--- a/include/wx/gtk1/dc.h
+++ b/include/wx/gtk1/dc.h
@@ -25,6 +25,7 @@ class wxDC;
 // constants
 //-----------------------------------------------------------------------------
 
+#ifndef MM_TEXT
 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2
@@ -33,6 +34,7 @@ class wxDC;
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7
+#endif
 
 //-----------------------------------------------------------------------------
 // wxDC

diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
index 7ac52ee1f54ec63ae059dab1eb30d7564ed742ac..db07868a65ed8cfad356aaab1f5cd04e09b7fc1b 100644 (file)
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@@ -28,6 +28,7 @@ class WXDLLEXPORT wxDC;
 // constants
 //-----------------------------------------------------------------------------
 
+#ifndef MM_TEXT
 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2
@@ -36,6 +37,7 @@ class WXDLLEXPORT wxDC;
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7
+#endif
 
 //-----------------------------------------------------------------------------
 // wxDC