Fixed comment bug [ 1390056 ] Wrong Documentation for TransferFromWindow

[wxWidgets.git] / wxPython / wx / lib / ogl / _composit.py

diff --git a/wxPython/wx/lib/ogl/_composit.py b/wxPython/wx/lib/ogl/_composit.py
index fba79f3b7367e1d82c035b43854f2e7385851d25..812b7539a153495042576115a5261f03890586a9 100644 (file)
--- a/wxPython/wx/lib/ogl/_composit.py
+++ b/wxPython/wx/lib/ogl/_composit.py
@@ -133,7 +133,7 @@ class Constraint(object):
         self._ySpacing = 0.0
 
         self._constraintType = type
         self._ySpacing = 0.0
 
         self._constraintType = type

-        self._constraintingObject = constraining
+        self._constrainingObject = constraining

 
         self._constraintId = 0
         self._constraintName = "noname"
 
         self._constraintId = 0
         self._constraintName = "noname"


@@ -158,13 +158,13 @@ class Constraint(object):
 
     def Evaluate(self):
         """Evaluate this constraint and return TRUE if anything changed."""
 
     def Evaluate(self):
         """Evaluate this constraint and return TRUE if anything changed."""

-        maxWidth, maxHeight = self._constraintingObject.GetBoundingBoxMax()
-        minWidth, minHeight = self._constraintingObject.GetBoundingBoxMin()
-        x = self._constraintingObject.GetX()
-        y = self._constraintingObject.GetY()
+        maxWidth, maxHeight = self._constrainingObject.GetBoundingBoxMax()
+        minWidth, minHeight = self._constrainingObject.GetBoundingBoxMin()
+        x = self._constrainingObject.GetX()
+        y = self._constrainingObject.GetY()

 
 

-        dc = wx.ClientDC(self._constraintingObject.GetCanvas())
-        self._constraintingObject.GetCanvas().PrepareDC(dc)
+        dc = wx.ClientDC(self._constrainingObject.GetCanvas())
+        self._constrainingObject.GetCanvas().PrepareDC(dc)

 
         if self._constraintType == CONSTRAINT_CENTRED_VERTICALLY:
             n = len(self._constrainedObjects)
 
         if self._constraintType == CONSTRAINT_CENTRED_VERTICALLY:
             n = len(self._constrainedObjects)


@@ -552,8 +552,10 @@ class CompositeShape(RectangleShape):
         """Removes the child from the composite and any constraint
         relationships, but does not delete the child.
         """
         """Removes the child from the composite and any constraint
         relationships, but does not delete the child.
         """

-        self._children.remove(child)
-        self._divisions.remove(child)
+        if child in self._children:
+            self._children.remove(child)
+        if child in self._divisions:
+            self._divisions.remove(child)

         self.RemoveChildFromConstraints(child)
         child.SetParent(None)
 
         self.RemoveChildFromConstraints(child)
         child.SetParent(None)