| Index: xfa/fwl/core/fwl_formimp.h
|
| diff --git a/xfa/fwl/core/fwl_formimp.h b/xfa/fwl/core/fwl_formimp.h
|
| index 1f2d6951c0f47efb7b9822412b37e6a8f0901b29..7278afb6811271cb53571db9dd014bf3fb7fa64a 100644
|
| --- a/xfa/fwl/core/fwl_formimp.h
|
| +++ b/xfa/fwl/core/fwl_formimp.h
|
| @@ -27,35 +27,15 @@ class CFWL_FormImpDelegate;
|
|
|
| class CFWL_SysBtn {
|
| public:
|
| - CFWL_SysBtn() {
|
| - m_rtBtn.Set(0, 0, 0, 0);
|
| - m_dwState = 0;
|
| - }
|
| -
|
| - bool IsDisabled() { return !!(m_dwState & FWL_SYSBUTTONSTATE_Disabled); }
|
| -
|
| - void SetNormal() { m_dwState &= 0xFFF0; }
|
| - void SetPressed() {
|
| - SetNormal();
|
| - m_dwState |= FWL_SYSBUTTONSTATE_Pressed;
|
| - }
|
| - void SetHover() {
|
| - SetNormal();
|
| - m_dwState |= FWL_SYSBUTTONSTATE_Hover;
|
| - }
|
| - void SetDisabled(FX_BOOL bDisabled) {
|
| - bDisabled ? m_dwState |= FWL_SYSBUTTONSTATE_Disabled
|
| - : m_dwState &= ~FWL_SYSBUTTONSTATE_Disabled;
|
| - }
|
| - uint32_t GetPartState() {
|
| - if (IsDisabled())
|
| - return CFWL_PartState_Disabled;
|
| - if (m_dwState & FWL_SYSBUTTONSTATE_Pressed)
|
| - return CFWL_PartState_Pressed;
|
| - if (m_dwState & FWL_SYSBUTTONSTATE_Hover)
|
| - return CFWL_PartState_Hovered;
|
| - return CFWL_PartState_Normal;
|
| - }
|
| + CFWL_SysBtn();
|
| +
|
| + bool IsDisabled() const;
|
| + uint32_t GetPartState() const;
|
| +
|
| + void SetNormal();
|
| + void SetPressed();
|
| + void SetHover();
|
| + void SetDisabled(FX_BOOL bDisabled);
|
|
|
| CFX_RectF m_rtBtn;
|
| uint32_t m_dwState;
|
| @@ -67,6 +47,9 @@ enum FORM_RESIZETYPE {
|
| };
|
|
|
| typedef struct RestoreResizeInfo {
|
| + RestoreResizeInfo();
|
| + ~RestoreResizeInfo();
|
| +
|
| CFX_PointF m_ptStart;
|
| CFX_SizeF m_szStart;
|
| } RestoreInfo;
|
|
|