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

diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index 998e593befc6f730df5948b5713fffc82a4ec3e3..44cb105c93b280bb340974719b533a637d459e05 100644 (file)
--- 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 cb261d2702986ec01e4b96856b5f14f8a0bdcf22..ab444bc18c94cd180dcbdfe321d86add3ce5fed7 100644 (file)
--- 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);