Index: xfa/fxfa/app/xfa_ffnotify.h |
diff --git a/xfa/fxfa/app/xfa_ffnotify.h b/xfa/fxfa/app/xfa_ffnotify.h |
index 30c8f0d1078695655ab28ec26b70ec55e95d5a18..6bf39ee6d2d60a7dc73ddbbc9847114b649614b2 100644 |
--- a/xfa/fxfa/app/xfa_ffnotify.h |
+++ b/xfa/fxfa/app/xfa_ffnotify.h |
@@ -9,59 +9,61 @@ |
#include "xfa/fxfa/parser/xfa_document.h" |
-class CXFA_FFNotify : public IXFA_Notify { |
+class CXFA_FFWidgetHandler; |
+ |
+class CXFA_FFNotify { |
public: |
CXFA_FFNotify(CXFA_FFDoc* pDoc); |
~CXFA_FFNotify(); |
- virtual void OnPageEvent(IXFA_LayoutPage* pSender, |
- XFA_PAGEEVENT eEvent, |
- void* pParam = NULL); |
+ void OnPageEvent(CXFA_ContainerLayoutItem* pSender, |
+ XFA_PAGEEVENT eEvent, |
+ void* pParam = NULL); |
- virtual void OnNodeEvent(CXFA_Node* pSender, |
- XFA_NODEEVENT eEvent, |
- void* pParam = NULL, |
- void* pParam2 = NULL, |
- void* pParam3 = NULL, |
- void* pParam4 = NULL); |
- virtual void OnWidgetDataEvent(CXFA_WidgetData* pSender, |
- uint32_t dwEvent, |
- void* pParam = NULL, |
- void* pAdditional = NULL, |
- void* pAdditional2 = NULL); |
- virtual CXFA_LayoutItem* OnCreateLayoutItem(CXFA_Node* pNode); |
- virtual void OnLayoutEvent(IXFA_DocLayout* pLayout, |
- CXFA_LayoutItem* pSender, |
- XFA_LAYOUTEVENT eEvent, |
- void* pParam = NULL, |
- void* pParam2 = NULL); |
+ void OnNodeEvent(CXFA_Node* pSender, |
+ XFA_NODEEVENT eEvent, |
+ void* pParam = NULL, |
+ void* pParam2 = NULL, |
+ void* pParam3 = NULL, |
+ void* pParam4 = NULL); |
+ void OnWidgetDataEvent(CXFA_WidgetData* pSender, |
+ uint32_t dwEvent, |
+ void* pParam = NULL, |
+ void* pAdditional = NULL, |
+ void* pAdditional2 = NULL); |
+ CXFA_LayoutItem* OnCreateLayoutItem(CXFA_Node* pNode); |
+ void OnLayoutEvent(CXFA_LayoutProcessor* pLayout, |
+ CXFA_LayoutItem* pSender, |
+ XFA_LAYOUTEVENT eEvent, |
+ void* pParam = NULL, |
+ void* pParam2 = NULL); |
- virtual void StartFieldDrawLayout(CXFA_Node* pItem, |
- FX_FLOAT& fCalcWidth, |
- FX_FLOAT& fCalcHeight); |
- virtual FX_BOOL FindSplitPos(CXFA_Node* pItem, |
- int32_t iBlockIndex, |
- FX_FLOAT& fCalcHeightPos); |
- virtual FX_BOOL RunScript(CXFA_Node* pScript, CXFA_Node* pFormItem); |
- virtual int32_t ExecEventByDeepFirst(CXFA_Node* pFormNode, |
- XFA_EVENTTYPE eEventType, |
- FX_BOOL bIsFormReady = FALSE, |
- FX_BOOL bRecursive = TRUE, |
- CXFA_WidgetAcc* pExclude = NULL); |
- virtual void AddCalcValidate(CXFA_Node* pNode); |
- virtual IXFA_Doc* GetHDOC(); |
- virtual IXFA_DocProvider* GetDocProvider(); |
- virtual IXFA_AppProvider* GetAppProvider(); |
- virtual IXFA_WidgetHandler* GetWidgetHandler(); |
- virtual IXFA_Widget* GetHWidget(CXFA_LayoutItem* pLayoutItem); |
- virtual void OpenDropDownList(IXFA_Widget* hWidget); |
- virtual CFX_WideString GetCurrentDateTime(); |
- virtual void ResetData(CXFA_WidgetData* pWidgetData = NULL); |
- virtual int32_t GetLayoutStatus(); |
- virtual void RunNodeInitialize(CXFA_Node* pNode); |
- virtual void RunSubformIndexChange(CXFA_Node* pSubformNode); |
- virtual CXFA_Node* GetFocusWidgetNode(); |
- virtual void SetFocusWidgetNode(CXFA_Node* pNode); |
+ void StartFieldDrawLayout(CXFA_Node* pItem, |
+ FX_FLOAT& fCalcWidth, |
+ FX_FLOAT& fCalcHeight); |
+ FX_BOOL FindSplitPos(CXFA_Node* pItem, |
+ int32_t iBlockIndex, |
+ FX_FLOAT& fCalcHeightPos); |
+ FX_BOOL RunScript(CXFA_Node* pScript, CXFA_Node* pFormItem); |
+ int32_t ExecEventByDeepFirst(CXFA_Node* pFormNode, |
+ XFA_EVENTTYPE eEventType, |
+ FX_BOOL bIsFormReady = FALSE, |
+ FX_BOOL bRecursive = TRUE, |
+ CXFA_WidgetAcc* pExclude = NULL); |
+ void AddCalcValidate(CXFA_Node* pNode); |
+ CXFA_FFDoc* GetHDOC(); |
+ IXFA_DocProvider* GetDocProvider(); |
+ IXFA_AppProvider* GetAppProvider(); |
+ CXFA_FFWidgetHandler* GetWidgetHandler(); |
+ CXFA_FFWidget* GetHWidget(CXFA_LayoutItem* pLayoutItem); |
+ void OpenDropDownList(CXFA_FFWidget* hWidget); |
+ CFX_WideString GetCurrentDateTime(); |
+ void ResetData(CXFA_WidgetData* pWidgetData = NULL); |
+ int32_t GetLayoutStatus(); |
+ void RunNodeInitialize(CXFA_Node* pNode); |
+ void RunSubformIndexChange(CXFA_Node* pSubformNode); |
+ CXFA_Node* GetFocusWidgetNode(); |
+ void SetFocusWidgetNode(CXFA_Node* pNode); |
protected: |
void OnNodeReady(CXFA_Node* pNode); |
@@ -74,22 +76,22 @@ class CXFA_FFNotify : public IXFA_Notify { |
void OnChildAdded(CXFA_Node* pSender, void* pParam, void* pParam2); |
void OnChildRemoved(CXFA_Node* pSender, void* pParam, void* pParam2); |
void OnLayoutItemAdd(CXFA_FFDocView* pDocView, |
- IXFA_DocLayout* pLayout, |
+ CXFA_LayoutProcessor* pLayout, |
CXFA_LayoutItem* pSender, |
void* pParam, |
void* pParam2); |
void OnLayoutItemRemoving(CXFA_FFDocView* pDocView, |
- IXFA_DocLayout* pLayout, |
+ CXFA_LayoutProcessor* pLayout, |
CXFA_LayoutItem* pSender, |
void* pParam, |
void* pParam2); |
void OnLayoutItemRectChanged(CXFA_FFDocView* pDocView, |
- IXFA_DocLayout* pLayout, |
+ CXFA_LayoutProcessor* pLayout, |
CXFA_LayoutItem* pSender, |
void* pParam, |
void* pParam2); |
void OnLayoutItemStatustChanged(CXFA_FFDocView* pDocView, |
- IXFA_DocLayout* pLayout, |
+ CXFA_LayoutProcessor* pLayout, |
CXFA_LayoutItem* pSender, |
void* pParam, |
void* pParam2); |