More FWL interface cleanup.

xfa/fwl/basewidget/fwl_comboboximp.cpp

Index: xfa/fwl/basewidget/fwl_comboboximp.cpp
diff --git a/xfa/fwl/basewidget/fwl_comboboximp.cpp b/xfa/fwl/basewidget/fwl_comboboximp.cpp
index d7fe209e16d02a01a0fa307c02b7ecb808375e0a..715c9384094e545639251e457533e9631cc70140 100644
--- a/xfa/fwl/basewidget/fwl_comboboximp.cpp
+++ b/xfa/fwl/basewidget/fwl_comboboximp.cpp
@@ -18,12 +18,10 @@
 #include "xfa/fwl/core/fwl_appimp.h"
 #include "xfa/fwl/core/fwl_formimp.h"
 #include "xfa/fwl/core/fwl_noteimp.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_app.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
-#include "xfa/fwl/core/ifwl_thread.h"
 
 // static
 IFWL_ComboBox* IFWL_ComboBox::Create(
@@ -1457,8 +1455,8 @@ FWL_ERR CFWL_ComboBoxImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
 }
 void CFWL_ComboBoxImpDelegate::OnFocusChanged(CFWL_Message* pMsg,
                                               FX_BOOL bSet) {
-  IFWL_Target* pDstTarget = pMsg->m_pDstTarget;
-  IFWL_Target* pSrcTarget = pMsg->m_pSrcTarget;
+  IFWL_Widget* pDstTarget = pMsg->m_pDstTarget;
+  IFWL_Widget* pSrcTarget = pMsg->m_pSrcTarget;
   FX_BOOL bDropDown = m_pOwner->IsDropDownStyle();
   if (bSet) {
     m_pOwner->m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
@@ -1803,7 +1801,7 @@ FWL_ERR CFWL_ComboProxyImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
   return FWL_ERR_Succeeded;
 }
 void CFWL_ComboProxyImpDelegate::OnLButtonDown(CFWL_MsgMouse* pMsg) {
-  IFWL_Thread* pThread = m_pForm->GetOwnerThread();
+  IFWL_App* pThread = m_pForm->GetOwnerThread();
   if (!pThread)
     return;
   CFWL_NoteDriver* pDriver =
@@ -1822,7 +1820,7 @@ void CFWL_ComboProxyImpDelegate::OnLButtonDown(CFWL_MsgMouse* pMsg) {
 }
 void CFWL_ComboProxyImpDelegate::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   m_bLButtonDown = FALSE;
-  IFWL_Thread* pThread = m_pForm->GetOwnerThread();
+  IFWL_App* pThread = m_pForm->GetOwnerThread();
   if (!pThread)
     return;
   CFWL_NoteDriver* pDriver =