make log messages more readable

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 1357cfd5f6a3ff07509c68e7c3a2491cb48eb211..fbd1ace563ef9dfd94c6786e51fa6b9c8a7b7fa2 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -890,17 +890,22 @@ void MyTreeCtrl::DoToggleIcon(const wxTreeItemId& item)
     SetItemImage(item, image, wxTreeItemIcon_Selected);
 }
 
+void MyTreeCtrl::LogEvent(const wxChar *name, const wxTreeEvent& event)
+{
+    wxTreeItemId item = event.GetItem();
+    wxString text;
+    if ( item.IsOk() )
+        text << _T('"') << GetItemText(item).c_str() << _T('"');
+    else
+        text = _T("invalid item");
+    wxLogMessage(wxT("%s(%s)"), name, text.c_str());
+}
 
 // avoid repetition
 #define TREE_EVENT_HANDLER(name)                                 \
 void MyTreeCtrl::name(wxTreeEvent& event)                        \
 {                                                                \
-    wxLogMessage( wxT("%s from:"), wxT(#name) );                 \
-    wxTreeItemId item = event.GetItem();                         \
-    if (item.IsOk())                                             \
-        wxLogMessage( GetItemText(item) );                       \
-    else                                                         \
-        wxLogMessage(wxT("invalid item"));                       \
+    LogEvent(_T(#name), event);                                  \
     SetLastItem(wxTreeItemId());                                 \
     event.Skip();                                                \
 }

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 1b8f1bc7cd5ecef3b25c2a43303288a34fd13fdd..24d3320887b9f1fef39b8e0f9f281e351712c499 100644 (file)
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -127,6 +127,8 @@ private:
                              size_t depth,
                              size_t folder);
 
+    void LogEvent(const wxChar *name, const wxTreeEvent& event);
+
     int          m_imageSize;               // current size of images
     bool         m_reverseSort;             // flag for OnCompareItems
     wxTreeItemId m_lastItem,                // for OnEnsureVisible()