updated from CVS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -749,18 +749,18 @@ class Shape(ShapeEvtHandler):
|
|||||||
if self._pen:
|
if self._pen:
|
||||||
dc.SetPen(self._pen)
|
dc.SetPen(self._pen)
|
||||||
|
|
||||||
region = self._regions[0]
|
for region in self._regions:
|
||||||
if region.GetFont():
|
if region.GetFont():
|
||||||
dc.SetFont(region.GetFont())
|
dc.SetFont(region.GetFont())
|
||||||
|
|
||||||
dc.SetTextForeground(region.GetActualColourObject())
|
dc.SetTextForeground(region.GetActualColourObject())
|
||||||
dc.SetBackgroundMode(wx.TRANSPARENT)
|
dc.SetBackgroundMode(wx.TRANSPARENT)
|
||||||
if not self._formatted:
|
if not self._formatted:
|
||||||
CentreText(dc, region.GetFormattedText(), self._xpos, self._ypos, bound_x - 2 * self._textMarginX, bound_y - 2 * self._textMarginY, region.GetFormatMode())
|
CentreText(dc, region.GetFormattedText(), self._xpos, self._ypos, bound_x - 2 * self._textMarginX, bound_y - 2 * self._textMarginY, region.GetFormatMode())
|
||||||
self._formatted = True
|
self._formatted = True
|
||||||
|
|
||||||
if not self.GetDisableLabel():
|
if not self.GetDisableLabel():
|
||||||
DrawFormattedText(dc, region.GetFormattedText(), self._xpos, self._ypos, bound_x - 2 * self._textMarginX, bound_y - 2 * self._textMarginY, region.GetFormatMode())
|
DrawFormattedText(dc, region.GetFormattedText(), self._xpos, self._ypos, bound_x - 2 * self._textMarginX, bound_y - 2 * self._textMarginY, region.GetFormatMode())
|
||||||
|
|
||||||
|
|
||||||
def DrawContents(self, dc):
|
def DrawContents(self, dc):
|
||||||
|
Reference in New Issue
Block a user