Index: xfa/fwl/lightwidget/cfwl_picturebox.h |
diff --git a/xfa/fwl/lightwidget/cfwl_picturebox.h b/xfa/fwl/lightwidget/cfwl_picturebox.h |
index 8fa985acd897d8fc1ec4f70711bbf5b76eb8b7bb..8b0b13de24cc52780dec3b748919a3183d36f4e5 100644 |
--- a/xfa/fwl/lightwidget/cfwl_picturebox.h |
+++ b/xfa/fwl/lightwidget/cfwl_picturebox.h |
@@ -14,19 +14,19 @@ |
class CFWL_PictureBox : public CFWL_Widget { |
public: |
static CFWL_PictureBox* Create(); |
- FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL); |
+ FWL_Error Initialize(const CFWL_WidgetProperties* pProperties = NULL); |
CFX_DIBitmap* GetPicture(); |
- FWL_ERR SetPicture(CFX_DIBitmap* pBitmap); |
+ FWL_Error SetPicture(CFX_DIBitmap* pBitmap); |
FX_FLOAT GetRotation(); |
- FWL_ERR SetRotation(FX_FLOAT fRotation); |
+ FWL_Error SetRotation(FX_FLOAT fRotation); |
int32_t GetFlipMode(); |
- FWL_ERR SetFlipMode(int32_t iFlipMode); |
+ FWL_Error SetFlipMode(int32_t iFlipMode); |
int32_t GetOpacity(); |
- FWL_ERR SetOpacity(int32_t iOpacity); |
- FWL_ERR GetScale(FX_FLOAT& fScaleX, FX_FLOAT& fScaleY); |
- FWL_ERR SetScale(FX_FLOAT fScaleX, FX_FLOAT fScaleY); |
- FWL_ERR GetOffset(FX_FLOAT& fx, FX_FLOAT& fy); |
- FWL_ERR SetOffset(FX_FLOAT fx, FX_FLOAT fy); |
+ FWL_Error SetOpacity(int32_t iOpacity); |
+ FWL_Error GetScale(FX_FLOAT& fScaleX, FX_FLOAT& fScaleY); |
+ FWL_Error SetScale(FX_FLOAT fScaleX, FX_FLOAT fScaleY); |
+ FWL_Error GetOffset(FX_FLOAT& fx, FX_FLOAT& fy); |
+ FWL_Error SetOffset(FX_FLOAT fx, FX_FLOAT fy); |
CFWL_PictureBox(); |
virtual ~CFWL_PictureBox(); |
@@ -41,13 +41,14 @@ class CFWL_PictureBox : public CFWL_Widget { |
m_fOffSetY = 0.0f; |
m_pBitmap = NULL; |
} |
- virtual FWL_ERR GetCaption(IFWL_Widget* pWidget, CFX_WideString& wsCaption); |
+ virtual FWL_Error GetCaption(IFWL_Widget* pWidget, |
+ CFX_WideString& wsCaption); |
virtual CFX_DIBitmap* GetPicture(IFWL_Widget* pWidget); |
virtual CFX_DIBitmap* GetErrorPicture(IFWL_Widget* pWidget); |
virtual CFX_DIBitmap* GetInitialPicture(IFWL_Widget* pWidget); |
virtual int32_t GetOpacity(IFWL_Widget* pWidget); |
virtual int32_t GetFlipMode(IFWL_Widget* pWidget); |
- virtual FWL_ERR GetMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix); |
+ virtual FWL_Error GetMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix); |
CFX_DIBitmap* m_pBitmap; |
int32_t m_iOpacity; |
int32_t m_iFlipMode; |