Merge branch 'werror' into 'master'

[xonotic/netradiant.git] / libs / gtkutil / frame.cpp

diff --git a/libs/gtkutil/frame.cpp b/libs/gtkutil/frame.cpp
index 8914fb707937980da8fa4984771c969ef0d02cdc..c32db754ea2d6b8c663b00925e2c177f2462696e 100644 (file)
--- a/libs/gtkutil/frame.cpp
+++ b/libs/gtkutil/frame.cpp
@@ -21,13 +21,15 @@
 
 #include "frame.h"
 
-#include <gtk/gtkframe.h>
+#include <gtk/gtk.h>
+#include <uilib/uilib.h>
 
-GtkFrame* create_framed_widget( GtkWidget* widget ){
-       GtkFrame* frame = GTK_FRAME( gtk_frame_new( 0 ) );
-       gtk_widget_show( GTK_WIDGET( frame ) );
-       gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN );
-       gtk_container_add( GTK_CONTAINER( frame ), widget );
-       gtk_widget_show( GTK_WIDGET( widget ) );
-       return frame;
+ui::Frame create_framed_widget(ui::Widget widget)
+{
+    auto frame = ui::Frame();
+    frame.show();
+    gtk_frame_set_shadow_type(frame, GTK_SHADOW_IN);
+    frame.add(widget);
+    widget.show();
+    return frame;
 }