clear up wxStringBuffer docs a bit

[wxWidgets.git] / include / wx / mgl / dc.h

diff --git a/include/wx/mgl/dc.h b/include/wx/mgl/dc.h
index 9e0cccd4548b065188e84e70f8956b6962461759..db07868a65ed8cfad356aaab1f5cd04e09b7fc1b 100644 (file)
--- a/include/wx/mgl/dc.h
+++ b/include/wx/mgl/dc.h
@@ -11,12 +11,11 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "dc.h"
 #endif
 
 #include "wx/defs.h"
-#include "wx/dc.h"
 #include "wx/region.h"
 
 //-----------------------------------------------------------------------------
@@ -29,6 +28,7 @@ class WXDLLEXPORT wxDC;
 // constants
 //-----------------------------------------------------------------------------
 
+#ifndef MM_TEXT
 #define MM_TEXT         0
 #define MM_ISOTROPIC    1
 #define MM_ANISOTROPIC  2
@@ -37,6 +37,7 @@ class WXDLLEXPORT wxDC;
 #define MM_TWIPS        5
 #define MM_POINTS       6
 #define MM_METRIC       7
+#endif
 
 //-----------------------------------------------------------------------------
 // wxDC