X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab552aa4d7f70363c6a3c6dd5b26d144c23b271c..6e28ff0ce787d68d8025cf650f3b30561d41a0bd:/wxPython/wx/lib/ogl/_basic.py diff --git a/wxPython/wx/lib/ogl/_basic.py b/wxPython/wx/lib/ogl/_basic.py index 757c5c2115..db095dd165 100644 --- a/wxPython/wx/lib/ogl/_basic.py +++ b/wxPython/wx/lib/ogl/_basic.py @@ -232,9 +232,9 @@ class Shape(ShapeEvtHandler): self._canvas = canvas self._xpos = 0.0 self._ypos = 0.0 - self._pen = wx.Pen(wx.BLACK, 1, wx.SOLID) + self._pen = BlackForegroundPen self._brush = wx.WHITE_BRUSH - self._font = wx.Font(10, wx.SWISS, wx.NORMAL, wx.NORMAL) + self._font = NormalFont self._textColour = wx.BLACK self._textColourName = wx.BLACK self._visible = False @@ -276,7 +276,7 @@ class Shape(ShapeEvtHandler): # the region eventually (the duplication is for compatibility) region = ShapeRegion() region.SetName("0") - region.SetFont(wx.Font(10, wx.SWISS, wx.NORMAL, wx.NORMAL)) + region.SetFont(NormalFont) region.SetFormatMode(FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT) region.SetColour("BLACK") self._regions.append(region) @@ -1166,7 +1166,7 @@ class Shape(ShapeEvtHandler): """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) @@ -2178,7 +2178,7 @@ class Shape(ShapeEvtHandler): 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.