X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37d403aa1cf182cfc01e2ce1753c2dda39ba82ea..a874db92795a6c30a08c75a7bc63b16da727edd4:/samples/notebook/notebook.cpp?ds=sidebyside

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index 5762ffffcf..e4c5f0eb4d 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;
@@ -57,7 +59,7 @@ bool MyApp::OnInit()
 #endif
 }
 
-void MyApp::InitTabView(wxNotebook* notebook, wxPanel* window)
+void MyApp::InitTabView(wxNotebook* notebook, wxTopLevelWindow* 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));