don't treat changing focus to popup's child as loosing it

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

diff --git a/samples/treectrl/treectrl.h b/samples/treectrl/treectrl.h
index 98913159683b57717451aaea12adb3bc714945af..25f6e73645c3cfb7ebaa0c1eb6d1c40487813caa 100644 (file)
--- a/samples/treectrl/treectrl.h
+++ b/samples/treectrl/treectrl.h
@@ -43,7 +43,7 @@ public:
     MyTreeItemData(const wxString& desc) : m_desc(desc) { }
 
     void ShowInfo(wxTreeCtrl *tree);
     MyTreeItemData(const wxString& desc) : m_desc(desc) { }
 
     void ShowInfo(wxTreeCtrl *tree);

-    const char *GetDesc() const { return m_desc.c_str(); }
+    const wxChar *GetDesc() const { return m_desc.c_str(); }

 
 private:
     wxString m_desc;
 
 private:
     wxString m_desc;


@@ -153,6 +153,7 @@ public:
     void OnTogHideRoot(wxCommandEvent& event)  { TogStyle(wxTR_HIDE_ROOT); }
     void OnTogRootLines(wxCommandEvent& event) { TogStyle(wxTR_LINES_AT_ROOT); }
     void OnTogBorder(wxCommandEvent& event)    { TogStyle(wxTR_ROW_LINES); }
     void OnTogHideRoot(wxCommandEvent& event)  { TogStyle(wxTR_HIDE_ROOT); }
     void OnTogRootLines(wxCommandEvent& event) { TogStyle(wxTR_LINES_AT_ROOT); }
     void OnTogBorder(wxCommandEvent& event)    { TogStyle(wxTR_ROW_LINES); }

+    void OnTogFullHighlight(wxCommandEvent& event)    { TogStyle(wxTR_FULL_ROW_HIGHLIGHT); }

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


@@ -223,6 +224,7 @@ enum
     TreeTest_TogHideRoot,
     TreeTest_TogRootLines,
     TreeTest_TogBorder,
     TreeTest_TogHideRoot,
     TreeTest_TogRootLines,
     TreeTest_TogBorder,

+    TreeTest_TogFullHighlight,

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