X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..4f3449b43280a855e57280e6848610ea9fdaa3bb:/samples/notebook/notebook.cpp diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp index b69850bd96..7943c7a028 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; @@ -47,7 +48,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);