From 7adef41ed27ced7e18ee649a3d4f27a3cc00c51f Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 18 Apr 2016 06:49:02 -0700 Subject: Fold the FWL NoteThread classes up to the Thread classes. The NoteThread classes only contained one member and don't provide any added clarity. This CL moves the NoteDriver up to the Thread classes and removes the NoteThread classes. Review URL: https://codereview.chromium.org/1887703003 --- xfa/fwl/core/fwl_noteimp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fwl/core/fwl_noteimp.cpp') diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp index 05963bba81..7de0465a1b 100644 --- a/xfa/fwl/core/fwl_noteimp.cpp +++ b/xfa/fwl/core/fwl_noteimp.cpp @@ -64,7 +64,7 @@ FWL_ERR CFWL_NoteLoop::SetMainForm(CFWL_WidgetImp* pForm) { void CFWL_NoteLoop::GenerateCommondEvent(uint32_t dwCommand) { CFWL_EvtMenuCommand ev; ev.m_iCommand = dwCommand; - IFWL_NoteThread* pThread = m_pForm->GetOwnerThread(); + IFWL_Thread* pThread = m_pForm->GetOwnerThread(); if (!pThread) return; IFWL_NoteDriver* pDriver = pThread->GetNoteDriver(); @@ -165,7 +165,7 @@ FWL_ERR CFWL_NoteDriver::UnregisterEventTarget(IFWL_Widget* pListener) { void CFWL_NoteDriver::ClearEventTargets(FX_BOOL bRemoveAll) { ClearInvalidEventTargets(bRemoveAll); } -IFWL_NoteThread* CFWL_NoteDriver::GetOwnerThread() const { +IFWL_Thread* CFWL_NoteDriver::GetOwnerThread() const { return FWL_GetApp(); } FWL_ERR CFWL_NoteDriver::PushNoteLoop(IFWL_NoteLoop* pNoteLoop) { -- cgit v1.2.3