Fixed centering and right-justification when combined with left indentation (bug...

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

diff --git a/src/msw/ole/activex.cpp b/src/msw/ole/activex.cpp
index 176fc6673fea4d0ebd2a8cd8bdbc46913586910a..4a4a7c6e84365fdd593bd9c8b6856ef276ed3dac 100644 (file)
--- a/src/msw/ole/activex.cpp
+++ b/src/msw/ole/activex.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/ole/activex.cpp
+// Name:        src/msw/ole/activex.cpp

 // Purpose:     wxActiveXContainer implementation
 // Author:      Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???>
 // Modified by:
 // Purpose:     wxActiveXContainer implementation
 // Author:      Ryan Norton <wxprojects@comcast.net>, Lindsay Mathieson <???>
 // Modified by:


@@ -23,12 +23,14 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/dcclient.h"
-#include "wx/math.h"
+#if wxUSE_ACTIVEX

 
 

-// I don't know why members of tagVARIANT aren't found when compiling
-// with Wine
-#ifndef __WINE__
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
+    #include "wx/math.h"
+#endif
+
+#include "wx/msw/dc.h"

 
 #include "wx/msw/ole/activex.h"
 // autointerfaces that we only use here
 
 #include "wx/msw/ole/activex.h"
 // autointerfaces that we only use here


@@ -523,7 +525,7 @@ public:
     HRESULT STDMETHODCALLTYPE LockContainer(BOOL){return S_OK;}
     //********************IOleItemContainer***************************
     HRESULT STDMETHODCALLTYPE
     HRESULT STDMETHODCALLTYPE LockContainer(BOOL){return S_OK;}
     //********************IOleItemContainer***************************
     HRESULT STDMETHODCALLTYPE

-    #ifdef __WXWINCE__
+    #if 0 // defined(__WXWINCE__) && __VISUALC__ < 1400

     GetObject
     #elif defined(_UNICODE)
     GetObjectW
     GetObject
     #elif defined(_UNICODE)
     GetObjectW


@@ -829,6 +831,15 @@ wxActiveXContainer::~wxActiveXContainer()
     }
 }
 
     }
 }
 

+// VZ: we might want to really report an error instead of just asserting here
+#ifdef __WXDEBUG__
+    #define CHECK_HR(hr) \
+        wxASSERT_MSG( SUCCEEDED(hr), \
+            wxString::Format("HRESULT = %X", (unsigned)(hr)) )
+#else
+    #define CHECK_HR(hr) wxUnusedVar(hr)
+#endif
+

 //---------------------------------------------------------------------------
 // wxActiveXContainer::CreateActiveX
 //
 //---------------------------------------------------------------------------
 // wxActiveXContainer::CreateActiveX
 //


@@ -841,20 +852,21 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 {
     HRESULT hret;
     hret = m_ActiveX.QueryInterface(iid, pUnk);
 {
     HRESULT hret;
     hret = m_ActiveX.QueryInterface(iid, pUnk);

-    wxASSERT(SUCCEEDED(hret));
+    CHECK_HR(hret);

 
     // FrameSite
     FrameSite *frame = new FrameSite(m_realparent, this);
     // oleClientSite
     hret = m_clientSite.QueryInterface(
         IID_IOleClientSite, (IDispatch *) frame);
 
     // FrameSite
     FrameSite *frame = new FrameSite(m_realparent, this);
     // oleClientSite
     hret = m_clientSite.QueryInterface(
         IID_IOleClientSite, (IDispatch *) frame);

-    wxASSERT(SUCCEEDED(hret));
+    CHECK_HR(hret);

     // adviseSink
     wxAutoIAdviseSink adviseSink(IID_IAdviseSink, (IDispatch *) frame);
     wxASSERT(adviseSink.Ok());
 
     // Get Dispatch interface
     hret = m_Dispatch.QueryInterface(IID_IDispatch, m_ActiveX);
     // adviseSink
     wxAutoIAdviseSink adviseSink(IID_IAdviseSink, (IDispatch *) frame);
     wxASSERT(adviseSink.Ok());
 
     // Get Dispatch interface
     hret = m_Dispatch.QueryInterface(IID_IDispatch, m_ActiveX);

+    CHECK_HR(hret);

 
     //
     // SETUP TYPEINFO AND ACTIVEX EVENTS
 
     //
     // SETUP TYPEINFO AND ACTIVEX EVENTS


@@ -867,12 +879,13 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
     // type info
     wxAutoITypeInfo typeInfo;
     hret = classInfo->GetClassInfo(typeInfo.GetRef());
     // type info
     wxAutoITypeInfo typeInfo;
     hret = classInfo->GetClassInfo(typeInfo.GetRef());

+    CHECK_HR(hret);

     wxASSERT(typeInfo.Ok());
 
     // TYPEATTR
     TYPEATTR *ta = NULL;
     hret = typeInfo->GetTypeAttr(&ta);
     wxASSERT(typeInfo.Ok());
 
     // TYPEATTR
     TYPEATTR *ta = NULL;
     hret = typeInfo->GetTypeAttr(&ta);

-    wxASSERT(ta);
+    CHECK_HR(hret);

 
     // this should be a TKIND_COCLASS
     wxASSERT(ta->typekind == TKIND_COCLASS);
 
     // this should be a TKIND_COCLASS
     wxASSERT(ta->typekind == TKIND_COCLASS);


@@ -893,8 +906,9 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
         if (! ti.Ok())
             continue;
 
         if (! ti.Ok())
             continue;
 

+        CHECK_HR(hret);
+

         // check if default event sink
         // check if default event sink

-        bool defInterface = false;

         bool defEventSink = false;
         int impTypeFlags = 0;
         typeInfo->GetImplTypeFlags(i, &impTypeFlags);
         bool defEventSink = false;
         int impTypeFlags = 0;
         typeInfo->GetImplTypeFlags(i, &impTypeFlags);


@@ -912,11 +926,6 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
                     wxFAIL_MSG(wxT("Default event sink is in vtable!"));
                 }
             }
                     wxFAIL_MSG(wxT("Default event sink is in vtable!"));
                 }
             }

-            else
-            {
-                // WXOLE_TRACEOUT("Default Interface");
-                defInterface = true;
-            }

         }
 
 
         }
 
 


@@ -924,7 +933,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
         // TYPEATTR
         TYPEATTR *ta = NULL;
         hret = ti->GetTypeAttr(&ta);
         // TYPEATTR
         TYPEATTR *ta = NULL;
         hret = ti->GetTypeAttr(&ta);

-        wxASSERT(ta);
+        CHECK_HR(hret);

 
         if (ta->typekind == TKIND_DISPATCH)
         {
 
         if (ta->typekind == TKIND_DISPATCH)
         {


@@ -939,15 +948,13 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
                 HRESULT hret =
                     cpContainer->FindConnectionPoint(ta->guid, cp.GetRef());
 
                 HRESULT hret =
                     cpContainer->FindConnectionPoint(ta->guid, cp.GetRef());

-                wxASSERT ( SUCCEEDED(hret));
+                CHECK_HR(hret);

 
                 IDispatch* disp;
                 frame->QueryInterface(IID_IDispatch, (void**)&disp);
                 hret = cp->Advise(new wxActiveXEvents(this, ta->guid),
                                   &adviseCookie);
 
                 IDispatch* disp;
                 frame->QueryInterface(IID_IDispatch, (void**)&disp);
                 hret = cp->Advise(new wxActiveXEvents(this, ta->guid),
                                   &adviseCookie);

-                wxASSERT_MSG( SUCCEEDED(hret),
-                    wxString::Format(wxT("Cannot connect!\nHRESULT:%X"), hret)
-                            );
+                CHECK_HR(hret);

             }
         }
 
             }
         }
 


@@ -963,15 +970,17 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
     // Get IOleObject interface
     hret = m_oleObject.QueryInterface(IID_IOleObject, m_ActiveX);
 
     // Get IOleObject interface
     hret = m_oleObject.QueryInterface(IID_IOleObject, m_ActiveX);

-    wxASSERT(SUCCEEDED(hret));
+    CHECK_HR(hret);

 
     // get IViewObject Interface
     hret = m_viewObject.QueryInterface(IID_IViewObject, m_ActiveX);
 
     // get IViewObject Interface
     hret = m_viewObject.QueryInterface(IID_IViewObject, m_ActiveX);

-    wxASSERT(SUCCEEDED(hret));
+    CHECK_HR(hret);

 
     // document advise
     m_docAdviseCookie = 0;
     hret = m_oleObject->Advise(adviseSink, &m_docAdviseCookie);
 
     // document advise
     m_docAdviseCookie = 0;
     hret = m_oleObject->Advise(adviseSink, &m_docAdviseCookie);

+    CHECK_HR(hret);
+

     // TODO:Needed?
 //    hret = m_viewObject->SetAdvise(DVASPECT_CONTENT, 0, adviseSink);
     m_oleObject->SetHostNames(L"wxActiveXContainer", NULL);
     // TODO:Needed?
 //    hret = m_viewObject->SetAdvise(DVASPECT_CONTENT, 0, adviseSink);
     m_oleObject->SetHostNames(L"wxActiveXContainer", NULL);


@@ -982,12 +991,12 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
     // Get IOleInPlaceObject interface
     hret = m_oleInPlaceObject.QueryInterface(
         IID_IOleInPlaceObject, m_ActiveX);
     // Get IOleInPlaceObject interface
     hret = m_oleInPlaceObject.QueryInterface(
         IID_IOleInPlaceObject, m_ActiveX);

-    wxASSERT(SUCCEEDED(hret));
+    CHECK_HR(hret);

 
     // status
     DWORD dwMiscStatus;
     m_oleObject->GetMiscStatus(DVASPECT_CONTENT, &dwMiscStatus);
 
     // status
     DWORD dwMiscStatus;
     m_oleObject->GetMiscStatus(DVASPECT_CONTENT, &dwMiscStatus);

-    wxASSERT(SUCCEEDED(hret));
+    CHECK_HR(hret);

 
     // set client site first ?
     if (dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST)
 
     // set client site first ?
     if (dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST)


@@ -1001,6 +1010,7 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
     if (pPersistStreamInit.Ok())
     {
         hret = pPersistStreamInit->InitNew();
     if (pPersistStreamInit.Ok())
     {
         hret = pPersistStreamInit->InitNew();

+        CHECK_HR(hret);

     }
 
     if (! (dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST))
     }
 
     if (! (dwMiscStatus & OLEMISC_SETCLIENTSITEFIRST))


@@ -1028,13 +1038,17 @@ void wxActiveXContainer::CreateActiveX(REFIID iid, IUnknown* pUnk)
 
         hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL,
             m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect);
 
         hret = m_oleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, NULL,
             m_clientSite, 0, (HWND)m_realparent->GetHWND(), &posRect);

+        CHECK_HR(hret);
+

         hret = m_oleObject->DoVerb(OLEIVERB_SHOW, 0, m_clientSite, 0,
             (HWND)m_realparent->GetHWND(), &posRect);
         hret = m_oleObject->DoVerb(OLEIVERB_SHOW, 0, m_clientSite, 0,
             (HWND)m_realparent->GetHWND(), &posRect);

+        CHECK_HR(hret);

     }
 
     if (! m_oleObjectHWND && m_oleInPlaceObject.Ok())
     {
         hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);
     }
 
     if (! m_oleObjectHWND && m_oleInPlaceObject.Ok())
     {
         hret = m_oleInPlaceObject->GetWindow(&m_oleObjectHWND);

+        CHECK_HR(hret);

     }
 
     if (m_oleObjectHWND)
     }
 
     if (m_oleObjectHWND)


@@ -1123,10 +1137,15 @@ void wxActiveXContainer::OnPaint(wxPaintEvent& WXUNUSED(event))
         posRect.right = w;
         posRect.bottom = h;
 
         posRect.right = w;
         posRect.bottom = h;
 

+#if !(defined(_WIN32_WCE) && _WIN32_WCE < 400)

         ::RedrawWindow(m_oleObjectHWND, NULL, NULL, RDW_INTERNALPAINT);
         ::RedrawWindow(m_oleObjectHWND, NULL, NULL, RDW_INTERNALPAINT);

+#else
+        ::InvalidateRect(m_oleObjectHWND, NULL, false);
+#endif

         RECTL *prcBounds = (RECTL *) &posRect;
         RECTL *prcBounds = (RECTL *) &posRect;

+        wxMSWDCImpl *msw = wxDynamicCast( dc.GetImpl() , wxMSWDCImpl );

         m_viewObject->Draw(DVASPECT_CONTENT, -1, NULL, NULL, NULL,
         m_viewObject->Draw(DVASPECT_CONTENT, -1, NULL, NULL, NULL,

-            (HDC)dc.GetHDC(), prcBounds, NULL, NULL, 0);
+            (HDC)msw->GetHDC(), prcBounds, NULL, NULL, 0);

     }
 }
 
     }
 }
 


@@ -1157,5 +1176,4 @@ void wxActiveXContainer::OnKillFocus(wxFocusEvent& event)
     event.Skip();
 }
 
     event.Skip();
 }
 

-#endif
-// __WINE__
+#endif // wxUSE_ACTIVEX