Patch from Joe "shmengie" Brown joebrown@podiatryfl.com

[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..3adeedf9ea0c891c04c5ef25fc85e6f38ed101aa 100644 (file)
--- a/contrib/samples/fl/fl_demo2.h
+++ b/contrib/samples/fl/fl_demo2.h
@@ -6,7 +6,7 @@
 // Created:     04/11/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas
-// Licence:    wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __FLDEMO_G__
@@ -14,7 +14,7 @@
 
 // ID for the menu commands
 
-#define MINIMAL_QUIT   1
+#define MINIMAL_QUIT    1
 #define MINIMAL_ABOUT 102
 
 #define ID_LOAD      103
@@ -25,7 +25,7 @@
 #define ID_REMOVEALL 108
 #define ID_RECREATE  109
 #define ID_ACTIVATE  110
-#define ID_FIRST        111
+#define ID_FIRST     111
 #define ID_SECOND    112
 #define ID_THIRD     113
 
@@ -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();
     
@@ -144,10 +144,10 @@ class StartButton95 : public wxPanel
     wxBitmap m_DBmp;
     
 public:
-    StartButton95(void) : m_bPressed(FALSE) {}
+    StartButton95(void) : m_bPressed(false) {}
     
     StartButton95(wxWindow* parent) 
-        : m_bPressed(FALSE) { wxPanel::Create(parent,-1); }
+        : m_bPressed(false) { wxPanel::Create(parent,wxID_ANY); }
     
     void OnMouseDown( wxMouseEvent& event );
     void OnMouseUp( wxMouseEvent& event );