From 27e66753c8bd6e664f26d05c1a468dc68be01913 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Fri, 11 Nov 2016 18:09:57 -0800
Subject: IFWL cleanup in the Combo classes

Cleanup visibility and unused methods in the IFWL combo code.

Review-Url: https://codereview.chromium.org/2494743002
---
 xfa/fwl/core/ifwl_comboedit.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'xfa/fwl/core/ifwl_comboedit.cpp')

diff --git a/xfa/fwl/core/ifwl_comboedit.cpp b/xfa/fwl/core/ifwl_comboedit.cpp
index 2a7ac904e1..0896ba76df 100644
--- a/xfa/fwl/core/ifwl_comboedit.cpp
+++ b/xfa/fwl/core/ifwl_comboedit.cpp
@@ -24,12 +24,8 @@ void IFWL_ComboEdit::ClearSelected() {
 
 void IFWL_ComboEdit::SetSelected() {
   FlagFocus(true);
-  EndCaret();
-  AddSelRange(0);
-}
-
-void IFWL_ComboEdit::EndCaret() {
   GetTxtEdtEngine()->MoveCaretPos(MC_End);
+  AddSelRange(0);
 }
 
 void IFWL_ComboEdit::FlagFocus(bool bSet) {
@@ -41,10 +37,6 @@ void IFWL_ComboEdit::FlagFocus(bool bSet) {
   }
 }
 
-void IFWL_ComboEdit::SetComboBoxFocus(bool bSet) {
-  m_pOuter->SetFocus(bSet);
-}
-
 void IFWL_ComboEdit::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
@@ -66,7 +58,7 @@ void IFWL_ComboEdit::OnProcessMessage(CFWL_Message* pMessage) {
       if ((pMsg->m_dwCmd == FWL_MouseCommand::LeftButtonDown) &&
           ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)) {
         SetSelected();
-        SetComboBoxFocus(true);
+        m_pOuter->SetFocus(true);
       }
       break;
     }
-- 
cgit v1.2.3