Index: xfa/fwl/basewidget/fwl_spinbuttonimp.h |
diff --git a/xfa/fwl/basewidget/fwl_spinbuttonimp.h b/xfa/fwl/basewidget/fwl_spinbuttonimp.h |
index 3f9dc77c4e4cbbfa8be305d1e81b8d5e8e792db8..f3434c9823af5fd2bd55841295d612b8e9f31625 100644 |
--- a/xfa/fwl/basewidget/fwl_spinbuttonimp.h |
+++ b/xfa/fwl/basewidget/fwl_spinbuttonimp.h |
@@ -19,27 +19,35 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer { |
public: |
CFWL_SpinButtonImp(const CFWL_WidgetImpProperties& properties, |
IFWL_Widget* pOuter); |
- ~CFWL_SpinButtonImp(); |
- virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const; |
- virtual uint32_t GetClassID() const; |
- virtual FWL_ERR Initialize(); |
- virtual FWL_ERR Finalize(); |
- virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); |
- virtual FWL_ERR Update(); |
- virtual FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy); |
- virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics, |
- const CFX_Matrix* pMatrix = NULL); |
- virtual int32_t Run(FWL_HTIMER hTimer); |
+ ~CFWL_SpinButtonImp() override; |
+ |
+ // CFWL_WidgetImp |
+ FWL_ERR GetClassName(CFX_WideString& wsClass) const override; |
+ FWL_Type GetClassID() const override { return FWL_Type::SpinButton; } |
+ FWL_ERR Initialize() override; |
+ FWL_ERR Finalize() override; |
+ FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; |
+ FWL_ERR Update() override; |
+ FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy) override; |
+ FWL_ERR DrawWidget(CFX_Graphics* pGraphics, |
+ const CFX_Matrix* pMatrix = nullptr) override; |
+ |
+ // IFWL_Timer |
+ int32_t Run(FWL_HTIMER hTimer) override; |
+ |
FWL_ERR EnableButton(FX_BOOL bEnable, FX_BOOL bUp = TRUE); |
FX_BOOL IsButtonEnable(FX_BOOL bUp = TRUE); |
protected: |
+ friend class CFWL_SpinButtonImpDelegate; |
+ |
void DrawUpButton(CFX_Graphics* pGraphics, |
IFWL_ThemeProvider* pTheme, |
const CFX_Matrix* pMatrix); |
void DrawDownButton(CFX_Graphics* pGraphics, |
IFWL_ThemeProvider* pTheme, |
const CFX_Matrix* pMatrix); |
+ |
CFX_RectF m_rtClient; |
CFX_RectF m_rtUpButton; |
CFX_RectF m_rtDnButton; |
@@ -48,7 +56,6 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer { |
int32_t m_iButtonIndex; |
FX_BOOL m_bLButtonDwn; |
FWL_HTIMER m_hTimer; |
- friend class CFWL_SpinButtonImpDelegate; |
}; |
class CFWL_SpinButtonImpDelegate : public CFWL_WidgetImpDelegate { |
public: |