X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca5c6ac3f4ab8778dba270798a6a8acdefc671e0..ca6911c361b04290fe1f0e64b616249b3b3d71ba:/include/wx/msw/ole/automtn.h?ds=sidebyside diff --git a/include/wx/msw/ole/automtn.h b/include/wx/msw/ole/automtn.h index e81b0e9096..41db577284 100644 --- a/include/wx/msw/ole/automtn.h +++ b/include/wx/msw/ole/automtn.h @@ -31,15 +31,16 @@ typedef unsigned short* WXBSTR; * Wraps up an IDispatch pointer and invocation; does variant conversion. */ -class WXDLLEXPORT wxAutomationObject: public wxObject +class WXDLLIMPEXP_CORE wxAutomationObject: public wxObject { public: wxAutomationObject(WXIDISPATCH* dispatchPtr = NULL); 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 // with a class id, such as "Excel.Application" @@ -64,7 +65,7 @@ public: const wxVariant& arg5 = wxNullVariant, const wxVariant& arg6 = wxNullVariant); // Get/Put property - wxVariant GetProperty(const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const; + wxVariant GetProperty(const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const; wxVariant GetPropertyArray(const wxString& property, int noArgs, const wxVariant **args) const; wxVariant GetProperty(const wxString& property, const wxVariant& arg1, const wxVariant& arg2 = wxNullVariant, @@ -87,13 +88,13 @@ public: // A way of initialising another wxAutomationObject with a dispatch object, // without having to deal with nasty IDispatch pointers. - bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = (wxVariant*) NULL) const; + bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs = 0, wxVariant args[] = NULL) const; bool GetObject(wxAutomationObject& obj, const wxString& property, int noArgs, const wxVariant **args) const; public: WXIDISPATCH* m_dispatchPtr; - DECLARE_NO_COPY_CLASS(wxAutomationObject) + wxDECLARE_NO_COPY_CLASS(wxAutomationObject); }; #endif // wxUSE_OLE_AUTOMATION