Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More unicode fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-12-18 06:24:15 +00:00
parent bfedf6212c
commit 9e05364039
18 changed files with 77 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/src/ogl/basic.cpp
View File

@@ -286,7 +286,7 @@ wxShape::wxShape(wxShapeCanvas *can)
m_brush = wxWHITE_BRUSH;
m_font = g_oglNormalFont;
m_textColour = wxBLACK;
m_textColourName = "BLACK";
m_textColourName = wxT("BLACK");
m_visible = FALSE;
m_selected = FALSE;
m_attachmentMode = ATTACHMENT_MODE_NONE;
@@ -305,7 +305,7 @@ wxShape::wxShape(wxShapeCanvas *can)
m_shadowBrush = wxBLACK_BRUSH;
m_textMarginX = 5;
m_textMarginY = 5;
m_regionName = "0";
m_regionName = wxT("0");
m_centreResize = TRUE;
m_maintainAspectRatio = FALSE;
m_highlighted = FALSE;
@@ -319,10 +319,10 @@ wxShape::wxShape(wxShapeCanvas *can)
// the region eventually (the duplication is for compatibility)
wxShapeRegion *region = new wxShapeRegion;
m_regions.Append(region);
region->SetName("0");
region->SetName(wxT("0"));
region->SetFont(g_oglNormalFont);
region->SetFormatMode(FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT);
region->SetColour("BLACK");
region->SetColour(wxT("BLACK"));
}
wxShape::~wxShape()
@@ -616,7 +616,7 @@ void wxShape::FormatText(wxDC& dc, const wxString& s, int i)
node = stringList->First();
while (node)
{
char *s = (char *)node->Data();
wxChar *s = (wxChar *)node->Data();
wxShapeTextLine *line = new wxShapeTextLine(0.0, 0.0, s);
region->GetFormattedText().Append((wxObject *)line);
node = node->Next();
@@ -776,7 +776,7 @@ wxString wxShape::GetTextColour(int regionId) const
{
wxNode *node = m_regions.Nth(regionId);
if (!node)
return wxString("");
return wxEmptyString;
wxShapeRegion *region = (wxShapeRegion *)node->Data();
return region->GetColour();
}
@@ -794,7 +794,7 @@ wxString wxShape::GetRegionName(int regionId)
{
wxNode *node = m_regions.Nth(regionId);
if (!node)
return wxString("");
return wxEmptyString;
wxShapeRegion *region = (wxShapeRegion *)node->Data();
return region->GetName();
}
@@ -822,7 +822,7 @@ void wxShape::NameRegions(const wxString& parentName)
for (int i = 0; i < n; i++)
{
if (parentName.Length() > 0)
buff << parentName << "." << i;
buff << parentName << wxT(".") << i;
else
buff << i;
SetRegionName(buff, i);
@@ -834,7 +834,7 @@ void wxShape::NameRegions(const wxString& parentName)
buff.Empty();
wxShape *child = (wxShape *)node->Data();
if (parentName.Length() > 0)
buff << parentName << "." << j;
buff << parentName << wxT(".") << j;
else
buff << j;
child->NameRegions(buff);