Log Message:
-----------
Decal needs to not have like 3,0000,0000 circular references
Modified Files:
--------------
/cvsroot/decaldev/source/Inject:
Inject.idl
Panel.cpp
Panel.h
RootLayer.cpp
Revision Data
-------------
Index: Inject.idl
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/Inject.idl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Inject.idl 28 Sep 2003 19:01:28 -0000 1.44
+++ Inject.idl 2 Oct 2003 11:49:58 -0000 1.45
@@ -554,6 +554,7 @@
[helpstring("method LoadViewEx")] HRESULT LoadViewEx(long nViewID, IView *pView, IUnknown *pSchema, long lViewFlags);
[propget, helpstring("property Transparent")] HRESULT Transparent([out, retval] VARIANT_BOOL* pVal);
[propput, helpstring("property Transparent")] HRESULT Transparent([in] VARIANT_BOOL newVal);
+ [propput, helpstring("property Params")] HRESULT Params([in] struct ViewParams *newVal);
};
[
Index: Panel.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/Panel.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Panel.cpp 28 Sep 2003 19:05:05 -0000 1.15
+++ Panel.cpp 2 Oct 2003 11:49:59 -0000 1.16
@@ -582,3 +582,12 @@
return S_OK;
}
+
+STDMETHODIMP cPanel::put_Params(ViewParams *newVal)
+{
+ if( newVal == NULL )
+ return E_POINTER;
+
+ m_pVP = newVal;
+ return S_OK;
+}
Index: Panel.h
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/Panel.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Panel.h 28 Sep 2003 19:05:05 -0000 1.8
+++ Panel.h 2 Oct 2003 11:49:59 -0000 1.9
@@ -82,6 +82,7 @@
STDMETHOD(putref_Sink)(/*[in]*/ IPanelSink* newVal);
STDMETHOD(get_Transparent)(/*[out, retval]*/ VARIANT_BOOL *pVal);
STDMETHOD(put_Transparent)(/*[in]*/ VARIANT_BOOL newVal);
+ STDMETHOD(put_Params)(ViewParams *Params);
// ILayerRender Methods
STDMETHOD(Render)(ICanvas *);
Index: RootLayer.cpp
===================================================================
RCS file: /cvsroot/decaldev/source/Inject/RootLayer.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- RootLayer.cpp 17 Sep 2003 23:10:06 -0000 1.7
+++ RootLayer.cpp 2 Oct 2003 11:49:59 -0000 1.8
@@ -155,9 +155,13 @@
pPanel->putref_Sink( this );
pView->m_pPanel = pPanel;
+ pPanel->put_Params( &pView->m_VP );
}
else
+ {
pView->m_pPanel = m_pPanel;
+ m_pPanel->put_Params( &pView->m_VP );
+ }
CComPtr< IUnknown > pRootControl;
|
