GetAsBitmap with subrect

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/dcmemory.h b/include/wx/gtk/dcmemory.h
index 0dbded2feba9bf658e6519f974f0cc4d147a0435..a8d6434ad39e65e083357b39d0ec0f2f7205bf18 100644 (file)
--- a/include/wx/gtk/dcmemory.h
+++ b/include/wx/gtk/dcmemory.h
@@ -47,6 +47,8 @@ public:
 
 protected:
     void DoGetSize( int *width, int *height ) const;
 
 protected:
     void DoGetSize( int *width, int *height ) const;

+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }

 
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };
 
     DECLARE_DYNAMIC_CLASS(wxMemoryDC)
 };

diff --git a/include/wx/mac/carbon/dcmemory.h b/include/wx/mac/carbon/dcmemory.h
index cc6d459e541c93b1f1f6214d7c3f1942762edd69..58a26fee28292f9bd947039c8ec32ae2a1af510d 100644 (file)
--- a/include/wx/mac/carbon/dcmemory.h
+++ b/include/wx/mac/carbon/dcmemory.h
@@ -23,11 +23,15 @@ class WXDLLEXPORT wxMemoryDC: public wxPaintDC
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );
     wxMemoryDC( wxDC *dc ); // Create compatible DC
     virtual ~wxMemoryDC(void);
     virtual void SelectObject( const wxBitmap& bitmap );

-       wxBitmap    GetSelectedBitmap() { return m_selected ; }
+    const wxBitmap& GetSelectedBitmap() const { return m_selected; }
+    wxBitmap    GetSelectedBitmap() { return m_selected; }
+

        wxBitmap    GetSelectedObject() { return GetSelectedBitmap() ; }
 
 protected:
     virtual void DoGetSize( int *width, int *height ) const;
        wxBitmap    GetSelectedObject() { return GetSelectedBitmap() ; }
 
 protected:
     virtual void DoGetSize( int *width, int *height ) const;

+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }

 
   private:
     wxBitmap  m_selected;
 
   private:
     wxBitmap  m_selected;

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 895aa8c50c27a857586b8d294474a120d9cbc1cb..0ab2cc622ec5e4611b3673f670cbc608a2d6db69 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -232,6 +232,8 @@ protected:
     virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
                                    wxCoord xoffset, wxCoord yoffset,
                                    int fillStyle = wxODDEVEN_RULE);
     virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
                                    wxCoord xoffset, wxCoord yoffset,
                                    int fillStyle = wxODDEVEN_RULE);

+    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const 
+    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }

 
 
 #if wxUSE_PALETTE
 
 
 #if wxUSE_PALETTE