diff options
Diffstat (limited to 'xfa/include/fwl/adapter')
| -rw-r--r-- | xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h | 4 | ||||
| -rw-r--r-- | xfa/include/fwl/adapter/fwl_adaptercursormgr.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/adapter/fwl_adaptermonitormgr.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h | 10 | ||||
| -rw-r--r-- | xfa/include/fwl/adapter/fwl_sdadapterimp.h | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h index 196e6503d9..1ad09eda96 100644 --- a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h @@ -14,7 +14,7 @@ enum FWL_CLIPBOARDFORMAT { FWL_CLIPBOARDFORMAT_UncodeText,
};
typedef struct _FWL_HCLIPBOARDDATA {
- FX_LPVOID pData;
+ void* pData;
} * FWL_HCLIPBOARDDATA;
class IFWL_AdapterClipboardMgr
{
@@ -24,7 +24,7 @@ public: virtual FWL_HCLIPBOARDDATA GetData(FX_DWORD dwFormat) = 0;
virtual FWL_ERR SetData(FX_DWORD dwFormat, uint8_t *pBuf, int32_t iSize) = 0;
virtual int32_t GetDataSize(FWL_HCLIPBOARDDATA hData) = 0;
- virtual FX_LPVOID LockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0;
+ virtual void* LockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0;
virtual FX_BOOL UnLockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0;
virtual FWL_ERR SetStringData(FX_WSTR ws) = 0;
virtual FWL_ERR SetStringData(FX_BSTR bs) = 0;
diff --git a/xfa/include/fwl/adapter/fwl_adaptercursormgr.h b/xfa/include/fwl/adapter/fwl_adaptercursormgr.h index 225a22ca2f..7b7b567be1 100644 --- a/xfa/include/fwl/adapter/fwl_adaptercursormgr.h +++ b/xfa/include/fwl/adapter/fwl_adaptercursormgr.h @@ -23,7 +23,7 @@ enum FWL_CURSORTYPE { FWL_CURSORTYPE_Help
};
typedef struct _FWL_HCURSOR {
- FX_LPVOID pData;
+ void* pData;
} *FWL_HCURSOR;
class IFWL_AdapterCursorMgr
{
diff --git a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h index 8830a3de81..3da0564225 100644 --- a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h +++ b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h @@ -8,7 +8,7 @@ #define _FWL_ADAPTER_MONITORMGR_H
class IFWL_AdapterMonitorMgr;
typedef struct _FWL_HMONITOR {
- FX_LPVOID pData;
+ void* pData;
} *FWL_HMONITOR;
class IFWL_AdapterMonitorMgr
{
diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h index e8c3b89674..bff8e8a885 100644 --- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h @@ -38,15 +38,15 @@ public: virtual FWL_ERR DispatchMessage() = 0;
virtual FWL_ERR RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect) = 0;
virtual FWL_ERR Exit(int32_t iExitCode) = 0;
- virtual FWL_ERR CreateWidgetWithNativeId(IFWL_Widget *pWidget, FX_LPVOID UserData) = 0;
- virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, FX_LPVOID &pDC) = 0;
- virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, FX_LPVOID pDC, CFX_RectF *pClip = 0) = 0;
- virtual FX_LPVOID GetWindow(IFWL_Widget *pWidget) = 0;
+ virtual FWL_ERR CreateWidgetWithNativeId(IFWL_Widget *pWidget, void* UserData) = 0;
+ virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, void* &pDC) = 0;
+ virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, void* pDC, CFX_RectF *pClip = 0) = 0;
+ virtual void* GetWindow(IFWL_Widget *pWidget) = 0;
virtual FX_DWORD GetKeyState(FX_DWORD dwVirtKey) = 0;
virtual FWL_ERR RunLoop(IFWL_Widget *widget) = 0;
virtual FWL_ERR EndLoop() = 0;
virtual FWL_ERR InitMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0;
- virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, int32_t iType) = 0;
+ virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, const void* hItem, int32_t iType) = 0;
virtual int32_t TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0;
virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook *hook) = 0;
virtual FWL_ERR GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b) = 0;
diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h index 323a0ba4fc..ba14ae66c6 100644 --- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h +++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h @@ -44,14 +44,14 @@ public: virtual FX_BOOL CheckMessage();
virtual FX_BOOL IsIdleMessage();
virtual FWL_ERR DispatchMessage();
- virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, FX_LPVOID &pDC);
- virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, FX_LPVOID pDC, CFX_RectF *pClip = 0);
- virtual FX_LPVOID GetWindow(IFWL_Widget *pWidget);
+ virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, void* &pDC);
+ virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, void* pDC, CFX_RectF *pClip = 0);
+ virtual void* GetWindow(IFWL_Widget *pWidget);
virtual FX_DWORD GetKeyState(FX_DWORD 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, FX_LPCVOID hItem, int32_t iType);
+ virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, const void* hItem, int32_t iType);
virtual int32_t TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData);
virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook *hook);
virtual FWL_ERR GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b);
|