Patch from Davide Salomoni that adds an optional point

parameter to LineShape.InsertLineControlPoint allowing one to
optionally specify where the new control point has to be drawn.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index b64dc29e539669c2808ab1a5dca1114bde9e1989..47344750b7e19d246c2030cdbfe945ed97d05ae2 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -91,6 +91,14 @@ while pasting).
 wx.lib.filebrowsebutton: Bug fix from Chad Netzer for when
 self.history is None.
 
 wx.lib.filebrowsebutton: Bug fix from Chad Netzer for when
 self.history is None.
 

+wx.ogl: Patch from Davide Salomoni that adds an optional point
+parameter to LineShape.InsertLineControlPoint allowing one to
+optionally specify where the new control point has to be drawn.
+
+wxMSW: setting foreground colour for wx.CheckBox now works when using
+XP themes.
+
+

 
 
 2.6.0.0
 
 
 2.6.0.0

diff --git a/wxPython/wx/lib/ogl/_lines.py b/wxPython/wx/lib/ogl/_lines.py
index 6b6e4cf59be79d7c95e5edbb81259989f18e1d25..1e1d3ab68ab68ab24f7388758599a1b78664c42b 100644 (file)
--- a/wxPython/wx/lib/ogl/_lines.py
+++ b/wxPython/wx/lib/ogl/_lines.py
@@ -298,16 +298,19 @@ 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)
         self._lineControlPoints.insert(len(self._lineControlPoints)-1, point)
 
         point = wx.RealPoint(line_x, line_y)
         self._lineControlPoints.insert(len(self._lineControlPoints)-1, point)