check the week day for consistency in ParseFormat() (replaces patch 788052)

[wxWidgets.git] / samples / oleauto / oleauto.cpp

diff --git a/samples/oleauto/oleauto.cpp b/samples/oleauto/oleauto.cpp
index b4021b93ae9cba88aea52a3d12bb9004a1f78323..1297437a4bc2d7ad501b16fa3bcc454b31f085c4 100644 (file)
--- a/samples/oleauto/oleauto.cpp
+++ b/samples/oleauto/oleauto.cpp
@@ -40,11 +40,15 @@
 #error "Sorry, this sample works under Windows only."
 #endif
 
 #error "Sorry, this sample works under Windows only."
 #endif
 

+#ifdef __WATCOMC__
+#error "Sorry, Watcom C++ does not support wxAutomationObject."
+#endif
+

 // ----------------------------------------------------------------------------
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon
 // ----------------------------------------------------------------------------
 // ressources
 // ----------------------------------------------------------------------------
 // the application icon

-#if defined(__WXGTK__) || defined(__WXMOTIF__)
+#if defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)

     #include "mondrian.xpm"
 #endif
 
     #include "mondrian.xpm"
 #endif
 


@@ -130,7 +134,7 @@ IMPLEMENT_APP(MyApp)
 bool MyApp::OnInit()
 {
     // Create the main application window
 bool MyApp::OnInit()
 {
     // Create the main application window

-    MyFrame *frame = new MyFrame("OleAuto wxWindows App",
+    MyFrame *frame = new MyFrame(_T("OleAuto wxWindows App"),

                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Show it and tell the application that it's our main window
                                  wxPoint(50, 50), wxSize(450, 340));
 
     // Show it and tell the application that it's our main window


@@ -158,21 +162,21 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     // create a menu bar
     wxMenu *menuFile = new wxMenu;
 
     // 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->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;
 
     // 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);
 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // create a status bar just for fun (by default with 1 pane only)
     CreateStatusBar(2);

-    SetStatusText("Welcome to wxWindows!");
+    SetStatusText(_T("Welcome to wxWindows!"));

 }
 
 
 }
 
 


@@ -186,8 +190,8 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
 
 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,
 }
 
 /* Tests OLE automation by making the active Excel cell bold,


@@ -195,28 +199,28 @@ void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
  */
 void MyFrame::OnTest(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 'wxWindows 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;
-       }
+    }
+    if (!excelObject.PutProperty(_T("ActiveCell.Value"), _T("wxWindows automation test!")))
+    {
+        wxMessageBox(_T("Could not set active cell value."));
+        return;
+    }

 #ifdef HAVE_BOOL
 #ifdef HAVE_BOOL

-       if (!excelObject.PutProperty("ActiveCell.Font.Bold", wxVariant((bool) TRUE)) )
-       {
-               wxMessageBox("Could not put Bold property to active cell.");
-               return;
-       }
+    if (!excelObject.PutProperty(_T("ActiveCell.Font.Bold"), wxVariant((bool) TRUE)) )
+    {
+        wxMessageBox(_T("Could not put Bold property to active cell."));
+        return;
+    }

 #endif
 }
 
 #endif
 }