Replace XFA_HWIDGET with IXFA_Widget*

fpdfsdk/src/fsdk_mgr.cpp

 // 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
 
 #include "../../public/fpdf_ext.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
@@ skipping 787 matching lines @@
                 
         if(pAnnotHandler)
         {                                
                 pAnnotHandler->Annot_OnCreate(pSDKAnnot);
                 
         }
 
          return pSDKAnnot;
 }
 
-CPDFSDK_Annot* CPDFSDK_PageView::AddAnnot(XFA_HWIDGET pPDFAnnot)
+CPDFSDK_Annot* CPDFSDK_PageView::AddAnnot(IXFA_Widget* pPDFAnnot)
 {
         if (!pPDFAnnot) return NULL;
 
         CPDFSDK_Annot* pSDKAnnot = GetAnnotByXFAWidget(pPDFAnnot);
         if (pSDKAnnot)
                 return pSDKAnnot;
 
         CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv();
         ASSERT(pEnv);
         CPDFSDK_AnnotHandlerMgr * pAnnotHandler= pEnv->GetAnnotHandlerMgr();    
@@ skipping 79 matching lines @@
 {
         int nCount = m_fxAnnotArray.GetSize();
         for(int i=0; i<nCount; i++)
         {
                 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
                 if(pDict==pAnnot->GetPDFAnnot()->m_pAnnotDict) 
                         return pAnnot;
         }
         return NULL;
 }
-CPDFSDK_Annot* CPDFSDK_PageView::GetAnnotByXFAWidget(XFA_HWIDGET hWidget)
+CPDFSDK_Annot* CPDFSDK_PageView::GetAnnotByXFAWidget(IXFA_Widget* hWidget)
 {
         if (hWidget == NULL)
                 return NULL;
         int annotCount = m_fxAnnotArray.GetSize();
 
         for(int i = 0; i < annotCount; i++)
         {
                 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
                 if(pAnnot->GetXFAWidget() == hWidget)
                         return pAnnot;
@@ skipping 192 matching lines @@
         ASSERT(pAnnotHandlerMgr != NULL);
 
         SetLock(TRUE);
         m_page->AddRef();
         if (m_pSDKDoc->GetDocument()->GetDocType() == DOCTYPE_DYNIMIC_XFA)
         {
                 IXFA_PageView* pageView = NULL;
                 pageView = m_page->GetXFAPageView();
                 ASSERT(pageView != NULL);
 
-                XFA_HWIDGET pXFAAnnot = NULL;
                 IXFA_WidgetIterator* pWidgetHander = pageView->CreateWidgetIterator(XFA_TRAVERSEWAY_Form, XFA_WIDGETFILTER_Visible|XFA_WIDGETFILTER_Viewable|XFA_WIDGETFILTER_AllType);
                 if (!pWidgetHander)
                 {
                         m_page->Release();
                         SetLock(FALSE);
                         return;
                 }
 
-                pXFAAnnot = pWidgetHander->MoveToNext();
+        IXFA_Widget* pXFAAnnot = pWidgetHander->MoveToNext();
                 while (pXFAAnnot) {
                         CPDFSDK_Annot* pAnnot = pAnnotHandlerMgr->NewAnnot(pXFAAnnot, this);
                         if(!pAnnot) {
                                 pXFAAnnot = pWidgetHander->MoveToNext();
                                 continue;
                         }
                         m_fxAnnotArray.Add(pAnnot);
                 
                         pAnnotHandlerMgr->Annot_OnLoad(pAnnot);
 
@@ skipping 92 matching lines @@
         
         for(int i=0; i<m_fxAnnotArray.GetSize(); i++)
         {
                 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
                 if(pAnnot == pFocusAnnot)
                         return pAnnot;
         }
         return NULL;
 }