X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4d06fb78de899e118d56ede472de2094a05cd43..b0ae510a86987787c7695026ffb49a69cc7e2c8b:/src/gtk1/glcanvas.cpp diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp index 73c12ca203..235c0de0d7 100644 --- a/src/gtk1/glcanvas.cpp +++ b/src/gtk1/glcanvas.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/glcanvas.cpp +// Name: src/gtk1/glcanvas.cpp // Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK // Author: Robert Roebling // Modified by: @@ -9,23 +9,19 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "glcanvas.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/setup.h" - #if wxUSE_GLCANVAS #include "wx/glcanvas.h" -#include "wx/frame.h" -#include "wx/colour.h" -#include "wx/module.h" -#include "wx/app.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/frame.h" + #include "wx/colour.h" + #include "wx/module.h" +#endif // WX_PRECOMP extern "C" { @@ -34,7 +30,7 @@ extern "C" #include "gdk/gdkx.h" } -#include "wx/gtk/win_gtk.h" +#include "wx/gtk1/win_gtk.h" // DLL options compatibility check: #include "wx/build.h" @@ -227,7 +223,7 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win ) event.SetEventObject( win ); win->GetEventHandler()->ProcessEvent( event ); - win->m_exposed = FALSE; + win->m_exposed = false; win->GetUpdateRegion().Clear(); } @@ -246,7 +242,7 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e if (g_isIdle) wxapp_install_idle_handler(); - win->m_exposed = TRUE; + win->m_exposed = true; win->GetUpdateRegion().Union( gdk_event->area.x, gdk_event->area.y, @@ -259,7 +255,6 @@ gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_e // "draw" of m_wxwindow //----------------------------------------------------------------------------- -#ifndef __WXGTK20__ extern "C" { static void gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win ) @@ -267,13 +262,12 @@ gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxG if (g_isIdle) wxapp_install_idle_handler(); - win->m_exposed = TRUE; + win->m_exposed = true; win->GetUpdateRegion().Union( rect->x, rect->y, rect->width, rect->height ); } } -#endif //----------------------------------------------------------------------------- // "size_allocate" of m_wxwindow @@ -349,9 +343,9 @@ bool wxGLCanvas::Create( wxWindow *parent, m_sharedContextOf = (wxGLCanvas*)shared_context_of; // const_cast m_glContext = (wxGLContext*) NULL; - m_exposed = FALSE; - m_noExpose = TRUE; - m_nativeSizeEvent = TRUE; + m_exposed = false; + m_noExpose = true; + m_nativeSizeEvent = true; m_fbc = NULL; m_vi = NULL; @@ -365,22 +359,22 @@ bool wxGLCanvas::Create( wxWindow *parent, if (wxTheApp->m_glFBCInfo != NULL) { fbc = (GLXFBConfig *) wxTheApp->m_glFBCInfo; - m_canFreeFBC = FALSE; // owned by wxTheApp - don't free upon destruction + m_canFreeFBC = false; // owned by wxTheApp - don't free upon destruction } else { fbc = (GLXFBConfig *) wxGLCanvas::ChooseGLFBC(attribList); - m_canFreeFBC = TRUE; + m_canFreeFBC = true; } m_fbc = fbc; // save for later use - wxCHECK_MSG( m_fbc, FALSE, _T("required FBConfig couldn't be found") ); + wxCHECK_MSG( m_fbc, false, _T("required FBConfig couldn't be found") ); } XVisualInfo *vi = NULL; if (wxTheApp->m_glVisualInfo != NULL) { vi = (XVisualInfo *)wxTheApp->m_glVisualInfo; - m_canFreeVi = FALSE; // owned by wxTheApp - don't free upon destruction + m_canFreeVi = false; // owned by wxTheApp - don't free upon destruction } else { @@ -391,25 +385,47 @@ bool wxGLCanvas::Create( wxWindow *parent, // GLX <= 1.2 vi = (XVisualInfo *) ChooseGLVisual(attribList); - m_canFreeVi = TRUE; + m_canFreeVi = true; } m_vi = vi; // save for later use - wxCHECK_MSG( m_vi, FALSE, _T("required visual couldn't be found") ); - GdkVisual *visual = gdkx_visual_get( vi->visualid ); - GdkColormap *colormap = gdk_colormap_new( visual, TRUE ); + wxCHECK_MSG( m_vi, false, _T("required visual couldn't be found") ); + GdkVisual *visual; + GdkColormap *colormap; - gtk_widget_push_colormap( colormap ); - gtk_widget_push_visual( visual ); + // MR: This needs a fix for lower gtk+ versions too. Might need to rethink logic (FIXME) +#if 0 + if (!gtk_check_version(2,2,0)) + { + wxWindow::Create( parent, id, pos, size, style, name ); + + m_glWidget = m_wxwindow; - wxWindow::Create( parent, id, pos, size, style, name ); + GdkScreen *screen = gtk_widget_get_screen( m_glWidget ); + colormap = gdk_screen_get_default_colormap(screen); + visual = gdk_colormap_get_visual(colormap); - m_glWidget = m_wxwindow; + if (GDK_VISUAL_XVISUAL(visual)->visualid != vi->visualid) + { + visual = gdk_x11_screen_lookup_visual( screen, vi->visualid ); + colormap = gdk_colormap_new(visual, FALSE); + } -#ifdef __WXGTK20__ - gtk_widget_set_double_buffered( m_glWidget, FALSE ); + gtk_widget_set_colormap( m_glWidget, colormap ); + } + else #endif + { + visual = gdkx_visual_get( vi->visualid ); + 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; + } gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE ); @@ -422,10 +438,8 @@ bool wxGLCanvas::Create( wxWindow *parent, gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event", GTK_SIGNAL_FUNC(gtk_glwindow_expose_callback), (gpointer)this ); -#ifndef __WXGTK20__ gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw", GTK_SIGNAL_FUNC(gtk_glwindow_draw_callback), (gpointer)this ); -#endif gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate", GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this ); @@ -442,7 +456,7 @@ bool wxGLCanvas::Create( wxWindow *parent, if (GTK_WIDGET_MAPPED(m_wxwindow)) gtk_glwindow_map_callback( m_wxwindow, this ); - return TRUE; + return true; } wxGLCanvas::~wxGLCanvas() @@ -640,7 +654,7 @@ void wxGLCanvas::OnInternalIdle() event.SetEventObject( this ); GetEventHandler()->ProcessEvent( event ); - m_exposed = FALSE; + m_exposed = false; GetUpdateRegion().Clear(); }