From bb179d7d4fa3b76457a88728fdb6bc0ab2e24e2b Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 23 Jul 2017 22:10:15 +1000 Subject: [PATCH] Fix GCC7 issues --- libs/gtkutil/glwidget.cpp | 2 +- radiant/camwindow.cpp | 2 +- radiant/texwindow.cpp | 2 +- radiant/xywindow.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/gtkutil/glwidget.cpp b/libs/gtkutil/glwidget.cpp index d732a212..20a82f30 100644 --- a/libs/gtkutil/glwidget.cpp +++ b/libs/gtkutil/glwidget.cpp @@ -37,7 +37,7 @@ void _glwidget_context_created(ui::GLArea self, void *data) { if (++g_context_count == 1) { g_shared = self; - g_object_ref(g_shared); + g_object_ref(g_shared._handle); glwidget_make_current(g_shared); GlobalOpenGL().contextValid = true; diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index a0c49d22..0f729b40 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -1165,7 +1165,7 @@ CamWnd::CamWnd() : m_window_observer->setRectangleDrawCallback( ReferenceCaller1( *this ) ); m_window_observer->setView( m_view ); - g_object_ref( m_gl_widget ); + g_object_ref( m_gl_widget._handle ); gtk_widget_set_events( m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); gtk_widget_set_can_focus( m_gl_widget, true ); diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 4dfee362..1a927a51 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -2057,7 +2057,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ } { // gl_widget g_TextureBrowser.m_gl_widget = glwidget_new( FALSE ); - g_object_ref( g_TextureBrowser.m_gl_widget ); + g_object_ref( g_TextureBrowser.m_gl_widget._handle ); gtk_widget_set_events( g_TextureBrowser.m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); gtk_widget_set_can_focus( g_TextureBrowser.m_gl_widget, true ); diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index 80b0a97b..5db4bf1d 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -828,7 +828,7 @@ XYWnd::XYWnd() : m_window_observer->setRectangleDrawCallback( ReferenceCaller1( *this ) ); m_window_observer->setView( m_view ); - g_object_ref( m_gl_widget ); + g_object_ref( m_gl_widget._handle ); gtk_widget_set_events( m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); gtk_widget_set_can_focus( m_gl_widget, true ); -- 2.39.2