Added wxDC::GetAsBitmap, and implemented wxWindowDC::DoGetAsBitmap on OS X, in order to restore the ability to blit the contents of those DCs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -313,6 +313,11 @@ public: | ||||
|         return DoBlit(destPt.x, destPt.y, sz.x, sz.y, | ||||
|                       source, srcPt.x, srcPt.y, rop, useMask, srcPtMask.x, srcPtMask.y); | ||||
|     } | ||||
|      | ||||
|     wxBitmap GetAsBitmap() | ||||
|     { | ||||
|         return DoGetAsBitmap(); | ||||
|     } | ||||
|  | ||||
| #if wxUSE_SPLINES | ||||
|     // TODO: this API needs fixing (wxPointList, why (!const) "wxList *"?) | ||||
| @@ -712,6 +717,8 @@ protected: | ||||
|                         wxDC *source, wxCoord xsrc, wxCoord ysrc, | ||||
|                         int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord) = 0; | ||||
|  | ||||
|     virtual wxBitmap DoGetAsBitmap() const { return wxNullBitmap; } | ||||
|  | ||||
|     virtual void DoGetSize(int *width, int *height) const = 0; | ||||
|     virtual void DoGetSizeMM(int* width, int* height) const = 0; | ||||
|  | ||||
|   | ||||
| @@ -35,6 +35,7 @@ class WXDLLEXPORT wxWindowDC: public wxDC | ||||
|   wxWindow *GetWindow() const { return m_window; } | ||||
|   protected : | ||||
|     virtual void DoGetSize( int *width, int *height ) const; | ||||
|     virtual wxBitmap DoGetAsBitmap() const;  | ||||
|     wxWindow     *m_window; | ||||
| #if wxMAC_USE_CORE_GRAPHICS | ||||
| 	bool		m_release; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user