added container class source

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

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index b69850bd96240e9ab760094d8625f80f08402d6e..7943c7a028c142a18ea5379f007892f25926412e 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


@@ -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);
   // 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();
   dialog->ShowModal();

+  delete dialog;

 
   // Quit immediately the dialog has been dismissed
   return FALSE;
 
   // 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
 
   // 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);