typo

[wxWidgets.git] / wxPython / wx / lib / anchors.py

diff --git a/wxPython/wx/lib/anchors.py b/wxPython/wx/lib/anchors.py
index 1553f2701a374f1f144a4daf0712d5a08a7fd6d0..af7cd8abfebf4be64acc5d35179d1ab4efea2c3f 100644 (file)
--- a/wxPython/wx/lib/anchors.py
+++ b/wxPython/wx/lib/anchors.py
@@ -10,12 +10,16 @@
 # Copyright:   (c) 2000 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
 # Copyright:   (c) 2000 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------

+# 11/30/2003 - Jeff Grimmett (grimmtooth@softhome.net)
+#
+# o Updated for wx namespace
+# o Tested with updated demo
+# 

 
 

-from wxPython.wx import wxLayoutConstraints, wxTop, wxLeft, wxBottom, wxRight, \
-                        wxHeight, wxWidth
+import  wx

 
 

-class LayoutAnchors(wxLayoutConstraints):
-    """ A class that implements Delphi's Anchors with wxLayoutConstraints.
+class LayoutAnchors(wx.LayoutConstraints):
+    """ A class that implements Delphi's Anchors with wx.LayoutConstraints.

 
         Anchored sides maintain the distance from the edge of the
         control to the same edge of the parent.
 
         Anchored sides maintain the distance from the edge of the
         control to the same edge of the parent.


@@ -56,22 +60,22 @@ class LayoutAnchors(wxLayoutConstraints):
                             +-------------------+
         * = anchored edge
     """
                             +-------------------+
         * = anchored edge
     """

-    def __init__(self, control, left = 1, top = 1, right = 0, bottom = 0):
-        wxLayoutConstraints.__init__(self)
+    def __init__(self, control, left=1, top=1, right=0, bottom=0):
+        wx.LayoutConstraints.__init__(self)

         parent = control.GetParent()
         if not parent: return
 
         pPos, pSize = parent.GetPosition(), parent.GetClientSize()
         cPos, cSize = control.GetPosition(), control.GetSize()
 
         parent = control.GetParent()
         if not parent: return
 
         pPos, pSize = parent.GetPosition(), parent.GetClientSize()
         cPos, cSize = control.GetPosition(), control.GetSize()
 

-        self.setConstraintSides(self.left, wxLeft, left,
-                                self.right, wxRight, right,
-                                self.width, wxWidth, self.centreX,
+        self.setConstraintSides(self.left, wx.Left, left,
+                                self.right, wx.Right, right,
+                                self.width, wx.Width, self.centreX,

                                 cPos.x, cSize.width, pSize.width, parent)
 
                                 cPos.x, cSize.width, pSize.width, parent)
 

-        self.setConstraintSides(self.top, wxTop, top,
-                                self.bottom, wxBottom, bottom,
-                                self.height, wxHeight, self.centreY,
+        self.setConstraintSides(self.top, wx.Top, top,
+                                self.bottom, wx.Bottom, bottom,
+                                self.height, wx.Height, self.centreY,

                                 cPos.y, cSize.height, pSize.height, parent)
 
     def setConstraintSides(self, side1, side1Edge, side1Anchor,
                                 cPos.y, cSize.height, pSize.height, parent)
 
     def setConstraintSides(self, side1, side1Edge, side1Anchor,


@@ -80,12 +84,16 @@ class LayoutAnchors(wxLayoutConstraints):
                                  cPos, cSize, pSize, parent):
         if side2Anchor:
             side2.SameAs(parent, side2Edge, pSize - (cPos + cSize))
                                  cPos, cSize, pSize, parent):
         if side2Anchor:
             side2.SameAs(parent, side2Edge, pSize - (cPos + cSize))

+

         if side1Anchor:
             side1.SameAs(parent, side1Edge, cPos)
         if side1Anchor:
             side1.SameAs(parent, side1Edge, cPos)

+

             if not side2Anchor:
                 size.AsIs()
         else:
             size.AsIs()
             if not side2Anchor:
                 size.AsIs()
         else:
             size.AsIs()

+            

             if not side2Anchor:
                 centre.PercentOf(parent, sizeEdge,
                                  int(((cPos + cSize / 2.0) / pSize)*100))
             if not side2Anchor:
                 centre.PercentOf(parent, sizeEdge,
                                  int(((cPos + cSize / 2.0) / pSize)*100))

+