X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/16c1f7f345e1850f590cfbf67c3b00fbb6d2e62e..8853b9a80e58b01a77700cb28c560ba3c1b033ce:/include/wx/motif/dcclient.h

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index a4d303e885..fc256e3e4d 100644
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -43,7 +43,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC
     
     ~wxWindowDC(void);
     
-    virtual void FloodFill( long x1, long y1, wxColour* col, int style=wxFLOOD_SURFACE );
+    virtual void FloodFill( long x1, long y1, const wxColour& col, int style=wxFLOOD_SURFACE );
     virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
 
     virtual void DrawLine( long x1, long y1, long x2, long y2 );
@@ -64,7 +64,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC
     virtual void DrawEllipse( long x, long y, long width, long height );
     
     virtual bool CanDrawBitmap(void) const;
-    virtual void DrawIcon( const wxIcon &icon, long x, long y, bool useMask=FALSE );
+    virtual void DrawIcon( const wxIcon &icon, long x, long y);
     virtual bool Blit( long xdest, long ydest, long width, long height,
        wxDC *source, long xsrc, long ysrc, int logical_func = wxCOPY, bool useMask=FALSE );
 
@@ -77,6 +77,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC
     virtual long GetCharHeight(void);
     
     virtual void Clear(void);
+    virtual void Clear(const wxRect& rect);
             
     virtual void SetFont( const wxFont &font );
     virtual void SetPen( const wxPen &pen );
@@ -89,13 +90,19 @@ class WXDLLEXPORT wxWindowDC: public wxDC
     virtual void SetPalette( const wxPalette& palette );
     
     virtual void SetClippingRegion( long x, long y, long width, long height );
+    virtual void SetClippingRegion( const wxRegion& region );
     virtual void DestroyClippingRegion(void);
     
-    virtual void DrawOpenSpline( wxList *points );
+    virtual void DrawSpline( wxList *points );
 
     // Motif-specific
     void SetDCClipping (); // Helper function for setting clipping
 
+    inline WXGC GetGC() const { return m_gc; }
+    inline WXDisplay* GetDisplay() const { return m_display; }
+    inline bool GetAutoSetting() const { return m_autoSetting; }
+    inline void SetAutoSetting(bool flag) { m_autoSetting = flag; }
+
 protected:
     WXGC         m_gc;
     WXGC         m_gcBacking;
@@ -118,6 +125,7 @@ protected:
     int          m_currentStyle ;
     int          m_currentFill ;
     int          m_autoSetting ; // See comment in dcclient.cpp
+    WXFont       m_oldFont;
 };
 
 class WXDLLEXPORT wxPaintDC: public wxWindowDC
@@ -125,7 +133,8 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 public:
   wxPaintDC() {}
-  wxPaintDC(wxWindow* win): wxWindowDC(win) {}
+  wxPaintDC(wxWindow* win);
+  ~wxPaintDC();
 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC