another attempt to improve combobox behaviour

[wxWidgets.git] / utils / framelayout / samples / demo / fl_demo.cpp

diff --git a/utils/framelayout/samples/demo/fl_demo.cpp b/utils/framelayout/samples/demo/fl_demo.cpp
index ebe2ba716329d1809ec9bcc1ca7407cd4f85fbf6..ea69a4d46398107e5e8a39d28c19ef67aaca2407 100644 (file)
--- a/utils/framelayout/samples/demo/fl_demo.cpp
+++ b/utils/framelayout/samples/demo/fl_demo.cpp
@@ -51,7 +51,9 @@
 #include "wxinfo.h"
 
 // ADDED by alex (linker complaints...):
+#ifndef wxDUMMY_OBJ_INCLUDED
 char wxDummyChar=0;
+#endif
 
 /***** Implementation for class MyApp *****/
 
@@ -667,17 +669,17 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
 {
     wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, -1 );
 
-    int rootid = pTree->AppendItem( (long)0, label, 0);
+    int rootid = pTree->AppendItem( (long)0, label, -1);
        
     if ( label[0] != 'X' )
     {
-        pTree->AppendItem(rootid, "Leaf1", 0);
-        pTree->AppendItem(rootid, "Leaf2", 0);
+        pTree->AppendItem(rootid, "Leaf1", -1);
+        pTree->AppendItem(rootid, "Leaf2", -1);
     }
     else
     {
-        pTree->AppendItem(rootid, "Scully", 0);
-        pTree->AppendItem(rootid, "Mulder", 0);
+        pTree->AppendItem(rootid, "Scully", -1);
+        pTree->AppendItem(rootid, "Mulder", -1);
     }
 
     return pTree;