diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 7dab094d53..a29183cd19 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -65,6 +65,8 @@
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 
+#include "wx/generic/calctrl.h"
+
 //----------------------------------------------------------------------
 // class definitions
 //----------------------------------------------------------------------
@@ -258,7 +260,7 @@ bool MyApp::OnInit()
     frame->Show(TRUE);
     frame->SetCursor(wxCursor(wxCURSOR_HAND));
 
-    //frame->GetPanel()->m_notebook->SetSelection(3);
+    frame->GetPanel()->m_notebook->SetSelection(5);
 
     SetTopWindow(frame);
 
@@ -641,6 +643,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
 
     m_notebook->AddPage(panel, "wxBitmapXXX");
 
+    panel = new wxPanel(m_notebook);
+    (void)new wxCalendarCtrl(panel, -1);
+    m_notebook->AddPage(panel, "wxCalendar");
+
 // --------------- TEST CODE ----------------------
 
   // layout constraints
diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index 4da9681fc0..a29db54296 100644
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -85,6 +85,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(TreeTest_CollapseAndReset, MyFrame::OnCollapseAndReset)
     EVT_MENU(TreeTest_EnsureVisible, MyFrame::OnEnsureVisible)
     EVT_MENU(TreeTest_AddItem, MyFrame::OnAddItem)
+    EVT_MENU(TreeTest_InsertItem, MyFrame::OnInsertItem)
     EVT_MENU(TreeTest_IncIndent, MyFrame::OnIncIndent)
     EVT_MENU(TreeTest_DecIndent, MyFrame::OnDecIndent)
     EVT_MENU(TreeTest_IncSpacing, MyFrame::OnIncSpacing)
@@ -153,6 +154,7 @@ MyFrame::MyFrame(const wxString& title, int x, int y, int w, int h)
     tree_menu->Append(TreeTest_CollapseAndReset, "C&ollapse and reset");
     tree_menu->AppendSeparator();
     tree_menu->Append(TreeTest_AddItem, "Append a &new item");
+    tree_menu->Append(TreeTest_InsertItem, "&Insert a new item");
     tree_menu->Append(TreeTest_Delete, "&Delete this item");
     tree_menu->Append(TreeTest_DeleteChildren, "Delete &children");
     tree_menu->Append(TreeTest_DeleteAll, "Delete &all items");
@@ -284,7 +286,7 @@ void MyFrame::OnCount(wxCommandEvent& WXUNUSED(event))
     CHECK_ITEM( item );
 
     int i = m_treeCtrl->GetChildrenCount( item, FALSE );
-    
+
     wxLogMessage(wxT("%d children"), i);
 }
 
@@ -295,7 +297,7 @@ void MyFrame::OnCountRec(wxCommandEvent& WXUNUSED(event))
     CHECK_ITEM( item );
 
     int i = m_treeCtrl->GetChildrenCount( item );
-    
+
     wxLogMessage(wxT("%d children"), i);
 }
 
@@ -392,6 +394,11 @@ void MyFrame::OnEnsureVisible(wxCommandEvent& event)
     m_treeCtrl->DoEnsureVisible();
 }
 
+void MyFrame::OnInsertItem(wxCommandEvent& WXUNUSED(event))
+{
+    m_treeCtrl->InsertItem(m_treeCtrl->GetRootItem(), 1, "2nd item");
+}
+
 void MyFrame::OnAddItem(wxCommandEvent& WXUNUSED(event))
 {
     static int s_num = 0;
diff --git a/samples/treectrl/treetest.h b/samples/treectrl/treetest.h
index dc193c2954..0c0cd57395 100644
--- a/samples/treectrl/treetest.h
+++ b/samples/treectrl/treetest.h
@@ -132,12 +132,13 @@ public:
 
     void OnCount(wxCommandEvent& event);
     void OnCountRec(wxCommandEvent& event);
-    
+
     void OnRename(wxCommandEvent& event);
     void OnSort(wxCommandEvent& event) { DoSort(); }
     void OnSortRev(wxCommandEvent& event) { DoSort(TRUE); }
 
     void OnAddItem(wxCommandEvent& event);
+    void OnInsertItem(wxCommandEvent& event);
 
     void OnIncIndent(wxCommandEvent& event);
     void OnDecIndent(wxCommandEvent& event);
@@ -178,6 +179,7 @@ enum
     TreeTest_CollapseAndReset,
     TreeTest_EnsureVisible,
     TreeTest_AddItem,
+    TreeTest_InsertItem,
     TreeTest_IncIndent,
     TreeTest_DecIndent,
     TreeTest_IncSpacing,