X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/include/wx/motif/dcclient.h

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index ec974c1bb3..fa04c08521 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(NO_GCC_PRAGMA)
 #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
     // --------------------------
@@ -90,7 +90,19 @@ public:
     void SetAutoSetting(bool flag) { m_autoSetting = flag; }
     
 protected:
-    virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+    // note that this function will call colour.SetPixel,
+    // and will do one of curCol = colour, curCol = wxWHITE, curCol = wxBLACK
+    // roundToWhite has an effect for monochrome display only
+    // if roundToWhite == true then the colour will be set to white unless
+    // it is RGB 0x000000;if roundToWhite == true the colour wull be set to
+    // black unless it id RGB 0xffffff
+    int CalculatePixel(wxColour& colour, wxColour& curCol,
+                       bool roundToWhite) const;
+    // sets the foreground pixel taking into account the
+    // currently selected logical operation
+    void SetForegroundPixelWithLogicalFunction(int pixel);
+
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
         int style = wxFLOOD_SURFACE);
     
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
@@ -117,7 +129,7 @@ protected:
     
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
         wxDC *source, wxCoord xsrc, wxCoord ysrc,
-        int rop = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
     
     virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
@@ -128,24 +140,30 @@ 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 ;
     int          m_currentPenDashCount ;
-    wxMOTIFDash* m_currentPenDash ;
+    wxX11Dash*   m_currentPenDash ;
     wxBitmap     m_currentStipple ;
     int          m_currentStyle ;
     int          m_currentFill ;