Rebake for 2.6.2

[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..aa546c98793da2a7d1b2b2a02cdcc9d9dd8e7412 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
 // Created:     04/11/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleksandras Gluchovas

-// Licence:    wxWindows license
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __FLDEMO_G__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __FLDEMO_G__


@@ -14,7 +14,7 @@
 
 // ID for the menu commands
 
 
 // ID for the menu commands
 

-#define MINIMAL_QUIT   1
+#define MINIMAL_QUIT    1

 #define MINIMAL_ABOUT 102
 
 #define ID_LOAD      103
 #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_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
 
 #define ID_SECOND    112
 #define ID_THIRD     113
 


@@ -49,7 +49,7 @@ typedef wxPanel MyTestPanel;
 // Define a new application type
 
 class MyApp: public wxApp
 // Define a new application type
 
 class MyApp: public wxApp

-{ 
+{

 public:
     bool OnInit(void);
 };
 public:
     bool OnInit(void);
 };


@@ -57,59 +57,59 @@ public:
 // Define a new frame type
 
 class MyFrame: public wxFrame
 // Define a new frame type
 
 class MyFrame: public wxFrame

-{ 
+{

 protected:
 protected:

-    
+

     wxFrameLayout* mLayouts[MAX_LAYOUTS];
     wxFrameLayout* mLayouts[MAX_LAYOUTS];

-    
+

     wxFrameLayout* mpNestedLayout;
     wxFrameLayout* mpAboutBoxLayout;
     wxFrameLayout* mpNestedLayout;
     wxFrameLayout* mpAboutBoxLayout;

-    
-    int            mActiveLayoutNo;   
+
+    int            mActiveLayoutNo;

     bool           mAutoSave;
     bool           mSavedAlready;
     bool           mAutoSave;
     bool           mSavedAlready;

-    
+

     // container windows:
     // container windows:

-    
+

     wxTextCtrl*    mpClntWindow;
     wxPanel*       mpInternalFrm;
     wxTextCtrl*    mpClntWindow;
     wxPanel*       mpInternalFrm;

-    
+

     wxImageList    mImageList;
     wxImageList    mImageList;

-    
+

     wxFrame       mAboutBox;
     wxFrame       mAboutBox;

-    
+

     // helpers for control-creation
     // 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
     // helpers for layout-creation

-    
+

     void AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent );
     wxWindow* CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent );
     void AddSearchToolbars( wxFrameLayout& layout, wxWindow* pParent );
     wxWindow* CreateDevLayout( wxFrameLayout& layout, wxWindow* pParent );

-    
+

     void DropInSomeBars( int layoutNo );
     void CreateLayout( int layoutNo );
     void RemoveLayout( int layoutNo );
     void DropInSomeBars( int layoutNo );
     void CreateLayout( int layoutNo );
     void RemoveLayout( int layoutNo );

-    
+

     void InitAboutBox();
     void InitAboutBox();

-    
+

     void ActivateLayout( int layoutNo );
     void ActivateLayout( int layoutNo );

-    
+

 public: /* public */
 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();
     ~MyFrame();

-    
+

     void SyncMenuBarItems();
     void SyncMenuBarItems();

-    
+

     // event handlers
     // event handlers

-    
+

     bool OnClose(void);
     bool OnClose(void);

-    
+

     void OnLoad( wxCommandEvent& event );
     void OnStore( wxCommandEvent& event );
     void OnAutoSave( wxCommandEvent& event );
     void OnLoad( wxCommandEvent& event );
     void OnStore( wxCommandEvent& event );
     void OnAutoSave( wxCommandEvent& event );


@@ -122,15 +122,15 @@ public: /* public */
     void OnFirst( wxCommandEvent& event );
     void OnSecond( wxCommandEvent& event );
     void OnThird( wxCommandEvent& event );
     void OnFirst( wxCommandEvent& event );
     void OnSecond( wxCommandEvent& event );
     void OnThird( wxCommandEvent& event );

-    
+

     void OnSayItsOk( wxCommandEvent& event );
     void OnBtnYes( wxCommandEvent& event );
     void OnBtnNo( wxCommandEvent& event );
     void OnBtnEsc( wxCommandEvent& event );
     void OnSayItsOk( wxCommandEvent& event );
     void OnBtnYes( wxCommandEvent& event );
     void OnBtnNo( wxCommandEvent& event );
     void OnBtnEsc( wxCommandEvent& event );

-    
+

     void OnChar( wxKeyEvent& event );
     void OnChar( wxKeyEvent& event );

-    
-    DECLARE_EVENT_TABLE()   
+
+    DECLARE_EVENT_TABLE()

 };
 
 // Define a new button type, StartButton95 (Just for fun)
 };
 
 // Define a new button type, StartButton95 (Just for fun)


@@ -138,21 +138,21 @@ public: /* public */
 class StartButton95 : public wxPanel
 {
     DECLARE_DYNAMIC_CLASS( StartButton95 )
 class StartButton95 : public wxPanel
 {
     DECLARE_DYNAMIC_CLASS( StartButton95 )

-        
+

     bool m_bPressed;
     wxBitmap m_PBmp;
     wxBitmap m_DBmp;
     bool m_bPressed;
     wxBitmap m_PBmp;
     wxBitmap m_DBmp;

-    
+

 public:
 public:

-    StartButton95(void) : m_bPressed(FALSE) {}
-    
-    StartButton95(wxWindow* parent) 
-        : m_bPressed(FALSE) { wxPanel::Create(parent,-1); }
-    
+    StartButton95(void) : m_bPressed(false) {}
+
+    StartButton95(wxWindow* parent)
+        : m_bPressed(false) { wxPanel::Create(parent,wxID_ANY); }
+

     void OnMouseDown( wxMouseEvent& event );
     void OnMouseUp( wxMouseEvent& event );
     void OnPaint( wxPaintEvent& event );
     void OnMouseDown( wxMouseEvent& event );
     void OnMouseUp( wxMouseEvent& event );
     void OnPaint( wxPaintEvent& event );

-    
+

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };