X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fplugintoolbar.cpp;h=6486e1bd176725c99f6e235b4bf466a97933d61e;hp=03ef2074b659455dbf2c73683be05d57787b4bf7;hb=4ebf4de56410776f8aa2b1e47ff71d40c57af629;hpb=3c73487420fde8d4a3b5360d8b99e48132517900

diff --git a/radiant/plugintoolbar.cpp b/radiant/plugintoolbar.cpp
index 03ef2074..6486e1bd 100644
--- a/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@ -25,8 +25,6 @@
 #include "itoolbar.h"
 #include "modulesystem.h"
 
-#include <gtk/gtktoolbar.h>
-
 #include "stream/stringstream.h"
 #include "gtkutil/image.h"
 #include "gtkutil/container.h"
@@ -34,66 +32,65 @@
 #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;
-		GtkImage* image = image_new_from_file_with_mask( fullpath.c_str() );
-		if ( image != 0 ) {
-			return image;
-		}
+		if ( auto image = image_new_from_file_with_mask(fullpath.c_str()) ) return image;
 	}
 
 	{
 		StringOutputStream fullpath( 256 );
 		fullpath << AppPath_get() << g_pluginsDir << "bitmaps/" << filename;
-		GtkImage* image = image_new_from_file_with_mask( fullpath.c_str() );
-		if ( image != 0 ) {
-			return image;
-		}
+		if ( auto image = image_new_from_file_with_mask(fullpath.c_str()) ) return image;
 	}
 
 	{
 		StringOutputStream fullpath( 256 );
 		fullpath << AppPath_get() << g_modulesDir << "bitmaps/" << filename;
-		GtkImage* image = image_new_from_file_with_mask( fullpath.c_str() );
-		if ( image != 0 ) {
-			return image;
-		}
+		if ( auto image = image_new_from_file_with_mask(fullpath.c_str()) ) return image;
 	}
 
 	return image_new_missing();
 }
 
-inline GtkToolbarChildType gtktoolbarchildtype_for_toolbarbuttontype( IToolbarButton::EType type ){
-	switch ( type )
-	{
-	case IToolbarButton::eSpace:
-		return GTK_TOOLBAR_CHILD_SPACE;
-	case IToolbarButton::eButton:
-		return GTK_TOOLBAR_CHILD_BUTTON;
-	case IToolbarButton::eToggleButton:
-		return GTK_TOOLBAR_CHILD_TOGGLEBUTTON;
-	case IToolbarButton::eRadioButton:
-		return GTK_TOOLBAR_CHILD_RADIOBUTTON;
+void toolbar_insert( GtkToolbar *toolbar, const char* icon, const char* text, const char* tooltip, IToolbarButton::EType type, GCallback handler, gpointer data ){
+	if (type == IToolbarButton::eSpace) {
+		auto it = ui::Widget(GTK_WIDGET(gtk_separator_tool_item_new()));
+		it.show();
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(it));
+		return;
+	}
+	if (type == IToolbarButton::eButton) {
+		auto button = gtk_tool_button_new(GTK_WIDGET(new_plugin_image(icon)), text);
+		gtk_widget_set_tooltip_text(GTK_WIDGET(button), tooltip);
+		gtk_widget_show_all(GTK_WIDGET(button));
+		g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(handler), data);
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
+		return;
+	}
+	if (type == IToolbarButton::eToggleButton) {
+		auto button = gtk_toggle_tool_button_new();
+		gtk_tool_button_set_icon_widget(GTK_TOOL_BUTTON(button), GTK_WIDGET(new_plugin_image(icon)));
+		gtk_tool_button_set_label(GTK_TOOL_BUTTON(button), text);
+		gtk_widget_set_tooltip_text(GTK_WIDGET(button), tooltip);
+		gtk_widget_show_all(GTK_WIDGET(button));
+		g_signal_connect(G_OBJECT(button), "toggled", G_CALLBACK(handler), data);
+		gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button));
+		return;
 	}
 	ERROR_MESSAGE( "invalid toolbar button type" );
-	return (GtkToolbarChildType)0;
-}
-
-void toolbar_insert( GtkToolbar *toolbar, const char* icon, const char* text, const char* tooltip, IToolbarButton::EType type, GtkSignalFunc handler, gpointer data ){
-	gtk_toolbar_append_element( toolbar, gtktoolbarchildtype_for_toolbarbuttontype( type ), 0, text, tooltip, "", GTK_WIDGET( new_plugin_image( icon ) ), handler, data );
 }
 
-void ActivateToolbarButton( GtkWidget *widget, gpointer data ){
-	const_cast<const IToolbarButton*>( reinterpret_cast<IToolbarButton*>( data ) )->activate();
+void ActivateToolbarButton( GtkToolButton *widget, gpointer data ){
+	(const_cast<const IToolbarButton *>( reinterpret_cast<IToolbarButton *>( data )))->activate();
 }
 
 void PlugInToolbar_AddButton( GtkToolbar* toolbar, const IToolbarButton* button ){
-	toolbar_insert( toolbar, button->getImage(), button->getText(), button->getTooltip(), button->getType(), GTK_SIGNAL_FUNC( ActivateToolbarButton ), reinterpret_cast<gpointer>( const_cast<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
@@ -117,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() );
-	gtk_toolbar_set_orientation( toolbar, GTK_ORIENTATION_HORIZONTAL );
+	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;