fixing osx_cocoa

[wxWidgets.git] / src / msw / ole / automtn.cpp

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index db0df28fb28e27d750a22a3ea50ca069f7995565..12a46ffcad35495faff534e8a4442cfafda588ec 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -109,7 +109,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
     int namedArgCount = 0;
     int i;
     for (i = 0; i < noArgs; i++)
     int namedArgCount = 0;
     int i;
     for (i = 0; i < noArgs; i++)

-        if (!INVOKEARG(i).GetName().IsNull())
+        if ( !INVOKEARG(i).GetName().empty() )

         {
             namedArgCount ++;
         }
         {
             namedArgCount ++;
         }


@@ -124,7 +124,7 @@ bool wxAutomationObject::Invoke(const wxString& member, int action,
     int j = 0;
     for (i = 0; i < namedArgCount; i++)
     {
     int j = 0;
     for (i = 0; i < namedArgCount; i++)
     {

-        if (!INVOKEARG(i).GetName().IsNull())
+        if ( !INVOKEARG(i).GetName().empty() )

         {
             argNames[(namedArgCount-j)] = wxConvertStringToOle(INVOKEARG(i).GetName());
             j ++;
         {
             argNames[(namedArgCount-j)] = wxConvertStringToOle(INVOKEARG(i).GetName());
             j ++;


@@ -545,8 +545,15 @@ bool wxAutomationObject::GetInstance(const wxString& progId, int flags) const
         }
         else
         {
         }
         else
         {

-            wxLogSysError(hr,
-                          _("Cannot get an active instance of \"%s\""), progId);
+            // Log an error except if we're supposed to fail silently when the
+            // error is that no current instance exists.
+            if ( hr != MK_E_UNAVAILABLE ||
+                    !(flags & wxAutomationInstance_SilentIfNone) )
+            {
+                wxLogSysError(hr,
+                              _("Cannot get an active instance of \"%s\""),
+                              progId);
+            }

         }
 
         return false;
         }
 
         return false;