Updated makefiles etc. for 2.5.1

[wxWidgets.git] / contrib / samples / fl / fl_demo2.h

diff --git a/contrib/samples/fl/fl_demo2.h b/contrib/samples/fl/fl_demo2.h
index 24b2317c050a1edf25665a6618a1db434a769872..028b83d0d568006bc9679b6727c737d49d96ece3 100644 (file)
--- a/contrib/samples/fl/fl_demo2.h
+++ b/contrib/samples/fl/fl_demo2.h
@@ -80,10 +80,10 @@ protected:
     
     // helpers for control-creation
     
-    wxTextCtrl* CreateTxtCtrl ( const wxString& txt = "wxTextCtrl", wxWindow* parent = NULL  );
-    wxTreeCtrl* CreateTreeCtrl( const wxString& label = "TreeCtrl" );
-    wxChoice*   CreateChoice  ( const wxString& txt = "Choice1" );
-    wxButton*   CreateButton  ( const wxString& label = "wxButton", wxWindow* pParent = NULL, long id = ID_SAY_ITSOK );
+    wxTextCtrl* CreateTxtCtrl ( const wxString& txt = wxT("wxTextCtrl"), wxWindow* parent = NULL  );
+    wxTreeCtrl* CreateTreeCtrl( const wxString& label = wxT("TreeCtrl") );
+    wxChoice*   CreateChoice  ( const wxString& txt = wxT("Choice1") );
+    wxButton*   CreateButton  ( const wxString& label = wxT("wxButton"), wxWindow* pParent = NULL, long id = ID_SAY_ITSOK );
     
     // helpers for layout-creation
     
@@ -100,7 +100,7 @@ protected:
     
 public: /* public */
     
-    MyFrame( wxFrame *frame, char *title, int x, int y, int w, int h);
+    MyFrame( wxFrame *frame, const wxChar *title, int x, int y, int w, int h);
     
     ~MyFrame();