Reverted conflict with Darwin.

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

diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h
index fb6316232e8bf120395fe75b0b88c8b9a539f717..f726723241011f2d4cf3d3e52e1dd4f6e1ae46b2 100644 (file)
--- a/include/wx/motif/dc.h
+++ b/include/wx/motif/dc.h
@@ -12,8 +12,8 @@
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 

-#ifdef __GNUG__
-    #pragma interface "dc.h"
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+#pragma interface "dc.h"

 #endif
 
 #include "wx/pen.h"
 #endif
 
 #include "wx/pen.h"


@@ -27,14 +27,14 @@
 //-----------------------------------------------------------------------------
 
 #ifndef MM_TEXT
 //-----------------------------------------------------------------------------
 
 #ifndef MM_TEXT

-    #define MM_TEXT         0
-    #define MM_ISOTROPIC    1
-    #define MM_ANISOTROPIC  2
-    #define MM_LOMETRIC     3
-    #define MM_HIMETRIC     4
-    #define MM_TWIPS        5
-    #define MM_POINTS       6
-    #define MM_METRIC       7
+#define MM_TEXT         0
+#define MM_ISOTROPIC    1
+#define MM_ANISOTROPIC  2
+#define MM_LOMETRIC     3
+#define MM_HIMETRIC     4
+#define MM_TWIPS        5
+#define MM_POINTS       6
+#define MM_METRIC       7

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -52,8 +52,6 @@ public:
     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 

-    virtual void DestroyClippingRegion();
-

     virtual wxSize GetPPI() const;
 
     virtual void SetMapMode(int mode);
     virtual wxSize GetPPI() const;
 
     virtual void SetMapMode(int mode);


@@ -66,10 +64,10 @@ public:
 protected:
     virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
 protected:
     virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,

-                              bool useMask = FALSE);
+        bool useMask = FALSE);

 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,

-                                     wxCoord width, wxCoord height);
+        wxCoord width, wxCoord height);

     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetSizeMM(int* width, int* height) const;
 


@@ -162,9 +160,7 @@ public:
     // recompute scale?
     bool         m_needComputeScaleX, m_needComputeScaleY;
 
     // recompute scale?
     bool         m_needComputeScaleX, m_needComputeScaleY;
 

-    // wxPSDC wants to have this. Will disappear.
-    float        m_scaleFactor;

 };
 
 #endif
 };
 
 #endif

-    // _WX_DC_H_
+// _WX_DC_H_