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

[wxWidgets.git] / contrib / samples / fl / fl_sample2.cpp

diff --git a/contrib/samples/fl/fl_sample2.cpp b/contrib/samples/fl/fl_sample2.cpp
index dd389f7002b30362de38f4eb216dc0074f9afafb..d2dae82c744e71a74b0ca22bc6408ea2f136c217 100644 (file)
--- a/contrib/samples/fl/fl_sample2.cpp
+++ b/contrib/samples/fl/fl_sample2.cpp
@@ -57,7 +57,7 @@ public:
     void OnStore( wxCommandEvent& event );
     void OnQuit( wxCommandEvent& event );
     
     void OnStore( wxCommandEvent& event );
     void OnQuit( wxCommandEvent& event );
     

-    bool OnClose(void) { return TRUE; }
+    bool OnClose(void) { return true; }

     
     DECLARE_EVENT_TABLE()
 };
     
     DECLARE_EVENT_TABLE()
 };


@@ -68,7 +68,7 @@ IMPLEMENT_APP    (MyApp)
 
 bool MyApp::OnInit(void)
 {
 
 bool MyApp::OnInit(void)
 {

-    // wxWindows boiler-plate:
+    // wxWidgets boiler-plate:

     
     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
     
     
     MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
     


@@ -84,14 +84,16 @@ bool MyApp::OnInit(void)
     
     menu_bar->Append(file_menu, _("&File"));
     
     
     menu_bar->Append(file_menu, _("&File"));
     

+#if wxUSE_STATUSBAR

     frame->CreateStatusBar(3);
     frame->CreateStatusBar(3);

+#endif // wxUSE_STATUSBAR

     frame->SetMenuBar(menu_bar);
     
     frame->SetMenuBar(menu_bar);
     

-    frame->Show(TRUE);
+    frame->Show(true);

     SetTopWindow(frame);
     frame->populateMyFrame();
     
     SetTopWindow(frame);
     frame->populateMyFrame();
     

-    return TRUE;
+    return true;

 }
 
 /***** Immlementation for class MyFrame *****/
 }
 
 /***** Immlementation for class MyFrame *****/


@@ -103,7 +105,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 END_EVENT_TABLE()
 
 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
 END_EVENT_TABLE()
 
 MyFrame::MyFrame( wxWindow* parent, const wxChar *title )

-    : wxFrame( parent, -1, title, wxDefaultPosition,
+    : wxFrame( parent, wxID_ANY, title, wxDefaultPosition,

           wxSize( 700, 500 ),
           wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
           wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,
           wxSize( 700, 500 ),
           wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
           wxTHICK_FRAME   | wxSYSTEM_MENU  | wxCAPTION,


@@ -124,7 +126,7 @@ void MyFrame::populateMyFrame()
     cbDimInfo sizes( 80,65,     // when docked horizontally      
                      80,165,    // when docked vertically        
                      180,30,    // when floated                  
     cbDimInfo sizes( 80,65,     // when docked horizontally      
                      80,165,    // when docked vertically        
                      180,30,    // when floated                  

-                     TRUE,      // the bar is fixed-size
+                     true,      // the bar is fixed-size

                      5,         // vertical gap (bar border)
                      5          // horizontal gap (bar border)
                    ); 
                      5,         // vertical gap (bar border)
                      5          // horizontal gap (bar border)
                    ); 


@@ -144,7 +146,7 @@ void MyFrame::populateMyFrame()
         
         if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
         //      mpLayout->AddBar( CreateTextCtrl(name),// bar window
         
         if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
         //      mpLayout->AddBar( CreateTextCtrl(name),// bar window

-        mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window
+        mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name),// bar window

                           sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                           0,                   // insert into 0th row (vert. position)
                           0,                   // offset from the start of row (in pixels)
                           sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
                           0,                   // insert into 0th row (vert. position)
                           0,                   // offset from the start of row (in pixels)


@@ -167,7 +169,7 @@ MyFrame::~MyFrame()
 
 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {
 
 wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
 {

-    wxTextCtrl* pCtrl = new wxTextCtrl( this, -1, value, 
+    wxTextCtrl* pCtrl = new wxTextCtrl( this, wxID_ANY, value, 

                                 wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
     
     pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );
                                 wxPoint(0,0), wxSize(1,1), wxTE_MULTILINE );
     
     pCtrl->SetBackgroundColour( wxColour( 255,255,255 ) );


@@ -187,8 +189,8 @@ void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) )
 
 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {
 
 void MyFrame::OnQuit( wxCommandEvent& WXUNUSED(event) )
 {

-    Show( FALSE ); // TRICK:: hide it, to avoid flickered destruction
+    Show( false ); // TRICK:: hide it, to avoid flickered destruction

     
     

-    Close(TRUE);
+    Close(true);

 }
 
 }