Add support for Unicode surrogate characters and planes above zero.HEADmaster

If the selected font supports the required characters, the text will be displayed correctly.
If the selected font does not support such characters, empty boxes will be displayed in place of the expected text.

Part of the code changes comes from Qt4 code.

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/kernel/tqpainter.cpp b/src/kernel/tqpainter.cpp
index 452af0a57..7b30e0af6 100644
--- a/src/kernel/tqpainter.cpp
+++ b/src/kernel/tqpainter.cpp
@@ -2883,12 +2883,12 @@ void qt_format_text( const TQFont& font, const TQRect &_r,
 	int desc = fm.descent();
 	height = -leading;
 
-	//tqDebug("\n\nbeginLayout: lw = %d, rectwidth=%d", lineWidth , r.width());
+	//tqDebug("beginLayout: lw = %d, rectwidth=%d", lineWidth , r.width());
 	while ( !textLayout.atEnd() ) {
 	    height += leading;
-	    textLayout.beginLine( lineWidth == INT_MAX ? lineWidth : lineWidth );
+	    textLayout.beginLine( lineWidth );
 	    //tqDebug("-----beginLine( %d )-----",  lineWidth );
-	    bool linesep = FALSE;
+	    bool linesep = false;
 	    while ( 1 ) {
 		TQTextItem ti = textLayout.currentItem();
  		//tqDebug("item: from=%d, ch=%x", ti.from(), text.unicode()[ti.from()].unicode() );
@@ -2913,7 +2913,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r,
 			ti.setWidth( tw );
 		}
 		if ( ti.isObject() && text.unicode()[ti.from()] == TQChar_linesep )
-		    linesep = TRUE;
+		    linesep = true;
 
 		if ( linesep || textLayout.addCurrentItem() != TQTextLayout::Ok || textLayout.atEnd() )
 		    break;