VC warning fix and update to curent state of wxW.

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

diff --git a/contrib/samples/fl/fl_demo2.cpp b/contrib/samples/fl/fl_demo2.cpp
index 9507011ed3db7c84e9400b763eaec2c0715f4aeb..dafbaa61ccee7af57179dbe75505ff369ce6e7c0 100644 (file)
--- a/contrib/samples/fl/fl_demo2.cpp
+++ b/contrib/samples/fl/fl_demo2.cpp
@@ -489,17 +489,17 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
 {
     wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, wxID_ANY );
 
 {
     wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, wxID_ANY );
 

-    const wxTreeItemId rootid = pTree->AppendItem( (long)0, label, 0);
+    const wxTreeItemId rootid = pTree->AddRoot(label);

 
 

-    if ( label[0] != 'X' )
+    if ( label.StartsWith(_T("X")) )

     {
     {

-        pTree->AppendItem(rootid, _("Leaf1"), 0);
-        pTree->AppendItem(rootid, _("Leaf2"), 0);
+        pTree->AppendItem(rootid, _("Scully"));
+        pTree->AppendItem(rootid, _("Mulder"));

     }
     else
     {
     }
     else
     {

-        pTree->AppendItem(rootid, _("Scully"), 0);
-        pTree->AppendItem(rootid, _("Mulder"), 0);
+        pTree->AppendItem(rootid, _("Leaf1"));
+        pTree->AppendItem(rootid, _("Leaf2"));

     }
 
     return pTree;
     }
 
     return pTree;