- up to 6.2.4

[packages/ucblogo.git] / ucblogo-wx.patch

--- ucblogo-6.0/wxTerminal.cpp.orig	2008-09-14 06:57:09.000000000 +0200
+++ ucblogo-6.0/wxTerminal.cpp	2013-05-16 20:28:02.600051372 +0200
@@ -938,7 +938,7 @@ wxTerminal::GetCharSize(int *cw, int *ch
   //dc.GetTextExtent("(", &dummy, ch);
 
   int descent, extlead; 
-  dc.GetTextExtent("M", cw, ch, &descent, &extlead);
+  dc.GetTextExtent(wxT("M"), cw, ch, &descent, &extlead);
   //for the tails of g's and y's, if needed.
 #ifdef __WXMSW__
     *ch += descent + extlead + 1;
--- ucblogo-6.0/wxTurtleGraphics.cpp.orig	2008-09-14 01:23:42.000000000 +0200
+++ ucblogo-6.0/wxTurtleGraphics.cpp	2013-05-16 20:28:53.780049221 +0200
@@ -558,7 +558,7 @@ extern "C" FLONUM y_scale;
 extern "C" void wx_get_label_size(int *w, int *h) {
     /* returns size in pixels; converted to turtle steps in wxterm.c */
   int descent, extlead;
-  m_memDC->GetTextExtent("M", w, h, &descent, &extlead);  
+  m_memDC->GetTextExtent(wxT("M"), w, h, &descent, &extlead);  
 }
 
 extern "C" void wx_adjust_label_height() {
@@ -573,7 +573,7 @@ extern "C" void wx_adjust_label_height()
     label_font.SetPointSize(font_size);
 
     m_memDC->SetFont(label_font);	
-    m_memDC->GetTextExtent("M", &cw, &ch, &descent, &extlead);
+    m_memDC->GetTextExtent(wxT("M"), &cw, &ch, &descent, &extlead);
 
     //now... first figure out whether we undershot or overshot...
     //this determines which direction to change the size
@@ -592,7 +592,7 @@ extern "C" void wx_adjust_label_height()
 	    }
 	    if (expected == 100) break;
 	    m_memDC->SetFont(tmp_font);	
-	    m_memDC->GetTextExtent("M", &cw, &tmp_height, &descent, &extlead);
+	    m_memDC->GetTextExtent(wxT("M"), &cw, &tmp_height, &descent, &extlead);
 
 	    if(tmp_height >= px_height) break;
 
@@ -611,7 +611,7 @@ extern "C" void wx_adjust_label_height()
 	    }
 	    if (expected == 2) break;
 	    m_memDC->SetFont(tmp_font);	
-	    m_memDC->GetTextExtent("M", &cw, &tmp_height, &descent, &extlead);
+	    m_memDC->GetTextExtent(wxT("M"), &cw, &tmp_height, &descent, &extlead);
 
 	    if(tmp_height <= px_height) break;