Wrap gtkutil/dialog

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

diff --git a/radiant/plugintoolbar.cpp b/radiant/plugintoolbar.cpp
index 4f554744fd6d25a0405a97d348344c9e0da9c7c9..3a79f3e13a61a20a4dfc6c6fa895a1f8226fbc59 100644 (file)
--- a/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@ -25,8 +25,6 @@
 #include "itoolbar.h"
 #include "modulesystem.h"
 
-#include <gtk/gtk.h>
-
 #include "stream/stringstream.h"
 #include "gtkutil/image.h"
 #include "gtkutil/container.h"
@@ -34,7 +32,7 @@
 #include "mainframe.h"
 #include "plugin.h"
 
-GtkImage* new_plugin_image( const char* filename ){
+ui::Image new_plugin_image( const char* filename ){
        {
                StringOutputStream fullpath( 256 );
                fullpath << GameToolsPath_get() << g_pluginsDir << "bitmaps/" << filename;
@@ -92,7 +90,7 @@ void PlugInToolbar_AddButton( GtkToolbar* toolbar, const IToolbarButton* button
        toolbar_insert( toolbar, button->getImage(), button->getText(), button->getTooltip(), button->getType(), G_CALLBACK( ActivateToolbarButton ), reinterpret_cast<gpointer>( const_cast<IToolbarButton*>( button ) ) );
 }
 
-GtkToolbar* g_plugin_toolbar = 0;
+ui::Toolbar g_plugin_toolbar{nullptr};
 
 void PluginToolbar_populate(){
        class AddToolbarItemVisitor : public ToolbarModules::Visitor
@@ -116,16 +114,15 @@ public:
 }
 
 void PluginToolbar_clear(){
-       container_remove_all( GTK_CONTAINER( g_plugin_toolbar ) );
+       container_remove_all( g_plugin_toolbar );
 }
 
-GtkToolbar* create_plugin_toolbar(){
-       GtkToolbar *toolbar;
+ui::Toolbar create_plugin_toolbar(){
 
-       toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
+       auto toolbar = ui::Toolbar(GTK_TOOLBAR( gtk_toolbar_new() ));
        gtk_orientable_set_orientation( GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL );
        gtk_toolbar_set_style( toolbar, GTK_TOOLBAR_ICONS );
-       gtk_widget_show( GTK_WIDGET( toolbar ) );
+       toolbar.show();
 
        g_plugin_toolbar = toolbar;