Replace XFA_HWIDGET with IXFA_Widget*

xfa/include/fxfa/fxfa.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef FXFA_H_
 #define FXFA_H_
 
 class IFDE_XMLElement;
@@ skipping 17 matching lines @@
 class IXFA_ChecksumContext;
 class IXFA_WidgetAccIterator;
 
 class IXFA_Doc {
 public:
     virtual ~IXFA_Doc() { }
 protected:
     IXFA_Doc() { }
 };
 
-typedef struct _XFA_HWIDGET {
-    FX_LPVOID pData;
-}* XFA_HWIDGET;
+
+class IXFA_Widget {
+public:
+    virtual ~IXFA_Widget() { }
+protected:
+    IXFA_Widget() { }
+};
+
+
 #include "fxfa_basic.h"
 #include "fxfa_widget.h"
 #define XFA_MBICON_Error        0
 #define XFA_MBICON_Warning      1
 #define XFA_MBICON_Question     2
 #define XFA_MBICON_Status       3
 #define XFA_MB_OK                       0
 #define XFA_MB_OKCancel         1
 #define XFA_MB_YesNo            2
 #define XFA_MB_YesNoCancel      3
@@ skipping 226 matching lines @@
     virtual IXFA_Doc*                   CreateDoc(IXFA_DocProvider* pProvider, CPDF_Document* pPDFDoc) = 0;
     virtual     IXFA_AppProvider*       GetAppProvider() = 0;
     virtual void                                SetDefaultFontMgr(IXFA_FontMgr* pFontMgr) = 0;
     virtual IXFA_MenuHandler*   GetMenuHandler() = 0;
 };
 class IXFA_MenuHandler
 {
 public:
     virtual ~IXFA_MenuHandler() { }
 
-    virtual FX_BOOL             CanCopy(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             CanCut(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             CanPaste(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             CanSelectAll(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             CanDelete(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             CanDeSelect(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             Copy(XFA_HWIDGET hWidget, CFX_WideString &wsText) = 0;
-    virtual FX_BOOL             Cut(XFA_HWIDGET hWidget, CFX_WideString &wsText) = 0;
-    virtual FX_BOOL             Paste(XFA_HWIDGET hWidget, const CFX_WideString &wsText) = 0;
-    virtual FX_BOOL             SelectAll(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             Delete(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             DeSelect(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             CanUndo(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             CanRedo(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             Undo(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             Redo(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL             GetSuggestWords(XFA_HWIDGET hWidget, CFX_PointF pointf, CFX_ByteStringArray &sSuggest) = 0;
-    virtual FX_BOOL             ReplaceSpellCheckWord(XFA_HWIDGET hWidget, CFX_PointF pointf, FX_BSTR bsReplace) = 0;
+    virtual FX_BOOL             CanCopy(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             CanCut(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             CanPaste(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             CanSelectAll(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             CanDelete(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             CanDeSelect(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             Copy(IXFA_Widget* hWidget, CFX_WideString &wsText) = 0;
+    virtual FX_BOOL             Cut(IXFA_Widget* hWidget, CFX_WideString &wsText) = 0;
+    virtual FX_BOOL             Paste(IXFA_Widget* hWidget, const CFX_WideString &wsText) = 0;
+    virtual FX_BOOL             SelectAll(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             Delete(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             DeSelect(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             CanUndo(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             CanRedo(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             Undo(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             Redo(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL             GetSuggestWords(IXFA_Widget* hWidget, CFX_PointF pointf, CFX_ByteStringArray &sSuggest) = 0;
+    virtual FX_BOOL             ReplaceSpellCheckWord(IXFA_Widget* hWidget, CFX_PointF pointf, FX_BSTR bsReplace) = 0;
 };
 #define XFA_INVALIDATE_AllPages         0x00000000
 #define XFA_INVALIDATE_CurrentPage      0x00000001
 #define XFA_PRINTOPT_ShowDialog         0x00000001
 #define XFA_PRINTOPT_CanCancel          0x00000002
 #define XFA_PRINTOPT_ShrinkPage         0x00000004
 #define XFA_PRINTOPT_AsImage            0x00000008
 #define XFA_PRINTOPT_ReverseOrder       0x00000010
 #define XFA_PRINTOPT_PrintAnnot         0x00000020
 #define  XFA_PAGEVIEWEVENT_PostAdded            1
 #define  XFA_PAGEVIEWEVENT_PostRemoved          3
 #define  XFA_WIDGETEVENT_PostAdded                      2
 #define  XFA_WIDGETEVENT_PreRemoved                     3
 #define  XFA_WIDGETEVENT_PostContentChanged     6
 #define  XFA_WIDGETEVENT_ListItemRemoved        7
 #define  XFA_WIDGETEVENT_ListItemAdded          8
 #define  XFA_WIDGETEVENT_AccessChanged          9
 class IXFA_DocProvider
 {
 public:
     virtual ~IXFA_DocProvider() { }
 
     virtual void                SetChangeMark(IXFA_Doc* hDoc) = 0;
     virtual void                InvalidateRect(IXFA_PageView* pPageView, const CFX_RectF& rt, FX_DWORD dwFlags = 0) = 0;
-    virtual void                DisplayCaret(XFA_HWIDGET hWidget, FX_BOOL bVisible, const CFX_RectF* pRtAnchor) = 0;
-    virtual FX_BOOL             GetPopupPos(XFA_HWIDGET hWidget, FX_FLOAT fMinPopup, FX_FLOAT fMaxPopup,
+    virtual void                DisplayCaret(IXFA_Widget* hWidget, FX_BOOL bVisible, const CFX_RectF* pRtAnchor) = 0;
+    virtual FX_BOOL             GetPopupPos(IXFA_Widget* hWidget, FX_FLOAT fMinPopup, FX_FLOAT fMaxPopup,
                                     const CFX_RectF &rtAnchor, CFX_RectF &rtPopup) = 0;
-    virtual FX_BOOL             PopupMenu(XFA_HWIDGET hWidget, CFX_PointF ptPopup, const CFX_RectF* pRectExclude = NULL) = 0;
+    virtual FX_BOOL             PopupMenu(IXFA_Widget* hWidget, CFX_PointF ptPopup, const CFX_RectF* pRectExclude = NULL) = 0;
     virtual void                PageViewEvent(IXFA_PageView* pPageView, FX_DWORD dwFlags) = 0;
-    virtual void                WidgetEvent(XFA_HWIDGET hWidget, CXFA_WidgetAcc* pWidgetData, FX_DWORD dwEvent, FX_LPVOID pParam = NULL, FX_LPVOID pAdditional = NULL) = 0;
-    virtual FX_BOOL             RenderCustomWidget(XFA_HWIDGET hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix, const CFX_RectF& rtUI)
+    virtual void                WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, FX_DWORD dwEvent, FX_LPVOID pParam = NULL, FX_LPVOID pAdditional = NULL) = 0;
+    virtual FX_BOOL             RenderCustomWidget(IXFA_Widget* hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix, const CFX_RectF& rtUI)
     {
         return FALSE;
     }
     virtual     FX_INT32        CountPages(IXFA_Doc* hDoc) = 0;
     virtual     FX_INT32        GetCurrentPage(IXFA_Doc* hDoc) = 0;
     virtual void                SetCurrentPage(IXFA_Doc* hDoc, FX_INT32 iCurPage) = 0;
     virtual FX_BOOL             IsCalculationsEnabled(IXFA_Doc* hDoc) = 0;
     virtual void                SetCalculationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;
     virtual void                GetTitle(IXFA_Doc* hDoc, CFX_WideString &wsTitle) = 0;
     virtual void                SetTitle(IXFA_Doc* hDoc, FX_WSTR wsTitle) = 0;
     virtual void                ExportData(IXFA_Doc* hDoc, FX_WSTR wsFilePath, FX_BOOL bXDP = TRUE) = 0;
     virtual void                ImportData(IXFA_Doc* hDoc, FX_WSTR wsFilePath) = 0;
     virtual void                GotoURL(IXFA_Doc* hDoc, FX_WSTR bsURL, FX_BOOL bAppend = TRUE) = 0;
     virtual FX_BOOL             IsValidationsEnabled(IXFA_Doc* hDoc) = 0;
     virtual void                SetValidationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;
-    virtual void                SetFocusWidget(IXFA_Doc* hDoc, XFA_HWIDGET hWidget) = 0;
+    virtual void                SetFocusWidget(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
     virtual void                Print(IXFA_Doc* hDoc, FX_INT32 nStartPage, FX_INT32 nEndPage, FX_DWORD dwOptions) = 0;
     virtual FX_INT32                    AbsPageCountInBatch(IXFA_Doc* hDoc) = 0;
-    virtual FX_INT32                    AbsPageInBatch(IXFA_Doc* hDoc, XFA_HWIDGET hWidget) = 0;
+    virtual FX_INT32                    AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
     virtual FX_INT32                    SheetCountInBatch(IXFA_Doc* hDoc) = 0;
-    virtual FX_INT32                    SheetInBatch(IXFA_Doc* hDoc, XFA_HWIDGET hWidget) = 0;
+    virtual FX_INT32                    SheetInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
     virtual FX_INT32                    Verify(IXFA_Doc* hDoc, CXFA_Node* pSigNode, FX_BOOL bUsed = TRUE)
     {
         return 0;
     }
     virtual FX_BOOL                             Sign(IXFA_Doc* hDoc, CXFA_NodeList* pNodeList, FX_WSTR wsExpression, FX_WSTR wsXMLIdent, FX_WSTR wsValue = FX_WSTRC(L"open"), FX_BOOL bUsed = TRUE)
     {
         return 0;
     }
     virtual CXFA_NodeList*              Enumerate(IXFA_Doc* hDoc)
     {
         return 0;
     }
     virtual FX_BOOL                             Clear(IXFA_Doc* hDoc, CXFA_Node* pSigNode, FX_BOOL bCleared = TRUE)
     {
         return 0;
     }
     virtual void                GetURL(IXFA_Doc* hDoc, CFX_WideString &wsDocURL) = 0;
     virtual FX_ARGB             GetHighlightColor(IXFA_Doc* hDoc) = 0;
-    virtual void                AddDoRecord(XFA_HWIDGET hWidget) = 0;
+    virtual void                AddDoRecord(IXFA_Widget* hWidget) = 0;
 
     virtual FX_BOOL             SubmitData(IXFA_Doc* hDoc, CXFA_Submit submit) = 0;
     virtual FX_BOOL             CheckWord(IXFA_Doc* hDoc, FX_BSTR sWord) = 0;
     virtual FX_BOOL             GetSuggestWords(IXFA_Doc* hDoc, FX_BSTR sWord, CFX_ByteStringArray& sSuggest) = 0;
     virtual FX_BOOL             GetPDFScriptObject(IXFA_Doc* hDoc, FX_BSTR utf8Name, FXJSE_HVALUE hValue) = 0;
     virtual FX_BOOL             GetGlobalProperty(IXFA_Doc* hDoc, FX_BSTR szPropName, FXJSE_HVALUE hValue) = 0;
     virtual FX_BOOL             SetGlobalProperty(IXFA_Doc* hDoc, FX_BSTR szPropName, FXJSE_HVALUE hValue) = 0;
     virtual CPDF_Document*  OpenPDF(IXFA_Doc* hDoc, IFX_FileRead* pFile, FX_BOOL bTakeOverFile) = 0;
     virtual IFX_FileRead*       OpenLinkedFile(IXFA_Doc* hDoc, const CFX_WideString& wsLink) = 0;
 };
@@ skipping 138 matching lines @@
 
     virtual IXFA_Doc*                   GetDoc() = 0;
     virtual     FX_INT32                        StartLayout(FX_INT32 iStartPage = 0) = 0;
     virtual FX_INT32                    DoLayout(IFX_Pause *pPause = NULL) = 0;
     virtual void                                StopLayout() = 0;
 
     virtual FX_INT32                    GetLayoutStatus() = 0;
     virtual     void                            UpdateDocView() = 0;
     virtual FX_INT32                    CountPageViews() = 0;
     virtual IXFA_PageView*              GetPageView(FX_INT32 nIndex) = 0;
-    virtual XFA_HWIDGET                 GetWidgetByName(FX_WSTR wsName) = 0;
+    virtual IXFA_Widget*                        GetWidgetByName(FX_WSTR wsName) = 0;
     virtual CXFA_WidgetAcc*             GetWidgetAccByName(FX_WSTR wsName) = 0;
     virtual void                                ResetWidgetData(CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;
     virtual FX_INT32                    ProcessWidgetEvent(CXFA_EventParam* pParam, CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;
     virtual IXFA_WidgetHandler* GetWidgetHandler() = 0;
     virtual IXFA_WidgetIterator*        CreateWidgetIterator() = 0;
     virtual IXFA_WidgetAccIterator* CreateWidgetAccIterator(XFA_WIDGETORDER eOrder = XFA_WIDGETORDER_PreOrder) = 0;
-    virtual XFA_HWIDGET                 GetFocusWidget() = 0;
+    virtual IXFA_Widget*                        GetFocusWidget() = 0;
     virtual void                                KillFocus() = 0;
-    virtual FX_BOOL                             SetFocus(XFA_HWIDGET hWidget) = 0;
+    virtual FX_BOOL                             SetFocus(IXFA_Widget* hWidget) = 0;
 };
 #define XFA_TRAVERSEWAY_Tranvalse               0x0001
 #define XFA_TRAVERSEWAY_Form                    0x0002
 #define XFA_WIDGETFILTER_Visible                0x0001
 #define XFA_WIDGETFILTER_Viewable               0x0010
 #define XFA_WIDGETFILTER_Printable              0x0020
 #define XFA_WIDGETFILTER_Field                  0x0100
 #define XFA_WIDGETFILTER_AllType                0x0F00
 class IXFA_PageView
 {
 public:
     virtual ~IXFA_PageView() { }
 
     virtual IXFA_DocView*       GetDocView() = 0;
     virtual FX_INT32            GetPageViewIndex() = 0;
     virtual void                        GetPageViewRect(CFX_RectF &rtPage) = 0;
 
     virtual void                        GetDisplayMatrix(CFX_Matrix &mt, const CFX_Rect &rtDisp, FX_INT32 iRotate) = 0;
 
     virtual FX_INT32            LoadPageView(IFX_Pause *pPause = NULL) = 0;
     virtual void                        UnloadPageView() = 0;
-    virtual XFA_HWIDGET         GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual IXFA_Widget*                GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0;
     virtual IXFA_WidgetIterator* CreateWidgetIterator(FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form, FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) = 0;
 };
 class CXFA_RenderOptions
 {
 public:
     CXFA_RenderOptions()
         : m_bPrint(FALSE)
         , m_bHighlight(TRUE)
     {
     }
@@ skipping 42 matching lines @@
 #define XFA_WIDGETSTATUS_Invisible      0x00000002
 #define XFA_WIDGETSTATUS_Hidden         0x00000004
 #define XFA_WIDGETSTATUS_Viewable       0x00000010
 #define XFA_WIDGETSTATUS_Printable      0x00000020
 #define XFA_WIDGETSTATUS_Focused        0x00000100
 class IXFA_WidgetHandler
 {
 public:
     virtual ~IXFA_WidgetHandler() { }
 
-    virtual XFA_HWIDGET         CreateWidget(XFA_HWIDGET hParent, XFA_WIDGETTYPE eType, XFA_HWIDGET hBefore = NULL) = 0;
-    virtual IXFA_PageView*      GetPageView(XFA_HWIDGET hWidget) = 0;
-    virtual void                        GetRect(XFA_HWIDGET hWidget, CFX_RectF &rt) = 0;
-    virtual FX_DWORD            GetStatus(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL                     GetBBox(XFA_HWIDGET hWidget, CFX_RectF &rtBox, FX_DWORD dwStatus, FX_BOOL bDrawFocus = FALSE) = 0;
-    virtual CXFA_WidgetAcc*     GetDataAcc(XFA_HWIDGET hWidget) = 0;
+    virtual IXFA_Widget*                CreateWidget(IXFA_Widget* hParent, XFA_WIDGETTYPE eType, IXFA_Widget* hBefore = NULL) = 0;
+    virtual IXFA_PageView*      GetPageView(IXFA_Widget* hWidget) = 0;
+    virtual void                        GetRect(IXFA_Widget* hWidget, CFX_RectF &rt) = 0;
+    virtual FX_DWORD            GetStatus(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL                     GetBBox(IXFA_Widget* hWidget, CFX_RectF &rtBox, FX_DWORD dwStatus, FX_BOOL bDrawFocus = FALSE) = 0;
+    virtual CXFA_WidgetAcc*     GetDataAcc(IXFA_Widget* hWidget) = 0;
 
-    virtual void                        GetName(XFA_HWIDGET hWidget, CFX_WideString &wsName, FX_INT32 iNameType = 0) = 0;
-    virtual     FX_BOOL                 GetToolTip(XFA_HWIDGET hWidget, CFX_WideString &wsToolTip) = 0;
-    virtual     void                    SetPrivateData(XFA_HWIDGET hWidget, FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) = 0;
-    virtual     FX_LPVOID               GetPrivateData(XFA_HWIDGET hWidget, FX_LPVOID module_id) = 0;
-    virtual FX_BOOL                     OnMouseEnter(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL                     OnMouseExit(XFA_HWIDGET hWidget) = 0;
-    virtual FX_BOOL                     OnLButtonDown(XFA_HWIDGET hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
-    virtual FX_BOOL                     OnLButtonUp(XFA_HWIDGET hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
-    virtual FX_BOOL                     OnLButtonDblClk(XFA_HWIDGET hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
-    virtual FX_BOOL                     OnMouseMove(XFA_HWIDGET hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
-    virtual FX_BOOL                     OnMouseWheel(XFA_HWIDGET hWidget, FX_DWORD dwFlags, FX_SHORT zDelta, FX_FLOAT fx, FX_FLOAT fy) = 0;
-    virtual FX_BOOL                     OnRButtonDown(XFA_HWIDGET hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
-    virtual FX_BOOL                     OnRButtonUp(XFA_HWIDGET hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
-    virtual FX_BOOL                     OnRButtonDblClk(XFA_HWIDGET hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual void                        GetName(IXFA_Widget* hWidget, CFX_WideString &wsName, FX_INT32 iNameType = 0) = 0;
+    virtual     FX_BOOL                 GetToolTip(IXFA_Widget* hWidget, CFX_WideString &wsToolTip) = 0;
+    virtual     void                    SetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) = 0;
+    virtual     FX_LPVOID               GetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id) = 0;
+    virtual FX_BOOL                     OnMouseEnter(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL                     OnMouseExit(IXFA_Widget* hWidget) = 0;
+    virtual FX_BOOL                     OnLButtonDown(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual FX_BOOL                     OnLButtonUp(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual FX_BOOL                     OnLButtonDblClk(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual FX_BOOL                     OnMouseMove(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual FX_BOOL                     OnMouseWheel(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_SHORT zDelta, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual FX_BOOL                     OnRButtonDown(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual FX_BOOL                     OnRButtonUp(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual FX_BOOL                     OnRButtonDblClk(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
 
-    virtual FX_BOOL                     OnKeyDown(XFA_HWIDGET hWidget, FX_DWORD dwKeyCode, FX_DWORD dwFlags) = 0;
-    virtual FX_BOOL                     OnKeyUp(XFA_HWIDGET hWidget, FX_DWORD dwKeyCode, FX_DWORD dwFlags) = 0;
-    virtual FX_BOOL                     OnChar(XFA_HWIDGET hWidget, FX_DWORD dwChar, FX_DWORD dwFlags) = 0;
-    virtual     FX_DWORD                OnHitTest(XFA_HWIDGET hWidget, FX_FLOAT fx, FX_FLOAT fy) = 0;
-    virtual FX_BOOL                     OnSetCursor(XFA_HWIDGET hWidget, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual FX_BOOL                     OnKeyDown(IXFA_Widget* hWidget, FX_DWORD dwKeyCode, FX_DWORD dwFlags) = 0;
+    virtual FX_BOOL                     OnKeyUp(IXFA_Widget* hWidget, FX_DWORD dwKeyCode, FX_DWORD dwFlags) = 0;
+    virtual FX_BOOL                     OnChar(IXFA_Widget* hWidget, FX_DWORD dwChar, FX_DWORD dwFlags) = 0;
+    virtual     FX_DWORD                OnHitTest(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy) = 0;
+    virtual FX_BOOL                     OnSetCursor(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy) = 0;
 
-    virtual void                        RenderWidget(XFA_HWIDGET hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, FX_BOOL bHighlight = FALSE) = 0;
+    virtual void                        RenderWidget(IXFA_Widget* hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, FX_BOOL bHighlight = FALSE) = 0;
     virtual FX_BOOL                     HasEvent(CXFA_WidgetAcc* pWidgetAcc, XFA_EVENTTYPE eEventType) = 0;
     virtual FX_INT32            ProcessEvent(CXFA_WidgetAcc* pWidgetAcc, CXFA_EventParam* pParam) = 0;
 };
 class IXFA_WidgetIterator
 {
 public:
     virtual void                                Release() = 0;
     virtual void                                Reset() = 0;
-    virtual XFA_HWIDGET                 MoveToFirst() = 0;
-    virtual XFA_HWIDGET                 MoveToLast() = 0;
-    virtual     XFA_HWIDGET                     MoveToNext() = 0;
-    virtual XFA_HWIDGET                 MoveToPrevious() = 0;
-    virtual     XFA_HWIDGET                     GetCurrentWidget() = 0;
-    virtual     FX_BOOL                         SetCurrentWidget(XFA_HWIDGET hWidget)  = 0;
+    virtual IXFA_Widget*                        MoveToFirst() = 0;
+    virtual IXFA_Widget*                        MoveToLast() = 0;
+    virtual     IXFA_Widget*                    MoveToNext() = 0;
+    virtual IXFA_Widget*                        MoveToPrevious() = 0;
+    virtual     IXFA_Widget*                    GetCurrentWidget() = 0;
+    virtual     FX_BOOL                         SetCurrentWidget(IXFA_Widget* hWidget)  = 0;
 protected:
     ~IXFA_WidgetIterator() { }
 };
 class IXFA_WidgetAccIterator
 {
 public:
     virtual void                                Release() = 0;
     virtual void                                Reset() = 0;
     virtual CXFA_WidgetAcc*             MoveToFirst() = 0;
     virtual CXFA_WidgetAcc*             MoveToLast() = 0;
@@ skipping 14 matching lines @@
     virtual FX_BOOL                             StartChecksum() = 0;
     virtual FX_BOOL                             UpdateChecksum(IFX_FileRead* pSrcFile, FX_FILESIZE offset = 0, size_t size = 0) = 0;
     virtual void                                FinishChecksum() = 0;
     virtual void                                GetChecksum(CFX_ByteString &bsChecksum) = 0;
 protected:
     ~IXFA_ChecksumContext() { }
 };
 IXFA_ChecksumContext*   XFA_Checksum_Create();
 
 #endif  // FXFA_H_