wxMac Unicode support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -59,7 +59,7 @@ bool wxStaticText::Create(wxWindow *parent, wxWindowID id,
|
||||
return ret;
|
||||
}
|
||||
|
||||
const wxString punct = " ,.-;:!?";
|
||||
const wxString punct = wxT(" ,.-;:!?");
|
||||
|
||||
void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
|
||||
{
|
||||
@@ -68,7 +68,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
|
||||
if (paragraph.Length() == 0)
|
||||
{
|
||||
// empty line
|
||||
dc.GetTextExtent( "H", &width, &height );
|
||||
dc.GetTextExtent( wxT("H"), &width, &height );
|
||||
y += height;
|
||||
|
||||
return;
|
||||
@@ -127,7 +127,7 @@ void wxStaticText::DrawParagraph(wxDC &dc, wxString paragraph, int &y)
|
||||
}
|
||||
|
||||
dc.DrawText( paragraph, pos , y) ;
|
||||
paragraph="";
|
||||
paragraph=wxEmptyString;
|
||||
y += height ;
|
||||
}
|
||||
}
|
||||
@@ -165,7 +165,7 @@ void wxStaticText::OnDraw( wxDC &dc )
|
||||
if (text[i] == 13 || text[i] == 10)
|
||||
{
|
||||
DrawParagraph(dc, paragraph,y);
|
||||
paragraph = "" ;
|
||||
paragraph = wxEmptyString ;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user