More FWL interface cleanup.

xfa/fwl/core/fwl_formimp.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_formimp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/fwl_formproxyimp.h"
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
 #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"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 #include "xfa/fwl/theme/cfwl_widgettp.h"
 
 #define FWL_SYSBTNSIZE 21
 #define FWL_SYSBTNMARGIN 5
 #define FWL_SYSBTNSPAN 2
@@ skipping 353 matching lines @@
   return FWL_ERR_Succeeded;
 }
 FWL_FORMSIZE CFWL_FormImp::GetFormSize() {
   return m_eFormSize;
 }
 FWL_ERR CFWL_FormImp::SetFormSize(FWL_FORMSIZE eFormSize) {
   m_eFormSize = 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);
   pDriver->PushNoteLoop(m_pNoteLoop);
   m_bDoModalFlag = TRUE;
   SetStates(FWL_WGTSTATE_Invisible, FALSE);
   pDriver->Run();
 #if (_FX_OS_ == _FX_MACOSX_)
 #else
   pDriver->PopNoteLoop();
 #endif
   delete m_pNoteLoop;
   m_pNoteLoop = NULL;
   return NULL;
 }
 IFWL_Widget* CFWL_FormImp::DoModal(uint32_t& dwCommandID) {
   return DoModal();
 }
 FWL_ERR CFWL_FormImp::EndDoModal() {
   if (!m_pNoteLoop)
     return FWL_ERR_Indefinite;
   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 =
       static_cast<CFWL_NoteDriver*>(pThread->GetNoteDriver());
   if (!pDriver)
     return FWL_ERR_Indefinite;
   pDriver->PopNoteLoop();
   SetStates(FWL_WGTSTATE_Invisible, TRUE);
   return FWL_ERR_Succeeded;
 #else
@@ skipping 307 matching lines @@
   }
   if (m_bCustomizeLayout) {
     CFWL_ThemeText parma;
     parma.m_pWidget = m_pInterface;
     parma.m_iPart = CFWL_Part::HeadText;
     m_pProperties->m_pDataProvider->GetCaption(m_pInterface, parma.m_wsText);
     pTheme->GetPartRect(&parma, m_rtCaptionText);
   }
 }
 void CFWL_FormImp::RegisterForm() {
-  IFWL_Thread* pThread = GetOwnerThread();
+  IFWL_App* pThread = GetOwnerThread();
   if (!pThread)
     return;
   CFWL_NoteDriver* pDriver =
       static_cast<CFWL_NoteDriver*>(pThread->GetNoteDriver());
   if (!pDriver)
     return;
   pDriver->RegisterForm(this);
 }
 void CFWL_FormImp::UnRegisterForm() {
-  IFWL_Thread* pThread = GetOwnerThread();
+  IFWL_App* pThread = GetOwnerThread();
   if (!pThread)
     return;
   CFWL_NoteDriver* pDriver =
       static_cast<CFWL_NoteDriver*>(pThread->GetNoteDriver());
   if (!pDriver)
     return;
   pDriver->UnRegisterForm(this);
 }
 FX_BOOL CFWL_FormImp::IsDoModal() {
   return m_bDoModalFlag;
@@ skipping 112 matching lines @@
   return FWL_ERR_Succeeded;
 }
 #else
 int32_t CFWL_FormImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return 0;
   int32_t iRet = 1;
   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();
       IFWL_Widget* pSubFocus =
           pSubFocusImp ? pSubFocusImp->GetInterface() : nullptr;
       if (pSubFocus && pSubFocus != pDriver->GetFocus())
         pDriver->SetFocus(pSubFocus);
 
       m_pOwner->Repaint(&m_pOwner->m_rtRelative);
       break;
     }
     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();
       IFWL_Widget* pSubFocus =
           pSubFocusImp ? pSubFocusImp->GetInterface() : nullptr;
       if (pSubFocus) {
         if (pSubFocus == pDriver->GetFocus()) {
           pDriver->SetFocus(nullptr);
         } else if (pSubFocus->GetStates() & FWL_WGTSTATE_Focused) {
           CFWL_MsgKillFocus ms;
@@ skipping 236 matching lines @@
 }
 void CFWL_FormImpDelegate::OnWindowMove(CFWL_MsgWindowMove* pMsg) {
   m_pOwner->m_pProperties->m_rtWidget.left = pMsg->m_fx;
   m_pOwner->m_pProperties->m_rtWidget.top = pMsg->m_fy;
 }
 void CFWL_FormImpDelegate::OnClose(CFWL_MsgClose* pMsg) {
   CFWL_EvtClose eClose;
   eClose.m_pSrcTarget = m_pOwner->m_pInterface;
   m_pOwner->DispatchEvent(&eClose);
 }