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

Remove more wxT() macros from samples

Browse Source 
Also use wxString instead of wxChar* strings.

Closes https://github.com/wxWidgets/wxWidgets/pull/950
This commit is contained in:
Blake Eryx
2018-09-28 21:45:15 -04:00
committed by Vadim Zeitlin
parent 480047ee9a
commit b70ed2d8c8
67 changed files with 1926 additions and 1932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
samples/treectrl/treetest.cpp
View File

@@ -1298,12 +1298,12 @@ void MyTreeCtrl::DoResetBrokenStateImages(const wxTreeItemId& idParent,
DoResetBrokenStateImages(idParent, cookie, state);
}
void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event)
void MyTreeCtrl::LogEvent(const wxString& name, const wxTreeEvent& event)
{
wxTreeItemId item = event.GetItem();
wxString text;
if ( item.IsOk() )
text << wxT('"') << GetItemText(item).c_str() << wxT('"');
text << '"' << GetItemText(item).c_str() << '"';
else
text = "invalid item";
wxLogMessage("%s(%s)", name, text.c_str());
@@ -1313,7 +1313,7 @@ void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event)
#define TREE_EVENT_HANDLER(name) \
void MyTreeCtrl::name(wxTreeEvent& event) \
{ \
LogEvent(wxT(#name), event); \
LogEvent(#name, event); \
event.Skip(); \
}
@@ -1606,7 +1606,7 @@ void MyTreeCtrl::OnItemStateClick(wxTreeEvent& event)
wxTreeItemId itemId = event.GetItem();
DoToggleState(itemId);
wxLogMessage(wxT("Item \"%s\" state changed to %d"),
wxLogMessage("Item \"%s\" state changed to %d",
GetItemText(itemId), GetItemState(itemId));
}
@@ -1619,8 +1619,8 @@ void MyTreeCtrl::OnItemMenu(wxTreeEvent& event)
wxPoint clientpt = event.GetPoint();
wxPoint screenpt = ClientToScreen(clientpt);
wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"),
item ? item->GetDesc() : wxString(wxS("unknown")), screenpt.x, screenpt.y);
wxLogMessage("OnItemMenu for item \"%s\" at screen coords (%i, %i)",
item ? item->GetDesc() : wxString("unknown"), screenpt.x, screenpt.y);
ShowMenu(itemId, clientpt);
event.Skip();
@@ -1665,7 +1665,7 @@ void MyTreeCtrl::OnItemRClick(wxTreeEvent& event)
MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc() : wxString(wxS("unknown")));
wxLogMessage("Item \"%s\" right clicked", item ? item->GetDesc() : wxString("unknown"));
event.Skip();
}