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

Fix for ogl.FORMAT_SIZE_TO_CONTENTS

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-09-10 19:54:05 +00:00
parent 43a6124f65
commit 241d5f3d34
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -521,7 +521,7 @@ class Shape(ShapeEvtHandler):
# Don't try to resize an object with more than one image (this # Don't try to resize an object with more than one image (this
# case should be dealt with by overriden handlers) # case should be dealt with by overriden handlers)
if (region.GetFormatMode() & FORMAT_SIZE_TO_CONTENTS) and \ if (region.GetFormatMode() & FORMAT_SIZE_TO_CONTENTS) and \
region.GetFormattedText().GetCount() and \ len(region.GetFormattedText()) and \
len(self._regions) == 1 and \ len(self._regions) == 1 and \
not Shape.GraphicsInSizeToContents: not Shape.GraphicsInSizeToContents:

2
wxPython/wx/lib/ogl/_oglmisc.py
View File

@@ -153,7 +153,7 @@ def GetCentredTextExtent(dc, text_list, xpos = 0, ypos = 0, width = 0, height =
max_width = 0 max_width = 0
for line in text_list: 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: if current_width > max_width:
max_width = current_width max_width = current_width