Merge to XFA: Remove typdefs for pointer types in fx_system.h.
[pdfium.git] / xfa / src / fwl / src / core / fwl_noteimp.cpp
index 4a9c138..0ea8975 100644 (file)
@@ -143,7 +143,7 @@ FX_BOOL CFWL_NoteDriver::SendNote(CFWL_Note *pNote)
         m_sendEventCalled ++;\r
         FX_POSITION pos = m_eventTargets.GetStartPosition();\r
         while (pos) {\r
-            FX_LPVOID key = NULL;\r
+            void* key = NULL;\r
             CFWL_EventTarget *pEventTarget;\r
             m_eventTargets.GetNextAssoc(pos, key, (void*&)pEventTarget);\r
             if (pEventTarget && !pEventTarget->IsInvalid()) {\r
@@ -169,15 +169,15 @@ FX_BOOL CFWL_NoteDriver::PostMessage(CFWL_Message *pMessage)
 #define FWL_NoteDriver_EventKey 1100\r
 FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget *pListener, IFWL_Widget *pEventSource , FX_DWORD dwFilter )\r
 {\r
-    FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((FX_LPVOID)(uintptr_t)FWL_NoteDriver_EventKey);\r
+    FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((void*)(uintptr_t)FWL_NoteDriver_EventKey);\r
     if (dwkey == 0) {\r
-        FX_LPVOID random = FX_Random_MT_Start(0);\r
+        void* random = FX_Random_MT_Start(0);\r
         dwkey =        rand();\r
         FX_Random_MT_Close(random);\r
-        pListener->SetPrivateData((FX_LPVOID)(uintptr_t)FWL_NoteDriver_EventKey, (FX_LPVOID)(uintptr_t)dwkey, NULL);\r
+        pListener->SetPrivateData((void*)(uintptr_t)FWL_NoteDriver_EventKey, (void*)(uintptr_t)dwkey, NULL);\r
     }\r
     CFWL_EventTarget *value = NULL;\r
-    if (!m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (FX_LPVOID&)value)) {\r
+    if (!m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (void*&)value)) {\r
         value = FX_NEW CFWL_EventTarget(this, pListener);\r
         m_eventTargets.SetAt((void*)(uintptr_t)dwkey, value);\r
     }\r
@@ -186,12 +186,12 @@ FWL_ERR CFWL_NoteDriver::RegisterEventTarget(IFWL_Widget *pListener, IFWL_Widget
 }\r
 FWL_ERR CFWL_NoteDriver::UnregisterEventTarget(IFWL_Widget *pListener)\r
 {\r
-    FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((FX_LPVOID)(uintptr_t)FWL_NoteDriver_EventKey);\r
+    FX_DWORD dwkey = (FX_DWORD)(uintptr_t)pListener->GetPrivateData((void*)(uintptr_t)FWL_NoteDriver_EventKey);\r
     if (dwkey == 0) {\r
         return FWL_ERR_Indefinite;\r
     }\r
     CFWL_EventTarget *value = NULL;\r
-    if (m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (FX_LPVOID&)value)) {\r
+    if (m_eventTargets.Lookup((void*)(uintptr_t)dwkey, (void*&)value)) {\r
         value->FlagInvalid();\r
     }\r
     return FWL_ERR_Succeeded;\r
@@ -442,7 +442,7 @@ int32_t CFWL_NoteDriver::CountLoop()
 {\r
     return m_noteLoopQueue.GetSize();\r
 }\r
-void CFWL_NoteDriver::SetHook(FWLMessageHookCallback callback, FX_LPVOID info)\r
+void CFWL_NoteDriver::SetHook(FWLMessageHookCallback callback, void* info)\r
 {\r
     m_hook = callback;\r
     m_hookInfo = info;\r
@@ -799,7 +799,7 @@ void CFWL_NoteDriver::ClearInvalidEventTargets(FX_BOOL bRemoveAll)
 {\r
     FX_POSITION pos = m_eventTargets.GetStartPosition();\r
     while (pos) {\r
-        FX_LPVOID key = NULL;\r
+        void* key = NULL;\r
         CFWL_EventTarget *pEventTarget = NULL;\r
         m_eventTargets.GetNextAssoc(pos, key, (void*&)pEventTarget);\r
         if (pEventTarget && (bRemoveAll || pEventTarget->IsInvalid())) {\r
@@ -1119,7 +1119,7 @@ IFWL_Widget* FWL_GetCurrentThreadModalWidget(IFWL_NoteThread *pNoteThread)
     _FWL_RETURN_VALUE_IF_FAIL(widget, NULL);\r
     return widget->GetInterface();\r
 }\r
-FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, FX_LPVOID info)\r
+FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, void* info)\r
 {\r
     CFWL_NoteDriver *noteDriver = (CFWL_NoteDriver*)driver;\r
     noteDriver->SetHook(callback, info);\r