added more HP-UX charset names

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

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index 4ead5fd1c11e3cc62d58be41789b9560fd142898..c8f182c135b3cebb6591badcc32c28efeeceb627 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -12,15 +12,11 @@
 #ifndef _WX_DCCLIENT_H_
 #define _WX_DCCLIENT_H_
 
-#ifdef __GNUG__
-    #pragma interface "dcclient.h"
-#endif
-
 #include "wx/dc.h"
 
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // fwd declarations
-// -----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 
 class WXDLLEXPORT wxWindowDC;
 class WXDLLEXPORT wxWindow;
@@ -64,10 +60,10 @@ public:
     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;
@@ -78,7 +74,7 @@ public:
     virtual void DestroyClippingRegion();
 
     // Helper function for setting clipping
-    void SetDCClipping();
+    void SetDCClipping(WXRegion region);
 
     // implementation from now on
     // --------------------------
@@ -86,12 +82,24 @@ public:
     WXGC GetGC() const { return m_gc; }
     WXGC GetBackingGC() const { return m_gcBacking; }
     WXDisplay* GetDisplay() const { return m_display; }
-    bool GetAutoSetting() const { return m_autoSetting; }
+    bool GetAutoSetting() const { return (m_autoSetting != 0); } // See comment in dcclient.cpp
     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 == 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;
 
@@ -99,15 +107,15 @@ protected:
     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);
@@ -116,41 +124,46 @@ protected:
     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, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+        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);
+        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 ;
     int          m_autoSetting ; // See comment in dcclient.cpp
-    WXFont       m_oldFont;
 };
 
 class WXDLLEXPORT wxPaintDC: public wxWindowDC
@@ -173,5 +186,5 @@ public:
     wxClientDC(wxWindow* win) : wxWindowDC(win) { }
 };
 
-#endif
-    // _WX_DCCLIENT_H_
+#endif // _WX_DCCLIENT_H_
+