Added wxDC::CreateGraphicsContext and implemented it for a few DCs

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-04-25 11:05:16 +00:00
parent 4c7b80fb91
commit 2b44ffc0e7
11 changed files with 99 additions and 0 deletions

View File

@@ -31,6 +31,11 @@
#include <gdk/gdkx.h>
#if wxUSE_GRAPHICS_CONTEXT
#include "wx/graphics.h"
#endif
//-----------------------------------------------------------------------------
// local defines
//-----------------------------------------------------------------------------
@@ -365,6 +370,14 @@ wxWindowDCImpl::~wxWindowDCImpl()
pango_font_description_free( m_fontdesc );
}
#if wxUSE_GRAPHICS_CONTEXT
wxGraphicsContext* wxWindowDCImpl::CreateGraphicsContext()
{
wxWindowDC *windowdc = (wxWindowDC*) GetOwner();
return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext( *windowdc );
}
#endif
void wxWindowDCImpl::SetUpDC( bool isMemDC )
{
m_ok = true;

View File

@@ -16,6 +16,10 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#if wxUSE_GRAPHICS_CONTEXT
#include "wx/graphics.h"
#endif
//-----------------------------------------------------------------------------
// wxMemoryDCImpl
//-----------------------------------------------------------------------------
@@ -60,6 +64,14 @@ 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();

View File

@@ -39,6 +39,10 @@
#include <gtk/gtk.h>
#include <gtk/gtkpagesetupunixdialog.h>
#if wxUSE_GRAPHICS_CONTEXT
#include "wx/graphics.h"
#endif
#include "wx/link.h"
wxFORCE_LINK_THIS_MODULE(gtk_print)
@@ -1155,6 +1159,13 @@ bool wxGtkPrinterDCImpl::IsOk() const
return m_gpc != NULL;
}
#if wxUSE_GRAPHICS_CONTEXT
wxGraphicsContext* wxGtkPrinterDCImpl::CreateGraphicsContext()
{
return wxGraphicsRenderer::GetDefaultRenderer()->CreateContextFromNativeContext( (void*) m_cairo );
}
#endif
bool wxGtkPrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
wxCoord WXUNUSED(y1),
const wxColour& WXUNUSED(col),

View File

@@ -33,6 +33,10 @@
#include "wx/window.h"
#endif
#if wxUSE_GRAPHICS_CONTEXT
#include "wx/graphics.h"
#endif
#include "wx/msw/private.h"
// ----------------------------------------------------------------------------
@@ -118,6 +122,14 @@ void wxWindowDCImpl::InitDC()
#endif
}
#if wxUSE_GRAPHICS_CONTEXT
wxGraphicsContext* wxWindowDCImpl::CreateGraphicsContext()
{
wxWindowDC *windowdc = (wxWindowDC*) GetOwner();
return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext( *windowdc );
}
#endif
void wxWindowDCImpl::DoGetSize(int *width, int *height) const
{
wxCHECK_RET( m_window, _T("wxWindowDCImpl without a window?") );

View File

@@ -32,6 +32,10 @@
#include "wx/log.h"
#endif
#if wxUSE_GRAPHICS_CONTEXT
#include "wx/graphics.h"
#endif
#include "wx/msw/private.h"
// ----------------------------------------------------------------------------
@@ -78,6 +82,14 @@ void wxMemoryDCImpl::Init()
}
}
#if wxUSE_GRAPHICS_CONTEXT
wxGraphicsContext* wxMemoryDCImpl::CreateGraphicsContext()
{
wxMemoryDC *memdc = (wxMemoryDC*) GetOwner();
return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext( *memdc );
}
#endif
bool wxMemoryDCImpl::CreateCompatible(wxDC *dc)
{
wxDCImpl *impl = dc ? dc->GetImpl() : NULL ;