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

Remove wxGLCanvas "realize" signal handler, use GTKHandleRealized() instead

Browse Source
This commit is contained in:
Paul Cornett
2019-06-12 22:30:41 -07:00
parent 780b8720c0
commit 65ced79ed1
1 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/gtk/glcanvas.cpp
View File

@@ -18,22 +18,6 @@
#include "wx/gtk/private/wrapgtk.h" #include "wx/gtk/private/wrapgtk.h"
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#if WXWIN_COMPATIBILITY_2_8
//-----------------------------------------------------------------------------
// "realize" from m_wxwindow: used to create m_glContext implicitly
//-----------------------------------------------------------------------------
extern "C" {
static void
gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
{
win->GTKInitImplicitContext();
}
}
#endif // WXWIN_COMPATIBILITY_2_8
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// "map" from m_wxwindow // "map" from m_wxwindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -294,9 +278,6 @@ bool wxGLCanvas::Create(wxWindow *parent,
gtk_widget_set_double_buffered(m_wxwindow, false); gtk_widget_set_double_buffered(m_wxwindow, false);
#if WXWIN_COMPATIBILITY_2_8
g_signal_connect(m_wxwindow, "realize", G_CALLBACK(gtk_glwindow_realized_callback), this);
#endif // WXWIN_COMPATIBILITY_2_8
#ifdef __WXGTK3__ #ifdef __WXGTK3__
g_signal_connect(m_wxwindow, "draw", G_CALLBACK(draw), this); g_signal_connect(m_wxwindow, "draw", G_CALLBACK(draw), this);
#else #else
@@ -305,14 +286,6 @@ bool wxGLCanvas::Create(wxWindow *parent,
#endif #endif
g_signal_connect(m_widget, "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback), this); g_signal_connect(m_widget, "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback), this);
#if WXWIN_COMPATIBILITY_2_8
// if our parent window is already visible, we had been realized before we
// connected to the "realize" signal and hence our m_glContext hasn't been
// initialized yet and we have to do it now
if (gtk_widget_get_realized(m_wxwindow))
gtk_glwindow_realized_callback( m_wxwindow, this );
#endif // WXWIN_COMPATIBILITY_2_8
#ifndef __WXGTK3__ #ifndef __WXGTK3__
if (gtk_widget_get_mapped(m_wxwindow)) if (gtk_widget_get_mapped(m_wxwindow))
gtk_glwindow_map_callback( m_wxwindow, this ); gtk_glwindow_map_callback( m_wxwindow, this );
@@ -336,6 +309,9 @@ void wxGLCanvas::GTKHandleRealized()
{ {
BaseType::GTKHandleRealized(); BaseType::GTKHandleRealized();
#if WXWIN_COMPATIBILITY_2_8
GTKInitImplicitContext();
#endif
SendSizeEvent(); SendSizeEvent();
} }