return correct client area for at least the primary display, fixes the problems with...

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

diff --git a/wxPython/wx/lib/ogl/_lines.py b/wxPython/wx/lib/ogl/_lines.py
index 80fccc8c094042bacf328214a4bdb49790b46592..d4da07dbd23e2ec6fcb7eb39ba03136641353e81 100644 (file)
--- a/wxPython/wx/lib/ogl/_lines.py
+++ b/wxPython/wx/lib/ogl/_lines.py
@@ -14,7 +14,7 @@
 import sys
 import math
 
 import sys
 import math
 

-from _basic import Shape, ShapeRegion, ControlPoint, RectangleShape
+from _basic import Shape, ShapeRegion, ShapeTextLine, ControlPoint, RectangleShape

 from _oglmisc import *
 
 # Line alignment flags
 from _oglmisc import *
 
 # Line alignment flags


@@ -131,7 +131,7 @@ class LabelShape(RectangleShape):
         RectangleShape.__init__(self, w, h)
         self._lineShape = parent
         self._shapeRegion = region
         RectangleShape.__init__(self, w, h)
         self._lineShape = parent
         self._shapeRegion = region

-        self.SetPen(wx.ThePenList.FindOrCreatePen(wx.Colour(0, 0, 0), 1, wx.DOT))
+        self.SetPen(wx.Pen(wx.Colour(0, 0, 0), 1, wx.DOT))

 
     def OnDraw(self, dc):
         if self._lineShape and not self._lineShape.GetDrawHandles():
 
     def OnDraw(self, dc):
         if self._lineShape and not self._lineShape.GetDrawHandles():


@@ -220,7 +220,6 @@ class LineShape(Shape):
 
     def __del__(self):
         if self._lineControlPoints:
 
     def __del__(self):
         if self._lineControlPoints:

-            self.ClearPointList(self._lineControlPoints)

             self._lineControlPoints = []
         for i in range(3):
             if self._labelObjects[i]:
             self._lineControlPoints = []
         for i in range(3):
             if self._labelObjects[i]:


@@ -289,8 +288,6 @@ class LineShape(Shape):
 
     def MakeLineControlPoints(self, n):
         """Make a given number of control points (minimum of two)."""
 
     def MakeLineControlPoints(self, n):
         """Make a given number of control points (minimum of two)."""

-        if self._lineControlPoints:
-            self.ClearPointList(self._lineControlPoints)

         self._lineControlPoints = []
         
         for _ in range(n):
         self._lineControlPoints = []
         
         for _ in range(n):


@@ -301,19 +298,22 @@ class LineShape(Shape):
         # the middle points to something other than (-999, -999)
         self._initialised = False
         
         # the middle points to something other than (-999, -999)
         self._initialised = False
         

-    def InsertLineControlPoint(self, dc = None):
-        """Insert a control point at an arbitrary position."""
+    def InsertLineControlPoint(self, dc = None, point = None):
+        """Insert a control point at an optional given position."""

         if dc:
             self.Erase(dc)
 
         if dc:
             self.Erase(dc)
 

-        last_point = self._lineControlPoints[-1]
-        second_last_point = self._lineControlPoints[-2]
+        if point:
+            line_x, line_y = point
+        else:
+            last_point = self._lineControlPoints[-1]
+            second_last_point = self._lineControlPoints[-2]

 
 

-        line_x = (last_point[0] + second_last_point[0]) / 2.0
-        line_y = (last_point[1] + second_last_point[1]) / 2.0
+            line_x = (last_point[0] + second_last_point[0]) / 2.0
+            line_y = (last_point[1] + second_last_point[1]) / 2.0

 
         point = wx.RealPoint(line_x, line_y)
 
         point = wx.RealPoint(line_x, line_y)

-        self._lineControlPoints.insert(len(self._lineControlPoints), point)
+        self._lineControlPoints.insert(len(self._lineControlPoints)-1, point)

 
     def DeleteLineControlPoint(self):
         """Delete an arbitary point on the line."""
 
     def DeleteLineControlPoint(self):
         """Delete an arbitary point on the line."""


@@ -350,7 +350,7 @@ class LineShape(Shape):
                         y2 = first_point[1]
                         y1 = last_point[1]
                     self._lineControlPoints[i] = wx.RealPoint((x2 - x1) / 2.0 + x1, (y2 - y1) / 2.0 + y1)
                         y2 = first_point[1]
                         y1 = last_point[1]
                     self._lineControlPoints[i] = wx.RealPoint((x2 - x1) / 2.0 + x1, (y2 - y1) / 2.0 + y1)

-                    self._initialised = True
+            self._initialised = True

                     
     def FormatText(self, dc, s, i):
         """Format a text string according to the region size, adding
                     
     def FormatText(self, dc, s, i):
         """Format a text string according to the region size, adding


@@ -1027,7 +1027,7 @@ class LineShape(Shape):
         # Problem with pen - if not a solid pen, does strange things
         # to the arrowhead. So make (get) a new pen that's solid.
         if self._pen and self._pen.GetStyle() != wx.SOLID:
         # Problem with pen - if not a solid pen, does strange things
         # to the arrowhead. So make (get) a new pen that's solid.
         if self._pen and self._pen.GetStyle() != wx.SOLID:

-            solid_pen = wx.ThePenList.FindOrCreatePen(self._pen.GetColour(), 1, wx.SOLID)
+            solid_pen = wx.Pen(self._pen.GetColour(), 1, wx.SOLID)

             if solid_pen:
                 dc.SetPen(solid_pen)
 
             if solid_pen:
                 dc.SetPen(solid_pen)
 


@@ -1378,7 +1378,7 @@ class LineShape(Shape):
         """
         for arrow in self._arcArrows:
             if (position == -1 or position == arrow.GetArrowEnd()) and arrow.GetName() == name:
         """
         for arrow in self._arcArrows:
             if (position == -1 or position == arrow.GetArrowEnd()) and arrow.GetName() == name:

-                return arow
+                return arrow

 
         return None
 
 
         return None
 


@@ -1514,12 +1514,7 @@ class LineShape(Shape):
         labelShape._shapeRegion.SetSize(labelShape.GetWidth(), labelShape.GetHeight())
 
         # Find position in line's region list
         labelShape._shapeRegion.SetSize(labelShape.GetWidth(), labelShape.GetHeight())
 
         # Find position in line's region list

-        i = 0
-        for region in self.GetRegions():
-            if labelShape._shapeRegion == region:
-                self.GetRegions().remove(region)
-            else:
-                i += 1
+        i = self._regions.index(labelShape._shapeRegion)

                 
         xx, yy = self.GetLabelPosition(i)
         # Set the region's offset, relative to the default position for
                 
         xx, yy = self.GetLabelPosition(i)
         # Set the region's offset, relative to the default position for