X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/37d403aa1cf182cfc01e2ce1753c2dda39ba82ea..b584b7d24a2595db71a912f7877ff658e6dedef1:/samples/notebook/notebook.cpp diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index 5762ffffcf..eeb65f56d4 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 @@ -37,8 +38,8 @@ 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->ShowModal(); + delete dialog; // Quit immediately the dialog has been dismissed return FALSE; @@ -57,7 +58,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));