Merge and cleanup of GSoC C++-ification project.

[inkscape.git] / src / ui / widget / page-sizer.cpp

diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 33adc85d0c5cb008d194057f27b23ef47873fbf0..f7cb6f145ea2518d2a46eaf218030ec824675676 100644 (file)
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -8,6 +8,7 @@
  *   Jon Phillips <jon@rejon.org>
  *   Ralf Stephan <ralf@ark.in-berlin.de> (Gtkmm)
  *   Bob Jamison <ishmal@users.sf.net>
+ *   Abhishek Sharma
  *
  * Copyright (C) 2000 - 2006 Authors
  *
@@ -297,6 +298,15 @@ PageSizer::PageSizer(Registry & _wr)
     _portraitButton.set_group (group);
     _portraitButton.set_active (true);
 
+    // Setting default custom unit to document unit
+    SPDesktop *dt = SP_ACTIVE_DESKTOP;
+    SPNamedView *nv = sp_desktop_namedview(dt);
+    if (nv->units) {
+        _dimensionUnits.setUnit(nv->units);
+    } else if (nv->doc_units) {
+        _dimensionUnits.setUnit(nv->doc_units);
+    }
+    
     //## Set up custom size frame
     _customFrame.set_label(_("Custom size"));
     pack_start (_customFrame, false, false, 0);
@@ -413,7 +423,7 @@ PageSizer::setDim (double w, double h, bool changeList)
         // changing the page size. The SVG's origin however is in the upper left corner, so we must compensate for this
         Geom::Translate const vert_offset(Geom::Point(0, (old_height - h)));
                SP_GROUP(SP_ROOT(doc->root))->translateChildItems(vert_offset);
-        SPDocumentUndo::done (doc, SP_VERB_NONE, _("Set page size"));
+        DocumentUndo::done(doc, SP_VERB_NONE, _("Set page size"));
     }
 
     if ( w != h ) {