Remove calls to wxApp::SetTopWindow() from the samples and documentation.

It is definitely not necessary to call SetTopWindow() when there is only a
single top level window and it is arguable whether it's useful to do it even
when there are many of them so don't encourage its use in the documentation
and also remove all its occurrences from the samples.

Closes #12816.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/demos/life/life.cpp b/demos/life/life.cpp
index 0402bd99445795e6414ee65326b9337ca610ef97..8366b49890c8a666a165ee1c68fa361bf52b10f6 100644 (file)
--- a/demos/life/life.cpp
+++ b/demos/life/life.cpp
@@ -163,9 +163,8 @@ bool LifeApp::OnInit()
     // create the main application window
     LifeFrame *frame = new LifeFrame();
 
     // create the main application window
     LifeFrame *frame = new LifeFrame();
 

-    // show it and tell the application that it's our main window
+    // show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);

 
     // just for Motif
 #ifdef __WXMOTIF__
 
     // just for Motif
 #ifdef __WXMOTIF__

diff --git a/docs/doxygen/overviews/app.h b/docs/doxygen/overviews/app.h
index 8217e20dde76f4044ab3b90af26c9cf2eae2b7f8..261aa5efbffb30bb2a096d1a5907cb6432c28bda 100644 (file)
--- a/docs/doxygen/overviews/app.h
+++ b/docs/doxygen/overviews/app.h
@@ -27,8 +27,7 @@ the wxApp::OnInit member defined for a class derived from wxApp.
 @e OnInit will usually create a top window as a bare minimum. Unlike in earlier
 versions of wxWidgets, OnInit does not return a frame. Instead it returns a
 boolean value which indicates whether processing should continue (@true) or not
 @e OnInit will usually create a top window as a bare minimum. Unlike in earlier
 versions of wxWidgets, OnInit does not return a frame. Instead it returns a
 boolean value which indicates whether processing should continue (@true) or not

-(@false). You call wxApp::SetTopWindow to let wxWidgets know about the top
-window.
+(@false).

 
 Note that the program's command line arguments, represented by @e argc and
 @e argv, are available from within wxApp member functions.
 
 Note that the program's command line arguments, represented by @e argc and
 @e argv, are available from within wxApp member functions.


@@ -59,7 +58,6 @@ bool DerivedApp::OnInit()
     wxFrame *the_frame = new wxFrame(NULL, ID_MYFRAME, argv[0]);
     ...
     the_frame->Show(true);
     wxFrame *the_frame = new wxFrame(NULL, ID_MYFRAME, argv[0]);
     ...
     the_frame->Show(true);

-    SetTopWindow(the_frame);

 
     return true;
 }
 
     return true;
 }

diff --git a/docs/doxygen/overviews/helloworld.h b/docs/doxygen/overviews/helloworld.h
index 913f76e82623acfcb42381560f3d39b36c86a6a6..fe1743958c32d64db32db72d1a5f4ff48720f35d 100644 (file)
--- a/docs/doxygen/overviews/helloworld.h
+++ b/docs/doxygen/overviews/helloworld.h
@@ -124,7 +124,6 @@ bool MyApp::OnInit()
 {
     MyFrame *frame = new MyFrame( "Hello World", wxPoint(50,50), wxSize(450,340) );
     frame->Show( true );
 {
     MyFrame *frame = new MyFrame( "Hello World", wxPoint(50,50), wxSize(450,340) );
     frame->Show( true );

-    SetTopWindow( frame );

     return true;
 }
 @endcode
     return true;
 }
 @endcode

diff --git a/docs/doxygen/overviews/python.h b/docs/doxygen/overviews/python.h
index 0517b04dcb6c96f709d3949825267b22ae2cc888..04dde37b1de484177c8c1b650b35eb763ed0db05 100644 (file)
--- a/docs/doxygen/overviews/python.h
+++ b/docs/doxygen/overviews/python.h
@@ -206,8 +206,6 @@ python DialogUnits.py
 62:         frame = MyFrame(NULL, -1, "This is a test")
 63:         frame.Show(true)
 64:
 62:         frame = MyFrame(NULL, -1, "This is a test")
 63:         frame.Show(true)
 64:

-65:         # Tell wxWidgets that this is our main window
-66:         self.SetTopWindow(frame)

 67:
 68:         # Return a success flag
 69:         return true
 67:
 68:         # Return a success flag
 69:         return true


@@ -257,8 +255,7 @@ Destroy() method as shown on line 36.
 
 Just like wxWidgets in C++, wxPython apps need to create a class derived from
 @c wxApp (line 56) that implements a method named @c OnInit, (line 59.) This
 
 Just like wxWidgets in C++, wxPython apps need to create a class derived from
 @c wxApp (line 56) that implements a method named @c OnInit, (line 59.) This

-method should create the application's main window (line 62) and use
-wxApp.SetTopWindow() (line 66) to inform wxWidgets about it.
+method should create the application's main window (line 62) and show it.

 
 And finally, at line 72 an instance of the application class is created. At
 this point wxPython finishes initializing itself, and calls the @c OnInit
 
 And finally, at line 72 an instance of the application class is created. At
 this point wxPython finishes initializing itself, and calls the @c OnInit

diff --git a/samples/animate/anitest.cpp b/samples/animate/anitest.cpp
index 13d00db097422149d7e8c28e893313b24df41c02..413558002f2f69156afb57e5ad2ab8ca95c8c46b 100644 (file)
--- a/samples/animate/anitest.cpp
+++ b/samples/animate/anitest.cpp
@@ -102,8 +102,6 @@ bool MyApp::OnInit()
                                  wxDEFAULT_FRAME_STYLE);
     frame->Show(true);
 
                                  wxDEFAULT_FRAME_STYLE);
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/aui/auidemo.cpp b/samples/aui/auidemo.cpp
index faea051a5c5428d7c4cfa89790b0ab2078fbda70..33dbaac0caea09cd5dd6baca26bb3dfbaa330c70 100644 (file)
--- a/samples/aui/auidemo.cpp
+++ b/samples/aui/auidemo.cpp
@@ -570,7 +570,6 @@ bool MyApp::OnInit()
                                  wxT("wxAUI Sample Application"),
                                  wxDefaultPosition,
                                  wxSize(800, 600));
                                  wxT("wxAUI Sample Application"),
                                  wxDefaultPosition,
                                  wxSize(800, 600));

-    SetTopWindow(frame);

     frame->Show();
 
     return true;
     frame->Show();
 
     return true;

diff --git a/samples/config/conftest.cpp b/samples/config/conftest.cpp
index c30baf42714b187d0ac1c163df17e7414123fbcc..a9c56761ab92e3328b2a710ffbbb609af6ce3a93 100644 (file)
--- a/samples/config/conftest.cpp
+++ b/samples/config/conftest.cpp
@@ -119,7 +119,6 @@ bool MyApp::OnInit()
     // create the main program window
     MyFrame *frame = new MyFrame;
     frame->Show(true);
     // create the main program window
     MyFrame *frame = new MyFrame;
     frame->Show(true);

-    SetTopWindow(frame);

 
     // use our config object...
     if ( pConfig->Read(wxT("/Controls/Check"), 1l) != 0 ) {
 
     // use our config object...
     if ( pConfig->Read(wxT("/Controls/Check"), 1l) != 0 ) {

diff --git a/samples/dataview/dataview.cpp b/samples/dataview/dataview.cpp
index baf7166263b093e198de195a767c771e79c921eb..ed3d828173440f534a0a6d51836a248f127bb5e9 100644 (file)
--- a/samples/dataview/dataview.cpp
+++ b/samples/dataview/dataview.cpp
@@ -242,7 +242,6 @@ bool MyApp::OnInit()
 
     MyFrame *frame =
         new MyFrame(NULL, "wxDataViewCtrl sample", 40, 40, 1000, 540);
 
     MyFrame *frame =
         new MyFrame(NULL, "wxDataViewCtrl sample", 40, 40, 1000, 540);

-    SetTopWindow(frame);

 
     frame->Show(true);
     return true;
 
     frame->Show(true);
     return true;

diff --git a/samples/dialup/nettest.cpp b/samples/dialup/nettest.cpp
index 8e68d35171b0e55d8be6ff196c00601bdc226af7..e317e100aceed21c64b542e9f320fe5535442d0b 100644 (file)
--- a/samples/dialup/nettest.cpp
+++ b/samples/dialup/nettest.cpp
@@ -161,9 +161,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(wxT("Dial-up wxWidgets demo"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     MyFrame *frame = new MyFrame(wxT("Dial-up wxWidgets demo"),
                                  wxPoint(50, 50), wxSize(450, 340));
 

-    // Show it and tell the application that it's our main window
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);

 
     // Init dial up manager
     m_dial = wxDialUpManager::Create();
 
     // Init dial up manager
     m_dial = wxDialUpManager::Create();

diff --git a/samples/docview/docview.cpp b/samples/docview/docview.cpp
index e95442160835af699edf22237e0133c12f627ddf..57eeef7c520d9f073ac62083c4eb2f60a6603aeb 100644 (file)
--- a/samples/docview/docview.cpp
+++ b/samples/docview/docview.cpp
@@ -231,7 +231,6 @@ bool MyApp::OnInit()
     frame->Centre();
     frame->Show();
 
     frame->Centre();
     frame->Show();
 

-    SetTopWindow(frame);

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index d48e299dab2fcaafcf0a917e8fe5ed59479e2251..ce823f98216058cf733628242b4add50280ab316 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -347,9 +347,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(wxT("Drawing sample"),
                                  wxDefaultPosition, wxSize(550, 840));
 
     MyFrame *frame = new MyFrame(wxT("Drawing sample"),
                                  wxDefaultPosition, wxSize(550, 840));
 

-    // Show it and tell the application that it's our main window
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);

 
     if ( !LoadImages() )
     {
 
     if ( !LoadImages() )
     {

diff --git a/samples/exec/exec.cpp b/samples/exec/exec.cpp
index 4f72a17958f6e0dc354aa691ce9ddb1b598801b0..6fe2ff9dd5acee1b8beb0fdab44f94d4f6866675 100644 (file)
--- a/samples/exec/exec.cpp
+++ b/samples/exec/exec.cpp
@@ -413,9 +413,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(wxT("Exec wxWidgets sample"),
                                  wxDefaultPosition, wxSize(500, 140));
 
     MyFrame *frame = new MyFrame(wxT("Exec wxWidgets sample"),
                                  wxDefaultPosition, wxSize(500, 140));
 

-    // Show it and tell the application that it's our main window
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the

diff --git a/samples/font/font.cpp b/samples/font/font.cpp
index 8dc2e42d2c6866bb33056b814604ba4b4be3ba42..0bd4df1c5bfa7268c69840d04228d17509bb4f73 100644 (file)
--- a/samples/font/font.cpp
+++ b/samples/font/font.cpp
@@ -282,9 +282,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(wxT("Font wxWidgets demo"),
                                  wxPoint(50, 50), wxSize(600, 400));
 
     MyFrame *frame = new MyFrame(wxT("Font wxWidgets demo"),
                                  wxPoint(50, 50), wxSize(600, 400));
 

-    // Show it and tell the application that it's our main window
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned 'false' here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned 'false' here, the

diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index 8cc959c746c0850bd0ac7e426e3ae57ef4b7cabe..9ba0461c4b6828e5954fdf357d925c606183bd86 100644 (file)
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -324,7 +324,6 @@ bool MyApp::OnInit()
 #endif // !USE_SIMPLE_HELP_PROVIDER
 
     frame->Show(true);
 #endif // !USE_SIMPLE_HELP_PROVIDER
 
     frame->Show(true);

-    SetTopWindow(frame);

 
     // initialise the help system: this means that we'll use doc.hlp file under
     // Windows and that the HTML docs are in the subdirectory doc for platforms
 
     // initialise the help system: this means that we'll use doc.hlp file under
     // Windows and that the HTML docs are in the subdirectory doc for platforms

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index c1c2954466af4cc15d4ab5ff29fef11fb399e610..490fdbef11428cfa743c070aa0d063537fe87196 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -127,11 +127,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_("HTML Help Sample"),
         wxDefaultPosition, wxDefaultSize);
 
     MyFrame *frame = new MyFrame(_("HTML Help Sample"),
         wxDefaultPosition, wxDefaultSize);
 

-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);
-

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the

diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp
index c6390fc4130732939df9a3f351036dd5ff69fcaa..3fea8d49ebcc1952de91bbca7c8283973f2708bb 100644 (file)
--- a/samples/html/printing/printing.cpp
+++ b/samples/html/printing/printing.cpp
@@ -152,11 +152,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_("Printing test"),
         wxDefaultPosition, wxSize(640, 480));
 
     MyFrame *frame = new MyFrame(_("Printing test"),
         wxDefaultPosition, wxSize(640, 480));
 

-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);
-

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the

diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index 58310342a60a7751a734a846e75599074e9956a5..c22ce0ccfbcf84b31d288e6fe7090462a0ac7a78 100644 (file)
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -169,10 +169,9 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
         wxDefaultPosition, wxSize(640, 480));
 
     MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
         wxDefaultPosition, wxSize(640, 480));
 

-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);
+

     wxFileSystem::AddHandler(new MyVFS);
 
     // success: wxApp::OnRun() will be called which will enter the main message
     wxFileSystem::AddHandler(new MyVFS);
 
     // success: wxApp::OnRun() will be called which will enter the main message

diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp
index c1449ce77200e6888413fb3a265337feda2c97e0..1a05c51ee8f836dabd06333f677a7bc391768fdc 100644 (file)
--- a/samples/html/widget/widget.cpp
+++ b/samples/html/widget/widget.cpp
@@ -162,10 +162,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame( _("wxHtmlWindow testing application"),
         wxDefaultPosition, wxSize(640, 480) );
 
     MyFrame *frame = new MyFrame( _("wxHtmlWindow testing application"),
         wxDefaultPosition, wxSize(640, 480) );
 

-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 6363dfab85f1ce63d5a6b8426fdb3e470f0598bd..accf15623fec4cf5b66fbf8b0b819d1a8f41cfc0 100644 (file)
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -123,10 +123,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
         wxDefaultPosition, wxSize(640, 480) );
 
     MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
         wxDefaultPosition, wxSize(640, 480) );
 

-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the

diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index 4ce95d0d13e69ab9bbf670f4cff4932feb793fbd..b39fb8972cb777d17eaa420cfa7cb465982d32da 100644 (file)
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -271,7 +271,6 @@ bool MyApp::OnInit()
 
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);

-    SetTopWindow(frame);

 
     return true;
 }
 
     return true;
 }

diff --git a/samples/joytest/joytest.cpp b/samples/joytest/joytest.cpp
index 0d25748342c32ddd16f92111b0a3e580fc080c20..729073fe04c4539fd8b838c4ca9932b9ee55876f 100644 (file)
--- a/samples/joytest/joytest.cpp
+++ b/samples/joytest/joytest.cpp
@@ -89,8 +89,6 @@ bool MyApp::OnInit()
     frame->CenterOnScreen();
     frame->Show(true);
 
     frame->CenterOnScreen();
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/listctrl/listtest.cpp b/samples/listctrl/listtest.cpp
index 4a08c2907856a3a78a56f8f4c4daf3b163101eeb..dc715e643b031febd05c711656bed0165b306c38 100644 (file)
--- a/samples/listctrl/listtest.cpp
+++ b/samples/listctrl/listtest.cpp
@@ -100,8 +100,6 @@ bool MyApp::OnInit()
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/menu/menu.cpp b/samples/menu/menu.cpp
index c4ce7f36734482e1606f3747deeeaebd82422b07..a8ba08b0348233c968d0607edefd2d65e3896fbf 100644 (file)
--- a/samples/menu/menu.cpp
+++ b/samples/menu/menu.cpp
@@ -365,8 +365,6 @@ bool MyApp::OnInit()
     frame->SetStatusText(wxT("Welcome to wxWidgets menu sample"));
 #endif // wxUSE_STATUSBAR
 
     frame->SetStatusText(wxT("Welcome to wxWidgets menu sample"));
 #endif // wxUSE_STATUSBAR
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp
index fa7c72140bd004883dc73fbde5214cd50fd52834..a3bb423cfd0ddd789ba009dbd78927f2ed6998be 100644 (file)
--- a/samples/nativdlg/nativdlg.cpp
+++ b/samples/nativdlg/nativdlg.cpp
@@ -67,9 +67,6 @@ bool MyApp::OnInit(void)
   frame->panel = new wxWindow(frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400), 0, wxT("MyMainFrame"));
   frame->Show(true);
 
   frame->panel = new wxWindow(frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400), 0, wxT("MyMainFrame"));
   frame->Show(true);
 

-  // Return the main frame window
-  SetTopWindow(frame);
-

   return true;
 }
 
   return true;
 }
 

diff --git a/samples/notebook/notebook.cpp b/samples/notebook/notebook.cpp
index a0adb5ed61af7965b27d32d2450d83b9b32e6ce7..5387775761c22527e5636bdcb7ff85652cedfb01 100644 (file)
--- a/samples/notebook/notebook.cpp
+++ b/samples/notebook/notebook.cpp
@@ -47,7 +47,6 @@ bool MyApp::OnInit()
 
     // Create the main window
     MyFrame *frame = new MyFrame();
 
     // Create the main window
     MyFrame *frame = new MyFrame();

-    SetTopWindow(frame);

 
     // 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

diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index a9dd3cb48b157fcd8872ace9af5e4b117b7190de..bf3b5ca1cfd60834b94db44d2bcba89b2015fab9 100644 (file)
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -132,10 +132,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(wxT("OleAuto wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     MyFrame *frame = new MyFrame(wxT("OleAuto wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 

-    // Show it and tell the application that it's our main window
-    // @@@ what does it do exactly, in fact? is it necessary here?
+    // Show it

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the

diff --git a/samples/opengl/isosurf/isosurf.cpp b/samples/opengl/isosurf/isosurf.cpp
index 6b04b47168f1b10cd482d8754e896b371a11af8a..a2ea654f916d98f1d7f5fcec5c4d304480a224d1 100644 (file)
--- a/samples/opengl/isosurf/isosurf.cpp
+++ b/samples/opengl/isosurf/isosurf.cpp
@@ -57,7 +57,7 @@ bool MyApp::OnInit()
         return false;
 
     // Create the main frame window
         return false;
 
     // Create the main frame window

-    SetTopWindow(new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample")));
+    MyFrame *frame = new MyFrame(NULL, wxT("wxWidgets OpenGL Isosurf Sample"));

 
     return true;
 }
 
     return true;
 }

diff --git a/samples/ownerdrw/ownerdrw.cpp b/samples/ownerdrw/ownerdrw.cpp
index b15aa9d68c6f01ad88d2aaefa41115b38e4296e4..80a7c2eb7471b26297f9883090d4348b1a913277 100644 (file)
--- a/samples/ownerdrw/ownerdrw.cpp
+++ b/samples/ownerdrw/ownerdrw.cpp
@@ -97,8 +97,6 @@ bool OwnerDrawnApp::OnInit(void)
         = new OwnerDrawnFrame(NULL, wxT("wxWidgets Ownerdraw Sample"),
                               50, 50, 450, 340);
 
         = new OwnerDrawnFrame(NULL, wxT("wxWidgets Ownerdraw Sample"),
                               50, 50, 450, 340);
 

-    SetTopWindow(pFrame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/printing/printing.cpp b/samples/printing/printing.cpp
index 205caee63724687992ecf5452b9326c080bbefa6..bb4daffb35e125cfc6f4fc10cf3d2704698cb56f 100644 (file)
--- a/samples/printing/printing.cpp
+++ b/samples/printing/printing.cpp
@@ -123,8 +123,6 @@ bool MyApp::OnInit(void)
     frame->Centre(wxBOTH);
     frame->Show();
 
     frame->Centre(wxBOTH);
     frame->Show();
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/regtest/regtest.cpp b/samples/regtest/regtest.cpp
index ac77e7bb811f3d16310c1a6c0d0bd26ffd42fea8..64a96ef3efcedd84c5323359cb7d0d3a45428e99 100644 (file)
--- a/samples/regtest/regtest.cpp
+++ b/samples/regtest/regtest.cpp
@@ -326,8 +326,6 @@ bool RegApp::OnInit()
     RegFrame *frame = new RegFrame(NULL, wxT("wxRegTest"), 50, 50, 600, 350);
     frame->Show(true);
 
     RegFrame *frame = new RegFrame(NULL, wxT("wxRegTest"), 50, 50, 600, 350);
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/ribbon/ribbondemo.cpp b/samples/ribbon/ribbondemo.cpp
index e85a3217cb9c649dbfcfe4e9e27882ff042c7e39..976544ee40d133197cec5a1560377d90e3f80e5e 100644 (file)
--- a/samples/ribbon/ribbondemo.cpp
+++ b/samples/ribbon/ribbondemo.cpp
@@ -139,7 +139,6 @@ bool MyApp::OnInit()
         return false;
 
     wxFrame* frame = new MyFrame;
         return false;
 
     wxFrame* frame = new MyFrame;

-    SetTopWindow(frame);

     frame->Show();
 
     return true;
     frame->Show();
 
     return true;

diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index b42bac05ac949fd1618fa732b4c6b442141681af..5ed6c61b883bf56368afb2b9dfb07b45292c98c4 100644 (file)
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -79,8 +79,6 @@ bool MyApp::OnInit(void)
 
   frame->Show(true);
 
 
   frame->Show(true);
 

-  SetTopWindow(frame);
-

   return true;
 }
 
   return true;
 }
 

diff --git a/samples/sockets/client.cpp b/samples/sockets/client.cpp
index b45ccb3f0962549db777ef00ea73553e77566c11..7b67c98dd8bae9f03698afb14834070a6e127dd9 100644 (file)
--- a/samples/sockets/client.cpp
+++ b/samples/sockets/client.cpp
@@ -190,9 +190,8 @@ bool MyApp::OnInit()
   // Create the main application window
   MyFrame *frame = new MyFrame();
 
   // Create the main application window
   MyFrame *frame = new MyFrame();
 

-  // Show it and tell the application that it's our main window
+  // Show it

   frame->Show(true);
   frame->Show(true);

-  SetTopWindow(frame);

 
   // success
   return true;
 
   // success
   return true;

diff --git a/samples/sockets/server.cpp b/samples/sockets/server.cpp
index 4187191ceeca460067d005619ec8e3d5cd2e5cd9..a57137cbede9bad612b41333c6da95212dfccc37 100644 (file)
--- a/samples/sockets/server.cpp
+++ b/samples/sockets/server.cpp
@@ -162,9 +162,8 @@ bool MyApp::OnInit()
   // Create the main application window
   MyFrame *frame = new MyFrame();
 
   // Create the main application window
   MyFrame *frame = new MyFrame();
 

-  // Show it and tell the application that it's our main window
+  // Show it

   frame->Show(true);
   frame->Show(true);

-  SetTopWindow(frame);

 
   // Success
   return true;
 
   // Success
   return true;

diff --git a/samples/stc/stctest.cpp b/samples/stc/stctest.cpp
index 9b83838205caac8c90b78b392dd5d72fa145d984..069008b5447a2062c8297052ea29dd522f8d328a 100644 (file)
--- a/samples/stc/stctest.cpp
+++ b/samples/stc/stctest.cpp
@@ -226,7 +226,6 @@ bool App::OnInit () {
     // open application frame
     m_frame->Layout ();
     m_frame->Show (true);
     // open application frame
     m_frame->Layout ();
     m_frame->Show (true);

-    SetTopWindow (m_frame);

 
     return true;
 }
 
     return true;
 }

diff --git a/samples/svg/svgtest.cpp b/samples/svg/svgtest.cpp
index 6f42626b66bf2a713fbc57e41d934b9fd4c11b89..159a15cf9c0983c854a5e38bc79f78d0a6c11b4e 100644 (file)
--- a/samples/svg/svgtest.cpp
+++ b/samples/svg/svgtest.cpp
@@ -160,8 +160,6 @@ bool MyApp::OnInit()
 
     frame->Show(true);
 
 
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/text/text.cpp b/samples/text/text.cpp
index 8880c7880827b6161fba6c7d705307ed978a0368..3a2f94a910f57bee599d59740e0cac3ebe282ff1 100644 (file)
--- a/samples/text/text.cpp
+++ b/samples/text/text.cpp
@@ -545,8 +545,6 @@ bool MyApp::OnInit()
 
     frame->Show(true);
 
 
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     // report success
     return true;
 }
     // report success
     return true;
 }

diff --git a/samples/toolbar/toolbar.cpp b/samples/toolbar/toolbar.cpp
index e1fdb33f7a39d8344da27affd1c212a181c0400a..180ac7ccd468ff621ee2843ef0967a9357ff5f49 100644 (file)
--- a/samples/toolbar/toolbar.cpp
+++ b/samples/toolbar/toolbar.cpp
@@ -315,8 +315,6 @@ bool MyApp::OnInit()
 
     wxInitAllImageHandlers();
 
 
     wxInitAllImageHandlers();
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/treectrl/treetest.cpp b/samples/treectrl/treetest.cpp
index f22c46718952d0c12da28f902c3423839fa82ee9..96a72c294083f5bedf8badb05ed77f8432f8e6c5 100644 (file)
--- a/samples/treectrl/treetest.cpp
+++ b/samples/treectrl/treetest.cpp
@@ -198,7 +198,6 @@ bool MyApp::OnInit()
 
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);

-    SetTopWindow(frame);

 
     return true;
 }
 
     return true;
 }

diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index c5d6574ea4b403fff77db3250d5b1640285bd113..61a6de06dfb314f4567a82d07aae313fc3467ac1 100644 (file)
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -116,8 +116,6 @@ bool MyApp::OnInit()
     // Show the frame
     frame->Show(true);
 
     // Show the frame
     frame->Show(true);
 

-    SetTopWindow(frame);
-

     return true;
 }
 
     return true;
 }
 

diff --git a/samples/validate/validate.cpp b/samples/validate/validate.cpp
index 8b81a9f7105afe1a58e80995059db0632d21d29b..344f719d148070f123a5ae74d38be2d72df19b91 100644 (file)
--- a/samples/validate/validate.cpp
+++ b/samples/validate/validate.cpp
@@ -136,7 +136,7 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame((wxFrame *) NULL, wxT("Validator Test"),
                                  50, 50, 300, 250);
     frame->Show(true);
     MyFrame *frame = new MyFrame((wxFrame *) NULL, wxT("Validator Test"),
                                  50, 50, 300, 250);
     frame->Show(true);

-    SetTopWindow(frame);
+

     return true;
 }
 
     return true;
 }