X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3e44503cf39acc2b36a3dc4457f045a23ad3455..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/gtk/dc.h?ds=sidebyside

diff --git a/include/wx/gtk/dc.h b/include/wx/gtk/dc.h
index bf3526f704..6022c4d728 100644
--- a/include/wx/gtk/dc.h
+++ b/include/wx/gtk/dc.h
@@ -11,7 +11,7 @@
 #ifndef __GTKDCH__
 #define __GTKDCH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -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
@@ -46,13 +48,10 @@ public:
 
     void SetColourMap( const wxPalette& palette ) { SetPalette(palette); };
 
-    // the first two must be overridden and called
-    virtual void DestroyClippingRegion();
-
     // 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() { }