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

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

diff --git a/samples/treectrl/treectrl.cpp b/samples/treectrl/treectrl.cpp
index 6e6a8a613f5eedee90c9d6751eb5a9adad537a0f..0a62c840820fbdb617831dfaf1cec5bfebc6c6d8 100644 (file)
--- a/samples/treectrl/treectrl.cpp
+++ b/samples/treectrl/treectrl.cpp
@@ -75,6 +75,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     MENU_LINK(TogHideRoot)
     MENU_LINK(TogRootLines)
     MENU_LINK(TogBorder)
     MENU_LINK(TogHideRoot)
     MENU_LINK(TogRootLines)
     MENU_LINK(TogBorder)

+    MENU_LINK(TogFullHighlight)

     MENU_LINK(Dump)
 #ifndef NO_MULTIPLE_SELECTION
     MENU_LINK(DumpSelected)
     MENU_LINK(Dump)
 #ifndef NO_MULTIPLE_SELECTION
     MENU_LINK(DumpSelected)


@@ -185,6 +186,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     style_menu->Append(TreeTest_TogRootLines, "Toggle &lines at root");
     style_menu->Append(TreeTest_TogHideRoot, "Toggle &hidden root");
     style_menu->Append(TreeTest_TogBorder, "Toggle &item border");
     style_menu->Append(TreeTest_TogRootLines, "Toggle &lines at root");
     style_menu->Append(TreeTest_TogHideRoot, "Toggle &hidden root");
     style_menu->Append(TreeTest_TogBorder, "Toggle &item border");

+    style_menu->Append(TreeTest_TogFullHighlight, "Toggle &full row highlight");

     style_menu->Append(TreeTest_TogEdit, "Toggle &edit mode");
 #ifndef NO_MULTIPLE_SELECTION
     style_menu->Append(TreeTest_ToggleSel, wxT("Toggle &selection mode"));
     style_menu->Append(TreeTest_TogEdit, "Toggle &edit mode");
 #ifndef NO_MULTIPLE_SELECTION
     style_menu->Append(TreeTest_ToggleSel, wxT("Toggle &selection mode"));


@@ -243,8 +245,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
 
     m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl,
                                 wxDefaultPosition, wxDefaultSize,
 
     m_treeCtrl = new MyTreeCtrl(this, TreeTest_Ctrl,
                                 wxDefaultPosition, wxDefaultSize,

-                                wxTR_TWIST_BUTTONS | wxTR_NO_LINES |
-                                wxTR_EDIT_LABELS |
+                                wxTR_DEFAULT_STYLE | wxTR_EDIT_LABELS |

 #ifndef NO_VARIABLE_HEIGHT
                                 wxTR_HAS_VARIABLE_ROW_HEIGHT |
 #endif
 #ifndef NO_VARIABLE_HEIGHT
                                 wxTR_HAS_VARIABLE_ROW_HEIGHT |
 #endif