| Index: xfa/fwl/basewidget/fwl_caretimp.h
|
| diff --git a/xfa/fwl/basewidget/fwl_caretimp.h b/xfa/fwl/basewidget/fwl_caretimp.h
|
| index c579beeed3804dca9a7f820d8a464e5f458c2805..b1ebcfa1847f29e1d91356ef01c9eb300c0c6aed 100644
|
| --- a/xfa/fwl/basewidget/fwl_caretimp.h
|
| +++ b/xfa/fwl/basewidget/fwl_caretimp.h
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "xfa/fwl/core/fwl_widgetimp.h"
|
| #include "xfa/fwl/core/ifwl_timer.h"
|
| +#include "xfa/fwl/core/ifwl_widget.h"
|
| #include "xfa/fxgraphics/cfx_color.h"
|
|
|
| class CFWL_WidgetImpProperties;
|
| @@ -19,26 +20,25 @@ class CFWL_CaretImp : public CFWL_WidgetImp {
|
| public:
|
| CFWL_CaretImp(const CFWL_WidgetImpProperties& properties,
|
| IFWL_Widget* pOuter);
|
| - virtual ~CFWL_CaretImp();
|
| + ~CFWL_CaretImp() override;
|
|
|
| - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const;
|
| - virtual uint32_t GetClassID() const;
|
| + // CFWL_WidgetImp
|
| + FWL_Error GetClassName(CFX_WideString& wsClass) const override;
|
| + FWL_Type GetClassID() const override;
|
| + FWL_Error Initialize() override;
|
| + FWL_Error Finalize() override;
|
| + FWL_Error DrawWidget(CFX_Graphics* pGraphics,
|
| + const CFX_Matrix* pMatrix = nullptr) override;
|
|
|
| - virtual FWL_Error Initialize();
|
| - virtual FWL_Error Finalize();
|
| -
|
| - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics,
|
| - const CFX_Matrix* pMatrix = NULL);
|
| -
|
| - virtual void ShowCaret(FX_BOOL bFlag = TRUE);
|
| - virtual FWL_Error GetFrequency(uint32_t& elapse);
|
| - virtual FWL_Error SetFrequency(uint32_t elapse);
|
| - virtual FWL_Error SetColor(CFX_Color crFill);
|
| + void ShowCaret(FX_BOOL bFlag = TRUE);
|
| + FWL_Error GetFrequency(uint32_t& elapse);
|
| + FWL_Error SetFrequency(uint32_t elapse);
|
| + FWL_Error SetColor(CFX_Color crFill);
|
|
|
| protected:
|
| - void DrawCaretBK(CFX_Graphics* pGraphics,
|
| - IFWL_ThemeProvider* pTheme,
|
| - const CFX_Matrix* pMatrix);
|
| + friend class CFWL_CaretImpDelegate;
|
| + friend class CFWL_CaretTimer;
|
| +
|
| class CFWL_CaretTimer : public IFWL_Timer {
|
| public:
|
| explicit CFWL_CaretTimer(CFWL_CaretImp* pCaret);
|
| @@ -46,14 +46,18 @@ class CFWL_CaretImp : public CFWL_WidgetImp {
|
| int32_t Run(FWL_HTIMER hTimer) override;
|
| CFWL_CaretImp* const m_pCaret;
|
| };
|
| +
|
| + void DrawCaretBK(CFX_Graphics* pGraphics,
|
| + IFWL_ThemeProvider* pTheme,
|
| + const CFX_Matrix* pMatrix);
|
| +
|
| CFWL_CaretTimer* m_pTimer;
|
| FWL_HTIMER m_hTimer;
|
| uint32_t m_dwElapse;
|
| CFX_Color m_crFill;
|
| FX_BOOL m_bSetColor;
|
| - friend class CFWL_CaretImpDelegate;
|
| - friend class CFWL_CaretTimer;
|
| };
|
| +
|
| class CFWL_CaretImpDelegate : public CFWL_WidgetImpDelegate {
|
| public:
|
| CFWL_CaretImpDelegate(CFWL_CaretImp* pOwner);
|
|
|