corrected generation of all event members (client data) and implemented DoGetBestSize

[wxWidgets.git] / src / generic / gridctrl.cpp

diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index a0c35be0fcd0e6bd290ddc7f3783dbdbf3543234..9d502277e63bf974622743346936f141a58f52dd 100644 (file)
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -340,7 +340,7 @@ wxGridCellAutoWrapStringRenderer::GetTextLines(wxGrid& grid,
 
     dc.SetFont(attr.GetFont());
     wxStringTokenizer tk(data , _T(" \n\t\r"));
-    wxString thisline("");
+    wxString thisline(wxT(""));
 
     while ( tk.HasMoreTokens() )
     {
@@ -381,7 +381,7 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
     wxRect rect(0,0,width,10);
 
     // M is a nice large character 'y' gives descender!.
-    dc.GetTextExtent("My", &x, &y);
+    dc.GetTextExtent(wxT("My"), &x, &y);
 
     do
     {