X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/600683ca0561c9d56e73f1faa3f21d8a6670936b..e946566e73a57c20de8705732638ee78bfb87a33:/samples/oleauto/oleauto.cpp diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp index 1297437a4b..f803eaf7c0 100644 --- a/samples/oleauto/oleauto.cpp +++ b/samples/oleauto/oleauto.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: oleauto.cpp -// Purpose: OLE Automation wxWindows sample +// Purpose: OLE Automation wxWidgets sample // Author: Julian Smart // Modified by: // Created: 08/12/98 @@ -16,10 +16,6 @@ // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ - #pragma implementation "oleauto.cpp" - #pragma interface "oleauto.cpp" -#endif // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -29,21 +25,17 @@ #endif // for all others, include the necessary headers (this file is usually all you -// need because it includes almost all "standard" wxWindows headers +// need because it includes almost all "standard" wxWidgets headers #ifndef WX_PRECOMP #include "wx/wx.h" #endif -#include +#include "wx/msw/ole/automtn.h" #ifndef __WXMSW__ #error "Sorry, this sample works under Windows only." #endif -#ifdef __WATCOMC__ -#error "Sorry, Watcom C++ does not support wxAutomationObject." -#endif - // ---------------------------------------------------------------------------- // ressources // ---------------------------------------------------------------------------- @@ -82,7 +74,7 @@ public: void OnTest(wxCommandEvent& event); private: - // any class wishing to process wxWindows events must use this macro + // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() }; @@ -99,14 +91,14 @@ enum OleAuto_Test, // controls start here (the numbers are, of course, arbitrary) - OleAuto_Text = 1000, + OleAuto_Text = 1000 }; // ---------------------------------------------------------------------------- -// event tables and other macros for wxWindows +// event tables and other macros for wxWidgets // ---------------------------------------------------------------------------- -// the event tables connect the wxWindows events with the functions (event +// the event tables connect the wxWidgets events with the functions (event // handlers) which process them. It can be also done at run-time, but for the // simple menu events like this the static method is much simpler. BEGIN_EVENT_TABLE(MyFrame, wxFrame) @@ -115,7 +107,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_MENU(OleAuto_Test, MyFrame::OnTest) END_EVENT_TABLE() -// Create a new application object: this macro will allow wxWindows to create +// Create a new application object: this macro will allow wxWidgets to create // the application object during program execution (it's better than using a // static object for many reasons) and also declares the accessor function // wxGetApp() which will return the reference of the right type (i.e. MyApp and @@ -133,19 +125,22 @@ IMPLEMENT_APP(MyApp) // `Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // Create the main application window - MyFrame *frame = new MyFrame(_T("OleAuto wxWindows App"), + MyFrame *frame = new MyFrame(_T("OleAuto wxWidgets App"), wxPoint(50, 50), wxSize(450, 340)); // 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 +149,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)); @@ -174,9 +169,11 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // ... and attach this menu bar to the frame SetMenuBar(menuBar); +#if wxUSE_STATUSBAR // create a status bar just for fun (by default with 1 pane only) CreateStatusBar(2); - SetStatusText(_T("Welcome to wxWindows!")); + SetStatusText(_T("Welcome to wxWidgets!")); +#endif // wxUSE_STATUSBAR } @@ -184,8 +181,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)) @@ -199,28 +196,49 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) */ void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(_T("Please ensure Excel is running, then press OK.\nThe active cell should then say 'wxWindows automation test!' in bold.")); + wxMessageBox(_T("Please ensure Excel is running, then press OK.\nThe active cell should then say 'wxWidgets automation test!' in bold.")); wxAutomationObject excelObject, rangeObject; if (!excelObject.GetInstance(_T("Excel.Application"))) { + // Start Excel if it is not running if (!excelObject.CreateInstance(_T("Excel.Application"))) { wxMessageBox(_T("Could not create Excel object.")); return; } } - if (!excelObject.PutProperty(_T("ActiveCell.Value"), _T("wxWindows automation test!"))) + + // Ensure that Excel is visible + if (!excelObject.PutProperty(_T("Visible"), true)) + { + wxMessageBox(_T("Could not make Excel object visible")); + } + const wxVariant workbooksCountVariant = excelObject.GetProperty(_T("Workbooks.Count")); + if (workbooksCountVariant.IsNull()) + { + wxMessageBox(_T("Could not get workbooks count")); + return; + } + const long workbooksCount = workbooksCountVariant; + if (workbooksCount == 0) + { + const wxVariant workbook = excelObject.CallMethod(_T("Workbooks.Add")); + if (workbook.IsNull()) + { + wxMessageBox(_T("Could not create new Workbook")); + return; + } + } + + if (!excelObject.PutProperty(_T("ActiveCell.Value"), _T("wxWidgets automation test!"))) { 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 } -