patch from list to fix warning and get rid of unneccessary call

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index 1556694fe8bd5ca0eb41a328ad1248ee88c1fcab..e5f769403bb06aeb92e94a1bb471cdbc08618aab 100644 (file)
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -322,7 +322,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 );
-    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 );

diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index 1556694fe8bd5ca0eb41a328ad1248ee88c1fcab..e5f769403bb06aeb92e94a1bb471cdbc08618aab 100644 (file)
--- a/src/gtk1/glcanvas.cpp
+++ b/src/gtk1/glcanvas.cpp
@@ -322,7 +322,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 );
-    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 );