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

Fix a compile error with some compilers introduced in r76813.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Tim Kosse
2014-07-10 09:51:41 +00:00
parent 63a9cc4c2e
commit 116112bcf5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/treectrl/treetest.cpp
View File

@@ -1601,7 +1601,7 @@ void MyTreeCtrl::OnItemMenu(wxTreeEvent& event)
wxPoint screenpt = ClientToScreen(clientpt);
wxLogMessage(wxT("OnItemMenu for item \"%s\" at screen coords (%i, %i)"),
item ? item->GetDesc() : wxS("unknown"), screenpt.x, screenpt.y);
item ? item->GetDesc() : wxString(wxS("unknown")), screenpt.x, screenpt.y);
ShowMenu(itemId, clientpt);
event.Skip();
@@ -1646,7 +1646,7 @@ void MyTreeCtrl::OnItemRClick(wxTreeEvent& event)
MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc() : wxS("unknown"));
wxLogMessage(wxT("Item \"%s\" right clicked"), item ? item->GetDesc() : wxString(wxS("unknown")));
event.Skip();
}

2
samples/treectrl/treetest.h
View File

@@ -45,7 +45,7 @@ public:
MyTreeItemData(const wxString& desc) : m_desc(desc) { }
void ShowInfo(wxTreeCtrl *tree);
const wxChar *GetDesc() const { return m_desc.c_str(); }
wxString const& GetDesc() const { return m_desc; }
private:
wxString m_desc;