From 5d3d6135e07741c630992afdf26e11e2d27c132d Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Mon, 8 Oct 2018 21:47:46 -0700
Subject: [PATCH] Fix wxRenderer for GTK+2 with wxGCDC created from wxMemoryDC

See #18242
---
 src/gtk/renderer.cpp | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp
index 55ad311725..32433bdf0e 100644
--- a/src/gtk/renderer.cpp
+++ b/src/gtk/renderer.cpp
@@ -34,7 +34,11 @@
 
 #include "wx/dcgraph.h"
 #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
 
 #include "wx/gtk/private.h"
@@ -166,14 +170,25 @@ static const GtkStateFlags stateTypeToFlags[] = {
 #define NULL_RECT NULL,
 typedef GdkWindow wxGTKDrawable;
 
-static GdkWindow* wxGetGTKDrawable(wxWindow* win, wxDC& dc)
+static GdkWindow* wxGetGTKDrawable(wxWindow*, wxDC& dc)
 {
     GdkWindow* gdk_window = NULL;
 
 #if wxUSE_GRAPHICS_CONTEXT
-    if ( wxDynamicCast(&dc, wxGCDC) )
-        gdk_window = win->GTKGetDrawingWindow();
-    else
+    cairo_t* cr = NULL;
+    wxGraphicsContext* gc = dc.GetGraphicsContext();
+    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
     {
         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");
     }
 
-#if !wxUSE_GRAPHICS_CONTEXT
-    wxUnusedVar(win);
-#endif
-
     return gdk_window;
 }
 #endif