Fixed "Bound pointer address" error under GCC-2.95

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

diff --git a/samples/notebook/test.cpp b/samples/notebook/test.cpp
index e9d6088176c04bee7c15fa7744bbd41c2bfdc32f..e140f42cc5a807a2723fa35f15b76898d14c4798 100644 (file)
--- a/samples/notebook/test.cpp
+++ b/samples/notebook/test.cpp
@@ -13,20 +13,22 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/wx.h"
+    #include "wx/wx.h"

 #endif
 
 #include "test.h"
 
 // If 1, use a dialog. Otherwise use a frame.
 #define USE_TABBED_DIALOG 0
 #endif
 
 #include "test.h"
 
 // If 1, use a dialog. Otherwise use a frame.
 #define USE_TABBED_DIALOG 0

-
+#if USE_TABBED_DIALOG

 MyDialog* dialog = (MyDialog *) NULL;
 MyDialog* dialog = (MyDialog *) NULL;

+#else // !USE_TABBED_DIALOG

 MyFrame*  frame = (MyFrame *) NULL;
 MyFrame*  frame = (MyFrame *) NULL;

+#endif // USE_TABBED_DIALOG

 
 IMPLEMENT_APP(MyApp)
 
 
 IMPLEMENT_APP(MyApp)
 


@@ -55,7 +57,7 @@ bool MyApp::OnInit(void)
 #endif
 }
 
 #endif
 }
 

-void MyApp::InitTabView(wxNotebook* notebook, wxWindow* window)
+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_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));


@@ -96,22 +98,26 @@ void MyApp::InitTabView(wxNotebook* notebook, wxWindow* window)
   panel2->SetBackgroundColour(wxColour("BLUE"));
 
   wxString animals[] = { "Fox", "Hare", "Rabbit", "Sabre-toothed tiger", "T Rex" };
   panel2->SetBackgroundColour(wxColour("BLUE"));
 
   wxString animals[] = { "Fox", "Hare", "Rabbit", "Sabre-toothed tiger", "T Rex" };

-  wxListBox *listbox = new wxListBox(panel2, -1, wxPoint(5, 5), wxSize(170, 80), 5, animals);
+  wxRadioBox *radiobox = new wxRadioBox(panel2, -1, "Choose one",
+                                        wxDefaultPosition, wxDefaultSize, 5, animals);

 
   c = new wxLayoutConstraints;
   c->left.SameAs(panel2, wxLeft, 4);
   c->top.SameAs(panel2, wxTop, 4);
   c->height.PercentOf(panel2, wxHeight, 50);
   c->right.SameAs(panel2, wxRight, 4);
 
   c = new wxLayoutConstraints;
   c->left.SameAs(panel2, wxLeft, 4);
   c->top.SameAs(panel2, wxTop, 4);
   c->height.PercentOf(panel2, wxHeight, 50);
   c->right.SameAs(panel2, wxRight, 4);

-  listbox->SetConstraints(c);
+  radiobox->SetConstraints(c);

 
 

-  wxTextCtrl *text = new wxTextCtrl(panel2, -1, "Some notes about the animals in this house", wxPoint(5, 100), wxSize(170, 100), wxTE_MULTILINE);
+  wxRadioBox *radiobox2 = new wxRadioBox(panel2, -1, "Choose one",
+                                         wxDefaultPosition, wxDefaultSize,
+                                         5, animals,
+                                         2, wxRA_SPECIFY_ROWS);

   c = new wxLayoutConstraints;
   c = new wxLayoutConstraints;

-  c->left.SameAs(panel2, wxLeft, 4);
-  c->bottom.SameAs(panel2, wxBottom, 4);
-  c->top.Below(listbox, 4);
-  c->right.SameAs(panel2, wxRight, 4);
-  text->SetConstraints(c);
+  c->left.SameAs(radiobox, wxLeft);
+  c->height.AsIs();
+  c->top.Below(radiobox, 4);
+  c->right.SameAs(radiobox, wxRight);
+  radiobox2->SetConstraints(c);

 
   notebook->AddPage(panel2, "Dog");
 
 
   notebook->AddPage(panel2, "Dog");
 


@@ -131,6 +137,8 @@ void MyApp::InitTabView(wxNotebook* notebook, wxWindow* window)
   notebook->SetSelection(2);
 }
 
   notebook->SetSelection(2);
 }
 

+#if USE_TABBED_DIALOG
+

 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
     EVT_BUTTON(wxID_OK, MyDialog::OnOK)
     EVT_BUTTON(wxID_CANCEL, MyDialog::OnOK)
 BEGIN_EVENT_TABLE(MyDialog, wxDialog)
     EVT_BUTTON(wxID_OK, MyDialog::OnOK)
     EVT_BUTTON(wxID_CANCEL, MyDialog::OnOK)


@@ -170,14 +178,15 @@ void MyDialog::Init(void)
   SetAutoLayout(TRUE);
   Layout();
 
   SetAutoLayout(TRUE);
   Layout();
 

-  this->Centre(wxBOTH);
+  Centre(wxBOTH);

 }
 
 }
 

+#else // USE_TABBED_DIALOG
+

 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)
 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_SIZE(MyFrame::OnSize)

     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 
     EVT_IDLE(MyFrame::OnIdle)
 END_EVENT_TABLE()
 


@@ -217,11 +226,18 @@ void MyFrame::Init(void)
 {
   m_panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxCLIP_CHILDREN);
 
 {
   m_panel = new wxPanel(this, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL|wxCLIP_CHILDREN);
 

+  wxLayoutConstraints* c = new wxLayoutConstraints;
+  c->left.SameAs(this, wxLeft);
+  c->right.SameAs(this, wxRight);
+  c->top.SameAs(this, wxTop);
+  c->bottom.SameAs(this, wxBottom);
+  m_panel->SetConstraints(c);
+

   // Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match
   // with the panel background, and save a bit of time.
   m_notebook = new wxNotebook(m_panel, ID_NOTEBOOK);
 
   // Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match
   // with the panel background, and save a bit of time.
   m_notebook = new wxNotebook(m_panel, ID_NOTEBOOK);
 

-  wxLayoutConstraints* c = new wxLayoutConstraints;
+  c = new wxLayoutConstraints;

   c->left.SameAs(m_panel, wxLeft, 4);
   c->right.SameAs(m_panel, wxRight, 4);
   c->top.SameAs(m_panel, wxTop, 4);
   c->left.SameAs(m_panel, wxLeft, 4);
   c->right.SameAs(m_panel, wxRight, 4);
   c->top.SameAs(m_panel, wxTop, 4);


@@ -232,20 +248,13 @@ void MyFrame::Init(void)
   wxGetApp().InitTabView(m_notebook, m_panel);
 
   m_panel->SetAutoLayout(TRUE);
   wxGetApp().InitTabView(m_notebook, m_panel);
 
   m_panel->SetAutoLayout(TRUE);

+  SetAutoLayout(TRUE);

 
 

-  m_panel->Layout();
-
-  this->Centre(wxBOTH);
+  Centre(wxBOTH);

 
   Show(TRUE);
 }
 
 
   Show(TRUE);
 }
 

-void MyFrame::OnSize(wxSizeEvent& event)
-{
-    wxFrame::OnSize(event);
-    m_panel->Layout();
-}
-

 void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
 {
     static int s_nPages = -1;
 void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
 {
     static int s_nPages = -1;


@@ -264,3 +273,5 @@ void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
         SetTitle(title);
     }
 }
         SetTitle(title);
     }
 }

+
+#endif // USE_TABBED_DIALOG