From 348469c284a35f66819c10819feff0ae91b5fde2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Fri, 21 May 2004 11:29:38 +0000 Subject: [PATCH 1/1] -1->wxID_ANY, TRUE->true and FALSE->false replacements. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/html/about/about.cpp | 20 ++++++++++---------- samples/html/help/help.cpp | 14 +++++++------- samples/html/helpview/helpview.cpp | 5 ++--- samples/html/printing/printing.cpp | 12 ++++++------ samples/html/virtual/virtual.cpp | 12 ++++++------ samples/html/zip/zip.cpp | 12 ++++++------ 6 files changed, 37 insertions(+), 38 deletions(-) diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp index eac43f4e19..e5e0c7645c 100644 --- a/samples/html/about/about.cpp +++ b/samples/html/about/about.cpp @@ -113,14 +113,14 @@ // 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; } // ---------------------------------------------------------------------------- @@ -130,7 +130,7 @@ // 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) { // create a menu bar wxMenu *menuFile = new wxMenu; @@ -151,19 +151,19 @@ 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)) { wxBoxSizer *topsizer; wxHtmlWindow *html; - wxDialog dlg(this, -1, wxString(_("About"))); + wxDialog dlg(this, wxID_ANY, wxString(_("About"))); topsizer = new wxBoxSizer(wxVERTICAL); - html = new wxHtmlWindow(&dlg, -1, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER); + html = new wxHtmlWindow(&dlg, wxID_ANY, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER); html -> SetBorders(0); html -> LoadPage(wxT("data/about.htm")); html -> SetSize(html -> GetInternalRepresentation() -> GetWidth(), @@ -171,14 +171,14 @@ topsizer -> Add(html, 1, wxALL, 10); - topsizer -> Add(new wxStaticLine(&dlg, -1), 0, wxEXPAND | wxLEFT | wxRIGHT, 10); + topsizer -> Add(new wxStaticLine(&dlg, wxID_ANY), 0, wxEXPAND | wxLEFT | wxRIGHT, 10); wxButton *bu1 = new wxButton(&dlg, wxID_OK, _("OK")); bu1 -> SetDefault(); topsizer -> Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15); - dlg.SetAutoLayout(TRUE); + dlg.SetAutoLayout(true); dlg.SetSizer(topsizer); topsizer -> Fit(&dlg); diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp index 0e6ed46d88..1f6448b31d 100644 --- a/samples/html/help/help.cpp +++ b/samples/html/help/help.cpp @@ -120,14 +120,14 @@ // 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; } // ---------------------------------------------------------------------------- @@ -137,7 +137,7 @@ // 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), help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES) { // create a menu bar @@ -169,8 +169,8 @@ 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::OnHelp(wxCommandEvent& WXUNUSED(event)) @@ -183,7 +183,7 @@ // Close the help frame; this will cause the config data to // get written. if ( help.GetFrame() ) // returns NULL if no help frame active - help.GetFrame()->Close(TRUE); + help.GetFrame()->Close(true); // now we can safely delete the config pointer event.Skip(); delete wxConfig::Set(NULL); diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp index d77e758829..24224c7d6e 100644 --- a/samples/html/helpview/helpview.cpp +++ b/samples/html/helpview/helpview.cpp @@ -1,4 +1,3 @@ - ///////////////////////////////////////////////////////////////////////////// // Name: helpview.cpp // Purpose: wxHtml help browser @@ -75,7 +74,7 @@ bool MyApp::OnInit() if (argc < 2) { wxLogError(wxT("Usage : helpview []")); wxLogError(wxT(" helpfile may be .hhp, .zip or .htb")); - return FALSE; + return false; } for (int i = 1; i < argc; i++) @@ -87,7 +86,7 @@ bool MyApp::OnInit() help -> DisplayContents(); - return TRUE; + return true; } diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp index f414cb56b2..c230fe2aa6 100644 --- a/samples/html/printing/printing.cpp +++ b/samples/html/printing/printing.cpp @@ -144,14 +144,14 @@ 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; } // ---------------------------------------------------------------------------- @@ -161,7 +161,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) { // create a menu bar wxMenu *menuFile = new wxMenu; @@ -214,8 +214,8 @@ MyFrame::~MyFrame() 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); } diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp index 0966023137..c4d21b9431 100644 --- a/samples/html/virtual/virtual.cpp +++ b/samples/html/virtual/virtual.cpp @@ -166,14 +166,14 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) // 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); wxFileSystem::AddHandler(new MyVFS); // 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; } // ---------------------------------------------------------------------------- @@ -184,7 +184,7 @@ wxHtmlWindow *html; // 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) { // create a menu bar wxMenu *menuFile = new wxMenu; @@ -215,8 +215,8 @@ wxHtmlWindow *html; 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::OnBack(wxCommandEvent& WXUNUSED(event)) diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp index 655715c590..937f48bd93 100644 --- a/samples/html/zip/zip.cpp +++ b/samples/html/zip/zip.cpp @@ -117,14 +117,14 @@ 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; } // ---------------------------------------------------------------------------- @@ -135,7 +135,7 @@ wxHtmlWindow *html; // 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) { // create a menu bar wxMenu *menuFile = new wxMenu; @@ -168,8 +168,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::OnBack(wxCommandEvent& WXUNUSED(event)) -- 2.45.2