Replace XFA_HWIDGET with IXFA_Widget*

fpdfsdk/include/fsdk_baseform.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 FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 #define FPDFSDK_INCLUDE_FSDK_BASEFORM_H_
 
 #if _FX_OS_ == _FX_ANDROID_
@@ skipping 49 matching lines @@
         int                                             nSelEnd;                //in[out]
         int                                             nSelStart;              //in[out]
         CFX_WideString                  sValue;                 //in[out]
         FX_BOOL                                 bWillCommit;    //in
         FX_BOOL                                 bFieldFull;             //in
         FX_BOOL                                 bRC;                    //in[out]
 }PDFSDK_FieldAction;
 class CPDFSDK_Widget:public CPDFSDK_BAAnnot
 {
 public:
-        XFA_HWIDGET                                             GetMixXFAWidget();
-        XFA_HWIDGET                                             GetGroupMixXFAWidget();
+        IXFA_Widget*                                            GetMixXFAWidget();
+        IXFA_Widget*                                            GetGroupMixXFAWidget();
         IXFA_WidgetHandler*                             GetXFAWidgetHandler();
 
         FX_BOOL                                                 HasXFAAAction(PDFSDK_XFAAActionType eXFAAAT);
         FX_BOOL                                                 OnXFAAAction(PDFSDK_XFAAActionType eXFAAAT, PDFSDK_FieldAction& data, CPDFSDK_PageView* pPageView);
 
         void                                                    Synchronize(FX_BOOL bSynchronizeElse);
         void                                                    SynchronizeXFAValue();
         void                                                    SynchronizeXFAItems();
 
-        static void                                             SynchronizeXFAValue(IXFA_DocView* pXFADocView, XFA_HWIDGET hWidget, 
+        static void                                             SynchronizeXFAValue(IXFA_DocView* pXFADocView, IXFA_Widget* hWidget, 
                 CPDF_FormField* pFormField, CPDF_FormControl* pFormControl);
-        static void                                             SynchronizeXFAItems(IXFA_DocView* pXFADocView, XFA_HWIDGET hWidget, 
+        static void                                             SynchronizeXFAItems(IXFA_DocView* pXFADocView, IXFA_Widget* hWidget, 
                 CPDF_FormField* pFormField, CPDF_FormControl* pFormControl);
 
 public:
         CPDFSDK_Widget(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm);
         virtual ~CPDFSDK_Widget();
 
         virtual CFX_ByteString                  GetSubType() const;
         
         virtual CPDF_Action                             GetAAction(CPDF_AAction::AActionType eAAT);
 
@@ skipping 91 matching lines @@
         void                                                    DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device,
                 CPDF_Annot::AppearanceMode mode, const CPDF_RenderOptions* pOptions);
 public:
         FX_BOOL                                                 HitTest(FX_FLOAT pageX, FX_FLOAT pageY);
 private:
         CPDFSDK_InterForm*                              m_pInterForm;
         FX_BOOL                                                 m_bAppModified;
         FX_INT32                                                m_nAppAge;
         FX_INT32                                                m_nValueAge;
 
-        XFA_HWIDGET                                             m_hMixXFAWidget;
+        IXFA_Widget*                                            m_hMixXFAWidget;
         IXFA_WidgetHandler*                             m_pWidgetHandler;
 };
 
 class CPDFSDK_XFAWidget : public CPDFSDK_Annot
 {
 public:
-        CPDFSDK_XFAWidget(XFA_HWIDGET pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm);
+        CPDFSDK_XFAWidget(IXFA_Widget* pAnnot, CPDFSDK_PageView* pPageView, CPDFSDK_InterForm* pInterForm);
         virtual ~CPDFSDK_XFAWidget(){}
 
 public:
         virtual FX_BOOL                         IsXFAField();
-        virtual XFA_HWIDGET                     GetXFAWidget() { return m_hXFAWidget; }
+        virtual IXFA_Widget*                    GetXFAWidget() { return m_hXFAWidget; }
 
         virtual CFX_ByteString          GetType() const ;
         virtual CFX_ByteString          GetSubType() const { return ""; }
 
         virtual CFX_FloatRect           GetRect();
 
 public:
         CPDFSDK_InterForm*                      GetInterForm() { return m_pInterForm; }
 
 private:
         CPDFSDK_InterForm*                              m_pInterForm;
-        XFA_HWIDGET                                             m_hXFAWidget;
+        IXFA_Widget*                                            m_hXFAWidget;
 };
 
 #define CPDFSDK_WidgetMap                               CFX_MapPtrTemplate<CPDF_FormControl*, CPDFSDK_Widget*>
-#define CPDFSDK_XFAWidgetMap                    CFX_MapPtrTemplate<XFA_HWIDGET, CPDFSDK_XFAWidget*>
+#define CPDFSDK_XFAWidgetMap                    CFX_MapPtrTemplate<IXFA_Widget*, CPDFSDK_XFAWidget*>
 #define CPDFSDK_FieldSynchronizeMap             CFX_MapPtrTemplate<CPDF_FormField*, int>
 
 class CPDFSDK_InterForm : public CPDF_FormNotify
 {
 public:
         CPDFSDK_InterForm(CPDFSDK_Document* pDocument);
         virtual ~CPDFSDK_InterForm();
         
 public:
         virtual void                                    Destroy();
         virtual CPDF_InterForm*                 GetInterForm();
         
         CPDFSDK_Document*                               GetDocument();
         FX_BOOL                                                 HighlightWidgets();
         
         CPDFSDK_Widget*                                 GetSibling(CPDFSDK_Widget* pWidget, FX_BOOL bNext) const;
         CPDFSDK_Widget*                                 GetWidget(CPDF_FormControl* pControl) const;
         void                                                    GetWidgets(const CFX_WideString& sFieldName, CFX_PtrArray& widgets);
         void                                                    GetWidgets(CPDF_FormField* pField, CFX_PtrArray& widgets);
         
         void                                                    AddMap(CPDF_FormControl* pControl, CPDFSDK_Widget* pWidget);
         void                                                    RemoveMap(CPDF_FormControl* pControl);
         
-        void                                                    AddXFAMap(XFA_HWIDGET hWidget, CPDFSDK_XFAWidget* pWidget);
-        void                                                    RemoveXFAMap(XFA_HWIDGET hWidget);
-        CPDFSDK_XFAWidget*                              GetXFAWidget(XFA_HWIDGET hWidget);
+        void                                                    AddXFAMap(IXFA_Widget* hWidget, CPDFSDK_XFAWidget* pWidget);
+        void                                                    RemoveXFAMap(IXFA_Widget* hWidget);
+        CPDFSDK_XFAWidget*                              GetXFAWidget(IXFA_Widget* hWidget);
         
         void                                                    EnableCalculate(FX_BOOL bEnabled);
         FX_BOOL                                                 IsCalculateEnabled() const;
 
         void                                                    XfaEnableCalculate(FX_BOOL bEnabled);
         FX_BOOL                                                 IsXfaCalculateEnabled() const;
 
         FX_BOOL                                                 IsXfaValidationsEnabled();
         void                                                    XfaSetValidationsEnabled(FX_BOOL bEnabled);
 
@@ skipping 91 matching lines @@
         static CPDF_Rect                                        GetAnnotRect(CPDFSDK_Annot* pAnnot);
 
         CPDFSDK_PageView*                                       m_pPageView;
         CFX_ByteString                                          m_sType;
         CFX_ByteString                                          m_sSubType;
         int                                                                     m_nTabs;
         CPDFSDK_Annots                                          m_Annots;
 };
 
 #endif  // FPDFSDK_INCLUDE_FSDK_BASEFORM_H_