diff options
| author | gustav_b <gustav_b@users.sourceforge.net> | 2007-12-07 01:41:04 +0000 |
|---|---|---|
| committer | gustav_b <gustav_b@users.sourceforge.net> | 2007-12-07 01:41:04 +0000 |
| commit | 1d22b74180777745a27e7ddbd3006c950063cf41 (patch) | |
| tree | df270c16e2856da62210ce610e3da52c45fe6c0d /src/ui/dialog/find.cpp | |
| parent | Fized crashes & odd behaviour when resizing, zooming and rotating feTurbulence (diff) | |
| download | inkscape-1d22b74180777745a27e7ddbd3006c950063cf41.tar.gz inkscape-1d22b74180777745a27e7ddbd3006c950063cf41.zip | |
Rework dialog management. Use singleton behavior for dialogs when
started in floating dialogs mode and use one dialog/desktop behavior
when started in dockable dialogs mode. Replace the panels use of the
SP_ACTIVE_DESKTOP macro and unify the panels' handling of desktop
activation events.
(bzr r4188)
Diffstat (limited to 'src/ui/dialog/find.cpp')
| -rw-r--r-- | src/ui/dialog/find.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/dialog/find.cpp b/src/ui/dialog/find.cpp index cfc1bfeb2..3ff79a0d3 100644 --- a/src/ui/dialog/find.cpp +++ b/src/ui/dialog/find.cpp @@ -275,7 +275,7 @@ Find::filter_fields (GSList *l, bool exact) bool Find::item_type_match (SPItem *item) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; + SPDesktop *desktop = getDesktop(); if (SP_IS_RECT(item)) { return (_check_all_shapes.get_active() || _check_rects.get_active()); @@ -337,7 +337,7 @@ Find::filter_list (GSList *l, bool exact) GSList * Find::all_items (SPObject *r, GSList *l, bool hidden, bool locked) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; + SPDesktop *desktop = getDesktop(); if (SP_IS_DEFS(r)) return l; // we're not interested in items in defs @@ -359,9 +359,9 @@ Find::all_items (SPObject *r, GSList *l, bool hidden, bool locked) GSList * Find::all_selection_items (Inkscape::Selection *s, GSList *l, SPObject *ancestor, bool hidden, bool locked) { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; + SPDesktop *desktop = getDesktop(); - for (GSList *i = (GSList *) s->itemList(); i != NULL; i = i->next) { + for (GSList *i = (GSList *) s->itemList(); i != NULL; i = i->next) { if (SP_IS_ITEM (i->data) && !SP_OBJECT_IS_CLONED (i->data) && !desktop->isLayer(SP_ITEM(i->data))) { if (!ancestor || ancestor->isAncestorOf(SP_OBJECT (i->data))) { if ((hidden || !desktop->itemIsHidden(SP_ITEM(i->data))) && (locked || !SP_ITEM(i->data)->isLocked())) { @@ -398,7 +398,7 @@ Find::onClear() void Find::onFind() { - SPDesktop *desktop = SP_ACTIVE_DESKTOP; + SPDesktop *desktop = getDesktop(); bool hidden = _check_include_hidden.get_active(); bool locked = _check_include_locked.get_active(); |