Cleaning up nits in fwl/core files.

xfa/fwl/core/ifwl_form.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/ifwl_form.h"
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
@@ skipping 648 matching lines @@
   if (!pWidgetMgr)
     return;
   IFWL_DataProvider* pData = m_pProperties->m_pDataProvider;
   if (!pData)
     return;
   CFX_WideString text;
   pData->GetCaption(this, text);
 }
 
 #ifdef FWL_UseMacSystemBorder
-void IFWL_Form::OnProcessMessage(CFWL_Message* pMessage) {
-  if (!pMessage)
-    return;
-
-  switch (pMessage->GetClassID()) {
-    case CFWL_MessageType::Activate: {
-      m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Deactivated;
-      Repaint(&m_rtRelative);
-      break;
-    }
-    case CFWL_MessageType::Deactivate: {
-      m_pProperties->m_dwStates |= FWL_WGTSTATE_Deactivated;
-      Repaint(&m_rtRelative);
-      break;
-    }
-    default:
-      break;
-  }
-}
+void IFWL_Form::OnProcessMessage(CFWL_Message* pMessage) {}

[npm, 2016/11/15 21:38:30]

Can this method now be virtual or something like that?

[dsinclair, 2016/11/15 21:44:06]

It is virtual. We want the implementation here that does nothing to make sure
the parent implementation doesn't get called.

 #else
 void IFWL_Form::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
   switch (pMessage->GetClassID()) {
-    case CFWL_MessageType::Activate: {
-      m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Deactivated;
-      const IFWL_App* pApp = GetOwnerApp();
-      CFWL_NoteDriver* pDriver =
-          static_cast<CFWL_NoteDriver*>(pApp->GetNoteDriver());
-      IFWL_Widget* pSubFocus = GetSubFocus();
-      if (pSubFocus && pSubFocus != pDriver->GetFocus())
-        pDriver->SetFocus(pSubFocus);
-
-      Repaint(&m_rtRelative);
-      break;
-    }
-    case CFWL_MessageType::Deactivate: {
-      m_pProperties->m_dwStates |= FWL_WGTSTATE_Deactivated;
-      const IFWL_App* pApp = GetOwnerApp();
-      CFWL_NoteDriver* pDriver =
-          static_cast<CFWL_NoteDriver*>(pApp->GetNoteDriver());
-      IFWL_Widget* pSubFocus = GetSubFocus();
-      if (pSubFocus) {
-        if (pSubFocus == pDriver->GetFocus()) {
-          pDriver->SetFocus(nullptr);
-        } else if (pSubFocus->GetStates() & FWL_WGTSTATE_Focused) {
-          if (IFWL_WidgetDelegate* pDelegate = pSubFocus->GetDelegate()) {
-            CFWL_MsgKillFocus ms;
-            pDelegate->OnProcessMessage(&ms);
-          }
-        }
-      }
-      Repaint(&m_rtRelative);
-      break;
-    }
     case CFWL_MessageType::Mouse: {
       CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
           break;
         case FWL_MouseCommand::LeftButtonUp:
           OnLButtonUp(pMsg);
           break;
         case FWL_MouseCommand::Move:
           OnMouseMove(pMsg);
           break;
         case FWL_MouseCommand::Leave:
           OnMouseLeave(pMsg);
           break;
         case FWL_MouseCommand::LeftButtonDblClk:
           OnLButtonDblClk(pMsg);
           break;
         default:
           break;
       }
       break;
     }
-    case CFWL_MessageType::Size: {
-      CFWL_WidgetMgr* pWidgetMgr = GetOwnerApp()->GetWidgetMgr();
-      if (!pWidgetMgr)
-        return;
-
-      pWidgetMgr->AddRedrawCounts(this);
-      if (!m_bSetMaximize)
-        break;
-
-      m_bSetMaximize = false;
-      CFWL_MsgSize* pMsg = static_cast<CFWL_MsgSize*>(pMessage);
-      m_pProperties->m_rtWidget.left = 0;
-      m_pProperties->m_rtWidget.top = 0;
-      m_pProperties->m_rtWidget.width = (FX_FLOAT)pMsg->m_iWidth;
-      m_pProperties->m_rtWidget.height = (FX_FLOAT)pMsg->m_iHeight;
-      Update();
-      break;
-    }
-    case CFWL_MessageType::WindowMove:
-      OnWindowMove(static_cast<CFWL_MsgWindowMove*>(pMessage));
-      break;
-    case CFWL_MessageType::Close:
-      OnClose(static_cast<CFWL_MsgClose*>(pMessage));
-      break;
     default:
       break;
   }
 }
 #endif  // FWL_UseMacSystemBorder
 
 void IFWL_Form::OnDrawWidget(CFX_Graphics* pGraphics,
                              const CFX_Matrix* pMatrix) {
   DrawWidget(pGraphics, pMatrix);
 }
@@ skipping 112 matching lines @@
     if (m_bMaximized)
       SetWidgetRect(m_rtRestore);
     else
       SetWorkAreaRect();
 
     Update();
     m_bMaximized = !m_bMaximized;
   }
 }
 
-void IFWL_Form::OnWindowMove(CFWL_MsgWindowMove* pMsg) {
-  m_pProperties->m_rtWidget.left = pMsg->m_fx;
-  m_pProperties->m_rtWidget.top = pMsg->m_fy;
-}
-
-void IFWL_Form::OnClose(CFWL_MsgClose* pMsg) {
-  CFWL_EvtClose eClose;
-  eClose.m_pSrcTarget = this;
-  DispatchEvent(&eClose);
-}
-
 CFWL_SysBtn::CFWL_SysBtn() {
   m_rtBtn.Set(0, 0, 0, 0);
   m_dwState = 0;
 }
 
 bool CFWL_SysBtn::IsDisabled() const {
   return !!(m_dwState & FWL_SYSBUTTONSTATE_Disabled);
 }
 
 void CFWL_SysBtn::SetNormal() {
@@ skipping 17 matching lines @@
 
 uint32_t CFWL_SysBtn::GetPartState() const {
   if (IsDisabled())
     return CFWL_PartState_Disabled;
   if (m_dwState & FWL_SYSBUTTONSTATE_Pressed)
     return CFWL_PartState_Pressed;
   if (m_dwState & FWL_SYSBUTTONSTATE_Hover)
     return CFWL_PartState_Hovered;
   return CFWL_PartState_Normal;
 }