wxMGL compilation fixes

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

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index a92cc083cb3c091c1857b9ae4bcd87edc1ee394a..ed8539615b0e8300b365de1a01f59a0ef1d97683 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -12,15 +12,15 @@
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dcclient.h"
 #endif
 
 #include "wx/dc.h"
 
 #pragma interface "dcclient.h"
 #endif
 
 #include "wx/dc.h"
 

-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 // fwd declarations
 // fwd declarations

-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------

 
 class WXDLLEXPORT wxWindowDC;
 class WXDLLEXPORT wxWindow;
 
 class WXDLLEXPORT wxWindowDC;
 class WXDLLEXPORT wxWindow;


@@ -78,7 +78,7 @@ public:
     virtual void DestroyClippingRegion();
     
     // Helper function for setting clipping
     virtual void DestroyClippingRegion();
     
     // Helper function for setting clipping

-    void SetDCClipping();
+    void SetDCClipping(WXRegion region);

     
     // implementation from now on
     // --------------------------
     
     // implementation from now on
     // --------------------------


@@ -140,19 +140,25 @@ protected:
     virtual void DoDrawPolygon(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset,
         int fillStyle = wxODDEVEN_RULE);
     virtual void DoDrawPolygon(int n, wxPoint points[],
         wxCoord xoffset, wxCoord yoffset,
         int fillStyle = wxODDEVEN_RULE);

-    
+
+    void DoGetSize( int *width, int *height ) const;
+
+    // common part of constructors
+    void Init();
+

     WXGC         m_gc;
     WXGC         m_gcBacking;
     WXDisplay*   m_display;
     wxWindow*    m_window;
     WXGC         m_gc;
     WXGC         m_gcBacking;
     WXDisplay*   m_display;
     wxWindow*    m_window;

-    WXRegion     m_currentRegion; // Current clipping region (incl. paint clip region)
-    WXRegion     m_userRegion;    // User-defined clipping region
-    WXPixmap     m_pixmap;        // Pixmap for drawing on
-    
+    // Pixmap for drawing on
+    WXPixmap     m_pixmap;
+    // Last clipping region set on th GC, this is the combination
+    // of paint clipping region and all user-defined clipping regions
+    WXRegion     m_clipRegion;
+

     // Not sure if we'll need all of these
     int          m_backgroundPixel;
     wxColour     m_currentColour;
     // Not sure if we'll need all of these
     int          m_backgroundPixel;
     wxColour     m_currentColour;

-    //    int          m_currentBkMode;

     int          m_currentPenWidth ;
     int          m_currentPenJoin ;
     int          m_currentPenCap ;
     int          m_currentPenWidth ;
     int          m_currentPenJoin ;
     int          m_currentPenCap ;