frame should call skip on child focus event to give owner a chance

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

diff --git a/wxPython/wx/lib/ogl/_basic.py b/wxPython/wx/lib/ogl/_basic.py
index 250e8f942299cacd94a81749fd89f6d11049f133..4ace078e4435960bed9b8ed49734a38ca6ed0ca8 100644 (file)
--- a/wxPython/wx/lib/ogl/_basic.py
+++ b/wxPython/wx/lib/ogl/_basic.py
@@ -11,8 +11,6 @@
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 
 # Licence:      wxWindows license
 #----------------------------------------------------------------------------
 

-from __future__ import division
-

 import wx
 import math
 
 import wx
 import math
 


@@ -21,7 +19,6 @@ from _oglmisc import *
 DragOffsetX = 0.0
 DragOffsetY = 0.0
 
 DragOffsetX = 0.0
 DragOffsetY = 0.0
 

-

 def OGLInitialize():
     global WhiteBackgroundPen, WhiteBackgroundBrush, TransparentPen
     global BlackForegroundPen, NormalFont
 def OGLInitialize():
     global WhiteBackgroundPen, WhiteBackgroundBrush, TransparentPen
     global BlackForegroundPen, NormalFont


@@ -84,7 +81,11 @@ class ShapeEvtHandler(object):
 
     def GetPreviousHandler(self):
         return self._previousHandler
 
     def GetPreviousHandler(self):
         return self._previousHandler

-    
+
+    def OnDelete(self):
+        if self!=self.GetShape():
+            del self
+            

     def OnDraw(self, dc):
         if self._previousHandler:
             self._previousHandler.OnDraw(dc)
     def OnDraw(self, dc):
         if self._previousHandler:
             self._previousHandler.OnDraw(dc)


@@ -254,7 +255,7 @@ class Shape(ShapeEvtHandler):
         self._shadowBrush = wx.BLACK_BRUSH
         self._textMarginX = 5
         self._textMarginY = 5
         self._shadowBrush = wx.BLACK_BRUSH
         self._textMarginX = 5
         self._textMarginY = 5

-        self._regionName="0"
+        self._regionName = "0"

         self._centreResize = True
         self._maintainAspectRatio = False
         self._highlighted = False
         self._centreResize = True
         self._maintainAspectRatio = False
         self._highlighted = False


@@ -285,20 +286,33 @@ class Shape(ShapeEvtHandler):
 
     def GetClassName(self):
         return str(self.__class__).split(".")[-1][:-2]
 
     def GetClassName(self):
         return str(self.__class__).split(".")[-1][:-2]

-    
-    def __del__(self):
+
+    def Delete(self):
+        """
+        Fully disconnect this shape from parents, children, the
+        canvas, etc.
+        """

         if self._parent:
         if self._parent:

-            i = self._parent.GetChildren().index(self)
-            self._parent.GetChildren(i).remove(self)
+            self._parent.GetChildren().remove(self)
+
+        for child in self.GetChildren():
+            child.Delete()

 
         self.ClearText()
         self.ClearRegions()
         self.ClearAttachments()
 
 
         self.ClearText()
         self.ClearRegions()
         self.ClearAttachments()
 

+        self._handlerShape = None
+        

         if self._canvas:
         if self._canvas:

-            self._canvas.RemoveShape(self)
+            self.RemoveFromCanvas(self._canvas)

 
 

-        self.GetEventHandler().OnDelete()
+        if self.GetEventHandler():
+            self.GetEventHandler().OnDelete()
+        self._eventHandler = None
+        
+    def __del__(self):
+        ShapeEvtHandler.__del__(self)

 
     def Draggable(self):
         """TRUE if the shape may be dragged by the user."""
 
     def Draggable(self):
         """TRUE if the shape may be dragged by the user."""


@@ -388,6 +402,10 @@ class Shape(ShapeEvtHandler):
         else:
             self._shadowMode = mode
 
         else:
             self._shadowMode = mode
 

+    def GetShadowMode(self):
+        """Return the current shadow mode setting"""
+        return self._shadowMode
+

     def SetCanvas(self, theCanvas):
         """Identical to Shape.Attach."""
         self._canvas = theCanvas
     def SetCanvas(self, theCanvas):
         """Identical to Shape.Attach."""
         self._canvas = theCanvas


@@ -418,6 +436,8 @@ class Shape(ShapeEvtHandler):
         """Remove the shape from the canvas."""
         if self.Selected():
             self.Select(False)
         """Remove the shape from the canvas."""
         if self.Selected():
             self.Select(False)

+        
+        self._canvas = None

         theCanvas.RemoveShape(self)
         for object in self._children:
             object.RemoveFromCanvas(theCanvas)
         theCanvas.RemoveShape(self)
         for object in self._children:
             object.RemoveFromCanvas(theCanvas)


@@ -431,8 +451,8 @@ class Shape(ShapeEvtHandler):
     def ClearText(self, regionId = 0):
         """Clear the text from the specified text region."""
         if regionId == 0:
     def ClearText(self, regionId = 0):
         """Clear the text from the specified text region."""
         if regionId == 0:

-            self._text=""
-        if regionId<len(self._regions):
+            self._text = ""
+        if regionId < len(self._regions):

             self._regions[regionId].ClearText()
             
     def ClearRegions(self):
             self._regions[regionId].ClearText()
             
     def ClearRegions(self):


@@ -456,18 +476,18 @@ class Shape(ShapeEvtHandler):
         the given point and target.
         """
         width, height = self.GetBoundingBoxMax()
         the given point and target.
         """
         width, height = self.GetBoundingBoxMax()

-        if abs(width)<4:
+        if abs(width) < 4:

             width = 4.0
             width = 4.0

-        if abs(height)<4:
+        if abs(height) < 4:

             height = 4.0
 
         width += 4 # Allowance for inaccurate mousing
         height += 4
         
             height = 4.0
 
         width += 4 # Allowance for inaccurate mousing
         height += 4
         

-        left = self._xpos - (width / 2)
-        top = self._ypos - (height / 2)
-        right = self._xpos + (width / 2)
-        bottom = self._ypos + (height / 2)
+        left = self._xpos - width / 2.0
+        top = self._ypos - height / 2.0
+        right = self._xpos + width / 2.0
+        bottom = self._ypos + height / 2.0

 
         nearest_attachment = 0
 
 
         nearest_attachment = 0
 


@@ -485,7 +505,7 @@ class Shape(ShapeEvtHandler):
                 if e:
                     xp, yp = e
                     l = math.sqrt(((xp - x) * (xp - x)) + (yp - y) * (yp - y))
                 if e:
                     xp, yp = e
                     l = math.sqrt(((xp - x) * (xp - x)) + (yp - y) * (yp - y))

-                    if l<nearest:
+                    if l < nearest:

                         nearest = l
                         nearest_attachment = i
 
                         nearest = l
                         nearest_attachment = i
 


@@ -504,7 +524,7 @@ class Shape(ShapeEvtHandler):
         if not self._regions:
             return
 
         if not self._regions:
             return
 

-        if i>len(self._regions):
+        if i > len(self._regions):

             return
 
         region = self._regions[i]
             return
 
         region = self._regions[i]


@@ -523,7 +543,7 @@ class Shape(ShapeEvtHandler):
         # Don't try to resize an object with more than one image (this
         # case should be dealt with by overriden handlers)
         if (region.GetFormatMode() & FORMAT_SIZE_TO_CONTENTS) and \
         # Don't try to resize an object with more than one image (this
         # case should be dealt with by overriden handlers)
         if (region.GetFormatMode() & FORMAT_SIZE_TO_CONTENTS) and \

-           region.GetFormattedText().GetCount() and \
+           len(region.GetFormattedText()) and \

            len(self._regions) == 1 and \
            not Shape.GraphicsInSizeToContents:
 
            len(self._regions) == 1 and \
            not Shape.GraphicsInSizeToContents:
 


@@ -595,7 +615,7 @@ class Shape(ShapeEvtHandler):
     def SetFont(self, the_font, regionId = 0):
         """Set the font for the specified text region."""
         self._font = the_font
     def SetFont(self, the_font, regionId = 0):
         """Set the font for the specified text region."""
         self._font = the_font

-        if regionId<len(self._regions):
+        if regionId < len(self._regions):

             self._regions[regionId].SetFont(the_font)
 
     def GetFont(self, regionId = 0):
             self._regions[regionId].SetFont(the_font)
 
     def GetFont(self, regionId = 0):


@@ -615,7 +635,7 @@ class Shape(ShapeEvtHandler):
         FORMAT_CENTRE_VERT
           Vertical centring.
         """
         FORMAT_CENTRE_VERT
           Vertical centring.
         """

-        if regionId<len(self._regions):
+        if regionId < len(self._regions):

             self._regions[regionId].SetFormatMode(mode)
 
     def GetFormatMode(self, regionId = 0):
             self._regions[regionId].SetFormatMode(mode)
 
     def GetFormatMode(self, regionId = 0):


@@ -628,21 +648,21 @@ class Shape(ShapeEvtHandler):
         self._textColour = wx.TheColourDatabase.Find(the_colour)
         self._textColourName = the_colour
 
         self._textColour = wx.TheColourDatabase.Find(the_colour)
         self._textColourName = the_colour
 

-        if regionId<len(self._regions):
+        if regionId < len(self._regions):

             self._regions[regionId].SetColour(the_colour)
             
     def GetTextColour(self, regionId = 0):
         """Get the colour for the specified text region."""
         if regionId >= len(self._regions):
             return ""
             self._regions[regionId].SetColour(the_colour)
             
     def GetTextColour(self, regionId = 0):
         """Get the colour for the specified text region."""
         if regionId >= len(self._regions):
             return ""

-        return self._regions[regionId].GetTextColour()
+        return self._regions[regionId].GetColour()

 
     def SetRegionName(self, name, regionId = 0):
         """Set the name for this region.
         The name for a region is unique within the scope of the whole
         composite, whereas a region id is unique only for a single image.
         """
 
     def SetRegionName(self, name, regionId = 0):
         """Set the name for this region.
         The name for a region is unique within the scope of the whole
         composite, whereas a region id is unique only for a single image.
         """

-        if regionId<len(self._regions):
+        if regionId < len(self._regions):

             self._regions[regionId].SetName(name)
 
     def GetRegionName(self, regionId = 0):
             self._regions[regionId].SetName(name)
 
     def GetRegionName(self, regionId = 0):


@@ -688,7 +708,7 @@ class Shape(ShapeEvtHandler):
         for the given region name.
         """
         id = self.GetRegionId(name)
         for the given region name.
         """
         id = self.GetRegionId(name)

-        if id>-1:
+        if id > -1:

             return self, id
 
         for child in self._children:
             return self, id
 
         for child in self._children:


@@ -696,7 +716,7 @@ class Shape(ShapeEvtHandler):
             if actualImage:
                 return actualImage, regionId
 
             if actualImage:
                 return actualImage, regionId
 

-        return None,-1
+        return None, -1

 
     # Finds all region names for this image (composite or simple).
     def FindRegionNames(self):
 
     # Finds all region names for this image (composite or simple).
     def FindRegionNames(self):


@@ -736,18 +756,18 @@ class Shape(ShapeEvtHandler):
         if self._pen:
             dc.SetPen(self._pen)
 
         if self._pen:
             dc.SetPen(self._pen)
 

-        region = self._regions[0]
-        if region.GetFont():
-            dc.SetFont(region.GetFont())
+        for region in self._regions:
+            if region.GetFont():
+                dc.SetFont(region.GetFont())

 
 

-        dc.SetTextForeground(region.GetActualColourObject())
-        dc.SetBackgroundMode(wx.TRANSPARENT)
-        if not self._formatted:
-            CentreText(dc, region.GetFormattedText(), self._xpos, self._ypos, bound_x - 2 * self._textMarginX, bound_y - 2 * self._textMarginY, region.GetFormatMode())
-            self._formatted = True
+            dc.SetTextForeground(region.GetActualColourObject())
+            dc.SetBackgroundMode(wx.TRANSPARENT)
+            if not self._formatted:
+                CentreText(dc, region.GetFormattedText(), self._xpos, self._ypos, bound_x - 2 * self._textMarginX, bound_y - 2 * self._textMarginY, region.GetFormatMode())
+                self._formatted = True

 
 

-        if not self.GetDisableLabel():
-            DrawFormattedText(dc, region.GetFormattedText(), self._xpos, self._ypos, bound_x - 2 * self._textMarginX, bound_y - 2 * self._textMarginY, region.GetFormatMode())
+            if not self.GetDisableLabel():
+                DrawFormattedText(dc, region.GetFormattedText(), self._xpos, self._ypos, bound_x - 2 * self._textMarginX, bound_y - 2 * self._textMarginY, region.GetFormatMode())

             
 
     def DrawContents(self, dc):
             
 
     def DrawContents(self, dc):


@@ -782,8 +802,8 @@ class Shape(ShapeEvtHandler):
         minX, minY = self.GetBoundingBoxMin()
         maxX, maxY = self.GetBoundingBoxMax()
 
         minX, minY = self.GetBoundingBoxMin()
         maxX, maxY = self.GetBoundingBoxMax()
 

-        topLeftX = xp - maxX / 2 - 2
-        topLeftY = yp - maxY / 2 - 2
+        topLeftX = xp - maxX / 2.0 - 2
+        topLeftY = yp - maxY / 2.0 - 2

 
         penWidth = 0
         if self._pen:
 
         penWidth = 0
         if self._pen:


@@ -794,7 +814,7 @@ class Shape(ShapeEvtHandler):
 
         dc.DrawRectangle(topLeftX - penWidth, topLeftY - penWidth, maxX + penWidth * 2 + 4, maxY + penWidth * 2 + 4)
 
 
         dc.DrawRectangle(topLeftX - penWidth, topLeftY - penWidth, maxX + penWidth * 2 + 4, maxY + penWidth * 2 + 4)
 

-    def EraseLinks(self, dc, attachment=-1, recurse = False):
+    def EraseLinks(self, dc, attachment = -1, recurse = False):

         """Erase links attached to this shape, but do not repair damage
         caused to other shapes.
         """
         """Erase links attached to this shape, but do not repair damage
         caused to other shapes.
         """


@@ -802,21 +822,21 @@ class Shape(ShapeEvtHandler):
             return
 
         for line in self._lines:
             return
 
         for line in self._lines:

-            if attachment==-1 or (line.GetTo() == self and line.GetAttachmentTo() == attachment or line.GetFrom() == self and line.GetAttachmentFrom() == attachment):
+            if attachment == -1 or (line.GetTo() == self and line.GetAttachmentTo() == attachment or line.GetFrom() == self and line.GetAttachmentFrom() == attachment):

                 line.GetEventHandler().OnErase(dc)
 
         if recurse:
             for child in self._children:
                 child.EraseLinks(dc, attachment, recurse)
 
                 line.GetEventHandler().OnErase(dc)
 
         if recurse:
             for child in self._children:
                 child.EraseLinks(dc, attachment, recurse)
 

-    def DrawLinks(self, dc, attachment=-1, recurse = False):
+    def DrawLinks(self, dc, attachment = -1, recurse = False):

         """Draws any lines linked to this shape."""
         if not self._visible:
             return
 
         for line in self._lines:
         """Draws any lines linked to this shape."""
         if not self._visible:
             return
 
         for line in self._lines:

-            if attachment==-1 or (line.GetTo() == self and line.GetAttachmentTo() == attachment or line.GetFrom() == self and line.GetAttachmentFrom() == attachment):
-                line.GetEventHandler().Draw(dc)
+            if attachment == -1 or (line.GetTo() == self and line.GetAttachmentTo() == attachment or line.GetFrom() == self and line.GetAttachmentFrom() == attachment):
+                line.Draw(dc)

                 
         if recurse:
             for child in self._children:
                 
         if recurse:
             for child in self._children:


@@ -838,9 +858,9 @@ class Shape(ShapeEvtHandler):
         """
         physicalAttachment = self.LogicalToPhysicalAttachment(attachmentPoint)
         if physicalAttachment in [0, 2]:
         """
         physicalAttachment = self.LogicalToPhysicalAttachment(attachmentPoint)
         if physicalAttachment in [0, 2]:

-            return pt1.x <= pt2.x
+            return pt1[0] <= pt2[0]

         elif physicalAttachment in [1, 3]:
         elif physicalAttachment in [1, 3]:

-            return pt1.y <= pt2.y
+            return pt1[1] <= pt2[1]

 
         return False
 
 
         return False
 


@@ -878,8 +898,8 @@ class Shape(ShapeEvtHandler):
         # it to another position in the list
         del newOrdering[newOrdering.index(to_move)]
 
         # it to another position in the list
         del newOrdering[newOrdering.index(to_move)]
 

-        old_x=-99999.9
-        old_y=-99999.9
+        old_x = -99999.9
+        old_y = -99999.9

 
         found = False
 
 
         found = False
 


@@ -965,7 +985,7 @@ class Shape(ShapeEvtHandler):
             if line in linesAtThisAttachment:
                 # Done this one
                 del linesAtThisAttachment[linesAtThisAttachment.index(line)]
             if line in linesAtThisAttachment:
                 # Done this one
                 del linesAtThisAttachment[linesAtThisAttachment.index(line)]

-                self._lines.Append(line)
+                self._lines.append(line)

 
         # Now add any lines that haven't been listed in linesToSort
         self._lines += linesAtThisAttachment
 
         # Now add any lines that haven't been listed in linesToSort
         self._lines += linesAtThisAttachment


@@ -1048,7 +1068,7 @@ class Shape(ShapeEvtHandler):
                 hit = self._parent.HitTest(x, y)
                 if hit:
                     attachment, dist = hit
                 hit = self._parent.HitTest(x, y)
                 if hit:
                     attachment, dist = hit

-            self._parent.GetEventHandler().OnEndDragLeft(x, y, keys, attachment)
+                self._parent.GetEventHandler().OnEndDragLeft(x, y, keys, attachment)

             return
 
         dc = wx.ClientDC(self.GetCanvas())
             return
 
         dc = wx.ClientDC(self.GetCanvas())


@@ -1088,14 +1108,13 @@ class Shape(ShapeEvtHandler):
             return
 
     def OnDrawOutline(self, dc, x, y, w, h):
             return
 
     def OnDrawOutline(self, dc, x, y, w, h):

-        points = [[x - w / 2, y - h / 2],
-                [x + w / 2, y - h / 2],
-                [x + w / 2, y + h / 2],
-                [x - w / 2, y + h / 2],
-                [x - w / 2, y - h / 2],
+        points = [[x - w / 2.0, y - h / 2.0],
+                [x + w / 2.0, y - h / 2.0],
+                [x + w / 2.0, y + h / 2.0],
+                [x - w / 2.0, y + h / 2.0],
+                [x - w / 2.0, y - h / 2.0],

                 ]
 
                 ]
 

-        #dc.DrawLines([[round(x), round(y)] for x, y in points])

         dc.DrawLines(points)
         
     def Attach(self, can):
         dc.DrawLines(points)
         
     def Attach(self, can):


@@ -1147,7 +1166,7 @@ class Shape(ShapeEvtHandler):
         """Flash the shape."""
         if self.GetCanvas():
             dc = wx.ClientDC(self.GetCanvas())
         """Flash the shape."""
         if self.GetCanvas():
             dc = wx.ClientDC(self.GetCanvas())

-            self.GetCanvas.PrepareDC(dc)
+            self.GetCanvas().PrepareDC(dc)

 
             dc.SetLogicalFunction(OGLRBLF)
             self.Draw(dc)
 
             dc.SetLogicalFunction(OGLRBLF)
             self.Draw(dc)


@@ -1197,18 +1216,18 @@ class Shape(ShapeEvtHandler):
         if width == 0:
             scaleX = 1.0
         else:
         if width == 0:
             scaleX = 1.0
         else:

-            scaleX = long(w) / width
+            scaleX = float(w) / width

         if height == 0:
             scaleY = 1.0
         else:
         if height == 0:
             scaleY = 1.0
         else:

-            scaleY = long(h) / height
+            scaleY = float(h) / height

 
         for point in self._attachmentPoints:
             point._x = point._x * scaleX
             point._y = point._y * scaleY
 
     # Add line FROM this object
 
         for point in self._attachmentPoints:
             point._x = point._x * scaleX
             point._y = point._y * scaleY
 
     # Add line FROM this object

-    def AddLine(self, line, other, attachFrom = 0, attachTo = 0, positionFrom=-1, positionTo=-1):
+    def AddLine(self, line, other, attachFrom = 0, attachTo = 0, positionFrom = -1, positionTo = -1):

         """Add a line between this shape and the given other shape, at the
         specified attachment points.
 
         """Add a line between this shape and the given other shape, at the
         specified attachment points.
 


@@ -1216,7 +1235,7 @@ class Shape(ShapeEvtHandler):
         so that the line will be drawn at a particular point on its attachment
         point.
         """
         so that the line will be drawn at a particular point on its attachment
         point.
         """

-        if positionFrom==-1:
+        if positionFrom == -1:

             if not line in self._lines:
                 self._lines.append(line)
         else:
             if not line in self._lines:
                 self._lines.append(line)
         else:


@@ -1225,12 +1244,12 @@ class Shape(ShapeEvtHandler):
                 self._lines.remove(line)
             except ValueError:
                 pass
                 self._lines.remove(line)
             except ValueError:
                 pass

-            if positionFrom<len(self._lines):
+            if positionFrom < len(self._lines):

                 self._lines.insert(positionFrom, line)
             else:
                 self._lines.append(line)
 
                 self._lines.insert(positionFrom, line)
             else:
                 self._lines.append(line)
 

-        if positionTo==-1:
+        if positionTo == -1:

             if not other in other._lines:
                 other._lines.append(line)
         else:
             if not other in other._lines:
                 other._lines.append(line)
         else:


@@ -1239,7 +1258,7 @@ class Shape(ShapeEvtHandler):
                 other._lines.remove(line)
             except ValueError:
                 pass
                 other._lines.remove(line)
             except ValueError:
                 pass

-            if positionTo<len(other._lines):
+            if positionTo < len(other._lines):

                 other._lines.insert(positionTo, line)
             else:
                 other._lines.append(line)
                 other._lines.insert(positionTo, line)
             else:
                 other._lines.append(line)


@@ -1273,10 +1292,10 @@ class Shape(ShapeEvtHandler):
         heightMin = minY + CONTROL_POINT_SIZE + 2
 
         # Offsets from main object
         heightMin = minY + CONTROL_POINT_SIZE + 2
 
         # Offsets from main object

-        top=-heightMin / 2
-        bottom = heightMin / 2 + (maxY - minY)
-        left=-widthMin / 2
-        right = widthMin / 2 + (maxX - minX)
+        top = -heightMin / 2.0
+        bottom = heightMin / 2.0 + (maxY - minY)
+        left = -widthMin / 2.0
+        right = widthMin / 2.0 + (maxX - minX)

 
         control = ControlPoint(self._canvas, self, CONTROL_POINT_SIZE, left, top, CONTROL_POINT_DIAGONAL)
         self._canvas.AddShape(control)
 
         control = ControlPoint(self._canvas, self, CONTROL_POINT_SIZE, left, top, CONTROL_POINT_DIAGONAL)
         self._canvas.AddShape(control)


@@ -1341,10 +1360,10 @@ class Shape(ShapeEvtHandler):
         heightMin = minY + CONTROL_POINT_SIZE + 2
         
         # Offsets from main object
         heightMin = minY + CONTROL_POINT_SIZE + 2
         
         # Offsets from main object

-        top=-heightMin / 2
-        bottom = heightMin / 2 + (maxY - minY)
-        left=-widthMin / 2
-        right = widthMin / 2 + (maxX - minX)
+        top = -heightMin / 2.0
+        bottom = heightMin / 2.0 + (maxY - minY)
+        left = -widthMin / 2.0
+        right = widthMin / 2.0 + (maxX - minX)

 
         self._controlPoints[0]._xoffset = left
         self._controlPoints[0]._yoffset = top
 
         self._controlPoints[0]._xoffset = left
         self._controlPoints[0]._yoffset = top


@@ -1375,13 +1394,13 @@ class Shape(ShapeEvtHandler):
 
         Does not redraw the shape.
         """
 
         Does not redraw the shape.
         """

-        for control in self._controlPoints:
+        for control in self._controlPoints[:]:

             if dc:
                 control.GetEventHandler().OnErase(dc)
             if dc:
                 control.GetEventHandler().OnErase(dc)

-            self._canvas.RemoveShape(control)
-            del control
+            control.Delete()
+            self._controlPoints.remove(control)

         self._controlPoints = []
         self._controlPoints = []

-
+        

         # Children of divisions are contained objects,
         # so stop here
         if not isinstance(self, DivisionShape):
         # Children of divisions are contained objects,
         # so stop here
         if not isinstance(self, DivisionShape):


@@ -1458,7 +1477,7 @@ class Shape(ShapeEvtHandler):
         else:
             maxN = 3
             for point in self._attachmentPoints:
         else:
             maxN = 3
             for point in self._attachmentPoints:

-                if point._id>maxN:
+                if point._id > maxN:

                     maxN = point._id
             return maxN + 1
 
                     maxN = point._id
             return maxN + 1
 


@@ -1482,7 +1501,7 @@ class Shape(ShapeEvtHandler):
             return self._xpos, self._ypos
         elif self._attachmentMode == ATTACHMENT_MODE_BRANCHING:
             pt, stemPt = self.GetBranchingAttachmentPoint(attachment, nth)
             return self._xpos, self._ypos
         elif self._attachmentMode == ATTACHMENT_MODE_BRANCHING:
             pt, stemPt = self.GetBranchingAttachmentPoint(attachment, nth)

-            return pt.x, pt.y
+            return pt[0], pt[1]

         elif self._attachmentMode == ATTACHMENT_MODE_EDGE:
             if len(self._attachmentPoints):
                 for point in self._attachmentPoints:
         elif self._attachmentMode == ATTACHMENT_MODE_EDGE:
             if len(self._attachmentPoints):
                 for point in self._attachmentPoints:


@@ -1492,10 +1511,10 @@ class Shape(ShapeEvtHandler):
             else:
                 # Assume is rectangular
                 w, h = self.GetBoundingBoxMax()
             else:
                 # Assume is rectangular
                 w, h = self.GetBoundingBoxMax()

-                top = self._ypos + h / 2
-                bottom = self._ypos - h / 2
-                left = self._xpos - w / 2
-                right = self._xpos + w / 2
+                top = self._ypos + h / 2.0
+                bottom = self._ypos - h / 2.0
+                left = self._xpos - w / 2.0
+                right = self._xpos + w / 2.0

 
                 # wtf?
                 line and line.IsEnd(self)
 
                 # wtf?
                 line and line.IsEnd(self)


@@ -1543,11 +1562,6 @@ class Shape(ShapeEvtHandler):
                 return True
         return False
 
                 return True
         return False
 

-    # Clears points from a list of wxRealPoints, and clears list
-    # Useless in python? /pi
-    def ClearPointList(self, list):
-        list = []
-

     # Assuming the attachment lies along a vertical or horizontal line,
     # calculate the position on that point.
     def CalcSimpleAttachment(self, pt1, pt2, nth, noArcs, line):
     # Assuming the attachment lies along a vertical or horizontal line,
     # calculate the position on that point.
     def CalcSimpleAttachment(self, pt1, pt2, nth, noArcs, line):


@@ -1583,7 +1597,7 @@ class Shape(ShapeEvtHandler):
         isHorizontal = RoughlyEqual(pt1[1], pt2[1])
 
         if isHorizontal:
         isHorizontal = RoughlyEqual(pt1[1], pt2[1])
 
         if isHorizontal:

-            if pt1[0]>pt2[0]:
+            if pt1[0] > pt2[0]:

                 firstPoint = pt2
                 secondPoint = pt1
             else:
                 firstPoint = pt2
                 secondPoint = pt1
             else:


@@ -1594,21 +1608,21 @@ class Shape(ShapeEvtHandler):
                 if line and line.GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE:
                     # Align line according to the next handle along
                     point = line.GetNextControlPoint(self)
                 if line and line.GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE:
                     # Align line according to the next handle along
                     point = line.GetNextControlPoint(self)

-                    if point[0]<firstPoint[0]:
+                    if point[0] < firstPoint[0]:

                         x = firstPoint[0]
                         x = firstPoint[0]

-                    elif point[0]>secondPoint[0]:
+                    elif point[0] > secondPoint[0]:

                         x = secondPoint[0]
                     else:
                         x = point[0]
                 else:
                         x = secondPoint[0]
                     else:
                         x = point[0]
                 else:

-                    x = firstPoint[0] + (nth + 1) * (secondPoint[0] - firstPoint[0]) / (noArcs + 1)
+                    x = firstPoint[0] + (nth + 1) * (secondPoint[0] - firstPoint[0]) / (noArcs + 1.0)

             else:
             else:

-                x = (secondPoint[0] - firstPoint[0]) / 2 # Midpoint
+                x = (secondPoint[0] - firstPoint[0]) / 2.0 # Midpoint

             y = pt1[1]
         else:
             assert RoughlyEqual(pt1[0], pt2[0])
 
             y = pt1[1]
         else:
             assert RoughlyEqual(pt1[0], pt2[0])
 

-            if pt1[1]>pt2[1]:
+            if pt1[1] > pt2[1]:

                 firstPoint = pt2
                 secondPoint = pt1
             else:
                 firstPoint = pt2
                 secondPoint = pt1
             else:


@@ -1619,16 +1633,16 @@ class Shape(ShapeEvtHandler):
                 if line and line.GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE:
                     # Align line according to the next handle along
                     point = line.GetNextControlPoint(self)
                 if line and line.GetAlignmentType(isEnd) == LINE_ALIGNMENT_TO_NEXT_HANDLE:
                     # Align line according to the next handle along
                     point = line.GetNextControlPoint(self)

-                    if point[1]<firstPoint[1]:
+                    if point[1] < firstPoint[1]:

                         y = firstPoint[1]
                         y = firstPoint[1]

-                    elif point[1]>secondPoint[1]:
+                    elif point[1] > secondPoint[1]:

                         y = secondPoint[1]
                     else:
                         y = point[1]
                 else:
                         y = secondPoint[1]
                     else:
                         y = point[1]
                 else:

-                    y = firstPoint[1] + (nth + 1) * (secondPoint[1] - firstPoint[1]) / (noArcs + 1)
+                    y = firstPoint[1] + (nth + 1) * (secondPoint[1] - firstPoint[1]) / (noArcs + 1.0)

             else:
             else:

-                y = (secondPoint[1] - firstPoint[1]) / 2 # Midpoint
+                y = (secondPoint[1] - firstPoint[1]) / 2.0 # Midpoint

             x = pt1[0]
 
         return x, y
             x = pt1[0]
 
         return x, y


@@ -1673,41 +1687,41 @@ class Shape(ShapeEvtHandler):
         
         # Assume that we have attachment points 0 to 3: top, right, bottom, left
         if physicalAttachment == 0:
         
         # Assume that we have attachment points 0 to 3: top, right, bottom, left
         if physicalAttachment == 0:

-            neck.x = self.GetX()
-            neck.y = root.y - self._branchNeckLength
+            neck[0] = self.GetX()
+            neck[1] = root[1] - self._branchNeckLength

 
 

-            shoulder1.x = root.x - totalBranchLength / 2
-            shoulder2.x = root.x + totalBranchLength / 2
+            shoulder1[0] = root[0] - totalBranchLength / 2.0
+            shoulder2[0] = root[0] + totalBranchLength / 2.0

 
 

-            shoulder1.y = neck.y
-            shoulder2.y = neck.y
+            shoulder1[1] = neck[1]
+            shoulder2[1] = neck[1]

         elif physicalAttachment == 1:
         elif physicalAttachment == 1:

-            neck.x = root.x + self._branchNeckLength
-            neck.y = root.y
+            neck[0] = root[0] + self._branchNeckLength
+            neck[1] = root[1]

             
             

-            shoulder1.x = neck.x
-            shoulder2.x = neck.x
+            shoulder1[0] = neck[0]
+            shoulder2[0] = neck[0]

 
 

-            shoulder1.y = neck.y - totalBranchLength / 2
-            shoulder1.y = neck.y + totalBranchLength / 2
+            shoulder1[1] = neck[1] - totalBranchLength / 2.0
+            shoulder1[1] = neck[1] + totalBranchLength / 2.0

         elif physicalAttachment == 2:
         elif physicalAttachment == 2:

-            neck.x = self.GetX()
-            neck.y = root.y + self._branchNeckLength
+            neck[0] = self.GetX()
+            neck[1] = root[1] + self._branchNeckLength

 
 

-            shoulder1.x = root.x - totalBranchLength / 2
-            shoulder2.x = root.x + totalBranchLength / 2
+            shoulder1[0] = root[0] - totalBranchLength / 2.0
+            shoulder2[0] = root[0] + totalBranchLength / 2.0

 
 

-            shoulder1.y = neck.y
-            shoulder2.y = neck.y
+            shoulder1[1] = neck[1]
+            shoulder2[1] = neck[1]

         elif physicalAttachment == 3:
         elif physicalAttachment == 3:

-            neck.x = root.x - self._branchNeckLength
-            neck.y = root.y
+            neck[0] = root[0] - self._branchNeckLength
+            neck[1] = root[1]

 
 

-            shoulder1.x = neck.x
-            shoulder2.x = neck.x
+            shoulder1[0] = neck[0]
+            shoulder2[0] = neck[0]

 
 

-            shoulder1.y = neck.y - totalBranchLength / 2
-            shoulder2.y = neck.y + totalBranchLength / 2
+            shoulder1[1] = neck[1] - totalBranchLength / 2.0
+            shoulder2[1] = neck[1] + totalBranchLength / 2.0

         else:
             raise "Unrecognised attachment point in GetBranchingAttachmentInfo"
         return root, neck, shoulder1, shoulder2
         else:
             raise "Unrecognised attachment point in GetBranchingAttachmentInfo"
         return root, neck, shoulder1, shoulder2


@@ -1720,29 +1734,29 @@ class Shape(ShapeEvtHandler):
         stemPt = wx.RealPoint()
 
         if physicalAttachment == 0:
         stemPt = wx.RealPoint()
 
         if physicalAttachment == 0:

-            pt.y = neck.y - self._branchStemLength
-            pt.x = shoulder1.x + n * self._branchSpacing
+            pt[1] = neck[1] - self._branchStemLength
+            pt[0] = shoulder1[0] + n * self._branchSpacing

 
 

-            stemPt.x = pt.x
-            stemPt.y = neck.y
+            stemPt[0] = pt[0]
+            stemPt[1] = neck[1]

         elif physicalAttachment == 2:
         elif physicalAttachment == 2:

-            pt.y = neck.y + self._branchStemLength
-            pt.x = shoulder1.x + n * self._branchStemLength
+            pt[1] = neck[1] + self._branchStemLength
+            pt[0] = shoulder1[0] + n * self._branchStemLength

             
             

-            stemPt.x = pt.x
-            stemPt.y = neck.y
+            stemPt[0] = pt[0]
+            stemPt[1] = neck[1]

         elif physicalAttachment == 1:
         elif physicalAttachment == 1:

-            pt.x = neck.x + self._branchStemLength
-            pt.y = shoulder1.y + n * self._branchSpacing
+            pt[0] = neck[0] + self._branchStemLength
+            pt[1] = shoulder1[1] + n * self._branchSpacing

 
 

-            stemPt.x = neck.x
-            stemPt.y = pt.y
+            stemPt[0] = neck[0]
+            stemPt[1] = pt[1]

         elif physicalAttachment == 3:
         elif physicalAttachment == 3:

-            pt.x = neck.x - self._branchStemLength
-            pt.y = shoulder1.y + n * self._branchSpacing
+            pt[0] = neck[0] - self._branchStemLength
+            pt[1] = shoulder1[1] + n * self._branchSpacing

 
 

-            stemPt.x = neck.x
-            stemPt.y = pt.y
+            stemPt[0] = neck[0]
+            stemPt[1] = pt[1]

         else:
             raise "Unrecognised attachment point in GetBranchingAttachmentPoint"
 
         else:
             raise "Unrecognised attachment point in GetBranchingAttachmentPoint"
 


@@ -1768,17 +1782,17 @@ class Shape(ShapeEvtHandler):
 
         # Assume that we have attachment points 0 to 3: top, right, bottom, left
         if physicalAttachment == 0:
 
         # Assume that we have attachment points 0 to 3: top, right, bottom, left
         if physicalAttachment == 0:

-            root.x = self.GetX()
-            root.y = self.GetY() - height / 2
+            root[0] = self.GetX()
+            root[1] = self.GetY() - height / 2.0

         elif physicalAttachment == 1:
         elif physicalAttachment == 1:

-            root.x = self.GetX() + width / 2
-            root.y = self.GetY()
+            root[0] = self.GetX() + width / 2.0
+            root[1] = self.GetY()

         elif physicalAttachment == 2:
         elif physicalAttachment == 2:

-            root.x = self.GetX()
-            root.y = self.GetY() + height / 2
+            root[0] = self.GetX()
+            root[1] = self.GetY() + height / 2.0

         elif physicalAttachment == 3:
         elif physicalAttachment == 3:

-            root.x = self.GetX() - width / 2
-            root.y = self.GetY()
+            root[0] = self.GetX() - width / 2.0
+            root[1] = self.GetY()

         else:
             raise "Unrecognised attachment point in GetBranchingAttachmentRoot"
 
         else:
             raise "Unrecognised attachment point in GetBranchingAttachmentRoot"
 


@@ -1800,19 +1814,19 @@ class Shape(ShapeEvtHandler):
             dc.SetBrush(wx.BLACK_BRUSH)
 
         # Draw neck
             dc.SetBrush(wx.BLACK_BRUSH)
 
         # Draw neck

-        dc.DrawLine(root, neck)
+        dc.DrawLine(root[0], root[1], neck[0], neck[1])

 
 

-        if count>1:
+        if count > 1:

             # Draw shoulder-to-shoulder line
             # Draw shoulder-to-shoulder line

-            dc.DrawLine(shoulder1, shoulder2)
+            dc.DrawLine(shoulder1[0], shoulder1[1], shoulder2[0], shoulder2[1])

         # Draw all the little branches
         for i in range(count):
             pt, stemPt = self.GetBranchingAttachmentPoint(attachment, i)
         # Draw all the little branches
         for i in range(count):
             pt, stemPt = self.GetBranchingAttachmentPoint(attachment, i)

-            dc.DrawLine(stemPt, pt)
+            dc.DrawLine(stemPt[0], stemPt[1], pt[0], pt[1])

 
 

-            if self.GetBranchStyle() & BRANCHING_ATTACHMENT_BLOB and count>1:
-                blobSize = 6
-                dc.DrawEllipse(stemPt.x - blobSize / 2, stemPt.y - blobSize / 2, blobSize, blobSize)
+            if self.GetBranchStyle() & BRANCHING_ATTACHMENT_BLOB and count > 1:
+                blobSize = 6.0
+                dc.DrawEllipse(stemPt[0] - blobSize / 2.0, stemPt[1] - blobSize / 2.0, blobSize, blobSize)

 
     def OnDrawBranches(self, dc, erase = False):
         if self._attachmentMode != ATTACHMENT_MODE_BRANCHING:
 
     def OnDrawBranches(self, dc, erase = False):
         if self._attachmentMode != ATTACHMENT_MODE_BRANCHING:


@@ -1841,17 +1855,17 @@ class Shape(ShapeEvtHandler):
         """
         if RoughlyEqual(self.GetRotation(), 0):
             i = physicalAttachment
         """
         if RoughlyEqual(self.GetRotation(), 0):
             i = physicalAttachment

-        elif RoughlyEqual(self.GetRotation(), math.pi / 2):
+        elif RoughlyEqual(self.GetRotation(), math.pi / 2.0):

             i = physicalAttachment - 1
         elif RoughlyEqual(self.GetRotation(), math.pi):
             i = physicalAttachment - 2
             i = physicalAttachment - 1
         elif RoughlyEqual(self.GetRotation(), math.pi):
             i = physicalAttachment - 2

-        elif RoughlyEqual(self.GetRotation(), 3 * math.pi / 2):
+        elif RoughlyEqual(self.GetRotation(), 3 * math.pi / 2.0):

             i = physicalAttachment - 3
         else:
             # Can't handle -- assume the same
             return physicalAttachment
 
             i = physicalAttachment - 3
         else:
             # Can't handle -- assume the same
             return physicalAttachment
 

-        if i<0:
+        if i < 0:

             i += 4
 
         return i
             i += 4
 
         return i


@@ -1862,16 +1876,16 @@ class Shape(ShapeEvtHandler):
         """
         if RoughlyEqual(self.GetRotation(), 0):
             i = logicalAttachment
         """
         if RoughlyEqual(self.GetRotation(), 0):
             i = logicalAttachment

-        elif RoughlyEqual(self.GetRotation(), math.pi / 2):
+        elif RoughlyEqual(self.GetRotation(), math.pi / 2.0):

             i = logicalAttachment + 1
         elif RoughlyEqual(self.GetRotation(), math.pi):
             i = logicalAttachment + 2
             i = logicalAttachment + 1
         elif RoughlyEqual(self.GetRotation(), math.pi):
             i = logicalAttachment + 2

-        elif RoughlyEqual(self.GetRotation(), 3 * math.pi / 2):
+        elif RoughlyEqual(self.GetRotation(), 3 * math.pi / 2.0):

             i = logicalAttachment + 3
         else:
             return logicalAttachment
 
             i = logicalAttachment + 3
         else:
             return logicalAttachment
 

-        if i>3:
+        if i > 3:

             i -= 4
 
         return i
             i -= 4
 
         return i


@@ -1879,9 +1893,9 @@ class Shape(ShapeEvtHandler):
     def Rotate(self, x, y, theta):
         """Rotate about the given axis by the given amount in radians."""
         self._rotation = theta
     def Rotate(self, x, y, theta):
         """Rotate about the given axis by the given amount in radians."""
         self._rotation = theta

-        if self._rotation<0:
+        if self._rotation < 0:

             self._rotation += 2 * math.pi
             self._rotation += 2 * math.pi

-        elif self._rotation>2 * math.pi:
+        elif self._rotation > 2 * math.pi:

             self._rotation -= 2 * math.pi
 
     def GetBackgroundPen(self):
             self._rotation -= 2 * math.pi
 
     def GetBackgroundPen(self):


@@ -2128,14 +2142,14 @@ class Shape(ShapeEvtHandler):
                 newX1 = pt._controlPointDragStartX
                 newX2 = newX1 + pt._controlPointDragStartWidth
             elif pt._type == CONTROL_POINT_DIAGONAL and (keys & KEY_SHIFT or self.GetMaintainAspectRatio()):
                 newX1 = pt._controlPointDragStartX
                 newX2 = newX1 + pt._controlPointDragStartWidth
             elif pt._type == CONTROL_POINT_DIAGONAL and (keys & KEY_SHIFT or self.GetMaintainAspectRatio()):

-                newH = (newX2 - newX1) * (pt._controlPointDragStartHeight / pt._controlPointDragStartWidth)
-                if self.GetY()>pt._controlPointDragStartY:
+                newH = (newX2 - newX1) * (float(pt._controlPointDragStartHeight) / pt._controlPointDragStartWidth)
+                if self.GetY() > pt._controlPointDragStartY:

                     newY2 = newY1 + newH
                 else:
                     newY1 = newY2 - newH
 
                     newY2 = newY1 + newH
                 else:
                     newY1 = newY2 - newH
 

-            newWidth = newX2 - newX1
-            newHeight = newY2 - newY1
+            newWidth = float(newX2 - newX1)
+            newHeight = float(newY2 - newY1)

 
             if pt._type == CONTROL_POINT_VERTICAL and self.GetMaintainAspectRatio():
                 newWidth = bound_x * (newHeight / bound_y)
 
             if pt._type == CONTROL_POINT_VERTICAL and self.GetMaintainAspectRatio():
                 newWidth = bound_x * (newHeight / bound_y)


@@ -2143,8 +2157,8 @@ class Shape(ShapeEvtHandler):
             if pt._type == CONTROL_POINT_HORIZONTAL and self.GetMaintainAspectRatio():
                 newHeight = bound_y * (newWidth / bound_x)
 
             if pt._type == CONTROL_POINT_HORIZONTAL and self.GetMaintainAspectRatio():
                 newHeight = bound_y * (newWidth / bound_x)
 

-            pt._controlPointDragPosX = newX1 + newWidth / 2
-            pt._controlPointDragPosY = newY1 + newHeight / 2
+            pt._controlPointDragPosX = newX1 + newWidth / 2.0
+            pt._controlPointDragPosY = newY1 + newHeight / 2.0

             if self.GetFixedWidth():
                 newWidth = bound_x
 
             if self.GetFixedWidth():
                 newWidth = bound_x
 


@@ -2164,24 +2178,24 @@ class Shape(ShapeEvtHandler):
         dc.SetLogicalFunction(OGLRBLF)
 
         bound_x, bound_y = self.GetBoundingBoxMin()
         dc.SetLogicalFunction(OGLRBLF)
 
         bound_x, bound_y = self.GetBoundingBoxMin()

-        self.GetEventHandler().OnEndSize(bound_x, bound_y)
+        self.GetEventHandler().OnBeginSize(bound_x, bound_y)

 
         # Choose the 'opposite corner' of the object as the stationary
         # point in case this is non-centring resizing.
 
         # Choose the 'opposite corner' of the object as the stationary
         # point in case this is non-centring resizing.

-        if pt.GetX()<self.GetX():
-            pt._controlPointDragStartX = self.GetX() + bound_x / 2
+        if pt.GetX() < self.GetX():
+            pt._controlPointDragStartX = self.GetX() + bound_x / 2.0

         else:
         else:

-            pt._controlPointDragStartX = self.GetX() - bound_x / 2
+            pt._controlPointDragStartX = self.GetX() - bound_x / 2.0

 
 

-        if pt.GetY()<self.GetY():
-            pt._controlPointDragStartY = self.GetY() + bound_y / 2
+        if pt.GetY() < self.GetY():
+            pt._controlPointDragStartY = self.GetY() + bound_y / 2.0

         else:
         else:

-            pt._controlPointDragStartY = self.GetY() - bound_y / 2
+            pt._controlPointDragStartY = self.GetY() - bound_y / 2.0

 
         if pt._type == CONTROL_POINT_HORIZONTAL:
 
         if pt._type == CONTROL_POINT_HORIZONTAL:

-            pt._controlPointDragStartY = self.GetY() - bound_y / 2
+            pt._controlPointDragStartY = self.GetY() - bound_y / 2.0

         elif pt._type == CONTROL_POINT_VERTICAL:
         elif pt._type == CONTROL_POINT_VERTICAL:

-            pt._controlPointDragStartX = self.GetX() - bound_x / 2
+            pt._controlPointDragStartX = self.GetX() - bound_x / 2.0

 
         # We may require the old width and height
         pt._controlPointDragStartWidth = bound_x
 
         # We may require the old width and height
         pt._controlPointDragStartWidth = bound_x


@@ -2230,15 +2244,15 @@ class Shape(ShapeEvtHandler):
             elif pt._type == CONTROL_POINT_VERTICAL:
                 newX1 = pt._controlPointDragStartX
                 newX2 = newX1 + pt._controlPointDragStartWidth
             elif pt._type == CONTROL_POINT_VERTICAL:
                 newX1 = pt._controlPointDragStartX
                 newX2 = newX1 + pt._controlPointDragStartWidth

-            elif pt._type == CONTROL_POINT_DIAGONAL and (keys & KEYS or self.GetMaintainAspectRatio()):
-                newH = (newX2 - newX1) * (pt._controlPointDragStartHeight / pt._controlPointDragStartWidth)
-                if pt.GetY()>pt._controlPointDragStartY:
+            elif pt._type == CONTROL_POINT_DIAGONAL and (keys & KEY_SHIFT or self.GetMaintainAspectRatio()):
+                newH = (newX2 - newX1) * (float(pt._controlPointDragStartHeight) / pt._controlPointDragStartWidth)
+                if pt.GetY() > pt._controlPointDragStartY:

                     newY2 = newY1 + newH
                 else:
                     newY1 = newY2 - newH
 
                     newY2 = newY1 + newH
                 else:
                     newY1 = newY2 - newH
 

-            newWidth = newX2 - newX1
-            newHeight = newY2 - newY1
+            newWidth = float(newX2 - newX1)
+            newHeight = float(newY2 - newY1)

 
             if pt._type == CONTROL_POINT_VERTICAL and self.GetMaintainAspectRatio():
                 newWidth = bound_x * (newHeight / bound_y)
 
             if pt._type == CONTROL_POINT_VERTICAL and self.GetMaintainAspectRatio():
                 newWidth = bound_x * (newHeight / bound_y)


@@ -2246,8 +2260,8 @@ class Shape(ShapeEvtHandler):
             if pt._type == CONTROL_POINT_HORIZONTAL and self.GetMaintainAspectRatio():
                 newHeight = bound_y * (newWidth / bound_x)
 
             if pt._type == CONTROL_POINT_HORIZONTAL and self.GetMaintainAspectRatio():
                 newHeight = bound_y * (newWidth / bound_x)
 

-            pt._controlPointDragPosX = newX1 + newWidth / 2
-            pt._controlPointDragPosY = newY1 + newHeight / 2
+            pt._controlPointDragPosX = newX1 + newWidth / 2.0
+            pt._controlPointDragPosY = newY1 + newHeight / 2.0

             if self.GetFixedWidth():
                 newWidth = bound_x
 
             if self.GetFixedWidth():
                 newWidth = bound_x
 


@@ -2285,7 +2299,7 @@ class Shape(ShapeEvtHandler):
 
         # Recursively redraw links if we have a composite
         if len(self.GetChildren()):
 
         # Recursively redraw links if we have a composite
         if len(self.GetChildren()):

-            self.DrawLinks(dc,-1, True)
+            self.DrawLinks(dc, -1, True)

 
         width, height = self.GetBoundingBoxMax()
         self.GetEventHandler().OnEndSize(width, height)
 
         width, height = self.GetBoundingBoxMax()
         self.GetEventHandler().OnEndSize(width, height)


@@ -2310,8 +2324,8 @@ class RectangleShape(Shape):
         self.SetDefaultRegionSize()
 
     def OnDraw(self, dc):
         self.SetDefaultRegionSize()
 
     def OnDraw(self, dc):

-        x1 = self._xpos - self._width / 2
-        y1 = self._ypos - self._height / 2
+        x1 = self._xpos - self._width / 2.0
+        y1 = self._ypos - self._height / 2.0

 
         if self._shadowMode != SHADOW_NONE:
             if self._shadowBrush:
 
         if self._shadowMode != SHADOW_NONE:
             if self._shadowBrush:


@@ -2440,20 +2454,20 @@ class PolygonShape(Shape):
     def CalculateBoundingBox(self):
         # Calculate bounding box at construction (and presumably resize) time
         left = 10000
     def CalculateBoundingBox(self):
         # Calculate bounding box at construction (and presumably resize) time
         left = 10000

-        right=-10000
+        right = -10000

         top = 10000
         top = 10000

-        bottom=-10000
+        bottom = -10000

 
         for point in self._points:
 
         for point in self._points:

-            if point.x<left:
-                left = point.x
-            if point.x>right:
-                right = point.x
+            if point[0] < left:
+                left = point[0]
+            if point[0] > right:
+                right = point[0]

 
 

-            if point.y<top:
-                top = point.y
-            if point.y>bottom:
-                bottom = point.y
+            if point[1] < top:
+                top = point[1]
+            if point[1] > bottom:
+                bottom = point[1]

 
         self._boundWidth = right - left
         self._boundHeight = bottom - top
 
         self._boundWidth = right - left
         self._boundHeight = bottom - top


@@ -2466,30 +2480,29 @@ class PolygonShape(Shape):
         box.
         """
         left = 10000
         box.
         """
         left = 10000

-        right=-10000
+        right = -10000

         top = 10000
         top = 10000

-        bottom=-10000
+        bottom = -10000

 
         for point in self._points:
 
         for point in self._points:

-            if point.x<left:
-                left = point.x
-            if point.x>right:
-                right = point.x
+            if point[0] < left:
+                left = point[0]
+            if point[0] > right:
+                right = point[0]

 
 

-            if point.y<top:
-                top = point.y
-            if point.y>bottom:
-                bottom = point.y
+            if point[1] < top:
+                top = point[1]
+            if point[1] > bottom:
+                bottom = point[1]

 
         bwidth = right - left
         bheight = bottom - top
 
 
         bwidth = right - left
         bheight = bottom - top
 

-        newCentreX = left + bwidth / 2
-        newCentreY = top + bheight / 2
+        newCentreX = left + bwidth / 2.0
+        newCentreY = top + bheight / 2.0

 
 

-        for point in self._points:
-            point.x -= newCentreX
-            point.y -= newCentreY
+        for i in range(len(self._points)):
+            self._points[i] = self._points[i][0] - newCentreX, self._points[i][1] - newCentreY

         self._xpos += newCentreX
         self._ypos += newCentreY
 
         self._xpos += newCentreX
         self._ypos += newCentreY
 


@@ -2505,8 +2518,8 @@ class PolygonShape(Shape):
         ypoints = []
 
         for point in self._points:
         ypoints = []
 
         for point in self._points:

-            xpoints.append(point.x + self._xpos)
-            ypoints.append(point.y + self._ypos)
+            xpoints.append(point[0] + self._xpos)
+            ypoints.append(point[1] + self._ypos)

 
         # We assume it's inside the polygon UNLESS one or more
         # lines don't hit the outline.
 
         # We assume it's inside the polygon UNLESS one or more
         # lines don't hit the outline.


@@ -2529,7 +2542,7 @@ class PolygonShape(Shape):
             if e:
                 xp, yp = e
                 l = math.sqrt((xp - x) * (xp - x) + (yp - y) * (yp - y))
             if e:
                 xp, yp = e
                 l = math.sqrt((xp - x) * (xp - x) + (yp - y) * (yp - y))

-                if l<nearest:
+                if l < nearest:

                     nearest = l
                     nearest_attachment = i
 
                     nearest = l
                     nearest_attachment = i
 


@@ -2541,12 +2554,11 @@ class PolygonShape(Shape):
         self.SetAttachmentSize(new_width, new_height)
 
         # Multiply all points by proportion of new size to old size
         self.SetAttachmentSize(new_width, new_height)
 
         # Multiply all points by proportion of new size to old size

-        x_proportion = abs(new_width / self._originalWidth)
-        y_proportion = abs(new_height / self._originalHeight)
+        x_proportion = abs(float(new_width) / self._originalWidth)
+        y_proportion = abs(float(new_height) / self._originalHeight)

 
         for i in range(max(len(self._points), len(self._originalPoints))):
 
         for i in range(max(len(self._points), len(self._originalPoints))):

-            self._points[i].x = self._originalPoints[i][0] * x_proportion
-            self._points[i].y = self._originalPoints[i][1] * y_proportion
+            self._points[i] = wx.Point(self._originalPoints[i][0] * x_proportion, self._originalPoints[i][1] * y_proportion)

 
         self._boundWidth = abs(new_width)
         self._boundHeight = abs(new_height)
 
         self._boundWidth = abs(new_width)
         self._boundHeight = abs(new_height)


@@ -2560,7 +2572,7 @@ class PolygonShape(Shape):
         self._originalPoints = []
 
         for point in self._points:
         self._originalPoints = []
 
         for point in self._points:

-            original_point = wx.RealPoint(point.x, point.y)
+            original_point = wx.RealPoint(point[0], point[1])

             self._originalPoints.append(original_point)
 
         self.CalculateBoundingBox()
             self._originalPoints.append(original_point)
 
         self.CalculateBoundingBox()


@@ -2579,8 +2591,8 @@ class PolygonShape(Shape):
         except ValueError:
             secondPoint = self._points[0]
 
         except ValueError:
             secondPoint = self._points[0]
 

-        x = (secondPoint.x - firstPoint.x) / 2 + firstPoint.x
-        y = (secondPoint.y - firstPoint.y) / 2 + firstPoint.y
+        x = (secondPoint[0] - firstPoint[0]) / 2.0 + firstPoint[0]
+        y = (secondPoint[1] - firstPoint[1]) / 2.0 + firstPoint[1]

         point = wx.RealPoint(x, y)
 
         if pos >= len(self._points) - 1:
         point = wx.RealPoint(x, y)
 
         if pos >= len(self._points) - 1:


@@ -2596,7 +2608,7 @@ class PolygonShape(Shape):
 
     def DeletePolygonPoint(self, pos):
         """Delete the given control point."""
 
     def DeletePolygonPoint(self, pos):
         """Delete the given control point."""

-        if pos<len(self._points):
+        if pos < len(self._points):

             del self._points[pos]
             self.UpdateOriginalPoints()
             if self._selected:
             del self._points[pos]
             self.UpdateOriginalPoints()
             if self._selected:


@@ -2613,17 +2625,17 @@ class PolygonShape(Shape):
             # Look for the point we'd be connecting to. This is
             # a heuristic...
             for point in self._points:
             # Look for the point we'd be connecting to. This is
             # a heuristic...
             for point in self._points:

-                if point.x == 0:
-                    if y2>y1 and point.y>0:
-                        return point.x + self._xpos, point.y + self._ypos
-                    elif y2<y1 and point.y<0:
-                        return point.x + self._xpos, point.y + self._ypos
+                if point[0] == 0:
+                    if y2 > y1 and point[1] > 0:
+                        return point[0] + self._xpos, point[1] + self._ypos
+                    elif y2 < y1 and point[1] < 0:
+                        return point[0] + self._xpos, point[1] + self._ypos

 
         xpoints = []
         ypoints = []
         for point in self._points:
 
         xpoints = []
         ypoints = []
         for point in self._points:

-            xpoints.append(point.x + self._xpos)
-            ypoints.append(point.y + self._ypos)
+            xpoints.append(point[0] + self._xpos)
+            ypoints.append(point[1] + self._ypos)

 
         return FindEndForPolyline(xpoints, ypoints, x1, y1, x2, y2)
 
 
         return FindEndForPolyline(xpoints, ypoints, x1, y1, x2, y2)
 


@@ -2647,8 +2659,8 @@ class PolygonShape(Shape):
     def OnDrawOutline(self, dc, x, y, w, h):
         dc.SetBrush(wx.TRANSPARENT_BRUSH)
         # Multiply all points by proportion of new size to old size
     def OnDrawOutline(self, dc, x, y, w, h):
         dc.SetBrush(wx.TRANSPARENT_BRUSH)
         # Multiply all points by proportion of new size to old size

-        x_proportion = abs(w / self._originalWidth)
-        y_proportion = abs(h / self._originalHeight)
+        x_proportion = abs(float(w) / self._originalWidth)
+        y_proportion = abs(float(h) / self._originalHeight)

 
         intPoints = []
         for point in self._originalPoints:
 
         intPoints = []
         for point in self._originalPoints:


@@ -2658,35 +2670,35 @@ class PolygonShape(Shape):
     # Make as many control points as there are vertices
     def MakeControlPoints(self):
         for point in self._points:
     # Make as many control points as there are vertices
     def MakeControlPoints(self):
         for point in self._points:

-            control = PolygonControlPoint(self._canvas, self, CONTROL_POINT_SIZE, point, point.x, point.y)
+            control = PolygonControlPoint(self._canvas, self, CONTROL_POINT_SIZE, point, point[0], point[1])

             self._canvas.AddShape(control)
             self._controlPoints.append(control)
 
     def ResetControlPoints(self):
         for i in range(min(len(self._points), len(self._controlPoints))):
             point = self._points[i]
             self._canvas.AddShape(control)
             self._controlPoints.append(control)
 
     def ResetControlPoints(self):
         for i in range(min(len(self._points), len(self._controlPoints))):
             point = self._points[i]

-            self._controlPoints[i]._xoffset = point.x
-            self._controlPoints[i]._yoffset = point.y
+            self._controlPoints[i]._xoffset = point[0]
+            self._controlPoints[i]._yoffset = point[1]

             self._controlPoints[i].polygonVertex = point
 
     def GetNumberOfAttachments(self):
         maxN = max(len(self._points) - 1, 0)
         for point in self._attachmentPoints:
             self._controlPoints[i].polygonVertex = point
 
     def GetNumberOfAttachments(self):
         maxN = max(len(self._points) - 1, 0)
         for point in self._attachmentPoints:

-            if point._id>maxN:
+            if point._id > maxN:

                 maxN = point._id
         return maxN + 1
 
     def GetAttachmentPosition(self, attachment, nth = 0, no_arcs = 1, line = None):
                 maxN = point._id
         return maxN + 1
 
     def GetAttachmentPosition(self, attachment, nth = 0, no_arcs = 1, line = None):

-        if self._attachmentMode == ATTACHMENT_MODE_EDGE and self._points and attachment<len(self._points):
+        if self._attachmentMode == ATTACHMENT_MODE_EDGE and self._points and attachment < len(self._points):

             point = self._points[0]
             point = self._points[0]

-            return point.x + self._xpos, point.y + self._ypos
+            return point[0] + self._xpos, point[1] + self._ypos

         return Shape.GetAttachmentPosition(self, attachment, nth, no_arcs, line)
 
     def AttachmentIsValid(self, attachment):
         if not self._points:
             return False
 
         return Shape.GetAttachmentPosition(self, attachment, nth, no_arcs, line)
 
     def AttachmentIsValid(self, attachment):
         if not self._points:
             return False
 

-        if attachment >= 0 and attachment<len(self._points):
+        if attachment >= 0 and attachment < len(self._points):

             return True
 
         for point in self._attachmentPoints:
             return True
 
         for point in self._attachmentPoints:


@@ -2710,20 +2722,20 @@ class PolygonShape(Shape):
             point._x = x1 * cosTheta - y1 * sinTheta + x * (1 - cosTheta) + y * sinTheta
             point._y = x1 * sinTheta + y1 * cosTheta + y * (1 - cosTheta) + x * sinTheta
 
             point._x = x1 * cosTheta - y1 * sinTheta + x * (1 - cosTheta) + y * sinTheta
             point._y = x1 * sinTheta + y1 * cosTheta + y * (1 - cosTheta) + x * sinTheta
 

-        for point in self._points:
-            x1 = point.x
-            y1 = point.y
+        for i in range(len(self._points)):
+            x1, y1 = self._points[i]

 
 

-            point.x = x1 * cosTheta - y1 * sinTheta + x * (1 - cosTheta) + y * sinTheta
-            point.y = x1 * sinTheta + y1 * cosTheta + y * (1 - cosTheta) + x * sinTheta
+            self._points[i] = x1 * cosTheta - y1 * sinTheta + x * (1 - cosTheta) + y * sinTheta, x1 * sinTheta + y1 * cosTheta + y * (1 - cosTheta) + x * sinTheta

 
 

-        for point in self._originalPoints:
-            x1 = point.x
-            y1 = point.y
+        for i in range(len(self._originalPoints)):
+            x1, y1 = self._originalPoints[i]

 
 

-            point.x = x1 * cosTheta - y1 * sinTheta + x * (1 - cosTheta) + y * sinTheta
-            point.y = x1 * sinTheta + y1 * cosTheta + y * (1 - cosTheta) + x * sinTheta
+            self._originalPoints[i] = x1 * cosTheta - y1 * sinTheta + x * (1 - cosTheta) + y * sinTheta, x1 * sinTheta + y1 * cosTheta + y * (1 - cosTheta) + x * sinTheta

 
 

+        # Added by Pierre Hjälm. If we don't do this the outline will be
+        # the wrong size. Hopefully it won't have any ill effects.
+        self.UpdateOriginalPoints()
+        

         self._rotation = theta
 
         self.CalculatePolygonCentre()
         self._rotation = theta
 
         self.CalculatePolygonCentre()


@@ -2746,7 +2758,7 @@ class PolygonShape(Shape):
         
         pt.CalculateNewSize(x, y)
 
         
         pt.CalculateNewSize(x, y)
 

-        self.GetEventHandler().OnDrawOutline(dc, self.GetX(), self.GetY(), pt.GetNewSize().x, pt.GetNewSize().y)
+        self.GetEventHandler().OnDrawOutline(dc, self.GetX(), self.GetY(), pt.GetNewSize()[0], pt.GetNewSize()[1])

 
     def OnSizingBeginDragLeft(self, pt, x, y, keys = 0, attachment = 0):
         dc = wx.ClientDC(self.GetCanvas())
 
     def OnSizingBeginDragLeft(self, pt, x, y, keys = 0, attachment = 0):
         dc = wx.ClientDC(self.GetCanvas())


@@ -2761,8 +2773,8 @@ class PolygonShape(Shape):
         dist = math.sqrt((x - self.GetX()) * (x - self.GetX()) + (y - self.GetY()) * (y - self.GetY()))
 
         pt._originalDistance = dist
         dist = math.sqrt((x - self.GetX()) * (x - self.GetX()) + (y - self.GetY()) * (y - self.GetY()))
 
         pt._originalDistance = dist

-        pt._originalSize.x = bound_x
-        pt._originalSize.y = bound_y
+        pt._originalSize[0] = bound_x
+        pt._originalSize[1] = bound_y

 
         if pt._originalDistance == 0:
             pt._originalDistance = 0.0001
 
         if pt._originalDistance == 0:
             pt._originalDistance = 0.0001


@@ -2775,7 +2787,7 @@ class PolygonShape(Shape):
 
         pt.CalculateNewSize(x, y)
 
 
         pt.CalculateNewSize(x, y)
 

-        self.GetEventHandler().OnDrawOutline(dc, self.GetX(), self.GetY(), pt.GetNewSize().x, pt.GetNewSize().y)
+        self.GetEventHandler().OnDrawOutline(dc, self.GetX(), self.GetY(), pt.GetNewSize()[0], pt.GetNewSize()[1])

 
         self._canvas.CaptureMouse()
 
 
         self._canvas.CaptureMouse()
 


@@ -2792,7 +2804,7 @@ class PolygonShape(Shape):
             self.CalculateBoundingBox()
             self.CalculatePolygonCentre()
         else:
             self.CalculateBoundingBox()
             self.CalculatePolygonCentre()
         else:

-            self.SetSize(pt.GetNewSize().x, pt.GetNewSize().y)
+            self.SetSize(pt.GetNewSize()[0], pt.GetNewSize()[1])

 
         self.Recompute()
         self.ResetControlPoints()
 
         self.Recompute()
         self.ResetControlPoints()


@@ -2840,8 +2852,8 @@ class EllipseShape(Shape):
             if self._shadowBrush:
                 dc.SetBrush(self._shadowBrush)
             dc.SetPen(TransparentPen)
             if self._shadowBrush:
                 dc.SetBrush(self._shadowBrush)
             dc.SetPen(TransparentPen)

-            dc.DrawEllipse(self._xpos - self.GetWidth() / 2 + self._shadowOffsetX,
-                           self._ypos - self.GetHeight() / 2 + self._shadowOffsetY,
+            dc.DrawEllipse(self._xpos - self.GetWidth() / 2.0 + self._shadowOffsetX,
+                           self._ypos - self.GetHeight() / 2.0 + self._shadowOffsetY,

                            self.GetWidth(), self.GetHeight())
 
         if self._pen:
                            self.GetWidth(), self.GetHeight())
 
         if self._pen:


@@ -2851,7 +2863,7 @@ class EllipseShape(Shape):
                 dc.SetPen(self._pen)
         if self._brush:
             dc.SetBrush(self._brush)
                 dc.SetPen(self._pen)
         if self._brush:
             dc.SetBrush(self._brush)

-        dc.DrawEllipse(self._xpos - self.GetWidth() / 2, self._ypos - self.GetHeight() / 2, self.GetWidth(), self.GetHeight())
+        dc.DrawEllipse(self._xpos - self.GetWidth() / 2.0, self._ypos - self.GetHeight() / 2.0, self.GetWidth(), self.GetHeight())

 
     def SetSize(self, x, y, recursive = True):
         self.SetAttachmentSize(x, y)
 
     def SetSize(self, x, y, recursive = True):
         self.SetAttachmentSize(x, y)


@@ -2869,35 +2881,35 @@ class EllipseShape(Shape):
             return Shape.GetAttachmentPosition(self, attachment, nth, no_arcs, line)
 
         if self._attachmentMode != ATTACHMENT_MODE_NONE:
             return Shape.GetAttachmentPosition(self, attachment, nth, no_arcs, line)
 
         if self._attachmentMode != ATTACHMENT_MODE_NONE:

-            top = self._ypos + self._height / 2
-            bottom = self._ypos - self._height / 2
-            left = self._xpos - self._width / 2
-            right = self._xpos + self._width / 2
+            top = self._ypos + self._height / 2.0
+            bottom = self._ypos - self._height / 2.0
+            left = self._xpos - self._width / 2.0
+            right = self._xpos + self._width / 2.0

 
             physicalAttachment = self.LogicalToPhysicalAttachment(attachment)
 
             if physicalAttachment == 0:
                 if self._spaceAttachments:
 
             physicalAttachment = self.LogicalToPhysicalAttachment(attachment)
 
             if physicalAttachment == 0:
                 if self._spaceAttachments:

-                    x = left + (nth + 1) * self._width / (no_arcs + 1)
+                    x = left + (nth + 1) * self._width / (no_arcs + 1.0)

                 else:
                     x = self._xpos
                 y = top
                 # We now have the point on the bounding box: but get the point
                 # on the ellipse by imagining a vertical line from
                 else:
                     x = self._xpos
                 y = top
                 # We now have the point on the bounding box: but get the point
                 # on the ellipse by imagining a vertical line from

-                # (x, self._ypos - self_height - 500) to (x, self._ypos) intersecting
+                # (x, self._ypos - self._height - 500) to (x, self._ypos) intersecting

                 # the ellipse.
 
                 return DrawArcToEllipse(self._xpos, self._ypos, self._width, self._height, x, self._ypos - self._height - 500, x, self._ypos)
             elif physicalAttachment == 1:
                 x = right
                 if self._spaceAttachments:
                 # the ellipse.
 
                 return DrawArcToEllipse(self._xpos, self._ypos, self._width, self._height, x, self._ypos - self._height - 500, x, self._ypos)
             elif physicalAttachment == 1:
                 x = right
                 if self._spaceAttachments:

-                    y = bottom + (nth + 1) * self._height / (no_arcs + 1)
+                    y = bottom + (nth + 1) * self._height / (no_arcs + 1.0)

                 else:
                     y = self._ypos
                 return DrawArcToEllipse(self._xpos, self._ypos, self._width, self._height, self._xpos + self._width + 500, y, self._xpos, y)
             elif physicalAttachment == 2:
                 if self._spaceAttachments:
                 else:
                     y = self._ypos
                 return DrawArcToEllipse(self._xpos, self._ypos, self._width, self._height, self._xpos + self._width + 500, y, self._xpos, y)
             elif physicalAttachment == 2:
                 if self._spaceAttachments:

-                    x = left + (nth + 1) * self._width / (no_arcs + 1)
+                    x = left + (nth + 1) * self._width / (no_arcs + 1.0)

                 else:
                     x = self._xpos
                 y = bottom
                 else:
                     x = self._xpos
                 y = bottom


@@ -2905,7 +2917,7 @@ class EllipseShape(Shape):
             elif physicalAttachment == 3:
                 x = left
                 if self._spaceAttachments:
             elif physicalAttachment == 3:
                 x = left
                 if self._spaceAttachments:

-                    y = bottom + (nth + 1) * self._height / (no_arcs + 1)
+                    y = bottom + (nth + 1) * self._height / (no_arcs + 1.0)

                 else:
                     y = self._ypos
                 return DrawArcToEllipse(self._xpos, self._ypos, self._width, self._height, self._xpos - self._width - 500, y, self._xpos, y)
                 else:
                     y = self._ypos
                 return DrawArcToEllipse(self._xpos, self._ypos, self._width, self._height, self._xpos - self._width - 500, y, self._xpos, y)


@@ -2923,7 +2935,7 @@ class CircleShape(EllipseShape):
         self.SetMaintainAspectRatio(True)
 
     def GetPerimeterPoint(self, x1, y1, x2, y2):
         self.SetMaintainAspectRatio(True)
 
     def GetPerimeterPoint(self, x1, y1, x2, y2):

-        return FindEndForCircle(self._width / 2, self._xpos, self._ypos, x2, y2)
+        return FindEndForCircle(self._width / 2.0, self._xpos, self._ypos, x2, y2)

 
 
 
 
 
 


@@ -2966,7 +2978,7 @@ class ShapeRegion(object):
                 new_line = ShapeTextLine(line.GetX(), line.GetY(), line.GetText())
                 self._formattedText.append(new_line)
         else:
                 new_line = ShapeTextLine(line.GetX(), line.GetY(), line.GetText())
                 self._formattedText.append(new_line)
         else:

-            self._regionText=""
+            self._regionText = ""

             self._font = NormalFont
             self._minHeight = 5.0
             self._minWidth = 5.0
             self._font = NormalFont
             self._minHeight = 5.0
             self._minWidth = 5.0


@@ -2975,12 +2987,12 @@ class ShapeRegion(object):
             self._x = 0.0
             self._y = 0.0
 
             self._x = 0.0
             self._y = 0.0
 

-            self._regionProportionX=-1.0
-            self._regionProportionY=-1.0
+            self._regionProportionX = -1.0
+            self._regionProportionY = -1.0

             self._formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT
             self._formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT

-            self._regionName=""
-            self._textColour="BLACK"
-            self._penColour="BLACK"
+            self._regionName = ""
+            self._textColour = "BLACK"
+            self._penColour = "BLACK"

             self._penStyle = wx.SOLID
             self._actualColourObject = wx.TheColourDatabase.Find("BLACK")
             self._actualPenObject = None
             self._penStyle = wx.SOLID
             self._actualColourObject = wx.TheColourDatabase.Find("BLACK")
             self._actualPenObject = None


@@ -3035,7 +3047,7 @@ class ShapeRegion(object):
             return None
         if self._penColour=="Invisible":
             return None
             return None
         if self._penColour=="Invisible":
             return None

-        self._actualPenObject = wx.ThePenList.FindOrCreatePen(self._penColour, 1, self._penStyle)
+        self._actualPenObject = wx.Pen(self._penColour, 1, self._penStyle)

         return self._actualPenObject
 
     def SetText(self, s):
         return self._actualPenObject
 
     def SetText(self, s):


@@ -3155,8 +3167,8 @@ class PolygonControlPoint(ControlPoint):
         bound_x, bound_y = self.GetShape().GetBoundingBoxMax()
         dist = math.sqrt((x - self._shape.GetX()) * (x - self._shape.GetX()) + (y - self._shape.GetY()) * (y - self._shape.GetY()))
 
         bound_x, bound_y = self.GetShape().GetBoundingBoxMax()
         dist = math.sqrt((x - self._shape.GetX()) * (x - self._shape.GetX()) + (y - self._shape.GetY()) * (y - self._shape.GetY()))
 

-        self._newSize.x = dist / self._originalDistance * self._originalSize.x
-        self._newSize.y = dist / self._originalDistance * self._originalSize.y
+        self._newSize[0] = dist / self._originalDistance * self._originalSize[0]
+        self._newSize[1] = dist / self._originalDistance * self._originalSize[1]

 
     # Implement resizing polygon or moving the vertex
     def OnDragLeft(self, draw, x, y, keys = 0, attachment = 0):
 
     # Implement resizing polygon or moving the vertex
     def OnDragLeft(self, draw, x, y, keys = 0, attachment = 0):