More FWL interface cleanup.

xfa/fwl/core/fwl_formimp.cpp

Index: xfa/fwl/core/fwl_formimp.cpp
diff --git a/xfa/fwl/core/fwl_formimp.cpp b/xfa/fwl/core/fwl_formimp.cpp
index e31f7e8202d6236f7513cfd2ce1ffda4a6a73b96..47465a81ed8db4baa516efe4788371be45c33d97 100644
--- a/xfa/fwl/core/fwl_formimp.cpp
+++ b/xfa/fwl/core/fwl_formimp.cpp
@@ -14,8 +14,6 @@
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/fwl_appimp.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_adapterwidgetmgr.h"
@@ -389,10 +387,10 @@ FWL_ERR CFWL_FormImp::SetFormSize(FWL_FORMSIZE eFormSize) {
   return FWL_ERR_Succeeded;
 }
 IFWL_Widget* CFWL_FormImp::DoModal() {
-  IFWL_Thread* pThread = GetOwnerThread();
+  IFWL_App* pThread = GetOwnerThread();
   if (!pThread)
     return NULL;
-  IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
+  CFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
   if (!pDriver)
     return NULL;
   m_pNoteLoop = new CFWL_NoteLoop(this);
@@ -417,7 +415,7 @@ FWL_ERR CFWL_FormImp::EndDoModal() {
   m_bDoModalFlag = FALSE;
 #if (_FX_OS_ == _FX_MACOSX_)
   m_pNoteLoop->EndModalLoop();
-  IFWL_Thread* pThread = GetOwnerThread();
+  IFWL_App* pThread = GetOwnerThread();

[Tom Sepez, 2016/04/27 20:23:34]

Can we get rid of the word Thread (maybe subsquent CL) and have
IWFL_App *pApp = GetOwnerApp();

[dsinclair, 2016/04/27 20:58:55]

Done.

   if (!pThread)
     return FWL_ERR_Indefinite;
   CFWL_NoteDriver* pDriver =
@@ -745,7 +743,7 @@ void CFWL_FormImp::ReSetSysBtn() {
   }
 }
 void CFWL_FormImp::RegisterForm() {
-  IFWL_Thread* pThread = GetOwnerThread();
+  IFWL_App* pThread = GetOwnerThread();
   if (!pThread)
     return;
   CFWL_NoteDriver* pDriver =
@@ -755,7 +753,7 @@ void CFWL_FormImp::RegisterForm() {
   pDriver->RegisterForm(this);
 }
 void CFWL_FormImp::UnRegisterForm() {
-  IFWL_Thread* pThread = GetOwnerThread();
+  IFWL_App* pThread = GetOwnerThread();
   if (!pThread)
     return;
   CFWL_NoteDriver* pDriver =
@@ -888,7 +886,7 @@ int32_t CFWL_FormImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   switch (pMessage->GetClassID()) {
     case CFWL_MessageType::Activate: {
       m_pOwner->m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Deactivated;
-      IFWL_Thread* pThread = m_pOwner->GetOwnerThread();
+      IFWL_App* pThread = m_pOwner->GetOwnerThread();
       CFWL_NoteDriver* pDriver =
           static_cast<CFWL_NoteDriver*>(pThread->GetNoteDriver());
       CFWL_WidgetImp* pSubFocusImp = m_pOwner->GetSubFocus();
@@ -902,7 +900,7 @@ int32_t CFWL_FormImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
     }
     case CFWL_MessageType::Deactivate: {
       m_pOwner->m_pProperties->m_dwStates |= FWL_WGTSTATE_Deactivated;
-      IFWL_Thread* pThread = m_pOwner->GetOwnerThread();
+      IFWL_App* pThread = m_pOwner->GetOwnerThread();
       CFWL_NoteDriver* pDriver =
           static_cast<CFWL_NoteDriver*>(pThread->GetNoteDriver());
       CFWL_WidgetImp* pSubFocusImp = m_pOwner->GetSubFocus();