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

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

diff --git a/wxPython/wx/lib/ogl/_oglmisc.py b/wxPython/wx/lib/ogl/_oglmisc.py
index cca574608dc9ad8777d38909c1b8fa0a6233fa3f..db2185c8322d72098868b0a46285f10bd52d0406 100644 (file)
--- a/wxPython/wx/lib/ogl/_oglmisc.py
+++ b/wxPython/wx/lib/ogl/_oglmisc.py
@@ -153,7 +153,7 @@ def GetCentredTextExtent(dc, text_list, xpos = 0, ypos = 0, width = 0, height =
 
     max_width = 0
     for line in text_list:
-        current_width, char_height = dc.GetTextExtent(line)
+        current_width, char_height = dc.GetTextExtent(line.GetText())
         if current_width > max_width:
             max_width = current_width
 
@@ -333,7 +333,7 @@ def GraphicsStraightenLine(point1, point2):
     elif abs(float(dy) / dx) > 1:
         point2[0] = point1[0]
     else:
-        point2[1] = point1[0]
+        point2[1] = point1[1]