diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-07-17 05:00:49 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-07-17 05:00:49 +0000 |
| commit | 7af2b98550f3389d08773addca07cd943ec6e2bb (patch) | |
| tree | 0c509f3f222e89380b6b72e0f2cdacb821fc3044 /src | |
| parent | Ported "widgets/node-toolbar.cpp". (diff) | |
| download | inkscape-7af2b98550f3389d08773addca07cd943ec6e2bb.tar.gz inkscape-7af2b98550f3389d08773addca07cd943ec6e2bb.zip | |
Temporary fixes/kludges.
(bzr r12380.1.16)
Diffstat (limited to 'src')
| -rw-r--r-- | src/helper/unit-tracker.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/helper/unit-tracker.cpp b/src/helper/unit-tracker.cpp index 609c2f292..7345660e6 100644 --- a/src/helper/unit-tracker.cpp +++ b/src/helper/unit-tracker.cpp @@ -94,7 +94,7 @@ SPUnit const* UnitTracker::getActiveUnit() const void UnitTracker::setActiveUnit( SPUnit const *unit ) { - if ( unit ) { + /*if ( unit ) { GtkTreeIter iter; int index = 0; gboolean found = gtk_tree_model_get_iter_first( GTK_TREE_MODEL(_store), &iter ); @@ -109,7 +109,7 @@ void UnitTracker::setActiveUnit( SPUnit const *unit ) found = gtk_tree_model_iter_next( GTK_TREE_MODEL(_store), &iter ); index++; } - } + }*/ } void UnitTracker::addAdjustment( GtkAdjustment* adj ) diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index d6e2406c9..102132158 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -477,6 +477,7 @@ SelectedStyle::setDesktop(SPDesktop *desktop) )); //_sw_unit = const_cast<SPUnit*>(sp_desktop_namedview(desktop)->doc_units); + _sw_unit = const_cast<SPUnit*>(&sp_unit_get_by_id(SP_UNIT_PX)); // Set the doc default unit active in the units list gint length = g_slist_length(_unit_mis); |