Fix a crash in wxExecute() in wxMSW too.

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

diff --git a/samples/sashtest/sashtest.cpp b/samples/sashtest/sashtest.cpp
index 7552e91e01bb2761aa527fc3102e17589020dc0e..13b6a9df3dc3d79e97d92493ee27572e2f8c4853 100644 (file)
--- a/samples/sashtest/sashtest.cpp
+++ b/samples/sashtest/sashtest.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -79,8 +79,6 @@ bool MyApp::OnInit(void)
 
   frame->Show(true);
 
 
   frame->Show(true);
 

-  SetTopWindow(frame);
-

   return true;
 }
 
   return true;
 }
 


@@ -110,7 +108,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetDefaultSize(wxSize(1000, 30));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_TOP);
   win->SetDefaultSize(wxSize(1000, 30));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_TOP);

-  win->SetBackgroundColour(wxColour(255, 0, 0));
+  win->SetBackgroundColour(*wxRED);

   win->SetSashVisible(wxSASH_BOTTOM, true);
 
   m_topWindow = win;
   win->SetSashVisible(wxSASH_BOTTOM, true);
 
   m_topWindow = win;


@@ -122,7 +120,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetDefaultSize(wxSize(1000, 30));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_BOTTOM);
   win->SetDefaultSize(wxSize(1000, 30));
   win->SetOrientation(wxLAYOUT_HORIZONTAL);
   win->SetAlignment(wxLAYOUT_BOTTOM);

-  win->SetBackgroundColour(wxColour(0, 0, 255));
+  win->SetBackgroundColour(*wxBLUE);

   win->SetSashVisible(wxSASH_TOP, true);
 
   m_bottomWindow = win;
   win->SetSashVisible(wxSASH_TOP, true);
 
   m_bottomWindow = win;


@@ -134,7 +132,7 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c
   win->SetDefaultSize(wxSize(120, 1000));
   win->SetOrientation(wxLAYOUT_VERTICAL);
   win->SetAlignment(wxLAYOUT_LEFT);
   win->SetDefaultSize(wxSize(120, 1000));
   win->SetOrientation(wxLAYOUT_VERTICAL);
   win->SetAlignment(wxLAYOUT_LEFT);

-  win->SetBackgroundColour(wxColour(0, 255, 0));
+  win->SetBackgroundColour(*wxGREEN);

   win->SetSashVisible(wxSASH_RIGHT, true);
   win->SetExtraBorderSize(10);
 
   win->SetSashVisible(wxSASH_RIGHT, true);
   win->SetExtraBorderSize(10);