From 50e768b95a9112f21acbf0a4a10bfde3bb2d827b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 20 Feb 2005 18:58:53 +0000 Subject: [PATCH] removed explicit calls to gtk_glwindow_(realized/map)_callback() as they should be called by GTK+ itself anyhow git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/glcanvas.cpp | 8 -------- src/gtk1/glcanvas.cpp | 8 -------- 2 files changed, 16 deletions(-) diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp index e5f769403b..301240283e 100644 --- a/src/gtk/glcanvas.cpp +++ b/src/gtk/glcanvas.cpp @@ -160,8 +160,6 @@ wxPalette wxGLContext::CreateDefaultPalette() static gint gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) { - // VZ: apparently in some cases we're called twice -- no idea why, - // but a check doesn't hurt if ( !win->m_glContext ) { wxGLContext *share = win->m_sharedContext; @@ -357,12 +355,6 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_widget_pop_visual(); gtk_widget_pop_colormap(); - 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 e5f769403b..301240283e 100644 --- a/src/gtk1/glcanvas.cpp +++ b/src/gtk1/glcanvas.cpp @@ -160,8 +160,6 @@ wxPalette wxGLContext::CreateDefaultPalette() static gint gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) { - // VZ: apparently in some cases we're called twice -- no idea why, - // but a check doesn't hurt if ( !win->m_glContext ) { wxGLContext *share = win->m_sharedContext; @@ -357,12 +355,6 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_widget_pop_visual(); gtk_widget_pop_colormap(); - 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.45.2