X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/227869da8d090e2364530dd310e2d63ad18edecf..e57e26dd03d65ccb816d34b5254398b448e74018:/samples/layout/layout.cpp

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index e33b97fad9..54c4b3a740 100644
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #if !wxUSE_CONSTRAINTS
-#error You must set wxUSE_CONSTRAINTS to 1 in wx_setup.h!
+#error You must set wxUSE_CONSTRAINTS to 1 in setup.h!
 #endif
 
 #include <ctype.h>
@@ -171,7 +171,8 @@ END_EVENT_TABLE()
 
 void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
 {
-      wxString s = wxFileSelector("Load text file", (const char *) NULL, (const char *) NULL, (const char *) NULL, "*.txt");
+      wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL, 
+                                   (const wxChar *) NULL, (const wxChar *) NULL, _T("*.txt") );
       if (s != "")
       {
 #ifdef __WXMSW__
@@ -244,14 +245,6 @@ void MyWindow::OnPaint(wxPaintEvent& WXUNUSED(event) )
   frame->Draw(dc,TRUE);
 }
 
-// Define the behaviour for the frame closing
-// - must delete all frames except for the main one.
-bool MyFrame::OnClose(void)
-{
-  Show(FALSE);
-
-  return TRUE;
-}
 
 SizerFrame::SizerFrame(wxFrame *frame, char *title, int x, int y, int w, int h):
   wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
@@ -346,10 +339,3 @@ void SizerFrame::OnSize(wxSizeEvent& event)
   panel->Layout();
 }
 
-bool SizerFrame::OnClose(void)
-{
-  Show(FALSE);
-
-  return TRUE;
-}
-