Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This commit was manufactured by cvs2svn to create tag 'WX_2_6_3'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_6_3@38365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2006-03-25 12:04:37 +00:00
parent 219ee9ba9d
commit 6b87fdbb87
1999 changed files with 213099 additions and 254730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
wxPython/wx/lib/ogl/_basic.py
View File

@@ -288,9 +288,15 @@ class Shape(ShapeEvtHandler):
return str(self.__class__).split(".")[-1][:-2]
def Delete(self):
"""
Fully disconnect this shape from parents, children, the
canvas, etc.
"""
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()
@@ -301,7 +307,8 @@ class Shape(ShapeEvtHandler):
if self._canvas:
self.RemoveFromCanvas(self._canvas)
self.GetEventHandler().OnDelete()
if self.GetEventHandler():
self.GetEventHandler().OnDelete()
self._eventHandler = None
def __del__(self):
@@ -749,18 +756,18 @@ class Shape(ShapeEvtHandler):
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):
@@ -1159,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)
@@ -3040,7 +3047,7 @@ class ShapeRegion(object):
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):