added a menu command to switch between clipboard and primary selection

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

diff --git a/include/wx/msw/ole/activex.h b/include/wx/msw/ole/activex.h
index 31a9eb2a4c2e5a16ed023511ccaf01213f419c82..99ef64557139d52a29a1fac5491c06d0a0fe2984 100644 (file)
--- a/include/wx/msw/ole/activex.h
+++ b/include/wx/msw/ole/activex.h
@@ -16,31 +16,14 @@
 #ifndef _WX_MSW_OLE_ACTIVEXCONTAINER_H_
 #define _WX_MSW_OLE_ACTIVEXCONTAINER_H_
 
 #ifndef _WX_MSW_OLE_ACTIVEXCONTAINER_H_
 #define _WX_MSW_OLE_ACTIVEXCONTAINER_H_
 

-//---------------------------------------------------------------------------
-//  COM includes
-//---------------------------------------------------------------------------
-#include "wx/msw/ole/oleutils.h" //wxBasicString, IID etc.
-#include "wx/msw/ole/uuid.h" //IID etc..
+#if wxUSE_ACTIVEX

 
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------

-//  COM compatability definitions
+// wx includes

 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------

-#ifndef STDMETHODCALLTYPE
-#define STDMETHODCALLTYPE __stdcall
-#endif
-#ifndef STDMETHOD
-#define STDMETHOD(funcname)  virtual HRESULT STDMETHODCALLTYPE funcname
-#endif
-#ifndef PURE
-#define PURE = 0
-#endif
-#ifndef __RPC_FAR
-#define __RPC_FAR FAR
-#endif

 
 

-//---------------------------------------------------------------------------
-//  WX includes
-//---------------------------------------------------------------------------
+#include "wx/msw/ole/oleutils.h" // wxBasicString &c
+#include "wx/msw/ole/uuid.h"

 #include "wx/window.h"
 #include "wx/variant.h"
 
 #include "wx/window.h"
 #include "wx/variant.h"
 


@@ -56,23 +39,27 @@
 
 #include <docobj.h>
 
 
 #include <docobj.h>
 

+#ifndef STDMETHOD
+    #define STDMETHOD(funcname)  virtual HRESULT wxSTDCALL funcname
+#endif
+

 //
 //  These defines are from another ole header - but its not in the
 //  latest sdk.  Also the ifndef DISPID_READYSTATE is here because at
 //  least on my machine with the latest sdk olectl.h defines these 3
 //
 #ifndef DISPID_READYSTATE
 //
 //  These defines are from another ole header - but its not in the
 //  latest sdk.  Also the ifndef DISPID_READYSTATE is here because at
 //  least on my machine with the latest sdk olectl.h defines these 3
 //
 #ifndef DISPID_READYSTATE

-    #define DISPID_READYSTATE                               -525
-    #define DISPID_READYSTATECHANGE                         -609
-    #define DISPID_AMBIENT_TRANSFERPRIORITY                 -728
+    #define DISPID_READYSTATE                               (-525)
+    #define DISPID_READYSTATECHANGE                         (-609)
+    #define DISPID_AMBIENT_TRANSFERPRIORITY                 (-728)

 #endif
 
 #endif
 

-#define DISPID_AMBIENT_OFFLINEIFNOTCONNECTED            -5501
-#define DISPID_AMBIENT_SILENT                           -5502
+#define DISPID_AMBIENT_OFFLINEIFNOTCONNECTED            (-5501)
+#define DISPID_AMBIENT_SILENT                           (-5502)

 
 #ifndef DISPID_AMBIENT_CODEPAGE
 
 #ifndef DISPID_AMBIENT_CODEPAGE

-#   define DISPID_AMBIENT_CODEPAGE                         -725
-#   define DISPID_AMBIENT_CHARSET                          -727
+    #define DISPID_AMBIENT_CODEPAGE                         (-725)
+    #define DISPID_AMBIENT_CHARSET                          (-727)

 #endif
 
 
 #endif
 
 


@@ -140,7 +127,8 @@ class wxAutoOleInterface \
     inline operator I *() const {return m_interface;}\
     inline I* operator ->() {return m_interface;}\
     inline I** GetRef()    {return &m_interface;}\
     inline operator I *() const {return m_interface;}\
     inline I* operator ->() {return m_interface;}\
     inline I** GetRef()    {return &m_interface;}\

-    inline bool Ok() const    {return m_interface != NULL;}\
+    inline bool Ok() const { return IsOk(); }\
+    inline bool IsOk() const    {return m_interface != NULL;}\

 };
 
 WX_DECLARE_AUTOOLE(wxAutoIDispatch, IDispatch)
 };
 
 WX_DECLARE_AUTOOLE(wxAutoIDispatch, IDispatch)


@@ -228,4 +216,6 @@ typedef void (wxEvtHandler::*wxActiveXEventFunction)(wxActiveXEvent&);
 #define wxActiveXEventHandler(func) \
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxActiveXEventFunction, &func)
 
 #define wxActiveXEventHandler(func) \
     (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxActiveXEventFunction, &func)
 

+#endif // wxUSE_ACTIVEX
+

 #endif // _WX_MSW_OLE_ACTIVEXCONTAINER_H_
 #endif // _WX_MSW_OLE_ACTIVEXCONTAINER_H_