/////////////////////////////////////////////////////////////////////////////
-// Name: glcanvas.cpp
-// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
+// Name: src/gtk/glcanvas.cpp
+// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK
// Author: Robert Roebling
// Modified by:
// Created: 17/08/98
// RCS-ID: $Id$
// Copyright: (c) Robert Roebling
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "glcanvas.h"
-#endif
-
-#include "wx/setup.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#if wxUSE_GLCANVAS
#include "wx/glcanvas.h"
-#include "wx/frame.h"
-#include "wx/colour.h"
-#include "wx/module.h"
-#include "wx/app.h"
-
-extern "C" {
-#include "gtk/gtk.h"
-#include "gdk/gdk.h"
-#include "gdk/gdkx.h"
-}
-
-#include "wx/gtk/win_gtk.h"
-
-//---------------------------------------------------------------------------
-// global data
-//---------------------------------------------------------------------------
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include "wx/gtk/private/gtk2-compat.h"
-XVisualInfo *g_vi = (XVisualInfo*) NULL;
+#if WXWIN_COMPATIBILITY_2_8
//-----------------------------------------------------------------------------
-// idle system
+// "realize" from m_wxwindow: used to create m_glContext implicitly
//-----------------------------------------------------------------------------
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//---------------------------------------------------------------------------
-// wxGLContext
-//---------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxGLContext,wxObject)
-
-wxGLContext::wxGLContext( bool WXUNUSED(isRGB), wxWindow *win, const wxPalette& WXUNUSED(palette) )
-{
- m_window = win;
- m_widget = win->m_wxwindow;
-
- wxGLCanvas *gc = (wxGLCanvas*) win;
- XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
-
- wxCHECK_RET( vi, "invalid visual for OpenGl" );
-
- m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE );
-
- wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
-}
-
-wxGLContext::wxGLContext(
- bool WXUNUSED(isRGB), wxWindow *win,
- const wxPalette& WXUNUSED(palette),
- const wxGLContext *other /* for sharing display lists */
-)
-{
- m_window = win;
- m_widget = win->m_wxwindow;
-
- wxGLCanvas *gc = (wxGLCanvas*) win;
- XVisualInfo *vi = (XVisualInfo *) gc->m_vi;
-
- wxCHECK_RET( vi, "invalid visual for OpenGl" );
-
- if( other != 0 )
- m_glContext = glXCreateContext( GDK_DISPLAY(), vi, other->m_glContext, GL_TRUE );
- else
- m_glContext = glXCreateContext( GDK_DISPLAY(), vi, None, GL_TRUE );
-
- wxCHECK_RET( m_glContext, "Couldn't create OpenGl context" );
-}
-
-wxGLContext::~wxGLContext()
-{
- if (!m_glContext) return;
-
- if (m_glContext == glXGetCurrentContext())
- {
- glXMakeCurrent( GDK_DISPLAY(), None, NULL);
- }
-
- glXDestroyContext( GDK_DISPLAY(), m_glContext );
-}
-
-void wxGLContext::SwapBuffers()
-{
- if (m_glContext)
- {
- GdkWindow *window = GTK_PIZZA(m_widget)->bin_window;
- glXSwapBuffers( GDK_DISPLAY(), GDK_WINDOW_XWINDOW( window ) );
- }
-}
-
-void wxGLContext::SetCurrent()
-{
- if (m_glContext)
- {
- GdkWindow *window = GTK_PIZZA(m_widget)->bin_window;
- glXMakeCurrent( GDK_DISPLAY(), GDK_WINDOW_XWINDOW(window), m_glContext );
- }
-}
-
-void wxGLContext::SetColour(const char *colour)
+extern "C" {
+static void
+gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
{
- float r = 0.0;
- float g = 0.0;
- float b = 0.0;
- wxColour *col = wxTheColourDatabase->FindColour(colour);
- if (col)
- {
- r = (float)(col->Red()/256.0);
- g = (float)(col->Green()/256.0);
- b = (float)(col->Blue()/256.0);
- glColor3f( r, g, b);
- }
+ win->GTKInitImplicitContext();
}
-
-void wxGLContext::SetupPixelFormat()
-{
}
-void wxGLContext::SetupPalette( const wxPalette& WXUNUSED(palette) )
-{
-}
-
-wxPalette wxGLContext::CreateDefaultPalette()
-{
- return wxNullPalette;
-}
+#endif // WXWIN_COMPATIBILITY_2_8
//-----------------------------------------------------------------------------
-// "realize" from m_wxwindow
+// "map" from m_wxwindow
//-----------------------------------------------------------------------------
-static gint
-gtk_glwindow_realized_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
+#ifndef __WXGTK3__
+extern "C" {
+static void
+gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
{
- wxGLContext *share= win->m_sharedContext;
- if (share==NULL && win->m_sharedContextOf) share=win->m_sharedContextOf->GetContext();
-
- win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, share );
+ wxPaintEvent event( win->GetId() );
+ event.SetEventObject( win );
+ win->HandleWindowEvent( event );
- return FALSE;
+ win->m_exposed = false;
+ win->GetUpdateRegion().Clear();
+}
}
+#endif
//-----------------------------------------------------------------------------
-// "map" from m_wxwindow
+// "expose_event" of m_wxwindow
//-----------------------------------------------------------------------------
-static gint
-gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
+extern "C" {
+#ifdef __WXGTK3__
+static gboolean draw(GtkWidget*, cairo_t* cr, wxGLCanvas* win)
{
- if (win->m_glContext/* && win->m_exposed*/)
+ win->m_exposed = true;
+ if (win->m_cairoPaintContext == NULL)
{
- wxPaintEvent event( win->GetId() );
- event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent( event );
-
- win->m_exposed = FALSE;
- win->GetUpdateRegion().Clear();
+ win->m_cairoPaintContext = cr;
+ cairo_reference(cr);
}
-
- return FALSE;
+ double x1, y1, x2, y2;
+ cairo_clip_extents(cr, &x1, &y1, &x2, &y2);
+ win->GetUpdateRegion().Union(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
+ return false;
}
-
-//-----------------------------------------------------------------------------
-// "expose_event" of m_wxwindow
-//-----------------------------------------------------------------------------
-
-static void
+#else
+static gboolean
gtk_glwindow_expose_callback( GtkWidget *WXUNUSED(widget), GdkEventExpose *gdk_event, wxGLCanvas *win )
{
- 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,
gdk_event->area.width,
gdk_event->area.height );
+ return false;
+}
+#endif
}
//-----------------------------------------------------------------------------
-// "draw" of m_wxwindow
+// "size_allocate" of m_wxwindow
//-----------------------------------------------------------------------------
-static void
-gtk_glwindow_draw_callback( GtkWidget *WXUNUSED(widget), GdkRectangle *rect, wxGLCanvas *win )
+extern "C" {
+static void
+gtk_glcanvas_size_callback(GtkWidget *WXUNUSED(widget),
+ GtkAllocation * WXUNUSED(alloc),
+ wxGLCanvas *win)
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
- win->m_exposed = TRUE;
-
- win->GetUpdateRegion().Union( rect->x, rect->y,
- rect->width, rect->height );
+ wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
+ event.SetEventObject( win );
+ win->HandleWindowEvent( event );
+}
}
//-----------------------------------------------------------------------------
-// "size_allocate" of m_wxwindow
+// emission hook for "parent-set"
//-----------------------------------------------------------------------------
-static void
-gtk_glcanvas_size_callback( GtkWidget *WXUNUSED(widget), GtkAllocation* alloc, wxGLCanvas *win )
+extern "C" {
+static gboolean
+parent_set_hook(GSignalInvocationHint*, guint, const GValue* param_values, void* data)
{
- if (g_isIdle)
- wxapp_install_idle_handler();
-
- if (!win->m_hasVMT)
- return;
-
- wxSizeEvent event( wxSize(win->m_width,win->m_height), win->GetId() );
- event.SetEventObject( win );
- win->GetEventHandler()->ProcessEvent( event );
+ wxGLCanvas* win = (wxGLCanvas*)data;
+ if (g_value_peek_pointer(¶m_values[0]) == win->m_wxwindow)
+ {
+ const XVisualInfo* xvi = win->GetXVisualInfo();
+ GdkVisual* visual = gtk_widget_get_visual(win->m_wxwindow);
+ if (GDK_VISUAL_XVISUAL(visual)->visualid != xvi->visualid)
+ {
+ GdkScreen* screen = gtk_widget_get_screen(win->m_wxwindow);
+ visual = gdk_x11_screen_lookup_visual(screen, xvi->visualid);
+#ifdef __WXGTK3__
+ gtk_widget_set_visual(win->m_wxwindow, visual);
+#else
+ GdkColormap* colormap = gdk_colormap_new(visual, false);
+ gtk_widget_set_colormap(win->m_wxwindow, colormap);
+ g_object_unref(colormap);
+#endif
+ }
+ // remove hook
+ return false;
+ }
+ return true;
+}
}
//---------------------------------------------------------------------------
// wxGlCanvas
//---------------------------------------------------------------------------
-IMPLEMENT_CLASS(wxGLCanvas, wxScrolledWindow)
-
-BEGIN_EVENT_TABLE(wxGLCanvas, wxScrolledWindow)
- EVT_SIZE(wxGLCanvas::OnSize)
-END_EVENT_TABLE()
-
-wxGLCanvas::wxGLCanvas( wxWindow *parent, wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style, const wxString& name,
- int *attribList,
- const wxPalette& palette )
+IMPLEMENT_CLASS(wxGLCanvas, wxWindow)
+
+wxGLCanvas::wxGLCanvas(wxWindow *parent,
+ wxWindowID id,
+ const int *attribList,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name,
+ const wxPalette& palette)
+#if WXWIN_COMPATIBILITY_2_8
+ : m_createImplicitContext(false)
+#endif
{
- Create( parent, NULL, NULL, id, pos, size, style, name, attribList, palette );
+ Create(parent, id, pos, size, style, name, attribList, palette);
}
-wxGLCanvas::wxGLCanvas( wxWindow *parent,
- const wxGLContext *shared,
- wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style, const wxString& name,
- int *attribList,
- const wxPalette& palette )
-{
- Create( parent, shared, NULL, id, pos, size, style, name, attribList, palette );
-}
+#if WXWIN_COMPATIBILITY_2_8
+
+wxGLCanvas::wxGLCanvas(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name,
+ const int *attribList,
+ const wxPalette& palette)
+ : m_createImplicitContext(true)
+{
+ m_sharedContext = NULL;
+ m_sharedContextOf = NULL;
-wxGLCanvas::wxGLCanvas( wxWindow *parent,
- const wxGLCanvas *shared,
- wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style, const wxString& name,
- int *attribList,
- const wxPalette& palette )
-{
- Create( parent, NULL, shared, id, pos, size, style, name, attribList, palette );
+ Create(parent, id, pos, size, style, name, attribList, palette);
}
-bool wxGLCanvas::Create( wxWindow *parent,
- const wxGLContext *shared,
- const wxGLCanvas *shared_context_of,
- wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style, const wxString& name,
- int *attribList,
- const wxPalette& palette)
+wxGLCanvas::wxGLCanvas(wxWindow *parent,
+ const wxGLContext *shared,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name,
+ const int *attribList,
+ const wxPalette& palette)
+ : m_createImplicitContext(true)
{
- m_sharedContext = (wxGLContext*)shared; // const_cast
- m_sharedContextOf = (wxGLCanvas*)shared_context_of; // const_cast
- m_glContext = (wxGLContext*) NULL;
-
- m_exposed = FALSE;
- m_noExpose = TRUE;
- m_nativeSizeEvent = TRUE;
-
- XVisualInfo *vi = NULL;
- if (wxTheApp->m_glVisualInfo != NULL) {
- vi = (XVisualInfo *) wxTheApp->m_glVisualInfo;
- m_canFreeVi = FALSE; // owned by wxTheApp - don't free upon destruction
- } else {
- vi = (XVisualInfo *) ChooseGLVisual(attribList);
- m_canFreeVi = TRUE;
- }
- m_vi = vi; // save for later use
-
- wxCHECK_MSG( m_vi, FALSE, "required visual couldn't be found" );
-
- GdkVisual *visual = gdkx_visual_get( vi->visualid );
- GdkColormap *colormap = gdk_colormap_new( gdkx_visual_get(vi->visualid), TRUE );
-
- gtk_widget_push_colormap( colormap );
- gtk_widget_push_visual( visual );
-
- wxScrolledWindow::Create( parent, id, pos, size, style, name );
-
- m_glWidget = m_wxwindow;
-
- gtk_pizza_set_clear( GTK_PIZZA(m_wxwindow), FALSE );
-
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "realize",
- GTK_SIGNAL_FUNC(gtk_glwindow_realized_callback), (gpointer) this );
-
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "map",
- GTK_SIGNAL_FUNC(gtk_glwindow_map_callback), (gpointer) this );
-
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "expose_event",
- GTK_SIGNAL_FUNC(gtk_glwindow_expose_callback), (gpointer)this );
-
- gtk_signal_connect( GTK_OBJECT(m_wxwindow), "draw",
- GTK_SIGNAL_FUNC(gtk_glwindow_draw_callback), (gpointer)this );
-
- gtk_signal_connect( GTK_OBJECT(m_widget), "size_allocate",
- GTK_SIGNAL_FUNC(gtk_glcanvas_size_callback), (gpointer)this );
-
- 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;
-}
+ m_sharedContext = const_cast<wxGLContext *>(shared);
-wxGLCanvas::~wxGLCanvas()
-{
- XVisualInfo *vi = (XVisualInfo *) m_vi;
-
- if (vi && m_canFreeVi) XFree( vi );
- if (m_glContext) delete m_glContext;
+ Create(parent, id, pos, size, style, name, attribList, palette);
}
-void* wxGLCanvas::ChooseGLVisual(int *attribList)
+wxGLCanvas::wxGLCanvas(wxWindow *parent,
+ const wxGLCanvas *shared,
+ wxWindowID id,
+ const wxPoint& pos, const wxSize& size,
+ long style, const wxString& name,
+ const int *attribList,
+ const wxPalette& palette )
+ : m_createImplicitContext(true)
{
- int data[512];
- if (!attribList)
- {
- // default settings if attriblist = 0
- data[0] = GLX_RGBA;
- data[1] = GLX_DOUBLEBUFFER;
- data[2] = GLX_DEPTH_SIZE; data[3] = 1;
- data[4] = GLX_RED_SIZE; data[5] = 1;
- data[6] = GLX_GREEN_SIZE; data[7] = 1;
- data[8] = GLX_BLUE_SIZE; data[9] = 1;
- data[10] = GLX_ALPHA_SIZE; data[11] = 0;
- data[12] = None;
-
- attribList = (int*) data;
- }
- else
- {
- int arg=0, p=0;
-
- while( (attribList[arg]!=0) && (p<510) )
- {
- switch( attribList[arg++] )
- {
- case WX_GL_RGBA: data[p++] = GLX_RGBA; break;
- case WX_GL_BUFFER_SIZE:
- data[p++]=GLX_BUFFER_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_LEVEL:
- data[p++]=GLX_LEVEL; data[p++]=attribList[arg++]; break;
- case WX_GL_DOUBLEBUFFER: data[p++] = GLX_DOUBLEBUFFER; break;
- case WX_GL_STEREO: data[p++] = GLX_STEREO; break;
- case WX_GL_AUX_BUFFERS:
- data[p++]=GLX_AUX_BUFFERS; data[p++]=attribList[arg++]; break;
- case WX_GL_MIN_RED:
- data[p++]=GLX_RED_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_MIN_GREEN:
- data[p++]=GLX_GREEN_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_MIN_BLUE:
- data[p++]=GLX_BLUE_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_MIN_ALPHA:
- data[p++]=GLX_ALPHA_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_DEPTH_SIZE:
- data[p++]=GLX_DEPTH_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_STENCIL_SIZE:
- data[p++]=GLX_STENCIL_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_MIN_ACCUM_RED:
- data[p++]=GLX_ACCUM_RED_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_MIN_ACCUM_GREEN:
- data[p++]=GLX_ACCUM_GREEN_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_MIN_ACCUM_BLUE:
- data[p++]=GLX_ACCUM_BLUE_SIZE; data[p++]=attribList[arg++]; break;
- case WX_GL_MIN_ACCUM_ALPHA:
- data[p++]=GLX_ACCUM_ALPHA_SIZE; data[p++]=attribList[arg++]; break;
- default:
- break;
- }
- }
- data[p] = 0;
+ m_sharedContext = NULL;
+ m_sharedContextOf = const_cast<wxGLCanvas *>(shared);
- attribList = (int*) data;
- }
-
-
- Display *dpy = GDK_DISPLAY();
-
- return glXChooseVisual( dpy, DefaultScreen(dpy), attribList );
+ Create(parent, id, pos, size, style, name, attribList, palette);
}
-void wxGLCanvas::SwapBuffers()
-{
- if (m_glContext) m_glContext->SwapBuffers();
-}
+#endif // WXWIN_COMPATIBILITY_2_8
-void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event))
+bool wxGLCanvas::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxString& name,
+ const int *attribList,
+ const wxPalette& palette)
{
- int width, height;
- GetClientSize( &width, &height );
-
- if (m_glContext && GTK_WIDGET_REALIZED(m_glWidget) )
- {
- SetCurrent();
-
- glViewport(0, 0, (GLint)width, (GLint)height );
- glMatrixMode(GL_PROJECTION);
- glLoadIdentity();
- glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 );
- glMatrixMode(GL_MODELVIEW);
- }
+#if wxUSE_PALETTE
+ wxASSERT_MSG( !palette.IsOk(), wxT("palettes not supported") );
+#endif // wxUSE_PALETTE
+ wxUnusedVar(palette); // Unused when wxDEBUG_LEVEL==0
+
+ m_exposed = false;
+ m_noExpose = true;
+ m_nativeSizeEvent = true;
+#ifdef __WXGTK3__
+ m_cairoPaintContext = NULL;
+ m_backgroundStyle = wxBG_STYLE_PAINT;
+#endif
+
+ if ( !InitVisual(attribList) )
+ return false;
+
+ // watch for the "parent-set" signal on m_wxwindow so we can set colormap
+ // before m_wxwindow is realized (which will occur before
+ // wxWindow::Create() returns if parent is already visible)
+ unsigned sig_id = g_signal_lookup("parent-set", GTK_TYPE_WIDGET);
+ g_signal_add_emission_hook(sig_id, 0, parent_set_hook, this, NULL);
+
+ wxWindow::Create( parent, id, pos, size, style, name );
+
+ gtk_widget_set_double_buffered(m_wxwindow, false);
+
+#if WXWIN_COMPATIBILITY_2_8
+ g_signal_connect(m_wxwindow, "realize", G_CALLBACK(gtk_glwindow_realized_callback), this);
+#endif // WXWIN_COMPATIBILITY_2_8
+#ifdef __WXGTK3__
+ g_signal_connect(m_wxwindow, "draw", G_CALLBACK(draw), this);
+#else
+ g_signal_connect(m_wxwindow, "map", G_CALLBACK(gtk_glwindow_map_callback), this);
+ g_signal_connect(m_wxwindow, "expose_event", G_CALLBACK(gtk_glwindow_expose_callback), this);
+#endif
+ g_signal_connect(m_widget, "size_allocate", G_CALLBACK(gtk_glcanvas_size_callback), this);
+
+#if WXWIN_COMPATIBILITY_2_8
+ // if our parent window is already visible, we had been realized before we
+ // connected to the "realize" signal and hence our m_glContext hasn't been
+ // initialized yet and we have to do it now
+ if (gtk_widget_get_realized(m_wxwindow))
+ gtk_glwindow_realized_callback( m_wxwindow, this );
+#endif // WXWIN_COMPATIBILITY_2_8
+
+#ifndef __WXGTK3__
+ if (gtk_widget_get_mapped(m_wxwindow))
+ gtk_glwindow_map_callback( m_wxwindow, this );
+#endif
+
+ return true;
}
-void wxGLCanvas::SetCurrent()
+bool wxGLCanvas::SetBackgroundStyle(wxBackgroundStyle /* style */)
{
- if (m_glContext) m_glContext->SetCurrent();
+ return false;
}
-void wxGLCanvas::SetColour( const char *colour )
+Window wxGLCanvas::GetXWindow() const
{
- if (m_glContext) m_glContext->SetColour( colour );
+ GdkWindow* window = GTKGetDrawingWindow();
+ return window ? GDK_WINDOW_XID(window) : 0;
}
void wxGLCanvas::OnInternalIdle()
{
- if (m_glContext && m_exposed)
+ if (m_exposed)
{
+#ifdef __WXGTK3__
+ GTKSendPaintEvents(m_cairoPaintContext);
+ cairo_destroy(m_cairoPaintContext);
+ m_cairoPaintContext = NULL;
+#else
wxPaintEvent event( GetId() );
event.SetEventObject( this );
- GetEventHandler()->ProcessEvent( event );
+ HandleWindowEvent( event );
+#endif
- m_exposed = FALSE;
+ m_exposed = false;
GetUpdateRegion().Clear();
}
-
+
wxWindow::OnInternalIdle();
}
+#if WXWIN_COMPATIBILITY_2_8
-
-//---------------------------------------------------------------------------
-// wxGLApp
-//---------------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxGLApp, wxApp)
-
-wxGLApp::~wxGLApp()
+void wxGLCanvas::GTKInitImplicitContext()
{
- if (m_glVisualInfo) XFree(m_glVisualInfo);
-}
+ if ( !m_glContext && m_createImplicitContext )
+ {
+ wxGLContext *share = m_sharedContext;
+ if ( !share && m_sharedContextOf )
+ share = m_sharedContextOf->m_glContext;
-bool wxGLApp::InitGLVisual(int *attribList)
-{
- if (m_glVisualInfo) XFree(m_glVisualInfo);
- m_glVisualInfo = wxGLCanvas::ChooseGLVisual(attribList);
- return (m_glVisualInfo != NULL);
+ m_glContext = new wxGLContext(this, share);
+ }
}
-#endif
- // wxUSE_GLCANVAS
+#endif // WXWIN_COMPATIBILITY_2_8
+#endif // wxUSE_GLCANVAS
projects / wxWidgets.git / blobdiff