Support for G_FILENAME_ENCODING=@locale

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

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index 1bc4d18c56c24f4d4992f2738d369d19d6858afb..6022c4d72821a6eb0bb52497b1f8fdd3e2357ae4 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
@@ -49,7 +51,7 @@ public:
     // Resolution in pixels per logical inch
     virtual wxSize GetPPI() const;
 
-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; }
+    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }
     virtual void EndDoc() { }
     virtual void StartPage() { }
     virtual void EndPage() { }