Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wxRenderer for GTK+2 with wxGCDC created from wxMemoryDC

Browse Source 
See #18242
This commit is contained in:
Paul Cornett
2018-10-08 21:47:46 -07:00
parent 309f942aa6
commit 5d3d6135e0
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/gtk/renderer.cpp
View File

@@ -34,7 +34,11 @@
#include "wx/dcgraph.h" #include "wx/dcgraph.h"
#ifndef __WXGTK3__ #ifndef __WXGTK3__
#include "wx/gtk/dc.h" #include "wx/gtk/dc.h"
#if wxUSE_GRAPHICS_CONTEXT
#include <gdk/gdkx.h>
#include <cairo-xlib.h>
#endif
#endif #endif
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
@@ -166,14 +170,25 @@ static const GtkStateFlags stateTypeToFlags[] = {
#define NULL_RECT NULL, #define NULL_RECT NULL,
typedef GdkWindow wxGTKDrawable; typedef GdkWindow wxGTKDrawable;
static GdkWindow* wxGetGTKDrawable(wxWindow* win, wxDC& dc) static GdkWindow* wxGetGTKDrawable(wxWindow*, wxDC& dc)
{ {
GdkWindow* gdk_window = NULL; GdkWindow* gdk_window = NULL;
#if wxUSE_GRAPHICS_CONTEXT #if wxUSE_GRAPHICS_CONTEXT
if ( wxDynamicCast(&dc, wxGCDC) ) cairo_t* cr = NULL;
gdk_window = win->GTKGetDrawingWindow(); wxGraphicsContext* gc = dc.GetGraphicsContext();
else if (gc)
cr = static_cast<cairo_t*>(gc->GetNativeContext());
if (cr)
{
cairo_surface_t* surf = cairo_get_target(cr);
if (cairo_surface_get_type(surf) == CAIRO_SURFACE_TYPE_XLIB)
{
gdk_window = static_cast<GdkWindow*>(
gdk_xid_table_lookup(cairo_xlib_surface_get_drawable(surf)));
}
}
if (gdk_window == NULL)
#endif #endif
{ {
wxDCImpl *impl = dc.GetImpl(); wxDCImpl *impl = dc.GetImpl();
@@ -184,10 +199,6 @@ static GdkWindow* wxGetGTKDrawable(wxWindow* win, wxDC& dc)
wxFAIL_MSG("cannot use wxRendererNative on wxDC of this type"); wxFAIL_MSG("cannot use wxRendererNative on wxDC of this type");
} }
#if !wxUSE_GRAPHICS_CONTEXT
wxUnusedVar(win);
#endif
return gdk_window; return gdk_window;
} }
#endif #endif