Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(338)

Side by Side Diff: xfa/fwl/core/ifwl_combobox.cpp

Issue 2509283003: Unify the three CFWL_EventType::SelectChange classes. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fwl/core/ifwl_combobox.h" 7 #include "xfa/fwl/core/ifwl_combobox.h"
8 8
9 #include "third_party/base/ptr_util.h" 9 #include "third_party/base/ptr_util.h"
10 #include "xfa/fde/cfde_txtedtengine.h" 10 #include "xfa/fde/cfde_txtedtengine.h"
11 #include "xfa/fde/tto/fde_textout.h" 11 #include "xfa/fde/tto/fde_textout.h"
12 #include "xfa/fwl/core/cfwl_evteditchanged.h" 12 #include "xfa/fwl/core/cfwl_evteditchanged.h"
13 #include "xfa/fwl/core/cfwl_evtpostdropdown.h" 13 #include "xfa/fwl/core/cfwl_evtpostdropdown.h"
14 #include "xfa/fwl/core/cfwl_evtpredropdown.h" 14 #include "xfa/fwl/core/cfwl_evtpredropdown.h"
15 #include "xfa/fwl/core/cfwl_evtselectchanged.h"
15 #include "xfa/fwl/core/cfwl_evttextchanged.h" 16 #include "xfa/fwl/core/cfwl_evttextchanged.h"
16 #include "xfa/fwl/core/cfwl_msgkey.h" 17 #include "xfa/fwl/core/cfwl_msgkey.h"
17 #include "xfa/fwl/core/cfwl_msgkillfocus.h" 18 #include "xfa/fwl/core/cfwl_msgkillfocus.h"
18 #include "xfa/fwl/core/cfwl_msgmouse.h" 19 #include "xfa/fwl/core/cfwl_msgmouse.h"
19 #include "xfa/fwl/core/cfwl_msgsetfocus.h" 20 #include "xfa/fwl/core/cfwl_msgsetfocus.h"
20 #include "xfa/fwl/core/cfwl_themebackground.h" 21 #include "xfa/fwl/core/cfwl_themebackground.h"
21 #include "xfa/fwl/core/cfwl_themepart.h" 22 #include "xfa/fwl/core/cfwl_themepart.h"
22 #include "xfa/fwl/core/cfwl_themetext.h" 23 #include "xfa/fwl/core/cfwl_themetext.h"
23 #include "xfa/fwl/core/cfwl_widgetmgr.h" 24 #include "xfa/fwl/core/cfwl_widgetmgr.h"
24 #include "xfa/fwl/core/fwl_noteimp.h" 25 #include "xfa/fwl/core/fwl_noteimp.h"
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 return; 556 return;
556 557
557 CFX_WideString wsText; 558 CFX_WideString wsText;
558 pData->GetItemText(this, hItem, wsText); 559 pData->GetItemText(this, hItem, wsText);
559 if (m_pEdit) { 560 if (m_pEdit) {
560 m_pEdit->SetText(wsText); 561 m_pEdit->SetText(wsText);
561 m_pEdit->Update(); 562 m_pEdit->Update();
562 m_pEdit->SetSelected(); 563 m_pEdit->SetSelected();
563 } 564 }
564 565
565 CFWL_EvtCmbSelChanged ev; 566 CFWL_EvtSelectChanged ev;
566 ev.bLButtonUp = bLButtonUp; 567 ev.bLButtonUp = bLButtonUp;
567 ev.m_pSrcTarget = this; 568 ev.m_pSrcTarget = this;
568 ev.iArraySels.Add(m_iCurSel);
npm 2016/11/17 18:07:02 Is iArraySels never used, or why is this deleted?
dsinclair 2016/11/17 18:13:19 Removed from class, compiler is happy.
569 DispatchEvent(&ev); 569 DispatchEvent(&ev);
570 } 570 }
571 571
572 void IFWL_ComboBox::InitProxyForm() { 572 void IFWL_ComboBox::InitProxyForm() {
573 if (m_pComboBoxProxy) 573 if (m_pComboBoxProxy)
574 return; 574 return;
575 if (!m_pListBox) 575 if (!m_pListBox)
576 return; 576 return;
577 577
578 auto prop = pdfium::MakeUnique<CFWL_WidgetProperties>(); 578 auto prop = pdfium::MakeUnique<CFWL_WidgetProperties>();
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 else 1127 else
1128 iCurSel++; 1128 iCurSel++;
1129 } 1129 }
1130 m_iCurSel = iCurSel; 1130 m_iCurSel = iCurSel;
1131 SyncEditText(m_iCurSel); 1131 SyncEditText(m_iCurSel);
1132 return; 1132 return;
1133 } 1133 }
1134 if (m_pEdit) 1134 if (m_pEdit)
1135 m_pEdit->GetDelegate()->OnProcessMessage(pMsg); 1135 m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
1136 } 1136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698