Remove <gtk/gtk.h> from gtkutil/widget.h

[xonotic/netradiant.git] / radiant / camwindow.cpp

diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp
index 97d5fc1cf7082df7cdfc87923bfd7c0aad7fbdeb..d77b519b3575ba83fa299527d6a09db3eaa896b1 100644 (file)
--- a/radiant/camwindow.cpp
+++ b/radiant/camwindow.cpp
@@ -671,7 +671,7 @@ FreezePointer m_freezePointer;
 
 public:
 ui::Widget m_gl_widget;
-ui::Window m_parent;
+ui::Window m_parent{ui::null};
 
 SelectionSystemWindowObserver* m_window_observer;
 XORRectangle m_XORRectangle;
@@ -769,7 +769,7 @@ ToggleShown g_camera_shown( true );
 
 void CamWnd_setParent( CamWnd& camwnd, ui::Window parent ){
        camwnd.m_parent = parent;
-       g_camera_shown.connect( GTK_WIDGET( camwnd.m_parent ) );
+       g_camera_shown.connect( camwnd.m_parent );
 }
 
 void CamWnd_Update( CamWnd& camwnd ){
@@ -1148,7 +1148,7 @@ CamWnd::CamWnd() :
        m_gl_widget( ui::Widget(glwidget_new( TRUE )) ),
        m_window_observer( NewWindowObserver() ),
        m_XORRectangle( m_gl_widget ),
-       m_deferredDraw( WidgetQueueDrawCaller( *m_gl_widget ) ),
+       m_deferredDraw( WidgetQueueDrawCaller( m_gl_widget ) ),
        m_deferred_motion( selection_motion, m_window_observer ),
        m_selection_button_press_handler( 0 ),
        m_selection_button_release_handler( 0 ),