Rebake for 2.6.2

[wxWidgets.git] / contrib / samples / fl / fl_demo2.cpp

diff --git a/contrib/samples/fl/fl_demo2.cpp b/contrib/samples/fl/fl_demo2.cpp
index 23d3ed29ab5dbada756720191682f3414f5d7a1d..dd4fd7925690c8bd01dc32037d1037bffaabf59d 100644 (file)
--- a/contrib/samples/fl/fl_demo2.cpp
+++ b/contrib/samples/fl/fl_demo2.cpp
@@ -96,7 +96,9 @@ bool MyApp::OnInit(void)
     menu_bar->Append(file_menu,   _("&File"));
     menu_bar->Append(active_menu, _("Active &Layout"));
 
+#if wxUSE_STATUSBAR
     frame->CreateStatusBar(3);
+#endif // wxUSE_STATUSBAR
 
     frame->SetMenuBar(menu_bar);
 
@@ -203,7 +205,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxChar *title, int x, int y, int w, int h
 
     // Create all layouts
     for( i = 0; i != MAX_LAYOUTS; ++i )
-    {  
+    {
         CreateLayout( i );
     }
     // hide others
@@ -489,17 +491,17 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
 {
     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
     {
-        pTree->AppendItem(rootid, _("Scully"), 0);
-        pTree->AppendItem(rootid, _("Mulder"), 0);
+        pTree->AppendItem(rootid, _("Leaf1"));
+        pTree->AppendItem(rootid, _("Leaf2"));
     }
 
     return pTree;
@@ -620,7 +622,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
 {
     bool isNested = (pParent != mpInternalFrm);
 
-    // check if we're craeting nested layout
+    // check if we're creating nested layout
     if ( isNested )
     {
         layout.mBorderPen.SetColour( 128,255,128 );
@@ -671,7 +673,7 @@ wxWindow* MyFrame::CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent )
     pClassView->AppendItem( rootId, _("serializer-classes (grabbed at run-time)"),    0 );
 
     // now create "output" window
-    wxNotebook*        pTabbedArea = new wxNotebook(pParent, wxID_ANY);
+    wxNotebook* pTabbedArea = new wxNotebook(pParent, wxID_ANY);
     // SEB: originally here was a wxpp (wxWorkshop) class used
     //    wxPaggedWindow* pTabbedArea = new wxPaggedWindow();
     //    pTabbedArea->Create( pParent, wxID_ANY );