Fix for ogl.FORMAT_SIZE_TO_CONTENTS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -521,7 +521,7 @@ class Shape(ShapeEvtHandler):
 | 
			
		||||
        # Don't try to resize an object with more than one image (this
 | 
			
		||||
        # case should be dealt with by overriden handlers)
 | 
			
		||||
        if (region.GetFormatMode() & FORMAT_SIZE_TO_CONTENTS) and \
 | 
			
		||||
           region.GetFormattedText().GetCount() and \
 | 
			
		||||
           len(region.GetFormattedText()) and \
 | 
			
		||||
           len(self._regions) == 1 and \
 | 
			
		||||
           not Shape.GraphicsInSizeToContents:
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user