From 144ae5bbbf6c9cef6f5e6bb19f0f8bc7542a8810 Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@bullseye.com>
Date: Fri, 1 Feb 2008 04:51:34 +0000
Subject: [PATCH] remove unnecessary m_glWidget, fix return types for realize
 and map callbacks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/gtk/glcanvas.h |  1 -
 src/gtk/glcanvas.cpp      | 12 +++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index 998e593bef..44cb105c93 100644
--- a/include/wx/gtk/glcanvas.h
+++ b/include/wx/gtk/glcanvas.h
@@ -92,7 +92,6 @@ public:
     // implementation from now on
     void OnInternalIdle();
 
-    GtkWidget        *m_glWidget;
     bool              m_exposed;
 
 #if WXWIN_COMPATIBILITY_2_8
diff --git a/src/gtk/glcanvas.cpp b/src/gtk/glcanvas.cpp
index cb261d2702..ab444bc18c 100644
--- a/src/gtk/glcanvas.cpp
+++ b/src/gtk/glcanvas.cpp
@@ -33,12 +33,10 @@
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static gint
+static void
 gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
 {
     win->GTKInitImplicitContext();
-
-    return FALSE;
 }
 }
 
@@ -49,7 +47,7 @@ gtk_glwindow_realized_callback( GtkWidget *WXUNUSED(widget), wxGLCanvas *win )
 //-----------------------------------------------------------------------------
 
 extern "C" {
-static gint
+static void
 gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
 {
     wxPaintEvent event( win->GetId() );
@@ -58,8 +56,6 @@ gtk_glwindow_map_callback( GtkWidget * WXUNUSED(widget), wxGLCanvas *win )
 
     win->m_exposed = false;
     win->GetUpdateRegion().Clear();
-
-    return FALSE;
 }
 }
 
@@ -222,9 +218,7 @@ bool wxGLCanvas::Create(wxWindow *parent,
 
     wxWindow::Create( parent, id, pos, size, style, name );
 
-    m_glWidget = m_wxwindow;
-
-    gtk_widget_set_double_buffered( m_glWidget, FALSE );
+    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);
-- 
2.47.2