ugh. Nesting the (per class) plugin sentries can require them to

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

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 7ffa097f23676fdb0bf7384d29507761d7c872e8..b8b321e1002d96da45dca2ec11404ac737517d14 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -20,10 +20,11 @@
     #include "wx/wx.h"
 #endif
 
     #include "wx/wx.h"
 #endif
 

+// If 1, use a dialog. Otherwise use a frame.
+#define USE_TABBED_DIALOG 1
+

 #include "notebook.h"
 
 #include "notebook.h"
 

-// If 1, use a dialog. Otherwise use a frame.
-#define USE_TABBED_DIALOG 0

 #if USE_TABBED_DIALOG
 MyDialog* dialog = (MyDialog *) NULL;
 #else // !USE_TABBED_DIALOG
 #if USE_TABBED_DIALOG
 MyDialog* dialog = (MyDialog *) NULL;
 #else // !USE_TABBED_DIALOG


@@ -36,9 +37,10 @@ bool MyApp::OnInit()
 {
   // Create the main window
 #if USE_TABBED_DIALOG
 {
   // Create the main window
 #if USE_TABBED_DIALOG

-  dialog = new MyDialog((wxFrame *) NULL, -1, (char *) "Notebook", wxPoint(-1, -1), wxSize(365, 390), wxDIALOG_MODAL|wxDEFAULT_DIALOG_STYLE);
-
+  dialog = new MyDialog((wxFrame *) NULL, -1, "Notebook", wxPoint(-1, -1), wxSize(365, 390),
+                        wxRESIZE_BORDER);

   dialog->ShowModal();
   dialog->ShowModal();

+  delete dialog;

 
   // Quit immediately the dialog has been dismissed
   return FALSE;
 
   // Quit immediately the dialog has been dismissed
   return FALSE;


@@ -47,7 +49,7 @@ bool MyApp::OnInit()
 
   // Problem with generic wxNotebook implementation whereby it doesn't size properly unless
   // you set the size again
 
   // Problem with generic wxNotebook implementation whereby it doesn't size properly unless
   // you set the size again

-#if defined(__WIN16__)
+#if defined(__WIN16__) || defined(__WXMOTIF__)

   int width, height;
   frame->GetSize(& width, & height);
   frame->SetSize(-1, -1, width, height);
   int width, height;
   frame->GetSize(& width, & height);
   frame->SetSize(-1, -1, width, height);


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

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


@@ -67,7 +69,6 @@ void MyApp::InitTabView(wxNotebook* notebook, wxPanel* window)
   m_okButton->SetDefault();
 
   wxLayoutConstraints *c;
   m_okButton->SetDefault();
 
   wxLayoutConstraints *c;

-

   c = new wxLayoutConstraints;
   c->right.SameAs(window, wxRight, 4);
   c->bottom.SameAs(window, wxBottom, 4);
   c = new wxLayoutConstraints;
   c->right.SameAs(window, wxRight, 4);
   c->bottom.SameAs(window, wxBottom, 4);


@@ -242,9 +243,25 @@ void MyFrame::OnInsertPage(wxCommandEvent& WXUNUSED(event))
     m_notebook->SetSelection(0);
 }
 
     m_notebook->SetSelection(0);
 }
 

+wxWindow *test = NULL;
+

 void MyFrame::OnDeletePage(wxCommandEvent& WXUNUSED(event))
 {
 void MyFrame::OnDeletePage(wxCommandEvent& WXUNUSED(event))
 {

-    m_notebook->DeletePage( m_notebook->GetPageCount()-1 );
+    if (m_notebook->GetPageCount() > 0)
+        m_notebook->DeletePage( m_notebook->GetPageCount()-1 );
+
+/*
+    if (test)
+    {
+       m_notebook->AddPage( test, "Readded" );
+       test = NULL;
+    }
+    else
+    {
+       test = m_notebook->GetPage( m_notebook->GetPageCount()-1 );
+       m_notebook->RemovePage( m_notebook->GetPageCount()-1 );
+    }
+*/

 }
 
 void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event))
 }
 
 void MyFrame::OnNextPage(wxCommandEvent& WXUNUSED(event))