From f03b280dafe7912b7d51b34206286c9f0ba93a49 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 23 Apr 2012 15:45:33 +0100 Subject: Fix remaining Lucid build issues, hopefully (bzr r11285) --- src/widgets/toolbox.cpp | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'src/widgets/toolbox.cpp') diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 58c7958ba..e1cbf8ff6 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -584,7 +584,7 @@ static void update_aux_toolbox(SPDesktop *desktop, SPEventContext *eventcontext, static void setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop); static void update_commands_toolbox(SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget *toolbox); -static GtkWidget * sp_toolbox_button_new_from_verb_with_doubleclick( GtkWidget *t, Inkscape::IconSize size, SPButtonType type, +static GtkToolItem * sp_toolbox_button_item_new_from_verb_with_doubleclick( GtkWidget *t, Inkscape::IconSize size, SPButtonType type, Inkscape::Verb *verb, Inkscape::Verb *doubleclick_verb, Inkscape::UI::View::View *view); @@ -656,18 +656,19 @@ Gtk::Widget* VerbAction::create_tool_item_vfunc() // Gtk::Widget* widg = Gtk::Action::create_tool_item_vfunc(); Inkscape::IconSize toolboxSize = ToolboxFactory::prefToSize("/toolbox/tools/small"); GtkWidget* toolbox = 0; - GtkWidget *button = sp_toolbox_button_new_from_verb_with_doubleclick( toolbox, toolboxSize, - SP_BUTTON_TYPE_TOGGLE, - verb, - verb2, - view ); + GtkToolItem *button_toolitem = sp_toolbox_button_item_new_from_verb_with_doubleclick( toolbox, toolboxSize, + SP_BUTTON_TYPE_TOGGLE, + verb, + verb2, + view ); + + GtkWidget* button_widget = gtk_bin_get_child(GTK_BIN(button_toolitem)); + if ( active ) { - sp_button_toggle_set_down( SP_BUTTON(button), active); + sp_button_toggle_set_down( SP_BUTTON(button_widget), active); } - gtk_widget_show_all( button ); - Gtk::Widget* wrapped = Glib::wrap(button); - Gtk::ToolItem* holder = Gtk::manage(new Gtk::ToolItem()); - holder->add(*wrapped); + gtk_widget_show_all( button_widget ); + Gtk::ToolItem* holder = Glib::wrap(button_toolitem); // g_message("create_tool_item_vfunc() = %p for '%s'", holder, verb->get_id()); return holder; @@ -841,7 +842,7 @@ static void delete_prefspusher(GtkObject * /*obj*/, PrefPusher *watcher ) // ------------------------------------------------------ -GtkWidget * sp_toolbox_button_new_from_verb_with_doubleclick(GtkWidget *t, Inkscape::IconSize size, SPButtonType type, +GtkToolItem * sp_toolbox_button_item_new_from_verb_with_doubleclick(GtkWidget *t, Inkscape::IconSize size, SPButtonType type, Inkscape::Verb *verb, Inkscape::Verb *doubleclick_verb, Inkscape::UI::View::View *view) { @@ -861,24 +862,27 @@ GtkWidget * sp_toolbox_button_new_from_verb_with_doubleclick(GtkWidget *t, Inksc /* fixme: Implement sp_button_new_from_action */ GtkWidget *b = sp_button_new(size, type, action, doubleclick_action); gtk_widget_show(b); - + GtkToolItem *b_toolitem = gtk_tool_item_new(); + gtk_container_add(GTK_CONTAINER(b_toolitem), b); unsigned int shortcut = sp_shortcut_get_primary(verb); if (shortcut != GDK_KEY_VoidSymbol) { gchar *key = sp_shortcut_get_label(shortcut); gchar *tip = g_strdup_printf ("%s (%s)", action->tip, key); if ( t ) { - gtk_toolbar_append_widget( GTK_TOOLBAR(t), b, tip, 0 ); + gtk_toolbar_insert(GTK_TOOLBAR(t), b_toolitem, -1); + gtk_widget_set_tooltip_text(b, tip); } g_free(tip); g_free(key); } else { if ( t ) { - gtk_toolbar_append_widget( GTK_TOOLBAR(t), b, action->tip, 0 ); + gtk_toolbar_insert(GTK_TOOLBAR(t), b_toolitem, -1); + gtk_widget_set_tooltip_text(b, action->tip); } } - return b; + return b_toolitem; } @@ -2075,7 +2079,7 @@ void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop) void update_tool_toolbox( SPDesktop *desktop, SPEventContext *eventcontext, GtkWidget * /*toolbox*/ ) { gchar const *const tname = ( eventcontext - ? gtk_type_name(GTK_OBJECT_TYPE(eventcontext)) + ? g_type_name(G_OBJECT_TYPE(eventcontext)) : NULL ); Glib::RefPtr mainActions = create_or_fetch_actions( desktop ); @@ -2178,7 +2182,7 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop) void update_aux_toolbox(SPDesktop * /*desktop*/, SPEventContext *eventcontext, GtkWidget *toolbox) { gchar const *tname = ( eventcontext - ? gtk_type_name(GTK_OBJECT_TYPE(eventcontext)) + ? g_type_name(G_OBJECT_TYPE(eventcontext)) : NULL ); for (int i = 0 ; aux_toolboxes[i].type_name ; i++ ) { GtkWidget *sub_toolbox = GTK_WIDGET(g_object_get_data(G_OBJECT(toolbox), aux_toolboxes[i].data_name)); -- cgit v1.2.3 From 55e1e3451e22a636ba0a87017eef2d5fe2ca05bb Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 23 Apr 2012 16:19:09 +0100 Subject: Get rid of GtkObject in toolbox (bzr r11286) --- src/widgets/toolbox.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'src/widgets/toolbox.cpp') diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index e1cbf8ff6..6eb394f87 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -834,7 +834,7 @@ void PrefPusher::notify(Inkscape::Preferences::Entry const &newVal) } } -static void delete_prefspusher(GtkObject * /*obj*/, PrefPusher *watcher ) +static void delete_prefspusher(GObject * /*obj*/, PrefPusher *watcher ) { delete watcher; } @@ -4045,7 +4045,7 @@ static void sp_spl_tb_t0_value_changed(GtkAdjustment *adj, GObject *tbl) sp_spl_tb_value_changed(adj, tbl, "t0"); } -static void sp_spl_tb_defaults(GtkWidget * /*widget*/, GtkObject *obj) +static void sp_spl_tb_defaults(GtkWidget * /*widget*/, GObject *obj) { GtkWidget *tbl = GTK_WIDGET(obj); @@ -4056,19 +4056,19 @@ static void sp_spl_tb_defaults(GtkWidget * /*widget*/, GtkObject *obj) gdouble exp = 1.0; gdouble t0 = 0.0; - adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(obj), "revolution"); + adj = (GtkAdjustment*)g_object_get_data(obj, "revolution"); gtk_adjustment_set_value(adj, rev); gtk_adjustment_value_changed(adj); - adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(obj), "expansion"); + adj = (GtkAdjustment*)g_object_get_data(obj, "expansion"); gtk_adjustment_set_value(adj, exp); gtk_adjustment_value_changed(adj); - adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(obj), "t0"); + adj = (GtkAdjustment*)g_object_get_data(obj, "t0"); gtk_adjustment_set_value(adj, t0); gtk_adjustment_value_changed(adj); - spinbutton_defocus(GTK_OBJECT(tbl)); + spinbutton_defocus(tbl); } @@ -4378,7 +4378,7 @@ static void sp_pen_toolbox_prep(SPDesktop * /*desktop*/, GtkActionGroup* mainAct } -static void sp_pencil_tb_defaults(GtkWidget * /*widget*/, GtkObject *obj) +static void sp_pencil_tb_defaults(GtkWidget * /*widget*/, GObject *obj) { GtkWidget *tbl = GTK_WIDGET(obj); @@ -4387,11 +4387,11 @@ static void sp_pencil_tb_defaults(GtkWidget * /*widget*/, GtkObject *obj) // fixme: make settable gdouble tolerance = 4; - adj = (GtkAdjustment*)g_object_get_data(G_OBJECT(obj), "tolerance"); + adj = (GtkAdjustment*)g_object_get_data(obj, "tolerance"); gtk_adjustment_set_value(adj, tolerance); gtk_adjustment_value_changed(adj); - spinbutton_defocus(GTK_OBJECT(tbl)); + spinbutton_defocus(tbl); } static void sp_pencil_tb_tolerance_value_changed(GtkAdjustment *adj, GObject *tbl) @@ -5724,7 +5724,7 @@ static void sp_arctb_defaults(GtkWidget *, GObject *obj) gtk_adjustment_set_value(adj, 0.0); gtk_adjustment_value_changed(adj); - spinbutton_defocus( GTK_OBJECT(obj) ); + spinbutton_defocus(GTK_WIDGET(obj)); } static void arc_tb_event_attr_changed(Inkscape::XML::Node *repr, gchar const * /*name*/, @@ -5945,14 +5945,14 @@ static void toggle_dropper_pick_alpha( GtkToggleAction* act, gpointer tbl ) } } - spinbutton_defocus(GTK_OBJECT(tbl)); + spinbutton_defocus(GTK_WIDGET(tbl)); } static void toggle_dropper_set_alpha( GtkToggleAction* act, gpointer tbl ) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setBool( "/tools/dropper/setalpha", gtk_toggle_action_get_active( act ) ); - spinbutton_defocus(GTK_OBJECT(tbl)); + spinbutton_defocus(GTK_WIDGET(tbl)); } @@ -8176,7 +8176,7 @@ static void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions //## Connector ## //######################### -static void sp_connector_mode_toggled( GtkToggleAction* act, GtkObject * /*tbl*/ ) +static void sp_connector_mode_toggled( GtkToggleAction* act, GObject * /*tbl*/ ) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setBool("/tools/connector/mode", @@ -8361,14 +8361,14 @@ static void sp_connector_graph_layout(void) DocumentUndo::done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_DIALOG_ALIGN_DISTRIBUTE, _("Arrange connector network")); } -static void sp_directed_graph_layout_toggled( GtkToggleAction* act, GtkObject * /*tbl*/ ) +static void sp_directed_graph_layout_toggled( GtkToggleAction* act, GObject * /*tbl*/ ) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setBool("/tools/connector/directedlayout", gtk_toggle_action_get_active( act )); } -static void sp_nooverlaps_graph_layout_toggled( GtkToggleAction* act, GtkObject * /*tbl*/ ) +static void sp_nooverlaps_graph_layout_toggled( GtkToggleAction* act, GObject * /*tbl*/ ) { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setBool("/tools/connector/avoidoverlaplayout", @@ -8397,7 +8397,7 @@ static void connector_tb_event_attr_changed(Inkscape::XML::Node *repr, gtk_adjustment_set_value(adj, spacing); gtk_adjustment_value_changed(adj); - spinbutton_defocus(GTK_OBJECT(tbl)); + spinbutton_defocus(tbl); } } -- cgit v1.2.3 From 228a5e7868174e94f34abec47307a43e48cc2a72 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 23 Apr 2012 16:37:37 +0100 Subject: Correct GTK+ 3 box syntax in toolbox (bzr r11287) --- src/widgets/toolbox.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/widgets/toolbox.cpp') diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 6eb394f87..7491c9c28 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -1067,8 +1067,8 @@ static GtkWidget* toolboxNewCommon( GtkWidget* tb, BarId id, GtkPositionType han GtkWidget *ToolboxFactory::createToolToolbox() { #if GTK_CHECK_VERSION(3,0,0) - GtkWidget *tb = gtk_box_new(GTK_ORIENTATION, 0); - gtk_box_new(GTK_BOX(tb), FALSE); + GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); + gtk_box_set_homogeneous(GTK_BOX(tb), FALSE); #else GtkWidget *tb = gtk_vbox_new(FALSE, 0); #endif @@ -1080,7 +1080,7 @@ GtkWidget *ToolboxFactory::createAuxToolbox() { #if GTK_CHECK_VERSION(3,0,0) GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_new(GTK_BOX(tb), FALSE); + gtk_box_set_homogeneous(GTK_BOX(tb), FALSE); #else GtkWidget *tb = gtk_vbox_new(FALSE, 0); #endif @@ -1096,7 +1096,7 @@ GtkWidget *ToolboxFactory::createCommandsToolbox() { #if GTK_CHECK_VERSION(3,0,0) GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_new(GTK_BOX(tb), FALSE); + gtk_box_set_homogeneous(GTK_BOX(tb), FALSE); #else GtkWidget *tb = gtk_vbox_new(FALSE, 0); #endif @@ -1108,7 +1108,7 @@ GtkWidget *ToolboxFactory::createSnapToolbox() { #if GTK_CHECK_VERSION(3,0,0) GtkWidget *tb = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); - gtk_box_new(GTK_BOX(tb), FALSE); + gtk_box_set_homogeneous(GTK_BOX(tb), FALSE); #else GtkWidget *tb = gtk_vbox_new(FALSE, 0); #endif -- cgit v1.2.3 From 3b09d1b8be1798131ce372d1eb308160c2383f88 Mon Sep 17 00:00:00 2001 From: John Smith Date: Wed, 25 Apr 2012 13:52:00 +0900 Subject: Fix for 950677 : Add link option to gradient toolbar (bzr r11291) --- src/widgets/toolbox.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/widgets/toolbox.cpp') diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 7491c9c28..7d73c042b 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -538,6 +538,7 @@ static gchar const * ui_descr = " " " " " " + " " " " " " " " -- cgit v1.2.3