Fix GCC7 issues

diff --git a/libs/gtkutil/glwidget.cpp b/libs/gtkutil/glwidget.cpp
index d732a212ab2b75e1508f9709f57df415e04e2ca6..20a82f304e6cf567db59cc833aad7ee7e7c56481 100644 (file)
--- 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 a0c49d22021fded385483fa83fe90dcf1c74ae14..0f729b40d34a56950380db5760e1e31e3ef5c317 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -1165,7 +1165,7 @@ CamWnd::CamWnd() :
        m_window_observer->setRectangleDrawCallback( ReferenceCaller1<CamWnd, rect_t, camwnd_update_xor_rectangle>( *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 4dfee3622777759777fd3d425714a966b4956c64..1a927a51cf12206273e335012155847c2912cf3a 100644 (file)
--- 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 80b0a97bf97e76282e2cfa6e45c2d5e22cd816b1..5db4bf1d9e63d6855477af37ceb6643bc42d3aef 100644 (file)
--- a/radiant/xywindow.cpp
+++ b/radiant/xywindow.cpp
@@ -828,7 +828,7 @@ XYWnd::XYWnd() :
        m_window_observer->setRectangleDrawCallback( ReferenceCaller1<XYWnd, rect_t, xy_update_xor_rectangle>( *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 );