X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b2f757f9b7bac4b4b10fde8449c62e35b9c9497a..60b73526d6797ee466c272dbfca962a230bc5908:/samples/notebook/notebook.cpp

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 7ffa097f23..b8b321e100 100644
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -20,10 +20,11 @@
     #include "wx/wx.h"
 #endif
 
+// If 1, use a dialog. Otherwise use a frame.
+#define USE_TABBED_DIALOG 1
+
 #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
@@ -36,9 +37,10 @@ bool MyApp::OnInit()
 {
   // 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();
+  delete dialog;
 
   // 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
-#if defined(__WIN16__)
+#if defined(__WIN16__) || defined(__WXMOTIF__)
   int width, height;
   frame->GetSize(& width, & height);
   frame->SetSize(-1, -1, width, height);
@@ -57,7 +59,7 @@ bool MyApp::OnInit()
 #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));
@@ -67,7 +69,6 @@ void MyApp::InitTabView(wxNotebook* notebook, wxPanel* window)
   m_okButton->SetDefault();
 
   wxLayoutConstraints *c;
-
   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);
 }
 
+wxWindow *test = NULL;
+
 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))