X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/457814b5aa2ee5c83abc65a6aee2a3ebcb1af34f..e21a504837179fc2be49f72e03664c8d8cc82148:/samples/treectrl/treetest.cpp?ds=inline

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 5ad9b54e2a..94a72b0d55 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -25,6 +25,12 @@
 #include "wx/wx.h"
 #endif
 
+#ifndef __WXMSW__
+  #include "icon1.xpm"
+  #include "icon2.xpm"
+  #include "mondrian.xpm"
+#endif
+
 #include "wx/treectrl.h"
 
 #include "treetest.h"
@@ -52,10 +58,10 @@ END_EVENT_TABLE()
 IMPLEMENT_APP(MyApp)
 
 // `Main program' equivalent, creating windows and returning main app frame
-bool MyApp::OnInit(void)
+bool MyApp::OnInit()
 {
   // Create the main frame window
-  MyFrame *frame = new MyFrame(NULL, "wxTreeCtrl Test", 50, 50, 450, 340);
+  MyFrame *frame = new MyFrame((wxFrame *) NULL, (char *) "wxTreeCtrl Test", 50, 50, 450, 340);
 
   // This reduces flicker effects - even better would be to define OnEraseBackground
   // to do nothing. When the tree control's scrollbars are show or hidden, the
@@ -63,22 +69,13 @@ bool MyApp::OnInit(void)
   frame->SetBackgroundColour(wxColour(255, 255, 255));
 
   // Give it an icon
-#ifdef __WINDOWS__
-  frame->SetIcon(wxIcon("mondrian"));
-#endif
-#ifdef __X__
-  frame->SetIcon(wxIcon("aiai.xbm"));
-#endif
+  frame->SetIcon(wxICON(mondrian));
 
-  // Make an image list containing large icons
+  // Make an image list containing small icons
   m_imageListNormal = new wxImageList(16, 16, TRUE);
 
-  wxIcon *icon = new wxIcon("icon1", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
-  icon = new wxIcon("icon2", wxBITMAP_TYPE_ICO_RESOURCE);
-  m_imageListNormal->Add(*icon);
-  delete icon;
+  m_imageListNormal->Add(wxICON(icon1));
+  m_imageListNormal->Add(wxICON(icon2));
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
@@ -112,7 +109,7 @@ bool MyApp::OnInit(void)
 
   frame->m_treeCtrl->SetImageList(wxGetApp().m_imageListNormal, wxIMAGE_LIST_NORMAL);
 
-  long rootId = frame->m_treeCtrl->InsertItem(0, "Root", 0);
+  wxTreeItemId rootId = frame->m_treeCtrl->AddRoot("Root", 0);
 
   char buf[20];
   int i;
@@ -122,20 +119,20 @@ bool MyApp::OnInit(void)
   {
 	sprintf(buf, "Folder child %d", i);
     str = buf;
-    long id = frame->m_treeCtrl->InsertItem(rootId, str, 0);
+    wxTreeItemId id = frame->m_treeCtrl->AppendItem(rootId, str, 0);
 	int j;
     for ( j = 0; j < 5; j++)
     {
 	  sprintf(buf, "File child %d", j);
       str = buf;
-      frame->m_treeCtrl->InsertItem(id, str, 1);
+      frame->m_treeCtrl->AppendItem(id, str, 1);
     }
   }
   for ( i = 0; i < 10; i++)
   {
 	sprintf(buf, "File child %d", i);
     str = buf;
-    frame->m_treeCtrl->InsertItem(rootId, str, 1);
+    frame->m_treeCtrl->AppendItem(rootId, str, 1);
   }
 
   frame->CreateStatusBar(3);
@@ -153,21 +150,21 @@ bool MyApp::OnInit(void)
 MyFrame::MyFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
   wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {
-	m_treeCtrl = NULL;
-	m_logWindow = NULL;
+	m_treeCtrl = (MyTreeCtrl *) NULL;
+	m_logWindow = (wxTextCtrl *) NULL;
 }
 
-MyFrame::~MyFrame(void)
+MyFrame::~MyFrame()
 {
 	delete wxGetApp().m_imageListNormal;
 }
 
-void MyFrame::OnQuit(wxCommandEvent& event)
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event) )
 {
   Close(TRUE);
 }
 
-void MyFrame::OnAbout(wxCommandEvent& event)
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event) )
 {
   wxMessageDialog dialog(this, "Tree test sample\nJulian Smart (c) 1997",
   	"About tree test", wxOK|wxCANCEL);
@@ -177,7 +174,7 @@ void MyFrame::OnAbout(wxCommandEvent& event)
 
 // MyTreeCtrl
 
-void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
+void MyTreeCtrl::OnBeginDrag(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -194,7 +191,7 @@ void MyTreeCtrl::OnBeginDrag(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnBeginRDrag(wxTreeEvent& event)
+void MyTreeCtrl::OnBeginRDrag(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -211,7 +208,7 @@ void MyTreeCtrl::OnBeginRDrag(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)
+void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -228,7 +225,7 @@ void MyTreeCtrl::OnBeginLabelEdit(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event)
+void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -245,7 +242,7 @@ void MyTreeCtrl::OnEndLabelEdit(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnDeleteItem(wxTreeEvent& event)
+void MyTreeCtrl::OnDeleteItem(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -262,7 +259,7 @@ void MyTreeCtrl::OnDeleteItem(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnGetInfo(wxTreeEvent& event)
+void MyTreeCtrl::OnGetInfo(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -279,7 +276,7 @@ void MyTreeCtrl::OnGetInfo(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnSetInfo(wxTreeEvent& event)
+void MyTreeCtrl::OnSetInfo(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -296,7 +293,7 @@ void MyTreeCtrl::OnSetInfo(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnItemExpanded(wxTreeEvent& event)
+void MyTreeCtrl::OnItemExpanded(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -313,7 +310,7 @@ void MyTreeCtrl::OnItemExpanded(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnItemExpanding(wxTreeEvent& event)
+void MyTreeCtrl::OnItemExpanding(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -330,7 +327,7 @@ void MyTreeCtrl::OnItemExpanding(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnSelChanged(wxTreeEvent& event)
+void MyTreeCtrl::OnSelChanged(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -347,7 +344,7 @@ void MyTreeCtrl::OnSelChanged(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnSelChanging(wxTreeEvent& event)
+void MyTreeCtrl::OnSelChanging(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;
@@ -364,7 +361,7 @@ void MyTreeCtrl::OnSelChanging(wxTreeEvent& event)
 #endif
 }
 
-void MyTreeCtrl::OnKeyDown(wxTreeEvent& event)
+void MyTreeCtrl::OnKeyDown(wxTreeEvent& WXUNUSED(event) )
 {
 	if ( !wxGetApp().GetTopWindow() )
 		return;