X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..cb7d73757f9e8771e7d8fc6b22f1acf27aac35bd:/samples/oleauto/oleauto.cpp diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp index d50c7ecd4b..9d1fe96853 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,7 +25,7 @@ #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 @@ -40,15 +36,11 @@ #error "Sorry, this sample works under Windows only." #endif -#ifdef __WATCOMC__ -#error "Sorry, Watcom C++ does not support wxAutomationObject." -#endif - // ---------------------------------------------------------------------------- // ressources // ---------------------------------------------------------------------------- // the application icon -#if defined(__WXGTK__) || defined(__WXMOTIF__) +#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__) #include "mondrian.xpm" #endif @@ -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() }; @@ -103,10 +95,10 @@ enum }; // ---------------------------------------------------------------------------- -// 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 @@ -134,18 +126,18 @@ IMPLEMENT_APP(MyApp) bool MyApp::OnInit() { // Create the main application window - MyFrame *frame = new MyFrame("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 +146,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)); @@ -162,21 +154,23 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // create a menu bar wxMenu *menuFile = new wxMenu; - menuFile->Append(OleAuto_Test, "&Test Excel Automation..."); - menuFile->Append(OleAuto_About, "&About..."); + menuFile->Append(OleAuto_Test, _T("&Test Excel Automation...")); + menuFile->Append(OleAuto_About, _T("&About...")); menuFile->AppendSeparator(); - menuFile->Append(OleAuto_Quit, "E&xit"); + menuFile->Append(OleAuto_Quit, _T("E&xit")); // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, "&File"); + menuBar->Append(menuFile, _T("&File")); // ... 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("Welcome to wxWindows!"); + SetStatusText(_T("Welcome to wxWidgets!")); +#endif // wxUSE_STATUSBAR } @@ -184,14 +178,14 @@ 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)) { - wxMessageBox("This is an OLE Automation sample", - "About OleAuto", wxOK | wxICON_INFORMATION, this); + wxMessageBox(_T("This is an OLE Automation sample"), + _T("About OleAuto"), wxOK | wxICON_INFORMATION, this); } /* Tests OLE automation by making the active Excel cell bold, @@ -199,28 +193,26 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) */ void MyFrame::OnTest(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox("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("Excel.Application")) - { - if (!excelObject.CreateInstance("Excel.Application")) + wxAutomationObject excelObject, rangeObject; + if (!excelObject.GetInstance(_T("Excel.Application"))) + { + if (!excelObject.CreateInstance(_T("Excel.Application"))) { - wxMessageBox("Could not create Excel object."); - return; + wxMessageBox(_T("Could not create Excel object.")); + return; } - } - if (!excelObject.PutProperty("ActiveCell.Value", "wxWindows automation test!")) - { - wxMessageBox("Could not set active cell value."); - return; - } -#ifdef HAVE_BOOL - if (!excelObject.PutProperty("ActiveCell.Font.Bold", wxVariant((bool) TRUE)) ) - { - wxMessageBox("Could not put Bold property to active cell."); - return; - } -#endif + } + if (!excelObject.PutProperty(_T("ActiveCell.Value"), _T("wxWidgets automation test!"))) + { + wxMessageBox(_T("Could not set active cell value.")); + return; + } + if (!excelObject.PutProperty(_T("ActiveCell.Font.Bold"), wxVariant(true)) ) + { + wxMessageBox(_T("Could not put Bold property to active cell.")); + return; + } }