Wrap gtkutil/container

[xonotic/netradiant.git] / libs / gtkutil / container.h

diff --git a/libs/gtkutil/container.h b/libs/gtkutil/container.h
index e633d81c841ad7a03043b04b2486256b6efbd89a..d931f0f02e1bf80fb3ed76c4f594ebdd8bd92084 100644 (file)
--- a/libs/gtkutil/container.h
+++ b/libs/gtkutil/container.h
@@ -24,17 +24,18 @@
 
 #include <gtk/gtk.h>
 
-inline GtkWidget* container_add_widget( GtkContainer* container, GtkWidget* widget ){
+inline ui::Widget container_add_widget( ui::Container container, ui::Widget widget ){
        gtk_container_add( container, widget );
        return widget;
 }
 
-inline void container_remove( GtkWidget* item, gpointer data ){
-       gtk_container_remove( GTK_CONTAINER( data ), item );
+inline void container_remove( ui::Widget item, gpointer data ){
+       auto container = ui::Container(GTK_CONTAINER( data ));
+       gtk_container_remove( container, item );
 }
 
-inline void container_remove_all( GtkContainer* container ){
-       gtk_container_foreach( container, container_remove, container );
+inline void container_remove_all( ui::Container container ){
+       gtk_container_foreach(container, (GtkCallback) container_remove, container );
 }
 
 #endif