Added wxTolBar::etMargins

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

diff --git a/include/wx/motif/dcclient.h b/include/wx/motif/dcclient.h
index 6784cda790f3bcae73c26857dba148aa75bd97d9..b683eb6b1c1523310e65416dd93630262a485d8c 100644 (file)
--- a/include/wx/motif/dcclient.h
+++ b/include/wx/motif/dcclient.h
@@ -43,7 +43,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC
     
     ~wxWindowDC(void);
     
     
     ~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 );
     virtual bool GetPixel( long x1, long y1, wxColour *col ) const;
 
     virtual void DrawLine( long x1, long y1, long x2, long y2 );


@@ -77,6 +77,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC
     virtual long GetCharHeight(void);
     
     virtual void Clear(void);
     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 );
             
     virtual void SetFont( const wxFont &font );
     virtual void SetPen( const wxPen &pen );


@@ -89,6 +90,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC
     virtual void SetPalette( const wxPalette& palette );
     
     virtual void SetClippingRegion( long x, long y, long width, long height );
     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 DrawSpline( wxList *points );
     virtual void DestroyClippingRegion(void);
     
     virtual void DrawSpline( wxList *points );


@@ -131,7 +133,8 @@ class WXDLLEXPORT wxPaintDC: public wxWindowDC
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 public:
   wxPaintDC() {}
   DECLARE_DYNAMIC_CLASS(wxPaintDC)
 public:
   wxPaintDC() {}

-  wxPaintDC(wxWindow* win): wxWindowDC(win) {}
+  wxPaintDC(wxWindow* win);
+  ~wxPaintDC();

 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC
 };
 
 class WXDLLEXPORT wxClientDC: public wxWindowDC