From 116112bcf5e7d2d5ba517bcfe5553c9ba5ffd49c Mon Sep 17 00:00:00 2001
From: Tim Kosse <tim.kosse@gmx.de>
Date: Thu, 10 Jul 2014 09:51:41 +0000
Subject: [PATCH] Fix a compile error with some compilers introduced in r76813.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 samples/treectrl/treetest.cpp | 4 ++--
 samples/treectrl/treetest.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index ee4342195d..f32bea9dd3 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -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();
 }
diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index c7a28c9ca3..971b745cc1 100644
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -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;