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

removed explicit calls to gtk_glwindow_(realized/map)_callback() as they should be called by GTK+ itself anyhow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-02-20 18:58:53 +00:00
parent bee44427ef
commit 50e768b95a
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gtk/glcanvas.cpp
View File

@@ -160,8 +160,6 @@ wxPalette wxGLContext::CreateDefaultPalette()
static gint static gint
gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) 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 ) if ( !win->m_glContext )
{ {
wxGLContext *share = win->m_sharedContext; wxGLContext *share = win->m_sharedContext;
@@ -357,12 +355,6 @@ bool wxGLCanvas::Create( wxWindow *parent,
gtk_widget_pop_visual(); gtk_widget_pop_visual();
gtk_widget_pop_colormap(); 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; return TRUE;
} }

8
src/gtk1/glcanvas.cpp
View File

@@ -160,8 +160,6 @@ wxPalette wxGLContext::CreateDefaultPalette()
static gint static gint
gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) 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 ) if ( !win->m_glContext )
{ {
wxGLContext *share = win->m_sharedContext; wxGLContext *share = win->m_sharedContext;
@@ -357,12 +355,6 @@ bool wxGLCanvas::Create( wxWindow *parent,
gtk_widget_pop_visual(); gtk_widget_pop_visual();
gtk_widget_pop_colormap(); 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; return TRUE;
} }