Use /bin/echo for creation of Mac OS X PkgInfo files.

[wxWidgets.git] / include / wx / msw / ole / automtn.h

diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h
index 87f2ff1538f99fdc27784e358fe48b5f4e9c66da..d38de41be7c8af4be0d92a64fe1450209ef463e5 100644 (file)
--- a/include/wx/msw/ole/automtn.h
+++ b/include/wx/msw/ole/automtn.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        automtn.h
+// Name:        wx/msw/ole/automtn.h

 // Purpose:     OLE automation utilities
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     OLE automation utilities
 // Author:      Julian Smart
 // Modified by:


@@ -26,6 +26,20 @@ typedef unsigned short* WXBSTR;
 #undef GetObject
 #endif
 
 #undef GetObject
 #endif
 

+// Flags used with wxAutomationObject::GetInstance()
+enum wxAutomationInstanceFlags
+{
+    // Only use the existing instance, never create a new one.
+    wxAutomationInstance_UseExistingOnly = 0,
+
+    // Create a new instance if there are no existing ones.
+    wxAutomationInstance_CreateIfNeeded = 1,
+
+    // Do not log errors if we failed to get the existing instance because none
+    // is available.
+    wxAutomationInstance_SilentIfNone = 2
+};
+

 /*
  * wxAutomationObject
  * Wraps up an IDispatch pointer and invocation; does variant conversion.
 /*
  * wxAutomationObject
  * Wraps up an IDispatch pointer and invocation; does variant conversion.


@@ -38,15 +52,17 @@ public:
     virtual ~wxAutomationObject();
 
     // Set/get dispatch pointer
     virtual ~wxAutomationObject();
 
     // Set/get dispatch pointer

-    inline void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }
-    inline WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
+    void SetDispatchPtr(WXIDISPATCH* dispatchPtr) { m_dispatchPtr = dispatchPtr; }
+    WXIDISPATCH* GetDispatchPtr() const { return m_dispatchPtr; }
+    bool IsOk() const { return m_dispatchPtr != NULL; }

 
     // Get a dispatch pointer from the current object associated
 
     // Get a dispatch pointer from the current object associated

-    // with a class id, such as "Excel.Application"
-    bool GetInstance(const wxString& classId) const;
+    // with a ProgID, such as "Excel.Application"
+    bool GetInstance(const wxString& progId,
+                     int flags = wxAutomationInstance_CreateIfNeeded) const;

 
 

-    // Get a dispatch pointer from a new instance of the the class
-    bool CreateInstance(const wxString& classId) const;
+    // Get a dispatch pointer from a new instance of the class
+    bool CreateInstance(const wxString& progId) const;

 
     // Low-level invocation function. Pass either an array of variants,
     // or an array of pointers to variants.
 
     // Low-level invocation function. Pass either an array of variants,
     // or an array of pointers to variants.


@@ -93,7 +109,7 @@ public:
 public:
     WXIDISPATCH*  m_dispatchPtr;
 
 public:
     WXIDISPATCH*  m_dispatchPtr;
 

-    DECLARE_NO_COPY_CLASS(wxAutomationObject)
+    wxDECLARE_NO_COPY_CLASS(wxAutomationObject);

 };
 
 #endif // wxUSE_OLE_AUTOMATION
 };
 
 #endif // wxUSE_OLE_AUTOMATION