1. fruitless attempts to reproduce wxNotebook bug in the sample

2. multiple selection related changes in the treetest


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

samples/notebook/test.cpp

@@ -32,7 +32,7 @@ MyFrame*  frame = (MyFrame *) NULL;
 
 IMPLEMENT_APP(MyApp)
 
-bool MyApp::OnInit(void)
+bool MyApp::OnInit()
 {
   // Create the main window
 #if USE_TABBED_DIALOG
@@ -60,17 +60,13 @@ bool MyApp::OnInit(void)
 void MyApp::InitTabView(wxNotebook* notebook, wxPanel* window)
 {
   m_okButton = new wxButton(window, wxID_OK, "Close", wxPoint(-1, -1), wxSize(80, 25));
-  m_cancelButton = new wxButton(window, ID_DELETE_PAGE, "Delete page", wxPoint(-1, -1), wxSize(80, 25));
+  m_cancelButton = new wxButton(window, ID_DELETE_PAGE, "&Delete page", wxPoint(-1, -1), wxSize(80, 25));
-  m_addPageButton = new wxButton(window, ID_ADD_PAGE, "Add page", wxPoint(-1, -1), wxSize(80, 25));
+  m_addPageButton = new wxButton(window, ID_ADD_PAGE, "&Add page", wxPoint(-1, -1), wxSize(80, 25));
-  m_nextPageButton = new wxButton(window, ID_NEXT_PAGE, "Next page", wxPoint(-1, -1), wxSize(80, 25));
+  m_insertPageButton = new wxButton(window, ID_INSERT_PAGE, "&Insert page", wxPoint(-1, -1), wxSize(80, 25));
+  m_nextPageButton = new wxButton(window, ID_NEXT_PAGE, "&Next page", wxPoint(-1, -1), wxSize(80, 25));
   m_okButton->SetDefault();
 
-  wxLayoutConstraints* c = new wxLayoutConstraints;
+  wxLayoutConstraints *c;
-  c->right.SameAs(m_addPageButton, wxLeft, 4);
-  c->bottom.SameAs(window, wxBottom, 4);
-  c->height.AsIs();
-  c->width.AsIs();
-  m_nextPageButton->SetConstraints(c);
 
   c = new wxLayoutConstraints;
   c->right.SameAs(window, wxRight, 4);
@@ -84,6 +80,20 @@ void MyApp::InitTabView(wxNotebook* notebook, wxPanel* window)
   c->bottom.SameAs(window, wxBottom, 4);
   c->height.AsIs();
   c->width.AsIs();
+  m_insertPageButton->SetConstraints(c);
+
+  c = new wxLayoutConstraints;
+  c->right.SameAs(m_insertPageButton, wxLeft, 4);
+  c->bottom.SameAs(window, wxBottom, 4);
+  c->height.AsIs();
+  c->width.AsIs();
+  m_nextPageButton->SetConstraints(c);
+
+  c = new wxLayoutConstraints;
+  c->right.SameAs(m_nextPageButton, wxLeft, 4);
+  c->bottom.SameAs(window, wxBottom, 4);
+  c->height.AsIs();
+  c->width.AsIs();
   m_cancelButton->SetConstraints(c);
 
   c = new wxLayoutConstraints;
@@ -171,7 +181,7 @@ void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event) )
     EndModal(wxID_CANCEL);
 }
 
-void MyDialog::Init(void)
+void MyDialog::Init()
 {
   m_notebook = new wxNotebook(this, ID_NOTEBOOK);
 
@@ -197,6 +207,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_BUTTON(wxID_OK, MyFrame::OnOK)
     EVT_BUTTON(ID_DELETE_PAGE, MyFrame::OnDeletePage)
     EVT_BUTTON(ID_ADD_PAGE, MyFrame::OnAddPage)
+    EVT_BUTTON(ID_INSERT_PAGE, MyFrame::OnInsertPage)
     EVT_BUTTON(ID_NEXT_PAGE, MyFrame::OnNextPage)
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
@@ -212,10 +223,23 @@ MyFrame::MyFrame(wxFrame* parent, const wxWindowID id, const wxString& title,
 
 void MyFrame::OnAddPage(wxCommandEvent& WXUNUSED(event))
 {
-  wxPanel *panel = new wxPanel( m_notebook, -1 );
+    static size_t s_pageAdded = 0;
-  (void)new wxButton( panel, -1, "Button", wxPoint( 10,10 ), wxSize(-1,-1) );
+
-  m_notebook->AddPage( panel, "Added" );
+    wxPanel *panel = new wxPanel( m_notebook, -1 );
-//  m_notebook->SetSelection( m_notebook->GetPageCount()-1 );
+    (void)new wxButton( panel, -1, "Button", wxPoint( 10,10 ), wxSize(-1,-1) );
+
+    m_notebook->AddPage( panel, wxString::Format("Added %u", ++s_pageAdded) );
+}
+
+void MyFrame::OnInsertPage(wxCommandEvent& WXUNUSED(event))
+{
+    static size_t s_pageIns = 0;
+
+    wxPanel *panel = new wxPanel( m_notebook, -1 );
+    (void)new wxButton( panel, -1, "Button", wxPoint( 10,10 ), wxSize(-1,-1) );
+
+    m_notebook->InsertPage(0, panel, wxString::Format("Inserted %u", ++s_pageIns) );
+    m_notebook->SetSelection(0);
 }
 
 void MyFrame::OnDeletePage(wxCommandEvent& WXUNUSED(event))
@@ -238,7 +262,7 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event) )
     Destroy();
 }
 
-void MyFrame::Init(void)
+void MyFrame::Init()
 {
   m_panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxCLIP_CHILDREN);
 

samples/notebook/test.h

@@ -15,12 +15,12 @@
 class MyApp: public wxApp
 {
 public:
-    bool OnInit(void);
+    bool OnInit();
     void InitTabView(wxNotebook* notebook, wxPanel* window);
 
     wxButton*   m_okButton;
     wxButton*   m_cancelButton;
-    wxButton*   m_addPageButton;
+    wxButton*   m_addPageButton, *m_insertPageButton;
     wxButton*   m_nextPageButton;
 };
 
@@ -36,7 +36,7 @@ public:
 
     void OnOK(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
-    void Init(void);
+    void Init();
 
 protected:
     wxNotebook* m_notebook;
@@ -55,6 +55,7 @@ public:
     void OnOK(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     void OnAddPage(wxCommandEvent& event);
+    void OnInsertPage(wxCommandEvent& event);
     void OnNextPage(wxCommandEvent& event);
     void OnDeletePage(wxCommandEvent& event);
     void OnIdle(wxIdleEvent& event);
@@ -91,4 +92,5 @@ protected:
 #define ID_ADD_PAGE         1200
 #define ID_DELETE_PAGE      1201
 #define ID_NEXT_PAGE        1202
+#define ID_INSERT_PAGE      1203
 

samples/treectrl/treetest.cpp

@@ -126,7 +126,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main frame window
-    MyFrame *frame = new MyFrame("wxTreeCtrl Test", 50, 50, 450, 340);
+    MyFrame *frame = new MyFrame("wxTreeCtrl Test", 50, 50, 450, 600);
 
     // Show the frame
     frame->Show(TRUE);
@@ -758,10 +758,10 @@ void MyTreeCtrl::OnItemCollapsing(wxTreeEvent& event)
     }
 }
 
-void MyTreeCtrl::OnItemActivated(wxTreeEvent&WXUNUSED(event))
+void MyTreeCtrl::OnItemActivated(wxTreeEvent& event)
 {
     // show some info about this item
-    wxTreeItemId itemId = GetSelection();
+    wxTreeItemId itemId = event.GetItem();
     MyTreeItemData *item = (MyTreeItemData *)GetItemData(itemId);
 
     if ( item != NULL )