IFWL cleanup in the Combo classes

xfa/fwl/core/ifwl_comboedit.cpp

Index: xfa/fwl/core/ifwl_comboedit.cpp
diff --git a/xfa/fwl/core/ifwl_comboedit.cpp b/xfa/fwl/core/ifwl_comboedit.cpp
index 2a7ac904e155e98dc12b55c94cca2df67f5e83f0..0896ba76df567a286428702434a68f7bbafdda19 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;
     }