Remove IFX_SystemHandler.

This CL folds IFX_SystemHandler into CFX_SystemHandler. Methods which either
had no implementation, or returned a default value have been removed.

Review URL: https://codereview.chromium.org/1923093002

9 files changed, 33 insertions, 235 deletions

diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index 4a9adfb207..dffc62a02f 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -129,67 +129,9 @@ FX_BOOL CPWL_Edit::CanCopy() const {
 FX_BOOL CPWL_Edit::CanCut() const {
   return CanCopy() && !IsReadOnly();
 }
-
-FX_BOOL CPWL_Edit::CanPaste() const {
-  if (IsReadOnly())
-    return FALSE;
-
-  CFX_WideString swClipboard;
-  if (IFX_SystemHandler* pSH = GetSystemHandler())
-    swClipboard = pSH->GetClipboardText(GetAttachedHWnd());
-
-  return !swClipboard.IsEmpty();
-}
-
-void CPWL_Edit::CopyText() {
-  if (!CanCopy())
-    return;
-
-  CFX_WideString str = m_pEdit->GetSelText();
-
-  if (IFX_SystemHandler* pSH = GetSystemHandler())
-    pSH->SetClipboardText(GetAttachedHWnd(), str);
-}
-
-void CPWL_Edit::PasteText() {
-  if (!CanPaste())
-    return;
-
-  CFX_WideString swClipboard;
-  if (IFX_SystemHandler* pSH = GetSystemHandler())
-    swClipboard = pSH->GetClipboardText(GetAttachedHWnd());
-
-  if (m_pFillerNotify) {
-    FX_BOOL bRC = TRUE;
-    FX_BOOL bExit = FALSE;
-    CFX_WideString strChangeEx;
-    int nSelStart = 0;
-    int nSelEnd = 0;
-    GetSel(nSelStart, nSelEnd);
-    m_pFillerNotify->OnBeforeKeyStroke(GetAttachedData(), swClipboard,
-                                       strChangeEx, nSelStart, nSelEnd, TRUE,
-                                       bRC, bExit, 0);
-    if (!bRC)
-      return;
-    if (bExit)
-      return;
-  }
-
-  if (swClipboard.GetLength() > 0) {
-    Clear();
-    InsertText(swClipboard.c_str());
-  }
-}
-
 void CPWL_Edit::CutText() {
   if (!CanCut())
     return;
-
-  CFX_WideString str = m_pEdit->GetSelText();
-
-  if (IFX_SystemHandler* pSH = GetSystemHandler())
-    pSH->SetClipboardText(GetAttachedHWnd(), str);
-
   m_pEdit->Clear();
 }
 
@@ -442,7 +384,7 @@ void CPWL_Edit::DrawThisAppearance(CFX_RenderDevice* pDevice,
     rcClip = GetClientRect();
     pRange = &wrRange;
   }
-  IFX_SystemHandler* pSysHandler = GetSystemHandler();
+  CFX_SystemHandler* pSysHandler = GetSystemHandler();
   IFX_Edit::DrawEdit(
       pDevice, pUser2Device, m_pEdit,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
@@ -477,15 +419,6 @@ FX_BOOL CPWL_Edit::OnLButtonDblClk(const CFX_FloatPoint& point,
   return TRUE;
 }
 
-#define WM_PWLEDIT_UNDO 0x01
-#define WM_PWLEDIT_REDO 0x02
-#define WM_PWLEDIT_CUT 0x03
-#define WM_PWLEDIT_COPY 0x04
-#define WM_PWLEDIT_PASTE 0x05
-#define WM_PWLEDIT_DELETE 0x06
-#define WM_PWLEDIT_SELECTALL 0x07
-#define WM_PWLEDIT_SUGGEST 0x08
-
 FX_BOOL CPWL_Edit::OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) {
   if (m_bMouseDown)
     return FALSE;
@@ -495,145 +428,13 @@ FX_BOOL CPWL_Edit::OnRButtonUp(const CFX_FloatPoint& point, uint32_t nFlag) {
   if (!HasFlag(PES_TEXTOVERFLOW) && !ClientHitTest(point))
     return TRUE;
 
-  IFX_SystemHandler* pSH = GetSystemHandler();
+  CFX_SystemHandler* pSH = GetSystemHandler();
   if (!pSH)
     return FALSE;
 
   SetFocus();
 
-  CPVT_WordRange wrLatin = GetLatinWordsRange(point);
-  CFX_WideString swLatin = m_pEdit->GetRangeText(wrLatin);
-
-  FX_HMENU hPopup = pSH->CreatePopupMenu();
-  if (!hPopup)
-    return FALSE;
-
-  std::vector<CFX_ByteString> sSuggestWords;
-  CFX_FloatPoint ptPopup = point;
-
-  IPWL_Provider* pProvider = GetProvider();
-
-  if (HasFlag(PES_UNDO)) {
-    pSH->AppendMenuItem(
-        hPopup, WM_PWLEDIT_UNDO,
-        pProvider ? pProvider->LoadPopupMenuString(0) : L"&Undo");
-    pSH->AppendMenuItem(
-        hPopup, WM_PWLEDIT_REDO,
-        pProvider ? pProvider->LoadPopupMenuString(1) : L"&Redo");
-    pSH->AppendMenuItem(hPopup, 0, L"");
-
-    if (!m_pEdit->CanUndo())
-      pSH->EnableMenuItem(hPopup, WM_PWLEDIT_UNDO, FALSE);
-    if (!m_pEdit->CanRedo())
-      pSH->EnableMenuItem(hPopup, WM_PWLEDIT_REDO, FALSE);
-  }
-
-  pSH->AppendMenuItem(hPopup, WM_PWLEDIT_CUT,
-                      pProvider ? pProvider->LoadPopupMenuString(2) : L"Cu&t");
-  pSH->AppendMenuItem(hPopup, WM_PWLEDIT_COPY,
-                      pProvider ? pProvider->LoadPopupMenuString(3) : L"&Copy");
-  pSH->AppendMenuItem(
-      hPopup, WM_PWLEDIT_PASTE,
-      pProvider ? pProvider->LoadPopupMenuString(4) : L"&Paste");
-  pSH->AppendMenuItem(
-      hPopup, WM_PWLEDIT_DELETE,
-      pProvider ? pProvider->LoadPopupMenuString(5) : L"&Delete");
-
-  CFX_WideString swText = pSH->GetClipboardText(GetAttachedHWnd());
-  if (swText.IsEmpty())
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_PASTE, FALSE);
-
-  if (!m_pEdit->IsSelected()) {
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_CUT, FALSE);
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_COPY, FALSE);
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_DELETE, FALSE);
-  }
-
-  if (IsReadOnly()) {
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_CUT, FALSE);
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_DELETE, FALSE);
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_PASTE, FALSE);
-  }
-
-  if (HasFlag(PES_PASSWORD)) {
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_CUT, FALSE);
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_COPY, FALSE);
-  }
-
-  if (HasFlag(PES_NOREAD)) {
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_CUT, FALSE);
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_COPY, FALSE);
-  }
-
-  pSH->AppendMenuItem(hPopup, 0, L"");
-  pSH->AppendMenuItem(
-      hPopup, WM_PWLEDIT_SELECTALL,
-      pProvider ? pProvider->LoadPopupMenuString(6) : L"&Select All");
-
-  if (m_pEdit->GetTotalWords() == 0) {
-    pSH->EnableMenuItem(hPopup, WM_PWLEDIT_SELECTALL, FALSE);
-  }
-
-  int32_t x, y;
-  PWLtoWnd(ptPopup, x, y);
-  pSH->ClientToScreen(GetAttachedHWnd(), x, y);
-  pSH->SetCursor(FXCT_ARROW);
-  int32_t nCmd = pSH->TrackPopupMenu(hPopup, x, y, GetAttachedHWnd());
-
-  switch (nCmd) {
-    case WM_PWLEDIT_UNDO:
-      Undo();
-      break;
-    case WM_PWLEDIT_REDO:
-      Redo();
-      break;
-    case WM_PWLEDIT_CUT:
-      CutText();
-      break;
-    case WM_PWLEDIT_COPY:
-      CopyText();
-      break;
-    case WM_PWLEDIT_PASTE:
-      PasteText();
-      break;
-    case WM_PWLEDIT_DELETE:
-      Clear();
-      break;
-    case WM_PWLEDIT_SELECTALL:
-      SelectAll();
-      break;
-    case WM_PWLEDIT_SUGGEST + 0:
-      SetSel(m_pEdit->WordPlaceToWordIndex(wrLatin.BeginPos),
-             m_pEdit->WordPlaceToWordIndex(wrLatin.EndPos));
-      ReplaceSel(sSuggestWords[0].UTF8Decode().c_str());
-      break;
-    case WM_PWLEDIT_SUGGEST + 1:
-      SetSel(m_pEdit->WordPlaceToWordIndex(wrLatin.BeginPos),
-             m_pEdit->WordPlaceToWordIndex(wrLatin.EndPos));
-      ReplaceSel(sSuggestWords[1].UTF8Decode().c_str());
-      break;
-    case WM_PWLEDIT_SUGGEST + 2:
-      SetSel(m_pEdit->WordPlaceToWordIndex(wrLatin.BeginPos),
-             m_pEdit->WordPlaceToWordIndex(wrLatin.EndPos));
-      ReplaceSel(sSuggestWords[2].UTF8Decode().c_str());
-      break;
-    case WM_PWLEDIT_SUGGEST + 3:
-      SetSel(m_pEdit->WordPlaceToWordIndex(wrLatin.BeginPos),
-             m_pEdit->WordPlaceToWordIndex(wrLatin.EndPos));
-      ReplaceSel(sSuggestWords[3].UTF8Decode().c_str());
-      break;
-    case WM_PWLEDIT_SUGGEST + 4:
-      SetSel(m_pEdit->WordPlaceToWordIndex(wrLatin.BeginPos),
-             m_pEdit->WordPlaceToWordIndex(wrLatin.EndPos));
-      ReplaceSel(sSuggestWords[4].UTF8Decode().c_str());
-      break;
-    default:
-      break;
-  }
-
-  pSH->DestroyMenu(hPopup);
-
-  return TRUE;
+  return FALSE;
 }
 
 void CPWL_Edit::OnSetFocus() {
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.h b/fpdfsdk/pdfwindow/PWL_Edit.h
index 29747dd2ae..8a9d371b28 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/pdfwindow/PWL_Edit.h
@@ -83,13 +83,10 @@ class CPWL_Edit : public CPWL_EditCtrl, public IFX_Edit_OprNotify {
   FX_BOOL CanClear() const;
   FX_BOOL CanCopy() const;
   FX_BOOL CanCut() const;
-  FX_BOOL CanPaste() const;
 
-  virtual void CopyText();
-  virtual void PasteText();
-  virtual void CutText();
+  void CutText();
 
-  virtual void SetText(const FX_WCHAR* csText);
+  void SetText(const FX_WCHAR* csText);
   void ReplaceSel(const FX_WCHAR* csText);
 
   CFX_ByteString GetTextAppearanceStream(const CFX_FloatPoint& ptOffset) const;
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
index af7e5837a3..a6596582de 100644
--- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
@@ -60,7 +60,7 @@ FX_BOOL CPWL_EditCtrl::IsWndHorV() {
 
 void CPWL_EditCtrl::SetCursor() {
   if (IsValid()) {
-    if (IFX_SystemHandler* pSH = GetSystemHandler()) {
+    if (CFX_SystemHandler* pSH = GetSystemHandler()) {
       if (IsWndHorV())
         pSH->SetCursor(FXCT_VBEAM);
       else
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
index 62bb4079f2..f73468bf2b 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
@@ -34,7 +34,7 @@ const char* const g_sDEStandardFontName[] = {"Courier",
 
 }  // namespace
 
-CPWL_FontMap::CPWL_FontMap(IFX_SystemHandler* pSystemHandler)
+CPWL_FontMap::CPWL_FontMap(CFX_SystemHandler* pSystemHandler)
     : m_pPDFDoc(NULL), m_pSystemHandler(pSystemHandler) {
   ASSERT(m_pSystemHandler);
 }
@@ -46,7 +46,7 @@ CPWL_FontMap::~CPWL_FontMap() {
   Empty();
 }
 
-void CPWL_FontMap::SetSystemHandler(IFX_SystemHandler* pSystemHandler) {
+void CPWL_FontMap::SetSystemHandler(CFX_SystemHandler* pSystemHandler) {
   m_pSystemHandler = pSystemHandler;
 }
 
@@ -284,7 +284,7 @@ CFX_ByteString CPWL_FontMap::GetNativeFont(int32_t nCharset) {
     if (m_pSystemHandler->FindNativeTrueTypeFont(nCharset, sFontName))
       return sFontName;
 
-    sFontName = m_pSystemHandler->GetNativeTrueTypeFont(nCharset);
+    sFontName = "";
   }
   return sFontName;
 }
@@ -491,7 +491,7 @@ int32_t CPWL_FontMap::CharSetFromUnicode(uint16_t word, int32_t nOldCharset) {
   return ANSI_CHARSET;
 }
 
-CPWL_DocFontMap::CPWL_DocFontMap(IFX_SystemHandler* pSystemHandler,
+CPWL_DocFontMap::CPWL_DocFontMap(CFX_SystemHandler* pSystemHandler,
                                  CPDF_Document* pAttachedDoc)
     : CPWL_FontMap(pSystemHandler), m_pAttachedDoc(pAttachedDoc) {}
 
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h
index 7533b1e787..2c40c92a97 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.h
@@ -12,7 +12,7 @@
 #include "public/fpdf_sysfontinfo.h"
 
 class CPDF_Document;
-class IFX_SystemHandler;
+class CFX_SystemHandler;
 
 struct CPWL_FontMap_Data {
   CPDF_Font* pFont;
@@ -51,7 +51,7 @@ struct CPWL_FontMap_Native {
 
 class CPWL_FontMap : public IPVT_FontMap {
  public:
-  CPWL_FontMap(IFX_SystemHandler* pSystemHandler);
+  CPWL_FontMap(CFX_SystemHandler* pSystemHandler);
   ~CPWL_FontMap() override;
 
   // IPVT_FontMap
@@ -63,7 +63,7 @@ class CPWL_FontMap : public IPVT_FontMap {
   int32_t CharCodeFromUnicode(int32_t nFontIndex, uint16_t word) override;
   int32_t CharSetFromUnicode(uint16_t word, int32_t nOldCharset) override;
 
-  void SetSystemHandler(IFX_SystemHandler* pSystemHandler);
+  void SetSystemHandler(CFX_SystemHandler* pSystemHandler);
   int32_t GetFontMapCount() const;
   const CPWL_FontMap_Data* GetFontMapData(int32_t nIndex) const;
   static int32_t GetNativeCharset();
@@ -119,12 +119,12 @@ class CPWL_FontMap : public IPVT_FontMap {
 
  private:
   CPDF_Document* m_pPDFDoc;
-  IFX_SystemHandler* m_pSystemHandler;
+  CFX_SystemHandler* m_pSystemHandler;
 };
 
 class CPWL_DocFontMap : public CPWL_FontMap {
  public:
-  CPWL_DocFontMap(IFX_SystemHandler* pSystemHandler,
+  CPWL_DocFontMap(CFX_SystemHandler* pSystemHandler,
                   CPDF_Document* pAttachedDoc);
   ~CPWL_DocFontMap() override;
 
diff --git a/fpdfsdk/pdfwindow/PWL_Label.cpp b/fpdfsdk/pdfwindow/PWL_Label.cpp
index 1375678cfb..9cb9791444 100644
--- a/fpdfsdk/pdfwindow/PWL_Label.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Label.cpp
@@ -96,7 +96,7 @@ void CPWL_Label::DrawThisAppearance(CFX_RenderDevice* pDevice,
     rcClip = GetClientRect();
     pRange = &wrRange;
   }
-  IFX_SystemHandler* pSysHandler = GetSystemHandler();
+  CFX_SystemHandler* pSysHandler = GetSystemHandler();
   IFX_Edit::DrawEdit(
       pDevice, pUser2Device, m_pEdit,
       CPWL_Utils::PWLColorToFXColor(GetTextColor(), GetTransparency()),
diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
index d32e7c937c..86f3b8f24a 100644
--- a/fpdfsdk/pdfwindow/PWL_ListBox.cpp
+++ b/fpdfsdk/pdfwindow/PWL_ListBox.cpp
@@ -181,7 +181,7 @@ void CPWL_ListBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
       }
 
       if (m_pList->IsItemSelected(i)) {
-        IFX_SystemHandler* pSysHandler = GetSystemHandler();
+        CFX_SystemHandler* pSysHandler = GetSystemHandler();
         if (pSysHandler && pSysHandler->IsSelectionImplemented()) {
           IFX_Edit::DrawEdit(
               pDevice, pUser2Device, m_pList->GetItemEdit(i),
@@ -197,7 +197,7 @@ void CPWL_ListBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
                              ptOffset, NULL, pSysHandler, m_pFormFiller);
         }
       } else {
-        IFX_SystemHandler* pSysHandler = GetSystemHandler();
+        CFX_SystemHandler* pSysHandler = GetSystemHandler();
         IFX_Edit::DrawEdit(pDevice, pUser2Device, m_pList->GetItemEdit(i),
                            CPWL_Utils::PWLColorToFXColor(GetTextColor()),
                            CPWL_Utils::PWLColorToFXColor(GetTextStrokeColor()),
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
index 538651797e..8883ceb574 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.cpp
@@ -17,7 +17,7 @@ static std::map<int32_t, CPWL_Timer*>& GetPWLTimeMap() {
 }
 
 CPWL_Timer::CPWL_Timer(CPWL_TimerHandler* pAttached,
-                       IFX_SystemHandler* pSystemHandler)
+                       CFX_SystemHandler* pSystemHandler)
     : m_nTimerID(0), m_pAttached(pAttached), m_pSystemHandler(pSystemHandler) {
   ASSERT(m_pAttached);
   ASSERT(m_pSystemHandler);
@@ -398,7 +398,7 @@ void CPWL_Wnd::InvalidateRect(CFX_FloatRect* pRect) {
     rcWin.right += PWL_INVALIDATE_INFLATE;
     rcWin.bottom += PWL_INVALIDATE_INFLATE;
 
-    if (IFX_SystemHandler* pSH = GetSystemHandler()) {
+    if (CFX_SystemHandler* pSH = GetSystemHandler()) {
       if (FX_HWND hWnd = GetAttachedHWnd()) {
         pSH->InvalidateRect(hWnd, rcWin);
       }
@@ -744,7 +744,7 @@ void CPWL_Wnd::CreateChildWnd(const PWL_CREATEPARAM& cp) {}
 
 void CPWL_Wnd::SetCursor() {
   if (IsValid()) {
-    if (IFX_SystemHandler* pSH = GetSystemHandler()) {
+    if (CFX_SystemHandler* pSH = GetSystemHandler()) {
       int32_t nCursorType = GetCreationParam().eCursorType;
       pSH->SetCursor(nCursorType);
     }
@@ -803,7 +803,7 @@ void CPWL_Wnd::SetFontSize(FX_FLOAT fFontSize) {
   m_sPrivateParam.fFontSize = fFontSize;
 }
 
-IFX_SystemHandler* CPWL_Wnd::GetSystemHandler() const {
+CFX_SystemHandler* CPWL_Wnd::GetSystemHandler() const {
   return m_sPrivateParam.pSystemHandler;
 }
 
@@ -1007,7 +1007,7 @@ void CPWL_Wnd::OnEnabled() {}
 void CPWL_Wnd::OnDisabled() {}
 
 FX_BOOL CPWL_Wnd::IsCTRLpressed(uint32_t nFlag) const {
-  if (IFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
+  if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
     return pSystemHandler->IsCTRLKeyDown(nFlag);
   }
 
@@ -1015,7 +1015,7 @@ FX_BOOL CPWL_Wnd::IsCTRLpressed(uint32_t nFlag) const {
 }
 
 FX_BOOL CPWL_Wnd::IsSHIFTpressed(uint32_t nFlag) const {
-  if (IFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
+  if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
     return pSystemHandler->IsSHIFTKeyDown(nFlag);
   }
 
@@ -1023,7 +1023,7 @@ FX_BOOL CPWL_Wnd::IsSHIFTpressed(uint32_t nFlag) const {
 }
 
 FX_BOOL CPWL_Wnd::IsALTpressed(uint32_t nFlag) const {
-  if (IFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
+  if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
     return pSystemHandler->IsALTKeyDown(nFlag);
   }
 
@@ -1031,7 +1031,7 @@ FX_BOOL CPWL_Wnd::IsALTpressed(uint32_t nFlag) const {
 }
 
 FX_BOOL CPWL_Wnd::IsINSERTpressed(uint32_t nFlag) const {
-  if (IFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
+  if (CFX_SystemHandler* pSystemHandler = GetSystemHandler()) {
     return pSystemHandler->IsINSERTKeyDown(nFlag);
   }
 
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h
index b9448c4362..dec3f9f252 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.h
@@ -11,15 +11,15 @@
 
 #include "core/fpdfdoc/include/fpdf_doc.h"
 #include "core/fxcrt/include/fx_basic.h"
-#include "fpdfsdk/include/fx_systemhandler.h"
+#include "fpdfsdk/cfx_systemhandler.h"
 
 class CPWL_MsgControl;
 class CPWL_ScrollBar;
 class CPWL_Timer;
 class CPWL_TimerHandler;
 class CPWL_Wnd;
+class CFX_SystemHandler;
 class IPVT_FontMap;
-class IFX_SystemHandler;
 class IPWL_Provider;
 
 // window styles
@@ -218,7 +218,7 @@ struct PWL_CREATEPARAM {
         mtChild(1, 0, 0, 1, 0, 0) {}
 
   CFX_FloatRect rcRectWnd;            // required
-  IFX_SystemHandler* pSystemHandler;  // required
+  CFX_SystemHandler* pSystemHandler;  // required
   IPVT_FontMap* pFontMap;             // required for text window
   IPWL_Provider* pProvider;           // required for self coordinate
   IPWL_FocusHandler* pFocusHandler;   // optional
@@ -242,7 +242,7 @@ struct PWL_CREATEPARAM {
 
 class CPWL_Timer {
  public:
-  CPWL_Timer(CPWL_TimerHandler* pAttached, IFX_SystemHandler* pSystemHandler);
+  CPWL_Timer(CPWL_TimerHandler* pAttached, CFX_SystemHandler* pSystemHandler);
   virtual ~CPWL_Timer();
 
   int32_t SetPWLTimer(int32_t nElapse);
@@ -252,7 +252,7 @@ class CPWL_Timer {
  private:
   int32_t m_nTimerID;
   CPWL_TimerHandler* m_pAttached;
-  IFX_SystemHandler* m_pSystemHandler;
+  CFX_SystemHandler* m_pSystemHandler;
 };
 
 class CPWL_TimerHandler {
@@ -263,7 +263,7 @@ class CPWL_TimerHandler {
   void BeginTimer(int32_t nElapse);
   void EndTimer();
   virtual void TimerProc();
-  virtual IFX_SystemHandler* GetSystemHandler() const = 0;
+  virtual CFX_SystemHandler* GetSystemHandler() const = 0;
 
  private:
   CPWL_Timer* m_pTimer;
@@ -382,7 +382,7 @@ class CPWL_Wnd : public CPWL_TimerHandler {
 
  protected:
   // CPWL_TimerHandler
-  IFX_SystemHandler* GetSystemHandler() const override;
+  CFX_SystemHandler* GetSystemHandler() const override;
 
   virtual void CreateChildWnd(const PWL_CREATEPARAM& cp);
   virtual void RePosChildWnd();