From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Mon, 22 Nov 2010 20:25:09 +0000 (+0100)
Subject: Strings are UTF8 encoded in drawText.
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/graphlib.git/commitdiff_plain/7a63d0a9af70fd6acbf2f97a15767b7b77c77596

Strings are UTF8 encoded in drawText.
---

diff --git a/CHANGES b/CHANGES
index e7e94c5..99f58e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,17 +1,17 @@
--- Mon, 22 Nov 2010 14:54:43 +0100
+-- Mon, 22 Nov 2010 21:27:00 +0100
 
-        * Add methods getFont() and setFont().
-        * Add methods drawTriangle() and fillTriangle().
+        * Add methods drawTriangle and fillTriangle.
+        * Add methods getFont and setFont.
+	* Mark strings as UTF8 encoded for drawText.
 
 -- Tue, 27 Apr 2010 17:30:13 +0200
 
-        * Make *sleep() methods static.
+        * Make *sleep methods static.
         * Recode to UTF8.
 
 -- Wed, 20 Jan 2010 19:20:49 +0100
 
-        * Add DrawingWindow::waitMousePress().
-        * Add DrawingWindow::mousePressEvent().
+        * Add methods waitMousePress and mousePressEvent.
 
 -- Tue, 27 Nov 2007 09:31:18 +0100
 
diff --git a/DrawingWindow.cpp b/DrawingWindow.cpp
index bb6a3e2..554e7fb 100644
--- a/DrawingWindow.cpp
+++ b/DrawingWindow.cpp
@@ -1034,7 +1034,7 @@ void DrawingWindow::realDrawText(int x, int y, const char *text, int flags)
         r.setTop(y);
     }
     syncMutex.lock();
-    painter->drawText(r, flags, text, &r);
+    painter->drawText(r, flags, QString::fromUtf8(text), &r);
     dirty(r);
     syncCondition.wakeAll();
     syncMutex.unlock();