check wxUSE_LIBJPEG

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

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index 8096c82b8f0186ab9105f2da802dd665dc5949c0..54c4b3a74082899943a3a2a7735ff1a9cc6454b5 100644 (file)
--- 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,8 +171,9 @@ END_EVENT_TABLE()
 
 void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
 {
-      char *s = wxFileSelector("Load text file", (const char *) NULL, (const char *) NULL, (const char *) NULL, "*.txt");
-      if (s)
+      wxString s = wxFileSelector( _T("Load text file"), (const wxChar *) NULL, 
+                                   (const wxChar *) NULL, (const wxChar *) NULL, _T("*.txt") );
+      if (s != "")
       {
 #ifdef __WXMSW__
         frame->text_window->LoadFile(s);
@@ -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;
-}
-