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

A couple of Unicode fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@6941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-03-25 23:06:31 +00:00
parent 12c1498d81
commit ab64366836
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/generic/treelay.cpp
View File

@@ -99,12 +99,12 @@ void wxTreeLayout::DrawBranches(wxDC& dc)
void wxTreeLayout::DrawNode(long id, wxDC& dc) void wxTreeLayout::DrawNode(long id, wxDC& dc)
{ {
char buf[80]; wxChar buf[80];
wxString name(GetNodeName(id)); wxString name(GetNodeName(id));
if (name != "") if (name != wxT(""))
sprintf(buf, "%s", (const char*) name); wxSprintf(buf, wxT("%s"), (const wxChar*) name);
else else
sprintf(buf, "<unnamed>"); wxSprintf(buf, wxT("<unnamed>"));
long x = 80; long x = 80;
long y = 20; long y = 20;
@@ -127,7 +127,7 @@ void wxTreeLayout::Initialize(void)
void wxTreeLayout::GetNodeSize(long id, long *x, long *y, wxDC& dc) void wxTreeLayout::GetNodeSize(long id, long *x, long *y, wxDC& dc)
{ {
wxString name(GetNodeName(id)); wxString name(GetNodeName(id));
if (name != "") if (name != wxT(""))
dc.GetTextExtent(name, x, y); dc.GetTextExtent(name, x, y);
else else
{ {
@@ -283,7 +283,7 @@ long wxTreeLayoutStored::AddChild(const wxString& name, const wxString& parent)
if (m_num < (m_maxNodes -1 )) if (m_num < (m_maxNodes -1 ))
{ {
long i = -1; long i = -1;
if (parent != "") if (parent != wxT(""))
i = NameToId(parent); i = NameToId(parent);
else m_parentNode = m_num; else m_parentNode = m_num;