Index: fpdfsdk/fsdk_mgr.cpp |
diff --git a/fpdfsdk/fsdk_mgr.cpp b/fpdfsdk/fsdk_mgr.cpp |
index 932bcece9d1063c7226737d020ee1203bc7e96ae..d7de3e47c5a10b030dfbc39993b6c66919c050ee 100644 |
--- a/fpdfsdk/fsdk_mgr.cpp |
+++ b/fpdfsdk/fsdk_mgr.cpp |
@@ -772,6 +772,7 @@ FX_BOOL CPDFSDK_PageView::OnLButtonDown(const CFX_FloatPoint& point, |
CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); |
ASSERT(pEnv); |
CPDFSDK_Annot* pFXAnnot = GetFXWidgetAtPoint(point.x, point.y); |
+ |
if (!pFXAnnot) { |
KillFocusAnnot(nFlag); |
return FALSE; |
@@ -846,13 +847,13 @@ FX_BOOL CPDFSDK_PageView::OnLButtonUp(const CFX_FloatPoint& point, |
FX_BOOL CPDFSDK_PageView::OnMouseMove(const CFX_FloatPoint& point, int nFlag) { |
CPDFDoc_Environment* pEnv = m_pSDKDoc->GetEnv(); |
CPDFSDK_AnnotHandlerMgr* pAnnotHandlerMgr = pEnv->GetAnnotHandlerMgr(); |
- if (CPDFSDK_Annot* pFXAnnot = GetFXWidgetAtPoint(point.x, point.y)) { |
+ if (CPDFSDK_Annot* pFXAnnot = GetFXAnnotAtPoint(point.x, point.y)) { |
if (m_CaptureWidget && m_CaptureWidget != pFXAnnot) { |
m_bExitWidget = TRUE; |
m_bEnterWidget = FALSE; |
pAnnotHandlerMgr->Annot_OnMouseExit(this, m_CaptureWidget, nFlag); |
} |
- m_CaptureWidget = (CPDFSDK_Widget*)pFXAnnot; |
+ m_CaptureWidget = pFXAnnot; |
m_bOnWidget = TRUE; |
if (!m_bEnterWidget) { |
m_bEnterWidget = TRUE; |