From 6129af7cc5b723223e9617614c931936e5190421 Mon Sep 17 00:00:00 2001 From: mental Date: Mon, 17 Apr 2006 04:46:51 +0000 Subject: [PATCH] Get rid of the SP_DT_* macros which do nothing more than provide additional, confusing, names for other functions. If shorter names are desired, the actual functions should be renamed -- or better, made into member functions. --- ChangeLog | 46 ++++++ src/application/editor.cpp | 26 ++-- src/arc-context.cpp | 10 +- src/conn-avoid-ref.cpp | 2 +- src/connector-context.cpp | 18 +-- src/desktop-events.cpp | 4 +- src/desktop-handles.h | 14 -- src/dialogs/clonetiler.cpp | 32 ++-- src/dialogs/export.cpp | 40 ++--- src/dialogs/fill-style.cpp | 8 +- src/dialogs/find.cpp | 4 +- src/dialogs/iconpreview.cpp | 2 +- src/dialogs/item-properties.cpp | 8 +- src/dialogs/layer-properties.cpp | 6 +- src/dialogs/object-properties.cpp | 2 +- src/dialogs/stroke-style.cpp | 32 ++-- src/dialogs/swatches.cpp | 4 +- src/dialogs/text-edit.cpp | 10 +- src/dialogs/tiledialog.cpp | 14 +- src/dialogs/xml-tree.cpp | 12 +- src/draw-anchor.cpp | 2 +- src/draw-context.cpp | 10 +- src/dropper-context.cpp | 14 +- src/dyna-draw-context.cpp | 12 +- src/event-context.cpp | 6 +- src/extension/implementation/script.cpp | 2 +- src/file.cpp | 8 +- src/gradient-context.cpp | 16 +- src/gradient-drag.cpp | 10 +- src/helper/stock-items.cpp | 4 +- src/inkscape.cpp | 26 ++-- src/interface.cpp | 6 +- src/jabber_whiteboard/callbacks.cpp | 8 +- src/jabber_whiteboard/chat-handler.cpp | 2 +- src/jabber_whiteboard/message-processors.cpp | 2 +- src/jabber_whiteboard/message-queue.cpp | 4 +- src/jabber_whiteboard/session-manager.cpp | 4 +- src/knot.cpp | 4 +- src/node-context.cpp | 14 +- src/nodepath.cpp | 12 +- src/object-ui.cpp | 14 +- src/path-chemistry.cpp | 34 ++-- src/pen-context.cpp | 14 +- src/pencil-context.cpp | 4 +- src/rect-context.cpp | 12 +- src/rubberband.cpp | 2 +- src/satisfied-guide-cns.cpp | 2 +- src/selcue.cpp | 8 +- src/select-context.cpp | 18 +-- src/selection-chemistry.cpp | 154 +++++++++---------- src/selection.cpp | 2 +- src/seltrans.cpp | 26 ++-- src/sp-flowtext.cpp | 8 +- src/sp-namedview.cpp | 20 +-- src/sp-text.cpp | 2 +- src/spiral-context.cpp | 10 +- src/splivarot.cpp | 34 ++-- src/star-context.cpp | 10 +- src/text-chemistry.cpp | 42 ++--- src/text-context.cpp | 72 ++++----- src/tools-switch.cpp | 28 ++-- src/trace/potrace/inkscape-potrace.cpp | 4 +- src/trace/trace.cpp | 24 +-- src/ui/dialog/align-and-distribute.cpp | 42 ++--- src/ui/dialog/dialog.cpp | 2 +- src/ui/dialog/document-metadata.cpp | 10 +- src/ui/dialog/document-properties.cpp | 16 +- src/ui/dialog/inkscape-preferences.cpp | 6 +- src/ui/dialog/session-player.cpp | 2 +- src/ui/dialog/transformation.cpp | 12 +- src/ui/widget/color-picker.cpp | 2 +- src/ui/widget/page-sizer.cpp | 2 +- src/ui/widget/registered-widget.cpp | 22 +-- src/ui/widget/ruler.cpp | 2 +- src/ui/widget/selected-style.cpp | 50 +++--- src/ui/widget/tolerance-slider.cpp | 4 +- src/verbs.cpp | 24 +-- src/widgets/gradient-toolbar.cpp | 24 +-- src/widgets/layer-selector.cpp | 6 +- src/widgets/select-toolbar.cpp | 16 +- src/widgets/sp-xmlview-content.cpp | 2 +- src/widgets/toolbox.cpp | 66 ++++---- 82 files changed, 673 insertions(+), 641 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86c6782c9..9cd7a9ed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +2006-04-17 MenTaLguY + + * src/application/editor.cpp, src/arc-context.cpp, src/conn-avoid-ref.cpp, + src/connector-context.cpp, src/desktop-events.cpp, src/desktop-handles.h, + src/dialogs/clonetiler.cpp, src/dialogs/export.cpp, + src/dialogs/fill-style.cpp, src/dialogs/find.cpp, + src/dialogs/iconpreview.cpp, src/dialogs/item-properties.cpp, + src/dialogs/layer-properties.cpp, src/dialogs/object-properties.cpp, + src/dialogs/stroke-style.cpp, src/dialogs/swatches.cpp, + src/dialogs/text-edit.cpp, src/dialogs/tiledialog.cpp, + src/dialogs/xml-tree.cpp, src/draw-anchor.cpp, src/draw-context.cpp, + src/dropper-context.cpp, src/dyna-draw-context.cpp, + src/event-context.cpp, src/extension/implementation/script.cpp, + src/file.cpp, src/gradient-context.cpp, src/gradient-drag.cpp, + src/helper/stock-items.cpp, src/inkscape.cpp, src/interface.cpp, + src/jabber_whiteboard/callbacks.cpp, + src/jabber_whiteboard/chat-handler.cpp, + src/jabber_whiteboard/message-processors.cpp, + src/jabber_whiteboard/message-queue.cpp, + src/jabber_whiteboard/session-manager.cpp, src/knot.cpp, + src/node-context.cpp, src/nodepath.cpp, src/object-ui.cpp, + src/path-chemistry.cpp, src/pencil-context.cpp, src/pen-context.cpp, + src/rect-context.cpp, src/rubberband.cpp, src/satisfied-guide-cns.cpp, + src/selcue.cpp, src/select-context.cpp, src/selection-chemistry.cpp, + src/selection.cpp, src/seltrans.cpp, src/sp-flowtext.cpp, + src/spiral-context.cpp, src/splivarot.cpp, src/sp-namedview.cpp, + src/sp-text.cpp, src/star-context.cpp, src/text-chemistry.cpp, + src/text-context.cpp, src/tools-switch.cpp, + src/trace/potrace/inkscape-potrace.cpp, src/trace/trace.cpp, + src/ui/dialog/align-and-distribute.cpp, src/ui/dialog/dialog.cpp, + src/ui/dialog/document-metadata.cpp, + src/ui/dialog/document-properties.cpp, + src/ui/dialog/inkscape-preferences.cpp, + src/ui/dialog/session-player.cpp, src/ui/dialog/transformation.cpp, + src/ui/widget/color-picker.cpp, src/ui/widget/page-sizer.cpp, + src/ui/widget/registered-widget.cpp, src/ui/widget/ruler.cpp, + src/ui/widget/selected-style.cpp, src/ui/widget/tolerance-slider.cpp, + src/verbs.cpp, src/widgets/gradient-toolbar.cpp, + src/widgets/layer-selector.cpp, src/widgets/select-toolbar.cpp, + src/widgets/sp-xmlview-content.cpp, src/widgets/toolbox.cpp: + + Get rid of the SP_DT_* macros which do nothing more than provide + additional, confusing, names for other functions. If shorter names + are desired, the actual functions should be renamed -- or better, made + into member functions. + 2006-04-09 Jon A. Cruz * share/icons/icons.svg: Fixed jumping eye (layer visibility). diff --git a/src/application/editor.cpp b/src/application/editor.cpp index 6c3dbf896..1cc45f3c7 100644 --- a/src/application/editor.cpp +++ b/src/application/editor.cpp @@ -100,7 +100,7 @@ SPDocument* Editor::getActiveDocument() { if (getActiveDesktop()) { - return SP_DT_DOCUMENT (getActiveDesktop()); + return sp_desktop_document (getActiveDesktop()); } return NULL; @@ -153,9 +153,9 @@ Editor::addDesktop (SPDesktop *dt) if (isDesktopActive (dt)) { _instance->_desktop_activated_signal.emit (dt); - _instance->_event_context_set_signal.emit (SP_DT_EVENTCONTEXT (dt)); - _instance->_selection_set_signal.emit (SP_DT_SELECTION (dt)); - _instance->_selection_changed_signal.emit (SP_DT_SELECTION (dt)); + _instance->_event_context_set_signal.emit (sp_desktop_event_context (dt)); + _instance->_selection_set_signal.emit (sp_desktop_selection (dt)); + _instance->_selection_changed_signal.emit (sp_desktop_selection (dt)); } } @@ -173,13 +173,13 @@ Editor::removeDesktop (SPDesktop *dt) _instance->_desktops = g_slist_remove (_instance->_desktops, new_desktop); _instance->_desktops = g_slist_prepend (_instance->_desktops, new_desktop); _instance->_desktop_activated_signal.emit (new_desktop); - _instance->_event_context_set_signal.emit (SP_DT_EVENTCONTEXT (new_desktop)); - _instance->_selection_set_signal.emit (SP_DT_SELECTION (new_desktop)); - _instance->_selection_changed_signal.emit (SP_DT_SELECTION (new_desktop)); + _instance->_event_context_set_signal.emit (sp_desktop_event_context (new_desktop)); + _instance->_selection_set_signal.emit (sp_desktop_selection (new_desktop)); + _instance->_selection_changed_signal.emit (sp_desktop_selection (new_desktop)); } else { _instance->_event_context_set_signal.emit (0); - if (SP_DT_SELECTION(dt)) - SP_DT_SELECTION(dt)->clear(); + if (sp_desktop_selection(dt)) + sp_desktop_selection(dt)->clear(); } } @@ -207,9 +207,9 @@ Editor::activateDesktop (SPDesktop* dt) _instance->_desktops = g_slist_prepend (_instance->_desktops, dt); _instance->_desktop_activated_signal.emit (dt); - _instance->_event_context_set_signal.emit (SP_DT_EVENTCONTEXT(dt)); - _instance->_selection_set_signal.emit (SP_DT_SELECTION(dt)); - _instance->_selection_changed_signal.emit (SP_DT_SELECTION(dt)); + _instance->_event_context_set_signal.emit (sp_desktop_event_context(dt)); + _instance->_selection_set_signal.emit (sp_desktop_selection(dt)); + _instance->_selection_changed_signal.emit (sp_desktop_selection(dt)); } void @@ -242,7 +242,7 @@ Editor::isDuplicatedView (SPDesktop* dt) //Editor::getEventContext() //{ // if (getActiveDesktop()) { -// return SP_DT_EVENTCONTEXT (getActiveDesktop()); +// return sp_desktop_event_context (getActiveDesktop()); // } // // return NULL; diff --git a/src/arc-context.cpp b/src/arc-context.cpp index 10e38ee9a..8bee7fe02 100644 --- a/src/arc-context.cpp +++ b/src/arc-context.cpp @@ -184,7 +184,7 @@ void sp_arc_context_selection_changed(Inkscape::Selection * selection, gpointer static void sp_arc_context_setup(SPEventContext *ec) { SPArcContext *ac = SP_ARC_CONTEXT(ec); - Inkscape::Selection *selection = SP_DT_SELECTION(ec->desktop); + Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); if (((SPEventContextClass *) parent_class)->setup) { ((SPEventContextClass *) parent_class)->setup(ec); @@ -247,7 +247,7 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent static bool dragging; SPDesktop *desktop = event_context->desktop; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); SPArcContext *ac = SP_ARC_CONTEXT(event_context); event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); @@ -345,7 +345,7 @@ static gint sp_arc_context_root_handler(SPEventContext *event_context, GdkEvent } break; case GDK_Escape: - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); //TODO: make dragging escapable by Esc default: break; @@ -425,8 +425,8 @@ static void sp_arc_finish(SPArcContext *ac) SP_OBJECT(ac->item)->updateRepr(); - SP_DT_SELECTION(desktop)->set(ac->item); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_desktop_selection(desktop)->set(ac->item); + sp_document_done(sp_desktop_document(desktop)); ac->item = NULL; } diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp index 5de222ade..d90eca49b 100644 --- a/src/conn-avoid-ref.cpp +++ b/src/conn-avoid-ref.cpp @@ -263,7 +263,7 @@ void init_avoided_shape_geometry(SPDesktop *desktop) { // Don't count this as changes to the document, // it is basically just llate initialisation. - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); gboolean saved = sp_document_get_undo_sensitive(document); sp_document_set_undo_sensitive(document, FALSE); diff --git a/src/connector-context.cpp b/src/connector-context.cpp index a00407662..d8e7b8797 100644 --- a/src/connector-context.cpp +++ b/src/connector-context.cpp @@ -254,7 +254,7 @@ sp_connector_context_setup(SPEventContext *ec) ((SPEventContextClass *) parent_class)->setup(ec); } - cc->selection = SP_DT_SELECTION(dt); + cc->selection = sp_desktop_selection(dt); cc->sel_changed_connection.disconnect(); cc->sel_changed_connection = cc->selection->connectChanged( @@ -262,7 +262,7 @@ sp_connector_context_setup(SPEventContext *ec) (gpointer) cc)); /* Create red bpath */ - cc->red_bpath = sp_canvas_bpath_new(SP_DT_SKETCH(ec->desktop), NULL); + cc->red_bpath = sp_canvas_bpath_new(sp_desktop_sketch(ec->desktop), NULL); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cc->red_bpath), cc->red_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cc->red_bpath), 0x00000000, @@ -653,7 +653,7 @@ connector_handle_button_release(SPConnectorContext *const cc, GdkEventButton con if ( revent.button == 1 ) { SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc); - SPDocument *doc = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); NR::Point const event_w(revent.x, revent.y); @@ -788,7 +788,7 @@ spcc_connector_set_subsequent_point(SPConnectorContext *const cc, NR::Point cons Avoid::Point dst = { d[NR::X], d[NR::Y] }; if (!cc->newConnRef) { - Avoid::Router *router = SP_DT_DOCUMENT(dt)->router; + Avoid::Router *router = sp_desktop_document(dt)->router; cc->newConnRef = new Avoid::ConnRef(router, 0, src, dst); cc->newConnRef->updateEndPoint(Avoid::VertID::src, src); } @@ -863,7 +863,7 @@ spcc_flush_white(SPConnectorContext *cc, SPCurve *gc) sp_desktop_dt2root_affine(SP_EVENT_CONTEXT_DESKTOP(cc))); SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(cc); - SPDocument *doc = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); if ( c && !sp_curve_empty(c) ) { /* We actually have something to write */ @@ -1085,7 +1085,7 @@ static void cc_set_active_shape(SPConnectorContext *cc, SPItem *item) knot->desktop = cc->desktop; knot->flags = SP_KNOT_VISIBLE; - knot->item = sp_canvas_item_new (SP_DT_CONTROLS(cc->desktop), + knot->item = sp_canvas_item_new (sp_desktop_controls(cc->desktop), SP_TYPE_CTRL, "anchor", GTK_ANCHOR_CENTER, "filled", TRUE, @@ -1165,7 +1165,7 @@ cc_set_active_conn(SPConnectorContext *cc, SPItem *item) knot->desktop = cc->desktop; knot->flags = SP_KNOT_VISIBLE; - knot->item = sp_canvas_item_new (SP_DT_CONTROLS (cc->desktop), + knot->item = sp_canvas_item_new (sp_desktop_controls (cc->desktop), SP_TYPE_CTRL, "anchor", GTK_ANCHOR_CENTER, "filled", TRUE, @@ -1249,9 +1249,9 @@ void cc_selection_set_avoid(bool const set_avoid) return; } - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList *l = (GSList *) selection->itemList(); diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index fad40ca7e..3147fae24 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -131,7 +131,7 @@ static gint sp_dt_ruler_event(GtkWidget *widget, GdkEvent *event, SPDesktopWidge sp_repr_set_svg_double(repr, "position", guide_pos_dt); SP_OBJECT_REPR(desktop->namedview)->appendChild(repr); Inkscape::GC::release(repr); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } desktop->set_coordinate_status(event_dt); } @@ -211,7 +211,7 @@ gint sp_dt_guide_event(SPCanvasItem *item, GdkEvent *event, gpointer data) sp_guide_remove(guide); } moved = false; - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); desktop->set_coordinate_status(event_dt); desktop->setPosition (event_dt); } diff --git a/src/desktop-handles.h b/src/desktop-handles.h index 0a7e5e7be..3633ef1f0 100644 --- a/src/desktop-handles.h +++ b/src/desktop-handles.h @@ -29,20 +29,6 @@ namespace Inkscape { #define SP_COORDINATES_UNDERLINE_X (1 << NR::X) #define SP_COORDINATES_UNDERLINE_Y (1 << NR::Y) -#define SP_DT_EVENTCONTEXT(d) sp_desktop_event_context (d) -#define SP_DT_SELECTION(d) sp_desktop_selection (d) -#define SP_DT_DOCUMENT(d) sp_desktop_document (d) -#define SP_DT_CANVAS(d) sp_desktop_canvas (d) -#define SP_DT_ACETATE(d) sp_desktop_acetate (d) -#define SP_DT_MAIN(d) sp_desktop_main (d) -#define SP_DT_GRID(d) sp_desktop_grid (d) -#define SP_DT_GUIDES(d) sp_desktop_guides (d) -#define SP_DT_DRAWING(d) sp_desktop_drawing (d) -#define SP_DT_SKETCH(d) sp_desktop_sketch (d) -#define SP_DT_CONTROLS(d) sp_desktop_controls (d) -#define SP_DT_MSGSTACK(d) sp_desktop_message_stack (d) -#define SP_DT_NAMEDVIEW(d) sp_desktop_namedview (d) - SPEventContext * sp_desktop_event_context (SPDesktop const * desktop); Inkscape::Selection * sp_desktop_selection (SPDesktop const * desktop); SPDocument * sp_desktop_document (SPDesktop const * desktop); diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp index 22b35370e..64edcbfd5 100644 --- a/src/dialogs/clonetiler.cpp +++ b/src/dialogs/clonetiler.cpp @@ -183,7 +183,7 @@ clonetiler_change_selection (Inkscape::Application * /*inkscape*/, Inkscape::Sel static void clonetiler_external_change (Inkscape::Application * /*inkscape*/, GtkWidget *dlg) { - clonetiler_change_selection (NULL, SP_DT_SELECTION(SP_ACTIVE_DESKTOP), dlg); + clonetiler_change_selection (NULL, sp_desktop_selection(SP_ACTIVE_DESKTOP), dlg); } static void clonetiler_disconnect_gsignal (GObject *widget, gpointer source) { @@ -837,11 +837,11 @@ clonetiler_unclump (GtkWidget *widget, void *) if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty() || g_slist_length((GSList *) selection->itemList()) > 1) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select one object whose tiled clones to unclump.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select one object whose tiled clones to unclump.")); return; } @@ -856,13 +856,13 @@ clonetiler_unclump (GtkWidget *widget, void *) } } - sp_document_ensure_up_to_date(SP_DT_DOCUMENT(desktop)); + sp_document_ensure_up_to_date(sp_desktop_document(desktop)); unclump (to_unclump); g_slist_free (to_unclump); - sp_document_done (SP_DT_DOCUMENT (desktop)); + sp_document_done (sp_desktop_document (desktop)); } static guint @@ -888,11 +888,11 @@ clonetiler_remove (GtkWidget *widget, void *, bool do_undo = true) if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty() || g_slist_length((GSList *) selection->itemList()) > 1) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select one object whose tiled clones to remove.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select one object whose tiled clones to remove.")); return; } @@ -914,7 +914,7 @@ clonetiler_remove (GtkWidget *widget, void *, bool do_undo = true) clonetiler_change_selection (NULL, selection, dlg); if (do_undo) - sp_document_done (SP_DT_DOCUMENT (desktop)); + sp_document_done (sp_desktop_document (desktop)); } static NR::Rect @@ -956,17 +956,17 @@ clonetiler_apply (GtkWidget *widget, void *) if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select an object to clone.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select an object to clone.")); return; } // Check if more than one object is selected. if (g_slist_length((GSList *) selection->itemList()) > 1) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("If you want to clone several objects, group them and clone the group.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("If you want to clone several objects, group them and clone the group.")); return; } @@ -1044,7 +1044,7 @@ clonetiler_apply (GtkWidget *widget, void *) double gamma_picked = prefs_get_double_attribute_limited (prefs_path, "gamma_picked", 0, -10, 10); if (dotrace) { - clonetiler_trace_setup (SP_DT_DOCUMENT(desktop), 1.0, SP_ITEM (obj)); + clonetiler_trace_setup (sp_desktop_document(desktop), 1.0, SP_ITEM (obj)); } NR::Point c; @@ -1274,7 +1274,7 @@ clonetiler_apply (GtkWidget *widget, void *) SP_OBJECT_REPR(parent)->appendChild(clone); if (center_set) { - SPObject *clone_object = SP_DT_DOCUMENT(desktop)->getObjectByRepr(clone); + SPObject *clone_object = sp_desktop_document(desktop)->getObjectByRepr(clone); if (clone_object && SP_IS_ITEM(clone_object)) { clone_object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); SP_ITEM(clone_object)->setCenter(desktop->doc2dt(new_center)); @@ -1293,7 +1293,7 @@ clonetiler_apply (GtkWidget *widget, void *) clonetiler_change_selection (NULL, selection, dlg); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } static GtkWidget * @@ -2427,7 +2427,7 @@ clonetiler_dialog (void) // unitmenu GtkWidget *u = sp_unit_selector_new (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE); - sp_unit_selector_set_unit (SP_UNIT_SELECTOR(u), SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)->doc_units); + sp_unit_selector_set_unit (SP_UNIT_SELECTOR(u), sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units); { // Width spinbutton @@ -2571,7 +2571,7 @@ clonetiler_dialog (void) g_signal_connect(G_OBJECT(dlg), "destroy", G_CALLBACK(clonetiler_disconnect_gsignal), G_OBJECT (INKSCAPE)); // update now - clonetiler_change_selection (NULL, SP_DT_SELECTION(SP_ACTIVE_DESKTOP), dlg); + clonetiler_change_selection (NULL, sp_desktop_selection(SP_ACTIVE_DESKTOP), dlg); } { diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp index 372430bcd..5438dfdc5 100644 --- a/src/dialogs/export.cpp +++ b/src/dialogs/export.cpp @@ -260,7 +260,7 @@ sp_export_dialog_area_frame (GtkWidget * dlg) us = sp_unit_selector_new (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE); SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop) - sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), SP_DT_NAMEDVIEW(desktop)->doc_units); + sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), sp_desktop_namedview(desktop)->doc_units); gtk_box_pack_end (GTK_BOX (unitbox), us, FALSE, FALSE, 0); l = gtk_label_new (_("Units:")); gtk_box_pack_end (GTK_BOX (unitbox), l, FALSE, FALSE, 3); @@ -562,7 +562,7 @@ sp_export_find_default_selection(GtkWidget * dlg) { selection_type key = SELECTION_NUMBER_OF; - if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false) { + if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false) { key = SELECTION_SELECTION; } @@ -610,13 +610,13 @@ sp_export_selection_changed ( Inkscape::Application *inkscape, current_key = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type"))); if ((current_key == SELECTION_DRAWING || current_key == SELECTION_PAGE) && - (SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false && + (sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false && was_empty) { gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( gtk_object_get_data (base, selection_names[SELECTION_SELECTION])), TRUE ); } - was_empty = (SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty(); + was_empty = (sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty(); current_key = (selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type"))); @@ -646,7 +646,7 @@ sp_export_selection_modified ( Inkscape::Application *inkscape, if ( SP_ACTIVE_DESKTOP ) { SPDocument *doc; NRRect bbox; - doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP); + doc = sp_desktop_document (SP_ACTIVE_DESKTOP); sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)), &bbox); if (!(bbox.x0 > bbox.x1 && bbox.y0 > bbox.y1)) { @@ -655,9 +655,9 @@ sp_export_selection_modified ( Inkscape::Application *inkscape, } break; case SELECTION_SELECTION: - if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false) { + if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false) { NRRect bbox; - (SP_DT_SELECTION (SP_ACTIVE_DESKTOP))->bounds(&bbox); + (sp_desktop_selection (SP_ACTIVE_DESKTOP))->bounds(&bbox); sp_export_set_area (base, bbox.x0, bbox.y0, bbox.x1, bbox.y1); } break; @@ -705,16 +705,16 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base) { SPDocument *doc; NRRect bbox; - doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP); + doc = sp_desktop_document (SP_ACTIVE_DESKTOP); /* Notice how the switch is used to 'fall through' here to get various backups. If you modify this without noticing you'll probabaly screw something up. */ switch (key) { case SELECTION_SELECTION: - if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false) + if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false) { - (SP_DT_SELECTION (SP_ACTIVE_DESKTOP))->bounds(&bbox); + (sp_desktop_selection (SP_ACTIVE_DESKTOP))->bounds(&bbox); /* Only if there is a selection that we can set do we break, otherwise we fall through to the drawing */ @@ -798,13 +798,13 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base) break; } case SELECTION_SELECTION: - if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false) { + if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false) { const GSList * reprlst; bool filename_search = TRUE; bool xdpi_search = TRUE; bool ydpi_search = TRUE; - reprlst = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->reprList(); + reprlst = sp_desktop_selection(SP_ACTIVE_DESKTOP)->reprList(); for(; reprlst != NULL && filename_search && xdpi_search && @@ -842,7 +842,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base) one that's nice */ if (filename == NULL) { const gchar * id = NULL; - reprlst = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->reprList(); + reprlst = sp_desktop_selection(SP_ACTIVE_DESKTOP)->reprList(); for(; reprlst != NULL; reprlst = reprlst->next) { Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data; if (repr->attribute("id")) { @@ -991,7 +991,7 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base) } g_free(dirname); - SPNamedView *nv = SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP); + SPNamedView *nv = sp_desktop_namedview(SP_ACTIVE_DESKTOP); GtkWidget *dlg, *prg, *btn; /* progressbar-stuff */ char *fn; gchar *text; @@ -1024,7 +1024,7 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base) gtk_widget_show_all (dlg); /* Do export */ - if (!sp_export_png_file (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP), filename, + if (!sp_export_png_file (sp_desktop_document (SP_ACTIVE_DESKTOP), filename, x0, y0, x1, y1, width, height, nv->pagecolor, sp_export_progress_callback, base)) { @@ -1085,7 +1085,7 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base) bool saved = sp_document_get_undo_sensitive(doc); sp_document_set_undo_sensitive(doc, FALSE); - reprlst = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->reprList(); + reprlst = sp_desktop_selection(SP_ACTIVE_DESKTOP)->reprList(); for(; reprlst != NULL; reprlst = reprlst->next) { Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data; @@ -1253,8 +1253,8 @@ sp_export_detect_size(GtkObject * base) { // std::cout << "Looking at: " << selection_names[this_test[i]] << std::endl; switch (this_test[i]) { case SELECTION_SELECTION: - if ((SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false) { - NR::Rect bbox = (SP_DT_SELECTION (SP_ACTIVE_DESKTOP))->bounds(); + if ((sp_desktop_selection(SP_ACTIVE_DESKTOP))->isEmpty() == false) { + NR::Rect bbox = (sp_desktop_selection (SP_ACTIVE_DESKTOP))->bounds(); //std::cout << "Selection " << bbox; if (sp_export_bbox_equal(bbox,current_bbox)) { @@ -1263,7 +1263,7 @@ sp_export_detect_size(GtkObject * base) { } break; case SELECTION_DRAWING: { - SPDocument *doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP); + SPDocument *doc = sp_desktop_document (SP_ACTIVE_DESKTOP); NR::Rect bbox = sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc))); @@ -1277,7 +1277,7 @@ sp_export_detect_size(GtkObject * base) { case SELECTION_PAGE: { SPDocument *doc; - doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP); + doc = sp_desktop_document (SP_ACTIVE_DESKTOP); NR::Point x(0.0, 0.0); NR::Point y(sp_document_width(doc), diff --git a/src/dialogs/fill-style.cpp b/src/dialogs/fill-style.cpp index 2aaf6e6c2..1efae59e1 100644 --- a/src/dialogs/fill-style.cpp +++ b/src/dialogs/fill-style.cpp @@ -324,7 +324,7 @@ sp_fill_style_widget_paint_dragged (SPPaintSelector *psel, SPWidget *spw) case SP_PAINT_SELECTOR_MODE_COLOR_CMYK: { sp_paint_selector_set_flat_color (psel, SP_ACTIVE_DESKTOP, "fill", "fill-opacity"); - sp_document_maybe_done (SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP), undo_label); + sp_document_maybe_done (sp_desktop_document(SP_ACTIVE_DESKTOP), undo_label); g_object_set_data (G_OBJECT (spw), "local", GINT_TO_POINTER (TRUE)); // local change, do not update from selection break; } @@ -359,8 +359,8 @@ sp_fill_style_widget_paint_changed ( SPPaintSelector *psel, if (!desktop) { return; } - SPDocument *document = SP_DT_DOCUMENT (desktop); - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + SPDocument *document = sp_desktop_document (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); GSList const *items = selection->itemList(); @@ -393,7 +393,7 @@ sp_fill_style_widget_paint_changed ( SPPaintSelector *psel, case SP_PAINT_SELECTOR_MODE_COLOR_CMYK: { sp_paint_selector_set_flat_color (psel, desktop, "fill", "fill-opacity"); - sp_document_maybe_done (SP_DT_DOCUMENT(desktop), undo_label); + sp_document_maybe_done (sp_desktop_document(desktop), undo_label); // on release, toggle undo_label so that the next drag will not be lumped with this one if (undo_label == undo_label_1) diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp index c76390ccb..f3efeed81 100644 --- a/src/dialogs/find.cpp +++ b/src/dialogs/find.cpp @@ -349,7 +349,7 @@ void sp_find_dialog_find(GObject *, GObject *dlg) if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_object_get_data (GTK_OBJECT (dlg), "inlayer")))) { l = all_items (desktop->currentLayer(), l, hidden, locked); } else { - l = all_items (SP_DOCUMENT_ROOT (SP_DT_DOCUMENT (desktop)), l, hidden, locked); + l = all_items (SP_DOCUMENT_ROOT (sp_desktop_document (desktop)), l, hidden, locked); } } guint all = g_slist_length (l); @@ -371,7 +371,7 @@ void sp_find_dialog_find(GObject *, GObject *dlg) count), count, all, exact? _("exact") : _("partial")); - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); selection->clear(); selection->setList(n); scroll_to_show_item (desktop, SP_ITEM(n->data)); diff --git a/src/dialogs/iconpreview.cpp b/src/dialogs/iconpreview.cpp index 4a3248010..6641b3bfb 100644 --- a/src/dialogs/iconpreview.cpp +++ b/src/dialogs/iconpreview.cpp @@ -218,7 +218,7 @@ void IconPreviewPanel::refreshPreview() if ( selectionButton && selectionButton->get_active() ) { - Inkscape::Selection * sel = SP_DT_SELECTION(desktop); + Inkscape::Selection * sel = sp_desktop_selection(desktop); if ( sel ) { //g_message("found a selection to play with"); diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp index 50027e2fa..51b0abd61 100644 --- a/src/dialogs/item-properties.cpp +++ b/src/dialogs/item-properties.cpp @@ -234,7 +234,7 @@ sp_item_widget_new (void) gtk_widget_show_all (spw); - sp_item_widget_setup (SP_WIDGET (spw), SP_DT_SELECTION (SP_ACTIVE_DESKTOP)); + sp_item_widget_setup (SP_WIDGET (spw), sp_desktop_selection (SP_ACTIVE_DESKTOP)); return (GtkWidget *) spw; @@ -338,7 +338,7 @@ sp_item_widget_sensitivity_toggled (GtkWidget *widget, SPWidget *spw) if (gtk_object_get_data (GTK_OBJECT (spw), "blocked")) return; - SPItem *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->singleItem(); + SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem(); g_return_if_fail (item != NULL); gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE)); @@ -356,7 +356,7 @@ sp_item_widget_hidden_toggled(GtkWidget *widget, SPWidget *spw) if (gtk_object_get_data (GTK_OBJECT (spw), "blocked")) return; - SPItem *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->singleItem(); + SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem(); g_return_if_fail (item != NULL); gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE)); @@ -374,7 +374,7 @@ sp_item_widget_label_changed (GtkWidget *widget, SPWidget *spw) if (gtk_object_get_data (GTK_OBJECT (spw), "blocked")) return; - SPItem *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->singleItem(); + SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem(); g_return_if_fail (item != NULL); gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE)); diff --git a/src/dialogs/layer-properties.cpp b/src/dialogs/layer-properties.cpp index e79817462..5be24993a 100644 --- a/src/dialogs/layer-properties.cpp +++ b/src/dialogs/layer-properties.cpp @@ -113,7 +113,7 @@ LayerPropertiesDialog::_apply() g_assert(_strategy != NULL); _strategy->perform(*this); - sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP)); + sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP)); _close(); } @@ -191,7 +191,7 @@ void LayerPropertiesDialog::Rename::perform(LayerPropertiesDialog &dialog) { desktop->currentLayer()->setLabel( ( name.empty() ? NULL : (gchar *)name.c_str() ) ); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); // TRANSLATORS: This means "The layer has been renamed" desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Renamed layer")); } @@ -215,7 +215,7 @@ void LayerPropertiesDialog::Create::perform(LayerPropertiesDialog &dialog) { if (!name.empty()) { new_layer->setLabel((gchar *)name.c_str()); } - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); desktop->setCurrentLayer(new_layer); desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("New layer created.")); } diff --git a/src/dialogs/object-properties.cpp b/src/dialogs/object-properties.cpp index 2d8b5070b..7be1b8a1c 100644 --- a/src/dialogs/object-properties.cpp +++ b/src/dialogs/object-properties.cpp @@ -307,7 +307,7 @@ sp_fillstroke_opacity_changed (GtkAdjustment *a, SPWidget *dlg) sp_repr_css_attr_unref (css); - sp_document_maybe_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP), "fillstroke:opacity"); + sp_document_maybe_done (sp_desktop_document (SP_ACTIVE_DESKTOP), "fillstroke:opacity"); gtk_object_set_data (GTK_OBJECT (dlg), "blocked", GUINT_TO_POINTER (FALSE)); } diff --git a/src/dialogs/stroke-style.cpp b/src/dialogs/stroke-style.cpp index 6ad8e82c4..5fefb8aa9 100644 --- a/src/dialogs/stroke-style.cpp +++ b/src/dialogs/stroke-style.cpp @@ -260,7 +260,7 @@ sp_stroke_style_paint_dragged(SPPaintSelector *psel, SPWidget *spw) case SP_PAINT_SELECTOR_MODE_COLOR_CMYK: { sp_paint_selector_set_flat_color (psel, SP_ACTIVE_DESKTOP, "stroke", "stroke-opacity"); - sp_document_maybe_done (SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP), undo_label); + sp_document_maybe_done (sp_desktop_document(SP_ACTIVE_DESKTOP), undo_label); break; } @@ -280,8 +280,8 @@ sp_stroke_style_paint_changed(SPPaintSelector *psel, SPWidget *spw) g_object_set_data (G_OBJECT (spw), "update", GINT_TO_POINTER (TRUE)); SPDesktop *desktop = SP_ACTIVE_DESKTOP; - SPDocument *document = SP_DT_DOCUMENT (desktop); - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + SPDocument *document = sp_desktop_document (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); GSList const *items = selection->itemList(); @@ -313,7 +313,7 @@ sp_stroke_style_paint_changed(SPPaintSelector *psel, SPWidget *spw) case SP_PAINT_SELECTOR_MODE_COLOR_CMYK: { sp_paint_selector_set_flat_color (psel, desktop, "stroke", "stroke-opacity"); - sp_document_maybe_done (SP_DT_DOCUMENT(desktop), undo_label); + sp_document_maybe_done (sp_desktop_document(desktop), undo_label); // on release, toggle undo_label so that the next drag will not be lumped with this one if (undo_label == undo_label_1) @@ -745,7 +745,7 @@ static GtkWidget * ink_marker_menu( GtkWidget *tbl, gchar *menu_id, SPDocument *sandbox) { SPDesktop *desktop = inkscape_active_desktop(); - SPDocument *doc = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); GtkWidget *mnu = gtk_option_menu_new(); /* Create new menu widget */ @@ -829,7 +829,7 @@ sp_marker_select(GtkOptionMenu *mnu, GtkWidget *spw) } SPDesktop *desktop = inkscape_active_desktop(); - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); if (!document) { return; } @@ -862,7 +862,7 @@ sp_marker_select(GtkOptionMenu *mnu, GtkWidget *spw) gchar *menu_id = (gchar *) g_object_get_data(G_OBJECT(mnu), "menu_id"); sp_repr_css_set_property(css, menu_id, marker); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = selection->itemList(); for (; items != NULL; items = items->next) { SPItem *item = (SPItem *) items->data; @@ -892,7 +892,7 @@ static gboolean stroke_width_set_unit(SPUnitSelector *, return FALSE; } - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); if (selection->isEmpty()) return FALSE; @@ -989,7 +989,7 @@ sp_stroke_style_line_widget_new(void) us = sp_unit_selector_new(SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE); SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop) - sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), SP_DT_NAMEDVIEW(desktop)->doc_units); + sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), sp_desktop_namedview(desktop)->doc_units); sp_unit_selector_add_unit(SP_UNIT_SELECTOR(us), &sp_unit_get_by_id(SP_UNIT_PERCENT), 0); g_signal_connect ( G_OBJECT (us), "set_unit", G_CALLBACK (stroke_width_set_unit), spw ); gtk_widget_show(us); @@ -1158,7 +1158,7 @@ sp_stroke_style_line_widget_new(void) GTK_SIGNAL_FUNC(sp_stroke_style_line_selection_changed), NULL ); - sp_stroke_style_line_update( SP_WIDGET(spw), desktop ? SP_DT_SELECTION(desktop) : NULL); + sp_stroke_style_line_update( SP_WIDGET(spw), desktop ? sp_desktop_selection(desktop) : NULL); return spw; } @@ -1176,7 +1176,7 @@ sp_stroke_style_line_construct(SPWidget *spw, gpointer data) if (spw->inkscape) { sp_stroke_style_line_update(spw, ( SP_ACTIVE_DESKTOP - ? SP_DT_SELECTION(SP_ACTIVE_DESKTOP) + ? sp_desktop_selection(SP_ACTIVE_DESKTOP) : NULL )); } } @@ -1302,7 +1302,7 @@ sp_stroke_style_line_update(SPWidget *spw, Inkscape::Selection *sel) } else { // same width, or only one object; no sense to keep percent, switch to absolute if (unit->base != SP_UNIT_ABSOLUTE && unit->base != SP_UNIT_DEVICE) { - sp_unit_selector_set_unit(SP_UNIT_SELECTOR(us), SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)->doc_units); + sp_unit_selector_set_unit(SP_UNIT_SELECTOR(us), sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units); } } @@ -1388,8 +1388,8 @@ sp_stroke_style_scale_line(SPWidget *spw) GtkAdjustment *ml = GTK_ADJUSTMENT(gtk_object_get_data(GTK_OBJECT(spw), "miterlimit")); SPDesktop *desktop = SP_ACTIVE_DESKTOP; - SPDocument *document = SP_DT_DOCUMENT (desktop); - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + SPDocument *document = sp_desktop_document (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); GSList const *items = selection->itemList(); @@ -1536,7 +1536,7 @@ sp_stroke_style_any_toggled(GtkToggleButton *tb, SPWidget *spw) sp_repr_css_attr_unref(css); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } } @@ -1708,7 +1708,7 @@ ink_extract_marker_name(gchar const *n) SPDesktop *desktop = inkscape_active_desktop(); - SPDocument *doc = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); SPObject *marker = doc->getObjectById(b); return marker; } diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp index bd2ec169c..4338b4252 100644 --- a/src/dialogs/swatches.cpp +++ b/src/dialogs/swatches.cpp @@ -387,7 +387,7 @@ void ColorItem::_colorDefChanged(void* data) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; if ( desktop ) { - SPDocument* document = SP_DT_DOCUMENT( desktop ); + SPDocument* document = sp_desktop_document( desktop ); Inkscape::XML::Node *rroot = sp_document_repr_root( document ); if ( rroot ) { @@ -550,7 +550,7 @@ void ColorItem::buttonClicked(bool secondary) sp_desktop_set_style(desktop, css); sp_repr_css_attr_unref(css); - sp_document_done (SP_DT_DOCUMENT (desktop)); + sp_document_done (sp_desktop_document (desktop)); } } diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp index 15d510dda..b28a1dc57 100644 --- a/src/dialogs/text-edit.cpp +++ b/src/dialogs/text-edit.cpp @@ -594,7 +594,7 @@ sp_text_edit_dialog_apply (GtkButton *button, GtkWidget *dlg) SPDesktop *desktop = SP_ACTIVE_DESKTOP; unsigned items = 0; - const GSList *item_list = SP_DT_SELECTION(desktop)->itemList(); + const GSList *item_list = sp_desktop_selection(desktop)->itemList(); SPCSSAttr *css = sp_get_text_dialog_style (); @@ -620,14 +620,14 @@ sp_text_edit_dialog_apply (GtkButton *button, GtkWidget *dlg) gtk_widget_set_sensitive (def, FALSE); } else if (items == 1) { /* exactly one text object; now set its text, too */ - SPItem *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->singleItem(); + SPItem *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->singleItem(); if (SP_IS_TEXT (item) || SP_IS_FLOWTEXT(item)) { sp_text_edit_dialog_update_object_text (item); } } // complete the transaction - sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP)); + sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP)); gtk_widget_set_sensitive (apply, FALSE); @@ -880,7 +880,7 @@ sp_ted_get_selected_text_item (void) if (!SP_ACTIVE_DESKTOP) return NULL; - for (const GSList *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList(); + for (const GSList *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList(); item != NULL; item = item->next) { @@ -901,7 +901,7 @@ sp_ted_get_selected_text_count (void) unsigned int items = 0; - for (const GSList *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList(); + for (const GSList *item = sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList(); item != NULL; item = item->next) { diff --git a/src/dialogs/tiledialog.cpp b/src/dialogs/tiledialog.cpp index c9c166bc2..4b84078e5 100644 --- a/src/dialogs/tiledialog.cpp +++ b/src/dialogs/tiledialog.cpp @@ -149,9 +149,9 @@ void TileDialog::Grid_Arrange () grid_top = 99999; SPDesktop *desktop = SP_ACTIVE_DESKTOP; - sp_document_ensure_up_to_date(SP_DT_DOCUMENT(desktop)); + sp_document_ensure_up_to_date(sp_desktop_document(desktop)); - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); const GSList *items = selection->itemList(); cnt=0; for (; items != NULL; items = items->next) { @@ -323,7 +323,7 @@ g_print("\n row = %f col = %f selection x= %f selection y = %f", total_row_h NRRect b; selection->bounds(&b); - sp_document_done (SP_DT_DOCUMENT (desktop)); + sp_document_done (sp_desktop_document (desktop)); } @@ -353,7 +353,7 @@ void TileDialog::on_row_spinbutton_changed() updating = true; SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); GSList const *items = selection->itemList(); int selcount = g_slist_length((GSList *)items); @@ -377,7 +377,7 @@ void TileDialog::on_col_spinbutton_changed() // in turn, prevent listener from responding updating = true; SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); GSList const *items = selection->itemList(); int selcount = g_slist_length((GSList *)items); @@ -539,7 +539,7 @@ void TileDialog::updateSelection() // in turn, prevent listener from responding updating = true; SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); const GSList *items = selection->itemList(); int selcount = g_slist_length((GSList *)items); @@ -609,7 +609,7 @@ TileDialog::TileDialog() SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); int selcount = 1; if (!selection->isEmpty()) { GSList const *items = selection->itemList(); diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp index c386fe91b..6b37b65d4 100644 --- a/src/dialogs/xml-tree.cpp +++ b/src/dialogs/xml-tree.cpp @@ -669,9 +669,9 @@ void set_tree_desktop(SPDesktop *desktop) } current_desktop = desktop; if (desktop) { - sel_changed_connection = SP_DT_SELECTION(desktop)->connectChanged(&on_desktop_selection_changed); + sel_changed_connection = sp_desktop_selection(desktop)->connectChanged(&on_desktop_selection_changed); document_replaced_connection = desktop->connectDocumentReplaced(&on_document_replaced); - set_tree_document(SP_DT_DOCUMENT(desktop)); + set_tree_document(sp_desktop_document(desktop)); } else { set_tree_document(NULL); } @@ -783,7 +783,7 @@ Inkscape::XML::Node *get_dt_select() return NULL; } - return SP_DT_SELECTION(current_desktop)->singleRepr(); + return sp_desktop_selection(current_desktop)->singleRepr(); } @@ -794,7 +794,7 @@ void set_dt_select(Inkscape::XML::Node *repr) return; } - Inkscape::Selection *selection = SP_DT_SELECTION(current_desktop); + Inkscape::Selection *selection = sp_desktop_selection(current_desktop); SPObject *object; if (repr) { @@ -804,7 +804,7 @@ void set_dt_select(Inkscape::XML::Node *repr) repr = sp_repr_parent(repr); } // end of while loop - object = SP_DT_DOCUMENT(current_desktop)->getObjectByRepr(repr); + object = sp_desktop_document(current_desktop)->getObjectByRepr(repr); } else { object = NULL; } @@ -1279,7 +1279,7 @@ static void on_document_replaced(SPDesktop *dt, SPDocument *doc) if (current_desktop) sel_changed_connection.disconnect(); - sel_changed_connection = SP_DT_SELECTION(dt)->connectChanged(&on_desktop_selection_changed); + sel_changed_connection = sp_desktop_selection(dt)->connectChanged(&on_desktop_selection_changed); set_tree_document(doc); } diff --git a/src/draw-anchor.cpp b/src/draw-anchor.cpp index f2af728cf..b06e94a48 100644 --- a/src/draw-anchor.cpp +++ b/src/draw-anchor.cpp @@ -34,7 +34,7 @@ sp_draw_anchor_new(SPDrawContext *dc, SPCurve *curve, gboolean start, NR::Point a->start = start; a->active = FALSE; a->dp = delta; - a->ctrl = sp_canvas_item_new(SP_DT_CONTROLS(dt), SP_TYPE_CTRL, + a->ctrl = sp_canvas_item_new(sp_desktop_controls(dt), SP_TYPE_CTRL, "size", 6.0, "filled", 0, "fill_color", 0xff00007f, diff --git a/src/draw-context.cpp b/src/draw-context.cpp index 0cb408293..d33a33f7b 100644 --- a/src/draw-context.cpp +++ b/src/draw-context.cpp @@ -150,7 +150,7 @@ sp_draw_context_setup(SPEventContext *ec) ((SPEventContextClass *) draw_parent_class)->setup(ec); } - dc->selection = SP_DT_SELECTION(dt); + dc->selection = sp_desktop_selection(dt); /* Connect signals to track selection changes */ dc->sel_changed_connection = dc->selection->connectChanged( @@ -161,13 +161,13 @@ sp_draw_context_setup(SPEventContext *ec) ); /* Create red bpath */ - dc->red_bpath = sp_canvas_bpath_new(SP_DT_SKETCH(ec->desktop), NULL); + dc->red_bpath = sp_canvas_bpath_new(sp_desktop_sketch(ec->desktop), NULL); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->red_bpath), dc->red_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); /* Create red curve */ dc->red_curve = sp_curve_new_sized(4); /* Create blue bpath */ - dc->blue_bpath = sp_canvas_bpath_new(SP_DT_SKETCH(ec->desktop), NULL); + dc->blue_bpath = sp_canvas_bpath_new(sp_desktop_sketch(ec->desktop), NULL); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->blue_bpath), dc->blue_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); /* Create blue curve */ dc->blue_curve = sp_curve_new_sized(8); @@ -218,7 +218,7 @@ sp_draw_context_root_handler(SPEventContext *ec, GdkEvent *event) case GDK_KEY_PRESS: switch (get_group0_keyval (&event->key)) { case GDK_Escape: - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); ret = TRUE; break; case GDK_Tab: // Tab - cycle selection forward @@ -529,7 +529,7 @@ spdc_flush_white(SPDrawContext *dc, SPCurve *gc) : sp_desktop_dt2root_affine(SP_EVENT_CONTEXT_DESKTOP(dc)) )); SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(dc); - SPDocument *doc = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); if ( c && !sp_curve_empty(c) ) { /* We actually have something to write */ diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index fbe1bd6ce..148cceda4 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -112,7 +112,7 @@ static void sp_dropper_context_setup(SPEventContext *ec) } SPCurve *c = sp_curve_new_from_static_bpath(spdc_circle); - dc->area = sp_canvas_bpath_new(SP_DT_CONTROLS(ec->desktop), c); + dc->area = sp_canvas_bpath_new(sp_desktop_controls(ec->desktop), c); sp_curve_unref(c); sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(dc->area), 0x00000000,(SPWindRule)0); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(dc->area), 0x0000007f, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); @@ -268,7 +268,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) NRPixBlock pb; nr_pixblock_setup_fast(&pb, NR_PIXBLOCK_MODE_R8G8B8A8P, x0, y0, x1, y1, TRUE); /* fixme: (Lauris) */ - sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(SP_DT_DRAWING(ec->desktop)), &pb); + sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(sp_desktop_drawing(ec->desktop)), &pb); for (int y = y0; y < y1; y++) { const unsigned char *s = NR_PIXBLOCK_PX(&pb) + (y - y0) * pb.rs; for (int x = x0; x < x1; x++) { @@ -302,7 +302,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) int x = (int) floor(event->button.x); int y = (int) floor(event->button.y); nr_pixblock_setup_fast(&pb, NR_PIXBLOCK_MODE_R8G8B8A8P, x, y, x+1, y+1, TRUE); - sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(SP_DT_DRAWING(ec->desktop)), &pb); + sp_canvas_arena_render_pixblock(SP_CANVAS_ARENA(sp_desktop_drawing(ec->desktop)), &pb); const unsigned char *s = NR_PIXBLOCK_PX(&pb); R = s[0] / 255.0; @@ -313,7 +313,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) if (pick == SP_DROPPER_PICK_VISIBLE) { // compose with page color - guint32 bg = SP_DT_NAMEDVIEW(ec->desktop)->pagecolor; + guint32 bg = sp_desktop_namedview(ec->desktop)->pagecolor; R = R + (SP_RGBA32_R_F(bg)) * (1 - A); G = G + (SP_RGBA32_G_F(bg)) * (1 - A); B = B + (SP_RGBA32_B_F(bg)) * (1 - A); @@ -378,8 +378,8 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) // REJON: set aux. toolbar input to hex color! - if (!(SP_DT_SELECTION(ec->desktop)->isEmpty())) { - sp_document_done(SP_DT_DOCUMENT(ec->desktop)); + if (!(sp_desktop_selection(ec->desktop)->isEmpty())) { + sp_document_done(sp_desktop_document(ec->desktop)); } ret = TRUE; @@ -397,7 +397,7 @@ static gint sp_dropper_context_root_handler(SPEventContext *ec, GdkEvent *event) } break; case GDK_Escape: - SP_DT_SELECTION(ec->desktop)->clear(); + sp_desktop_selection(ec->desktop)->clear(); default: break; } diff --git a/src/dyna-draw-context.cpp b/src/dyna-draw-context.cpp index 02ca80b20..c0c91adcc 100644 --- a/src/dyna-draw-context.cpp +++ b/src/dyna-draw-context.cpp @@ -201,7 +201,7 @@ sp_dyna_draw_context_setup(SPEventContext *ec) ddc->cal1 = sp_curve_new_sized(32); ddc->cal2 = sp_curve_new_sized(32); - ddc->currentshape = sp_canvas_item_new(SP_DT_SKETCH(ec->desktop), SP_TYPE_CANVAS_BPATH, NULL); + ddc->currentshape = sp_canvas_item_new(sp_desktop_sketch(ec->desktop), SP_TYPE_CANVAS_BPATH, NULL); sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(ddc->currentshape), DDC_RED_RGBA, SP_WIND_RULE_EVENODD); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(ddc->currentshape), 0x00000000, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); /* fixme: Cannot we cascade it to root more clearly? */ @@ -444,7 +444,7 @@ sp_dyna_draw_timeout_handler(gpointer data) { SPDynaDrawContext *dc = SP_DYNA_DRAW_CONTEXT(data); SPDesktop *desktop = SP_EVENT_CONTEXT(dc)->desktop; - SPCanvas *canvas = SP_CANVAS(SP_DT_CANVAS(desktop)); + SPCanvas *canvas = SP_CANVAS(sp_desktop_canvas(desktop)); dc->dragging = TRUE; @@ -628,7 +628,7 @@ sp_dyna_draw_context_root_handler(SPEventContext *event_context, } break; case GDK_Escape: - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); break; default: @@ -683,7 +683,7 @@ set_to_accumulated(SPDynaDrawContext *dc) Inkscape::GC::release(dc->repr); item->transform = SP_ITEM(desktop->currentRoot())->getRelativeTransform(desktop->currentLayer()); item->updateRepr(); - SP_DT_SELECTION(desktop)->set(dc->repr); + sp_desktop_selection(desktop)->set(dc->repr); } abp = nr_artpath_affine(sp_curve_first_bpath(dc->accumulated), sp_desktop_dt2root_affine(desktop)); str = sp_svg_write_path(abp); @@ -698,7 +698,7 @@ set_to_accumulated(SPDynaDrawContext *dc) dc->repr = NULL; } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } static void @@ -824,7 +824,7 @@ fit_and_split_calligraphics(SPDynaDrawContext *dc, gboolean release) if (!release) { g_assert(!sp_curve_empty(dc->currentcurve)); - SPCanvasItem *cbp = sp_canvas_item_new(SP_DT_SKETCH(SP_EVENT_CONTEXT(dc)->desktop), + SPCanvasItem *cbp = sp_canvas_item_new(sp_desktop_sketch(SP_EVENT_CONTEXT(dc)->desktop), SP_TYPE_CANVAS_BPATH, NULL); SPCurve *curve = sp_curve_copy(dc->currentcurve); diff --git a/src/event-context.cpp b/src/event-context.cpp index da430a2ed..ea37775bb 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -170,7 +170,7 @@ sp_event_context_dispose(GObject *object) void sp_event_context_update_cursor(SPEventContext *ec) { - GtkWidget *w = GTK_WIDGET(SP_DT_CANVAS(ec->desktop)); + GtkWidget *w = GTK_WIDGET(sp_desktop_canvas(ec->desktop)); if (w->window) { /* fixme: */ if (ec->cursor_shape) { @@ -875,7 +875,7 @@ sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event) /* fixme: This is not what I want but works for now (Lauris) */ if (event->type == GDK_KEY_PRESS) { - item = SP_DT_SELECTION(desktop)->singleItem(); + item = sp_desktop_selection(desktop)->singleItem(); } menu = sp_ui_context_menu(desktop, item); gtk_widget_show(menu); @@ -1013,7 +1013,7 @@ ec_shape_event_attr_changed(Inkscape::XML::Node *shape_repr, gchar const *name, SPDesktop *desktop = ec->desktop; - SPItem *item = SP_DT_SELECTION(desktop)->singleItem(); + SPItem *item = sp_desktop_selection(desktop)->singleItem(); if (item) { ec->shape_knot_holder = sp_item_knot_holder(item, desktop); diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index f9cc2ee0b..8f121800f 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -609,7 +609,7 @@ Script::effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::View *do SPDesktop *desktop = (SPDesktop *) doc; if (desktop != NULL) { using Inkscape::Util::GSListConstIterator; - GSListConstIterator selected = SP_DT_SELECTION(desktop)->itemList(); + GSListConstIterator selected = sp_desktop_selection(desktop)->itemList(); while ( selected != NULL ) { local_command += " --id="; local_command += SP_OBJECT_ID(*selected); diff --git a/src/file.cpp b/src/file.cpp index e1a05897b..4d96899da 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -179,7 +179,7 @@ sp_file_open(gchar const *uri, Inkscape::Extension::Extension *key, bool add_to_ if (doc) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - SPDocument *existing = desktop ? SP_DT_DOCUMENT(desktop) : NULL; + SPDocument *existing = desktop ? sp_desktop_document(desktop) : NULL; if (existing && existing->virgin && replace_empty) { // If the current desktop is empty, open the document there @@ -232,7 +232,7 @@ sp_file_revert_dialog() SPDesktop *desktop = SP_ACTIVE_DESKTOP; g_assert(desktop != NULL); - SPDocument *doc = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); g_assert(doc != NULL); Inkscape::XML::Node *repr = sp_document_repr_root(doc); @@ -881,7 +881,7 @@ file_import(SPDocument *in_doc, gchar const *uri, Inkscape::Extension::Extension // select and move the imported item if (new_obj && SP_IS_ITEM(new_obj)) { - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); selection->set(SP_ITEM(new_obj)); // To move the imported object, we must temporarily set the "transform pattern with @@ -889,7 +889,7 @@ file_import(SPDocument *in_doc, gchar const *uri, Inkscape::Extension::Extension { int const saved_pref = prefs_get_int_attribute("options.transform", "pattern", 1); prefs_set_int_attribute("options.transform", "pattern", 1); - sp_document_ensure_up_to_date(SP_DT_DOCUMENT(desktop)); + sp_document_ensure_up_to_date(sp_desktop_document(desktop)); NR::Point m( desktop->point() - selection->bounds().midpoint() ); sp_selection_move_relative(selection, m); prefs_set_int_attribute("options.transform", "pattern", saved_pref); diff --git a/src/gradient-context.cpp b/src/gradient-context.cpp index 98a109737..aaf86d863 100644 --- a/src/gradient-context.cpp +++ b/src/gradient-context.cpp @@ -121,7 +121,7 @@ static void sp_gradient_context_setup(SPEventContext *ec) ec->enableGrDrag(); - rc->_message_context = new Inkscape::MessageContext(SP_DT_MSGSTACK(ec->desktop)); + rc->_message_context = new Inkscape::MessageContext(sp_desktop_message_stack(ec->desktop)); } static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkEvent *event) @@ -129,7 +129,7 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE static bool dragging; SPDesktop *desktop = event_context->desktop; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); SPGradientContext *rc = SP_GRADIENT_CONTEXT(event_context); @@ -148,13 +148,13 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE SPGradientType new_type = (SPGradientType) prefs_get_int_attribute ("tools.gradient", "newgradient", SP_GRADIENT_TYPE_LINEAR); guint new_fill = prefs_get_int_attribute ("tools.gradient", "newfillorstroke", 1); - SPGradient *vector = sp_gradient_vector_for_object(SP_DT_DOCUMENT(desktop), desktop, SP_OBJECT (item), new_fill); + SPGradient *vector = sp_gradient_vector_for_object(sp_desktop_document(desktop), desktop, SP_OBJECT (item), new_fill); SPGradient *priv = sp_item_set_gradient(item, vector, new_type, new_fill); sp_gradient_reset_to_userspace(priv, item); } - sp_document_done (SP_DT_DOCUMENT (desktop)); + sp_document_done (sp_desktop_document (desktop)); ret = TRUE; } @@ -359,7 +359,7 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE } } // we did an undoable action - sp_document_done (SP_DT_DOCUMENT (desktop)); + sp_document_done (sp_desktop_document (desktop)); ret = TRUE; } break; @@ -399,8 +399,8 @@ static gint sp_gradient_context_root_handler(SPEventContext *event_context, GdkE static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint state, guint32 etime) { SPDesktop *desktop = SP_EVENT_CONTEXT(&rc)->desktop; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); - SPDocument *document = SP_DT_DOCUMENT(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); + SPDocument *document = sp_desktop_document(desktop); SPEventContext *ec = SP_EVENT_CONTEXT(&rc); if (!selection->isEmpty()) { @@ -455,7 +455,7 @@ static void sp_gradient_drag(SPGradientContext &rc, NR::Point const pt, guint st "Gradient for %d objects; with Ctrl to snap angle", n_objects), n_objects); } else { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select objects on which to create gradient.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select objects on which to create gradient.")); } } diff --git a/src/gradient-drag.cpp b/src/gradient-drag.cpp index 1e8626602..cb61a9890 100644 --- a/src/gradient-drag.cpp +++ b/src/gradient-drag.cpp @@ -223,7 +223,7 @@ GrDrag::GrDrag(SPDesktop *desktop) { this->desktop = desktop; - this->selection = SP_DT_SELECTION(desktop); + this->selection = sp_desktop_selection(desktop); this->draggers = NULL; this->lines = NULL; @@ -378,7 +378,7 @@ gr_knot_moved_handler(SPKnot *knot, NR::Point const *ppointer, guint state, gpoi d_new->updateKnotShape (); d_new->updateTip (); d_new->updateDependencies(true); - sp_document_done (SP_DT_DOCUMENT (d_new->parent->desktop)); + sp_document_done (sp_desktop_document (d_new->parent->desktop)); return; } } @@ -509,7 +509,7 @@ gr_knot_ungrabbed_handler (SPKnot *knot, unsigned int state, gpointer data) dragger->updateDependencies(true); // we did an undoable action - sp_document_done (SP_DT_DOCUMENT (dragger->parent->desktop)); + sp_document_done (sp_desktop_document (dragger->parent->desktop)); } /** @@ -853,7 +853,7 @@ Create a line from p1 to p2 and add it to the lines list void GrDrag::addLine (NR::Point p1, NR::Point p2, guint32 rgba) { - SPCanvasItem *line = sp_canvas_item_new(SP_DT_CONTROLS(this->desktop), + SPCanvasItem *line = sp_canvas_item_new(sp_desktop_controls(this->desktop), SP_TYPE_CTRLLINE, NULL); sp_ctrlline_set_coords(SP_CTRLLINE(line), p1, p2); if (rgba != GR_LINE_COLOR_FILL) // fill is the default, so don't set color for it to speed up redraw @@ -1061,7 +1061,7 @@ GrDrag::selected_move (double x, double y) selected->updateDependencies(true); // we did an undoable action - sp_document_done (SP_DT_DOCUMENT (desktop)); + sp_document_done (sp_desktop_document (desktop)); } void diff --git a/src/helper/stock-items.cpp b/src/helper/stock-items.cpp index fe2026043..ed6d25b74 100644 --- a/src/helper/stock-items.cpp +++ b/src/helper/stock-items.cpp @@ -179,7 +179,7 @@ SPObject *get_stock_item(gchar const *urn) gchar * base = g_strndup(e, a); SPDesktop *desktop = inkscape_active_desktop(); - SPDocument *doc = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(doc); SPObject *object = NULL; @@ -248,7 +248,7 @@ SPObject *get_stock_item(gchar const *urn) else { SPDesktop *desktop = inkscape_active_desktop(); - SPDocument *doc = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); SPObject *object = doc->getObjectById(urn); return object; diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 71c5d422f..4051a453c 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -839,9 +839,9 @@ inkscape_add_desktop (SPDesktop * desktop) if (DESKTOP_IS_ACTIVE (desktop)) { g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, desktop); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, SP_DT_EVENTCONTEXT (desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, SP_DT_SELECTION (desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, SP_DT_SELECTION (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, sp_desktop_event_context (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, sp_desktop_selection (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, sp_desktop_selection (desktop)); } } @@ -867,13 +867,13 @@ inkscape_remove_desktop (SPDesktop * desktop) inkscape->desktops = g_slist_remove (inkscape->desktops, new_desktop); inkscape->desktops = g_slist_prepend (inkscape->desktops, new_desktop); g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, new_desktop); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, SP_DT_EVENTCONTEXT (new_desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, SP_DT_SELECTION (new_desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, SP_DT_SELECTION (new_desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, sp_desktop_event_context (new_desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, sp_desktop_selection (new_desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, sp_desktop_selection (new_desktop)); } else { g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, NULL); - if (SP_DT_SELECTION(desktop)) - SP_DT_SELECTION(desktop)->clear(); + if (sp_desktop_selection(desktop)) + sp_desktop_selection(desktop)->clear(); } } @@ -912,9 +912,9 @@ inkscape_activate_desktop (SPDesktop * desktop) inkscape->desktops = g_slist_prepend (inkscape->desktops, desktop); g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, desktop); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, SP_DT_EVENTCONTEXT (desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, SP_DT_SELECTION (desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, SP_DT_SELECTION (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, sp_desktop_event_context (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, sp_desktop_selection (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, sp_desktop_selection (desktop)); } @@ -1145,7 +1145,7 @@ inkscape_active_document (void) return Inkscape::NSApplication::Editor::getActiveDocument(); if (SP_ACTIVE_DESKTOP) { - return SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP); + return sp_desktop_document (SP_ACTIVE_DESKTOP); } return NULL; @@ -1170,7 +1170,7 @@ SPEventContext * inkscape_active_event_context (void) { if (SP_ACTIVE_DESKTOP) { - return SP_DT_EVENTCONTEXT (SP_ACTIVE_DESKTOP); + return sp_desktop_event_context (SP_ACTIVE_DESKTOP); } return NULL; diff --git a/src/interface.cpp b/src/interface.cpp index 55a9601ee..2a2cba4d0 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -895,7 +895,7 @@ static void leave_group(GtkMenuItem *, SPDesktop *desktop) { static void enter_group(GtkMenuItem *mi, SPDesktop *desktop) { desktop->setCurrentLayer(reinterpret_cast(g_object_get_data(G_OBJECT(mi), "group"))); - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); } GtkWidget * @@ -1126,14 +1126,14 @@ sp_ui_drag_data_received(GtkWidget *widget, SPObject *new_obj = NULL; new_obj = desktop->currentLayer()->appendChildRepr(newgroup); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); selection->set(SP_ITEM(new_obj)); // To move the imported object, we must temporarily set the "transform pattern with // object" option. { int const saved_pref = prefs_get_int_attribute("options.transform", "pattern", 1); prefs_set_int_attribute("options.transform", "pattern", 1); - sp_document_ensure_up_to_date(SP_DT_DOCUMENT(desktop)); + sp_document_ensure_up_to_date(sp_desktop_document(desktop)); NR::Point m( desktop->point() - selection->bounds().midpoint() ); sp_selection_move_relative(selection, m); prefs_set_int_attribute("options.transform", "pattern", saved_pref); diff --git a/src/jabber_whiteboard/callbacks.cpp b/src/jabber_whiteboard/callbacks.cpp index 8216f33c6..31f536616 100644 --- a/src/jabber_whiteboard/callbacks.cpp +++ b/src/jabber_whiteboard/callbacks.cpp @@ -56,7 +56,7 @@ Callbacks::dispatchSendQueue() LmConnectionState state = lm_connection_get_state(this->_sd->connection); if (state != LM_CONNECTION_STATE_OPEN && state != LM_CONNECTION_STATE_AUTHENTICATED) { - SP_DT_MSGSTACK(this->_sm->desktop())->flash(Inkscape::INFORMATION_MESSAGE, _("Jabber connection lost.")); + sp_desktop_message_stack(this->_sm->desktop())->flash(Inkscape::INFORMATION_MESSAGE, _("Jabber connection lost.")); return false; } @@ -68,14 +68,14 @@ Callbacks::dispatchSendQueue() // otherwise, send out the first change MessageNode* first = this->_sd->send_queue->first(); - SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE, + sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE, ngettext("Sending message; %u message remaining in send queue.", "Sending message; %u messages remaining in send queue.", this->_sd->send_queue->size()), this->_sd->send_queue->size()); if (this->_sd->send_queue->empty()) { - SP_DT_MSGSTACK(this->_sm->desktop())->flash(Inkscape::NORMAL_MESSAGE, _("Receive queue empty.")); + sp_desktop_message_stack(this->_sm->desktop())->flash(Inkscape::NORMAL_MESSAGE, _("Receive queue empty.")); } switch (first->type()) { @@ -150,7 +150,7 @@ Callbacks::dispatchReceiveQueue() // Pass the message to the received change handler. this->_sm->receiveChange(msg->message()); - SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE, + sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE, ngettext("Receiving change; %u change left to process.", "Receiving change; %u changes left to process.", rmq->size()), diff --git a/src/jabber_whiteboard/chat-handler.cpp b/src/jabber_whiteboard/chat-handler.cpp index bf7a2a31e..1474be040 100644 --- a/src/jabber_whiteboard/chat-handler.cpp +++ b/src/jabber_whiteboard/chat-handler.cpp @@ -154,7 +154,7 @@ ChatMessageHandler::parse(LmMessage* message) // Delete the message queue used by this sender this->_sm->session_data->receive_queues.erase(sender.raw()); - SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::INFORMATION_MESSAGE, _("%s has left the chatroom."), sender.c_str()); + sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::INFORMATION_MESSAGE, _("%s has left the chatroom."), sender.c_str()); } default: diff --git a/src/jabber_whiteboard/message-processors.cpp b/src/jabber_whiteboard/message-processors.cpp index bd24f7ad8..f44224cbd 100644 --- a/src/jabber_whiteboard/message-processors.cpp +++ b/src/jabber_whiteboard/message-processors.cpp @@ -142,7 +142,7 @@ public: this->_sm->userConnectedToWhiteboard(m.sender.c_str()); this->_sm->setRecipient(m.sender.c_str()); } else { - SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::INFORMATION_MESSAGE, _("%s has joined the chatroom."), m.sender.c_str()); + sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::INFORMATION_MESSAGE, _("%s has joined the chatroom."), m.sender.c_str()); } break; default: diff --git a/src/jabber_whiteboard/message-queue.cpp b/src/jabber_whiteboard/message-queue.cpp index 89c20d66f..21cd76f17 100644 --- a/src/jabber_whiteboard/message-queue.cpp +++ b/src/jabber_whiteboard/message-queue.cpp @@ -83,7 +83,7 @@ ReceiveMessageQueue::insert(MessageNode* msg) // Otherwise, it is safe to insert this message. // Inkscape::GC::anchor(msg); this->_queue.push_back(msg); - SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE, + sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE, ngettext("%u change in receive queue.", "%u changes in receive queue.", this->_queue.size()), @@ -113,7 +113,7 @@ SendMessageQueue::insert(MessageNode* msg) { // Inkscape::GC::anchor(msg); this->_queue.push_back(msg); - SP_DT_MSGSTACK(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE, + sp_desktop_message_stack(this->_sm->desktop())->flashF(Inkscape::NORMAL_MESSAGE, ngettext("%u change in send queue.", "%u changes in send queue.", this->_queue.size()), diff --git a/src/jabber_whiteboard/session-manager.cpp b/src/jabber_whiteboard/session-manager.cpp index 5b07e2c13..33c7f2663 100644 --- a/src/jabber_whiteboard/session-manager.cpp +++ b/src/jabber_whiteboard/session-manager.cpp @@ -776,7 +776,7 @@ SessionManager::loadSessionFile(Glib::ustring filename) void SessionManager::userConnectedToWhiteboard(gchar const* JID) { - SP_DT_MSGSTACK(this->_myDesktop)->flashF(Inkscape::INFORMATION_MESSAGE, _("Established whiteboard session with %s."), JID); + sp_desktop_message_stack(this->_myDesktop)->flashF(Inkscape::INFORMATION_MESSAGE, _("Established whiteboard session with %s."), JID); } @@ -784,7 +784,7 @@ void SessionManager::userDisconnectedFromWhiteboard(std::string const& JID) { - SP_DT_MSGSTACK(this->_myDesktop)->flashF(Inkscape::INFORMATION_MESSAGE, _("%s has left the whiteboard session."), JID.c_str()); + sp_desktop_message_stack(this->_myDesktop)->flashF(Inkscape::INFORMATION_MESSAGE, _("%s has left the whiteboard session."), JID.c_str()); // Inform the user // TRANSLATORS: %1 is the name of the user that disconnected, %2 is the name of the user whom the disconnected user disconnected from. diff --git a/src/knot.cpp b/src/knot.cpp index 01b1bafa2..c8d2f2065 100644 --- a/src/knot.cpp +++ b/src/knot.cpp @@ -415,7 +415,7 @@ static int sp_knot_handler(SPCanvasItem *item, GdkEvent *event, SPKnot *knot) g_signal_emit(knot, knot_signals[UNGRABBED], 0, event->button.state); - sp_document_undo(SP_DT_DOCUMENT(knot->desktop)); + sp_document_undo(sp_desktop_document(knot->desktop)); knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled.")); transform_escaped = true; consumed = TRUE; @@ -452,7 +452,7 @@ SPKnot *sp_knot_new(SPDesktop *desktop, const gchar *tip) knot->tip = g_strdup (tip); } - knot->item = sp_canvas_item_new(SP_DT_CONTROLS (desktop), + knot->item = sp_canvas_item_new(sp_desktop_controls (desktop), SP_TYPE_CTRL, "anchor", GTK_ANCHOR_CENTER, "size", 8.0, diff --git a/src/node-context.cpp b/src/node-context.cpp index 2e5fd3e73..988de9d12 100644 --- a/src/node-context.cpp +++ b/src/node-context.cpp @@ -159,9 +159,9 @@ sp_node_context_setup(SPEventContext *ec) ((SPEventContextClass *) parent_class)->setup(ec); nc->sel_changed_connection.disconnect(); - nc->sel_changed_connection = SP_DT_SELECTION(ec->desktop)->connectChanged(sigc::bind(sigc::ptr_fun(&sp_node_context_selection_changed), (gpointer)nc)); + nc->sel_changed_connection = sp_desktop_selection(ec->desktop)->connectChanged(sigc::bind(sigc::ptr_fun(&sp_node_context_selection_changed), (gpointer)nc)); - Inkscape::Selection *selection = SP_DT_SELECTION(ec->desktop); + Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); SPItem *item = selection->singleItem(); nc->nodepath = NULL; @@ -288,7 +288,7 @@ sp_nodepath_update_from_item(SPNodeContext *nc, SPItem *item) ec->shape_knot_holder = NULL; } - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); item = selection->singleItem(); if (item) { @@ -405,7 +405,7 @@ sp_node_context_item_handler(SPEventContext *event_context, SPItem *item, GdkEve gint ret = FALSE; SPDesktop *desktop = event_context->desktop; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); SPNodeContext *nc = SP_NODE_CONTEXT(event_context); @@ -515,7 +515,7 @@ static gint sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) { SPDesktop *desktop = event_context->desktop; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); SPNodeContext *nc = SP_NODE_CONTEXT(event_context); double const nudge = prefs_get_double_attribute_limited("options.nudgedistance", "value", 2, 0, 1000); // in px @@ -614,7 +614,7 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (nc->nodepath && nc->nodepath->selected) sp_nodepath_deselect(nc->nodepath); else - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); } } ret = TRUE; @@ -789,7 +789,7 @@ sp_node_context_root_handler(SPEventContext *event_context, GdkEvent *event) if (nc->nodepath && nc->nodepath->selected) { sp_nodepath_deselect(nc->nodepath); } else { - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); } } ret = TRUE; diff --git a/src/nodepath.cpp b/src/nodepath.cpp index 35f64c1b3..081638f1d 100644 --- a/src/nodepath.cpp +++ b/src/nodepath.cpp @@ -434,7 +434,7 @@ static void update_repr_internal(Inkscape::NodePath::Path *np) void sp_nodepath_update_repr(Inkscape::NodePath::Path *np) { update_repr_internal(np); - sp_document_done(SP_DT_DOCUMENT(np->desktop)); + sp_document_done(sp_desktop_document(np->desktop)); if (np->livarot_path) { delete np->livarot_path; @@ -454,7 +454,7 @@ void sp_nodepath_update_repr(Inkscape::NodePath::Path *np) static void sp_nodepath_update_repr_keyed(Inkscape::NodePath::Path *np, gchar const *key) { update_repr_internal(np); - sp_document_maybe_done(SP_DT_DOCUMENT(np->desktop), key); + sp_document_maybe_done(sp_desktop_document(np->desktop), key); if (np->livarot_path) { delete np->livarot_path; @@ -496,7 +496,7 @@ static void stamp_repr(Inkscape::NodePath::Path *np) // move to the saved position new_repr->setPosition(pos > 0 ? pos : 0); - sp_document_done(SP_DT_DOCUMENT(np->desktop)); + sp_document_done(sp_desktop_document(np->desktop)); Inkscape::GC::release(new_repr); g_free(svgpath); @@ -1021,7 +1021,7 @@ static void sp_node_ensure_knot_exists (SPDesktop *desktop, Inkscape::NodePath:: } if (!side->line) { - side->line = sp_canvas_item_new(SP_DT_CONTROLS(desktop), + side->line = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLLINE, NULL); } } @@ -1727,7 +1727,7 @@ void sp_node_delete_preserve(GList *nodes_to_delete) // if the entire nodepath is removed, delete the selected object. if (nodepath->subpaths == NULL || sp_nodepath_get_node_count(nodepath) < 2) { - SPDocument *document = SP_DT_DOCUMENT (nodepath->desktop); + SPDocument *document = sp_desktop_document (nodepath->desktop); sp_nodepath_destroy(nodepath); g_list_free(nodes_to_delete); nodes_to_delete = NULL; @@ -1767,7 +1767,7 @@ void sp_node_selected_delete() // if the entire nodepath is removed, delete the selected object. if (nodepath->subpaths == NULL || sp_nodepath_get_node_count(nodepath) < 2) { - SPDocument *document = SP_DT_DOCUMENT (nodepath->desktop); + SPDocument *document = sp_desktop_document (nodepath->desktop); sp_nodepath_destroy(nodepath); sp_selection_delete(); sp_document_done (document); diff --git a/src/object-ui.cpp b/src/object-ui.cpp index a55a8f500..23c9ece5b 100644 --- a/src/object-ui.cpp +++ b/src/object-ui.cpp @@ -104,7 +104,7 @@ sp_item_menu(SPObject *object, SPDesktop *desktop, GtkMenu *m) gtk_menu_append(GTK_MENU(m), w); /* Select item */ w = gtk_menu_item_new_with_mnemonic(_("_Select This")); - if (SP_DT_SELECTION(desktop)->includes(item)) { + if (sp_desktop_selection(desktop)->includes(item)) { gtk_widget_set_sensitive(w, FALSE); } else { gtk_object_set_data(GTK_OBJECT(w), "desktop", desktop); @@ -131,7 +131,7 @@ sp_item_properties(GtkMenuItem *menuitem, SPItem *item) desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop"); g_return_if_fail(desktop != NULL); - SP_DT_SELECTION(desktop)->set(item); + sp_desktop_selection(desktop)->set(item); sp_item_dialog(); } @@ -146,7 +146,7 @@ sp_item_select_this(GtkMenuItem *menuitem, SPItem *item) desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop"); g_return_if_fail(desktop != NULL); - SP_DT_SELECTION(desktop)->set(item); + sp_desktop_selection(desktop)->set(item); } static void @@ -172,7 +172,7 @@ sp_item_create_link(GtkMenuItem *menuitem, SPItem *item) sp_object_attributes_dialog(object, "SPAnchor"); - SP_DT_SELECTION(desktop)->set(SP_ITEM(object)); + sp_desktop_selection(desktop)->set(SP_ITEM(object)); } /* SPGroup */ @@ -207,7 +207,7 @@ sp_item_group_ungroup_activate(GtkMenuItem *menuitem, SPGroup *group) children = NULL; sp_item_group_ungroup(group, &children); - SP_DT_SELECTION(desktop)->setList(children); + sp_desktop_selection(desktop)->setList(children); g_slist_free(children); } @@ -315,8 +315,8 @@ sp_shape_fill_settings(GtkMenuItem *menuitem, SPItem *item) desktop = (SPDesktop*)gtk_object_get_data(GTK_OBJECT(menuitem), "desktop"); g_return_if_fail(desktop != NULL); - if (SP_DT_SELECTION(desktop)->isEmpty()) { - SP_DT_SELECTION(desktop)->set(item); + if (sp_desktop_selection(desktop)->isEmpty()) { + sp_desktop_selection(desktop)->set(item); } sp_object_properties_dialog(); diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp index 663cd6da4..de775ac19 100644 --- a/src/path-chemistry.cpp +++ b/src/path-chemistry.cpp @@ -48,18 +48,18 @@ sp_selected_path_combine(void) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList *items = (GSList *) selection->itemList(); if (g_slist_length(items) < 2) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select at least two objects to combine.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select at least two objects to combine.")); return; } for (GSList *i = items; i != NULL; i = i->next) { SPItem *item = (SPItem *) i->data; if (!SP_IS_SHAPE(item) && !SP_IS_TEXT(item)) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("At least one of the objects is not a path, cannot combine.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("At least one of the objects is not a path, cannot combine.")); return; } } @@ -67,7 +67,7 @@ sp_selected_path_combine(void) Inkscape::XML::Node *parent = SP_OBJECT_REPR((SPItem *) items->data)->parent(); for (GSList *i = items; i != NULL; i = i->next) { if ( SP_OBJECT_REPR((SPItem *) i->data)->parent() != parent ) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot combine objects from different groups or layers.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot combine objects from different groups or layers.")); return; } } @@ -134,7 +134,7 @@ sp_selected_path_combine(void) // move to the position of the topmost, reduced by the number of deleted items repr->setPosition(topmost > 0 ? topmost + 1 : 0); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); selection->set(repr); @@ -146,10 +146,10 @@ sp_selected_path_break_apart(void) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select path(s) to break apart.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select path(s) to break apart.")); return; } @@ -223,9 +223,9 @@ sp_selected_path_break_apart(void) } if (did) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } else { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No path(s) to break apart in the selection.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No path(s) to break apart in the selection.")); return; } } @@ -242,11 +242,11 @@ sp_selected_path_to_curves0(gboolean interactive, guint32 text_grouping_policy) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { if (interactive) - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to convert to path.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to convert to path.")); return; } @@ -289,9 +289,9 @@ sp_selected_path_to_curves0(gboolean interactive, guint32 text_grouping_policy) if (interactive) { if (did) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } else { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No objects to convert to path in the selection.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No objects to convert to path in the selection.")); return; } } @@ -338,11 +338,11 @@ sp_selected_path_reverse() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList *items = (GSList *) selection->itemList(); if (!items) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select path(s) to reverse.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select path(s) to reverse.")); return; } @@ -366,9 +366,9 @@ sp_selected_path_reverse() } if (did) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } else { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No paths to reverse in the selection.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No paths to reverse in the selection.")); } } diff --git a/src/pen-context.cpp b/src/pen-context.cpp index 6344cff28..0eec95cd6 100644 --- a/src/pen-context.cpp +++ b/src/pen-context.cpp @@ -182,13 +182,13 @@ sp_pen_context_setup(SPEventContext *ec) } /* Pen indicators */ - pc->c0 = sp_canvas_item_new(SP_DT_CONTROLS(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRL, "shape", SP_CTRL_SHAPE_CIRCLE, + pc->c0 = sp_canvas_item_new(sp_desktop_controls(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRL, "shape", SP_CTRL_SHAPE_CIRCLE, "size", 4.0, "filled", 0, "fill_color", 0xff00007f, "stroked", 1, "stroke_color", 0x0000ff7f, NULL); - pc->c1 = sp_canvas_item_new(SP_DT_CONTROLS(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRL, "shape", SP_CTRL_SHAPE_CIRCLE, + pc->c1 = sp_canvas_item_new(sp_desktop_controls(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRL, "shape", SP_CTRL_SHAPE_CIRCLE, "size", 4.0, "filled", 0, "fill_color", 0xff00007f, "stroked", 1, "stroke_color", 0x0000ff7f, NULL); - pc->cl0 = sp_canvas_item_new(SP_DT_CONTROLS(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRLLINE, NULL); + pc->cl0 = sp_canvas_item_new(sp_desktop_controls(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRLLINE, NULL); sp_ctrlline_set_rgba32(SP_CTRLLINE(pc->cl0), 0x0000007f); - pc->cl1 = sp_canvas_item_new(SP_DT_CONTROLS(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRLLINE, NULL); + pc->cl1 = sp_canvas_item_new(sp_desktop_controls(SP_EVENT_CONTEXT_DESKTOP(ec)), SP_TYPE_CTRLLINE, NULL); sp_ctrlline_set_rgba32(SP_CTRLLINE(pc->cl1), 0x0000007f); sp_canvas_item_hide(pc->c0); @@ -367,7 +367,7 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const // This is the first click of a new curve; deselect item so that // this curve is not combined with it (unless it is drawn from its // anchor, which is handled by the sibling branch above) - Inkscape::Selection * const selection = SP_DT_SELECTION(desktop); + Inkscape::Selection * const selection = sp_desktop_selection(desktop); if (!(bevent.state & GDK_SHIFT_MASK)) { selection->clear(); @@ -704,7 +704,7 @@ pen_lastpoint_move (SPPenContext *const pc, gdouble x, gdouble y) pc->green_bpaths = g_slist_remove(pc->green_bpaths, pc->green_bpaths->data); } // one canvas bpath for all of green_curve - SPCanvasItem *cshape = sp_canvas_bpath_new(SP_DT_SKETCH(pc->desktop), pc->green_curve); + SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), pc->green_curve); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); sp_canvas_bpath_set_fill(SP_CANVAS_BPATH(cshape), 0, SP_WIND_RULE_NONZERO); @@ -1032,7 +1032,7 @@ spdc_pen_finish_segment(SPPenContext *const pc, NR::Point const p, guint const s sp_curve_append_continuous(pc->green_curve, pc->red_curve, 0.0625); SPCurve *curve = sp_curve_copy(pc->red_curve); /// \todo fixme: - SPCanvasItem *cshape = sp_canvas_bpath_new(SP_DT_SKETCH(pc->desktop), curve); + SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), curve); sp_curve_unref(curve); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); diff --git a/src/pencil-context.cpp b/src/pencil-context.cpp index 0b6900613..ccb7c97e9 100644 --- a/src/pencil-context.cpp +++ b/src/pencil-context.cpp @@ -200,7 +200,7 @@ pencil_handle_button_press(SPPencilContext *const pc, GdkEventButton const &beve SPDrawContext *dc = SP_DRAW_CONTEXT (pc); SPDesktop *desktop = SP_EVENT_CONTEXT_DESKTOP(dc); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (Inkscape::have_viable_layer(desktop, dc->_message_context) == false) { return TRUE; @@ -568,7 +568,7 @@ fit_and_split(SPPencilContext *pc) SPCurve *curve = sp_curve_copy(pc->red_curve); /// \todo fixme: - SPCanvasItem *cshape = sp_canvas_bpath_new(SP_DT_SKETCH(pc->desktop), curve); + SPCanvasItem *cshape = sp_canvas_bpath_new(sp_desktop_sketch(pc->desktop), curve); sp_curve_unref(curve); sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(cshape), pc->green_color, 1.0, SP_STROKE_LINEJOIN_MITER, SP_STROKE_LINECAP_BUTT); diff --git a/src/rect-context.cpp b/src/rect-context.cpp index 053229a41..cf8651ae1 100644 --- a/src/rect-context.cpp +++ b/src/rect-context.cpp @@ -193,7 +193,7 @@ static void sp_rect_context_setup(SPEventContext *ec) ((SPEventContextClass *) parent_class)->setup(ec); } - SPItem *item = SP_DT_SELECTION(ec->desktop)->singleItem(); + SPItem *item = sp_desktop_selection(ec->desktop)->singleItem(); if (item) { ec->shape_knot_holder = sp_item_knot_holder(item, ec->desktop); Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(item); @@ -205,7 +205,7 @@ static void sp_rect_context_setup(SPEventContext *ec) } rc->sel_changed_connection.disconnect(); - rc->sel_changed_connection = SP_DT_SELECTION(ec->desktop)->connectChanged( + rc->sel_changed_connection = sp_desktop_selection(ec->desktop)->connectChanged( sigc::bind(sigc::ptr_fun(&sp_rect_context_selection_changed), (gpointer)rc) ); @@ -270,7 +270,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent static bool dragging; SPDesktop *desktop = event_context->desktop; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); SPRectContext *rc = SP_RECT_CONTEXT(event_context); @@ -391,7 +391,7 @@ static gint sp_rect_context_root_handler(SPEventContext *event_context, GdkEvent break; case GDK_Escape: - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); //TODO: make dragging escapable by Esc default: break; @@ -480,8 +480,8 @@ static void sp_rect_finish(SPRectContext *rc) SP_OBJECT(rc->item)->updateRepr(); - SP_DT_SELECTION(dt)->set(rc->item); - sp_document_done(SP_DT_DOCUMENT(dt)); + sp_desktop_selection(dt)->set(rc->item); + sp_document_done(sp_desktop_document(dt)); rc->item = NULL; } diff --git a/src/rubberband.cpp b/src/rubberband.cpp index 813076806..cc0e70a74 100644 --- a/src/rubberband.cpp +++ b/src/rubberband.cpp @@ -44,7 +44,7 @@ void Inkscape::Rubberband::stop() void Inkscape::Rubberband::move(NR::Point const &p) { if (_canvas == NULL) { - _canvas = static_cast(sp_canvas_item_new(SP_DT_CONTROLS(_desktop), SP_TYPE_CTRLRECT, NULL)); + _canvas = static_cast(sp_canvas_item_new(sp_desktop_controls(_desktop), SP_TYPE_CTRLRECT, NULL)); } _desktop->scroll_to_point(&p); diff --git a/src/satisfied-guide-cns.cpp b/src/satisfied-guide-cns.cpp index edbf32dbb..3353b1fdf 100644 --- a/src/satisfied-guide-cns.cpp +++ b/src/satisfied-guide-cns.cpp @@ -9,7 +9,7 @@ void satisfied_guide_cns(SPDesktop const &desktop, std::vector const &snappoints, std::vector &cns) { - SPNamedView const &nv = *SP_DT_NAMEDVIEW(&desktop); + SPNamedView const &nv = *sp_desktop_namedview(&desktop); for (GSList const *l = nv.guides; l != NULL; l = l->next) { SPGuide &g = *SP_GUIDE(l->data); for (unsigned int i = 0; i < snappoints.size(); ++i) { diff --git a/src/selcue.cpp b/src/selcue.cpp index 426422fc9..6d3656592 100644 --- a/src/selcue.cpp +++ b/src/selcue.cpp @@ -27,7 +27,7 @@ Inkscape::SelCue::SelCue(SPDesktop *desktop) : _desktop(desktop) { - _selection = SP_DT_SELECTION(_desktop); + _selection = sp_desktop_selection(_desktop); _sel_changed_connection = _selection->connectChanged( sigc::hide(sigc::mem_fun(*this, &Inkscape::SelCue::_updateItemBboxes)) @@ -83,7 +83,7 @@ void Inkscape::SelCue::_updateItemBboxes() SPCanvasItem* box = NULL; if (mode == MARK) { - box = sp_canvas_item_new(SP_DT_CONTROLS(_desktop), + box = sp_canvas_item_new(sp_desktop_controls(_desktop), SP_TYPE_CTRL, "mode", SP_CTRL_MODE_XOR, "shape", SP_CTRL_SHAPE_DIAMOND, @@ -100,7 +100,7 @@ void Inkscape::SelCue::_updateItemBboxes() } else if (mode == BBOX) { box = sp_canvas_item_new( - SP_DT_CONTROLS(_desktop), + sp_desktop_controls(_desktop), SP_TYPE_CTRLRECT, NULL ); @@ -121,7 +121,7 @@ void Inkscape::SelCue::_updateItemBboxes() Inkscape::Text::Layout const *layout = te_get_layout(item); if (layout != NULL) { NR::Point a = layout->characterAnchorPoint(layout->begin()) * sp_item_i2d_affine(item); - baseline_point = sp_canvas_item_new(SP_DT_CONTROLS(_desktop), SP_TYPE_CTRL, + baseline_point = sp_canvas_item_new(sp_desktop_controls(_desktop), SP_TYPE_CTRL, "mode", SP_CTRL_MODE_XOR, "size", 4.0, "filled", 0, diff --git a/src/select-context.cpp b/src/select-context.cpp index e9ad992a4..32eee593d 100644 --- a/src/select-context.cpp +++ b/src/select-context.cpp @@ -211,7 +211,7 @@ sp_select_context_abort(SPEventContext *event_context) if (sc->item) { // only undo if the item is still valid if (SP_OBJECT_DOCUMENT( SP_OBJECT(sc->item))) { - sp_document_undo(SP_DT_DOCUMENT(desktop)); + sp_document_undo(sp_desktop_document(desktop)); } sp_object_unref( SP_OBJECT(sc->item), NULL); @@ -219,7 +219,7 @@ sp_select_context_abort(SPEventContext *event_context) // NOTE: This is a workaround to a bug. // When the ctrl key is held, sc->item is not defined // so in this case (only), we skip the object doc check - sp_document_undo(SP_DT_DOCUMENT(desktop)); + sp_document_undo(sp_desktop_document(desktop)); } sc->item = NULL; @@ -275,7 +275,7 @@ sp_select_context_up_one_layer(SPDesktop *desktop) { desktop->setCurrentLayer(parent); if (SP_IS_GROUP(current_layer) && SPGroup::LAYER != SP_GROUP(current_layer)->layerMode()) - SP_DT_SELECTION(desktop)->set(current_layer); + sp_desktop_selection(desktop)->set(current_layer); } } } @@ -342,13 +342,13 @@ sp_select_context_item_handler(SPEventContext *event_context, SPItem *item, GdkE case GDK_ENTER_NOTIFY: { GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR); - gdk_window_set_cursor(GTK_WIDGET(SP_DT_CANVAS(desktop))->window, cursor); + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, cursor); gdk_cursor_destroy(cursor); break; } case GDK_LEAVE_NOTIFY: - gdk_window_set_cursor(GTK_WIDGET(SP_DT_CANVAS(desktop))->window, event_context->cursor); + gdk_window_set_cursor(GTK_WIDGET(sp_desktop_canvas(desktop))->window, event_context->cursor); break; case GDK_KEY_PRESS: @@ -383,7 +383,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) SPDesktop *desktop = event_context->desktop; SPSelectContext *sc = SP_SELECT_CONTEXT(event_context); Inkscape::SelTrans *seltrans = sc->_seltrans; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); gdouble const nudge = prefs_get_double_attribute_limited("options.nudgedistance", "value", 2, 0, 1000); // in px gdouble const offset = prefs_get_double_attribute_limited("options.defaultscale", "value", 2, 0, 1000); tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); @@ -401,7 +401,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) SPItem *clicked_item = (SPItem *) selection->itemList()->data; if (SP_IS_GROUP (clicked_item)) { // enter group desktop->setCurrentLayer(reinterpret_cast(clicked_item)); - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); sc->dragging = false; } else { // switch tool tools_switch_by_item (desktop, clicked_item); @@ -546,7 +546,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) Inkscape::Rubberband::get()->stop(); seltrans->resetState(); // find out affected items: - GSList *items = sp_document_items_in_box(SP_DT_DOCUMENT(desktop), desktop->dkey, b.assume()); + GSList *items = sp_document_items_in_box(sp_desktop_document(desktop), desktop->dkey, b.assume()); if (event->button.state & GDK_SHIFT_MASK) { // with shift, add to selection selection->addList (items); @@ -776,7 +776,7 @@ sp_select_context_root_handler(SPEventContext *event_context, GdkEvent *event) SPItem *clicked_item = selection->singleItem(); if (SP_IS_GROUP (clicked_item)) { // enter group desktop->setCurrentLayer(reinterpret_cast(clicked_item)); - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); } else { SP_EVENT_CONTEXT(sc)->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Selected object is not a group. Cannot enter.")); } diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index e6684010e..0e208f216 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -208,11 +208,11 @@ void sp_selection_delete() if (tools_isactive (desktop, TOOLS_TEXT)) if (sp_text_delete_selection(desktop->event_context)) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); return; } - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -233,7 +233,7 @@ void sp_selection_delete() */ tools_switch ( desktop, tools_active ( desktop ) ); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } /* fixme: sequencing */ @@ -243,7 +243,7 @@ void sp_selection_duplicate() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -271,7 +271,7 @@ void sp_selection_duplicate() Inkscape::GC::release(copy); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); selection->setReprList(newsel); @@ -284,8 +284,8 @@ void sp_edit_clear_all() if (!dt) return; - SPDocument *doc = SP_DT_DOCUMENT(dt); - SP_DT_SELECTION(dt)->clear(); + SPDocument *doc = sp_desktop_document(dt); + sp_desktop_selection(dt)->clear(); g_return_if_fail(SP_IS_GROUP(dt->currentLayer())); GSList *items = sp_item_group_item_list(SP_GROUP(dt->currentLayer())); @@ -326,7 +326,7 @@ void sp_edit_select_all_full (bool force_all_layers, bool invert) if (!dt) return; - Inkscape::Selection *selection = SP_DT_SELECTION(dt); + Inkscape::Selection *selection = sp_desktop_selection(dt); g_return_if_fail(SP_IS_GROUP(dt->currentLayer())); @@ -412,9 +412,9 @@ void sp_selection_group() if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT (desktop); + SPDocument *document = sp_desktop_document (desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // Check if something is selected. if (selection->isEmpty()) { @@ -496,7 +496,7 @@ void sp_selection_group() // Move to the position of the topmost, reduced by the number of items deleted from topmost_parent group->setPosition(topmost + 1); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); selection->set(group); Inkscape::GC::release(group); @@ -508,7 +508,7 @@ void sp_selection_ungroup() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select a group to ungroup.")); @@ -557,7 +557,7 @@ void sp_selection_ungroup() g_slist_free(items); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } static SPGroup * @@ -617,7 +617,7 @@ sp_selection_raise() if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = (GSList *) selection->itemList(); if (!items) { @@ -658,7 +658,7 @@ sp_selection_raise() rev = g_slist_remove(rev, child); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } void sp_selection_raise_to_top() @@ -667,8 +667,8 @@ void sp_selection_raise_to_top() if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + SPDocument *document = sp_desktop_document(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to raise to top.")); @@ -703,7 +703,7 @@ sp_selection_lower() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = (GSList *) selection->itemList(); if (!items) { @@ -749,7 +749,7 @@ sp_selection_lower() rev = g_slist_remove(rev, child); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } @@ -759,8 +759,8 @@ void sp_selection_lower_to_bottom() if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + SPDocument *document = sp_desktop_document(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select object(s) to lower to bottom.")); @@ -803,14 +803,14 @@ void sp_selection_lower_to_bottom() void sp_undo(SPDesktop *desktop, SPDocument *) { - if (!sp_document_undo(SP_DT_DOCUMENT(desktop))) + if (!sp_document_undo(sp_desktop_document(desktop))) desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to undo.")); } void sp_redo(SPDesktop *desktop, SPDocument *) { - if (!sp_document_redo(SP_DT_DOCUMENT(desktop))) + if (!sp_document_redo(sp_desktop_document(desktop))) desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to redo.")); } @@ -972,7 +972,7 @@ void sp_selection_copy() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (tools_isactive (desktop, TOOLS_DROPPER)) { sp_dropper_context_copy(desktop->event_context); @@ -1066,13 +1066,13 @@ void sp_selection_paste(bool in_place) return; } - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); if (Inkscape::have_viable_layer(desktop, desktop->messageStack()) == false) { return; } - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (tools_isactive (desktop, TOOLS_TEXT)) { if (sp_text_paste_inline(desktop->event_context)) @@ -1113,7 +1113,7 @@ void sp_selection_paste_style() SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is in the clipboard if (clipboard == NULL) { @@ -1127,11 +1127,11 @@ void sp_selection_paste_style() return; } - paste_defs (&defs_clipboard, SP_DT_DOCUMENT(desktop)); + paste_defs (&defs_clipboard, sp_desktop_document(desktop)); sp_desktop_set_style (desktop, style_clipboard); - sp_document_done(SP_DT_DOCUMENT (desktop)); + sp_document_done(sp_desktop_document (desktop)); } void sp_selection_paste_size (bool apply_x, bool apply_y) @@ -1139,7 +1139,7 @@ void sp_selection_paste_size (bool apply_x, bool apply_y) SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is in the clipboard if (size_clipboard.extent(NR::X) < 1e-6 || size_clipboard.extent(NR::Y) < 1e-6) { @@ -1166,7 +1166,7 @@ void sp_selection_paste_size (bool apply_x, bool apply_y) apply_x? scale_x : (desktop->isToolboxButtonActive ("lock")? scale_y : 1.0), apply_y? scale_y : (desktop->isToolboxButtonActive ("lock")? scale_x : 1.0))); - sp_document_done(SP_DT_DOCUMENT (desktop)); + sp_document_done(sp_desktop_document (desktop)); } void sp_selection_paste_size_separately (bool apply_x, bool apply_y) @@ -1174,7 +1174,7 @@ void sp_selection_paste_size_separately (bool apply_x, bool apply_y) SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is in the clipboard if (size_clipboard.extent(NR::X) < 1e-6 || size_clipboard.extent(NR::Y) < 1e-6) { @@ -1206,14 +1206,14 @@ void sp_selection_paste_size_separately (bool apply_x, bool apply_y) } - sp_document_done(SP_DT_DOCUMENT (desktop)); + sp_document_done(sp_desktop_document (desktop)); } void sp_selection_to_next_layer () { SPDesktop *dt = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(dt); + Inkscape::Selection *selection = sp_desktop_selection(dt); // check if something is selected if (selection->isEmpty()) { @@ -1228,12 +1228,12 @@ void sp_selection_to_next_layer () GSList *temp_clip = NULL; sp_selection_copy_impl (items, &temp_clip, NULL, NULL); // we're in the same doc, so no need to copy defs sp_selection_delete_impl (items); - GSList *copied = sp_selection_paste_impl (SP_DT_DOCUMENT (dt), next, &temp_clip, NULL); + GSList *copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL); selection->setReprList((GSList const *) copied); g_slist_free (copied); if (temp_clip) g_slist_free (temp_clip); dt->setCurrentLayer(next); - sp_document_done(SP_DT_DOCUMENT (dt)); + sp_document_done(sp_desktop_document (dt)); } else { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("No more layers above.")); } @@ -1245,7 +1245,7 @@ void sp_selection_to_prev_layer () { SPDesktop *dt = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(dt); + Inkscape::Selection *selection = sp_desktop_selection(dt); // check if something is selected if (selection->isEmpty()) { @@ -1260,12 +1260,12 @@ void sp_selection_to_prev_layer () GSList *temp_clip = NULL; sp_selection_copy_impl (items, &temp_clip, NULL, NULL); // we're in the same doc, so no need to copy defs sp_selection_delete_impl (items); - GSList *copied = sp_selection_paste_impl (SP_DT_DOCUMENT (dt), next, &temp_clip, NULL); + GSList *copied = sp_selection_paste_impl (sp_desktop_document (dt), next, &temp_clip, NULL); selection->setReprList((GSList const *) copied); g_slist_free (copied); if (temp_clip) g_slist_free (temp_clip); dt->setCurrentLayer(next); - sp_document_done(SP_DT_DOCUMENT (dt)); + sp_document_done(sp_desktop_document (dt)); } else { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("No more layers below.")); } @@ -1386,7 +1386,7 @@ void sp_selection_remove_transform() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *l = (GSList *) selection->reprList(); while (l != NULL) { @@ -1394,7 +1394,7 @@ void sp_selection_remove_transform() l = l->next; } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } void @@ -1490,7 +1490,7 @@ void sp_selection_rotate_90_cw() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) return; @@ -1502,7 +1502,7 @@ void sp_selection_rotate_90_cw() sp_item_rotate_rel(item, rot_neg_90); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } @@ -1517,7 +1517,7 @@ void sp_selection_rotate_90_ccw() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) return; @@ -1529,7 +1529,7 @@ void sp_selection_rotate_90_ccw() sp_item_rotate_rel(item, rot_neg_90); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } void @@ -1542,7 +1542,7 @@ sp_selection_rotate(Inkscape::Selection *selection, gdouble const angle_degrees) sp_selection_rotate_relative(selection, center, angle_degrees); - sp_document_maybe_done(SP_DT_DOCUMENT(selection->desktop()), + sp_document_maybe_done(sp_desktop_document(selection->desktop()), ( ( angle_degrees > 0 ) ? "selector:rotate:ccw" : "selector:rotate:cw" )); @@ -1569,7 +1569,7 @@ sp_selection_rotate_screen(Inkscape::Selection *selection, gdouble angle) sp_selection_rotate_relative(selection, center, zangle); - sp_document_maybe_done(SP_DT_DOCUMENT(selection->desktop()), + sp_document_maybe_done(sp_desktop_document(selection->desktop()), ( (angle > 0) ? "selector:rotate:ccw" : "selector:rotate:cw" )); @@ -1593,7 +1593,7 @@ sp_selection_scale(Inkscape::Selection *selection, gdouble grow) double const times = 1.0 + grow / max_len; sp_selection_scale_relative(selection, center, NR::scale(times, times)); - sp_document_maybe_done(SP_DT_DOCUMENT(selection->desktop()), + sp_document_maybe_done(sp_desktop_document(selection->desktop()), ( (grow > 0) ? "selector:scale:larger" : "selector:scale:smaller" )); @@ -1614,14 +1614,14 @@ sp_selection_scale_times(Inkscape::Selection *selection, gdouble times) NR::Point const center(selection->bounds().midpoint()); sp_selection_scale_relative(selection, center, NR::scale(times, times)); - sp_document_done(SP_DT_DOCUMENT(selection->desktop())); + sp_document_done(sp_desktop_document(selection->desktop())); } void sp_selection_move(gdouble dx, gdouble dy) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { return; } @@ -1629,11 +1629,11 @@ sp_selection_move(gdouble dx, gdouble dy) sp_selection_move_relative(selection, dx, dy); if (dx == 0) { - sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:vertical"); + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical"); } else if (dy == 0) { - sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:horizontal"); + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal"); } else { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } } @@ -1642,7 +1642,7 @@ sp_selection_move_screen(gdouble dx, gdouble dy) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { return; } @@ -1654,11 +1654,11 @@ sp_selection_move_screen(gdouble dx, gdouble dy) sp_selection_move_relative(selection, zdx, zdy); if (dx == 0) { - sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:vertical"); + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:vertical"); } else if (dy == 0) { - sp_document_maybe_done(SP_DT_DOCUMENT(desktop), "selector:move:horizontal"); + sp_document_maybe_done(sp_desktop_document(desktop), "selector:move:horizontal"); } else { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } } @@ -1719,7 +1719,7 @@ sp_selection_item_next(void) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; g_return_if_fail(desktop != NULL); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); PrefsSelectionContext inlayer = (PrefsSelectionContext)prefs_get_int_attribute ("options.kbselection", "inlayer", PREFS_SELECTION_LAYER); bool onlyvisible = prefs_get_int_attribute ("options.kbselection", "onlyvisible", 1); @@ -1749,7 +1749,7 @@ sp_selection_item_prev(void) SPDesktop *desktop = SP_ACTIVE_DESKTOP; g_return_if_fail(document != NULL); g_return_if_fail(desktop != NULL); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); PrefsSelectionContext inlayer = (PrefsSelectionContext)prefs_get_int_attribute ("options.kbselection", "inlayer", PREFS_SELECTION_LAYER); bool onlyvisible = prefs_get_int_attribute ("options.kbselection", "onlyvisible", 1); @@ -1881,7 +1881,7 @@ sp_selection_clone() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -1918,7 +1918,7 @@ sp_selection_clone() Inkscape::GC::release(clone); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); selection->setReprList(newsel); @@ -1932,7 +1932,7 @@ sp_selection_unlink() if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select a clone to unlink.")); @@ -1969,7 +1969,7 @@ sp_selection_unlink() desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No clones to unlink in the selection.")); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } void @@ -1979,7 +1979,7 @@ sp_select_clone_original() if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); SPItem *item = selection->singleItem(); @@ -2033,9 +2033,9 @@ sp_selection_tile(bool apply) if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -2104,7 +2104,7 @@ sp_selection_tile(bool apply) // restore parent and position SP_OBJECT_REPR (parent)->appendChild(rect); rect->setPosition(pos > 0 ? pos : 0); - SPItem *rectangle = (SPItem *) SP_DT_DOCUMENT (desktop)->getObjectByRepr(rect); + SPItem *rectangle = (SPItem *) sp_desktop_document (desktop)->getObjectByRepr(rect); Inkscape::GC::release(rect); @@ -2124,9 +2124,9 @@ sp_selection_untile() if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -2185,7 +2185,7 @@ sp_selection_untile() if (!did) { desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No pattern fills in the selection.")); } else { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); selection->setList(new_select); } } @@ -2197,9 +2197,9 @@ sp_selection_create_bitmap_copy () if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -2359,9 +2359,9 @@ sp_selection_set_mask(bool apply_clip_path, bool apply_to_layer) if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); + SPDocument *document = sp_desktop_document(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected bool is_empty = selection->isEmpty(); @@ -2467,8 +2467,8 @@ void sp_selection_unset_mask(bool apply_clip_path) { if (desktop == NULL) return; - SPDocument *document = SP_DT_DOCUMENT(desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + SPDocument *document = sp_desktop_document(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); // check if something is selected if (selection->isEmpty()) { @@ -2527,7 +2527,7 @@ void sp_selection_unset_mask(bool apply_clip_path) { parent->appendChild(repr); repr->setPosition((pos + 1) > 0 ? (pos + 1) : 0); - SPItem *mask_item = (SPItem *) SP_DT_DOCUMENT (desktop)->getObjectByRepr(repr); + SPItem *mask_item = (SPItem *) sp_desktop_document (desktop)->getObjectByRepr(repr); selection->add(repr); // transform mask, so it is moved the same spot where mask was applied diff --git a/src/selection.cpp b/src/selection.cpp index 702cc6594..413048f5c 100644 --- a/src/selection.cpp +++ b/src/selection.cpp @@ -476,7 +476,7 @@ SPObject *Selection::_objectForXMLNode(Inkscape::XML::Node *repr) const { g_return_val_if_fail(repr != NULL, NULL); gchar const *id = repr->attribute("id"); g_return_val_if_fail(id != NULL, NULL); - SPObject *object=SP_DT_DOCUMENT(_desktop)->getObjectById(id); + SPObject *object=sp_desktop_document(_desktop)->getObjectById(id); g_return_val_if_fail(object != NULL, NULL); return object; } diff --git a/src/seltrans.cpp b/src/seltrans.cpp index a301c8158..ec6ca8ba2 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -105,9 +105,9 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) : _updateHandles(); - _selection = SP_DT_SELECTION(desktop); + _selection = sp_desktop_selection(desktop); - _norm = sp_canvas_item_new(SP_DT_CONTROLS(desktop), + _norm = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRL, "anchor", GTK_ANCHOR_CENTER, "mode", SP_CTRL_MODE_COLOR, @@ -120,7 +120,7 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) : "pixbuf", handles[12], NULL); - _grip = sp_canvas_item_new(SP_DT_CONTROLS(desktop), + _grip = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRL, "anchor", GTK_ANCHOR_CENTER, "mode", SP_CTRL_MODE_XOR, @@ -137,7 +137,7 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) : sp_canvas_item_hide(_norm); for (int i = 0; i < 4; i++) { - _l[i] = sp_canvas_item_new(SP_DT_CONTROLS(desktop), SP_TYPE_CTRLLINE, NULL); + _l[i] = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLLINE, NULL); sp_canvas_item_hide(_l[i]); } @@ -222,14 +222,14 @@ void Inkscape::SelTrans::setCenter(NR::Point const &p) it->setCenter(p); SP_OBJECT(it)->updateRepr(); } - sp_document_maybe_done (SP_DT_DOCUMENT(_desktop), "center::move"); + sp_document_maybe_done (sp_desktop_document(_desktop), "center::move"); _updateHandles(); } void Inkscape::SelTrans::grab(NR::Point const &p, gdouble x, gdouble y, bool show_handles) { - Inkscape::Selection *selection = SP_DT_SELECTION(_desktop); + Inkscape::Selection *selection = sp_desktop_selection(_desktop); g_return_if_fail(!_grabbed); @@ -320,7 +320,7 @@ void Inkscape::SelTrans::ungrab() { g_return_if_fail(_grabbed); - Inkscape::Selection *selection = SP_DT_SELECTION(_desktop); + Inkscape::Selection *selection = sp_desktop_selection(_desktop); bool updh = true; if (!_empty && _changed) { sp_selection_apply_affine(selection, _current, (_show == SHOW_OUTLINE)? true : false); @@ -340,7 +340,7 @@ void Inkscape::SelTrans::ungrab() } } - sp_document_done(SP_DT_DOCUMENT(_desktop)); + sp_document_done(sp_desktop_document(_desktop)); updh = false; } @@ -378,7 +378,7 @@ void Inkscape::SelTrans::ungrab() void Inkscape::SelTrans::stamp() { - Inkscape::Selection *selection = SP_DT_SELECTION(_desktop); + Inkscape::Selection *selection = sp_desktop_selection(_desktop); /* stamping mode */ if (!_empty) { @@ -408,7 +408,7 @@ void Inkscape::SelTrans::stamp() // move to the saved position copy_repr->setPosition(pos > 0 ? pos : 0); - SPItem *copy_item = (SPItem *) SP_DT_DOCUMENT(_desktop)->getObjectByRepr(copy_repr); + SPItem *copy_item = (SPItem *) sp_desktop_document(_desktop)->getObjectByRepr(copy_repr); NR::Matrix const *new_affine; if (_show == SHOW_OUTLINE) { @@ -425,7 +425,7 @@ void Inkscape::SelTrans::stamp() Inkscape::GC::release(copy_repr); l = l->next; } - sp_document_done(SP_DT_DOCUMENT(_desktop)); + sp_document_done(sp_desktop_document(_desktop)); } } @@ -492,7 +492,7 @@ void Inkscape::SelTrans::_updateHandles() void Inkscape::SelTrans::_updateVolatileState() { - Inkscape::Selection *selection = SP_DT_SELECTION(_desktop); + Inkscape::Selection *selection = sp_desktop_selection(_desktop); _empty = selection->isEmpty(); if (_empty) { @@ -602,7 +602,7 @@ void Inkscape::SelTrans::handleClick(SPKnot *knot, guint state, SPSelTransHandle it->unsetCenter(); SP_OBJECT(it)->updateRepr(); } - sp_document_maybe_done (SP_DT_DOCUMENT(_desktop), "center::unset"); + sp_document_maybe_done (sp_desktop_document(_desktop), "center::unset"); } break; default: diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp index e078013aa..a16123901 100644 --- a/src/sp-flowtext.cpp +++ b/src/sp-flowtext.cpp @@ -502,7 +502,7 @@ void SPFlowtext::_clearFlow(NRArenaGroup *in_arena) void SPFlowtext::convert_to_text() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); SPItem *item = selection->singleItem(); if (!SP_IS_FLOWTEXT(item)) return; @@ -601,7 +601,7 @@ void SPFlowtext::convert_to_text() Inkscape::XML::Node *parent = SP_OBJECT_REPR(item)->parent(); parent->appendChild(repr); - SPItem *new_item = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr); + SPItem *new_item = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr); sp_item_write_transform(new_item, repr, item->transform); SP_OBJECT(new_item)->updateRepr(); @@ -609,7 +609,7 @@ void SPFlowtext::convert_to_text() selection->set(new_item); item->deleteObject(); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } SPItem *SPFlowtext::get_frame(SPItem *after) @@ -660,7 +660,7 @@ bool SPFlowtext::has_internal_frame() SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, NR::Point p0, NR::Point p1) { - SPDocument *doc = SP_DT_DOCUMENT (desktop); + SPDocument *doc = sp_desktop_document (desktop); Inkscape::XML::Node *root_repr = sp_repr_new("svg:flowRoot"); root_repr->setAttribute("xml:space", "preserve"); // we preserve spaces in the text objects we create diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 4dfdb1b28..39590f826 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -571,7 +571,7 @@ static void sp_namedview_child_added(SPObject *object, Inkscape::XML::Node *chil sp_guide_show(g, static_cast(l->data)->guides, (GCallback) sp_dt_guide_event); if (static_cast(l->data)->guides_active) sp_guide_sensitize(g, - SP_DT_CANVAS(static_cast (l->data)), + sp_desktop_canvas(static_cast (l->data)), TRUE); if (nv->showguides) { for (GSList *v = SP_GUIDE(g)->views; v != NULL; v = v->next) { @@ -627,7 +627,7 @@ void SPNamedView::show(SPDesktop *desktop) for (GSList *l = guides; l != NULL; l = l->next) { sp_guide_show(SP_GUIDE(l->data), desktop->guides, (GCallback) sp_dt_guide_event); if (desktop->guides_active) { - sp_guide_sensitize(SP_GUIDE(l->data), SP_DT_CANVAS(desktop), TRUE); + sp_guide_sensitize(SP_GUIDE(l->data), sp_desktop_canvas(desktop), TRUE); } if (showguides) { for (GSList *v = SP_GUIDE(l->data)->views; v != NULL; v = v->next) { @@ -642,7 +642,7 @@ void SPNamedView::show(SPDesktop *desktop) views = g_slist_prepend(views, desktop); - SPCanvasItem *item = sp_canvas_item_new(SP_DT_GRID(desktop), SP_TYPE_CGRID, NULL); + SPCanvasItem *item = sp_canvas_item_new(sp_desktop_grid(desktop), SP_TYPE_CGRID, NULL); // since we're keeping a copy, we need to bump up the ref count gtk_object_ref(GTK_OBJECT(item)); gridviews = g_slist_prepend(gridviews, item); @@ -670,7 +670,7 @@ void sp_namedview_window_from_document(SPDesktop *desktop) && nv->cx != HUGE_VAL && !isNaN(nv->cx) && nv->cy != HUGE_VAL && !isNaN(nv->cy)) { desktop->zoom_absolute(nv->cx, nv->cy, nv->zoom); - } else if (SP_DT_DOCUMENT(desktop)) { // document without saved zoom, zoom to its page + } else if (sp_desktop_document(desktop)) { // document without saved zoom, zoom to its page desktop->zoom_page(); } @@ -710,8 +710,8 @@ void sp_namedview_document_from_window(SPDesktop *desktop) NR::Rect const r = desktop->get_display_area(); // saving window geometry is not undoable - gboolean saved = sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop)); - sp_document_set_undo_sensitive(SP_DT_DOCUMENT(desktop), FALSE); + gboolean saved = sp_document_get_undo_sensitive(sp_desktop_document(desktop)); + sp_document_set_undo_sensitive(sp_desktop_document(desktop), FALSE); sp_repr_set_svg_double(view, "inkscape:zoom", desktop->current_zoom()); sp_repr_set_svg_double(view, "inkscape:cx", r.midpoint()[NR::X]); @@ -729,7 +729,7 @@ void sp_namedview_document_from_window(SPDesktop *desktop) view->setAttribute("inkscape:current-layer", SP_OBJECT_ID(desktop->currentLayer())); // restore undoability - sp_document_set_undo_sensitive(SP_DT_DOCUMENT(desktop), saved); + sp_document_set_undo_sensitive(sp_desktop_document(desktop), saved); } void SPNamedView::hide(SPDesktop const *desktop) @@ -738,14 +738,14 @@ void SPNamedView::hide(SPDesktop const *desktop) g_assert(g_slist_find(views, desktop)); for (GSList *l = guides; l != NULL; l = l->next) { - sp_guide_hide(SP_GUIDE(l->data), SP_DT_CANVAS(desktop)); + sp_guide_hide(SP_GUIDE(l->data), sp_desktop_canvas(desktop)); } views = g_slist_remove(views, desktop); GSList *l; for (l = gridviews; l != NULL; l = l->next) { - if (SP_CANVAS_ITEM(l->data)->canvas == SP_DT_CANVAS(desktop)) { + if (SP_CANVAS_ITEM(l->data)->canvas == sp_desktop_canvas(desktop)) { break; } } @@ -765,7 +765,7 @@ void SPNamedView::activateGuides(gpointer desktop, gboolean active) SPDesktop *dt = static_cast(desktop); for (GSList *l = guides; l != NULL; l = l->next) { - sp_guide_sensitize(SP_GUIDE(l->data), SP_DT_CANVAS(dt), active); + sp_guide_sensitize(SP_GUIDE(l->data), sp_desktop_canvas(dt), active); } } diff --git a/src/sp-text.cpp b/src/sp-text.cpp index c1c4acae4..f9be54944 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -409,7 +409,7 @@ sp_text_description(SPItem *item) n = g_strdup(_("<no name found>")); } - GString *xs = SP_PX_TO_METRIC_STRING(style->font_size.computed, SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)->getDefaultMetric()); + GString *xs = SP_PX_TO_METRIC_STRING(style->font_size.computed, sp_desktop_namedview(SP_ACTIVE_DESKTOP)->getDefaultMetric()); char *ret = ( SP_IS_TEXT_TEXTPATH(item) ? g_strdup_printf(_("Text on path (%s, %s)"), n, xs->str) diff --git a/src/spiral-context.cpp b/src/spiral-context.cpp index ea0ba9b64..b05926b02 100644 --- a/src/spiral-context.cpp +++ b/src/spiral-context.cpp @@ -199,7 +199,7 @@ sp_spiral_context_setup(SPEventContext *ec) sp_event_context_read(ec, "revolution"); sp_event_context_read(ec, "t0"); - Inkscape::Selection *selection = SP_DT_SELECTION(ec->desktop); + Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); SPItem *item = selection->singleItem(); if (item) { @@ -249,7 +249,7 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event) static gboolean dragging; SPDesktop *desktop = event_context->desktop; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); SPSpiralContext *sc = SP_SPIRAL_CONTEXT(event_context); event_context->tolerance = prefs_get_int_attribute_limited("options.dragtolerance", "value", 0, 0, 100); @@ -348,7 +348,7 @@ sp_spiral_context_root_handler(SPEventContext *event_context, GdkEvent *event) } break; case GDK_Escape: - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); //TODO: make dragging escapable by Esc default: break; @@ -451,8 +451,8 @@ sp_spiral_finish(SPSpiralContext *sc) sp_shape_set_shape(SP_SHAPE(spiral)); SP_OBJECT(spiral)->updateRepr(NULL, SP_OBJECT_WRITE_EXT); - SP_DT_SELECTION(desktop)->set(sc->item); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_desktop_selection(desktop)->set(sc->item); + sp_document_done(sp_desktop_document(desktop)); sc->item = NULL; } diff --git a/src/splivarot.cpp b/src/splivarot.cpp index 065533f71..0d43373d2 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -92,7 +92,7 @@ sp_selected_path_boolop(bool_op bop) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList *il = (GSList *) selection->itemList(); @@ -395,7 +395,7 @@ sp_selected_path_boolop(bool_op bop) { SP_OBJECT(l->data)->deleteObject(); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); selection->clear(); delete res; @@ -440,7 +440,7 @@ sp_selected_path_boolop(bool_op bop) g_slist_free(il); // premultiply by the inverse of parent's repr - SPItem *parent_item = SP_ITEM(SP_DT_DOCUMENT(desktop)->getObjectByRepr(parent)); + SPItem *parent_item = SP_ITEM(sp_desktop_document(desktop)->getObjectByRepr(parent)); NR::Matrix local = sp_item_i2doc_affine(parent_item); gchar affinestr[80]; gchar *transform = NULL; @@ -530,7 +530,7 @@ sp_selected_path_boolop(bool_op bop) Inkscape::GC::release(repr); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); delete res; } @@ -541,7 +541,7 @@ sp_selected_path_outline() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { // TRANSLATORS: "to outline" means "to convert stroke to path" @@ -721,7 +721,7 @@ sp_selected_path_outline() repr->setAttribute("id", id); - SPItem *newitem = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr); + SPItem *newitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr); sp_item_write_transform(newitem, repr, transform); selection->add(repr); @@ -736,7 +736,7 @@ sp_selected_path_outline() } if (did) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } else { // TRANSLATORS: "to outline" means "to convert stroke to path" desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No stroked paths to outline in the selection.")); @@ -818,7 +818,7 @@ sp_selected_path_create_offset_object(int expand, bool updating) desktop = SP_ACTIVE_DESKTOP; - selection = SP_DT_SELECTION(desktop); + selection = sp_desktop_selection(desktop); item = selection->singleItem(); @@ -940,7 +940,7 @@ sp_selected_path_create_offset_object(int expand, bool updating) { // pas vraiment de points sur le resultat // donc il ne reste rien - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); selection->clear(); delete res; @@ -983,7 +983,7 @@ sp_selected_path_create_offset_object(int expand, bool updating) // move to the saved position repr->setPosition(pos > 0 ? pos : 0); - SPItem *nitem = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr); + SPItem *nitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr); if ( updating ) { // on conserve l'original @@ -1004,7 +1004,7 @@ sp_selected_path_create_offset_object(int expand, bool updating) selection->set(nitem); } - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); delete res; delete orig; @@ -1028,7 +1028,7 @@ sp_selected_path_do_offset(bool expand, double prefOffset) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select path(s) to inset/outset.")); @@ -1229,7 +1229,7 @@ sp_selected_path_do_offset(bool expand, double prefOffset) // move to the saved position repr->setPosition(pos > 0 ? pos : 0); - SPItem *newitem = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr); + SPItem *newitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr); // reapply the transform sp_item_write_transform(newitem, repr, transform); @@ -1246,7 +1246,7 @@ sp_selected_path_do_offset(bool expand, double prefOffset) } if (did) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } else { desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No paths to inset/outset in the selection.")); return; @@ -1353,7 +1353,7 @@ sp_selected_path_simplify_item(SPDesktop *desktop, Inkscape::Selection *selectio // move to the saved position repr->setPosition(pos > 0 ? pos : 0); - SPItem *newitem = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr); + SPItem *newitem = (SPItem *) sp_desktop_document(desktop)->getObjectByRepr(repr); // reapply the transform sp_item_write_transform(newitem, repr, transform); @@ -1377,7 +1377,7 @@ sp_selected_path_simplify_selection(float threshold, bool justCoalesce, { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, @@ -1406,7 +1406,7 @@ sp_selected_path_simplify_selection(float threshold, bool justCoalesce, if (didSomething) - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); else desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("No paths to simplify in the selection.")); diff --git a/src/star-context.cpp b/src/star-context.cpp index 9d5d16684..6e10a03fa 100644 --- a/src/star-context.cpp +++ b/src/star-context.cpp @@ -205,7 +205,7 @@ sp_star_context_setup (SPEventContext *ec) sp_event_context_read (ec, "rounded"); sp_event_context_read (ec, "randomized"); - Inkscape::Selection *selection = SP_DT_SELECTION(ec->desktop); + Inkscape::Selection *selection = sp_desktop_selection(ec->desktop); SPItem *item = selection->singleItem(); if (item) { @@ -259,7 +259,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent static gboolean dragging; SPDesktop *desktop = event_context->desktop; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); SPStarContext *sc = SP_STAR_CONTEXT (event_context); @@ -358,7 +358,7 @@ static gint sp_star_context_root_handler(SPEventContext *event_context, GdkEvent } break; case GDK_Escape: - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); //TODO: make dragging escapable by Esc default: break; @@ -463,8 +463,8 @@ sp_star_finish (SPStarContext * sc) object->updateRepr(NULL, SP_OBJECT_WRITE_EXT); - SP_DT_SELECTION(desktop)->set(sc->item); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_desktop_selection(desktop)->set(sc->item); + sp_document_done(sp_desktop_document(desktop)); sc->item = NULL; } diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp index 549db6228..21c74d1a7 100644 --- a/src/text-chemistry.cpp +++ b/src/text-chemistry.cpp @@ -85,29 +85,29 @@ text_put_on_path() if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); SPItem *text = text_or_flowtext_in_selection(selection); SPItem *shape = shape_in_selection(selection); if (!text || !shape || g_slist_length((GSList *) selection->itemList()) != 2) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select a text and a path to put text on path.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select a text and a path to put text on path.")); return; } if (SP_IS_TEXT_TEXTPATH(text)) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("This text object is already put on a path. Remove it from the path first. Use Shift+D to look up its path.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("This text object is already put on a path. Remove it from the path first. Use Shift+D to look up its path.")); return; } if (SP_IS_FLOWTEXT(text)) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot put flowtext on a path. Convert flowtext to text first.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot put flowtext on a path. Convert flowtext to text first.")); return; } if (SP_IS_RECT(shape)) { // rect is the only SPShape which is not yet, and thus SVG forbids us from putting text on it - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot put text on a rectangle in this version. Convert rectangle to path first.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("You cannot put text on a rectangle in this version. Convert rectangle to path first.")); return; } @@ -153,7 +153,7 @@ text_put_on_path() SP_OBJECT_REPR(text)->setAttribute("x", NULL); SP_OBJECT_REPR(text)->setAttribute("y", NULL); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); g_slist_free(text_reprs); } @@ -162,10 +162,10 @@ text_remove_from_path() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select a text on path to remove it from path.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select a text on path to remove it from path.")); return; } @@ -187,10 +187,10 @@ text_remove_from_path() } if (!did) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No texts-on-paths in the selection.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No texts-on-paths in the selection.")); } else { selection->setList(g_slist_copy((GSList *) selection->itemList())); // reselect to update statusbar description - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } } @@ -212,10 +212,10 @@ text_remove_all_kerns() { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select text(s) to remove kerns from.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select text(s) to remove kerns from.")); return; } @@ -235,9 +235,9 @@ text_remove_all_kerns() } if (!did) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, _("Select text(s) to remove kerns from.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("Select text(s) to remove kerns from.")); } else { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } } @@ -248,15 +248,15 @@ text_flow_into_shape() if (!desktop) return; - SPDocument *doc = SP_DT_DOCUMENT (desktop); + SPDocument *doc = sp_desktop_document (desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); SPItem *text = text_in_selection(selection); SPItem *shape = shape_in_selection(selection); if (!text || !shape || g_slist_length((GSList *) selection->itemList()) < 2) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select a text and one or more paths or shapes to flow text into frame.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select a text and one or more paths or shapes to flow text into frame.")); return; } @@ -307,7 +307,7 @@ text_flow_into_shape() sp_document_done(doc); - SP_DT_SELECTION(desktop)->set(SP_ITEM(root_object)); + sp_desktop_selection(desktop)->set(SP_ITEM(root_object)); Inkscape::GC::release(root_repr); Inkscape::GC::release(region_repr); @@ -322,13 +322,13 @@ text_unflow () if (!desktop) return; - SPDocument *doc = SP_DT_DOCUMENT (desktop); + SPDocument *doc = sp_desktop_document (desktop); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (!flowtext_in_selection(selection) || g_slist_length((GSList *) selection->itemList()) < 1) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select a flowed text to unflow it.")); + sp_desktop_message_stack(desktop)->flash(Inkscape::WARNING_MESSAGE, _("Select a flowed text to unflow it.")); return; } diff --git a/src/text-context.cpp b/src/text-context.cpp index 615e02d48..d5eaf6228 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -208,17 +208,17 @@ sp_text_context_setup(SPEventContext *ec) SPTextContext *tc = SP_TEXT_CONTEXT(ec); SPDesktop *desktop = ec->desktop; - tc->cursor = sp_canvas_item_new(SP_DT_CONTROLS(desktop), SP_TYPE_CTRLLINE, NULL); + tc->cursor = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLLINE, NULL); sp_ctrlline_set_coords(SP_CTRLLINE(tc->cursor), 100, 0, 100, 100); sp_ctrlline_set_rgba32(SP_CTRLLINE(tc->cursor), 0x000000ff); sp_canvas_item_hide(tc->cursor); - tc->indicator = sp_canvas_item_new(SP_DT_CONTROLS(desktop), SP_TYPE_CTRLRECT, NULL); + tc->indicator = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLRECT, NULL); SP_CTRLRECT(tc->indicator)->setRectangle(NR::Rect(NR::Point(0, 0), NR::Point(100, 100))); SP_CTRLRECT(tc->indicator)->setColor(0x0000ff7f, false, 0); sp_canvas_item_hide(tc->indicator); - tc->frame = sp_canvas_item_new(SP_DT_CONTROLS(desktop), SP_TYPE_CTRLRECT, NULL); + tc->frame = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLRECT, NULL); SP_CTRLRECT(tc->frame)->setRectangle(NR::Rect(NR::Point(0, 0), NR::Point(100, 100))); SP_CTRLRECT(tc->frame)->setColor(0x0000ff7f, false, 0); sp_canvas_item_hide(tc->frame); @@ -227,7 +227,7 @@ sp_text_context_setup(SPEventContext *ec) tc->imc = gtk_im_multicontext_new(); if (tc->imc) { - GtkWidget *canvas = GTK_WIDGET(SP_DT_CANVAS(desktop)); + GtkWidget *canvas = GTK_WIDGET(sp_desktop_canvas(desktop)); /* im preedit handling is very broken in inkscape for * multi-byte characters. See bug 1086769. @@ -250,7 +250,7 @@ sp_text_context_setup(SPEventContext *ec) if (((SPEventContextClass *) parent_class)->setup) ((SPEventContextClass *) parent_class)->setup(ec); - SPItem *item = SP_DT_SELECTION(ec->desktop)->singleItem(); + SPItem *item = sp_desktop_selection(ec->desktop)->singleItem(); if (item && SP_IS_FLOWTEXT (item) && SP_FLOWTEXT(item)->has_internal_frame()) { ec->shape_knot_holder = sp_item_knot_holder(item, ec->desktop); Inkscape::XML::Node *shape_repr = SP_OBJECT_REPR(SP_FLOWTEXT(item)->get_frame(NULL)); @@ -261,10 +261,10 @@ sp_text_context_setup(SPEventContext *ec) } } - tc->sel_changed_connection = SP_DT_SELECTION(desktop)->connectChanged( + tc->sel_changed_connection = sp_desktop_selection(desktop)->connectChanged( sigc::bind(sigc::ptr_fun(&sp_text_context_selection_changed), tc) ); - tc->sel_modified_connection = SP_DT_SELECTION(desktop)->connectModified( + tc->sel_modified_connection = sp_desktop_selection(desktop)->connectModified( sigc::bind(sigc::ptr_fun(&sp_text_context_selection_modified), tc) ); tc->style_set_connection = desktop->connectSetStyle( @@ -274,7 +274,7 @@ sp_text_context_setup(SPEventContext *ec) sigc::bind(sigc::ptr_fun(&sp_text_context_style_query), tc) ); - sp_text_context_selection_changed(SP_DT_SELECTION(desktop), tc); + sp_text_context_selection_changed(sp_desktop_selection(desktop), tc); if (prefs_get_int_attribute("tools.text", "selcue", 0) != 0) { ec->enableSelectionCue(); @@ -331,7 +331,7 @@ sp_text_context_finish(SPEventContext *ec) tc->text_selection_quads.clear(); if (ec->desktop) { - sp_signal_disconnect_by_data(SP_DT_CANVAS(ec->desktop), tc); + sp_signal_disconnect_by_data(sp_desktop_canvas(ec->desktop), tc); } } @@ -353,7 +353,7 @@ sp_text_context_item_handler(SPEventContext *ec, SPItem *item, GdkEvent *event) // find out clicked item, disregarding groups item_ungrouped = desktop->item_at_point(NR::Point(event->button.x, event->button.y), TRUE); if (SP_IS_TEXT(item_ungrouped) || SP_IS_FLOWTEXT(item_ungrouped)) { - SP_DT_SELECTION(ec->desktop)->set(item_ungrouped); + sp_desktop_selection(ec->desktop)->set(item_ungrouped); if (tc->text) { // find out click point in document coordinates NR::Point p = ec->desktop->w2d(NR::Point(event->button.x, event->button.y)); @@ -494,11 +494,11 @@ sp_text_context_setup_text(SPTextContext *tc) SPItem *text_item = SP_ITEM(ec->desktop->currentLayer()->appendChildRepr(rtext)); /* fixme: Is selection::changed really immediate? */ /* yes, it's immediate .. why does it matter? */ - SP_DT_SELECTION(ec->desktop)->set(text_item); + sp_desktop_selection(ec->desktop)->set(text_item); Inkscape::GC::release(rtext); text_item->transform = SP_ITEM(ec->desktop->currentRoot())->getRelativeTransform(ec->desktop->currentLayer()); text_item->updateRepr(); - sp_document_done(SP_DT_DOCUMENT(ec->desktop)); + sp_document_done(sp_desktop_document(ec->desktop)); } /** @@ -536,7 +536,7 @@ insert_uni_char(SPTextContext *const tc) tc->text_sel_start = tc->text_sel_end = sp_te_replace(tc->text, tc->text_sel_start, tc->text_sel_end, u); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); - sp_document_done(SP_DT_DOCUMENT(tc->desktop)); + sp_document_done(sp_desktop_document(tc->desktop)); } } @@ -668,7 +668,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) if (tc->creating && ec->within_tolerance) { /* Button 1, set X & Y & new item */ - SP_DT_SELECTION(desktop)->clear(); + sp_desktop_selection(desktop)->clear(); NR::Point dtp = ec->desktop->w2d(NR::Point(event->button.x, event->button.y)); tc->pdoc = sp_desktop_dt2root_xy_point(ec->desktop, dtp); @@ -692,9 +692,9 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) if (fabs(p1[NR::Y] - tc->p0[NR::Y]) > cursor_height) { // otherwise even one line won't fit; most probably a slip of hand (even if bigger than tolerance) SPItem *ft = create_flowtext_with_internal_frame (desktop, tc->p0, p1); - SP_DT_SELECTION(desktop)->set(ft); + sp_desktop_selection(desktop)->set(ft); ec->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Flowed text is created.")); - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } else { ec->desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, _("The frame is too small for the current font size. Flowed text not created.")); } @@ -816,7 +816,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); ec->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("No-break space")); - sp_document_done(SP_DT_DOCUMENT(ec->desktop)); + sp_document_done(sp_desktop_document(ec->desktop)); return TRUE; } break; @@ -852,7 +852,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) sp_repr_css_set_property(css, "font-weight", "normal"); sp_te_apply_style(tc->text, tc->text_sel_start, tc->text_sel_end, css); sp_repr_css_attr_unref(css); - sp_document_done(SP_DT_DOCUMENT(ec->desktop)); + sp_document_done(sp_desktop_document(ec->desktop)); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); return TRUE; @@ -869,7 +869,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) sp_repr_css_set_property(css, "font-style", "normal"); sp_te_apply_style(tc->text, tc->text_sel_start, tc->text_sel_end, css); sp_repr_css_attr_unref(css); - sp_document_done(SP_DT_DOCUMENT(ec->desktop)); + sp_document_done(sp_desktop_document(ec->desktop)); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); return TRUE; @@ -900,7 +900,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) tc->text_sel_start = tc->text_sel_end = sp_te_insert_line(tc->text, tc->text_sel_start); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); - sp_document_done(SP_DT_DOCUMENT(ec->desktop)); + sp_document_done(sp_desktop_document(ec->desktop)); return TRUE; case GDK_BackSpace: if (tc->text) { // if nascent_object, do nothing, but return TRUE; same for all other delete and move keys @@ -909,7 +909,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) tc->text_sel_start = tc->text_sel_end = sp_te_delete(tc->text, tc->text_sel_start, tc->text_sel_end); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); - sp_document_done(SP_DT_DOCUMENT(ec->desktop)); + sp_document_done(sp_desktop_document(ec->desktop)); } return TRUE; case GDK_Delete: @@ -920,7 +920,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) tc->text_sel_start = tc->text_sel_end = sp_te_delete(tc->text, tc->text_sel_start, tc->text_sel_end); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); - sp_document_done(SP_DT_DOCUMENT(ec->desktop)); + sp_document_done(sp_desktop_document(ec->desktop)); } return TRUE; case GDK_Left: @@ -934,7 +934,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, NR::Point(-1, 0)); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "kern:left"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "kern:left"); } else { cursor_movement_operator = MOD__CTRL ? &Inkscape::Text::Layout::iterator::cursorLeftWithControl : &Inkscape::Text::Layout::iterator::cursorLeft; @@ -953,7 +953,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, NR::Point(1, 0)); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "kern:right"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "kern:right"); } else { cursor_movement_operator = MOD__CTRL ? &Inkscape::Text::Layout::iterator::cursorRightWithControl : &Inkscape::Text::Layout::iterator::cursorRight; @@ -972,7 +972,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, NR::Point(0, -1)); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "kern:up"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "kern:up"); } else { cursor_movement_operator = MOD__CTRL ? &Inkscape::Text::Layout::iterator::cursorUpWithControl : &Inkscape::Text::Layout::iterator::cursorUp; @@ -991,7 +991,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) sp_te_adjust_kerning_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, NR::Point(0, 1)); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "kern:down"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "kern:down"); } else { cursor_movement_operator = MOD__CTRL ? &Inkscape::Text::Layout::iterator::cursorDownWithControl : &Inkscape::Text::Layout::iterator::cursorDown; @@ -1028,7 +1028,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) } Inkscape::Rubberband::get()->stop(); } else { - SP_DT_SELECTION(ec->desktop)->clear(); + sp_desktop_selection(ec->desktop)->clear(); } tc->nascent_object = FALSE; return TRUE; @@ -1045,7 +1045,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) } else { sp_te_adjust_rotation(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -90); } - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "textrot:ccw"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "textrot:ccw"); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); return TRUE; @@ -1065,7 +1065,7 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) } else { sp_te_adjust_rotation(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 90); } - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "textrot:cw"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "textrot:cw"); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); return TRUE; @@ -1081,13 +1081,13 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -10); else sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -1); - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "linespacing:dec"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "linespacing:dec"); } else { if (MOD__SHIFT) sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -10); else sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, -1); - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "letterspacing:dec"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "letterspacing:dec"); } sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); @@ -1104,13 +1104,13 @@ sp_text_context_root_handler(SPEventContext *const ec, GdkEvent *const event) sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 10); else sp_te_adjust_linespacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 1); - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "linespacing:inc"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "linespacing:inc"); } else { if (MOD__SHIFT) sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 10); else sp_te_adjust_tspan_letterspacing_screen(tc->text, tc->text_sel_start, tc->text_sel_end, ec->desktop, 1); - sp_document_maybe_done(SP_DT_DOCUMENT(ec->desktop), "letterspacing:inc"); + sp_document_maybe_done(sp_desktop_document(ec->desktop), "letterspacing:inc"); } sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); @@ -1212,7 +1212,7 @@ sp_text_paste_inline(SPEventContext *ec) tc->text_sel_start = tc->text_sel_end = sp_te_insert_line(tc->text, tc->text_sel_start); begin = end + 1; } - sp_document_done(SP_DT_DOCUMENT(ec->desktop)); + sp_document_done(sp_desktop_document(ec->desktop)); return true; } @@ -1325,7 +1325,7 @@ sp_text_context_style_set(SPCSSAttr const *css, SPTextContext *tc) return false; // will get picked up by the parent and applied to the whole text object sp_te_apply_style(tc->text, tc->text_sel_start, tc->text_sel_end, css); - sp_document_done(SP_DT_DOCUMENT(tc->desktop)); + sp_document_done(sp_desktop_document(tc->desktop)); sp_text_context_update_cursor(tc); sp_text_context_update_text_selection(tc); @@ -1451,7 +1451,7 @@ static void sp_text_context_update_text_selection(SPTextContext *tc) quads = sp_te_create_selection_quads(tc->text, tc->text_sel_start, tc->text_sel_end, sp_item_i2d_affine(tc->text)); for (unsigned i = 0 ; i < quads.size() ; i += 4) { SPCanvasItem *quad_canvasitem; - quad_canvasitem = sp_canvas_item_new(SP_DT_CONTROLS(tc->desktop), SP_TYPE_CTRLQUADR, NULL); + quad_canvasitem = sp_canvas_item_new(sp_desktop_controls(tc->desktop), SP_TYPE_CTRLQUADR, NULL); sp_ctrlquadr_set_rgba32(SP_CTRLQUADR(quad_canvasitem), 0x000000ff); sp_ctrlquadr_set_coords(SP_CTRLQUADR(quad_canvasitem), quads[i], quads[i+1], quads[i+2], quads[i+3]); sp_canvas_item_show(quad_canvasitem); diff --git a/src/tools-switch.cpp b/src/tools-switch.cpp index 0a2b2b3c8..d42354e8d 100644 --- a/src/tools-switch.cpp +++ b/src/tools-switch.cpp @@ -124,84 +124,84 @@ tools_switch(SPDesktop *dt, int num) dt->set_event_context(SP_TYPE_SELECT_CONTEXT, tool_names[num]); /* fixme: This is really ugly hack. We should bind and unbind class methods */ dt->activate_guides(true); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); break; case TOOLS_NODES: dt->set_event_context(SP_TYPE_NODE_CONTEXT, tool_names[num]); dt->activate_guides(true); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("To edit a path, click, Shift+click, or drag around nodes to select them, then drag nodes and handles. Click on an object to select.")); break; case TOOLS_SHAPES_RECT: dt->set_event_context(SP_TYPE_RECT_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Drag to create a rectangle. Drag controls to round corners and resize. Click to select.")); break; case TOOLS_SHAPES_ARC: dt->set_event_context(SP_TYPE_ARC_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Drag to create an ellipse. Drag controls to make an arc or segment. Click to select.")); break; case TOOLS_SHAPES_STAR: dt->set_event_context(SP_TYPE_STAR_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Drag to create a star. Drag controls to edit the star shape. Click to select.")); break; case TOOLS_SHAPES_SPIRAL: dt->set_event_context(SP_TYPE_SPIRAL_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Drag to create a spiral. Drag controls to edit the spiral shape. Click to select.")); break; case TOOLS_FREEHAND_PENCIL: dt->set_event_context(SP_TYPE_PENCIL_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Drag to create a freehand line. Start drawing with Shift to append to selected path.")); break; case TOOLS_FREEHAND_PEN: dt->set_event_context(SP_TYPE_PEN_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Click or click and drag to start a path; with Shift to append to selected path.")); break; case TOOLS_CALLIGRAPHIC: dt->set_event_context(SP_TYPE_DYNA_DRAW_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Drag to paint a calligraphic stroke. Left/right arrow keys adjust width, up/down adjust angle.")); break; case TOOLS_TEXT: dt->set_event_context(SP_TYPE_TEXT_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Click to select or create text, drag to create flowed text; then type.")); break; case TOOLS_GRADIENT: dt->set_event_context(SP_TYPE_GRADIENT_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Drag or double click to create a gradient on selected objects, drag handles to adjust gradients.")); break; case TOOLS_ZOOM: dt->set_event_context(SP_TYPE_ZOOM_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Click or drag around an area to zoom in, Shift+click to zoom out.")); break; case TOOLS_DROPPER: dt->set_event_context(SP_TYPE_DROPPER_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Click to set fill, Shift+click to set stroke; drag to average color in area; with Alt to pick inverse color; Ctrl+C to copy the color under mouse to clipboard")); break; case TOOLS_CONNECTOR: dt->set_event_context(SP_TYPE_CONNECTOR_CONTEXT, tool_names[num]); dt->activate_guides(false); - inkscape_eventcontext_set(SP_DT_EVENTCONTEXT(dt)); + inkscape_eventcontext_set(sp_desktop_event_context(dt)); dt->tipsMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Click and drag between shapes to create a connector.")); break; } diff --git a/src/trace/potrace/inkscape-potrace.cpp b/src/trace/potrace/inkscape-potrace.cpp index d8dfb77f6..4aaf1b376 100644 --- a/src/trace/potrace/inkscape-potrace.cpp +++ b/src/trace/potrace/inkscape-potrace.cpp @@ -543,7 +543,7 @@ PotraceTracingEngine::traceBrightnessMulti(GdkPixbuf * thePixbuf, int *nrPaths) if (desktop) { gchar *msg = g_strdup_printf(_("Trace: %d. %ld nodes"), traceCount++, nodeCount); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg); g_free(msg); } } @@ -644,7 +644,7 @@ PotraceTracingEngine::traceQuant(GdkPixbuf * thePixbuf, int *nrPaths) if (desktop) { gchar *msg = g_strdup_printf(_("Trace: %d. %ld nodes"), colorIndex, nodeCount); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg); g_free(msg); } diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp index ea822c536..81ccb64fa 100644 --- a/src/trace/trace.cpp +++ b/src/trace/trace.cpp @@ -55,11 +55,11 @@ Tracer::getSelectedSPImage() return NULL; } - Inkscape::Selection *sel = SP_DT_SELECTION(desktop); + Inkscape::Selection *sel = sp_desktop_selection(desktop); if (!sel) { char *msg = _("Select an image to trace"); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); //g_warning(msg); return NULL; } @@ -94,7 +94,7 @@ Tracer::getSelectedSPImage() if (img) //we want only one { char *msg = _("Select only one image to trace"); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); return NULL; } img = SP_IMAGE(item); @@ -112,7 +112,7 @@ Tracer::getSelectedSPImage() if (!img || sioxShapes.size() < 1) { char *msg = _("Select one image and one or more shapes above it"); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); return NULL; } return img; @@ -124,7 +124,7 @@ Tracer::getSelectedSPImage() if (!item) { char *msg = _("Select an image to trace"); //same as above - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); //g_warning(msg); return NULL; } @@ -132,7 +132,7 @@ Tracer::getSelectedSPImage() if (!SP_IS_IMAGE(item)) { char *msg = _("Select an image to trace"); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); //g_warning(msg); return NULL; } @@ -184,11 +184,11 @@ Tracer::sioxProcessImage(SPImage *img, GdkPixbuf *origPixbuf) return NULL; } - Inkscape::Selection *sel = SP_DT_SELECTION(desktop); + Inkscape::Selection *sel = sp_desktop_selection(desktop); if (!sel) { char *msg = _("Select an image to trace"); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); //g_warning(msg); return NULL; } @@ -331,12 +331,12 @@ void Tracer::traceThread() return; } - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); if (!SP_ACTIVE_DOCUMENT) { char *msg = _("Trace: No active document"); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); //g_warning(msg); engine = NULL; return; @@ -357,7 +357,7 @@ void Tracer::traceThread() if (!pixbuf) { char *msg = _("Trace: Image has no bitmap data"); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, msg); //g_warning(msg); engine = NULL; return; @@ -489,7 +489,7 @@ void Tracer::traceThread() engine = NULL; char *msg = g_strdup_printf(_("Trace: Done. %ld nodes created"), totalNodeCount); - SP_DT_MSGSTACK(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg); + sp_desktop_message_stack(desktop)->flash(Inkscape::NORMAL_MESSAGE, msg); g_free(msg); } diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index fc8b6b2f5..08e197586 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -118,7 +118,7 @@ private : SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (!selection) return; using Inkscape::Util::GSListConstIterator; @@ -159,14 +159,14 @@ private : } case AlignAndDistribute::PAGE: - mp = NR::Point(a.mx1 * sp_document_width(SP_DT_DOCUMENT(desktop)), - a.my1 * sp_document_height(SP_DT_DOCUMENT(desktop))); + mp = NR::Point(a.mx1 * sp_document_width(sp_desktop_document(desktop)), + a.my1 * sp_document_height(sp_desktop_document(desktop))); break; case AlignAndDistribute::DRAWING: { NR::Rect b = sp_item_bbox_desktop - ( (SPItem *) sp_document_root (SP_DT_DOCUMENT (desktop)) ); + ( (SPItem *) sp_document_root (sp_desktop_document (desktop)) ); mp = NR::Point(a.mx0 * b.min()[NR::X] + a.mx1 * b.max()[NR::X], a.my0 * b.min()[NR::Y] + a.my1 * b.max()[NR::Y]); break; @@ -200,7 +200,7 @@ private : it != selected.end(); it++) { - sp_document_ensure_up_to_date(SP_DT_DOCUMENT (desktop)); + sp_document_ensure_up_to_date(sp_desktop_document (desktop)); NR::Rect b = sp_item_bbox_desktop (*it); NR::Point const sp(a.sx0 * b.min()[NR::X] + a.sx1 * b.max()[NR::X], a.sy0 * b.min()[NR::Y] + a.sy1 * b.max()[NR::Y]); @@ -215,7 +215,7 @@ private : prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); if (changed) { - sp_document_done ( SP_DT_DOCUMENT (desktop) ); + sp_document_done ( sp_desktop_document (desktop) ); } @@ -287,7 +287,7 @@ private : SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (!selection) return; using Inkscape::Util::GSListConstIterator; @@ -374,7 +374,7 @@ private : prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); if (changed) { - sp_document_done ( SP_DT_DOCUMENT (desktop) ); + sp_document_done ( sp_desktop_document (desktop) ); } } guint _index; @@ -408,7 +408,7 @@ private : { if (!SP_ACTIVE_DESKTOP) return; - SPEventContext *event_context = SP_DT_EVENTCONTEXT(SP_ACTIVE_DESKTOP); + SPEventContext *event_context = sp_desktop_event_context(SP_ACTIVE_DESKTOP); if (!SP_IS_NODE_CONTEXT (event_context)) return ; Inkscape::NodePath::Path *nodepath = SP_NODE_CONTEXT (event_context)->nodepath; @@ -478,13 +478,13 @@ private : // xGap and yGap are the minimum space required between bounding rectangles. double const xGap = removeOverlapXGap.get_value(); double const yGap = removeOverlapYGap.get_value(); - removeoverlap(SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList(), + removeoverlap(sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList(), xGap, yGap); // restore compensation setting prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); - sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP)); + sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP)); } }; @@ -508,12 +508,12 @@ private : int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); - graphlayout(SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList()); + graphlayout(sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList()); // restore compensation setting prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); - sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP)); + sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP)); } }; @@ -537,12 +537,12 @@ private : int saved_compensation = prefs_get_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); prefs_set_int_attribute("options.clonecompensation", "value", SP_CLONE_COMPENSATION_UNMOVED); - unclump ((GSList *) SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->itemList()); + unclump ((GSList *) sp_desktop_selection(SP_ACTIVE_DESKTOP)->itemList()); // restore compensation setting prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); - sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP)); + sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP)); } }; @@ -563,7 +563,7 @@ private : SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (!selection) return; using Inkscape::Util::GSListConstIterator; @@ -590,7 +590,7 @@ private : it != selected.end(); ++it) { - sp_document_ensure_up_to_date(SP_DT_DOCUMENT (desktop)); + sp_document_ensure_up_to_date(sp_desktop_document (desktop)); NR::Rect item_box = sp_item_bbox_desktop (*it); // find new center, staying within bbox double x = _dialog.randomize_bbox.min()[NR::X] + item_box.extent(NR::X)/2 + @@ -605,7 +605,7 @@ private : // restore compensation setting prefs_set_int_attribute("options.clonecompensation", "value", saved_compensation); - sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP)); + sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP)); } }; @@ -649,7 +649,7 @@ private : SPDesktop *desktop = SP_ACTIVE_DESKTOP; if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (!selection) return; using Inkscape::Util::GSListConstIterator; @@ -717,7 +717,7 @@ private : } if (changed) { - sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP)); + sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP)); } } }; @@ -727,7 +727,7 @@ private : void on_tool_changed(Inkscape::Application *inkscape, SPEventContext *context, AlignAndDistribute *daad) { SPDesktop *desktop = SP_ACTIVE_DESKTOP; - if (desktop && SP_DT_EVENTCONTEXT(desktop)) + if (desktop && sp_desktop_event_context(desktop)) daad->setMode(tools_active(desktop) == TOOLS_NODES); } diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp index 7cb360a43..074ee0d36 100644 --- a/src/ui/dialog/dialog.cpp +++ b/src/ui/dialog/dialog.cpp @@ -331,7 +331,7 @@ Dialog::onDesktopActivated (SPDesktop *desktop) Inkscape::Selection* Dialog::_getSelection() { - return SP_DT_SELECTION(SP_ACTIVE_DESKTOP); + return sp_desktop_selection(SP_ACTIVE_DESKTOP); } void diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp index bbe64b201..090cb42ca 100644 --- a/src/ui/dialog/document-metadata.cpp +++ b/src/ui/dialog/document-metadata.cpp @@ -103,7 +103,7 @@ DocumentMetadata::init() { update(); - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->addListener (&_repr_events, this); _doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced)); @@ -120,7 +120,7 @@ DocumentMetadata::init() DocumentMetadata::~DocumentMetadata() { - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->removeListenerByData (this); _doc_replaced_connection.disconnect(); @@ -261,7 +261,7 @@ on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*) if (!_instance) return; - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->addListener (&_repr_events, _instance); _instance->_doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced)); _instance->update(); @@ -273,7 +273,7 @@ on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*) if (!_instance) return; - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->removeListenerByData (_instance); _instance->_doc_replaced_connection.disconnect(); } @@ -284,7 +284,7 @@ on_doc_replaced (SPDesktop* dt, SPDocument* doc) if (!_instance) return; - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(dt)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt)); repr->addListener (&_repr_events, _instance); _instance->update(); } diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp index 8a1035eb3..9951f5956 100644 --- a/src/ui/dialog/document-properties.cpp +++ b/src/ui/dialog/document-properties.cpp @@ -109,7 +109,7 @@ DocumentProperties::init() { update(); - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->addListener (&_repr_events, this); _doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced)); @@ -126,7 +126,7 @@ DocumentProperties::init() DocumentProperties::~DocumentProperties() { - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->removeListenerByData (this); _doc_replaced_connection.disconnect(); } @@ -361,7 +361,7 @@ DocumentProperties::update() if (_wr.isUpdating()) return; SPDesktop *dt = SP_ACTIVE_DESKTOP; - SPNamedView *nv = SP_DT_NAMEDVIEW(dt); + SPNamedView *nv = sp_desktop_namedview(dt); _wr.setUpdating (true); set_sensitive (true); @@ -375,8 +375,8 @@ DocumentProperties::update() if (nv->doc_units) _rum_deflt.setUnit (nv->doc_units); - double const doc_w_px = sp_document_width(SP_DT_DOCUMENT(dt)); - double const doc_h_px = sp_document_height(SP_DT_DOCUMENT(dt)); + double const doc_w_px = sp_document_width(sp_desktop_document(dt)); + double const doc_h_px = sp_document_height(sp_desktop_document(dt)); _page_sizer.setDim (doc_w_px, doc_h_px); //-----------------------------------------------------------grid page @@ -462,7 +462,7 @@ on_activate_desktop (Inkscape::Application *, SPDesktop* dt, void*) if (!_instance) return; - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->addListener (&_repr_events, _instance); _instance->_doc_replaced_connection = SP_ACTIVE_DESKTOP->connectDocumentReplaced (sigc::ptr_fun (on_doc_replaced)); _instance->update(); @@ -474,7 +474,7 @@ on_deactivate_desktop (Inkscape::Application *, SPDesktop* dt, void*) if (!_instance) return; - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); repr->removeListenerByData (_instance); _instance->_doc_replaced_connection.disconnect(); } @@ -485,7 +485,7 @@ on_doc_replaced (SPDesktop* dt, SPDocument* doc) if (!_instance) return; - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(dt)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt)); repr->addListener (&_repr_events, _instance); _instance->update(); } diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 4dd20682f..3ebf50eb9 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -215,10 +215,10 @@ void StyleFromSelectionToTool(gchar const *prefs_path, StyleSwatch *swatch) if (desktop == NULL) return; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) { - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("No objects selected to take the style from.")); return; } @@ -227,7 +227,7 @@ void StyleFromSelectionToTool(gchar const *prefs_path, StyleSwatch *swatch) /* TODO: If each item in the selection has the same style then don't consider it an error. * Maybe we should try to handle multiple selections anyway, e.g. the intersection of the * style attributes for the selected items. */ - SP_DT_MSGSTACK(desktop)->flash(Inkscape::ERROR_MESSAGE, + sp_desktop_message_stack(desktop)->flash(Inkscape::ERROR_MESSAGE, _("More than one object selected. Cannot take style from multiple objects.")); return; } diff --git a/src/ui/dialog/session-player.cpp b/src/ui/dialog/session-player.cpp index 48c3ff5ef..97ef5618e 100644 --- a/src/ui/dialog/session-player.cpp +++ b/src/ui/dialog/session-player.cpp @@ -182,7 +182,7 @@ SessionPlaybackDialogImpl::_respCallback(int resp) switch (result) { case Gtk::RESPONSE_OK: this->_sm->clearDocument(); - sp_document_done(SP_DT_DOCUMENT(this->_desktop)); + sp_document_done(sp_desktop_document(this->_desktop)); this->_sm->loadSessionFile(sessionfiledlg.get_filename()); this->_openfile.set_text(this->_sfp->filename()); break; diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp index 92baa7b81..28710ace3 100644 --- a/src/ui/dialog/transformation.cpp +++ b/src/ui/dialog/transformation.cpp @@ -437,7 +437,7 @@ void Transformation::onSwitchPage(GtkNotebookPage *page, guint pagenum) { - updateSelection((PageType)pagenum, SP_DT_SELECTION(SP_ACTIVE_DESKTOP)); + updateSelection((PageType)pagenum, sp_desktop_selection(SP_ACTIVE_DESKTOP)); } void @@ -581,7 +581,7 @@ Transformation::applyPageMove(Inkscape::Selection *selection) x - bbox.min()[NR::X], y - bbox.min()[NR::Y]); } - sp_document_done ( SP_DT_DOCUMENT (selection->desktop()) ); + sp_document_done ( sp_desktop_document (selection->desktop()) ); } void @@ -632,7 +632,7 @@ Transformation::applyPageScale(Inkscape::Selection *selection) sp_selection_scale_relative(selection, center, scale); } - sp_document_done(SP_DT_DOCUMENT(selection->desktop())); + sp_document_done(sp_desktop_document(selection->desktop())); } void @@ -650,7 +650,7 @@ Transformation::applyPageRotate(Inkscape::Selection *selection) sp_selection_rotate_relative(selection, center, angle); } - sp_document_done(SP_DT_DOCUMENT(selection->desktop())); + sp_document_done(sp_desktop_document(selection->desktop())); } void @@ -702,7 +702,7 @@ Transformation::applyPageSkew(Inkscape::Selection *selection) } } - sp_document_done(SP_DT_DOCUMENT(selection->desktop())); + sp_document_done(sp_desktop_document(selection->desktop())); } @@ -727,7 +727,7 @@ Transformation::applyPageTransform(Inkscape::Selection *selection) sp_selection_apply_affine(selection, displayed); // post-multiply each object's transform } - sp_document_done(SP_DT_DOCUMENT(selection->desktop())); + sp_document_done(sp_desktop_document(selection->desktop())); } diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp index a8cdba61e..883370aec 100644 --- a/src/ui/widget/color-picker.cpp +++ b/src/ui/widget/color-picker.cpp @@ -117,7 +117,7 @@ sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp) (ptr->_preview).setRgba32 (rgba); if (ptr->_undo && SP_ACTIVE_DESKTOP) - sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP)); + sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP)); ptr->on_changed (rgba); ptr->_changed_signal.emit (rgba); diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp index 1073fa1d2..31390b676 100644 --- a/src/ui/widget/page-sizer.cpp +++ b/src/ui/widget/page-sizer.cpp @@ -285,7 +285,7 @@ PageSizer::setDoc (double w, double h) if (!SP_ACTIVE_DESKTOP || _wr->isUpdating()) return; - SPDocument *doc = SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP); + SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP); sp_document_set_width (doc, _rusw.getSU()->getValue("px"), &_px_unit); sp_document_set_height (doc, _rush.getSU()->getValue("px"), &_px_unit); sp_document_done (doc); diff --git a/src/ui/widget/registered-widget.cpp b/src/ui/widget/registered-widget.cpp index bed44ae16..1bfcb1f84 100644 --- a/src/ui/widget/registered-widget.cpp +++ b/src/ui/widget/registered-widget.cpp @@ -88,9 +88,9 @@ RegisteredCheckButton::on_toggled() return; } - SPDocument *doc = SP_DT_DOCUMENT(dt); + SPDocument *doc = sp_desktop_document(dt); - Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt)); _wr->setUpdating (true); gboolean saved = sp_document_get_undo_sensitive (doc); @@ -149,10 +149,10 @@ RegisteredUnitMenu::on_changed() _wr->setUpdating (true); - SPDocument *doc = SP_DT_DOCUMENT(dt); + SPDocument *doc = sp_desktop_document(dt); gboolean saved = sp_document_get_undo_sensitive (doc); sp_document_set_undo_sensitive (doc, FALSE); - Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt)); repr->setAttribute(_key.c_str(), os.str().c_str()); doc->rroot->setAttribute("sodipodi:modified", "true"); sp_document_set_undo_sensitive (doc, saved); @@ -216,10 +216,10 @@ RegisteredScalarUnit::on_value_changed() _wr->setUpdating (true); - SPDocument *doc = SP_DT_DOCUMENT(dt); + SPDocument *doc = sp_desktop_document(dt); gboolean saved = sp_document_get_undo_sensitive (doc); sp_document_set_undo_sensitive (doc, FALSE); - Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt)); repr->setAttribute(_key.c_str(), os.str().c_str()); doc->rroot->setAttribute("sodipodi:modified", "true"); sp_document_set_undo_sensitive (doc, saved); @@ -272,7 +272,7 @@ RegisteredColorPicker::on_changed (guint32 rgba) return; _wr->setUpdating (true); - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(SP_ACTIVE_DESKTOP)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(SP_ACTIVE_DESKTOP)); gchar c[32]; sp_svg_write_color(c, 32, rgba); repr->setAttribute(_ckey.c_str(), c); @@ -327,13 +327,13 @@ RegisteredSuffixedInteger::on_value_changed() _wr->setUpdating (true); SPDesktop* dt = SP_ACTIVE_DESKTOP; - Inkscape::XML::Node *repr = SP_OBJECT_REPR(SP_DT_NAMEDVIEW(dt)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR(sp_desktop_namedview(dt)); Inkscape::SVGOStringStream os; int value = int(_adj.get_value()); os << value; repr->setAttribute(_key.c_str(), os.str().c_str()); - sp_document_done(SP_DT_DOCUMENT(dt)); + sp_document_done(sp_desktop_document(dt)); _wr->setUpdating (false); } @@ -389,10 +389,10 @@ RegisteredRadioButtonPair::on_value_changed() _wr->setUpdating (true); bool second = _rb2->get_active(); - SPDocument *doc = SP_DT_DOCUMENT(dt); + SPDocument *doc = sp_desktop_document(dt); gboolean saved = sp_document_get_undo_sensitive (doc); sp_document_set_undo_sensitive (doc, FALSE); - Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt)); repr->setAttribute(_key.c_str(), second ? "true" : "false"); doc->rroot->setAttribute("sodipodi:modified", "true"); sp_document_set_undo_sensitive (doc, saved); diff --git a/src/ui/widget/ruler.cpp b/src/ui/widget/ruler.cpp index f2a59338d..02a532a5a 100644 --- a/src/ui/widget/ruler.cpp +++ b/src/ui/widget/ruler.cpp @@ -150,7 +150,7 @@ Ruler::on_button_release_event(GdkEventButton *evb) sp_repr_set_svg_double(repr, "position", guide_pos_dt); SP_OBJECT_REPR(_dt->namedview)->appendChild(repr); Inkscape::GC::release(repr); - sp_document_done(SP_DT_DOCUMENT(_dt)); + sp_document_done(sp_desktop_document(_dt)); } _dt->set_coordinate_status(event_dt); } diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index f5b1fa08f..57a4d20d1 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -373,7 +373,7 @@ SelectedStyle::setDesktop(SPDesktop *desktop) _desktop = desktop; gtk_object_set_data (GTK_OBJECT(_opacity_sb.gobj()), "dtw", _desktop->canvas); - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); selection_changed_connection = new sigc::connection (selection->connectChanged( sigc::bind ( @@ -391,7 +391,7 @@ SelectedStyle::setDesktop(SPDesktop *desktop) this ) )); - //_sw_unit = (SPUnit *) SP_DT_NAMEDVIEW(desktop)->doc_units; + //_sw_unit = (SPUnit *) sp_desktop_namedview(desktop)->doc_units; } void SelectedStyle::dragDataReceived( GtkWidget *widget, @@ -424,7 +424,7 @@ void SelectedStyle::dragDataReceived( GtkWidget *widget, sp_repr_css_set_property( css, (tracker->item == SS_FILL) ? "fill":"stroke", c ); sp_desktop_set_style( tracker->parent->_desktop, css ); sp_repr_css_attr_unref( css ); - sp_document_done( SP_DT_DOCUMENT(tracker->parent->_desktop) ); + sp_document_done( sp_desktop_document(tracker->parent->_desktop) ); } } break; @@ -436,7 +436,7 @@ void SelectedStyle::on_fill_remove() { sp_repr_css_set_property (css, "fill", "none"); sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_stroke_remove() { @@ -444,7 +444,7 @@ void SelectedStyle::on_stroke_remove() { sp_repr_css_set_property (css, "stroke", "none"); sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_fill_unset() { @@ -452,7 +452,7 @@ void SelectedStyle::on_fill_unset() { sp_repr_css_unset_property (css, "fill"); sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_stroke_unset() { @@ -460,7 +460,7 @@ void SelectedStyle::on_stroke_unset() { sp_repr_css_unset_property (css, "stroke"); sp_desktop_set_style (_desktop, css, true, false); // do not write to current, to preserve current color sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_fill_opaque() { @@ -468,7 +468,7 @@ void SelectedStyle::on_fill_opaque() { sp_repr_css_set_property (css, "fill-opacity", "1"); sp_desktop_set_style (_desktop, css, true); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_stroke_opaque() { @@ -476,7 +476,7 @@ void SelectedStyle::on_stroke_opaque() { sp_repr_css_set_property (css, "stroke-opacity", "1"); sp_desktop_set_style (_desktop, css, true); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_fill_lastused() { @@ -487,7 +487,7 @@ void SelectedStyle::on_fill_lastused() { sp_repr_css_set_property (css, "fill", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_stroke_lastused() { @@ -498,7 +498,7 @@ void SelectedStyle::on_stroke_lastused() { sp_repr_css_set_property (css, "stroke", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_fill_lastselected() { @@ -508,7 +508,7 @@ void SelectedStyle::on_fill_lastselected() { sp_repr_css_set_property (css, "fill", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_stroke_lastselected() { @@ -518,7 +518,7 @@ void SelectedStyle::on_stroke_lastselected() { sp_repr_css_set_property (css, "stroke", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_fill_invert() { @@ -537,7 +537,7 @@ void SelectedStyle::on_fill_invert() { sp_repr_css_set_property (css, "fill", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_stroke_invert() { @@ -556,7 +556,7 @@ void SelectedStyle::on_stroke_invert() { sp_repr_css_set_property (css, "stroke", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_fill_white() { @@ -567,7 +567,7 @@ void SelectedStyle::on_fill_white() { sp_repr_css_set_property (css, "fill-opacity", "1"); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_stroke_white() { @@ -578,7 +578,7 @@ void SelectedStyle::on_stroke_white() { sp_repr_css_set_property (css, "stroke-opacity", "1"); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_fill_black() { @@ -589,7 +589,7 @@ void SelectedStyle::on_fill_black() { sp_repr_css_set_property (css, "fill-opacity", "1.0"); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_stroke_black() { @@ -600,7 +600,7 @@ void SelectedStyle::on_stroke_black() { sp_repr_css_set_property (css, "stroke-opacity", "1.0"); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_fill_copy() { @@ -642,7 +642,7 @@ void SelectedStyle::on_fill_paste() { sp_repr_css_set_property (css, "fill", text.c_str()); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } } @@ -659,7 +659,7 @@ void SelectedStyle::on_stroke_paste() { sp_repr_css_set_property (css, "stroke", text.c_str()); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } } @@ -714,7 +714,7 @@ void SelectedStyle::on_fillstroke_swap() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void SelectedStyle::on_fill_edit() { @@ -781,7 +781,7 @@ SelectedStyle::on_opacity_click(GdkEventButton *event) sp_repr_css_set_property (css, "opacity", opacity); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT (_desktop)); + sp_document_done (sp_desktop_document (_desktop)); return true; } @@ -814,7 +814,7 @@ void SelectedStyle::on_popup_preset(int i) { sp_repr_css_set_property (css, "stroke-width", os.str().c_str()); sp_desktop_set_style (_desktop, css, true); sp_repr_css_attr_unref (css); - sp_document_done (SP_DT_DOCUMENT(_desktop)); + sp_document_done (sp_desktop_document(_desktop)); } void @@ -1054,7 +1054,7 @@ void SelectedStyle::on_opacity_changed () { sp_repr_css_set_property (css, "opacity", os.str().c_str()); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_maybe_done (SP_DT_DOCUMENT (_desktop), "fillstroke:opacity"); + sp_document_maybe_done (sp_desktop_document (_desktop), "fillstroke:opacity"); spinbutton_defocus(GTK_OBJECT(_opacity_sb.gobj())); _opacity_blocked = false; } diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp index 25d332c59..654936814 100644 --- a/src/ui/widget/tolerance-slider.cpp +++ b/src/ui/widget/tolerance-slider.cpp @@ -162,10 +162,10 @@ ToleranceSlider::update (double val) _wr->setUpdating (true); - SPDocument *doc = SP_DT_DOCUMENT(dt); + SPDocument *doc = sp_desktop_document(dt); gboolean saved = sp_document_get_undo_sensitive (doc); sp_document_set_undo_sensitive (doc, FALSE); - Inkscape::XML::Node *repr = SP_OBJECT_REPR (SP_DT_NAMEDVIEW(dt)); + Inkscape::XML::Node *repr = SP_OBJECT_REPR (sp_desktop_namedview(dt)); repr->setAttribute(_key.c_str(), os.str().c_str()); doc->rroot->setAttribute("sodipodi:modified", "true"); sp_document_set_undo_sensitive (doc, saved); diff --git a/src/verbs.cpp b/src/verbs.cpp index d9f89b98a..29cf9a749 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -803,10 +803,10 @@ EditVerb::perform(SPAction *action, void *data, void *pdata) switch (reinterpret_cast(data)) { case SP_VERB_EDIT_UNDO: - sp_undo(dt, SP_DT_DOCUMENT(dt)); + sp_undo(dt, sp_desktop_document(dt)); break; case SP_VERB_EDIT_REDO: - sp_redo(dt, SP_DT_DOCUMENT(dt)); + sp_redo(dt, sp_desktop_document(dt)); break; case SP_VERB_EDIT_CUT: sp_selection_cut(); @@ -897,7 +897,7 @@ EditVerb::perform(SPAction *action, void *data, void *pdata) if (tools_isactive(dt, TOOLS_NODES)) { sp_nodepath_deselect(SP_NODE_CONTEXT(ec)->nodepath); } else { - SP_DT_SELECTION(dt)->clear(); + sp_desktop_selection(dt)->clear(); } break; default: @@ -1045,7 +1045,7 @@ LayerVerb::perform(SPAction *action, void *data, void *pdata) SPObject *next=Inkscape::next_layer(dt->currentRoot(), dt->currentLayer()); if (next) { dt->setCurrentLayer(next); - sp_document_done(SP_DT_DOCUMENT(dt)); + sp_document_done(sp_desktop_document(dt)); dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to next layer.")); } else { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past last layer.")); @@ -1056,7 +1056,7 @@ LayerVerb::perform(SPAction *action, void *data, void *pdata) SPObject *prev=Inkscape::previous_layer(dt->currentRoot(), dt->currentLayer()); if (prev) { dt->setCurrentLayer(prev); - sp_document_done(SP_DT_DOCUMENT(dt)); + sp_document_done(sp_desktop_document(dt)); dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Moved to previous layer.")); } else { dt->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Cannot move past first layer.")); @@ -1112,7 +1112,7 @@ LayerVerb::perform(SPAction *action, void *data, void *pdata) message = g_strdup_printf(_("Lowered layer %s."), layer->defaultLabel()); break; }; - sp_document_done(SP_DT_DOCUMENT(dt)); + sp_document_done(sp_desktop_document(dt)); if (message) { dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, message); g_free((void *) message); @@ -1125,7 +1125,7 @@ LayerVerb::perform(SPAction *action, void *data, void *pdata) } case SP_VERB_LAYER_DELETE: { if ( dt->currentLayer() != dt->currentRoot() ) { - SP_DT_SELECTION(dt)->clear(); + sp_desktop_selection(dt)->clear(); SPObject *old_layer=dt->currentLayer(); sp_object_ref(old_layer, NULL); @@ -1145,7 +1145,7 @@ LayerVerb::perform(SPAction *action, void *data, void *pdata) dt->setCurrentLayer(survivor); } - sp_document_done(SP_DT_DOCUMENT(dt)); + sp_document_done(sp_desktop_document(dt)); // TRANSLATORS: this means "The layer has been deleted." dt->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Deleted layer.")); @@ -1169,7 +1169,7 @@ ObjectVerb::perform( SPAction *action, void *data, void *pdata ) SPEventContext *ec = dt->event_context; - Inkscape::Selection *sel = SP_DT_SELECTION(dt); + Inkscape::Selection *sel = sp_desktop_selection(dt); if (sel->isEmpty()) return; @@ -1204,7 +1204,7 @@ ObjectVerb::perform( SPAction *action, void *data, void *pdata ) } else { sp_selection_scale_relative(sel, center, NR::scale(-1.0, 1.0)); } - sp_document_done(SP_DT_DOCUMENT(dt)); + sp_document_done(sp_desktop_document(dt)); break; case SP_VERB_OBJECT_FLIP_VERTICAL: if (tools_isactive(dt, TOOLS_NODES)) { @@ -1212,7 +1212,7 @@ ObjectVerb::perform( SPAction *action, void *data, void *pdata ) } else { sp_selection_scale_relative(sel, center, NR::scale(1.0, -1.0)); } - sp_document_done(SP_DT_DOCUMENT(dt)); + sp_document_done(sp_desktop_document(dt)); break; case SP_VERB_OBJECT_SET_MASK: sp_selection_set_mask(false, false); @@ -1373,7 +1373,7 @@ ZoomVerb::perform(SPAction *action, void *data, void *pdata) if (!dt) return; - SPDocument *doc = SP_DT_DOCUMENT(dt); + SPDocument *doc = sp_desktop_document(dt); Inkscape::XML::Node *repr = SP_OBJECT_REPR(dt->namedview); diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index c8fc58e51..2ba59b10c 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -137,12 +137,12 @@ gr_item_activate (GtkMenuItem *menuitem, gpointer data) gr = sp_gradient_ensure_vector_normalized(gr); SPDesktop *desktop = (SPDesktop *) data; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); - SPEventContext *ev = SP_DT_EVENTCONTEXT (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); + SPEventContext *ev = sp_desktop_event_context (desktop); gr_apply_gradient (selection, ev? ev->get_drag() : NULL, gr); - sp_document_done (SP_DT_DOCUMENT (desktop)); + sp_document_done (sp_desktop_document (desktop)); } gchar * @@ -157,7 +157,7 @@ gr_prepare_label (SPObject *obj) GtkWidget * gr_vector_list (SPDesktop *desktop, bool selection_empty, SPGradient *gr_selected, bool gr_multi) { - SPDocument *document = SP_DT_DOCUMENT (desktop); + SPDocument *document = sp_desktop_document (desktop); GtkWidget *om = gtk_option_menu_new (); GtkWidget *m = gtk_menu_new (); @@ -345,11 +345,11 @@ gr_tb_selection_changed (Inkscape::Selection *, gpointer data) if (!desktop) return; - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); // take from desktop, not from args + Inkscape::Selection *selection = sp_desktop_selection (desktop); // take from desktop, not from args if (!selection) return; - SPEventContext *ev = SP_DT_EVENTCONTEXT (desktop); + SPEventContext *ev = sp_desktop_event_context (desktop); GtkWidget *om = (GtkWidget *) g_object_get_data (G_OBJECT (widget), "menu"); if (om) gtk_widget_destroy (om); @@ -401,9 +401,9 @@ static void gr_fork (GtkWidget *button, GtkWidget *widget) { SPDesktop *desktop = (SPDesktop *) g_object_get_data (G_OBJECT(widget), "desktop"); - SPDocument *document = SP_DT_DOCUMENT (desktop); - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); - SPEventContext *ev = SP_DT_EVENTCONTEXT (desktop); + SPDocument *document = sp_desktop_document (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); + SPEventContext *ev = sp_desktop_event_context (desktop); GtkWidget *om = (GtkWidget *) g_object_get_data (G_OBJECT(widget), "menu"); if (om && document) { @@ -454,9 +454,9 @@ gr_edit (GtkWidget *button, GtkWidget *widget) GtkWidget * gr_change_widget (SPDesktop *desktop) { - Inkscape::Selection *selection = SP_DT_SELECTION (desktop); - SPDocument *document = SP_DT_DOCUMENT (desktop); - SPEventContext *ev = SP_DT_EVENTCONTEXT (desktop); + Inkscape::Selection *selection = sp_desktop_selection (desktop); + SPDocument *document = sp_desktop_document (desktop); + SPEventContext *ev = sp_desktop_event_context (desktop); SPGradient *gr_selected = NULL; bool gr_multi = false; diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp index e0c8286b0..8fe0c928e 100644 --- a/src/widgets/layer-selector.cpp +++ b/src/widgets/layer-selector.cpp @@ -292,7 +292,7 @@ void LayerSelector::_setDesktopLayer() { _layer_changed_connection.block(); _desktop->setCurrentLayer(layer); _layer_changed_connection.unblock(); - SP_DT_SELECTION(_desktop)->clear(); + sp_desktop_selection(_desktop)->clear(); _selectLayer(_desktop->currentLayer()); } } @@ -562,14 +562,14 @@ void LayerSelector::_prepareLabelRenderer( void LayerSelector::_lockLayer(bool lock) { if ( _layer && SP_IS_ITEM(_layer) ) { SP_ITEM(_layer)->setLocked(lock); - sp_document_maybe_done(SP_DT_DOCUMENT(_desktop), "LayerSelector:lock"); + sp_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:lock"); } } void LayerSelector::_hideLayer(bool hide) { if ( _layer && SP_IS_ITEM(_layer) ) { SP_ITEM(_layer)->setHidden(hide); - sp_document_maybe_done(SP_DT_DOCUMENT(_desktop), "LayerSelector:hide"); + sp_document_maybe_done(sp_desktop_document(_desktop), "LayerSelector:hide"); } } diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index f980d37ff..6bcb24d2d 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -100,7 +100,7 @@ static void sp_selection_layout_widget_modify_selection(SPWidget *spw, Inkscape::Selection *selection, guint flags, gpointer data) { SPDesktop *desktop = (SPDesktop *) data; - if ((SP_DT_SELECTION(desktop) == selection) // only respond to changes in our desktop + if ((sp_desktop_selection(desktop) == selection) // only respond to changes in our desktop && (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_PARENT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG ))) @@ -113,7 +113,7 @@ static void sp_selection_layout_widget_change_selection(SPWidget *spw, Inkscape::Selection *selection, gpointer data) { SPDesktop *desktop = (SPDesktop *) data; - if (SP_DT_SELECTION(desktop) == selection) // only respond to changes in our desktop + if (sp_desktop_selection(desktop) == selection) // only respond to changes in our desktop sp_selection_layout_widget_update(spw, selection); } @@ -136,8 +136,8 @@ sp_object_layout_any_value_changed(GtkAdjustment *adj, SPWidget *spw) gtk_object_set_data(GTK_OBJECT(spw), "update", GINT_TO_POINTER(TRUE)); SPDesktop *desktop = SP_ACTIVE_DESKTOP; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); - SPDocument *document = SP_DT_DOCUMENT(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); + SPDocument *document = sp_desktop_document(desktop); sp_document_ensure_up_to_date (document); NR::Rect bbox = selection->bounds(); @@ -272,7 +272,7 @@ static gboolean aux_set_unit(SPUnitSelector *, return FALSE; } - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); if (selection->isEmpty()) return FALSE; @@ -410,7 +410,7 @@ sp_select_toolbox_new(SPDesktop *desktop) GtkWidget *spw = sp_widget_new_global(INKSCAPE); // Remember the desktop's canvas widget, to be used for defocusing. - gtk_object_set_data(GTK_OBJECT(spw), "dtw", SP_DT_CANVAS(desktop)); + gtk_object_set_data(GTK_OBJECT(spw), "dtw", sp_desktop_canvas(desktop)); // The vb frame holds all other widgets and is used to set sensitivity depending on selection state. GtkWidget *vb = gtk_hbox_new(FALSE, 0); @@ -422,7 +422,7 @@ sp_select_toolbox_new(SPDesktop *desktop) GtkWidget *us = sp_unit_selector_new(SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE); sp_unit_selector_setsize(us, AUX_OPTION_MENU_WIDTH, AUX_OPTION_MENU_HEIGHT); sp_unit_selector_add_unit(SP_UNIT_SELECTOR(us), &sp_unit_get_by_id(SP_UNIT_PERCENT), 0); - sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), SP_DT_NAMEDVIEW(desktop)->doc_units); + sp_unit_selector_set_unit (SP_UNIT_SELECTOR(us), sp_desktop_namedview(desktop)->doc_units); g_signal_connect(G_OBJECT(us), "set_unit", G_CALLBACK(aux_set_unit), spw); // four spinbuttons @@ -476,7 +476,7 @@ sp_select_toolbox_new(SPDesktop *desktop) gtk_signal_connect(GTK_OBJECT(spw), "change_selection", GTK_SIGNAL_FUNC(sp_selection_layout_widget_change_selection), desktop); // Update now. - sp_selection_layout_widget_update(SP_WIDGET(spw), SP_ACTIVE_DESKTOP ? SP_DT_SELECTION(SP_ACTIVE_DESKTOP) : NULL); + sp_selection_layout_widget_update(SP_WIDGET(spw), SP_ACTIVE_DESKTOP ? sp_desktop_selection(SP_ACTIVE_DESKTOP) : NULL); // Insert spw into the toolbar. gtk_box_pack_start(GTK_BOX(tb), spw, FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); diff --git a/src/widgets/sp-xmlview-content.cpp b/src/widgets/sp-xmlview-content.cpp index 0d8878436..ffec0b723 100644 --- a/src/widgets/sp-xmlview-content.cpp +++ b/src/widgets/sp-xmlview-content.cpp @@ -160,6 +160,6 @@ sp_xmlview_content_changed (GtkTextBuffer *tb, SPXMLViewContent *text) text->repr->setContent(data); g_free (data); text->blocked = FALSE; - sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP)); + sp_document_done (sp_desktop_document (SP_ACTIVE_DESKTOP)); } } diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index cf3094375..1f9c2e504 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -779,7 +779,7 @@ sp_stb_magnitude_value_changed(GtkAdjustment *adj, GtkWidget *tbl) { SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) { + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { // do not remember prefs if this call is initiated by an undo change, because undoing object // creation sets bogus values to its attributes before it is deleted prefs_set_int_attribute("tools.shapes.star", "magnitude", (gint)adj->value); @@ -795,7 +795,7 @@ sp_stb_magnitude_value_changed(GtkAdjustment *adj, GtkWidget *tbl) bool modmade = false; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = selection->itemList(); for (; items != NULL; items = items->next) { if (SP_IS_STAR((SPItem *) items->data)) { @@ -808,7 +808,7 @@ sp_stb_magnitude_value_changed(GtkAdjustment *adj, GtkWidget *tbl) modmade = true; } } - if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop)); + if (modmade) sp_document_done(sp_desktop_document(desktop)); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -820,7 +820,7 @@ sp_stb_proportion_value_changed(GtkAdjustment *adj, GtkWidget *tbl) { SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) { + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.star", "proportion", adj->value); } @@ -833,7 +833,7 @@ sp_stb_proportion_value_changed(GtkAdjustment *adj, GtkWidget *tbl) g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); bool modmade = false; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = selection->itemList(); for (; items != NULL; items = items->next) { if (SP_IS_STAR((SPItem *) items->data)) { @@ -852,7 +852,7 @@ sp_stb_proportion_value_changed(GtkAdjustment *adj, GtkWidget *tbl) } } - if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop)); + if (modmade) sp_document_done(sp_desktop_document(desktop)); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -864,7 +864,7 @@ sp_stb_sides_flat_state_changed(GtkWidget *widget, GtkObject *tbl) { SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) { + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { prefs_set_string_attribute("tools.shapes.star", "isflatsided", "true"); } else { @@ -880,7 +880,7 @@ sp_stb_sides_flat_state_changed(GtkWidget *widget, GtkObject *tbl) // in turn, prevent listener from responding g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = selection->itemList(); GtkWidget *prop_widget = (GtkWidget*) g_object_get_data(G_OBJECT(tbl), "prop_widget"); bool modmade = false; @@ -905,7 +905,7 @@ sp_stb_sides_flat_state_changed(GtkWidget *widget, GtkObject *tbl) } } } - if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop)); + if (modmade) sp_document_done(sp_desktop_document(desktop)); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -917,7 +917,7 @@ sp_stb_rounded_value_changed(GtkAdjustment *adj, GtkWidget *tbl) { SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) { + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.star", "rounded", (gdouble) adj->value); } @@ -931,7 +931,7 @@ sp_stb_rounded_value_changed(GtkAdjustment *adj, GtkWidget *tbl) bool modmade = false; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = selection->itemList(); for (; items != NULL; items = items->next) { if (SP_IS_STAR((SPItem *) items->data)) { @@ -941,7 +941,7 @@ sp_stb_rounded_value_changed(GtkAdjustment *adj, GtkWidget *tbl) modmade = true; } } - if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop)); + if (modmade) sp_document_done(sp_desktop_document(desktop)); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -954,7 +954,7 @@ sp_stb_randomized_value_changed(GtkAdjustment *adj, GtkWidget *tbl) { SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) { + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.star", "randomized", (gdouble) adj->value); } @@ -968,7 +968,7 @@ sp_stb_randomized_value_changed(GtkAdjustment *adj, GtkWidget *tbl) bool modmade = false; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); GSList const *items = selection->itemList(); for (; items != NULL; items = items->next) { if (SP_IS_STAR((SPItem *) items->data)) { @@ -978,7 +978,7 @@ sp_stb_randomized_value_changed(GtkAdjustment *adj, GtkWidget *tbl) modmade = true; } } - if (modmade) sp_document_done(SP_DT_DOCUMENT(desktop)); + if (modmade) sp_document_done(sp_desktop_document(desktop)); g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -1247,7 +1247,7 @@ sp_star_toolbox_new(SPDesktop *desktop) sp_set_font_size_smaller (tbl); sigc::connection *connection = new sigc::connection( - SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_star_toolbox_selection_changed), (GtkObject *)tbl)) + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_star_toolbox_selection_changed), (GtkObject *)tbl)) ); g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection); @@ -1283,7 +1283,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name GtkWidget *us = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(tbl), "units"); SPUnit const *unit = sp_unit_selector_get_unit(SP_UNIT_SELECTOR(us)); - if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) { + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.rect", value_name, sp_units_get_pixels(adj->value, *unit)); } @@ -1296,7 +1296,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(TRUE)); bool modmade = false; - Inkscape::Selection *selection = SP_DT_SELECTION(desktop); + Inkscape::Selection *selection = sp_desktop_selection(desktop); for (GSList const *items = selection->itemList(); items != NULL; items = items->next) { if (SP_IS_RECT(items->data)) { if (adj->value != 0) { @@ -1311,7 +1311,7 @@ sp_rtb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_name sp_rtb_sensitivize (tbl); if (modmade) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -1575,7 +1575,7 @@ sp_rect_toolbox_new(SPDesktop *desktop) sp_set_font_size_smaller (tbl); sigc::connection *connection = new sigc::connection( - SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_rect_toolbox_selection_changed), (GtkObject *)tbl)) + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_rect_toolbox_selection_changed), (GtkObject *)tbl)) ); g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection); @@ -1591,7 +1591,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n { SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) { + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.spiral", value_name, adj->value); } @@ -1606,7 +1606,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n gchar* namespaced_name = g_strconcat("sodipodi:", value_name, NULL); bool modmade = false; - for (GSList const *items = SP_DT_SELECTION(desktop)->itemList(); + for (GSList const *items = sp_desktop_selection(desktop)->itemList(); items != NULL; items = items->next) { @@ -1621,7 +1621,7 @@ sp_spl_tb_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const *value_n g_free(namespaced_name); if (modmade) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -1814,7 +1814,7 @@ sp_spiral_toolbox_new(SPDesktop *desktop) sp_set_font_size_smaller (tbl); sigc::connection *connection = new sigc::connection( - SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_spiral_toolbox_selection_changed), (GtkObject *)tbl)) + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_spiral_toolbox_selection_changed), (GtkObject *)tbl)) ); g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection); @@ -2102,7 +2102,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const { SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) { + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { prefs_set_double_attribute("tools.shapes.arc", value_name, (adj->value * M_PI)/ 180); } @@ -2117,7 +2117,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const gchar* namespaced_name = g_strconcat("sodipodi:", value_name, NULL); bool modmade = false; - for (GSList const *items = SP_DT_SELECTION(desktop)->itemList(); + for (GSList const *items = sp_desktop_selection(desktop)->itemList(); items != NULL; items = items->next) { @@ -2148,7 +2148,7 @@ sp_arctb_startend_value_changed(GtkAdjustment *adj, GtkWidget *tbl, gchar const sp_arctb_sensitivize (tbl, adj->value, other->value); if (modmade) { - sp_document_maybe_done(SP_DT_DOCUMENT(desktop), value_name); + sp_document_maybe_done(sp_desktop_document(desktop), value_name); } // defocus spinbuttons by moving focus to the canvas, unless "stay" is on @@ -2175,7 +2175,7 @@ sp_arctb_open_state_changed(GtkWidget *widget, GtkObject *tbl) { SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - if (sp_document_get_undo_sensitive(SP_DT_DOCUMENT(desktop))) { + if (sp_document_get_undo_sensitive(sp_desktop_document(desktop))) { if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { prefs_set_string_attribute("tools.shapes.arc", "open", "true"); } else { @@ -2194,7 +2194,7 @@ sp_arctb_open_state_changed(GtkWidget *widget, GtkObject *tbl) bool modmade = false; if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) { - for (GSList const *items = SP_DT_SELECTION(desktop)->itemList(); + for (GSList const *items = sp_desktop_selection(desktop)->itemList(); items != NULL; items = items->next) { @@ -2206,7 +2206,7 @@ sp_arctb_open_state_changed(GtkWidget *widget, GtkObject *tbl) } } } else { - for (GSList const *items = SP_DT_SELECTION(desktop)->itemList(); + for (GSList const *items = sp_desktop_selection(desktop)->itemList(); items != NULL; items = items->next) { @@ -2220,7 +2220,7 @@ sp_arctb_open_state_changed(GtkWidget *widget, GtkObject *tbl) } if (modmade) { - sp_document_done(SP_DT_DOCUMENT(desktop)); + sp_document_done(sp_desktop_document(desktop)); } g_object_set_data(G_OBJECT(tbl), "freeze", GINT_TO_POINTER(FALSE)); @@ -2413,7 +2413,7 @@ sp_arc_toolbox_new(SPDesktop *desktop) } sigc::connection *connection = new sigc::connection( - SP_DT_SELECTION(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_arc_toolbox_selection_changed), (GtkObject *)tbl)) + sp_desktop_selection(desktop)->connectChanged(sigc::bind(sigc::ptr_fun(sp_arc_toolbox_selection_changed), (GtkObject *)tbl)) ); g_signal_connect(G_OBJECT(tbl), "destroy", G_CALLBACK(delete_connection), connection); @@ -3017,7 +3017,7 @@ static void connector_spacing_changed(GtkAdjustment *adj, GtkWidget *tbl) SPDesktop *desktop = (SPDesktop *) gtk_object_get_data(GTK_OBJECT(tbl), "desktop"); - SPDocument *doc = SP_DT_DOCUMENT(desktop); + SPDocument *doc = sp_desktop_document(desktop); if (!sp_document_get_undo_sensitive(doc)) { -- 2.30.2