X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03206f17a616c02f7c5349c066917809b64106ea..fbe2ca438b746a509ca04c456166b984650ecaac:/contrib/samples/fl/fl_sample3.cpp diff --git a/contrib/samples/fl/fl_sample3.cpp b/contrib/samples/fl/fl_sample3.cpp index 2cdde9fbf3..3a64a92ae5 100644 --- a/contrib/samples/fl/fl_sample3.cpp +++ b/contrib/samples/fl/fl_sample3.cpp @@ -52,7 +52,7 @@ protected: wxTextCtrl* CreateTextCtrl( const wxString& value ); public: - MyFrame( wxWindow* parent, char *title ); + MyFrame( wxWindow* parent, const wxChar *title ); ~MyFrame(); void OnLoad( wxCommandEvent& event ); @@ -61,7 +61,7 @@ public: void OnButt( wxCommandEvent& event ); void OnButt2( wxCommandEvent& event ); - bool OnClose(void) { return TRUE; } + bool OnClose(void) { return true; } DECLARE_EVENT_TABLE() }; @@ -72,29 +72,31 @@ IMPLEMENT_APP (MyApp) bool MyApp::OnInit(void) { - // wxWindows boiler-plate: + // wxWidgets boiler-plate: - MyFrame *frame = new MyFrame(NULL, "wxFrameLayout sample"); + MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample")); wxMenu *file_menu = new wxMenu; - file_menu->Append( ID_LOAD, "&Load layout" ); - file_menu->Append( ID_STORE, "&Store layout" ); + file_menu->Append( ID_LOAD, _("&Load layout") ); + file_menu->Append( ID_STORE, _("&Store layout") ); file_menu->AppendSeparator(); - file_menu->Append( ID_QUIT, "E&xit" ); + file_menu->Append( ID_QUIT, _("E&xit") ); wxMenuBar *menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); + menu_bar->Append(file_menu, _("&File")); +#if wxUSE_STATUSBAR frame->CreateStatusBar(3); +#endif // wxUSE_STATUSBAR frame->SetMenuBar(menu_bar); - frame->Show(TRUE); + frame->Show(true); SetTopWindow(frame); - return TRUE; + return true; } /***** Immlementation for class MyFrame *****/ @@ -107,15 +109,15 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_BUTTON( ID_BUTT2, MyFrame::OnButt2 ) END_EVENT_TABLE() -MyFrame::MyFrame( wxWindow* parent, char *title ) - : wxFrame( parent, -1, "NewTest-II", wxDefaultPosition, +MyFrame::MyFrame( wxWindow* parent, const wxChar *title ) + : wxFrame( parent, wxID_ANY, title, wxDefaultPosition, wxSize( 700, 500 ), wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX | wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION, - "freimas" ) + wxT("freimas") ) { - mpClientWnd = new wxWindow(this, -1); + mpClientWnd = new wxWindow(this, wxID_ANY); mpLayout = new wxFrameLayout( this, mpClientWnd ); /// mpLayout->PushDefaultPlugins(); @@ -125,7 +127,7 @@ MyFrame::MyFrame( wxWindow* parent, char *title ) 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) ); @@ -135,17 +137,17 @@ MyFrame::MyFrame( wxWindow* parent, char *title ) for( int i = 1; i <= 11; ++i ) { - char buf[4]; - sprintf( buf, "%d", i ); - wxString name = wxString("Bar-"); + wxChar buf[4]; + wxSprintf( buf, wxT("%d"), i ); + wxString name = wxString(wxT("Bar-")); name += buf; sizes.mIsFixed = (i !=3); // every fifth bar is not fixed-size - if ( !sizes.mIsFixed ) name += " (flexible)"; + if ( !sizes.mIsFixed ) name += wxT(" (flexible)"); // mpLayout->AddBar( CreateTextCtrl(name),// bar window if(i != 4 && i!= 5 && i!=11) { - 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) @@ -153,8 +155,8 @@ MyFrame::MyFrame( wxWindow* parent, char *title ) name // name to refere in customization pop-ups ); } else if(i==4){ - mpLayout->AddBar( new wxTextCtrl(this, -1, name),// bar window - cbDimInfo( 100,100, 100,100, 100,100, TRUE, 5, 5), + mpLayout->AddBar( new wxTextCtrl(this, wxID_ANY, name),// bar window + cbDimInfo( 100,100, 100,100, 100,100, true, 5, 5), 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) @@ -163,15 +165,15 @@ MyFrame::MyFrame( wxWindow* parent, char *title ) } else if(i==5) { my_butt = new wxButton(this, ID_BUTT, name); mpLayout->AddBar( my_butt,// bar window - cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), + cbDimInfo( 100,100, 200,200, 400,400, true, 5, 5), 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) name // name to refere in customization pop-ups ); } else if(i==11) { - mpLayout->AddBar( new wxButton(this, ID_BUTT2, name+"_2"), - cbDimInfo( 100,100, 200,200, 400,400, TRUE, 5, 5), + mpLayout->AddBar( new wxButton(this, ID_BUTT2, name+wxT("_2")), + cbDimInfo( 100,100, 200,200, 400,400, true, 5, 5), 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) @@ -194,7 +196,7 @@ MyFrame::~MyFrame() 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 ) ); @@ -202,24 +204,24 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value ) return pCtrl; } -void MyFrame::OnLoad( wxCommandEvent& event ) +void MyFrame::OnLoad( wxCommandEvent& WXUNUSED(event) ) { - wxMessageBox("Hey - you found a BIG question-mark !!"); + wxMessageBox(_("Hey - you found a BIG question-mark !!")); } -void MyFrame::OnStore( wxCommandEvent& event ) +void MyFrame::OnStore( wxCommandEvent& WXUNUSED(event) ) { - wxMessageBox("Hey - you found another BIG question-mark !!"); + wxMessageBox(_("Hey - you found another BIG question-mark !!")); } -void MyFrame::OnQuit( wxCommandEvent& 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); } -void MyFrame::OnButt( wxCommandEvent& event ) +void MyFrame::OnButt( wxCommandEvent& WXUNUSED(event) ) { static int i =0; @@ -228,7 +230,7 @@ void MyFrame::OnButt( wxCommandEvent& event ) switch(i % 2) { case 0: { - cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-1")); + cbBarInfo* x = mpLayout->FindBarByName(wxString(wxT("Bar-1"))); if(x) mpLayout->InverseVisibility(x); else @@ -237,23 +239,23 @@ void MyFrame::OnButt( wxCommandEvent& event ) } case 1: { - cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-6")); + cbBarInfo* x = mpLayout->FindBarByName(wxString(wxT("Bar-6"))); if(x) { if(i % 4 == 1) { - mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE); + mpLayout->SetBarState(x, wxCBAR_FLOATING, true); //mpLayout->RecalcLayout(true); mpLayout->RepositionFloatedBar(x); } else { - mpLayout->SetBarState(x, 0, TRUE); + mpLayout->SetBarState(x, 0, true); //mpLayout->RecalcLayout(true); //mpLayout->RepositionFloatedBar(x); } - // // // x->mState = wxCBAR_FLOATING; - // // // mpLayout->ApplyBarProperties(x); + // // // x->mState = wxCBAR_FLOATING; + // // // mpLayout->ApplyBarProperties(x); } else { @@ -266,7 +268,7 @@ void MyFrame::OnButt( wxCommandEvent& event ) i++; } -void MyFrame::OnButt2( wxCommandEvent& event ) +void MyFrame::OnButt2( wxCommandEvent& WXUNUSED(event) ) { static int i =0; @@ -275,7 +277,7 @@ void MyFrame::OnButt2( wxCommandEvent& event ) switch(i % 2) { case 0: { - cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-1")); + cbBarInfo* x = mpLayout->FindBarByName(wxString(wxT("Bar-1"))); if(x) { for(int a=0;amDimInfo.mSizes[a].y = 200; } x->mpBarWnd->SetSize(200,200); - mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE); // HACK !!! - mpLayout->SetBarState(x, 0, TRUE); // HACK !!! + mpLayout->SetBarState(x, wxCBAR_FLOATING, true); // HACK !!! + mpLayout->SetBarState(x, 0, true); // HACK !!! wxYield(); // HACK !!! needed to resize BEFORE redraw - mpLayout->RefreshNow( TRUE ); // HACK !!! needed to trigger redraw + mpLayout->RefreshNow( true ); // HACK !!! needed to trigger redraw } else { @@ -298,7 +300,7 @@ void MyFrame::OnButt2( wxCommandEvent& event ) } case 1: { - cbBarInfo* x = mpLayout->FindBarByName(wxString("Bar-1")); + cbBarInfo* x = mpLayout->FindBarByName(wxString(wxT("Bar-1"))); if(x) { //mpLayout->InverseVisibility(x); @@ -309,20 +311,20 @@ void MyFrame::OnButt2( wxCommandEvent& event ) x->mDimInfo.mSizes[a].y = 10 + 2 + 2*x->mDimInfo.mVertGap; } x->mpBarWnd->SetSize(10,10); - mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE); // HACK !!! - mpLayout->SetBarState(x, 0, TRUE); // HACK !!! + mpLayout->SetBarState(x, wxCBAR_FLOATING, true); // HACK !!! + mpLayout->SetBarState(x, 0, true); // HACK !!! wxYield(); // HACK !!! needed to resize BEFORE redraw - mpLayout->RefreshNow( TRUE ); // HACK !!! needed to trigger redraw + mpLayout->RefreshNow( true ); // HACK !!! needed to trigger redraw - // // mpLayout->SetBarState(x, wxCBAR_FLOATING, TRUE); - // // mpLayout->RecalcLayout(true); - // // // mpLayout->RepositionFloatedBar(x); - // // mpLayout->RecalcLayout(true); - // // mpLayout->RepositionFloatedBar(x); - // // mpLayout->SetBarState(x, 0, TRUE); - // // wxYield(); - // // mpLayout->RefreshNow( TRUE ); - // // mpLayout->RecalcLayout(true); + // // mpLayout->SetBarState(x, wxCBAR_FLOATING, true); + // // mpLayout->RecalcLayout(true); + // // mpLayout->RepositionFloatedBar(x); + // // mpLayout->RecalcLayout(true); + // // mpLayout->RepositionFloatedBar(x); + // // mpLayout->SetBarState(x, 0, true); + // // wxYield(); + // // mpLayout->RefreshNow( true ); + // // mpLayout->RecalcLayout(true); } else {