Cleanup CFX_SystemHandler.

fpdfsdk/cfx_systemhandler.h

Index: fpdfsdk/cfx_systemhandler.h
diff --git a/fpdfsdk/cfx_systemhandler.h b/fpdfsdk/cfx_systemhandler.h
index a1c277d04b3a8b25cf74fb46485a65ae6acfa720..5f8a871f05079716058b6588de7082804ac4119d 100644
--- a/fpdfsdk/cfx_systemhandler.h
+++ b/fpdfsdk/cfx_systemhandler.h
@@ -10,8 +10,6 @@
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_system.h"
 
-using FX_HWND = void*;
-using FX_HMENU = void*;
 using TimerCallback = void (*)(int32_t idEvent);
 
 struct FX_SYSTEMTIME {
@@ -43,17 +41,19 @@ struct FX_SYSTEMTIME {
 #define FXCT_HBEAM 4
 #define FXCT_HAND 5
 
+class CFFL_FormFiller;
 class CPDF_Document;
 class CPDF_Font;
 class CPDFSDK_Environment;
+class CPDFSDK_Widget;
 
 class CFX_SystemHandler {
  public:
   explicit CFX_SystemHandler(CPDFSDK_Environment* pEnv) : m_pEnv(pEnv) {}
   ~CFX_SystemHandler() {}
 
-  void InvalidateRect(FX_HWND hWnd, FX_RECT rect);
-  void OutputSelectedRect(void* pFormFiller, CFX_FloatRect& rect);
+  void InvalidateRect(CPDFSDK_Widget* widget, FX_RECT rect);
+  void OutputSelectedRect(CFFL_FormFiller* pFormFiller, CFX_FloatRect& rect);
   bool IsSelectionImplemented() const;
 
   void SetCursor(int32_t nCursorType);
@@ -62,14 +62,14 @@ class CFX_SystemHandler {
   CPDF_Font* AddNativeTrueTypeFontToPDF(CPDF_Document* pDoc,
                                         CFX_ByteString sFontFaceName,
                                         uint8_t nCharset);
+
   int32_t SetTimer(int32_t uElapse, TimerCallback lpTimerFunc);
   void KillTimer(int32_t nID);
+
   bool IsSHIFTKeyDown(uint32_t nFlag) const;
   bool IsCTRLKeyDown(uint32_t nFlag) const;
   bool IsALTKeyDown(uint32_t nFlag) const;
 
-  FX_SYSTEMTIME GetLocalTime();
-
  private:
   CPDFSDK_Environment* const m_pEnv;
 };