X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7b65ea1af911e4ba65c47e2ed4f3138367b2bdbb..a31a5f85341a2ef131d86a1dee12f3d6c8156118:/include/wx/motif/dcclient.h?ds=inline

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index 4edf65a924..a92cc083cb 100644
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -13,7 +13,7 @@
 #define _WX_DCCLIENT_H_
 
 #ifdef __GNUG__
-    #pragma interface "dcclient.h"
+#pragma interface "dcclient.h"
 #endif
 
 #include "wx/dc.h"
@@ -35,21 +35,21 @@ class WXDLLEXPORT wxWindow;
 class WXDLLEXPORT wxWindowDC : public wxDC
 {
     DECLARE_DYNAMIC_CLASS(wxWindowDC)
-
+        
 public:
     wxWindowDC();
     wxWindowDC( wxWindow *win );
-
+    
     ~wxWindowDC();
-
+    
     // TODO this function is Motif-only for now - should it go into base class?
     void Clear(const wxRect& rect);
-
+    
     // implement base class pure virtuals
     // ----------------------------------
-
+    
     virtual void Clear();
-
+    
     virtual void SetFont(const wxFont& font);
     virtual void SetPen(const wxPen& pen);
     virtual void SetBrush(const wxBrush& brush);
@@ -57,81 +57,90 @@ public:
     virtual void SetBackgroundMode(int mode);
     virtual void SetPalette(const wxPalette& palette);
     virtual void SetLogicalFunction( int function );
-
+    
     virtual void SetTextForeground(const wxColour& colour);
     virtual void SetTextBackground(const wxColour& colour);
-
+    
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;
     virtual void DoGetTextExtent(const wxString& string,
-                                 wxCoord *x, wxCoord *y,
-                                 wxCoord *descent = NULL,
-                                 wxCoord *externalLeading = NULL,
-                                 wxFont *theFont = NULL) const;
-
+        wxCoord *x, wxCoord *y,
+        wxCoord *descent = NULL,
+        wxCoord *externalLeading = NULL,
+        wxFont *theFont = NULL) const;
+    
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;
-
+    
     virtual int GetDepth() const;
     virtual wxSize GetPPI() const;
-
+    
     virtual void DestroyClippingRegion();
-
+    
     // Helper function for setting clipping
     void SetDCClipping();
-
+    
     // implementation from now on
     // --------------------------
-
+    
     WXGC GetGC() const { return m_gc; }
     WXGC GetBackingGC() const { return m_gcBacking; }
     WXDisplay* GetDisplay() const { return m_display; }
     bool GetAutoSetting() const { return m_autoSetting; }
     void SetAutoSetting(bool flag) { m_autoSetting = flag; }
-
+    
 protected:
-    virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             int style = wxFLOOD_SURFACE);
-
+    // 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 == FALSE 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;
-
+    
     virtual void DoDrawPoint(wxCoord x, wxCoord y);
     virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
-
+    
     virtual void DoDrawArc(wxCoord x1, wxCoord y1,
-                           wxCoord x2, wxCoord y2,
-                           wxCoord xc, wxCoord yc);
+        wxCoord x2, wxCoord y2,
+        wxCoord xc, wxCoord yc);
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-                                   double sa, double ea);
-
+        double sa, double ea);
+    
     virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
     virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-                                        wxCoord width, wxCoord height,
-                                        double radius);
+        wxCoord width, wxCoord height,
+        double radius);
     virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-
+    
     virtual void DoCrossHair(wxCoord x, wxCoord y);
-
+    
     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-
+    virtual void DoDrawRotatedText(const wxString &text, wxCoord x, wxCoord y, double angle);
+    
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-            wxDC *source, wxCoord xsrc, wxCoord ysrc,
-            int rop = wxCOPY, bool useMask = FALSE);
-
+        wxDC *source, wxCoord xsrc, wxCoord ysrc,
+        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,
-            wxCoord width, wxCoord height);
-
+        wxCoord width, wxCoord height);
+    
     virtual void DoDrawLines(int n, wxPoint points[],
-            wxCoord xoffset, wxCoord yoffset);
+        wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
-            wxCoord xoffset, wxCoord yoffset,
-            int fillStyle = wxODDEVEN_RULE);
-
-#if wxUSE_SPLINES
-    virtual void DoDrawSpline(wxList *points);
-#endif // wxUSE_SPLINES
-
+        wxCoord xoffset, wxCoord yoffset,
+        int fillStyle = wxODDEVEN_RULE);
+    
     WXGC         m_gc;
     WXGC         m_gcBacking;
     WXDisplay*   m_display;
@@ -139,7 +148,7 @@ protected:
     WXRegion     m_currentRegion; // Current clipping region (incl. paint clip region)
     WXRegion     m_userRegion;    // User-defined clipping region
     WXPixmap     m_pixmap;        // Pixmap for drawing on
-
+    
     // Not sure if we'll need all of these
     int          m_backgroundPixel;
     wxColour     m_currentColour;
@@ -148,7 +157,7 @@ protected:
     int          m_currentPenJoin ;
     int          m_currentPenCap ;
     int          m_currentPenDashCount ;
-    char*        m_currentPenDash ;
+    wxX11Dash*   m_currentPenDash ;
     wxBitmap     m_currentStipple ;
     int          m_currentStyle ;
     int          m_currentFill ;
@@ -159,22 +168,22 @@ protected:
 class WXDLLEXPORT wxPaintDC: public wxWindowDC
 {
     DECLARE_DYNAMIC_CLASS(wxPaintDC)
-
+        
 public:
     wxPaintDC() { }
     wxPaintDC(wxWindow* win);
-
+    
     ~wxPaintDC();
 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC
 {
     DECLARE_DYNAMIC_CLASS(wxClientDC)
-
+        
 public:
     wxClientDC() { }
     wxClientDC(wxWindow* win) : wxWindowDC(win) { }
 };
 
 #endif
-    // _WX_DCCLIENT_H_
+// _WX_DCCLIENT_H_