X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b44ffc0e77a8db603b3aba597e4c4df2e2e518f..4776c0b783a9776f94b049aecdc253d379686b6b:/src/gtk/dcmemory.cpp?ds=sidebyside diff --git a/src/gtk/dcmemory.cpp b/src/gtk/dcmemory.cpp index d77d307dc5..4590917127 100644 --- a/src/gtk/dcmemory.cpp +++ b/src/gtk/dcmemory.cpp @@ -16,27 +16,23 @@ #include #include -#if wxUSE_GRAPHICS_CONTEXT -#include "wx/graphics.h" -#endif - //----------------------------------------------------------------------------- // wxMemoryDCImpl //----------------------------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxMemoryDCImpl, wxWindowDCImpl) -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) +wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner ) : wxWindowDCImpl( owner ) -{ - Init(); +{ + Init(); } -wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap) +wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap) : wxWindowDCImpl( owner ) -{ - Init(); - DoSelect(bitmap); +{ + Init(); + DoSelect(bitmap); } wxMemoryDCImpl::wxMemoryDCImpl( wxMemoryDC *owner, wxDC *WXUNUSED(dc) ) @@ -64,14 +60,6 @@ void wxMemoryDCImpl::Init() m_fontdesc = pango_font_description_copy( pango_context_get_font_description( m_context ) ); } -#if wxUSE_GRAPHICS_CONTEXT -wxGraphicsContext* wxMemoryDCImpl::CreateGraphicsContext() -{ - wxMemoryDC *memdc = (wxMemoryDC*) GetOwner(); - return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext( *memdc ); -} -#endif - void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) { Destroy(); @@ -88,7 +76,7 @@ void wxMemoryDCImpl::DoSelect( const wxBitmap& bitmap ) else { m_ok = false; - m_gdkwindow = (GdkWindow *) NULL; + m_gdkwindow = NULL; } }