Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1430)

Unified Diff: xfa/fwl/basewidget/fwl_pushbuttonimp.h

Issue 1946213003: Remove CLASSHASH defines in favour of an enum class. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: xfa/fwl/basewidget/fwl_pushbuttonimp.h
diff --git a/xfa/fwl/basewidget/fwl_pushbuttonimp.h b/xfa/fwl/basewidget/fwl_pushbuttonimp.h
index be6941249cbdff4af200918d96058801bf54dad1..4479423e66c1a7f4ff31dd806d767b35765726c4 100644
--- a/xfa/fwl/basewidget/fwl_pushbuttonimp.h
+++ b/xfa/fwl/basewidget/fwl_pushbuttonimp.h
@@ -8,6 +8,7 @@
#define XFA_FWL_BASEWIDGET_FWL_PUSHBUTTONIMP_H_
#include "xfa/fwl/core/fwl_widgetimp.h"
+#include "xfa/fwl/core/ifwl_widget.h"
class CFWL_MsgMouse;
class CFWL_WidgetImpProperties;
@@ -18,18 +19,22 @@ class CFWL_PushButtonImp : public CFWL_WidgetImp {
public:
CFWL_PushButtonImp(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter);
- virtual ~CFWL_PushButtonImp();
- 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 SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE);
- virtual FWL_ERR Update();
- virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
- const CFX_Matrix* pMatrix = NULL);
+ ~CFWL_PushButtonImp() override;
+
+ // CFWL_WidgetImp
+ FWL_ERR GetClassName(CFX_WideString& wsClass) const override;
+ FWL_Type GetClassID() const override { return FWL_Type::PushButton; }
+ FWL_ERR Initialize() override;
+ FWL_ERR Finalize() override;
+ FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override;
+ FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE) override;
+ FWL_ERR Update() override;
+ FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
+ const CFX_Matrix* pMatrix = nullptr) override;
protected:
+ friend class CFWL_PushButtonImpDelegate;
+
void DrawBkground(CFX_Graphics* pGraphics,
IFWL_ThemeProvider* pTheme,
const CFX_Matrix* pMatrix);
@@ -38,12 +43,12 @@ class CFWL_PushButtonImp : public CFWL_WidgetImp {
const CFX_Matrix* pMatrix);
uint32_t GetPartStates();
void UpdateTextOutStyles();
+
CFX_RectF m_rtClient;
CFX_RectF m_rtCaption;
FX_BOOL m_bBtnDown;
uint32_t m_dwTTOStyles;
int32_t m_iTTOAlign;
- friend class CFWL_PushButtonImpDelegate;
};
class CFWL_PushButtonImpDelegate : public CFWL_WidgetImpDelegate {

Powered by Google App Engine
This is Rietveld 408576698