From d2b1753d162aa390080a005fcf3e8bbf7bf966a8 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 7 Oct 2004 16:42:11 +0000
Subject: [PATCH] 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
---
 include/wx/gtk/dc.h  | 2 ++
 include/wx/gtk1/dc.h | 2 ++
 include/wx/mgl/dc.h  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 1bc4d18c56..84c79d7353 100644
--- 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 1bc4d18c56..84c79d7353 100644
--- 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 7ac52ee1f5..db07868a65 100644
--- 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