diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-02-26 13:09:42 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-02-26 13:09:42 -0800 |
| commit | 3b8fdd34bdf57ec45291b77008a43249f838efcb (patch) | |
| tree | b65090a7c1fbedcda6499c3be4ffcaf8453e9e11 /fpdfsdk/include/pdfwindow/PWL_ComboBox.h | |
| parent | 8ba5b59356d506d3b9e976e7422e69bbd5bec8d6 (diff) | |
| download | pdfium-3b8fdd34bdf57ec45291b77008a43249f838efcb.tar.xz | |
Replace CPDF_Rect and CPDF_Point with CFX types.
Too many rectangle types. Remove CPDF_Rect #define, and
make an equivalent point type in CFX, but stop short of
consolidating the N different forms of rectangles in CFX.
Also banish PDF_ClipFloat to the one .cpp file that needs it,
since it was in the vicinity of the .h file changes.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1740923003 .
Diffstat (limited to 'fpdfsdk/include/pdfwindow/PWL_ComboBox.h')
| -rw-r--r-- | fpdfsdk/include/pdfwindow/PWL_ComboBox.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h index a6f6a7b591..e5383009b9 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h @@ -23,7 +23,7 @@ class CPWL_CBListBox : public CPWL_ListBox { ~CPWL_CBListBox() override {} // CPWL_ListBox - FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; + FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override; FX_BOOL OnKeyDownWithExit(FX_WORD nChar, FX_BOOL& bExit, FX_DWORD nFlag); FX_BOOL OnCharWithExit(FX_WORD nChar, FX_BOOL& bExit, FX_DWORD nFlag); @@ -40,8 +40,8 @@ class CPWL_CBButton : public CPWL_Wnd { void GetThisAppearanceStream(CFX_ByteTextBuf& sAppStream) override; void DrawThisAppearance(CFX_RenderDevice* pDevice, CFX_Matrix* pUser2Device) override; - FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag) override; - FX_BOOL OnLButtonUp(const CPDF_Point& point, FX_DWORD nFlag) override; + FX_BOOL OnLButtonDown(const CFX_FloatPoint& point, FX_DWORD nFlag) override; + FX_BOOL OnLButtonUp(const CFX_FloatPoint& point, FX_DWORD nFlag) override; }; class CPWL_ComboBox : public CPWL_Wnd { @@ -62,7 +62,7 @@ class CPWL_ComboBox : public CPWL_Wnd { intptr_t lParam = 0) override; void CreateChildWnd(const PWL_CREATEPARAM& cp) override; void RePosChildWnd() override; - CPDF_Rect GetFocusRect() const override; + CFX_FloatRect GetFocusRect() const override; void SetFocus() override; void KillFocus() override; @@ -95,7 +95,7 @@ class CPWL_ComboBox : public CPWL_Wnd { CPWL_CBButton* m_pButton; CPWL_CBListBox* m_pList; FX_BOOL m_bPopup; - CPDF_Rect m_rcOldWindow; + CFX_FloatRect m_rcOldWindow; int32_t m_nPopupWhere; int32_t m_nSelectItem; IPWL_Filler_Notify* m_pFillerNotify; |