Replace XFA_HWIDGET with IXFA_Widget*

fpdfsdk/src/fsdk_annothandler.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 "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
 #include "../include/fsdk_mgr.h"
@@ skipping 56 matching lines @@
         ASSERT(pPageView != NULL);
         
         if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(pAnnot->GetSubType()))
         {
                 return pAnnotHandler->NewAnnot(pAnnot, pPageView);
         }
         
         return new CPDFSDK_BAAnnot(pAnnot, pPageView);
 }
 
-CPDFSDK_Annot* CPDFSDK_AnnotHandlerMgr::NewAnnot(XFA_HWIDGET pAnnot, CPDFSDK_PageView* pPageView)
+CPDFSDK_Annot* CPDFSDK_AnnotHandlerMgr::NewAnnot(IXFA_Widget* pAnnot, CPDFSDK_PageView* pPageView)
 {
         ASSERT(pAnnot != NULL);
         ASSERT(pPageView != NULL);
 
         if (IPDFSDK_AnnotHandler* pAnnotHandler = GetAnnotHandler(FSDK_XFAWIDGET_TYPENAME))
         {
                 return pAnnotHandler->NewAnnot(pAnnot, pPageView);
         }
 
         return NULL;
@@ skipping 303 matching lines @@
                 ai.GetNextAnnot(pSDKAnnot) : 
                 ai.GetPrevAnnot(pSDKAnnot);
                 return pNext;
         }
         // for xfa annots
         IXFA_WidgetIterator* pWidgetIterator = pPage->GetXFAPageView()->CreateWidgetIterator(XFA_TRAVERSEWAY_Tranvalse, XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_Field);
         if (pWidgetIterator == NULL)
                 return  NULL;
         if (pWidgetIterator->GetCurrentWidget() != pSDKAnnot->GetXFAWidget())   
                 pWidgetIterator->SetCurrentWidget(pSDKAnnot->GetXFAWidget());
-        XFA_HWIDGET hNextFocus = NULL;
+        IXFA_Widget* hNextFocus = NULL;
         hNextFocus = bNext?pWidgetIterator->MoveToNext():pWidgetIterator->MoveToPrevious();
         if (hNextFocus == NULL && pSDKAnnot != NULL)
                 hNextFocus = pWidgetIterator->MoveToFirst();
 
         pWidgetIterator->Release();
         return pPageView->GetAnnotByXFAWidget(hNextFocus);
 }
 
 FX_BOOL CPDFSDK_BFAnnotHandler::CanAnswer(CPDFSDK_Annot* pAnnot)
 {
@@ skipping 47 matching lines @@
                 pWidget = new CPDFSDK_Widget(pAnnot, pPage, pInterForm);
                 pInterForm->AddMap(pCtrl, pWidget);
                 CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
                 if(pPDFInterForm && pPDFInterForm->NeedConstructAP())
                         pWidget->ResetAppearance(NULL,FALSE);
         }
         
         return pWidget;
 }
 
-CPDFSDK_Annot*          CPDFSDK_BFAnnotHandler::NewAnnot(XFA_HWIDGET hWidget, CPDFSDK_PageView* pPage)
+CPDFSDK_Annot*          CPDFSDK_BFAnnotHandler::NewAnnot(IXFA_Widget* hWidget, CPDFSDK_PageView* pPage)
 {
         return NULL;
 }
 
 void CPDFSDK_BFAnnotHandler::ReleaseAnnot(CPDFSDK_Annot* pAnnot)
 {
         ASSERT(pAnnot != NULL);
 
         if (m_pFormFiller)
                 m_pFormFiller->OnDelete(pAnnot);
@@ skipping 350 matching lines @@
 #define FWL_WGTHITTEST_Border                   17
 #define FWL_WGTHITTEST_Edit                             19
 #define FWL_WGTHITTEST_HyperLink        20
 
 CPDFSDK_XFAAnnotHandler::CPDFSDK_XFAAnnotHandler(CPDFDoc_Environment* pApp) :
         m_pApp(pApp)
 {
 
 }
 
-CPDFSDK_Annot* CPDFSDK_XFAAnnotHandler::NewAnnot(XFA_HWIDGET pAnnot, CPDFSDK_PageView* pPage)
+CPDFSDK_Annot* CPDFSDK_XFAAnnotHandler::NewAnnot(IXFA_Widget* pAnnot, CPDFSDK_PageView* pPage)
 {
         ASSERT(pPage != NULL);
         ASSERT(pAnnot != NULL);
 
         CPDFSDK_Document* pSDKDoc  = m_pApp->GetCurrentDoc();
         ASSERT(pSDKDoc);
         CPDFSDK_InterForm* pInterForm = (CPDFSDK_InterForm*)pSDKDoc->GetInterForm();
         ASSERT(pInterForm != NULL);
 
         CPDFSDK_XFAWidget* pWidget = NULL;
@@ skipping 21 matching lines @@
 
         IXFA_WidgetHandler* pWidgetHandler = GetXFAWidgetHandler(pAnnot);
         ASSERT(pWidgetHandler != NULL);
 
         CFX_Graphics gs;
         gs.Create(pDevice);
 
         CFX_Matrix mt;
         mt = *(CFX_Matrix*)pUser2Device;
 
-        XFA_HWIDGET hWidget = pAnnot->GetXFAWidget();
+        IXFA_Widget* hWidget = pAnnot->GetXFAWidget();
         ASSERT(hWidget != NULL);
 
         FX_BOOL bIsHighlight = FALSE;
         if (pSDKDoc->GetFocusAnnot() != pAnnot)
                 bIsHighlight = TRUE;
 
         pWidgetHandler->RenderWidget(pAnnot->GetXFAWidget(), &gs, &mt, bIsHighlight);
 
         // to do highlight and shadow
 
@@ skipping 249 matching lines @@
 {
         IXFA_WidgetHandler* pWidgetHandler = NULL;
 
         if (pOldAnnot)
                 pWidgetHandler = GetXFAWidgetHandler(pOldAnnot);
         else if (pNewAnnot)
                 pWidgetHandler = GetXFAWidgetHandler(pNewAnnot);
 
         if (pWidgetHandler)
         {
-                FX_BOOL bRet = TRUE; /*pWidgetHandler->OnFocusChange(pNewAnnot ? pNewAnnot->GetXFAWidget() : NULL,
-                        pOldAnnot ? pOldAnnot->GetXFAWidget() : NULL); */
-
-                XFA_HWIDGET hWidget = pNewAnnot ? pNewAnnot->GetXFAWidget() : NULL;
+                FX_BOOL bRet = TRUE;
+                IXFA_Widget* hWidget = pNewAnnot ? pNewAnnot->GetXFAWidget() : NULL;
                 if (hWidget)
                 {
                         IXFA_PageView* pXFAPageView = pWidgetHandler->GetPageView(hWidget);
                         if (pXFAPageView)
                         {
                                 bRet = pXFAPageView->GetDocView()->SetFocus(hWidget);
                                 if (pXFAPageView->GetDocView()->GetFocusWidget() == hWidget)
                                         bRet = TRUE;
                         }
                 }
@@ skipping 238 matching lines @@
                                 m_pIteratorAnnotList.RemoveAt(i);
                                 m_pIteratorAnnotList.InsertAt(0, pReaderAnnot);
                                 break;
                         }       
                 }
         }
 
         return TRUE;
 }