X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=libs%2Fgtkutil%2Fcontainer.h;h=12d0ca99706020b5b6910f03c595df1c72158bfa;hb=414307f1eb6b2f46b87121ea71d63adf973cf571;hp=d931f0f02e1bf80fb3ed76c4f594ebdd8bd92084;hpb=234b657ba977434c3c0be08fb154eaac6c3ac798;p=xonotic%2Fnetradiant.git diff --git a/libs/gtkutil/container.h b/libs/gtkutil/container.h index d931f0f0..12d0ca99 100644 --- a/libs/gtkutil/container.h +++ b/libs/gtkutil/container.h @@ -22,20 +22,11 @@ #if !defined( INCLUDED_GTKUTIL_CONTAINER_H ) #define INCLUDED_GTKUTIL_CONTAINER_H -#include - -inline ui::Widget container_add_widget( ui::Container container, ui::Widget widget ){ - gtk_container_add( container, widget ); - return widget; -} - -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( ui::Container container ){ - gtk_container_foreach(container, (GtkCallback) container_remove, container ); +inline void container_remove_all(ui::Container container) +{ + container.foreach([=](ui::Widget it) mutable { + container.remove(it); + }); } #endif