compilation fix for Unicode build: remove ambiguity arising when trying to pass wxCha...

[wxWidgets.git] / samples / treectrl / treetest.h

diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index 778be3b787d5abb79ddb532826b2c7d10e64ad9f..f9a2f3bcaa9519c52450a3641fd52270284a6914 100644 (file)
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -76,7 +76,6 @@ public:
     void OnContextMenu(wxContextMenuEvent& event);
     void OnItemMenu(wxTreeEvent& event);
     void OnGetInfo(wxTreeEvent& event);
     void OnContextMenu(wxContextMenuEvent& event);
     void OnItemMenu(wxTreeEvent& event);
     void OnGetInfo(wxTreeEvent& event);

-    void OnTreeRMouseClick(wxTreeEvent& event);

     void OnSetInfo(wxTreeEvent& event);
     void OnItemExpanded(wxTreeEvent& event);
     void OnItemExpanding(wxTreeEvent& event);
     void OnSetInfo(wxTreeEvent& event);
     void OnItemExpanded(wxTreeEvent& event);
     void OnItemExpanding(wxTreeEvent& event);


@@ -86,6 +85,10 @@ public:
     void OnSelChanging(wxTreeEvent& event);
     void OnTreeKeyDown(wxTreeEvent& event);
     void OnItemActivated(wxTreeEvent& event);
     void OnSelChanging(wxTreeEvent& event);
     void OnTreeKeyDown(wxTreeEvent& event);
     void OnItemActivated(wxTreeEvent& event);

+    void OnItemRClick(wxTreeEvent& event);
+
+    void OnRMouseDown(wxMouseEvent& event);
+    void OnRMouseUp(wxMouseEvent& event);

     void OnRMouseDClick(wxMouseEvent& event);
 
     void GetItemsRecursively(const wxTreeItemId& idParent,
     void OnRMouseDClick(wxMouseEvent& event);
 
     void GetItemsRecursively(const wxTreeItemId& idParent,


@@ -124,6 +127,8 @@ private:
                              size_t depth,
                              size_t folder);
 
                              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()
     int          m_imageSize;               // current size of images
     bool         m_reverseSort;             // flag for OnCompareItems
     wxTreeItemId m_lastItem,                // for OnEnsureVisible()


@@ -172,6 +177,7 @@ public:
     void OnSetFgColour(wxCommandEvent& event);
     void OnSetBgColour(wxCommandEvent& event);
 
     void OnSetFgColour(wxCommandEvent& event);
     void OnSetBgColour(wxCommandEvent& event);
 

+    void OnHighlight(wxCommandEvent& event);

     void OnDump(wxCommandEvent& event);
 #ifndef NO_MULTIPLE_SELECTION
     void OnDumpSelected(wxCommandEvent& event);
     void OnDump(wxCommandEvent& event);
 #ifndef NO_MULTIPLE_SELECTION
     void OnDumpSelected(wxCommandEvent& event);


@@ -226,6 +232,7 @@ private:
     void CreateTreeWithDefStyle();
     void CreateTree(long style);
 
     void CreateTreeWithDefStyle();
     void CreateTree(long style);
 

+    wxPanel *m_panel;

     MyTreeCtrl *m_treeCtrl;
 #if wxUSE_LOG
     wxTextCtrl *m_textCtrl;
     MyTreeCtrl *m_treeCtrl;
 #if wxUSE_LOG
     wxTextCtrl *m_textCtrl;


@@ -252,6 +259,7 @@ enum
     TreeTest_SetFgColour,
     TreeTest_SetBgColour,
     TreeTest_ResetStyle,
     TreeTest_SetFgColour,
     TreeTest_SetBgColour,
     TreeTest_ResetStyle,

+    TreeTest_Highlight,

     TreeTest_Dump,
     TreeTest_DumpSelected,
     TreeTest_Count,
     TreeTest_Dump,
     TreeTest_DumpSelected,
     TreeTest_Count,