Revert "Replace CPDF_Rect and CPDF_Point with CFX types."

fpdfsdk/src/pdfwindow/PWL_ListBox.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "fpdfsdk/include/pdfwindow/PWL_ListBox.h"
 
 #include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
 #include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
@@ skipping 42 matching lines @@
         m_pList->RePosChildWnd();
       }
     }
   }
 }
 
 void CPWL_List_Notify::IOnSetScrollPosY(FX_FLOAT fy) {
   m_pList->OnNotify(m_pList, PNM_SETSCROLLPOS, SBT_VSCROLL, (intptr_t)&fy);
 }
 
-void CPWL_List_Notify::IOnInvalidateRect(CFX_FloatRect* pRect) {
+void CPWL_List_Notify::IOnInvalidateRect(CPDF_Rect* pRect) {
   m_pList->InvalidateRect(pRect);
 }
 
 CPWL_ListBox::CPWL_ListBox()
     : m_pList(NULL),
       m_pListNotify(NULL),
       m_bMouseDown(FALSE),
       m_bHoverSel(FALSE),
       m_pFillerNotify(NULL) {
   m_pList = IFX_List::NewList();
@@ skipping 28 matching lines @@
   delete m_pListNotify;
   m_pListNotify = NULL;
 }
 
 void CPWL_ListBox::GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) {
   CPWL_Wnd::GetThisAppearanceStream(sAppStream);
 
   CFX_ByteTextBuf sListItems;
 
   if (m_pList) {
-    CFX_FloatRect rcPlate = m_pList->GetPlateRect();
+    CPDF_Rect rcPlate = m_pList->GetPlateRect();
     for (int32_t i = 0, sz = m_pList->GetCount(); i < sz; i++) {
-      CFX_FloatRect rcItem = m_pList->GetItemRect(i);
+      CPDF_Rect rcItem = m_pList->GetItemRect(i);
 
       if (rcItem.bottom > rcPlate.top || rcItem.top < rcPlate.bottom)
         continue;
 
-      CFX_FloatPoint ptOffset(rcItem.left, (rcItem.top + rcItem.bottom) * 0.5f);
+      CPDF_Point ptOffset(rcItem.left, (rcItem.top + rcItem.bottom) * 0.5f);
       if (m_pList->IsItemSelected(i)) {
         sListItems << CPWL_Utils::GetRectFillAppStream(
             rcItem, PWL_DEFAULT_SELBACKCOLOR);
         CFX_ByteString sItem =
             CPWL_Utils::GetEditAppStream(m_pList->GetItemEdit(i), ptOffset);
         if (sItem.GetLength() > 0) {
           sListItems << "BT\n"
                      << CPWL_Utils::GetColorAppStream(PWL_DEFAULT_SELTEXTCOLOR)
                      << sItem << "ET\n";
         }
       } else {
         CFX_ByteString sItem =
             CPWL_Utils::GetEditAppStream(m_pList->GetItemEdit(i), ptOffset);
         if (sItem.GetLength() > 0) {
           sListItems << "BT\n" << CPWL_Utils::GetColorAppStream(GetTextColor())
                      << sItem << "ET\n";
         }
       }
     }
   }
 
   if (sListItems.GetLength() > 0) {
     CFX_ByteTextBuf sClip;
-    CFX_FloatRect rcClient = GetClientRect();
+    CPDF_Rect rcClient = GetClientRect();
 
     sClip << "q\n";
     sClip << rcClient.left << " " << rcClient.bottom << " "
           << rcClient.right - rcClient.left << " "
           << rcClient.top - rcClient.bottom << " re W n\n";
 
     sClip << sListItems << "Q\n";
 
     sAppStream << "/Tx BMC\n" << sClip << "EMC\n";
   }
 }
 
 void CPWL_ListBox::DrawThisAppearance(CFX_RenderDevice* pDevice,
                                       CFX_Matrix* pUser2Device) {
   CPWL_Wnd::DrawThisAppearance(pDevice, pUser2Device);
 
   if (m_pList) {
-    CFX_FloatRect rcPlate = m_pList->GetPlateRect();
-    CFX_FloatRect rcList = GetListRect();
-    CFX_FloatRect rcClient = GetClientRect();
+    CPDF_Rect rcPlate = m_pList->GetPlateRect();
+    CPDF_Rect rcList = GetListRect();
+    CPDF_Rect rcClient = GetClientRect();
 
     for (int32_t i = 0, sz = m_pList->GetCount(); i < sz; i++) {
-      CFX_FloatRect rcItem = m_pList->GetItemRect(i);
+      CPDF_Rect rcItem = m_pList->GetItemRect(i);
       if (rcItem.bottom > rcPlate.top || rcItem.top < rcPlate.bottom)
         continue;
 
-      CFX_FloatPoint ptOffset(rcItem.left, (rcItem.top + rcItem.bottom) * 0.5f);
+      CPDF_Point ptOffset(rcItem.left, (rcItem.top + rcItem.bottom) * 0.5f);
       if (IFX_Edit* pEdit = m_pList->GetItemEdit(i)) {
-        CFX_FloatRect rcContent = pEdit->GetContentRect();
+        CPDF_Rect rcContent = pEdit->GetContentRect();
         if (rcContent.Width() > rcClient.Width())
           rcItem.Intersect(rcList);
         else
           rcItem.Intersect(rcClient);
       }
 
       if (m_pList->IsItemSelected(i)) {
         IFX_SystemHandler* pSysHandler = GetSystemHandler();
         if (pSysHandler && pSysHandler->IsSelectionImplemented()) {
           IFX_Edit::DrawEdit(
@@ skipping 75 matching lines @@
 
   if (!m_pList->OnChar(nChar, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag)))
     return FALSE;
 
   FX_BOOL bExit = FALSE;
   OnNotifySelChanged(TRUE, bExit, nFlag);
 
   return TRUE;
 }
 
-FX_BOOL CPWL_ListBox::OnLButtonDown(const CFX_FloatPoint& point,
-                                    FX_DWORD nFlag) {
+FX_BOOL CPWL_ListBox::OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnLButtonDown(point, nFlag);
 
   if (ClientHitTest(point)) {
     m_bMouseDown = TRUE;
     SetFocus();
     SetCapture();
 
     if (m_pList)
       m_pList->OnMouseDown(point, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
   }
 
   return TRUE;
 }
 
-FX_BOOL CPWL_ListBox::OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_ListBox::OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnLButtonUp(point, nFlag);
 
   if (m_bMouseDown) {
     ReleaseCapture();
     m_bMouseDown = FALSE;
   }
 
   FX_BOOL bExit = FALSE;
   OnNotifySelChanged(FALSE, bExit, nFlag);
 
   return TRUE;
 }
 
 void CPWL_ListBox::SetHoverSel(FX_BOOL bHoverSel) {
   m_bHoverSel = bHoverSel;
 }
 
-FX_BOOL CPWL_ListBox::OnMouseMove(const CFX_FloatPoint& point, FX_DWORD nFlag) {
+FX_BOOL CPWL_ListBox::OnMouseMove(const CPDF_Point& point, FX_DWORD nFlag) {
   CPWL_Wnd::OnMouseMove(point, nFlag);
 
   if (m_bHoverSel && !IsCaptureMouse() && ClientHitTest(point)) {
     if (m_pList)
       m_pList->Select(m_pList->GetItemIndex(point));
   }
 
   if (m_bMouseDown) {
     if (m_pList)
       m_pList->OnMouseMove(point, IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
@@ skipping 27 matching lines @@
             pChild->OnNotify(pWnd, PNM_SETSCROLLPOS, wParam, lParam);
           }
           break;
       }
       break;
     case PNM_SCROLLWINDOW:
       fPos = *(FX_FLOAT*)lParam;
       switch (wParam) {
         case SBT_VSCROLL:
           if (m_pList)
-            m_pList->SetScrollPos(CFX_FloatPoint(0, fPos));
+            m_pList->SetScrollPos(CPDF_Point(0, fPos));
           break;
       }
       break;
   }
 }
 
 void CPWL_ListBox::KillFocus() {
   CPWL_Wnd::KillFocus();
 }
 
@@ skipping 13 matching lines @@
   FX_BOOL bRC = TRUE;
   CFX_WideString swChange = GetText();
   CFX_WideString strChangeEx;
   int nSelStart = 0;
   int nSelEnd = swChange.GetLength();
   m_pFillerNotify->OnBeforeKeyStroke(GetAttachedData(), swChange, strChangeEx,
                                      nSelStart, nSelEnd, bKeyDown, bRC, bExit,
                                      nFlag);
 }
 
-CFX_FloatRect CPWL_ListBox::GetFocusRect() const {
+CPDF_Rect CPWL_ListBox::GetFocusRect() const {
   if (m_pList && m_pList->IsMultipleSel()) {
-    CFX_FloatRect rcCaret = m_pList->GetItemRect(m_pList->GetCaret());
+    CPDF_Rect rcCaret = m_pList->GetItemRect(m_pList->GetCaret());
     rcCaret.Intersect(GetClientRect());
     return rcCaret;
   }
 
   return CPWL_Wnd::GetFocusRect();
 }
 
 void CPWL_ListBox::AddString(const FX_WCHAR* string) {
   if (m_pList) {
     m_pList->AddString(string);
@@ skipping 92 matching lines @@
   return 0;
 }
 
 int32_t CPWL_ListBox::FindNext(int32_t nIndex, FX_WCHAR nChar) const {
   if (m_pList)
     return m_pList->FindNext(nIndex, nChar);
 
   return nIndex;
 }
 
-CFX_FloatRect CPWL_ListBox::GetContentRect() const {
+CPDF_Rect CPWL_ListBox::GetContentRect() const {
   if (m_pList)
     return m_pList->GetContentRect();
 
-  return CFX_FloatRect();
+  return CPDF_Rect();
 }
 
 FX_FLOAT CPWL_ListBox::GetFirstHeight() const {
   if (m_pList)
     return m_pList->GetFirstHeight();
 
   return 0.0f;
 }
 
-CFX_FloatRect CPWL_ListBox::GetListRect() const {
+CPDF_Rect CPWL_ListBox::GetListRect() const {
   return CPWL_Utils::DeflateRect(
       GetWindowRect(), (FX_FLOAT)(GetBorderWidth() + GetInnerBorderWidth()));
 }
 
 FX_BOOL CPWL_ListBox::OnMouseWheel(short zDelta,
-                                   const CFX_FloatPoint& point,
+                                   const CPDF_Point& point,
                                    FX_DWORD nFlag) {
   if (!m_pList)
     return FALSE;
 
   if (zDelta < 0) {
     m_pList->OnVK_DOWN(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
   } else {
     m_pList->OnVK_UP(IsSHIFTpressed(nFlag), IsCTRLpressed(nFlag));
   }
 
   FX_BOOL bExit = FALSE;
   OnNotifySelChanged(FALSE, bExit, nFlag);
   return TRUE;
 }