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

Side by Side Diff: xfa/fxfa/app/xfa_ffchoicelist.cpp

Issue 2422303003: Remove FWL Create methods, use new instead (Closed)
Patch Set: Created 4 years, 2 months 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/fxfa/app/xfa_ffchoicelist.h" 7 #include "xfa/fxfa/app/xfa_ffchoicelist.h"
8 8
9 #include "xfa/fwl/basewidget/ifwl_edit.h" 9 #include "xfa/fwl/basewidget/ifwl_edit.h"
10 #include "xfa/fwl/core/fwl_noteimp.h" 10 #include "xfa/fwl/core/fwl_noteimp.h"
(...skipping 12 matching lines...) Expand all
23 CXFA_WidgetAcc* pDataAcc) 23 CXFA_WidgetAcc* pDataAcc)
24 : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(nullptr) {} 24 : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(nullptr) {}
25 CXFA_FFListBox::~CXFA_FFListBox() { 25 CXFA_FFListBox::~CXFA_FFListBox() {
26 if (m_pNormalWidget) { 26 if (m_pNormalWidget) {
27 IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); 27 IFWL_Widget* pWidget = m_pNormalWidget->GetWidget();
28 CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); 28 CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver();
29 pNoteDriver->UnregisterEventTarget(pWidget); 29 pNoteDriver->UnregisterEventTarget(pWidget);
30 } 30 }
31 } 31 }
32 FX_BOOL CXFA_FFListBox::LoadWidget() { 32 FX_BOOL CXFA_FFListBox::LoadWidget() {
33 CFWL_ListBox* pListBox = CFWL_ListBox::Create(); 33 CFWL_ListBox* pListBox = new CFWL_ListBox;
34 pListBox->Initialize(); 34 pListBox->Initialize();
35 pListBox->ModifyStyles(FWL_WGTSTYLE_VScroll | FWL_WGTSTYLE_NoBackground, 35 pListBox->ModifyStyles(FWL_WGTSTYLE_VScroll | FWL_WGTSTYLE_NoBackground,
36 0xFFFFFFFF); 36 0xFFFFFFFF);
37 m_pNormalWidget = (CFWL_Widget*)pListBox; 37 m_pNormalWidget = (CFWL_Widget*)pListBox;
38 m_pNormalWidget->SetLayoutItem(this); 38 m_pNormalWidget->SetLayoutItem(this);
39 IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); 39 IFWL_Widget* pWidget = m_pNormalWidget->GetWidget();
40 CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); 40 CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver();
41 pNoteDriver->RegisterEventTarget(pWidget, pWidget); 41 pNoteDriver->RegisterEventTarget(pWidget, pWidget);
42 m_pOldDelegate = m_pNormalWidget->SetDelegate(this); 42 m_pOldDelegate = m_pNormalWidget->SetDelegate(this);
43 m_pNormalWidget->LockUpdate(); 43 m_pNormalWidget->LockUpdate();
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 return FALSE; 220 return FALSE;
221 } 221 }
222 CFX_RectF rtWidget; 222 CFX_RectF rtWidget;
223 ((CFWL_ComboBox*)m_pNormalWidget)->GetBBox(rtWidget); 223 ((CFWL_ComboBox*)m_pNormalWidget)->GetBBox(rtWidget);
224 if (rtWidget.Contains(fx, fy)) { 224 if (rtWidget.Contains(fx, fy)) {
225 return TRUE; 225 return TRUE;
226 } 226 }
227 return FALSE; 227 return FALSE;
228 } 228 }
229 FX_BOOL CXFA_FFComboBox::LoadWidget() { 229 FX_BOOL CXFA_FFComboBox::LoadWidget() {
230 CFWL_ComboBox* pComboBox = CFWL_ComboBox::Create(); 230 CFWL_ComboBox* pComboBox = new CFWL_ComboBox;
231 pComboBox->Initialize(); 231 pComboBox->Initialize();
232 m_pNormalWidget = (CFWL_Widget*)pComboBox; 232 m_pNormalWidget = (CFWL_Widget*)pComboBox;
233 m_pNormalWidget->SetLayoutItem(this); 233 m_pNormalWidget->SetLayoutItem(this);
234 IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); 234 IFWL_Widget* pWidget = m_pNormalWidget->GetWidget();
235 CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver(); 235 CFWL_NoteDriver* pNoteDriver = FWL_GetApp()->GetNoteDriver();
236 pNoteDriver->RegisterEventTarget(pWidget, pWidget); 236 pNoteDriver->RegisterEventTarget(pWidget, pWidget);
237 m_pOldDelegate = m_pNormalWidget->SetDelegate(this); 237 m_pOldDelegate = m_pNormalWidget->SetDelegate(this);
238 m_pNormalWidget->LockUpdate(); 238 m_pNormalWidget->LockUpdate();
239 CFX_WideStringArray wsLabelArray; 239 CFX_WideStringArray wsLabelArray;
240 m_pDataAcc->GetChoiceListItems(wsLabelArray, FALSE); 240 m_pDataAcc->GetChoiceListItems(wsLabelArray, FALSE);
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 default: 524 default:
525 break; 525 break;
526 } 526 }
527 m_pOldDelegate->OnProcessEvent(pEvent); 527 m_pOldDelegate->OnProcessEvent(pEvent);
528 } 528 }
529 529
530 void CXFA_FFComboBox::OnDrawWidget(CFX_Graphics* pGraphics, 530 void CXFA_FFComboBox::OnDrawWidget(CFX_Graphics* pGraphics,
531 const CFX_Matrix* pMatrix) { 531 const CFX_Matrix* pMatrix) {
532 m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix); 532 m_pOldDelegate->OnDrawWidget(pGraphics, pMatrix);
533 } 533 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698