X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b20edf8b33e4ffa3a56e65f773e3bf73e13adf81..d8eff331e23435d9d8d6483a40f6fd9997a13f87:/samples/oleauto/oleauto.cpp?ds=sidebyside

diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index bc77c7e8d7..383ef4d012 100644
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -91,7 +91,7 @@ enum
     OleAuto_Test,
 
     // controls start here (the numbers are, of course, arbitrary)
-    OleAuto_Text = 1000,
+    OleAuto_Text = 1000
 };
 
 // ----------------------------------------------------------------------------
@@ -125,8 +125,11 @@ 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 wxWidgets App"),
+    MyFrame *frame = new MyFrame(wxT("OleAuto wxWidgets App"),
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Show it and tell the application that it's our main window
@@ -154,14 +157,14 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
-    menuFile->Append(OleAuto_Test, _T("&Test Excel Automation..."));
-    menuFile->Append(OleAuto_About, _T("&About..."));
+    menuFile->Append(OleAuto_Test, wxT("&Test Excel Automation..."));
+    menuFile->Append(OleAuto_About, wxT("&About..."));
     menuFile->AppendSeparator();
-    menuFile->Append(OleAuto_Quit, _T("E&xit"));
+    menuFile->Append(OleAuto_Quit, wxT("E&xit"));
 
     // now append the freshly created menu to the menu bar...
     wxMenuBar *menuBar = new wxMenuBar;
-    menuBar->Append(menuFile, _T("&File"));
+    menuBar->Append(menuFile, wxT("&File"));
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
@@ -169,7 +172,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 #if wxUSE_STATUSBAR
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
-    SetStatusText(_T("Welcome to wxWidgets!"));
+    SetStatusText(wxT("Welcome to wxWidgets!"));
 #endif // wxUSE_STATUSBAR
 }
 
@@ -184,8 +187,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    wxMessageBox(_T("This is an OLE Automation sample"),
-                 _T("About OleAuto"), wxOK | wxICON_INFORMATION, this);
+    wxMessageBox(wxT("This is an OLE Automation sample"),
+                 wxT("About OleAuto"), wxOK | wxICON_INFORMATION, this);
 }
 
 /* Tests OLE automation by making the active Excel cell bold,
@@ -193,25 +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 'wxWidgets automation test!' in bold."));
+    wxMessageBox(wxT("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")))
+    if (!excelObject.GetInstance(wxT("Excel.Application")))
     {
-        if (!excelObject.CreateInstance(_T("Excel.Application")))
+        // Start Excel if it is not running
+        if (!excelObject.CreateInstance(wxT("Excel.Application")))
         {
-            wxMessageBox(_T("Could not create Excel object."));
+            wxMessageBox(wxT("Could not create Excel object."));
             return;
         }
     }
-    if (!excelObject.PutProperty(_T("ActiveCell.Value"), _T("wxWidgets automation test!")))
+
+    // Ensure that Excel is visible
+    if (!excelObject.PutProperty(wxT("Visible"), true))
+    {
+        wxMessageBox(wxT("Could not make Excel object visible"));
+    }
+    const wxVariant workbooksCountVariant = excelObject.GetProperty(wxT("Workbooks.Count"));
+    if (workbooksCountVariant.IsNull())
+    {
+        wxMessageBox(wxT("Could not get workbooks count"));
+        return;
+    }
+    const long workbooksCount = workbooksCountVariant;
+    if (workbooksCount == 0)
+    {
+        const wxVariant workbook = excelObject.CallMethod(wxT("Workbooks.Add"));
+        if (workbook.IsNull())
+        {
+            wxMessageBox(wxT("Could not create new Workbook"));
+            return;
+        }
+    }
+
+    if (!excelObject.PutProperty(wxT("ActiveCell.Value"), wxT("wxWidgets automation test!")))
     {
-        wxMessageBox(_T("Could not set active cell value."));
+        wxMessageBox(wxT("Could not set active cell value."));
         return;
     }
-    if (!excelObject.PutProperty(_T("ActiveCell.Font.Bold"), wxVariant(true)) )
+    if (!excelObject.PutProperty(wxT("ActiveCell.Font.Bold"), wxVariant(true)) )
     {
-        wxMessageBox(_T("Could not put Bold property to active cell."));
+        wxMessageBox(wxT("Could not put Bold property to active cell."));
         return;
     }
 }