Revert last change, which made it impossible to set a custom text color and then...

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

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 8dea8ef980255b53d70b907d3a885b5e90266325..9e418fc892fc0632caa41f4a32eda2021a2382e3 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -2,25 +2,29 @@
 // Name:        msw/ole/activex.cpp
 // Purpose:     wxActiveXContainer implementation
 // Author:      Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???>
 // Name:        msw/ole/activex.cpp
 // Purpose:     wxActiveXContainer implementation
 // Author:      Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???>

-// Modified by: 
+// Modified by:

 // Created:     11/07/04
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Lindsay Mathieson, (c) 2005 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     11/07/04
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Lindsay Mathieson, (c) 2005 Ryan Norton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-//===========================================================================
-//  DECLARATIONS
-//===========================================================================
+// ============================================================================
+// declarations
+// ============================================================================

 
 

-//---------------------------------------------------------------------------
-// WX include
-//---------------------------------------------------------------------------
-#include "wx/wxprec.h"
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 

-#include "wx/msw/ole/activex.h"
+#include "wx/wxprec.h"

 
 

+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif

 
 

+#include "wx/dcclient.h"
+#include "wx/msw/ole/activex.h"

 
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++


@@ -54,21 +58,21 @@
         if (! ppvObject)\
         {\
             return E_FAIL;\
         if (! ppvObject)\
         {\
             return E_FAIL;\

-        };\
+        }\

         const char *desc = NULL;\
         cls::_GetInterface(this, iid, ppvObject, desc);\
         if (! *ppvObject)\
         {\
             return E_NOINTERFACE;\
         const char *desc = NULL;\
         cls::_GetInterface(this, iid, ppvObject, desc);\
         if (! *ppvObject)\
         {\
             return E_NOINTERFACE;\

-        };\
+        }\

         ((IUnknown * )(*ppvObject))->AddRef();\
         return S_OK;\
         ((IUnknown * )(*ppvObject))->AddRef();\
         return S_OK;\

-    };\
+    }\

     ULONG STDMETHODCALLTYPE cls::AddRef()\
     {\
         InterlockedIncrement(&refCount.l);\
         return refCount.l;\
     ULONG STDMETHODCALLTYPE cls::AddRef()\
     {\
         InterlockedIncrement(&refCount.l);\
         return refCount.l;\

-    };\
+    }\

     ULONG STDMETHODCALLTYPE cls::Release()\
     {\
         if (refCount.l > 0)\
     ULONG STDMETHODCALLTYPE cls::Release()\
     {\
         if (refCount.l > 0)\


@@ -78,7 +82,7 @@
             {\
                 delete this;\
                 return 0;\
             {\
                 delete this;\
                 return 0;\

-            };\
+            }\

             return refCount.l;\
         }\
         else\
             return refCount.l;\
         }\
         else\


@@ -88,7 +92,7 @@
     {\
         InterlockedIncrement(&lockCount.l);\
         return lockCount.l;\
     {\
         InterlockedIncrement(&lockCount.l);\
         return lockCount.l;\

-    };\
+    }\

     ULONG STDMETHODCALLTYPE cls::ReleaseLock()\
     {\
         if (lockCount.l > 0)\
     ULONG STDMETHODCALLTYPE cls::ReleaseLock()\
     {\
         if (lockCount.l > 0)\


@@ -321,7 +325,7 @@ public:
         if (! SUCCEEDED(hr))
         {
             return E_UNEXPECTED;
         if (! SUCCEEDED(hr))
         {
             return E_UNEXPECTED;

-        };
+        }

 
         hr = QueryInterface(IID_IOleInPlaceUIWindow, (void **) ppDoc);
         if (! SUCCEEDED(hr))
 
         hr = QueryInterface(IID_IOleInPlaceUIWindow, (void **) ppDoc);
         if (! SUCCEEDED(hr))


@@ -329,7 +333,7 @@ public:
             (*ppFrame)->Release();
             *ppFrame = NULL;
             return E_UNEXPECTED;
             (*ppFrame)->Release();
             *ppFrame = NULL;
             return E_UNEXPECTED;

-        };
+        }

 
         RECT rect;
         ::GetClientRect(m_hWndParent, &rect);
 
         RECT rect;
         ::GetClientRect(m_hWndParent, &rect);


@@ -338,13 +342,13 @@ public:
             lprcPosRect->left = lprcPosRect->top = 0;
             lprcPosRect->right = rect.right;
             lprcPosRect->bottom = rect.bottom;
             lprcPosRect->left = lprcPosRect->top = 0;
             lprcPosRect->right = rect.right;
             lprcPosRect->bottom = rect.bottom;

-        };
+        }

         if (lprcClipRect)
         {
             lprcClipRect->left = lprcClipRect->top = 0;
             lprcClipRect->right = rect.right;
             lprcClipRect->bottom = rect.bottom;
         if (lprcClipRect)
         {
             lprcClipRect->left = lprcClipRect->top = 0;
             lprcClipRect->right = rect.right;
             lprcClipRect->bottom = rect.bottom;

-        };
+        }

 
         memset(lpFrameInfo, 0, sizeof(OLEINPLACEFRAMEINFO));
         lpFrameInfo->cb = sizeof(OLEINPLACEFRAMEINFO);
 
         memset(lpFrameInfo, 0, sizeof(OLEINPLACEFRAMEINFO));
         lpFrameInfo->cb = sizeof(OLEINPLACEFRAMEINFO);


@@ -394,8 +398,8 @@ public:
         case OLEGETMONIKER_UNASSIGN     : return "OLEGETMONIKER_UNASSIGN";
         case OLEGETMONIKER_TEMPFORUSER  : return "OLEGETMONIKER_TEMPFORUSER";
         default                         : return "Bad Enum";
         case OLEGETMONIKER_UNASSIGN     : return "OLEGETMONIKER_UNASSIGN";
         case OLEGETMONIKER_TEMPFORUSER  : return "OLEGETMONIKER_TEMPFORUSER";
         default                         : return "Bad Enum";

-        };
-    };
+        }
+    }

 
     const char *OleGetWhicMonikerStr(DWORD dwWhichMoniker)
     {
 
     const char *OleGetWhicMonikerStr(DWORD dwWhichMoniker)
     {


@@ -405,8 +409,8 @@ public:
         case OLEWHICHMK_OBJREL      : return "OLEWHICHMK_OBJREL";
         case OLEWHICHMK_OBJFULL     : return "OLEWHICHMK_OBJFULL";
         default                     : return "Bad Enum";
         case OLEWHICHMK_OBJREL      : return "OLEWHICHMK_OBJREL";
         case OLEWHICHMK_OBJFULL     : return "OLEWHICHMK_OBJFULL";
         default                     : return "Bad Enum";

-        };
-    };
+        }
+    }

     STDMETHOD(GetMoniker)(DWORD, DWORD, IMoniker **){return E_FAIL;}
     HRESULT STDMETHODCALLTYPE GetContainer(LPOLECONTAINER * ppContainer)
     {
     STDMETHOD(GetMoniker)(DWORD, DWORD, IMoniker **){return E_FAIL;}
     HRESULT STDMETHODCALLTYPE GetContainer(LPOLECONTAINER * ppContainer)
     {


@@ -531,11 +535,11 @@ public:
                 return E_FAIL;
 
             m_window->m_docView->SetInPlaceSite(inPlaceSite);
                 return E_FAIL;
 
             m_window->m_docView->SetInPlaceSite(inPlaceSite);

-        };
+        }

 
         m_window->m_docView->UIActivate(TRUE);
         return S_OK;
 
         m_window->m_docView->UIActivate(TRUE);
         return S_OK;

-    };
+    }

 
 
 protected:
 
 
 protected:


@@ -574,7 +578,7 @@ DEFINE_OLE_TABLE(FrameSite)
     OLE_IINTERFACE(IOleDocumentSite)
     OLE_IINTERFACE(IAdviseSink)
     OLE_IINTERFACE(IOleControlSite)
     OLE_IINTERFACE(IOleDocumentSite)
     OLE_IINTERFACE(IAdviseSink)
     OLE_IINTERFACE(IOleControlSite)

-END_OLE_TABLE;
+END_OLE_TABLE

 
 
 wxActiveXContainer::wxActiveXContainer(wxWindow * parent, REFIID iid, IUnknown* pUnk)
 
 
 wxActiveXContainer::wxActiveXContainer(wxWindow * parent, REFIID iid, IUnknown* pUnk)