X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69c4481222795d89f470020b63ec788bb717c0b3..75d3838010e2d8a9592a4a016e2994f4f0d3070b:/include/wx/motif/dcclient.h?ds=sidebyside diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h index a92cc083cb..ef1fabd10b 100644 --- a/include/wx/motif/dcclient.h +++ b/include/wx/motif/dcclient.h @@ -12,15 +12,15 @@ #ifndef _WX_DCCLIENT_H_ #define _WX_DCCLIENT_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "dcclient.h" #endif #include "wx/dc.h" -// ----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // fwd declarations -// ----------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- class WXDLLEXPORT wxWindowDC; class WXDLLEXPORT wxWindow; @@ -78,7 +78,7 @@ public: virtual void DestroyClippingRegion(); // Helper function for setting clipping - void SetDCClipping(); + void SetDCClipping(WXRegion region); // implementation from now on // -------------------------- @@ -140,19 +140,25 @@ protected: 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; - 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; - // int m_currentBkMode; int m_currentPenWidth ; int m_currentPenJoin ; int m_currentPenCap ;