More updates to wxWindow, wxMenu, GdiImage to get minimal to work

[wxWidgets.git] / samples / notebook / test.cpp

diff --git a/samples/notebook/test.cpp b/samples/notebook/test.cpp
index c2dffe86fe4daa06f4eecf629f7b77ef691a441b..573d302e3b7cfde86c73c6a9d233f1ee1c3401e9 100644 (file)
--- a/samples/notebook/test.cpp
+++ b/samples/notebook/test.cpp
@@ -62,9 +62,17 @@ 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_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_okButton->SetDefault();
 
   wxLayoutConstraints* c = new wxLayoutConstraints;
+  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);
   c->bottom.SameAs(window, wxBottom, 4);
   c->height.AsIs();
@@ -99,13 +107,14 @@ void MyApp::InitTabView(wxNotebook* notebook, wxPanel* window)
 
   wxString animals[] = { "Fox", "Hare", "Rabbit", "Sabre-toothed tiger", "T Rex" };
   wxRadioBox *radiobox = new wxRadioBox(panel2, -1, "Choose one",
-                                        wxDefaultPosition, wxDefaultSize, 5, animals);
+                                        wxDefaultPosition, wxDefaultSize, 5, animals,
+                                        2, wxRA_SPECIFY_ROWS);
 
   c = new wxLayoutConstraints;
-  c->left.SameAs(panel2, wxLeft, 4);
-  c->top.SameAs(panel2, wxTop, 4);
+  c->left.SameAs(panel2, wxLeft, 10);
+  c->top.SameAs(panel2, wxTop, 5);
   c->height.PercentOf(panel2, wxHeight, 50);
-  c->right.SameAs(panel2, wxRight, 4);
+  c->right.SameAs(panel2, wxRight, 10);
   radiobox->SetConstraints(c);
 
   wxRadioBox *radiobox2 = new wxRadioBox(panel2, -1, "Choose one",
@@ -116,7 +125,7 @@ void MyApp::InitTabView(wxNotebook* notebook, wxPanel* window)
   c = new wxLayoutConstraints;
   c->left.SameAs(radiobox, wxLeft);
   c->height.AsIs();
-  c->top.Below(radiobox, 4);
+  c->top.Below(radiobox, 5);
   c->right.SameAs(radiobox, wxRight);
   radiobox2->SetConstraints(c);
 
@@ -188,6 +197,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_NEXT_PAGE, MyFrame::OnNextPage)
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
@@ -213,6 +223,11 @@ void MyFrame::OnDeletePage(wxCommandEvent& WXUNUSED(event))
     m_notebook->DeletePage( m_notebook->GetPageCount()-1 );
 }
 
+void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event))
+{
+    m_notebook->AdvanceSelection();
+}
+
 void MyFrame::OnOK(wxCommandEvent& WXUNUSED(event) )
 {
     Destroy();