reintroducing non-composited functionality due to DataBrowser Bugs under 10.2

[wxWidgets.git] / src / gtk / glcanvas.cpp

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 1556694fe8bd5ca0eb41a328ad1248ee88c1fcab..301240283ee7da4687cdfe0a7218ca53991157d8 100644 (file)
--- 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 )
 {
 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;
     if ( !win->m_glContext )
     {
         wxGLContext *share = win->m_sharedContext;


@@ -322,7 +320,7 @@ bool wxGLCanvas::Create( wxWindow *parent,
     wxCHECK_MSG( m_vi, FALSE, _T("required visual couldn't be found") );
 
     GdkVisual *visual = gdkx_visual_get( vi->visualid );
     wxCHECK_MSG( m_vi, FALSE, _T("required visual couldn't be found") );
 
     GdkVisual *visual = gdkx_visual_get( vi->visualid );

-    GdkColormap *colormap = gdk_colormap_new( gdkx_visual_get(vi->visualid), TRUE );
+    GdkColormap *colormap = gdk_colormap_new( visual, TRUE );

 
     gtk_widget_push_colormap( colormap );
     gtk_widget_push_visual( visual );
 
     gtk_widget_push_colormap( colormap );
     gtk_widget_push_visual( visual );


@@ -357,12 +355,6 @@ bool wxGLCanvas::Create( wxWindow *parent,
     gtk_widget_pop_visual();
     gtk_widget_pop_colormap();
 
     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;
 }
 
     return TRUE;
 }