| Index: xfa/fwl/core/fwl_sdadapterimp.h
|
| diff --git a/xfa/fwl/core/fwl_sdadapterimp.h b/xfa/fwl/core/fwl_sdadapterimp.h
|
| index cd2ac8d6d81bc32ad7bc0a70aaa5f0a9b2089194..7f17985e5088544cf04e30d058ba9cb6ada10f60 100644
|
| --- a/xfa/fwl/core/fwl_sdadapterimp.h
|
| +++ b/xfa/fwl/core/fwl_sdadapterimp.h
|
| @@ -14,23 +14,23 @@ class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr {
|
| public:
|
| CFWL_SDAdapterWidgetMgr();
|
| ~CFWL_SDAdapterWidgetMgr();
|
| - virtual FWL_ERR CreateWidget(IFWL_Widget* pWidget,
|
| - IFWL_Widget* pParent = NULL);
|
| - virtual FWL_ERR DestroyWidget(IFWL_Widget* pWidget);
|
| - virtual FWL_ERR SetWidgetRect(IFWL_Widget* pWidget, const CFX_RectF& rect);
|
| - virtual FWL_ERR SetWidgetPosition(IFWL_Widget* pWidget,
|
| - FX_FLOAT fx,
|
| - FX_FLOAT fy);
|
| - virtual FWL_ERR SetParentWidget(IFWL_Widget* pWidget, IFWL_Widget* pParent);
|
| - virtual FWL_ERR ShowWidget(IFWL_Widget* pWidget);
|
| - virtual FWL_ERR HideWidget(IFWL_Widget* pWidget);
|
| - virtual FWL_ERR SetNormal(IFWL_Widget* pWidget);
|
| - virtual FWL_ERR SetMaximize(IFWL_Widget* pWidget);
|
| - virtual FWL_ERR SetMinimize(IFWL_Widget* pWidget);
|
| - virtual FWL_ERR RunWidget(IFWL_Widget* pWidget);
|
| - virtual FWL_ERR RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect);
|
| - virtual FWL_ERR Exit(int32_t iExitCode);
|
| - virtual FWL_ERR CreateWidgetWithNativeId(IFWL_Widget* pWidget, void* vp);
|
| + virtual FWL_Error CreateWidget(IFWL_Widget* pWidget,
|
| + IFWL_Widget* pParent = NULL);
|
| + virtual FWL_Error DestroyWidget(IFWL_Widget* pWidget);
|
| + virtual FWL_Error SetWidgetRect(IFWL_Widget* pWidget, const CFX_RectF& rect);
|
| + virtual FWL_Error SetWidgetPosition(IFWL_Widget* pWidget,
|
| + FX_FLOAT fx,
|
| + FX_FLOAT fy);
|
| + virtual FWL_Error SetParentWidget(IFWL_Widget* pWidget, IFWL_Widget* pParent);
|
| + virtual FWL_Error ShowWidget(IFWL_Widget* pWidget);
|
| + virtual FWL_Error HideWidget(IFWL_Widget* pWidget);
|
| + virtual FWL_Error SetNormal(IFWL_Widget* pWidget);
|
| + virtual FWL_Error SetMaximize(IFWL_Widget* pWidget);
|
| + virtual FWL_Error SetMinimize(IFWL_Widget* pWidget);
|
| + virtual FWL_Error RunWidget(IFWL_Widget* pWidget);
|
| + virtual FWL_Error RepaintWidget(IFWL_Widget* pWidget, const CFX_RectF* pRect);
|
| + virtual FWL_Error Exit(int32_t iExitCode);
|
| + virtual FWL_Error CreateWidgetWithNativeId(IFWL_Widget* pWidget, void* vp);
|
| virtual FX_BOOL GetPopupPos(IFWL_Widget* pWidget,
|
| FX_FLOAT fMinHeight,
|
| FX_FLOAT fMaxHeight,
|
| @@ -38,34 +38,34 @@ class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr {
|
| CFX_RectF& rtPopup);
|
|
|
| public:
|
| - virtual FWL_ERR GetWidgetRect(IFWL_Widget* pWidget, CFX_RectF& rect);
|
| - virtual FWL_ERR SetWidgetIcon(IFWL_Widget* pWidget,
|
| - const CFX_DIBitmap* pIcon,
|
| - FX_BOOL bBig);
|
| - virtual FWL_ERR SetWidgetCaption(IFWL_Widget* pWidget,
|
| - const CFX_WideStringC& wsCaption);
|
| - virtual FWL_ERR SetBorderRegion(IFWL_Widget* pWidget, CFX_Path* pPath);
|
| - virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, uint32_t dwAlpha);
|
| + virtual FWL_Error GetWidgetRect(IFWL_Widget* pWidget, CFX_RectF& rect);
|
| + virtual FWL_Error SetWidgetIcon(IFWL_Widget* pWidget,
|
| + const CFX_DIBitmap* pIcon,
|
| + FX_BOOL bBig);
|
| + virtual FWL_Error SetWidgetCaption(IFWL_Widget* pWidget,
|
| + const CFX_WideStringC& wsCaption);
|
| + virtual FWL_Error SetBorderRegion(IFWL_Widget* pWidget, CFX_Path* pPath);
|
| + virtual FWL_Error SetTransparent(IFWL_Widget* pWidget, uint32_t dwAlpha);
|
| virtual FX_BOOL CheckMessage();
|
| virtual FX_BOOL IsIdleMessage();
|
| - virtual FWL_ERR DispatchMessage();
|
| - virtual FWL_ERR GetWidgetDC(IFWL_Widget* pWidget, void*& pDC);
|
| - virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget* pWidget,
|
| - void* pDC,
|
| - CFX_RectF* pClip = 0);
|
| + virtual FWL_Error DispatchMessage();
|
| + virtual FWL_Error GetWidgetDC(IFWL_Widget* pWidget, void*& pDC);
|
| + virtual FWL_Error ReleaseWidgetDC(IFWL_Widget* pWidget,
|
| + void* pDC,
|
| + CFX_RectF* pClip = 0);
|
| virtual void* GetWindow(IFWL_Widget* pWidget);
|
| virtual uint32_t GetKeyState(uint32_t dwVirtKey);
|
| - virtual FWL_ERR RunLoop(IFWL_Widget* widget);
|
| - virtual FWL_ERR EndLoop();
|
| - virtual FWL_ERR InitMenu(IFWL_Menu* pMenu, IFWL_MenuDP* pMenuData);
|
| - virtual FWL_ERR UpdateMenu(IFWL_Menu* pMenu,
|
| - const void* hItem,
|
| - int32_t iType);
|
| - virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook* hook);
|
| - virtual FWL_ERR GetSystemBorder(FX_FLOAT& l,
|
| - FX_FLOAT& t,
|
| - FX_FLOAT& r,
|
| - FX_FLOAT& b);
|
| + virtual FWL_Error RunLoop(IFWL_Widget* widget);
|
| + virtual FWL_Error EndLoop();
|
| + virtual FWL_Error InitMenu(IFWL_Menu* pMenu, IFWL_MenuDP* pMenuData);
|
| + virtual FWL_Error UpdateMenu(IFWL_Menu* pMenu,
|
| + const void* hItem,
|
| + int32_t iType);
|
| + virtual FWL_Error SetMessageHook(IFWL_AdapterMessageHook* hook);
|
| + virtual FWL_Error GetSystemBorder(FX_FLOAT& l,
|
| + FX_FLOAT& t,
|
| + FX_FLOAT& r,
|
| + FX_FLOAT& b);
|
| };
|
|
|
| class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr {
|
|
|