From 7cdd78f635849b72c98b520e427148051620edf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 31 May 2004 09:53:12 +0000 Subject: [PATCH] Watcom repair. TRUE->true, FALSE->false and -1->wxID_ANY replacements. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/oleauto/oleauto.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp index 43e7fedd58..1d851b9f64 100644 --- a/samples/oleauto/oleauto.cpp +++ b/samples/oleauto/oleauto.cpp @@ -40,10 +40,6 @@ #error "Sorry, this sample works under Windows only." #endif -#ifdef __WATCOMC__ -#error "Sorry, Watcom C++ does not support wxAutomationObject." -#endif - // ---------------------------------------------------------------------------- // ressources // ---------------------------------------------------------------------------- @@ -139,13 +135,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; } // ---------------------------------------------------------------------------- @@ -154,7 +150,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)); @@ -184,8 +180,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)) @@ -215,12 +211,10 @@ void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event)) wxMessageBox(_T("Could not set active cell value.")); return; } -#ifdef HAVE_BOOL - if (!excelObject.PutProperty(_T("ActiveCell.Font.Bold"), wxVariant((bool) TRUE)) ) + if (!excelObject.PutProperty(_T("ActiveCell.Font.Bold"), wxVariant(true)) ) { wxMessageBox(_T("Could not put Bold property to active cell.")); return; } -#endif }