From bc8699718d9466a6f0029013a4ec21bc928c144f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 28 Feb 2005 12:28:36 +0000 Subject: [PATCH] restored manual calls to gtk_glwindow_realized/map_callback() and added comment explaining why they're (sometimes) needed git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/glcanvas.cpp | 9 +++++++++ src/gtk1/glcanvas.cpp | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp index 301240283e..30def50299 100644 --- a/src/gtk/glcanvas.cpp +++ b/src/gtk/glcanvas.cpp @@ -355,6 +355,15 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_widget_pop_visual(); gtk_widget_pop_colormap(); + // 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_REALIZED(m_wxwindow)) + gtk_glwindow_realized_callback( m_wxwindow, this ); + + if (GTK_WIDGET_MAPPED(m_wxwindow)) + gtk_glwindow_map_callback( m_wxwindow, this ); + return TRUE; } diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp index 301240283e..30def50299 100644 --- a/src/gtk1/glcanvas.cpp +++ b/src/gtk1/glcanvas.cpp @@ -355,6 +355,15 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_widget_pop_visual(); gtk_widget_pop_colormap(); + // 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_REALIZED(m_wxwindow)) + gtk_glwindow_realized_callback( m_wxwindow, this ); + + if (GTK_WIDGET_MAPPED(m_wxwindow)) + gtk_glwindow_map_callback( m_wxwindow, this ); + return TRUE; } -- 2.50.0