Minor corrections to make dist after reports

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

diff --git a/include/wx/gtk/dcclient.h b/include/wx/gtk/dcclient.h
index 9a3a13d1a4c60c336d5421a2b627937004740bcd..04d3e3b1ae0bb9460cf6b311815404249ce31625 100644 (file)
--- a/include/wx/gtk/dcclient.h
+++ b/include/wx/gtk/dcclient.h
@@ -28,10 +28,6 @@ public:
 
     virtual ~wxWindowDCImpl();
 
-#if wxUSE_GRAPHICS_CONTEXT
-    virtual wxGraphicsContext* CreateGraphicsContext();
-#endif
-
     virtual bool CanDrawBitmap() const { return true; }
     virtual bool CanGetTextExtent() const { return true; }
 
@@ -75,7 +71,7 @@ public:
                                 const wxFont *theFont = (wxFont *) NULL) const;
     virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
     virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height );
-    virtual void DoSetClippingRegionAsRegion( const wxRegion &region );
+    virtual void DoSetDeviceClippingRegion( const wxRegion &region );
 
     virtual wxCoord GetCharWidth() const;
     virtual wxCoord GetCharHeight() const;
@@ -123,7 +119,7 @@ public:
 
     void SetUpDC( bool ismem = false );
     void Destroy();
-    
+
     virtual void ComputeScaleAndOrigin();
 
     virtual GdkWindow *GetGDKWindow() const { return m_gdkwindow; }
@@ -131,6 +127,25 @@ public:
 private:
     void DrawingSetup(GdkGC*& gc, bool& originChanged);
 
+    // return true if the rectangle specified by the parameters is entirely
+    // outside of the current clipping region
+    bool IsOutsideOfClippingRegion(int x, int y, int w, int h);
+
+    // remove the current clipping mask and set the clipping region
+    void RemoveClipMask(GdkGC *gc);
+
+    // return the mask equal to the intersection of the original one with the
+    // clipping region
+    GdkBitmap *GetClippedMask(GdkBitmap *mask, int w, int h,
+                              int x, int y,
+                              int xsrcMask, int ysrcMask);
+
+    void DoDrawMonoBitmap(const wxBitmap& bitmap,
+                          int bmp_w, int bmp_h,
+                          int xsrc, int ysrc,
+                          int xdest, int ydest,
+                          int width, int height);
+
     DECLARE_ABSTRACT_CLASS(wxWindowDCImpl)
 };