From 882957a2d3ebaa84bafb3e1dfe672974bc52e586 Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Wed, 28 Jun 2023 21:08:57 +0000
Subject: [PATCH] Override SetCurrent() in GLDrawingPanel

Make a bool SetCurrent() wrapper over checking the wxGL_IMPLICIT_CONTEXT
define and executing the appropriate behavior to set the OpenGL context.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
---
 src/wx/drawing.h |  1 +
 src/wx/panel.cpp | 28 +++++++++++-----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/wx/drawing.h b/src/wx/drawing.h
index 2c689675..def47591 100644
--- a/src/wx/drawing.h
+++ b/src/wx/drawing.h
@@ -41,6 +41,7 @@ protected:
 #ifndef wxGL_IMPLICIT_CONTEXT
     wxGLContext* ctx;
 #endif
+    bool SetCurrent();
     void DrawingPanelInit();
     GLuint texid, vlist;
     int texsize;
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index 639df4d6..d2722467 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -2183,6 +2183,15 @@ static int glopts[] = {
     WX_GL_RGBA, WX_GL_DOUBLEBUFFER, 0
 };
 
+bool GLDrawingPanel::SetCurrent()
+{
+#ifndef wxGL_IMPLICIT_CONTEXT
+    return wxGLCanvas::SetCurrent(*ctx);
+#else
+    return wxGLContext::SetCurrent(*this);
+#endif
+}
+
 GLDrawingPanel::GLDrawingPanel(wxWindow* parent, int _width, int _height)
     : DrawingPanelBase(_width, _height)
     , wxglc(parent, wxID_ANY, glopts, wxPoint(0, 0), parent->GetClientSize(),
@@ -2191,8 +2200,8 @@ GLDrawingPanel::GLDrawingPanel(wxWindow* parent, int _width, int _height)
     widgets::RequestHighResolutionOpenGlSurfaceForWindow(this);
 #ifndef wxGL_IMPLICIT_CONTEXT
     ctx = new wxGLContext(this);
-    SetCurrent(*ctx);
 #endif
+    SetCurrent();
     if (!did_init) DrawingPanelInit();
 }
 
@@ -2202,11 +2211,7 @@ GLDrawingPanel::~GLDrawingPanel()
     // it's also unsafe if panel no longer displayed
     if (did_init)
     {
-#ifndef wxGL_IMPLICIT_CONTEXT
-        SetCurrent(*ctx);
-#else
         SetCurrent();
-#endif
         glDeleteLists(vlist, 1);
         glDeleteTextures(1, &texid);
     }
@@ -2218,11 +2223,7 @@ GLDrawingPanel::~GLDrawingPanel()
 
 void GLDrawingPanel::DrawingPanelInit()
 {
-#ifndef wxGL_IMPLICIT_CONTEXT
-    SetCurrent(*ctx);
-#else
     SetCurrent();
-#endif
 
     DrawingPanelBase::DrawingPanelInit();
 
@@ -2360,6 +2361,7 @@ void GLDrawingPanel::DrawingPanelInit()
 
 void GLDrawingPanel::OnSize(wxSizeEvent& ev)
 {
+    SetCurrent();
     AdjustViewport();
 
     // Temporary hack to backport 800d6ed69b from wxWidgets until 3.2.2 is released.
@@ -2371,11 +2373,7 @@ void GLDrawingPanel::OnSize(wxSizeEvent& ev)
 
 void GLDrawingPanel::AdjustViewport()
 {
-#ifndef wxGL_IMPLICIT_CONTEXT
-    SetCurrent(*ctx);
-#else
     SetCurrent();
-#endif
 
     int x, y;
     widgets::GetRealPixelClientSize(this, &x, &y);
@@ -2392,11 +2390,7 @@ void GLDrawingPanel::AdjustViewport()
 void GLDrawingPanel::DrawArea(wxWindowDC& dc)
 {
     (void)dc; // unused params
-#ifndef wxGL_IMPLICIT_CONTEXT
-    SetCurrent(*ctx);
-#else
     SetCurrent();
-#endif
 
     if (!did_init)
         DrawingPanelInit();