X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9fa72bd2a637cee761c56e2ce61cec3e43c62765..937f314d3fcb38b7740d6d014a6099236907fa3b:/src/gtk/glcanvas.cpp diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp index b945ff75da..98d32c753f 100644 --- a/src/gtk/glcanvas.cpp +++ b/src/gtk/glcanvas.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/glcanvas.cpp +// Name: src/gtk/glcanvas.cpp // Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK // Author: Robert Roebling // Modified by: @@ -12,8 +12,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" - #if wxUSE_GLCANVAS #include "wx/glcanvas.h" @@ -31,6 +29,7 @@ extern "C" } #include "wx/gtk/win_gtk.h" +#include "wx/gtk/private.h" // DLL options compatibility check: #include "wx/build.h" @@ -47,12 +46,6 @@ int wxGLCanvas::m_glxVersion = 0; //--------------------------------------------------------------------------- XVisualInfo *g_vi = (XVisualInfo*) NULL; -//----------------------------------------------------------------------------- -// idle system -//----------------------------------------------------------------------------- - -extern void wxapp_install_idle_handler(); -extern bool g_isIdle; //--------------------------------------------------------------------------- // wxGLContext @@ -403,7 +396,6 @@ bool wxGLCanvas::Create( wxWindow *parent, colormap = gdk_colormap_new( visual, TRUE ); gtk_widget_push_colormap( colormap ); - gtk_widget_push_visual( visual ); wxWindow::Create( parent, id, pos, size, style, name ); m_glWidget = m_wxwindow; @@ -428,7 +420,6 @@ bool wxGLCanvas::Create( wxWindow *parent, if (gtk_check_version(2,2,0) != NULL) { - gtk_widget_pop_visual(); gtk_widget_pop_colormap(); }