Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Watcom repair. TRUE->true, FALSE->false and -1->wxID_ANY replacements.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-05-31 09:53:12 +00:00
parent 6b12494db9
commit 7cdd78f635
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
samples/oleauto/oleauto.cpp
View File

@@ -40,10 +40,6 @@
#error "Sorry, this sample works under Windows only." #error "Sorry, this sample works under Windows only."
#endif #endif
#ifdef __WATCOMC__
#error "Sorry, Watcom C++ does not support wxAutomationObject."
#endif
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// ressources // ressources
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -139,13 +135,13 @@ bool MyApp::OnInit()
// Show it and tell the application that it's our main window // Show it and tell the application that it's our main window
// @@@ what does it do exactly, in fact? is it necessary here? // @@@ what does it do exactly, in fact? is it necessary here?
frame->Show(TRUE); frame->Show(true);
SetTopWindow(frame); SetTopWindow(frame);
// success: wxApp::OnRun() will be called which will enter the main message // 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. // application would exit immediately.
return TRUE; return true;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -154,7 +150,7 @@ bool MyApp::OnInit()
// frame constructor // frame constructor
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) 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 // set the frame icon
SetIcon(wxICON(mondrian)); SetIcon(wxICON(mondrian));
@@ -184,8 +180,8 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
{ {
// TRUE is to force the frame to close // true is to force the frame to close
Close(TRUE); Close(true);
} }
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
@@ -215,12 +211,10 @@ void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event))
wxMessageBox(_T("Could not set active cell value.")); wxMessageBox(_T("Could not set active cell value."));
return; return;
} }
#ifdef HAVE_BOOL if (!excelObject.PutProperty(_T("ActiveCell.Font.Bold"), wxVariant(true)) )
if (!excelObject.PutProperty(_T("ActiveCell.Font.Bold"), wxVariant((bool) TRUE)) )
{ {
wxMessageBox(_T("Could not put Bold property to active cell.")); wxMessageBox(_T("Could not put Bold property to active cell."));
return; return;
} }
#endif
} }