Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_combolist.cpp

 // Copyright 2016 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/cfwl_combolist.h"
+#include "xfa/fwl/cfwl_combolist.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_combobox.h"
-#include "xfa/fwl/core/cfwl_comboedit.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
+#include "xfa/fwl/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_comboedit.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
 
 CFWL_ComboList::CFWL_ComboList(
     const CFWL_App* app,
     std::unique_ptr<CFWL_WidgetProperties> properties,
     CFWL_Widget* pOuter)
     : CFWL_ListBox(app, std::move(properties), pOuter), m_bNotifyOwner(true) {
   ASSERT(pOuter);
 }
 
 int32_t CFWL_ComboList::MatchItem(const CFX_WideString& wsMatch) {
@@ skipping 47 matching lines @@
 void CFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
   CFWL_Message::Type type = pMessage->GetType();
   bool backDefault = true;
   if (type == CFWL_Message::Type::SetFocus ||
       type == CFWL_Message::Type::KillFocus) {
     OnDropListFocusChanged(pMessage, type == CFWL_Message::Type::SetFocus);
   } else if (type == CFWL_Message::Type::Mouse) {
-    CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+    CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
     CFWL_ScrollBar* vertSB = GetVertScrollBar();
     if (IsShowScrollBar(true) && vertSB) {
       CFX_RectF rect = vertSB->GetWidgetRect();
       if (rect.Contains(pMsg->m_fx, pMsg->m_fy)) {
         pMsg->m_fx -= rect.left;
         pMsg->m_fy -= rect.top;
         vertSB->GetDelegate()->OnProcessMessage(pMsg);
         return;
       }
     }
@@ skipping 10 matching lines @@
       }
       case FWL_MouseCommand::LeftButtonUp: {
         backDefault = false;
         OnDropListLButtonUp(pMsg);
         break;
       }
       default:
         break;
     }
   } else if (type == CFWL_Message::Type::Key) {
-    backDefault = !OnDropListKey(static_cast<CFWL_MsgKey*>(pMessage));
+    backDefault = !OnDropListKey(static_cast<CFWL_MessageKey*>(pMessage));
   }
   if (backDefault)
     CFWL_ListBox::OnProcessMessage(pMessage);
 }
 
 void CFWL_ComboList::OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (bSet)
     return;
 
-  CFWL_MsgKillFocus* pKill = static_cast<CFWL_MsgKillFocus*>(pMsg);
+  CFWL_MessageKillFocus* pKill = static_cast<CFWL_MessageKillFocus*>(pMsg);
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   if (pKill->m_pSetFocus == m_pOuter ||
       pKill->m_pSetFocus == pOuter->GetComboEdit()) {
     pOuter->ShowDropList(false);
   }
 }
 
-void CFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListMouseMove(CFWL_MessageMouse* pMsg) {
   if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy)) {
     if (m_bNotifyOwner)
       m_bNotifyOwner = false;
 
     CFWL_ScrollBar* vertSB = GetVertScrollBar();
     if (IsShowScrollBar(true) && vertSB) {
       CFX_RectF rect = vertSB->GetWidgetRect();
       if (rect.Contains(pMsg->m_fx, pMsg->m_fy))
         return;
     }
 
     CFWL_ListItem* hItem = GetItemAtPoint(pMsg->m_fx, pMsg->m_fy);
     if (!hItem)
       return;
 
     ChangeSelected(GetItemIndex(this, hItem));
   } else if (m_bNotifyOwner) {
     ClientToOuter(pMsg->m_fx, pMsg->m_fy);
     CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
     pOuter->GetDelegate()->OnProcessMessage(pMsg);
   }
 }
 
-void CFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListLButtonDown(CFWL_MessageMouse* pMsg) {
   if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy))
     return;
 
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   pOuter->ShowDropList(false);
 }
 
-void CFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListLButtonUp(CFWL_MessageMouse* pMsg) {
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   if (m_bNotifyOwner) {
     ClientToOuter(pMsg->m_fx, pMsg->m_fy);
     pOuter->GetDelegate()->OnProcessMessage(pMsg);
     return;
   }
 
   CFWL_ScrollBar* vertSB = GetVertScrollBar();
   if (IsShowScrollBar(true) && vertSB) {
     CFX_RectF rect = vertSB->GetWidgetRect();
     if (rect.Contains(pMsg->m_fx, pMsg->m_fy))
       return;
   }
   pOuter->ShowDropList(false);
 
   CFWL_ListItem* hItem = GetItemAtPoint(pMsg->m_fx, pMsg->m_fy);
   if (hItem)
     pOuter->ProcessSelChanged(true);
 }
 
-bool CFWL_ComboList::OnDropListKey(CFWL_MsgKey* pKey) {
+bool CFWL_ComboList::OnDropListKey(CFWL_MessageKey* pKey) {
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   bool bPropagate = false;
   if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown) {
     uint32_t dwKeyCode = pKey->m_dwKeyCode;
     switch (dwKeyCode) {
       case FWL_VKEY_Return:
       case FWL_VKEY_Escape: {
         pOuter->ShowDropList(false);
         return true;
       }
@@ skipping 12 matching lines @@
     bPropagate = true;
   }
   if (bPropagate) {
     pKey->m_pDstTarget = m_pOuter;
     pOuter->GetDelegate()->OnProcessMessage(pKey);
     return true;
   }
   return false;
 }
 
-void CFWL_ComboList::OnDropListKeyDown(CFWL_MsgKey* pKey) {
+void CFWL_ComboList::OnDropListKeyDown(CFWL_MessageKey* pKey) {
   uint32_t dwKeyCode = pKey->m_dwKeyCode;
   switch (dwKeyCode) {
     case FWL_VKEY_Up:
     case FWL_VKEY_Down:
     case FWL_VKEY_Home:
     case FWL_VKEY_End: {
       CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
       CFWL_ListItem* hItem = GetItem(this, pOuter->GetCurrentSelection());
       hItem = GetListItem(hItem, dwKeyCode);
       if (!hItem)
         break;
 
       SetSelection(hItem, hItem, true);
       ScrollToVisible(hItem);
       CFX_RectF rtInvalidate;
       rtInvalidate.Set(0, 0, m_pProperties->m_rtWidget.width,
                        m_pProperties->m_rtWidget.height);
       Repaint(&rtInvalidate);
       break;
     }
     default:
       break;
   }
 }