X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af0bb3b161bc687d4a53a83c930c807bfa300a2d..9f4de6b2cf06f53a98b28f53640f3b9ec8cf4182:/include/wx/motif/dcclient.h

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index c7d6c2c205..5288b91763 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,84 +57,78 @@ 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 long GetCharHeight() const;
-    virtual long GetCharWidth() const;
-    virtual void GetTextExtent(const wxString& string,
-                               long *x, long *y,
-                               long *descent = NULL,
-                               long *externalLeading = NULL,
-                               wxFont *theFont = NULL) const;
-
+    
+    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;
+    
     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(long x, long y, const wxColour& col,
-                             int style = wxFLOOD_SURFACE);
-
-    virtual bool DoGetPixel(long x, long y, wxColour *col) const;
-
-    virtual void DoDrawPoint(long x, long y);
-    virtual void DoDrawLine(long x1, long y1, long x2, long y2);
-
-    virtual void DoDrawArc(long x1, long y1,
-                           long x2, long y2,
-                           long xc, long yc);
-    virtual void DoDrawEllipticArc(long x, long y, long w, long h,
-                                   double sa, double ea);
-
-    virtual void DoDrawRectangle(long x, long y, long width, long height);
-    virtual void DoDrawRoundedRectangle(long x, long y,
-                                        long width, long height,
-                                        double radius);
-    virtual void DoDrawEllipse(long x, long y, long width, long height);
-
-    virtual void DoCrossHair(long x, long y);
-
-    virtual void DoDrawText(const wxString& text, long x, long y);
-
-    virtual bool DoBlit(long xdest, long ydest, long width, long height,
-            wxDC *source, long xsrc, long ysrc,
-            int rop = wxCOPY, bool useMask = FALSE);
-
+    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);
+    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+        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);
+    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, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+    
     virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
-    virtual void DoSetClippingRegion(long x, long y,
-            long width, long height);
-
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetSizeMM(int* width, int* height) const;
-
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
+        wxCoord width, wxCoord height);
+    
     virtual void DoDrawLines(int n, wxPoint points[],
-            long xoffset, long yoffset);
+        wxCoord xoffset, wxCoord yoffset);
     virtual void DoDrawPolygon(int n, wxPoint points[],
-            long xoffset, long 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;
@@ -142,7 +136,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;
@@ -151,7 +145,7 @@ protected:
     int          m_currentPenJoin ;
     int          m_currentPenCap ;
     int          m_currentPenDashCount ;
-    char*        m_currentPenDash ;
+    wxMOTIFDash* m_currentPenDash ;
     wxBitmap     m_currentStipple ;
     int          m_currentStyle ;
     int          m_currentFill ;
@@ -162,22 +156,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_