void toolbar_insert( ui::Toolbar 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()));
+ auto it = ui::ToolItem::from(gtk_separator_tool_item_new());
it.show();
toolbar.add(it);
return;
}
if (type == IToolbarButton::eButton) {
- auto button = ui::ToolButton(GTK_TOOL_BUTTON(gtk_tool_button_new(GTK_WIDGET(new_plugin_image(icon)), text)));
+ auto button = ui::ToolButton::from(gtk_tool_button_new(new_plugin_image(icon), text));
gtk_widget_set_tooltip_text(button, tooltip);
gtk_widget_show_all(button);
- g_signal_connect(button, "clicked", G_CALLBACK(handler), data);
+ button.connect("clicked", G_CALLBACK(handler), data);
toolbar.add(button);
return;
}
if (type == IToolbarButton::eToggleButton) {
- auto button = ui::ToolButton(GTK_TOOL_BUTTON(gtk_toggle_tool_button_new()));
- gtk_tool_button_set_icon_widget(button, GTK_WIDGET(new_plugin_image(icon)));
+ auto button = ui::ToolButton::from(gtk_toggle_tool_button_new());
+ gtk_tool_button_set_icon_widget(button, new_plugin_image(icon));
gtk_tool_button_set_label(button, text);
gtk_widget_set_tooltip_text(button, tooltip);
gtk_widget_show_all(button);
- g_signal_connect(button, "toggled", G_CALLBACK(handler), data);
+ button.connect("toggled", G_CALLBACK(handler), data);
toolbar.add(button);
return;
}
ERROR_MESSAGE( "invalid toolbar button type" );
}
-void ActivateToolbarButton( GtkToolButton *widget, gpointer data ){
+void ActivateToolbarButton( ui::ToolButton widget, gpointer data ){
(const_cast<const IToolbarButton *>( reinterpret_cast<IToolbarButton *>( data )))->activate();
}
toolbar_insert( toolbar, button->getImage(), button->getText(), button->getTooltip(), button->getType(), G_CALLBACK( ActivateToolbarButton ), reinterpret_cast<gpointer>( const_cast<IToolbarButton*>( button ) ) );
}
-ui::Toolbar g_plugin_toolbar{nullptr};
+ui::Toolbar g_plugin_toolbar{ui::null};
void PluginToolbar_populate(){
class AddToolbarItemVisitor : public ToolbarModules::Visitor
ui::Toolbar create_plugin_toolbar(){
- auto toolbar = ui::Toolbar(GTK_TOOLBAR( gtk_toolbar_new() ));
+ auto toolbar = ui::Toolbar::from( gtk_toolbar_new() );
gtk_orientable_set_orientation( GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL );
gtk_toolbar_set_style( toolbar, GTK_TOOLBAR_ICONS );
toolbar.show();