Mercurial > fife-parpg
diff engine/core/gui/widgets/clicklabel.cpp @ 228:756b895e1dab
Merged unicode-support back into trunk.
Now all GUI/visible strings should be unicode.
Internal strings unchanged.
Remember to use a font that actually has the desired codepoints.
Current default unicode policiy is 'ignore'.
author | phoku@33b003aa-7bff-0310-803a-e67f0ece8222 |
---|---|
date | Sat, 21 Mar 2009 10:38:11 +0000 |
parents | bb9902910067 |
children | 51cc05d862f2 |
line wrap: on
line diff
--- a/engine/core/gui/widgets/clicklabel.cpp Fri Mar 20 15:17:28 2009 +0000 +++ b/engine/core/gui/widgets/clicklabel.cpp Sat Mar 21 10:38:11 2009 +0000 @@ -115,7 +115,7 @@ if( isTextWrapping() ) { image = mGuiFont->getAsImageMultiline(mWrappedText); } else { - image = mGuiFont->getAsImage(mCaption); + image = mGuiFont->getAsImageMultiline(mCaption); } setWidth( image->getWidth() ); setHeight( image->getHeight() );