More FWL interface cleanup.

xfa/fxfa/app/xfa_ffbarcode.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 "xfa/fxfa/app/xfa_ffbarcode.h"
 
 #include "core/fxcrt/include/fx_ext.h"
+#include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_app.h"
-#include "xfa/fwl/core/ifwl_notedriver.h"
 #include "xfa/fwl/lightwidget/cfwl_barcode.h"
 #include "xfa/fxfa/app/xfa_fffield.h"
 #include "xfa/fxfa/app/xfa_fftextedit.h"
 #include "xfa/fxfa/app/xfa_fwladapter.h"
 #include "xfa/fxfa/include/xfa_ffpageview.h"
 #include "xfa/fxfa/include/xfa_ffwidget.h"
 
 namespace {
 
 const XFA_BARCODETYPEENUMINFO g_XFABarCodeTypeEnumData[] = {
@@ skipping 99 matching lines @@
     : CXFA_FFTextEdit(pPageView, pDataAcc) {}
 CXFA_FFBarcode::~CXFA_FFBarcode() {}
 FX_BOOL CXFA_FFBarcode::LoadWidget() {
   CFWL_Barcode* pFWLBarcode = CFWL_Barcode::Create();
   if (pFWLBarcode) {
     pFWLBarcode->Initialize();
   }
   m_pNormalWidget = pFWLBarcode;
   IFWL_Widget* pWidget = m_pNormalWidget->GetWidget();
   m_pNormalWidget->SetPrivateData(pWidget, this, NULL);
-  IFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver();
+  CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver();
   pNoteDriver->RegisterEventTarget(pWidget, pWidget);
   m_pOldDelegate = m_pNormalWidget->SetDelegate(this);
   m_pNormalWidget->LockUpdate();
   CFX_WideString wsText;
   m_pDataAcc->GetValue(wsText, XFA_VALUEPICTURE_Display);
   pFWLBarcode->SetText(wsText);
   UpdateWidgetProperty();
   m_pNormalWidget->UnlockUpdate();
   return CXFA_FFField::LoadWidget();
 }
@@ skipping 89 matching lines @@
 }
 FX_BOOL CXFA_FFBarcode::OnRButtonDown(uint32_t dwFlags,
                                       FX_FLOAT fx,
                                       FX_FLOAT fy) {
   CFWL_Barcode* pBarCodeWidget = (CFWL_Barcode*)m_pNormalWidget;
   if (!pBarCodeWidget || pBarCodeWidget->IsProtectedType()) {
     return FALSE;
   }
   return CXFA_FFTextEdit::OnRButtonDown(dwFlags, fx, fy);
 }