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

Side by Side Diff: fpdfsdk/src/fxedit/fxet_list.cpp

Issue 436483002: Fix a few more -Wreorder warnings. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « fpdfsdk/src/fsdk_mgr.cpp ('k') | fpdfsdk/src/javascript/Document.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "../../include/fxedit/fxet_stub.h" 7 #include "../../include/fxedit/fxet_stub.h"
8 #include "../../include/fxedit/fxet_edit.h" 8 #include "../../include/fxedit/fxet_edit.h"
9 #include "../../include/fxedit/fxet_list.h" 9 #include "../../include/fxedit/fxet_list.h"
10 10
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 CFX_WideString CFX_ListItem::GetText() const 112 CFX_WideString CFX_ListItem::GetText() const
113 { 113 {
114 if (m_pEdit) 114 if (m_pEdit)
115 return m_pEdit->GetText(); 115 return m_pEdit->GetText();
116 116
117 return L""; 117 return L"";
118 } 118 }
119 119
120 /* ------------------------------------ CFX_List ------------------------------- -- */ 120 /* ------------------------------------ CFX_List ------------------------------- -- */
121 121
122 CFX_List::CFX_List() : m_pFontMap(NULL), m_fFontSize(0.0f), m_bMultiple(FALSE) 122 CFX_List::CFX_List() : m_fFontSize(0.0f), m_pFontMap(NULL), m_bMultiple(FALSE)
123 { 123 {
124 } 124 }
125 125
126 CFX_List::~CFX_List() 126 CFX_List::~CFX_List()
127 { 127 {
128 Empty(); 128 Empty();
129 } 129 }
130 130
131 void CFX_List::Empty() 131 void CFX_List::Empty()
132 { 132 {
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 { 500 {
501 pItem->nState = 0; 501 pItem->nState = 0;
502 } 502 }
503 } 503 }
504 } 504 }
505 } 505 }
506 506
507 /* ------------------------------------ CFX_ListCtrl --------------------------- ------ */ 507 /* ------------------------------------ CFX_ListCtrl --------------------------- ------ */
508 508
509 CFX_ListCtrl::CFX_ListCtrl() : m_pNotify(NULL), 509 CFX_ListCtrl::CFX_ListCtrl() : m_pNotify(NULL),
510 m_bNotifyFlag(FALSE),
510 m_ptScrollPos(0.0f,0.0f), 511 m_ptScrollPos(0.0f,0.0f),
511 m_nSelItem(-1), 512 m_nSelItem(-1),
512 m_nFootIndex(-1), 513 m_nFootIndex(-1),
513 » m_bCtrlSel(FALSE),» 514 » m_bCtrlSel(FALSE),
514 » m_nCaretIndex(-1), 515 » m_nCaretIndex(-1)
515 » m_bNotifyFlag(FALSE)
516 { 516 {
517 } 517 }
518 518
519 CFX_ListCtrl::~CFX_ListCtrl() 519 CFX_ListCtrl::~CFX_ListCtrl()
520 { 520 {
521 } 521 }
522 522
523 void CFX_ListCtrl::SetNotify(IFX_List_Notify * pNotify) 523 void CFX_ListCtrl::SetNotify(IFX_List_Notify * pNotify)
524 { 524 {
525 m_pNotify = pNotify; 525 m_pNotify = pNotify;
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after
1003 } 1003 }
1004 1004
1005 CFX_WideString CFX_ListCtrl::GetText() const 1005 CFX_WideString CFX_ListCtrl::GetText() const
1006 { 1006 {
1007 if (this->IsMultipleSel()) 1007 if (this->IsMultipleSel())
1008 return this->GetItemText(this->m_nCaretIndex); 1008 return this->GetItemText(this->m_nCaretIndex);
1009 else 1009 else
1010 return this->GetItemText(this->m_nSelItem); 1010 return this->GetItemText(this->m_nSelItem);
1011 } 1011 }
1012 1012
OLDNEW
« no previous file with comments | « fpdfsdk/src/fsdk_mgr.cpp ('k') | fpdfsdk/src/javascript/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698