From 9b22decc4efd846a2ea9989212a0cde01a6e8901 Mon Sep 17 00:00:00 2001 From: nyamatongwe Date: Sun, 26 Mar 2006 02:48:43 +0000 Subject: Fixed warnings from recent GCC. --- gtk/PlatGTK.cxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 20c518fdb..f841a96f0 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -1290,7 +1290,7 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, int ybase, const char int wclen; if (et == UTF8) { wclen = UCS2FromUTF8(s, len, - reinterpret_cast(wctext), maxLengthTextRun - 1); + static_cast(static_cast(wctext)), maxLengthTextRun - 1); } else { // dbcs, so convert using current locale char sMeasure[maxLengthTextRun]; memcpy(sMeasure, s, len); @@ -1465,7 +1465,7 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, int *positi int wclen; if (et == UTF8) { wclen = UCS2FromUTF8(s, len, - reinterpret_cast(wctext), maxLengthTextRun - 1); + static_cast(static_cast(wctext)), maxLengthTextRun - 1); } else { // dbcsMode, so convert using current locale char sDraw[maxLengthTextRun]; memcpy(sDraw, s, len); @@ -1550,7 +1550,8 @@ int SurfaceImpl::WidthText(Font &font_, const char *s, int len) { #endif if (et == UTF8) { GdkWChar wctext[maxLengthTextRun]; - size_t wclen = UCS2FromUTF8(s, len, (wchar_t *)wctext, sizeof(wctext) / sizeof(GdkWChar) - 1); + size_t wclen = UCS2FromUTF8(s, len, static_cast(static_cast(wctext)), + sizeof(wctext) / sizeof(GdkWChar) - 1); wctext[wclen] = L'\0'; return gdk_text_width_wc(PFont(font_)->pfont, wctext, wclen); } else { -- cgit v1.2.3