second try...

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

diff --git a/samples/layout/layout.cpp b/samples/layout/layout.cpp
index ab66c79b015c582c5bcd5f9b0f42ed9c257f6c68..54c4b3a74082899943a3a2a7735ff1a9cc6454b5 100644 (file)
--- a/samples/layout/layout.cpp
+++ b/samples/layout/layout.cpp
@@ -21,7 +21,7 @@
 #endif
 
 #if !wxUSE_CONSTRAINTS
 #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>
 #endif
 
 #include <ctype.h>


@@ -171,7 +171,8 @@ END_EVENT_TABLE()
 
 void MyFrame::LoadFile(wxCommandEvent& WXUNUSED(event) )
 {
 
 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__
       if (s != "")
       {
 #ifdef __WXMSW__