Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / include / fwl / core / fwl_note.h
index 7e553a9..ea8328f 100644 (file)
@@ -146,7 +146,7 @@ public:
     {\r
         return 0;\r
     }\r
-    virtual FX_BOOL                    IsInstance(FX_WSTR wsClass) const\r
+    virtual FX_BOOL                    IsInstance(const CFX_WideStringC& wsClass) const\r
     {\r
         return TRUE;\r
     }\r
@@ -322,7 +322,7 @@ IFWL_Widget *m_pOwner;
 END_FWL_EVENT_DEF\r
 BEGIN_FWL_EVENT_DEF(CFWL_EvtMenuCommand, FWL_EVTHASH_MenuCommand)\r
 int32_t m_iCommand;\r
-FX_LPVOID m_pData;\r
+void* m_pData;\r
 END_FWL_EVENT_DEF\r
 BEGIN_FWL_EVENT_DEF(CFWL_EvtSizeChanged, FWL_EVTHASH_SizeChanged)\r
 IFWL_Widget *m_pWidget;\r
@@ -384,6 +384,6 @@ FWL_ERR FWL_AddToolTipTarget(IFWL_ToolTipTarget *pTarget);
 FWL_ERR FWL_RemoveToolTipTarget(IFWL_ToolTipTarget *pTarget);\r
 FWL_ERR        FWL_SetToolTipInitialDelay(int32_t iDelayTime);\r
 FWL_ERR        FWL_SetToolTipAutoPopDelay(int32_t iDelayTime);\r
-typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message *msg, FX_LPVOID info);\r
-FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, FX_LPVOID info);\r
+typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message *msg, void* info);\r
+FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, void* info);\r
 #endif\r