Index: xfa/fwl/core/fwl_sdadapterimp.cpp |
diff --git a/xfa/fwl/core/fwl_sdadapterimp.cpp b/xfa/fwl/core/fwl_sdadapterimp.cpp |
index c4dc61a8d1f8338063e2f71e9d9d5864a2d87f0b..d25266de49b92a2b64f649351b2b5c36baec0068 100644 |
--- a/xfa/fwl/core/fwl_sdadapterimp.cpp |
+++ b/xfa/fwl/core/fwl_sdadapterimp.cpp |
@@ -16,76 +16,77 @@ |
CFWL_SDAdapterWidgetMgr::CFWL_SDAdapterWidgetMgr() {} |
CFWL_SDAdapterWidgetMgr::~CFWL_SDAdapterWidgetMgr() {} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::CreateWidget(IFWL_Widget* pWidget, |
- IFWL_Widget* pParent) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::CreateWidget(IFWL_Widget* pWidget, |
+ IFWL_Widget* pParent) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::DestroyWidget(IFWL_Widget* pWidget) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::DestroyWidget(IFWL_Widget* pWidget) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetWidgetRect(IFWL_Widget* pWidget, |
- const CFX_RectF& rect) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetWidgetRect(IFWL_Widget* pWidget, |
+ const CFX_RectF& rect) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetWidgetPosition(IFWL_Widget* pWidget, |
- FX_FLOAT fx, |
- FX_FLOAT fy) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetWidgetPosition(IFWL_Widget* pWidget, |
+ FX_FLOAT fx, |
+ FX_FLOAT fy) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetParentWidget(IFWL_Widget* pWidget, |
- IFWL_Widget* pParent) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetParentWidget(IFWL_Widget* pWidget, |
+ IFWL_Widget* pParent) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::ShowWidget(IFWL_Widget* pWidget) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::ShowWidget(IFWL_Widget* pWidget) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::HideWidget(IFWL_Widget* pWidget) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::HideWidget(IFWL_Widget* pWidget) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetNormal(IFWL_Widget* pWidget) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetNormal(IFWL_Widget* pWidget) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetMaximize(IFWL_Widget* pWidget) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetMaximize(IFWL_Widget* pWidget) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetMinimize(IFWL_Widget* pWidget) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetMinimize(IFWL_Widget* pWidget) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::RunWidget(IFWL_Widget* pWidget) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::RunWidget(IFWL_Widget* pWidget) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::RepaintWidget(IFWL_Widget* pWidget, |
- const CFX_RectF* pRect) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::RepaintWidget(IFWL_Widget* pWidget, |
+ const CFX_RectF* pRect) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::Exit(int32_t iExitCode) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::Exit(int32_t iExitCode) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::CreateWidgetWithNativeId(IFWL_Widget* pWidget, |
- void* vp) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::CreateWidgetWithNativeId( |
+ IFWL_Widget* pWidget, |
+ void* vp) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::GetWidgetRect(IFWL_Widget* pWidget, |
- CFX_RectF& rect) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::GetWidgetRect(IFWL_Widget* pWidget, |
+ CFX_RectF& rect) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetWidgetIcon(IFWL_Widget* pWidget, |
- const CFX_DIBitmap* pIcon, |
- FX_BOOL bBig) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetWidgetIcon(IFWL_Widget* pWidget, |
+ const CFX_DIBitmap* pIcon, |
+ FX_BOOL bBig) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetWidgetCaption( |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetWidgetCaption( |
IFWL_Widget* pWidget, |
const CFX_WideStringC& wsCaption) { |
- return FWL_ERR_Succeeded; |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetBorderRegion(IFWL_Widget* pWidget, |
- CFX_Path* pPath) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetBorderRegion(IFWL_Widget* pWidget, |
+ CFX_Path* pPath) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetTransparent(IFWL_Widget* pWidget, |
- uint32_t dwAlpha) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetTransparent(IFWL_Widget* pWidget, |
+ uint32_t dwAlpha) { |
+ return FWL_Error::Succeeded; |
} |
FX_BOOL CFWL_SDAdapterWidgetMgr::CheckMessage() { |
return TRUE; |
@@ -93,16 +94,17 @@ FX_BOOL CFWL_SDAdapterWidgetMgr::CheckMessage() { |
FX_BOOL CFWL_SDAdapterWidgetMgr::IsIdleMessage() { |
return TRUE; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::DispatchMessage() { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::DispatchMessage() { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::GetWidgetDC(IFWL_Widget* pWidget, void*& pDC) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::GetWidgetDC(IFWL_Widget* pWidget, |
+ void*& pDC) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::ReleaseWidgetDC(IFWL_Widget* pWidget, |
- void* pDC, |
- CFX_RectF* pClip) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::ReleaseWidgetDC(IFWL_Widget* pWidget, |
+ void* pDC, |
+ CFX_RectF* pClip) { |
+ return FWL_Error::Succeeded; |
} |
void* CFWL_SDAdapterWidgetMgr::GetWindow(IFWL_Widget* pWidget) { |
return NULL; |
@@ -110,36 +112,38 @@ void* CFWL_SDAdapterWidgetMgr::GetWindow(IFWL_Widget* pWidget) { |
uint32_t CFWL_SDAdapterWidgetMgr::GetKeyState(uint32_t dwVirtKey) { |
return 0; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::RunLoop(IFWL_Widget* widget) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::RunLoop(IFWL_Widget* widget) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::EndLoop() { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::EndLoop() { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::InitMenu(IFWL_Menu* pMenu, |
- IFWL_MenuDP* pMenuData) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::InitMenu(IFWL_Menu* pMenu, |
+ IFWL_MenuDP* pMenuData) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::UpdateMenu(IFWL_Menu* pMenu, |
- const void* hItem, |
- int32_t iType) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::UpdateMenu(IFWL_Menu* pMenu, |
+ const void* hItem, |
+ int32_t iType) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::SetMessageHook(IFWL_AdapterMessageHook* hook) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::SetMessageHook( |
+ IFWL_AdapterMessageHook* hook) { |
+ return FWL_Error::Succeeded; |
} |
-FWL_ERR CFWL_SDAdapterWidgetMgr::GetSystemBorder(FX_FLOAT& l, |
- FX_FLOAT& t, |
- FX_FLOAT& r, |
- FX_FLOAT& b) { |
- return FWL_ERR_Succeeded; |
+FWL_Error CFWL_SDAdapterWidgetMgr::GetSystemBorder(FX_FLOAT& l, |
+ FX_FLOAT& t, |
+ FX_FLOAT& r, |
+ FX_FLOAT& b) { |
+ return FWL_Error::Succeeded; |
} |
+ |
FX_BOOL CFWL_SDAdapterWidgetMgr::GetPopupPos(IFWL_Widget* pWidget, |
FX_FLOAT fMinHeight, |
FX_FLOAT fMaxHeight, |
const CFX_RectF& rtAnchor, |
CFX_RectF& rtPopup) { |
- return FWL_ERR_Succeeded; |
+ return FALSE; |
} |
CFWL_SDAdapterThreadMgr::CFWL_SDAdapterThreadMgr() {} |