-1->wxID_ANY, TRUE->true and FALSE->false replacements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -124,13 +124,13 @@ bool MyApp::OnInit()
|
||||
|
||||
// Show it and tell the application that it's our main window
|
||||
// @@@ what does it do exactly, in fact? is it necessary here?
|
||||
frame->Show(TRUE);
|
||||
frame->Show(true);
|
||||
SetTopWindow(frame);
|
||||
|
||||
// success: wxApp::OnRun() will be called which will enter the main message
|
||||
// loop and the application will run. If we returned FALSE here, the
|
||||
// loop and the application will run. If we returned false here, the
|
||||
// application would exit immediately.
|
||||
return TRUE;
|
||||
return true;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
@@ -139,7 +139,7 @@ bool MyApp::OnInit()
|
||||
|
||||
// frame constructor
|
||||
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
: wxFrame((wxFrame *)NULL, -1, title, pos, size)
|
||||
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
|
||||
{
|
||||
// set the frame icon
|
||||
SetIcon(wxICON(mondrian));
|
||||
@@ -165,11 +165,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
||||
#define AddLine(orient) \
|
||||
Add( new wxStaticLine( this, -1, wxDefaultPosition, wxSize(2,2), orient), \
|
||||
Add( new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxSize(2,2), orient), \
|
||||
0, wxEXPAND)
|
||||
|
||||
#define AddButton(label,align) Add( \
|
||||
new wxButton( this, -1, label, wxDefaultPosition, wxSize(100,50)), \
|
||||
new wxButton( this, wxID_ANY, label, wxDefaultPosition, wxSize(100,50)), \
|
||||
1, wxSHAPED | align)
|
||||
|
||||
wxBoxSizer *topsizer = new wxBoxSizer( wxVERTICAL );
|
||||
@@ -190,11 +190,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
// sizer that preserves it's shape
|
||||
wxBoxSizer *vsizer = new wxBoxSizer( wxVERTICAL );
|
||||
vsizer->Add(
|
||||
new wxButton( this, -1, _T("up"), wxDefaultPosition, wxSize(100,25) ),
|
||||
new wxButton( this, wxID_ANY, _T("up"), wxDefaultPosition, wxSize(100,25) ),
|
||||
1, wxEXPAND);
|
||||
|
||||
vsizer->Add(
|
||||
new wxButton( this, -1, _T("down"), wxDefaultPosition, wxSize(100,25) ),
|
||||
new wxButton( this, wxID_ANY, _T("down"), wxDefaultPosition, wxSize(100,25) ),
|
||||
1, wxEXPAND);
|
||||
|
||||
hsizer2->Add(vsizer, 1, wxSHAPED | wxALIGN_CENTER);
|
||||
@@ -228,8 +228,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
|
||||
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
|
||||
{
|
||||
// TRUE is to force the frame to close
|
||||
Close(TRUE);
|
||||
// true is to force the frame to close
|
||||
Close(true);
|
||||
}
|
||||
|
||||
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
|
||||
|
Reference in New Issue
Block a user