From b271d60d6a009930d80092a8cb534a5df19fc99b Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sun, 27 Nov 2005 02:01:21 +0000 Subject: [PATCH] Small fixes to allow compilation in Unicode mode with gcc git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/richedit/wxllist.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp index 4b2be97526..1352b8cb19 100644 --- a/samples/richedit/wxllist.cpp +++ b/samples/richedit/wxllist.cpp @@ -62,7 +62,7 @@ /// This should never really get created -#define WXLLIST_TEMPFILE "__wxllist.tmp" +#define WXLLIST_TEMPFILE _T("__wxllist.tmp") #ifdef WXLAYOUT_DEBUG @@ -100,7 +100,7 @@ #define WXLO_MINIMUM_CURSOR_WIDTH 4 /// Use this character to estimate a cursor size when none is available. -#define WXLO_CURSORCHAR "E" +#define WXLO_CURSORCHAR _T("E") /** @name Helper functions */ //@{ /// allows me to compare to wxPoints @@ -1196,7 +1196,7 @@ wxLayoutLine::Layout(wxDC &dc, if(len < obj->GetLength()) str = (*(wxLayoutObjectText*)*i).GetText().substr(len,1); else - str = _T(WXLO_CURSORCHAR); + str = WXLO_CURSORCHAR; dc.GetTextExtent(str, &width, &height, &descent); if(cursorStyle) // set style info @@ -1269,7 +1269,7 @@ wxLayoutLine::Layout(wxDC &dc, if(m_Height == 0) { CoordType width, height, descent; - dc.GetTextExtent(_T(WXLO_CURSORCHAR), &width, &height, &descent); + dc.GetTextExtent(WXLO_CURSORCHAR, &width, &height, &descent); m_Height = height; m_BaseLine = m_Height - descent; } @@ -1288,7 +1288,7 @@ wxLayoutLine::Layout(wxDC &dc, if(cursorSize->x < WXLO_MINIMUM_CURSOR_WIDTH) { CoordType width, height, descent; - dc.GetTextExtent(_T(WXLO_CURSORCHAR), &width, &height, &descent); + dc.GetTextExtent(WXLO_CURSORCHAR, &width, &height, &descent); cursorSize->x = width; cursorSize->y = height; } @@ -3300,7 +3300,7 @@ void wxLayoutPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, determine the correct paper size and scaling. We don't actually print anything on it. */ #if defined(__WXMSW__) || defined(__WXMAC__) - wxPrinterDC *psdc = new wxPrinterDC(wxEmptyString,wxEmptyString,_T(WXLLIST_TEMPFILE),false); + wxPrinterDC *psdc = new wxPrinterDC(wxEmptyString,wxEmptyString,WXLLIST_TEMPFILE,false); #else wxPrintData data; data.SetFilename(WXLLIST_TEMPFILE); @@ -3333,7 +3333,7 @@ void wxLayoutPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, *selPageTo = m_NumOfPages; psdc->EndDoc(); delete psdc; - wxRemoveFile(_T(WXLLIST_TEMPFILE)); + wxRemoveFile(WXLLIST_TEMPFILE); } bool wxLayoutPrintout::HasPage(int pageNum)