Index: xfa/fwl/core/fwl_noteimp.cpp |
diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp |
index 267b2ca2ee8f642987887247db8389f93bd84083..e29241aee61248907b242e162b2eba7c043af5fd 100644 |
--- a/xfa/fwl/core/fwl_noteimp.cpp |
+++ b/xfa/fwl/core/fwl_noteimp.cpp |
@@ -14,7 +14,6 @@ |
#include "xfa/fwl/core/fwl_formimp.h" |
#include "xfa/fwl/core/fwl_widgetimp.h" |
#include "xfa/fwl/core/fwl_widgetmgrimp.h" |
-#include "xfa/fwl/core/ifwl_adapterwidgetmgr.h" |
#include "xfa/fwl/core/ifwl_app.h" |
#include "xfa/fwl/core/ifwl_tooltiptarget.h" |
@@ -48,7 +47,8 @@ FWL_ERR CFWL_NoteLoop::EndModalLoop() { |
m_bContinueModal = FALSE; |
#if (_FX_OS_ == _FX_MACOSX_) |
CFWL_WidgetMgr* pWidgetMgr = static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr()); |
- IFWL_AdapterWidgetMgr* adapterWidgetMgr = pWidgetMgr->GetAdapterWidgetMgr(); |
+ CXFA_FWLAdapterWidgetMgr* adapterWidgetMgr = |
+ pWidgetMgr->GetAdapterWidgetMgr(); |
adapterWidgetMgr->EndLoop(); |
#endif |
return FWL_ERR_Succeeded; |
@@ -254,15 +254,10 @@ FWL_ERR CFWL_NoteDriver::Run() { |
CFWL_NoteLoop* pTopLoop = NULL; |
for (;;) { |
pTopLoop = GetTopLoop(); |
- if (!pTopLoop || !pTopLoop->ContinueModal()) { |
+ if (!pTopLoop || !pTopLoop->ContinueModal()) |
break; |
- } |
- if (UnqueueMessage(pTopLoop)) { |
+ if (UnqueueMessage(pTopLoop)) |
continue; |
- } |
- if (pWidgetMgr->CheckMessage_Native()) { |
- pWidgetMgr->DispatchMessage_Native(); |
- } |
} |
#endif |
return FWL_ERR_Succeeded; |