[Skencil-commits] r800 - skencil/branches/skencil-0.6/src/Sketch/UI

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-02-06 21:28:09 +0100 (Sun, 06 Feb 2011)
New Revision: 800

Modified:
   skencil/branches/skencil-0.6/src/Sketch/UI/mainwindow.py
   skencil/branches/skencil-0.6/src/Sketch/UI/ruler.py
Log:
Make the master and orient parameters of Ruler mandatory.
They are always provided anyway and it prepares for more mandatory
arguments. Adapt the caller in mainwindow.


Modified: skencil/branches/skencil-0.6/src/Sketch/UI/mainwindow.py
===================================================================
--- skencil/branches/skencil-0.6/src/Sketch/UI/mainwindow.py	2011-02-06 20:19:59 UTC (rev 799)
+++ skencil/branches/skencil-0.6/src/Sketch/UI/mainwindow.py	2011-02-06 20:28:09 UTC (rev 800)
@@ -599,10 +599,10 @@
         vbar.grid(in_ = frame, column = 2, row = 1, sticky = 'ns')
         hbar = Scrollbar(frame, orient = HORIZONTAL)
         hbar.grid(in_ = frame, column = 1, row = 2, sticky = 'ew')
-        hrule = ruler.Ruler(root, orient = ruler.HORIZONTAL)
+        hrule = ruler.Ruler(root, ruler.HORIZONTAL)
         hrule.grid(in_ = frame, column = 1, row = 0, sticky = 'ew',
                    columnspan = 2)
-        vrule = ruler.Ruler(root, orient = ruler.VERTICAL)
+        vrule = ruler.Ruler(root, ruler.VERTICAL)
         vrule.grid(in_ = frame, column = 0, row = 1, sticky = 'ns',
                    rowspan = 2)
         tmp = Frame(frame, name = 'rulercorner')

Modified: skencil/branches/skencil-0.6/src/Sketch/UI/ruler.py
===================================================================
--- skencil/branches/skencil-0.6/src/Sketch/UI/ruler.py	2011-02-06 20:19:59 UTC (rev 799)
+++ skencil/branches/skencil-0.6/src/Sketch/UI/ruler.py	2011-02-06 20:28:09 UTC (rev 800)
@@ -84,7 +84,7 @@
 
 class Ruler(PyWidget):
 
-    def __init__(self, master=None, orient=HORIZONTAL, canvas=None, **kw):
+    def __init__(self, master, orient, canvas=None, **kw):
         apply(PyWidget.__init__, (self, master), kw)
         self.orient = orient
         self.canvas = canvas