Better alphabetized the event handler macros

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

diff --git a/src/gtk1/glcanvas.cpp b/src/gtk1/glcanvas.cpp
index 88018d4bb84fd2792800062e556b2e55a395857e..e5f769403bb06aeb92e94a1bb471cdbc08618aab 100644 (file)
--- a/src/gtk1/glcanvas.cpp
+++ b/src/gtk1/glcanvas.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gtk/glcanvas.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        gtk/glcanvas.cpp

-// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWindows and GTK
+// Purpose:     wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK

 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/08/98
 // Author:      Robert Roebling
 // Modified by:
 // Created:     17/08/98


@@ -160,10 +160,16 @@ 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 )
 {

-    wxGLContext *share= win->m_sharedContext;
-    if (share==NULL && win->m_sharedContextOf) share=win->m_sharedContextOf->GetContext();
+    // 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 ( !share && win->m_sharedContextOf )
+            share = win->m_sharedContextOf->GetContext();

 
 

-    win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, share );
+        win->m_glContext = new wxGLContext( TRUE, win, wxNullPalette, share );
+    }

 
     return FALSE;
 }
 
     return FALSE;
 }


@@ -316,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 );
     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 );


@@ -365,7 +371,7 @@ wxGLCanvas::~wxGLCanvas()
     XVisualInfo *vi = (XVisualInfo *) m_vi;
 
     if (vi && m_canFreeVi) XFree( vi );
     XVisualInfo *vi = (XVisualInfo *) m_vi;
 
     if (vi && m_canFreeVi) XFree( vi );

-    if (m_glContext) delete m_glContext;
+    delete m_glContext;

 }
 
 void* wxGLCanvas::ChooseGLVisual(int *attribList)
 }
 
 void* wxGLCanvas::ChooseGLVisual(int *attribList)