1. Empty() now doesn't free memory - Clear() does

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

diff --git a/samples/notebook/test.cpp b/samples/notebook/test.cpp
index 3358e3655211e7759359f8c3abd653086e22fcc8..e9867c144cc8ae407563592c1344cb476b650814 100644 (file)
--- a/samples/notebook/test.cpp
+++ b/samples/notebook/test.cpp
@@ -50,9 +50,6 @@ bool MyApp::OnInit(void)
 
 void MyApp::InitTabView(wxNotebook* notebook, wxWindow* window)
 {
-  int dialogWidth = 365;
-  int dialogHeight = 390;
-  
   m_okButton = new wxButton(window, wxID_OK, "Close", wxPoint(-1, -1), wxSize(80, 25));
   m_cancelButton = new wxButton(window, wxID_CANCEL, "Cancel", wxPoint(-1, -1), wxSize(80, 25));
   m_helpButton = new wxButton(window, wxID_HELP, "Help", wxPoint(-1, -1), wxSize(80, 25));
@@ -81,12 +78,14 @@ void MyApp::InitTabView(wxNotebook* notebook, wxWindow* window)
 
   // Add some panels
   wxPanel *panel1 = new wxPanel(notebook, -1);
+  //  panel1->SetBackgroundColour(wxColour("RED"));
   (void)new wxButton(panel1, -1, "Press me", wxPoint(10, 10));
   (void)new wxTextCtrl(panel1, -1, "1234", wxPoint(10, 40), wxSize(120, 150));
   
   notebook->AddPage(panel1, "Cat");
 
   wxPanel *panel2 = new wxPanel(notebook, -1);
+  panel2->SetBackgroundColour(wxColour("BLUE"));
 
   wxString animals[] = { "Fox", "Hare", "Rabbit", "Sabre-toothed tiger", "T Rex" };
   (void)new wxListBox(panel2, -1, wxPoint(5, 5), wxSize(170, 80), 5, animals);
@@ -95,6 +94,14 @@ void MyApp::InitTabView(wxNotebook* notebook, wxWindow* window)
     wxTE_MULTILINE);
 
   notebook->AddPage(panel2, "Dog");
+
+  wxPanel *panel3 = new wxPanel(notebook, -1);
+  panel3->SetBackgroundColour(wxColour("WHITE"));
+  notebook->AddPage(panel3, "Goat");
+
+  wxPanel *panel4 = new wxPanel(notebook, -1);
+  panel4->SetBackgroundColour(wxColour("YELLOW"));
+  notebook->AddPage(panel4, "Sheep");
 }
 
 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
@@ -121,9 +128,6 @@ void MyDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event) )
 
 void MyDialog::Init(void)
 {
-  int dialogWidth = 365;
-  int dialogHeight = 390;
-  
   m_notebook = new wxNotebook(this, ID_NOTEBOOK);
 
   wxLayoutConstraints* c = new wxLayoutConstraints;
@@ -169,9 +173,6 @@ void MyFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event) )
 
 void MyFrame::Init(void)
 {
-  int dialogWidth = 365;
-  int dialogHeight = 390;
-
   m_panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxCLIP_CHILDREN);
 
   // Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match