diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-07-17 04:15:06 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-07-17 04:15:06 +0000 |
| commit | a2b755108f544e938705a364d2573b049e21f26f (patch) | |
| tree | 6377f03e8d77a1de4764dd11eaebd5d9f6c538e2 /src/widgets/text-toolbar.cpp | |
| parent | Removed unused unit includes. (diff) | |
| download | inkscape-a2b755108f544e938705a364d2573b049e21f26f.tar.gz inkscape-a2b755108f544e938705a364d2573b049e21f26f.zip | |
Ported "widgets/text-toolbar.cpp" and "widgets/paintbucket.cpp"
(bzr r12380.1.11)
Diffstat (limited to 'src/widgets/text-toolbar.cpp')
| -rw-r--r-- | src/widgets/text-toolbar.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp index 144a2a3e8..4dd44bb8d 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -56,9 +56,6 @@ #include "../xml/repr.h" #include "ui/uxmanager.h" #include "../ui/icon-names.h" -#include "../helper/unit-menu.h" -#include "../helper/units.h" -#include "../helper/unit-tracker.h" #include "../pen-context.h" #include "../sp-namedview.h" #include "../svg/css-ostringstream.h" @@ -72,7 +69,6 @@ #include "widgets/font-selector.h" -using Inkscape::UnitTracker; using Inkscape::UI::UXManager; using Inkscape::DocumentUndo; using Inkscape::UI::ToolboxFactory; @@ -1218,9 +1214,10 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje Inkscape::IconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1); // Is this used? - UnitTracker* tracker = new UnitTracker( SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE ); + /*UnitTracker* tracker = new UnitTracker( SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE ); //tracker->setActiveUnit( sp_desktop_namedview(desktop)->doc_units ); - g_object_set_data( holder, "tracker", tracker ); + tracker->setActiveUnit(&sp_unit_get_by_id(SP_UNIT_PX)); + g_object_set_data( holder, "tracker", tracker );*/ /* Font family */ { |