More FWL interface cleanup.

xfa/fwl/lightwidget/cfwl_widget.cpp

Index: xfa/fwl/lightwidget/cfwl_widget.cpp
diff --git a/xfa/fwl/lightwidget/cfwl_widget.cpp b/xfa/fwl/lightwidget/cfwl_widget.cpp
index 31c54d8efa121cb12efe04b42963b2d945fad4d5..38506693a5b62d4638925cb49df94e5d8122ed76 100644
--- a/xfa/fwl/lightwidget/cfwl_widget.cpp
+++ b/xfa/fwl/lightwidget/cfwl_widget.cpp
@@ -10,11 +10,10 @@
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
-#include "xfa/fwl/core/fwl_targetimp.h"
 #include "xfa/fwl/core/fwl_widgetimp.h"
 #include "xfa/fwl/core/fwl_widgetmgrimp.h"
+#include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
-#include "xfa/fwl/core/ifwl_thread.h"
 
 IFWL_Widget* CFWL_Widget::GetWidget() {
   return m_pIface;
@@ -242,10 +241,10 @@ FWL_ERR CFWL_Widget::Repaint(const CFX_RectF* pRect) {
 FWL_ERR CFWL_Widget::SetFocus(FX_BOOL bFocus) {
   if (!m_pIface)
     return FWL_ERR_Indefinite;
-  IFWL_Thread* pThread = m_pIface->GetOwnerThread();
+  IFWL_App* pThread = m_pIface->GetOwnerThread();
   if (!pThread)
     return FWL_ERR_Indefinite;
-  IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
+  CFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
   if (!pDriver)
     return FWL_ERR_Indefinite;
   if (bFocus) {
@@ -261,10 +260,10 @@ FWL_ERR CFWL_Widget::SetFocus(FX_BOOL bFocus) {
 FWL_ERR CFWL_Widget::SetGrab(FX_BOOL bSet) {
   if (!m_pIface)
     return FWL_ERR_Indefinite;
-  IFWL_Thread* pThread = m_pIface->GetOwnerThread();
+  IFWL_App* pThread = m_pIface->GetOwnerThread();
   if (!pThread)
     return FWL_ERR_Indefinite;
-  IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
+  CFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
   if (!pDriver)
     return FWL_ERR_Indefinite;
   pDriver->SetGrab(m_pIface, bSet);
@@ -275,10 +274,10 @@ void CFWL_Widget::RegisterEventTarget(CFWL_Widget* pEventSource,
                                       uint32_t dwFilter) {
   if (!m_pIface)
     return;
-  IFWL_Thread* pThread = m_pIface->GetOwnerThread();
+  IFWL_App* pThread = m_pIface->GetOwnerThread();
   if (!pThread)
     return;
-  IFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();
+  CFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();
   if (!pNoteDriver)
     return;
   IFWL_Widget* pEventSourceImp =
@@ -292,10 +291,10 @@ void CFWL_Widget::DispatchEvent(CFWL_Event* pEvent) {
   if (m_pIface->GetOuter()) {
     return;
   }
-  IFWL_Thread* pThread = m_pIface->GetOwnerThread();
+  IFWL_App* pThread = m_pIface->GetOwnerThread();
   if (!pThread)
     return;
-  IFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();
+  CFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();
   if (!pNoteDriver)
     return;
   pNoteDriver->SendEvent(pEvent);