More FWL interface cleanup.

xfa/fwl/core/fwl_noteimp.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/fwl/core/fwl_noteimp.h"
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fwl/basewidget/fwl_tooltipctrlimp.h"
 #include "xfa/fwl/basewidget/ifwl_tooltip.h"
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/fwl_appimp.h"
 #include "xfa/fwl/core/fwl_formimp.h"
-#include "xfa/fwl/core/fwl_targetimp.h"
-#include "xfa/fwl/core/fwl_threadimp.h"
 #include "xfa/fwl/core/fwl_widgetimp.h"
 #include "xfa/fwl/core/fwl_widgetmgrimp.h"
 #include "xfa/fwl/core/ifwl_adapterwidgetmgr.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_tooltiptarget.h"
 
 CFWL_NoteLoop::CFWL_NoteLoop(CFWL_WidgetImp* pForm)
     : m_pForm(pForm), m_bContinueModal(TRUE) {}
 
 FWL_ERR CFWL_NoteLoop::Idle(int32_t count) {
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_)
   if (count <= 0) {
 #endif
     CFWL_EvtIdle ev;
     IFWL_App* pApp = FWL_GetApp();
     if (!pApp)
       return FWL_ERR_Indefinite;
-    IFWL_NoteDriver* pDriver = pApp->GetNoteDriver();
+    CFWL_NoteDriver* pDriver = pApp->GetNoteDriver();
     if (!pDriver)
       return FWL_ERR_Indefinite;
     pDriver->SendEvent(&ev);
 #if (_FX_OS_ == _FX_WIN32_DESKTOP_)
   }
 #endif
   return FWL_ERR_Indefinite;
 }
 CFWL_WidgetImp* CFWL_NoteLoop::GetForm() {
   return m_pForm;
@@ skipping 11 matching lines @@
   return FWL_ERR_Succeeded;
 }
 
 FWL_ERR CFWL_NoteLoop::SetMainForm(CFWL_WidgetImp* pForm) {
   m_pForm = pForm;
   return FWL_ERR_Succeeded;
 }
 void CFWL_NoteLoop::GenerateCommondEvent(uint32_t dwCommand) {
   CFWL_EvtMenuCommand ev;
   ev.m_iCommand = dwCommand;
-  IFWL_Thread* pThread = m_pForm->GetOwnerThread();
+  IFWL_App* pThread = m_pForm->GetOwnerThread();
   if (!pThread)
     return;
-  IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
+  CFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
   if (!pDriver)
     return;
   pDriver->SendEvent(&ev);
 }
 CFWL_NoteDriver::CFWL_NoteDriver()
     : m_sendEventCalled(0),
       m_pHover(nullptr),
       m_pFocus(nullptr),
       m_pGrab(nullptr) {
   m_pNoteLoop = new CFWL_NoteLoop;
@@ skipping 66 matching lines @@
   }
   CFWL_EventTarget* value = NULL;
   if (m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (void*&)value)) {
     value->FlagInvalid();
   }
   return FWL_ERR_Succeeded;
 }
 void CFWL_NoteDriver::ClearEventTargets(FX_BOOL bRemoveAll) {
   ClearInvalidEventTargets(bRemoveAll);
 }
-IFWL_Thread* CFWL_NoteDriver::GetOwnerThread() const {
+IFWL_App* CFWL_NoteDriver::GetOwnerThread() const {
   return FWL_GetApp();
 }
-FWL_ERR CFWL_NoteDriver::PushNoteLoop(IFWL_NoteLoop* pNoteLoop) {
+FWL_ERR CFWL_NoteDriver::PushNoteLoop(CFWL_NoteLoop* pNoteLoop) {
   m_noteLoopQueue.Add(pNoteLoop);
   return FWL_ERR_Succeeded;
 }
-IFWL_NoteLoop* CFWL_NoteDriver::PopNoteLoop() {
+CFWL_NoteLoop* CFWL_NoteDriver::PopNoteLoop() {
   int32_t pos = m_noteLoopQueue.GetSize();
   if (pos <= 0)
-    return NULL;
-  IFWL_NoteLoop* p =
-      static_cast<IFWL_NoteLoop*>(m_noteLoopQueue.GetAt(pos - 1));
+    return nullptr;
+
+  CFWL_NoteLoop* p =
+      static_cast<CFWL_NoteLoop*>(m_noteLoopQueue.GetAt(pos - 1));
   m_noteLoopQueue.RemoveAt(pos - 1);
   return p;
 }
 FX_BOOL CFWL_NoteDriver::SetFocus(IFWL_Widget* pFocus, FX_BOOL bNotify) {
   if (m_pFocus == pFocus) {
     return TRUE;
   }
   IFWL_Widget* pPrev = m_pFocus;
   m_pFocus = pFocus;
   if (pPrev) {
@@ skipping 788 matching lines @@
   if (HasToolTip(pEvt->m_pDstTarget) && NULL != m_pToolTipImp) {
     m_pToolTipImp->Hide();
     pCurTarget = NULL;
     return TRUE;
   }
   return FALSE;
 }
 IFWL_ToolTipTarget* CFWL_ToolTipContainer::GetCurrentToolTipTarget() {
   return pCurTarget;
 }