diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-17 15:15:41 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-17 15:15:41 -0800 |
| commit | b8a51e2c5b476d0db5b75799911f0c8626012e9c (patch) | |
| tree | 070a128be38b2d846c51e16dc514d10e686fb172 /xfa | |
| parent | 10cfea1fdafc8fcf1edd60bc783e9db9ef6229c0 (diff) | |
| download | pdfium-b8a51e2c5b476d0db5b75799911f0c8626012e9c.tar.xz | |
Make FWL_ classes more consistently named.
Rename IFWL_Target::m_pData to m_pImpl since it points
to CFWL_*Imp classes.
Rename CFWL_Widget:m_pImp to m_pIface since it points
to IFWL_* interface classes. Here, the concrete classes
have pointers to the corresponding interfaces, rather
than inheriting from them, and this is likely due to
someone not understanding virtual inheritance (since this
code has the diamond problem in spades).
Rename CFWL_Target to CWFL_TargetImp since it is the root
of the CFWL_*Imp hierarchy, and is pointed to by the
m_pImpl slot.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1446393002 .
Diffstat (limited to 'xfa')
43 files changed, 819 insertions, 798 deletions
diff --git a/xfa/include/fwl/core/fwl_target.h b/xfa/include/fwl/core/fwl_target.h index facd28fb70..25c8a33c90 100644 --- a/xfa/include/fwl/core/fwl_target.h +++ b/xfa/include/fwl/core/fwl_target.h @@ -4,9 +4,28 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FWL_TARGET_H
-#define _FWL_TARGET_H
-class IFWL_Target;
+#ifndef FWL_TARGET_H_
+#define FWL_TARGET_H_
+
+#include "core/include/fxcrt/fx_basic.h"
+
+// FWL contains three parallel inheritance hierarchies, which reference each
+// other via pointers as follows:
+//
+// m_pImpl
+// (nonesuch) IFWL_Target ----------> CFWL_TargetImp
+// | |
+// A A
+// m_pIface | |
+// CFWL_Widget ----------> IFWL_Widget CFWL_WidgetImp
+// | | |
+// A A A
+// | | |
+// CFWL_... IFWL_... CFWL_...Imp
+//
+
+class CFWL_TargetImp;
+
class IFWL_Target {
public:
FX_DWORD Release();
@@ -20,6 +39,7 @@ class IFWL_Target { protected:
virtual ~IFWL_Target();
- void* m_pData;
+ CFWL_TargetImp* m_pImpl;
};
-#endif
+
+#endif // FWL_TARGET_H_
diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h index ab1719373a..447a403f2e 100644 --- a/xfa/include/fwl/lightwidget/barcode.h +++ b/xfa/include/fwl/lightwidget/barcode.h @@ -35,7 +35,7 @@ class CFWL_Barcode : public CFWL_Edit { void SetDataLength(int32_t dataLength) {
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_DATALENGTH;
m_barcodeData.m_nDataLength = dataLength;
- ((IFWL_Barcode*)m_pImp)->SetLimit(dataLength);
+ ((IFWL_Barcode*)m_pIface)->SetLimit(dataLength);
}
void SetCalChecksum(int32_t calChecksum) {
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_CALCHECKSUM;
diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index 02f96e9bdf..c6a7e4b80e 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -88,7 +88,7 @@ class CFWL_Widget { CFX_SizeF CalcTextSize(const CFX_WideString& wsText,
FX_BOOL bMultiLine = FALSE,
int32_t iLineWidth = -1);
- IFWL_Widget* m_pImp;
+ IFWL_Widget* m_pIface;
IFWL_WidgetDelegate* m_pDelegate;
CFWL_WidgetMgr* m_pWidgetMgr;
CFWL_WidgetProperties* m_pProperties;
diff --git a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp index ab6c0eb42d..342118e0a1 100644 --- a/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_barcodeimp.cpp @@ -14,30 +14,30 @@ IFWL_Barcode* IFWL_Barcode::Create() { return new IFWL_Barcode;
}
IFWL_Barcode::IFWL_Barcode() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_Barcode::~IFWL_Barcode() {
- if (m_pData) {
- delete (CFWL_BarcodeImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_BarcodeImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_Barcode::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_BarcodeImp(pOuter);
- ((CFWL_BarcodeImp*)m_pData)->SetInterface(this);
- return ((CFWL_BarcodeImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_BarcodeImp(pOuter);
+ ((CFWL_BarcodeImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_BarcodeImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Barcode::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_BarcodeImp(properties, pOuter);
- ((CFWL_BarcodeImp*)m_pData)->SetInterface(this);
- return ((CFWL_BarcodeImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_BarcodeImp(properties, pOuter);
+ ((CFWL_BarcodeImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_BarcodeImp*)m_pImpl)->Initialize();
}
void IFWL_Barcode::SetType(BC_TYPE type) {
- ((CFWL_BarcodeImp*)m_pData)->SetType(type);
+ ((CFWL_BarcodeImp*)m_pImpl)->SetType(type);
}
FX_BOOL IFWL_Barcode::IsProtectedType() {
- return ((CFWL_BarcodeImp*)m_pData)->IsProtectedType();
+ return ((CFWL_BarcodeImp*)m_pImpl)->IsProtectedType();
}
CFWL_BarcodeImp::CFWL_BarcodeImp(IFWL_Widget* pOuter)
: CFWL_EditImp(pOuter),
diff --git a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp index c7c52b1c69..c0cc74b1bc 100644 --- a/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_caretimp.cpp @@ -13,36 +13,36 @@ IFWL_Caret* IFWL_Caret::Create() { return new IFWL_Caret;
}
IFWL_Caret::IFWL_Caret() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_Caret::~IFWL_Caret() {
- if (m_pData) {
- delete (CFWL_CaretImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_CaretImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_Caret::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_CaretImp(pOuter);
- ((CFWL_CaretImp*)m_pData)->SetInterface(this);
- return ((CFWL_CaretImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_CaretImp(pOuter);
+ ((CFWL_CaretImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_CaretImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Caret::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_CaretImp(properties, pOuter);
- ((CFWL_CaretImp*)m_pData)->SetInterface(this);
- return ((CFWL_CaretImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_CaretImp(properties, pOuter);
+ ((CFWL_CaretImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_CaretImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Caret::ShowCaret(FX_BOOL bFlag) {
- return ((CFWL_CaretImp*)m_pData)->ShowCaret(bFlag);
+ return ((CFWL_CaretImp*)m_pImpl)->ShowCaret(bFlag);
}
FWL_ERR IFWL_Caret::GetFrequency(FX_DWORD& elapse) {
- return ((CFWL_CaretImp*)m_pData)->GetFrequency(elapse);
+ return ((CFWL_CaretImp*)m_pImpl)->GetFrequency(elapse);
}
FWL_ERR IFWL_Caret::SetFrequency(FX_DWORD elapse) {
- return ((CFWL_CaretImp*)m_pData)->SetFrequency(elapse);
+ return ((CFWL_CaretImp*)m_pImpl)->SetFrequency(elapse);
}
FWL_ERR IFWL_Caret::SetColor(CFX_Color crFill) {
- return ((CFWL_CaretImp*)m_pData)->SetColor(crFill);
+ return ((CFWL_CaretImp*)m_pImpl)->SetColor(crFill);
}
CFWL_CaretImp::CFWL_CaretImp(IFWL_Widget* pOuter) : m_hTimer(NULL) {
m_dwElapse = 400;
diff --git a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp index 1a77f3b121..e63d87c97c 100644 --- a/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_checkboximp.cpp @@ -15,53 +15,53 @@ IFWL_CheckBox* IFWL_CheckBox::Create() { return new IFWL_CheckBox;
}
IFWL_CheckBox::IFWL_CheckBox() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_CheckBox::~IFWL_CheckBox() {
- if (m_pData) {
- delete (CFWL_CheckBoxImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_CheckBoxImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_CheckBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_CheckBoxImp(pOuter);
- ((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_CheckBoxImp(pOuter);
+ ((CFWL_CheckBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_CheckBoxImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_CheckBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_CheckBoxImp(properties, pOuter);
- ((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_CheckBoxImp(properties, pOuter);
+ ((CFWL_CheckBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_CheckBoxImp*)m_pImpl)->Initialize();
}
int32_t IFWL_CheckBox::GetCheckState() {
- return ((CFWL_CheckBoxImp*)m_pData)->GetCheckState();
+ return ((CFWL_CheckBoxImp*)m_pImpl)->GetCheckState();
}
FWL_ERR IFWL_CheckBox::SetCheckState(int32_t iCheck) {
- return ((CFWL_CheckBoxImp*)m_pData)->SetCheckState(iCheck);
+ return ((CFWL_CheckBoxImp*)m_pImpl)->SetCheckState(iCheck);
}
IFWL_RadioButton* IFWL_RadioButton::Create() {
return new IFWL_RadioButton;
}
IFWL_RadioButton::IFWL_RadioButton() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_RadioButton::~IFWL_RadioButton() {
- if (m_pData) {
- delete (CFWL_CheckBoxImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_CheckBoxImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_RadioButton::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_CheckBoxImp(pOuter);
- ((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_CheckBoxImp(pOuter);
+ ((CFWL_CheckBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_CheckBoxImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_RadioButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_CheckBoxImp(properties, pOuter);
- ((CFWL_CheckBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_CheckBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_CheckBoxImp(properties, pOuter);
+ ((CFWL_CheckBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_CheckBoxImp*)m_pImpl)->Initialize();
}
CFWL_CheckBoxImp::CFWL_CheckBoxImp(IFWL_Widget* pOuter)
: CFWL_WidgetImp(pOuter),
diff --git a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp index a170618950..0390ef60cc 100644 --- a/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp @@ -22,117 +22,117 @@ IFWL_ComboBox* IFWL_ComboBox::Create() { return new IFWL_ComboBox;
}
IFWL_ComboBox::IFWL_ComboBox() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_ComboBox::~IFWL_ComboBox() {
- if (m_pData) {
- delete (CFWL_ComboBoxImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_ComboBoxImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_ComboBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_ComboBoxImp(pOuter);
- ((CFWL_ComboBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_ComboBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_ComboBoxImp(pOuter);
+ ((CFWL_ComboBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_ComboBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_ComboBoxImp(properties, pOuter);
- ((CFWL_ComboBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_ComboBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_ComboBoxImp(properties, pOuter);
+ ((CFWL_ComboBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->Initialize();
}
int32_t IFWL_ComboBox::GetCurSel() {
- return ((CFWL_ComboBoxImp*)m_pData)->GetCurSel();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->GetCurSel();
}
FWL_ERR IFWL_ComboBox::SetCurSel(int32_t iSel) {
- return ((CFWL_ComboBoxImp*)m_pData)->SetCurSel(iSel);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->SetCurSel(iSel);
}
FWL_ERR IFWL_ComboBox::SetEditText(const CFX_WideString& wsText) {
- return ((CFWL_ComboBoxImp*)m_pData)->SetEditText(wsText);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->SetEditText(wsText);
}
int32_t IFWL_ComboBox::GetEditTextLength() const {
- return ((CFWL_ComboBoxImp*)m_pData)->GetEditTextLength();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->GetEditTextLength();
}
FWL_ERR IFWL_ComboBox::GetEditText(CFX_WideString& wsText,
int32_t nStart,
int32_t nCount) const {
- return ((CFWL_ComboBoxImp*)m_pData)->GetEditText(wsText, nStart, nCount);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->GetEditText(wsText, nStart, nCount);
}
FWL_ERR IFWL_ComboBox::SetEditSelRange(int32_t nStart, int32_t nCount) {
- return ((CFWL_ComboBoxImp*)m_pData)->SetEditSelRange(nStart, nCount);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->SetEditSelRange(nStart, nCount);
}
int32_t IFWL_ComboBox::GetEditSelRange(int32_t nIndex, int32_t& nStart) {
- return ((CFWL_ComboBoxImp*)m_pData)->GetEditSelRange(nIndex, nStart);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->GetEditSelRange(nIndex, nStart);
}
int32_t IFWL_ComboBox::GetEditLimit() {
- return ((CFWL_ComboBoxImp*)m_pData)->GetEditLimit();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->GetEditLimit();
}
FWL_ERR IFWL_ComboBox::SetEditLimit(int32_t nLimit) {
- return ((CFWL_ComboBoxImp*)m_pData)->SetEditLimit(nLimit);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->SetEditLimit(nLimit);
}
FWL_ERR IFWL_ComboBox::EditDoClipboard(int32_t iCmd) {
- return ((CFWL_ComboBoxImp*)m_pData)->EditDoClipboard(iCmd);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditDoClipboard(iCmd);
}
FX_BOOL IFWL_ComboBox::EditRedo(const CFX_ByteStringC& bsRecord) {
- return ((CFWL_ComboBoxImp*)m_pData)->EditRedo(bsRecord);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditRedo(bsRecord);
}
FX_BOOL IFWL_ComboBox::EditUndo(const CFX_ByteStringC& bsRecord) {
- return ((CFWL_ComboBoxImp*)m_pData)->EditUndo(bsRecord);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditUndo(bsRecord);
}
IFWL_ListBox* IFWL_ComboBox::GetListBoxt() {
- return ((CFWL_ComboBoxImp*)m_pData)->GetListBoxt();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->GetListBoxt();
}
FX_BOOL IFWL_ComboBox::AfterFocusShowDropList() {
- return ((CFWL_ComboBoxImp*)m_pData)->AfterFocusShowDropList();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->AfterFocusShowDropList();
}
FX_ERR IFWL_ComboBox::OpenDropDownList(FX_BOOL bActivate) {
- return ((CFWL_ComboBoxImp*)m_pData)->OpenDropDownList(bActivate);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->OpenDropDownList(bActivate);
}
FX_BOOL IFWL_ComboBox::EditCanUndo() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditCanUndo();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditCanUndo();
}
FX_BOOL IFWL_ComboBox::EditCanRedo() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditCanRedo();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditCanRedo();
}
FX_BOOL IFWL_ComboBox::EditUndo() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditUndo();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditUndo();
}
FX_BOOL IFWL_ComboBox::EditRedo() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditRedo();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditRedo();
}
FX_BOOL IFWL_ComboBox::EditCanCopy() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditCanCopy();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditCanCopy();
}
FX_BOOL IFWL_ComboBox::EditCanCut() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditCanCut();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditCanCut();
}
FX_BOOL IFWL_ComboBox::EditCanSelectAll() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditCanSelectAll();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditCanSelectAll();
}
FX_BOOL IFWL_ComboBox::EditCopy(CFX_WideString& wsCopy) {
- return ((CFWL_ComboBoxImp*)m_pData)->EditCopy(wsCopy);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditCopy(wsCopy);
}
FX_BOOL IFWL_ComboBox::EditCut(CFX_WideString& wsCut) {
- return ((CFWL_ComboBoxImp*)m_pData)->EditCut(wsCut);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditCut(wsCut);
}
FX_BOOL IFWL_ComboBox::EditPaste(const CFX_WideString& wsPaste) {
- return ((CFWL_ComboBoxImp*)m_pData)->EditPaste(wsPaste);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditPaste(wsPaste);
}
FX_BOOL IFWL_ComboBox::EditSelectAll() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditSelectAll();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditSelectAll();
}
FX_BOOL IFWL_ComboBox::EditDelete() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditDelete();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditDelete();
}
FX_BOOL IFWL_ComboBox::EditDeSelect() {
- return ((CFWL_ComboBoxImp*)m_pData)->EditDeSelect();
+ return ((CFWL_ComboBoxImp*)m_pImpl)->EditDeSelect();
}
FWL_ERR IFWL_ComboBox::GetBBox(CFX_RectF& rect) {
- return ((CFWL_ComboBoxImp*)m_pData)->GetBBox(rect);
+ return ((CFWL_ComboBoxImp*)m_pImpl)->GetBBox(rect);
}
FWL_ERR IFWL_ComboBox::EditModifyStylesEx(FX_DWORD dwStylesExAdded,
FX_DWORD dwStylesExRemoved) {
- return ((CFWL_ComboBoxImp*)m_pData)
+ return ((CFWL_ComboBoxImp*)m_pImpl)
->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
}
CFWL_ComboEdit::CFWL_ComboEdit(IFWL_Widget* pOuter) : CFWL_EditImp(pOuter) {
diff --git a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp index f09f74bd20..d125f0235c 100644 --- a/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_datetimepickerimp.cpp @@ -23,122 +23,122 @@ IFWL_DateTimePicker* IFWL_DateTimePicker::Create() { FWL_ERR IFWL_DateTimeForm::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_FormProxyImp(properties, pOuter);
- ((CFWL_FormProxyImp*)m_pData)->SetInterface(this);
- return ((CFWL_FormProxyImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_FormProxyImp(properties, pOuter);
+ ((CFWL_FormProxyImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_FormProxyImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_DateTimeCalender::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_DateTimeCalendar(properties, pOuter);
- ((CFWL_DateTimeCalendar*)m_pData)->SetInterface(this);
- return ((CFWL_DateTimeCalendar*)m_pData)->Initialize();
+ m_pImpl = new CFWL_DateTimeCalendar(properties, pOuter);
+ ((CFWL_DateTimeCalendar*)m_pImpl)->SetInterface(this);
+ return ((CFWL_DateTimeCalendar*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_DateTimeEdit::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_DateTimeEdit(properties, pOuter);
- ((CFWL_DateTimeEdit*)m_pData)->SetInterface(this);
- return ((CFWL_DateTimeEdit*)m_pData)->Initialize();
+ m_pImpl = new CFWL_DateTimeEdit(properties, pOuter);
+ ((CFWL_DateTimeEdit*)m_pImpl)->SetInterface(this);
+ return ((CFWL_DateTimeEdit*)m_pImpl)->Initialize();
}
IFWL_DateTimePicker::IFWL_DateTimePicker() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_DateTimePicker::~IFWL_DateTimePicker() {
- if (m_pData) {
- delete (CFWL_DateTimePickerImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_DateTimePickerImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_DateTimePicker::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_DateTimePickerImp(pOuter);
- ((CFWL_DateTimePickerImp*)m_pData)->SetInterface(this);
- return ((CFWL_DateTimePickerImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_DateTimePickerImp(pOuter);
+ ((CFWL_DateTimePickerImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_DateTimePicker::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_DateTimePickerImp(properties, pOuter);
- ((CFWL_DateTimePickerImp*)m_pData)->SetInterface(this);
- return ((CFWL_DateTimePickerImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_DateTimePickerImp(properties, pOuter);
+ ((CFWL_DateTimePickerImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->Initialize();
}
int32_t IFWL_DateTimePicker::CountSelRanges() {
- return ((CFWL_DateTimePickerImp*)m_pData)
+ return ((CFWL_DateTimePickerImp*)m_pImpl)
->GetDataTimeEdit()
->CountSelRanges();
}
int32_t IFWL_DateTimePicker::GetSelRange(int32_t nIndex, int32_t& nStart) {
- return ((CFWL_DateTimePickerImp*)m_pData)
+ return ((CFWL_DateTimePickerImp*)m_pImpl)
->GetDataTimeEdit()
->GetSelRange(nIndex, nStart);
}
FWL_ERR IFWL_DateTimePicker::GetCurSel(int32_t& iYear,
int32_t& iMonth,
int32_t& iDay) {
- return ((CFWL_DateTimePickerImp*)m_pData)->GetCurSel(iYear, iMonth, iDay);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->GetCurSel(iYear, iMonth, iDay);
}
FWL_ERR IFWL_DateTimePicker::SetCurSel(int32_t iYear,
int32_t iMonth,
int32_t iDay) {
- return ((CFWL_DateTimePickerImp*)m_pData)->SetCurSel(iYear, iMonth, iDay);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->SetCurSel(iYear, iMonth, iDay);
}
FWL_ERR IFWL_DateTimePicker::SetEditText(const CFX_WideString& wsText) {
- return ((CFWL_DateTimePickerImp*)m_pData)->SetEditText(wsText);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->SetEditText(wsText);
}
FWL_ERR IFWL_DateTimePicker::GetEditText(CFX_WideString& wsText,
int32_t nStart,
int32_t nCount) const {
- return ((CFWL_DateTimePickerImp*)m_pData)
+ return ((CFWL_DateTimePickerImp*)m_pImpl)
->GetEditText(wsText, nStart, nCount);
}
FX_BOOL IFWL_DateTimePicker::CanUndo() {
- return ((CFWL_DateTimePickerImp*)m_pData)->CanUndo();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->CanUndo();
}
FX_BOOL IFWL_DateTimePicker::CanRedo() {
- return ((CFWL_DateTimePickerImp*)m_pData)->CanRedo();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->CanRedo();
}
FX_BOOL IFWL_DateTimePicker::Undo() {
- return ((CFWL_DateTimePickerImp*)m_pData)->Undo();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->Undo();
}
FX_BOOL IFWL_DateTimePicker::Redo() {
- return ((CFWL_DateTimePickerImp*)m_pData)->Redo();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->Redo();
}
FX_BOOL IFWL_DateTimePicker::CanCopy() {
- return ((CFWL_DateTimePickerImp*)m_pData)->CanCopy();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->CanCopy();
}
FX_BOOL IFWL_DateTimePicker::CanCut() {
- return ((CFWL_DateTimePickerImp*)m_pData)->CanCut();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->CanCut();
}
FX_BOOL IFWL_DateTimePicker::CanSelectAll() {
- return ((CFWL_DateTimePickerImp*)m_pData)->CanSelectAll();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->CanSelectAll();
}
FX_BOOL IFWL_DateTimePicker::Copy(CFX_WideString& wsCopy) {
- return ((CFWL_DateTimePickerImp*)m_pData)->Copy(wsCopy);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->Copy(wsCopy);
}
FX_BOOL IFWL_DateTimePicker::Cut(CFX_WideString& wsCut) {
- return ((CFWL_DateTimePickerImp*)m_pData)->Cut(wsCut);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->Cut(wsCut);
}
FX_BOOL IFWL_DateTimePicker::Paste(const CFX_WideString& wsPaste) {
- return ((CFWL_DateTimePickerImp*)m_pData)->Paste(wsPaste);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->Paste(wsPaste);
}
FX_BOOL IFWL_DateTimePicker::SelectAll() {
- return ((CFWL_DateTimePickerImp*)m_pData)->SelectAll();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->SelectAll();
}
FX_BOOL IFWL_DateTimePicker::Delete() {
- return ((CFWL_DateTimePickerImp*)m_pData)->Delete();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->Delete();
}
FX_BOOL IFWL_DateTimePicker::DeSelect() {
- return ((CFWL_DateTimePickerImp*)m_pData)->DeSelect();
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->DeSelect();
}
FWL_ERR IFWL_DateTimePicker::GetBBox(CFX_RectF& rect) {
- return ((CFWL_DateTimePickerImp*)m_pData)->GetBBox(rect);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->GetBBox(rect);
}
FWL_ERR IFWL_DateTimePicker::SetEditLimit(int32_t nLimit) {
- return ((CFWL_DateTimePickerImp*)m_pData)->SetEditLimit(nLimit);
+ return ((CFWL_DateTimePickerImp*)m_pImpl)->SetEditLimit(nLimit);
}
FWL_ERR IFWL_DateTimePicker::ModifyEditStylesEx(FX_DWORD dwStylesExAdded,
FX_DWORD dwStylesExRemoved) {
- return ((CFWL_DateTimePickerImp*)m_pData)
+ return ((CFWL_DateTimePickerImp*)m_pImpl)
->ModifyEditStylesEx(dwStylesExAdded, dwStylesExRemoved);
}
CFWL_DateTimeEdit::CFWL_DateTimeEdit(const CFWL_WidgetImpProperties& properties,
diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp index ca273070ab..d70a85aca6 100644 --- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp @@ -18,146 +18,146 @@ IFWL_Edit* IFWL_Edit::Create() { return new IFWL_Edit;
}
IFWL_Edit::IFWL_Edit() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_Edit::~IFWL_Edit() {
- if (m_pData) {
- delete (CFWL_EditImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_EditImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_Edit::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_EditImp(pOuter);
- ((CFWL_EditImp*)m_pData)->SetInterface(this);
- return ((CFWL_EditImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_EditImp(pOuter);
+ ((CFWL_EditImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_EditImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Edit::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_EditImp(properties, pOuter);
- ((CFWL_EditImp*)m_pData)->SetInterface(this);
- return ((CFWL_EditImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_EditImp(properties, pOuter);
+ ((CFWL_EditImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_EditImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Edit::SetText(const CFX_WideString& wsText) {
- return ((CFWL_EditImp*)m_pData)->SetText(wsText);
+ return ((CFWL_EditImp*)m_pImpl)->SetText(wsText);
}
int32_t IFWL_Edit::GetTextLength() const {
- return ((CFWL_EditImp*)m_pData)->GetTextLength();
+ return ((CFWL_EditImp*)m_pImpl)->GetTextLength();
}
FWL_ERR IFWL_Edit::GetText(CFX_WideString& wsText,
int32_t nStart,
int32_t nCount) const {
- return ((CFWL_EditImp*)m_pData)->GetText(wsText, nStart, nCount);
+ return ((CFWL_EditImp*)m_pImpl)->GetText(wsText, nStart, nCount);
}
FWL_ERR IFWL_Edit::ClearText() {
- return ((CFWL_EditImp*)m_pData)->ClearText();
+ return ((CFWL_EditImp*)m_pImpl)->ClearText();
}
int32_t IFWL_Edit::GetCaretPos() const {
- return ((CFWL_EditImp*)m_pData)->GetCaretPos();
+ return ((CFWL_EditImp*)m_pImpl)->GetCaretPos();
}
int32_t IFWL_Edit::SetCaretPos(int32_t nIndex, FX_BOOL bBefore) {
- return ((CFWL_EditImp*)m_pData)->SetCaretPos(nIndex, bBefore);
+ return ((CFWL_EditImp*)m_pImpl)->SetCaretPos(nIndex, bBefore);
}
FWL_ERR IFWL_Edit::AddSelRange(int32_t nStart, int32_t nCount) {
- return ((CFWL_EditImp*)m_pData)->AddSelRange(nStart, nCount);
+ return ((CFWL_EditImp*)m_pImpl)->AddSelRange(nStart, nCount);
}
int32_t IFWL_Edit::CountSelRanges() {
- return ((CFWL_EditImp*)m_pData)->CountSelRanges();
+ return ((CFWL_EditImp*)m_pImpl)->CountSelRanges();
}
int32_t IFWL_Edit::GetSelRange(int32_t nIndex, int32_t& nStart) {
- return ((CFWL_EditImp*)m_pData)->GetSelRange(nIndex, nStart);
+ return ((CFWL_EditImp*)m_pImpl)->GetSelRange(nIndex, nStart);
}
FWL_ERR IFWL_Edit::ClearSelections() {
- return ((CFWL_EditImp*)m_pData)->ClearSelections();
+ return ((CFWL_EditImp*)m_pImpl)->ClearSelections();
}
int32_t IFWL_Edit::GetLimit() {
- return ((CFWL_EditImp*)m_pData)->GetLimit();
+ return ((CFWL_EditImp*)m_pImpl)->GetLimit();
}
FWL_ERR IFWL_Edit::SetLimit(int32_t nLimit) {
- return ((CFWL_EditImp*)m_pData)->SetLimit(nLimit);
+ return ((CFWL_EditImp*)m_pImpl)->SetLimit(nLimit);
}
FWL_ERR IFWL_Edit::SetAliasChar(FX_WCHAR wAlias) {
- return ((CFWL_EditImp*)m_pData)->SetAliasChar(wAlias);
+ return ((CFWL_EditImp*)m_pImpl)->SetAliasChar(wAlias);
}
FWL_ERR IFWL_Edit::SetFormatString(const CFX_WideString& wsFormat) {
- return ((CFWL_EditImp*)m_pData)->SetFormatString(wsFormat);
+ return ((CFWL_EditImp*)m_pImpl)->SetFormatString(wsFormat);
}
FWL_ERR IFWL_Edit::Insert(int32_t nStart,
const FX_WCHAR* lpText,
int32_t nLen) {
- return ((CFWL_EditImp*)m_pData)->Insert(nStart, lpText, nLen);
+ return ((CFWL_EditImp*)m_pImpl)->Insert(nStart, lpText, nLen);
}
FWL_ERR IFWL_Edit::DeleteSelections() {
- return ((CFWL_EditImp*)m_pData)->DeleteSelections();
+ return ((CFWL_EditImp*)m_pImpl)->DeleteSelections();
}
FWL_ERR IFWL_Edit::DeleteRange(int32_t nStart, int32_t nCount) {
- return ((CFWL_EditImp*)m_pData)->DeleteRange(nStart, nCount);
+ return ((CFWL_EditImp*)m_pImpl)->DeleteRange(nStart, nCount);
}
FWL_ERR IFWL_Edit::ReplaceSelections(const CFX_WideStringC& wsReplace) {
- return ((CFWL_EditImp*)m_pData)->ReplaceSelections(wsReplace);
+ return ((CFWL_EditImp*)m_pImpl)->ReplaceSelections(wsReplace);
}
FWL_ERR IFWL_Edit::Replace(int32_t nStart,
int32_t nLen,
const CFX_WideStringC& wsReplace) {
- return ((CFWL_EditImp*)m_pData)->Replace(nStart, nLen, wsReplace);
+ return ((CFWL_EditImp*)m_pImpl)->Replace(nStart, nLen, wsReplace);
}
FWL_ERR IFWL_Edit::DoClipboard(int32_t iCmd) {
- return ((CFWL_EditImp*)m_pData)->DoClipboard(iCmd);
+ return ((CFWL_EditImp*)m_pImpl)->DoClipboard(iCmd);
}
FX_BOOL IFWL_Edit::Copy(CFX_WideString& wsCopy) {
- return ((CFWL_EditImp*)m_pData)->Copy(wsCopy);
+ return ((CFWL_EditImp*)m_pImpl)->Copy(wsCopy);
}
FX_BOOL IFWL_Edit::Cut(CFX_WideString& wsCut) {
- return ((CFWL_EditImp*)m_pData)->Cut(wsCut);
+ return ((CFWL_EditImp*)m_pImpl)->Cut(wsCut);
}
FX_BOOL IFWL_Edit::Paste(const CFX_WideString& wsPaste) {
- return ((CFWL_EditImp*)m_pData)->Paste(wsPaste);
+ return ((CFWL_EditImp*)m_pImpl)->Paste(wsPaste);
}
FX_BOOL IFWL_Edit::Delete() {
- return ((CFWL_EditImp*)m_pData)->Delete();
+ return ((CFWL_EditImp*)m_pImpl)->Delete();
}
FX_BOOL IFWL_Edit::Redo(const CFX_ByteStringC& bsRecord) {
- return ((CFWL_EditImp*)m_pData)->Redo(bsRecord);
+ return ((CFWL_EditImp*)m_pImpl)->Redo(bsRecord);
}
FX_BOOL IFWL_Edit::Undo(const CFX_ByteStringC& bsRecord) {
- return ((CFWL_EditImp*)m_pData)->Undo(bsRecord);
+ return ((CFWL_EditImp*)m_pImpl)->Undo(bsRecord);
}
FX_BOOL IFWL_Edit::Undo() {
- return ((CFWL_EditImp*)m_pData)->Undo();
+ return ((CFWL_EditImp*)m_pImpl)->Undo();
}
FX_BOOL IFWL_Edit::Redo() {
- return ((CFWL_EditImp*)m_pData)->Redo();
+ return ((CFWL_EditImp*)m_pImpl)->Redo();
}
FX_BOOL IFWL_Edit::CanUndo() {
- return ((CFWL_EditImp*)m_pData)->CanUndo();
+ return ((CFWL_EditImp*)m_pImpl)->CanUndo();
}
FX_BOOL IFWL_Edit::CanRedo() {
- return ((CFWL_EditImp*)m_pData)->CanRedo();
+ return ((CFWL_EditImp*)m_pImpl)->CanRedo();
}
FWL_ERR IFWL_Edit::SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant) {
- return ((CFWL_EditImp*)m_pData)->SetTabWidth(fTabWidth, bEquidistant);
+ return ((CFWL_EditImp*)m_pImpl)->SetTabWidth(fTabWidth, bEquidistant);
}
FWL_ERR IFWL_Edit::SetOuter(IFWL_Widget* pOuter) {
- return ((CFWL_EditImp*)m_pData)->SetOuter(pOuter);
+ return ((CFWL_EditImp*)m_pImpl)->SetOuter(pOuter);
}
FWL_ERR IFWL_Edit::SetNumberRange(int32_t iMin, int32_t iMax) {
- return ((CFWL_EditImp*)m_pData)->SetNumberRange(iMin, iMax);
+ return ((CFWL_EditImp*)m_pImpl)->SetNumberRange(iMin, iMax);
}
FWL_ERR IFWL_Edit::SetBackColor(FX_DWORD dwColor) {
- return ((CFWL_EditImp*)m_pData)->SetBackgroundColor(dwColor);
+ return ((CFWL_EditImp*)m_pImpl)->SetBackgroundColor(dwColor);
}
FWL_ERR IFWL_Edit::SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize) {
- return ((CFWL_EditImp*)m_pData)->SetFont(wsFont, fSize);
+ return ((CFWL_EditImp*)m_pImpl)->SetFont(wsFont, fSize);
}
void IFWL_Edit::SetScrollOffset(FX_FLOAT fScrollOffset) {
- return ((CFWL_EditImp*)m_pData)->SetScrollOffset(fScrollOffset);
+ return ((CFWL_EditImp*)m_pImpl)->SetScrollOffset(fScrollOffset);
}
FX_BOOL IFWL_Edit::GetSuggestWords(CFX_PointF pointf,
CFX_ByteStringArray& sSuggest) {
- return ((CFWL_EditImp*)m_pData)->GetSuggestWords(pointf, sSuggest);
+ return ((CFWL_EditImp*)m_pImpl)->GetSuggestWords(pointf, sSuggest);
}
FX_BOOL IFWL_Edit::ReplaceSpellCheckWord(CFX_PointF pointf,
const CFX_ByteStringC& bsReplace) {
- return ((CFWL_EditImp*)m_pData)->ReplaceSpellCheckWord(pointf, bsReplace);
+ return ((CFWL_EditImp*)m_pImpl)->ReplaceSpellCheckWord(pointf, bsReplace);
}
#define FWL_EDIT_Margin 3
CFWL_EditImp::CFWL_EditImp(IFWL_Widget* pOuter)
diff --git a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp index 8a47e4c293..09ef4cd0ae 100644 --- a/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_listboximp.cpp @@ -15,45 +15,45 @@ IFWL_ListBox* IFWL_ListBox::Create() { return new IFWL_ListBox;
}
IFWL_ListBox::IFWL_ListBox() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_ListBox::~IFWL_ListBox() {
- if (m_pData) {
- delete (CFWL_ListBoxImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_ListBoxImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_ListBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_ListBoxImp(pOuter);
- ((CFWL_ListBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_ListBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_ListBoxImp(pOuter);
+ ((CFWL_ListBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_ListBoxImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_ListBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_ListBoxImp(properties, pOuter);
- ((CFWL_ListBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_ListBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_ListBoxImp(properties, pOuter);
+ ((CFWL_ListBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_ListBoxImp*)m_pImpl)->Initialize();
}
int32_t IFWL_ListBox::CountSelItems() {
- return ((CFWL_ListBoxImp*)m_pData)->CountSelItems();
+ return ((CFWL_ListBoxImp*)m_pImpl)->CountSelItems();
}
FWL_HLISTITEM IFWL_ListBox::GetSelItem(int32_t nIndexSel) {
- return ((CFWL_ListBoxImp*)m_pData)->GetSelItem(nIndexSel);
+ return ((CFWL_ListBoxImp*)m_pImpl)->GetSelItem(nIndexSel);
}
int32_t IFWL_ListBox::GetSelIndex(int32_t nIndex) {
- return ((CFWL_ListBoxImp*)m_pData)->GetSelIndex(nIndex);
+ return ((CFWL_ListBoxImp*)m_pImpl)->GetSelIndex(nIndex);
}
FWL_ERR IFWL_ListBox::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
- return ((CFWL_ListBoxImp*)m_pData)->SetSelItem(hItem, bSelect);
+ return ((CFWL_ListBoxImp*)m_pImpl)->SetSelItem(hItem, bSelect);
}
FWL_ERR IFWL_ListBox::GetItemText(FWL_HLISTITEM hItem, CFX_WideString& wsText) {
- return ((CFWL_ListBoxImp*)m_pData)->GetItemText(hItem, wsText);
+ return ((CFWL_ListBoxImp*)m_pImpl)->GetItemText(hItem, wsText);
}
FWL_ERR IFWL_ListBox::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
- return ((CFWL_ListBoxImp*)m_pData)->GetScrollPos(fPos, bVert);
+ return ((CFWL_ListBoxImp*)m_pImpl)->GetScrollPos(fPos, bVert);
}
FWL_ERR* IFWL_ListBox::Sort(IFWL_ListBoxCompare* pCom) {
- return ((CFWL_ListBoxImp*)m_pData)->Sort(pCom);
+ return ((CFWL_ListBoxImp*)m_pImpl)->Sort(pCom);
}
CFWL_ListBoxImp::CFWL_ListBoxImp(IFWL_Widget* pOuter)
: CFWL_WidgetImp(pOuter),
diff --git a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp index 0be09cab9c..6928349106 100644 --- a/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_monthcalendarimp.cpp @@ -21,40 +21,40 @@ IFWL_MonthCalendar* IFWL_MonthCalendar::Create() { return new IFWL_MonthCalendar;
}
IFWL_MonthCalendar::IFWL_MonthCalendar() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_MonthCalendar::~IFWL_MonthCalendar() {
- if (m_pData) {
- delete (CFWL_MonthCalendarImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_MonthCalendarImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_MonthCalendar::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_MonthCalendarImp(pOuter);
- ((CFWL_MonthCalendarImp*)m_pData)->SetInterface(this);
- return ((CFWL_MonthCalendarImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_MonthCalendarImp(pOuter);
+ ((CFWL_MonthCalendarImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_MonthCalendarImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_MonthCalendar::Initialize(
const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_MonthCalendarImp(properties, pOuter);
- ((CFWL_MonthCalendarImp*)m_pData)->SetInterface(this);
- return ((CFWL_MonthCalendarImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_MonthCalendarImp(properties, pOuter);
+ ((CFWL_MonthCalendarImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_MonthCalendarImp*)m_pImpl)->Initialize();
}
int32_t IFWL_MonthCalendar::CountSelect() {
- return ((CFWL_MonthCalendarImp*)m_pData)->CountSelect();
+ return ((CFWL_MonthCalendarImp*)m_pImpl)->CountSelect();
}
FX_BOOL IFWL_MonthCalendar::GetSelect(int32_t& iYear,
int32_t& iMonth,
int32_t& iDay,
int32_t nIndex) {
- return ((CFWL_MonthCalendarImp*)m_pData)
+ return ((CFWL_MonthCalendarImp*)m_pImpl)
->GetSelect(iYear, iMonth, iDay, nIndex);
}
FX_BOOL IFWL_MonthCalendar::SetSelect(int32_t iYear,
int32_t iMonth,
int32_t iDay) {
- return ((CFWL_MonthCalendarImp*)m_pData)->SetSelect(iYear, iMonth, iDay);
+ return ((CFWL_MonthCalendarImp*)m_pImpl)->SetSelect(iYear, iMonth, iDay);
}
CFWL_MonthCalendarImp::CFWL_MonthCalendarImp(IFWL_Widget* pOuter)
: CFWL_WidgetImp(pOuter),
diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp index 219aa88598..f8cfa107ea 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp @@ -13,24 +13,24 @@ IFWL_PictureBox* IFWL_PictureBox::Create() { return new IFWL_PictureBox;
}
IFWL_PictureBox::IFWL_PictureBox() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_PictureBox::~IFWL_PictureBox() {
- if (m_pData) {
- delete (CFWL_PictureBoxImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_PictureBoxImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_PictureBox::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_PictureBoxImp(pOuter);
- ((CFWL_PictureBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_PictureBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_PictureBoxImp(pOuter);
+ ((CFWL_PictureBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_PictureBoxImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_PictureBox::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_PictureBoxImp(properties, pOuter);
- ((CFWL_PictureBoxImp*)m_pData)->SetInterface(this);
- return ((CFWL_PictureBoxImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_PictureBoxImp(properties, pOuter);
+ ((CFWL_PictureBoxImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_PictureBoxImp*)m_pImpl)->Initialize();
}
CFWL_PictureBoxImp::CFWL_PictureBoxImp(IFWL_Widget* pOuter)
: CFWL_WidgetImp(pOuter),
diff --git a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp index 7fe9a7fb3f..6ae0a334c3 100644 --- a/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_pushbuttonimp.cpp @@ -13,23 +13,23 @@ IFWL_PushButton* IFWL_PushButton::Create() { return new IFWL_PushButton;
}
FWL_ERR IFWL_PushButton::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_PushButtonImp(pOuter);
- ((CFWL_PushButtonImp*)m_pData)->SetInterface(this);
- return ((CFWL_PushButtonImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_PushButtonImp(pOuter);
+ ((CFWL_PushButtonImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_PushButtonImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_PushButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_PushButtonImp(properties, pOuter);
- ((CFWL_PushButtonImp*)m_pData)->SetInterface(this);
- return ((CFWL_PushButtonImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_PushButtonImp(properties, pOuter);
+ ((CFWL_PushButtonImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_PushButtonImp*)m_pImpl)->Initialize();
}
IFWL_PushButton::IFWL_PushButton() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_PushButton::~IFWL_PushButton() {
- if (m_pData) {
- delete (CFWL_PushButtonImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_PushButtonImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
CFWL_PushButtonImp::CFWL_PushButtonImp(IFWL_Widget* pOuter)
diff --git a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp index d196203b9f..02eae32fc0 100644 --- a/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_scrollbarimp.cpp @@ -15,60 +15,60 @@ IFWL_ScrollBar* IFWL_ScrollBar::Create() { return new IFWL_ScrollBar;
}
IFWL_ScrollBar::IFWL_ScrollBar() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_ScrollBar::~IFWL_ScrollBar() {
- if (m_pData) {
- delete (CFWL_ScrollBarImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_ScrollBarImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_ScrollBar::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_ScrollBarImp(pOuter);
- ((CFWL_ScrollBarImp*)m_pData)->SetInterface(this);
- return ((CFWL_ScrollBarImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_ScrollBarImp(pOuter);
+ ((CFWL_ScrollBarImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_ScrollBarImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_ScrollBar::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_ScrollBarImp(properties, pOuter);
- ((CFWL_ScrollBarImp*)m_pData)->SetInterface(this);
- return ((CFWL_ScrollBarImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_ScrollBarImp(properties, pOuter);
+ ((CFWL_ScrollBarImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_ScrollBarImp*)m_pImpl)->Initialize();
}
FX_BOOL IFWL_ScrollBar::IsVertical() {
- return ((CFWL_ScrollBarImp*)m_pData)->IsVertical();
+ return ((CFWL_ScrollBarImp*)m_pImpl)->IsVertical();
}
FWL_ERR IFWL_ScrollBar::GetRange(FX_FLOAT& fMin, FX_FLOAT& fMax) {
- return ((CFWL_ScrollBarImp*)m_pData)->GetRange(fMin, fMax);
+ return ((CFWL_ScrollBarImp*)m_pImpl)->GetRange(fMin, fMax);
}
FWL_ERR IFWL_ScrollBar::SetRange(FX_FLOAT fMin, FX_FLOAT fMax) {
- return ((CFWL_ScrollBarImp*)m_pData)->SetRange(fMin, fMax);
+ return ((CFWL_ScrollBarImp*)m_pImpl)->SetRange(fMin, fMax);
}
FX_FLOAT IFWL_ScrollBar::GetPageSize() {
- return ((CFWL_ScrollBarImp*)m_pData)->GetPageSize();
+ return ((CFWL_ScrollBarImp*)m_pImpl)->GetPageSize();
}
FWL_ERR IFWL_ScrollBar::SetPageSize(FX_FLOAT fPageSize) {
- return ((CFWL_ScrollBarImp*)m_pData)->SetPageSize(fPageSize);
+ return ((CFWL_ScrollBarImp*)m_pImpl)->SetPageSize(fPageSize);
}
FX_FLOAT IFWL_ScrollBar::GetStepSize() {
- return ((CFWL_ScrollBarImp*)m_pData)->GetStepSize();
+ return ((CFWL_ScrollBarImp*)m_pImpl)->GetStepSize();
}
FWL_ERR IFWL_ScrollBar::SetStepSize(FX_FLOAT fStepSize) {
- return ((CFWL_ScrollBarImp*)m_pData)->SetStepSize(fStepSize);
+ return ((CFWL_ScrollBarImp*)m_pImpl)->SetStepSize(fStepSize);
}
FX_FLOAT IFWL_ScrollBar::GetPos() {
- return ((CFWL_ScrollBarImp*)m_pData)->GetPos();
+ return ((CFWL_ScrollBarImp*)m_pImpl)->GetPos();
}
FWL_ERR IFWL_ScrollBar::SetPos(FX_FLOAT fPos) {
- return ((CFWL_ScrollBarImp*)m_pData)->SetPos(fPos);
+ return ((CFWL_ScrollBarImp*)m_pImpl)->SetPos(fPos);
}
FX_FLOAT IFWL_ScrollBar::GetTrackPos() {
- return ((CFWL_ScrollBarImp*)m_pData)->GetTrackPos();
+ return ((CFWL_ScrollBarImp*)m_pImpl)->GetTrackPos();
}
FWL_ERR IFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) {
- return ((CFWL_ScrollBarImp*)m_pData)->SetTrackPos(fTrackPos);
+ return ((CFWL_ScrollBarImp*)m_pImpl)->SetTrackPos(fTrackPos);
}
FX_BOOL IFWL_ScrollBar::DoScroll(FX_DWORD dwCode, FX_FLOAT fPos) {
- return ((CFWL_ScrollBarImp*)m_pData)->DoScroll(dwCode, fPos);
+ return ((CFWL_ScrollBarImp*)m_pImpl)->DoScroll(dwCode, fPos);
}
CFWL_ScrollBarImp::CFWL_ScrollBarImp(IFWL_Widget* pOuter)
: CFWL_WidgetImp(pOuter),
diff --git a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp index 849044ea6e..60614e79f9 100644 --- a/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_spinbuttonimp.cpp @@ -16,30 +16,30 @@ IFWL_SpinButton* IFWL_SpinButton::Create() { return new IFWL_SpinButton;
}
IFWL_SpinButton::IFWL_SpinButton() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_SpinButton::~IFWL_SpinButton() {
- if (m_pData) {
- delete (CFWL_SpinButtonImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_SpinButtonImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_SpinButton::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_SpinButtonImp;
- ((CFWL_SpinButtonImp*)m_pData)->SetInterface(this);
- return ((CFWL_SpinButtonImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_SpinButtonImp;
+ ((CFWL_SpinButtonImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_SpinButtonImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_SpinButton::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_SpinButtonImp(properties);
- ((CFWL_SpinButtonImp*)m_pData)->SetInterface(this);
- return ((CFWL_SpinButtonImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_SpinButtonImp(properties);
+ ((CFWL_SpinButtonImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_SpinButtonImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_SpinButton::EnableButton(FX_BOOL bEnable, FX_BOOL bUp) {
- return ((CFWL_SpinButtonImp*)m_pData)->EnableButton(bEnable, bUp);
+ return ((CFWL_SpinButtonImp*)m_pImpl)->EnableButton(bEnable, bUp);
}
FX_BOOL IFWL_SpinButton::IsButtonEnable(FX_BOOL bUp) {
- return ((CFWL_SpinButtonImp*)m_pData)->IsButtonEnable(bUp);
+ return ((CFWL_SpinButtonImp*)m_pImpl)->IsButtonEnable(bUp);
}
CFWL_SpinButtonImp::CFWL_SpinButtonImp(IFWL_Widget* pOuter)
: CFWL_WidgetImp(pOuter),
diff --git a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp index 6de913615d..6c680f9059 100644 --- a/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/src/fwl/src/basewidget/fwl_tooltipctrlimp.cpp @@ -15,32 +15,32 @@ IFWL_ToolTip* IFWL_ToolTip::Create() { return new IFWL_ToolTip;
}
FWL_ERR IFWL_ToolTip::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_ToolTipImp(pOuter);
- ((CFWL_ToolTipImp*)m_pData)->SetInterface(this);
- return ((CFWL_ToolTipImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_ToolTipImp(pOuter);
+ ((CFWL_ToolTipImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_ToolTipImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_ToolTip::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_ToolTipImp(properties, pOuter);
- ((CFWL_ToolTipImp*)m_pData)->SetInterface(this);
- return ((CFWL_ToolTipImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_ToolTipImp(properties, pOuter);
+ ((CFWL_ToolTipImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_ToolTipImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_ToolTip::SetAnchor(const CFX_RectF& rtAnchor) {
- return ((CFWL_ToolTipImp*)m_pData)->SetAnchor(rtAnchor);
+ return ((CFWL_ToolTipImp*)m_pImpl)->SetAnchor(rtAnchor);
}
FWL_ERR IFWL_ToolTip::Show() {
- return ((CFWL_ToolTipImp*)m_pData)->Show();
+ return ((CFWL_ToolTipImp*)m_pImpl)->Show();
}
FWL_ERR IFWL_ToolTip::Hide() {
- return ((CFWL_ToolTipImp*)m_pData)->Hide();
+ return ((CFWL_ToolTipImp*)m_pImpl)->Hide();
}
IFWL_ToolTip::IFWL_ToolTip() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_ToolTip::~IFWL_ToolTip() {
- if (m_pData) {
- delete (CFWL_ToolTipImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_ToolTipImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
CFWL_ToolTipImp::CFWL_ToolTipImp(IFWL_Widget* pOuter)
diff --git a/xfa/src/fwl/src/core/fwl_contentimp.cpp b/xfa/src/fwl/src/core/fwl_contentimp.cpp index b99b84dbbd..2fcfbb89de 100644 --- a/xfa/src/fwl/src/core/fwl_contentimp.cpp +++ b/xfa/src/fwl/src/core/fwl_contentimp.cpp @@ -15,38 +15,38 @@ IFWL_Content* IFWL_Content::Create() { return new IFWL_Content;
}
FWL_ERR IFWL_Content::Initialize() {
- m_pData = new CFWL_ContentImp;
- ((CFWL_ContentImp*)m_pData)->SetInterface(this);
- return ((CFWL_ContentImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_ContentImp;
+ ((CFWL_ContentImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_ContentImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Content::InsertWidget(IFWL_Widget* pChild, int32_t nIndex) {
- return ((CFWL_ContentImp*)m_pData)->InsertWidget(pChild, nIndex);
+ return ((CFWL_ContentImp*)m_pImpl)->InsertWidget(pChild, nIndex);
}
FWL_ERR IFWL_Content::RemoveWidget(IFWL_Widget* pWidget) {
- return ((CFWL_ContentImp*)m_pData)->RemoveWidget(pWidget);
+ return ((CFWL_ContentImp*)m_pImpl)->RemoveWidget(pWidget);
}
FWL_ERR IFWL_Content::RemoveAllWidgets() {
- return ((CFWL_ContentImp*)m_pData)->RemoveAllWidgets();
+ return ((CFWL_ContentImp*)m_pImpl)->RemoveAllWidgets();
}
FWL_ERR IFWL_Content::GetMinSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) {
- return ((CFWL_ContentImp*)m_pData)->GetMinSize(fWidth, fHeight);
+ return ((CFWL_ContentImp*)m_pImpl)->GetMinSize(fWidth, fHeight);
}
FWL_ERR IFWL_Content::SetMinSize(FX_FLOAT fWidth, FX_FLOAT fHeight) {
- return ((CFWL_ContentImp*)m_pData)->SetMinSize(fWidth, fHeight);
+ return ((CFWL_ContentImp*)m_pImpl)->SetMinSize(fWidth, fHeight);
}
FWL_ERR IFWL_Content::GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight) {
- return ((CFWL_ContentImp*)m_pData)->GetMaxSize(fWidth, fHeight);
+ return ((CFWL_ContentImp*)m_pImpl)->GetMaxSize(fWidth, fHeight);
}
FWL_ERR IFWL_Content::SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight) {
- return ((CFWL_ContentImp*)m_pData)->SetMaxSize(fWidth, fHeight);
+ return ((CFWL_ContentImp*)m_pImpl)->SetMaxSize(fWidth, fHeight);
}
IFWL_Content::IFWL_Content() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_Content::~IFWL_Content() {
- if (m_pData) {
- delete (CFWL_ContentImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_ContentImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
CFWL_ContentImp::CFWL_ContentImp() {
diff --git a/xfa/src/fwl/src/core/fwl_formimp.cpp b/xfa/src/fwl/src/core/fwl_formimp.cpp index b64f4b19f4..d34dcd2157 100644 --- a/xfa/src/fwl/src/core/fwl_formimp.cpp +++ b/xfa/src/fwl/src/core/fwl_formimp.cpp @@ -21,49 +21,49 @@ IFWL_Form* IFWL_Form::Create() { return new IFWL_Form;
}
FWL_ERR IFWL_Form::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_FormImp(pOuter);
- ((CFWL_FormImp*)m_pData)->SetInterface(this);
- return ((CFWL_FormImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_FormImp(pOuter);
+ ((CFWL_FormImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_FormImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Form::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_FormImp(properties, pOuter);
- ((CFWL_FormImp*)m_pData)->SetInterface(this);
- return ((CFWL_FormImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_FormImp(properties, pOuter);
+ ((CFWL_FormImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_FormImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Form::Initialize(CFWL_WidgetImpProperties& properties,
CFX_WideString* classname,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_FormImp(properties, pOuter);
- ((CFWL_FormImp*)m_pData)->SetInterface(this);
- ((CFWL_FormImp*)m_pData)->SetPrivateData(this, classname, NULL);
- return ((CFWL_FormImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_FormImp(properties, pOuter);
+ ((CFWL_FormImp*)m_pImpl)->SetInterface(this);
+ ((CFWL_FormImp*)m_pImpl)->SetPrivateData(this, classname, NULL);
+ return ((CFWL_FormImp*)m_pImpl)->Initialize();
}
FWL_FORMSIZE IFWL_Form::GetFormSize() {
- return ((CFWL_FormImp*)m_pData)->GetFormSize();
+ return ((CFWL_FormImp*)m_pImpl)->GetFormSize();
}
FWL_ERR IFWL_Form::SetFormSize(FWL_FORMSIZE eFormSize) {
- return ((CFWL_FormImp*)m_pData)->SetFormSize(eFormSize);
+ return ((CFWL_FormImp*)m_pImpl)->SetFormSize(eFormSize);
}
IFWL_Widget* IFWL_Form::DoModal() {
- return ((CFWL_FormImp*)m_pData)->DoModal();
+ return ((CFWL_FormImp*)m_pImpl)->DoModal();
}
IFWL_Widget* IFWL_Form::DoModal(FX_DWORD& dwCommandID) {
- return ((CFWL_FormImp*)m_pData)->DoModal(dwCommandID);
+ return ((CFWL_FormImp*)m_pImpl)->DoModal(dwCommandID);
}
FWL_ERR IFWL_Form::EndDoModal() {
- return ((CFWL_FormImp*)m_pData)->EndDoModal();
+ return ((CFWL_FormImp*)m_pImpl)->EndDoModal();
}
FWL_ERR IFWL_Form::SetBorderRegion(CFX_Path* pPath) {
- return ((CFWL_FormImp*)m_pData)->SetBorderRegion(pPath);
+ return ((CFWL_FormImp*)m_pImpl)->SetBorderRegion(pPath);
}
IFWL_Form::IFWL_Form() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_Form::~IFWL_Form() {
- if (m_pData) {
- delete (CFWL_FormImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_FormImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
CFWL_FormImp::CFWL_FormImp(IFWL_Widget* pOuter)
diff --git a/xfa/src/fwl/src/core/fwl_gridimp.cpp b/xfa/src/fwl/src/core/fwl_gridimp.cpp index d7db6a6f11..480dc904cf 100644 --- a/xfa/src/fwl/src/core/fwl_gridimp.cpp +++ b/xfa/src/fwl/src/core/fwl_gridimp.cpp @@ -15,113 +15,113 @@ IFWL_Grid* IFWL_Grid::Create() { return new IFWL_Grid;
}
FWL_ERR IFWL_Grid::Initialize() {
- m_pData = new CFWL_GridImp;
- ((CFWL_GridImp*)m_pData)->SetInterface(this);
- return ((CFWL_GridImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_GridImp;
+ ((CFWL_GridImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_GridImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Grid::Initialize(CFWL_WidgetImpProperties& properties) {
- m_pData = new CFWL_GridImp(properties);
- ((CFWL_GridImp*)m_pData)->SetInterface(this);
- return ((CFWL_GridImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_GridImp(properties);
+ ((CFWL_GridImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_GridImp*)m_pImpl)->Initialize();
}
FWL_HGRIDCOLROW IFWL_Grid::InsertColRow(FX_BOOL bColumn, int32_t nIndex) {
- return ((CFWL_GridImp*)m_pData)->InsertColRow(bColumn, nIndex);
+ return ((CFWL_GridImp*)m_pImpl)->InsertColRow(bColumn, nIndex);
}
int32_t IFWL_Grid::CountColRows(FX_BOOL bColumn) {
- return ((CFWL_GridImp*)m_pData)->CountColRows(bColumn);
+ return ((CFWL_GridImp*)m_pImpl)->CountColRows(bColumn);
}
FWL_HGRIDCOLROW IFWL_Grid::GetColRow(FX_BOOL bColumn, int32_t nIndex) {
- return ((CFWL_GridImp*)m_pData)->GetColRow(bColumn, nIndex);
+ return ((CFWL_GridImp*)m_pImpl)->GetColRow(bColumn, nIndex);
}
int32_t IFWL_Grid::GetIndex(FWL_HGRIDCOLROW hColRow) {
- return ((CFWL_GridImp*)m_pData)->GetIndex(hColRow);
+ return ((CFWL_GridImp*)m_pImpl)->GetIndex(hColRow);
}
FX_FLOAT IFWL_Grid::GetSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit) {
- return ((CFWL_GridImp*)m_pData)->GetSize(hColRow, eUnit);
+ return ((CFWL_GridImp*)m_pImpl)->GetSize(hColRow, eUnit);
}
FWL_ERR IFWL_Grid::SetSize(FWL_HGRIDCOLROW hColRow,
FX_FLOAT fSize,
FWL_GRIDUNIT eUnit) {
- return ((CFWL_GridImp*)m_pData)->SetSize(hColRow, fSize, eUnit);
+ return ((CFWL_GridImp*)m_pImpl)->SetSize(hColRow, fSize, eUnit);
}
FX_FLOAT IFWL_Grid::GetMinSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit) {
- return ((CFWL_GridImp*)m_pData)->GetMinSize(hColRow, eUnit);
+ return ((CFWL_GridImp*)m_pImpl)->GetMinSize(hColRow, eUnit);
}
FWL_ERR IFWL_Grid::SetMinSize(FWL_HGRIDCOLROW hColRow,
FX_FLOAT fSize,
FWL_GRIDUNIT eUnit) {
- return ((CFWL_GridImp*)m_pData)->SetMinSize(hColRow, fSize, eUnit);
+ return ((CFWL_GridImp*)m_pImpl)->SetMinSize(hColRow, fSize, eUnit);
}
FX_FLOAT IFWL_Grid::GetMaxSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit) {
- return ((CFWL_GridImp*)m_pData)->GetMaxSize(hColRow, eUnit);
+ return ((CFWL_GridImp*)m_pImpl)->GetMaxSize(hColRow, eUnit);
}
FWL_ERR IFWL_Grid::SetMaxSize(FWL_HGRIDCOLROW hColRow,
FX_FLOAT fSize,
FWL_GRIDUNIT eUnit) {
- return ((CFWL_GridImp*)m_pData)->SetMaxSize(hColRow, fSize, eUnit);
+ return ((CFWL_GridImp*)m_pImpl)->SetMaxSize(hColRow, fSize, eUnit);
}
FX_BOOL IFWL_Grid::DeleteColRow(FWL_HGRIDCOLROW hColRow) {
- return ((CFWL_GridImp*)m_pData)->DeleteColRow(hColRow);
+ return ((CFWL_GridImp*)m_pImpl)->DeleteColRow(hColRow);
}
FX_BOOL IFWL_Grid::IsColumn(FWL_HGRIDCOLROW hColRow) {
- return ((CFWL_GridImp*)m_pData)->IsColumn(hColRow);
+ return ((CFWL_GridImp*)m_pImpl)->IsColumn(hColRow);
}
int32_t IFWL_Grid::GetWidgetPos(IFWL_Widget* pWidget, FX_BOOL bColumn) {
- return ((CFWL_GridImp*)m_pData)->GetWidgetPos(pWidget, bColumn);
+ return ((CFWL_GridImp*)m_pImpl)->GetWidgetPos(pWidget, bColumn);
}
FWL_ERR IFWL_Grid::SetWidgetPos(IFWL_Widget* pWidget,
int32_t iPos,
FX_BOOL bColumn) {
- return ((CFWL_GridImp*)m_pData)->SetWidgetPos(pWidget, iPos, bColumn);
+ return ((CFWL_GridImp*)m_pImpl)->SetWidgetPos(pWidget, iPos, bColumn);
}
int32_t IFWL_Grid::GetWidgetSpan(IFWL_Widget* pWidget, FX_BOOL bColumn) {
- return ((CFWL_GridImp*)m_pData)->GetWidgetSpan(pWidget, bColumn);
+ return ((CFWL_GridImp*)m_pImpl)->GetWidgetSpan(pWidget, bColumn);
}
FWL_ERR IFWL_Grid::SetWidgetSpan(IFWL_Widget* pWidget,
int32_t iSpan,
FX_BOOL bColumn) {
- return ((CFWL_GridImp*)m_pData)->SetWidgetSpan(pWidget, iSpan, bColumn);
+ return ((CFWL_GridImp*)m_pImpl)->SetWidgetSpan(pWidget, iSpan, bColumn);
}
FX_FLOAT IFWL_Grid::GetWidgetSize(IFWL_Widget* pWidget,
FWL_GRIDSIZE eSize,
FWL_GRIDUNIT& eUnit) {
- return ((CFWL_GridImp*)m_pData)->GetWidgetSize(pWidget, eSize, eUnit);
+ return ((CFWL_GridImp*)m_pImpl)->GetWidgetSize(pWidget, eSize, eUnit);
}
FWL_ERR IFWL_Grid::SetWidgetSize(IFWL_Widget* pWidget,
FWL_GRIDSIZE eSize,
FX_FLOAT fSize,
FWL_GRIDUNIT eUit) {
- return ((CFWL_GridImp*)m_pData)->SetWidgetSize(pWidget, eSize, fSize, eUit);
+ return ((CFWL_GridImp*)m_pImpl)->SetWidgetSize(pWidget, eSize, fSize, eUit);
}
FX_BOOL IFWL_Grid::GetWidgetMargin(IFWL_Widget* pWidget,
FWL_GRIDMARGIN eMargin,
FX_FLOAT& fMargin) {
- return ((CFWL_GridImp*)m_pData)->GetWidgetMargin(pWidget, eMargin, fMargin);
+ return ((CFWL_GridImp*)m_pImpl)->GetWidgetMargin(pWidget, eMargin, fMargin);
}
FWL_ERR IFWL_Grid::SetWidgetMargin(IFWL_Widget* pWidget,
FWL_GRIDMARGIN eMargin,
FX_FLOAT fMargin) {
- return ((CFWL_GridImp*)m_pData)->SetWidgetMargin(pWidget, eMargin, fMargin);
+ return ((CFWL_GridImp*)m_pImpl)->SetWidgetMargin(pWidget, eMargin, fMargin);
}
FWL_ERR IFWL_Grid::RemoveWidgetMargin(IFWL_Widget* pWidget,
FWL_GRIDMARGIN eMargin) {
- return ((CFWL_GridImp*)m_pData)->RemoveWidgetMargin(pWidget, eMargin);
+ return ((CFWL_GridImp*)m_pImpl)->RemoveWidgetMargin(pWidget, eMargin);
}
FX_FLOAT IFWL_Grid::GetGridSize(FWL_GRIDSIZE eSize, FWL_GRIDUNIT& eUnit) {
- return ((CFWL_GridImp*)m_pData)->GetGridSize(eSize, eUnit);
+ return ((CFWL_GridImp*)m_pImpl)->GetGridSize(eSize, eUnit);
}
FWL_ERR IFWL_Grid::SetGridSize(FWL_GRIDSIZE eSize,
FX_FLOAT fSize,
FWL_GRIDUNIT eUit) {
- return ((CFWL_GridImp*)m_pData)->SetGridSize(eSize, fSize, eUit);
+ return ((CFWL_GridImp*)m_pImpl)->SetGridSize(eSize, fSize, eUit);
}
IFWL_Grid::IFWL_Grid() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_Grid::~IFWL_Grid() {
- if (m_pData) {
- delete (CFWL_GridImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_GridImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
CFWL_GridImp::CFWL_GridImp() {
diff --git a/xfa/src/fwl/src/core/fwl_panelimp.cpp b/xfa/src/fwl/src/core/fwl_panelimp.cpp index bca581b03d..aef3521c5f 100644 --- a/xfa/src/fwl/src/core/fwl_panelimp.cpp +++ b/xfa/src/fwl/src/core/fwl_panelimp.cpp @@ -13,29 +13,29 @@ IFWL_Panel* IFWL_Panel::Create() { return new IFWL_Panel;
}
FWL_ERR IFWL_Panel::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_PanelImp(pOuter);
- ((CFWL_PanelImp*)m_pData)->SetInterface(this);
- return ((CFWL_PanelImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_PanelImp(pOuter);
+ ((CFWL_PanelImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_PanelImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Panel::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_PanelImp(properties, pOuter);
- ((CFWL_PanelImp*)m_pData)->SetInterface(this);
- return ((CFWL_PanelImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_PanelImp(properties, pOuter);
+ ((CFWL_PanelImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_PanelImp*)m_pImpl)->Initialize();
}
IFWL_Content* IFWL_Panel::GetContent() {
- return ((CFWL_PanelImp*)m_pData)->GetContent();
+ return ((CFWL_PanelImp*)m_pImpl)->GetContent();
}
FWL_ERR IFWL_Panel::SetContent(IFWL_Content* pContent) {
- return ((CFWL_PanelImp*)m_pData)->SetContent(pContent);
+ return ((CFWL_PanelImp*)m_pImpl)->SetContent(pContent);
}
IFWL_Panel::IFWL_Panel() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_Panel::~IFWL_Panel() {
- if (m_pData) {
- delete (CFWL_PanelImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_PanelImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
CFWL_PanelImp::CFWL_PanelImp(IFWL_Widget* pOuter)
@@ -142,31 +142,31 @@ IFWL_CustomPanel* IFWL_CustomPanel::Create() { return new IFWL_CustomPanel;
}
FWL_ERR IFWL_CustomPanel::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_CustomPanelImp(pOuter);
- ((CFWL_CustomPanelImp*)m_pData)->SetInterface(this);
- return ((CFWL_CustomPanelImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_CustomPanelImp(pOuter);
+ ((CFWL_CustomPanelImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_CustomPanelImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_CustomPanel::Initialize(CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_CustomPanelImp(properties, pOuter);
- ((CFWL_CustomPanelImp*)m_pData)->SetInterface(this);
- return ((CFWL_CustomPanelImp*)m_pData)->Initialize();
+ m_pImpl = new CFWL_CustomPanelImp(properties, pOuter);
+ ((CFWL_CustomPanelImp*)m_pImpl)->SetInterface(this);
+ return ((CFWL_CustomPanelImp*)m_pImpl)->Initialize();
}
IFWL_Content* IFWL_CustomPanel::GetContent() {
- return ((CFWL_CustomPanelImp*)m_pData)->GetContent();
+ return ((CFWL_CustomPanelImp*)m_pImpl)->GetContent();
}
FWL_ERR IFWL_CustomPanel::SetContent(IFWL_Content* pContent) {
- return ((CFWL_CustomPanelImp*)m_pData)->SetContent(pContent);
+ return ((CFWL_CustomPanelImp*)m_pImpl)->SetContent(pContent);
}
FWL_ERR IFWL_CustomPanel::SetProxy(IFWL_Proxy* pProxy) {
- return ((CFWL_CustomPanelImp*)m_pData)->SetProxy(pProxy);
+ return ((CFWL_CustomPanelImp*)m_pImpl)->SetProxy(pProxy);
}
IFWL_CustomPanel::IFWL_CustomPanel() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_CustomPanel::~IFWL_CustomPanel() {
- if (m_pData) {
- delete (CFWL_CustomPanelImp*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_CustomPanelImp*)m_pImpl;
+ m_pImpl = NULL;
}
}
diff --git a/xfa/src/fwl/src/core/fwl_targetimp.cpp b/xfa/src/fwl/src/core/fwl_targetimp.cpp index cd9bf811a8..1acc56a018 100644 --- a/xfa/src/fwl/src/core/fwl_targetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_targetimp.cpp @@ -7,38 +7,40 @@ #include "../../../foxitlib.h"
#include "include/fwl_targetimp.h"
FX_DWORD IFWL_Target::Release() {
- FX_DWORD dwRef = ((CFWL_Target*)m_pData)->Release();
+ FX_DWORD dwRef = ((CFWL_TargetImp*)m_pImpl)->Release();
if (!dwRef) {
- m_pData = NULL;
+ m_pImpl = NULL;
delete this;
}
return dwRef;
}
IFWL_Target* IFWL_Target::Retain() {
- return ((CFWL_Target*)m_pData)->Retain();
+ return ((CFWL_TargetImp*)m_pImpl)->Retain();
}
FX_DWORD IFWL_Target::GetRefCount() const {
- return ((CFWL_Target*)m_pData)->GetRefCount();
+ return ((CFWL_TargetImp*)m_pImpl)->GetRefCount();
}
FWL_ERR IFWL_Target::GetClassName(CFX_WideString& wsClass) const {
- return ((CFWL_Target*)m_pData)->GetClassName(wsClass);
+ return ((CFWL_TargetImp*)m_pImpl)->GetClassName(wsClass);
}
FX_DWORD IFWL_Target::GetClassID() const {
- return ((CFWL_Target*)m_pData)->GetClassID();
+ return ((CFWL_TargetImp*)m_pImpl)->GetClassID();
}
FX_BOOL IFWL_Target::IsInstance(const CFX_WideStringC& wsClass) const {
- return ((CFWL_Target*)m_pData)->IsInstance(wsClass);
+ return ((CFWL_TargetImp*)m_pImpl)->IsInstance(wsClass);
}
FWL_ERR IFWL_Target::Initialize() {
- return ((CFWL_Target*)m_pData)->Initialize();
+ return ((CFWL_TargetImp*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Target::Finalize() {
- return ((CFWL_Target*)m_pData)->Finalize();
+ return ((CFWL_TargetImp*)m_pImpl)->Finalize();
}
IFWL_Target::~IFWL_Target() {}
-CFWL_Target::CFWL_Target() : m_dwRefCount(1) {}
-CFWL_Target::~CFWL_Target() {}
-FX_DWORD CFWL_Target::Release() {
+CFWL_TargetImp::CFWL_TargetImp() : m_dwRefCount(1) {
+}
+CFWL_TargetImp::~CFWL_TargetImp() {
+}
+FX_DWORD CFWL_TargetImp::Release() {
m_dwRefCount--;
FX_DWORD dwRet = m_dwRefCount;
if (!m_dwRefCount) {
@@ -46,31 +48,25 @@ FX_DWORD CFWL_Target::Release() { }
return dwRet;
}
-IFWL_Target* CFWL_Target::Retain() {
+IFWL_Target* CFWL_TargetImp::Retain() {
m_dwRefCount++;
return (IFWL_Target*)this;
}
-FX_DWORD CFWL_Target::GetRefCount() const {
+FX_DWORD CFWL_TargetImp::GetRefCount() const {
return m_dwRefCount;
}
-FWL_ERR CFWL_Target::GetClassName(CFX_WideString& wsClass) const {
+FWL_ERR CFWL_TargetImp::GetClassName(CFX_WideString& wsClass) const {
return FWL_ERR_Succeeded;
}
-FX_DWORD CFWL_Target::GetClassID() const {
+FX_DWORD CFWL_TargetImp::GetClassID() const {
return 0;
}
-FX_BOOL CFWL_Target::IsInstance(const CFX_WideStringC& wsClass) const {
+FX_BOOL CFWL_TargetImp::IsInstance(const CFX_WideStringC& wsClass) const {
return FALSE;
}
-FWL_ERR CFWL_Target::Initialize() {
+FWL_ERR CFWL_TargetImp::Initialize() {
return FWL_ERR_Succeeded;
}
-FWL_ERR CFWL_Target::Finalize() {
+FWL_ERR CFWL_TargetImp::Finalize() {
return FWL_ERR_Succeeded;
}
-void* IFWL_TargetData::GetData() {
- return m_pData;
-}
-void IFWL_TargetData::SetData(void* pData) {
- m_pData = pData;
-}
diff --git a/xfa/src/fwl/src/core/fwl_widgetimp.cpp b/xfa/src/fwl/src/core/fwl_widgetimp.cpp index d5246d31e7..7dda3ec490 100644 --- a/xfa/src/fwl/src/core/fwl_widgetimp.cpp +++ b/xfa/src/fwl/src/core/fwl_widgetimp.cpp @@ -12,109 +12,109 @@ #include "include/fwl_widgetmgrimp.h"
#include "include/fwl_widgetimp.h"
FWL_ERR IFWL_Widget::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
- return ((CFWL_WidgetImp*)m_pData)->GetWidgetRect(rect, bAutoSize);
+ return ((CFWL_WidgetImp*)m_pImpl)->GetWidgetRect(rect, bAutoSize);
}
FWL_ERR IFWL_Widget::GetGlobalRect(CFX_RectF& rect) {
- return ((CFWL_WidgetImp*)m_pData)->GetGlobalRect(rect);
+ return ((CFWL_WidgetImp*)m_pImpl)->GetGlobalRect(rect);
}
FWL_ERR IFWL_Widget::SetWidgetRect(const CFX_RectF& rect) {
- return ((CFWL_WidgetImp*)m_pData)->SetWidgetRect(rect);
+ return ((CFWL_WidgetImp*)m_pImpl)->SetWidgetRect(rect);
}
FWL_ERR IFWL_Widget::GetClientRect(CFX_RectF& rect) {
- return ((CFWL_WidgetImp*)m_pData)->GetClientRect(rect);
+ return ((CFWL_WidgetImp*)m_pImpl)->GetClientRect(rect);
}
IFWL_Widget* IFWL_Widget::GetParent() {
- return ((CFWL_WidgetImp*)m_pData)->GetParent();
+ return ((CFWL_WidgetImp*)m_pImpl)->GetParent();
}
FWL_ERR IFWL_Widget::SetParent(IFWL_Widget* pParent) {
- return ((CFWL_WidgetImp*)m_pData)->SetParent(pParent);
+ return ((CFWL_WidgetImp*)m_pImpl)->SetParent(pParent);
}
IFWL_Widget* IFWL_Widget::GetOwner() {
- return ((CFWL_WidgetImp*)m_pData)->GetOwner();
+ return ((CFWL_WidgetImp*)m_pImpl)->GetOwner();
}
FWL_ERR IFWL_Widget::SetOwner(IFWL_Widget* pOwner) {
- return ((CFWL_WidgetImp*)m_pData)->SetOwner(pOwner);
+ return ((CFWL_WidgetImp*)m_pImpl)->SetOwner(pOwner);
}
IFWL_Widget* IFWL_Widget::GetOuter() {
- return ((CFWL_WidgetImp*)m_pData)->GetOuter();
+ return ((CFWL_WidgetImp*)m_pImpl)->GetOuter();
}
FX_DWORD IFWL_Widget::GetStyles() {
- return ((CFWL_WidgetImp*)m_pData)->GetStyles();
+ return ((CFWL_WidgetImp*)m_pImpl)->GetStyles();
}
FWL_ERR IFWL_Widget::ModifyStyles(FX_DWORD dwStylesAdded,
FX_DWORD dwStylesRemoved) {
- return ((CFWL_WidgetImp*)m_pData)
+ return ((CFWL_WidgetImp*)m_pImpl)
->ModifyStyles(dwStylesAdded, dwStylesRemoved);
}
FX_DWORD IFWL_Widget::GetStylesEx() {
- return ((CFWL_WidgetImp*)m_pData)->GetStylesEx();
+ return ((CFWL_WidgetImp*)m_pImpl)->GetStylesEx();
}
FWL_ERR IFWL_Widget::ModifyStylesEx(FX_DWORD dwStylesExAdded,
FX_DWORD dwStylesExRemoved) {
- return ((CFWL_WidgetImp*)m_pData)
+ return ((CFWL_WidgetImp*)m_pImpl)
->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
}
FX_DWORD IFWL_Widget::GetStates() {
- return ((CFWL_WidgetImp*)m_pData)->GetStates();
+ return ((CFWL_WidgetImp*)m_pImpl)->GetStates();
}
FWL_ERR IFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet) {
- return ((CFWL_WidgetImp*)m_pData)->SetStates(dwStates, bSet);
+ return ((CFWL_WidgetImp*)m_pImpl)->SetStates(dwStates, bSet);
}
FWL_ERR IFWL_Widget::SetPrivateData(void* module_id,
void* pData,
PD_CALLBACK_FREEDATA callback) {
- return ((CFWL_WidgetImp*)m_pData)->SetPrivateData(module_id, pData, callback);
+ return ((CFWL_WidgetImp*)m_pImpl)->SetPrivateData(module_id, pData, callback);
}
void* IFWL_Widget::GetPrivateData(void* module_id) {
- return ((CFWL_WidgetImp*)m_pData)->GetPrivateData(module_id);
+ return ((CFWL_WidgetImp*)m_pImpl)->GetPrivateData(module_id);
}
FWL_ERR IFWL_Widget::Update() {
- return ((CFWL_WidgetImp*)m_pData)->Update();
+ return ((CFWL_WidgetImp*)m_pImpl)->Update();
}
FWL_ERR IFWL_Widget::LockUpdate() {
- return ((CFWL_WidgetImp*)m_pData)->LockUpdate();
+ return ((CFWL_WidgetImp*)m_pImpl)->LockUpdate();
}
FWL_ERR IFWL_Widget::UnlockUpdate() {
- return ((CFWL_WidgetImp*)m_pData)->UnlockUpdate();
+ return ((CFWL_WidgetImp*)m_pImpl)->UnlockUpdate();
}
FX_DWORD IFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
- return ((CFWL_WidgetImp*)m_pData)->HitTest(fx, fy);
+ return ((CFWL_WidgetImp*)m_pImpl)->HitTest(fx, fy);
}
FWL_ERR IFWL_Widget::TransformTo(IFWL_Widget* pWidget,
FX_FLOAT& fx,
FX_FLOAT& fy) {
- return ((CFWL_WidgetImp*)m_pData)->TransformTo(pWidget, fx, fy);
+ return ((CFWL_WidgetImp*)m_pImpl)->TransformTo(pWidget, fx, fy);
}
FWL_ERR IFWL_Widget::TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt) {
- return ((CFWL_WidgetImp*)m_pData)->TransformTo(pWidget, rt);
+ return ((CFWL_WidgetImp*)m_pImpl)->TransformTo(pWidget, rt);
}
FWL_ERR IFWL_Widget::GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal) {
- return ((CFWL_WidgetImp*)m_pData)->GetMatrix(matrix, bGlobal);
+ return ((CFWL_WidgetImp*)m_pImpl)->GetMatrix(matrix, bGlobal);
}
FWL_ERR IFWL_Widget::SetMatrix(const CFX_Matrix& matrix) {
- return ((CFWL_WidgetImp*)m_pData)->SetMatrix(matrix);
+ return ((CFWL_WidgetImp*)m_pImpl)->SetMatrix(matrix);
}
FWL_ERR IFWL_Widget::DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {
- return ((CFWL_WidgetImp*)m_pData)->DrawWidget(pGraphics, pMatrix);
+ return ((CFWL_WidgetImp*)m_pImpl)->DrawWidget(pGraphics, pMatrix);
}
IFWL_ThemeProvider* IFWL_Widget::GetThemeProvider() {
- return ((CFWL_WidgetImp*)m_pData)->GetThemeProvider();
+ return ((CFWL_WidgetImp*)m_pImpl)->GetThemeProvider();
}
FWL_ERR IFWL_Widget::SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) {
- return ((CFWL_WidgetImp*)m_pData)->SetThemeProvider(pThemeProvider);
+ return ((CFWL_WidgetImp*)m_pImpl)->SetThemeProvider(pThemeProvider);
}
FWL_ERR IFWL_Widget::SetDataProvider(IFWL_DataProvider* pDataProvider) {
- return ((CFWL_WidgetImp*)m_pData)->SetDataProvider(pDataProvider);
+ return ((CFWL_WidgetImp*)m_pImpl)->SetDataProvider(pDataProvider);
}
IFWL_WidgetDelegate* IFWL_Widget::SetDelegate(IFWL_WidgetDelegate* pDelegate) {
- return ((CFWL_WidgetImp*)m_pData)->SetDelegate(pDelegate);
+ return ((CFWL_WidgetImp*)m_pImpl)->SetDelegate(pDelegate);
}
IFWL_NoteThread* IFWL_Widget::GetOwnerThread() const {
- return ((CFWL_WidgetImp*)m_pData)->GetOwnerThread();
+ return ((CFWL_WidgetImp*)m_pImpl)->GetOwnerThread();
}
CFX_SizeF IFWL_Widget::GetOffsetFromParent(IFWL_Widget* pParent) {
- return ((CFWL_WidgetImp*)m_pData)->GetOffsetFromParent(pParent);
+ return ((CFWL_WidgetImp*)m_pImpl)->GetOffsetFromParent(pParent);
}
FWL_ERR CFWL_WidgetImp::Initialize() {
IFWL_App* pApp = FWL_GetApp();
@@ -1115,27 +1115,27 @@ IFWL_Custom* IFWL_Custom::Create() { return new IFWL_Custom;
}
IFWL_Custom::IFWL_Custom() {
- m_pData = NULL;
+ m_pImpl = NULL;
}
IFWL_Custom::~IFWL_Custom() {
- if (m_pData) {
- delete (CFWL_Custom*)m_pData;
- m_pData = NULL;
+ if (m_pImpl) {
+ delete (CFWL_Custom*)m_pImpl;
+ m_pImpl = NULL;
}
}
FWL_ERR IFWL_Custom::Initialize(IFWL_Widget* pOuter) {
- m_pData = new CFWL_Custom(pOuter);
- ((CFWL_Custom*)m_pData)->SetInterface(this);
- return ((CFWL_Custom*)m_pData)->Initialize();
+ m_pImpl = new CFWL_Custom(pOuter);
+ ((CFWL_Custom*)m_pImpl)->SetInterface(this);
+ return ((CFWL_Custom*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Custom::Initialize(const CFWL_WidgetImpProperties& properties,
IFWL_Widget* pOuter) {
- m_pData = new CFWL_Custom(properties, pOuter);
- ((CFWL_Custom*)m_pData)->SetInterface(this);
- return ((CFWL_Custom*)m_pData)->Initialize();
+ m_pImpl = new CFWL_Custom(properties, pOuter);
+ ((CFWL_Custom*)m_pImpl)->SetInterface(this);
+ return ((CFWL_Custom*)m_pImpl)->Initialize();
}
FWL_ERR IFWL_Custom::SetProxy(IFWL_Proxy* pProxy) {
- return ((CFWL_Custom*)m_pData)->SetProxy(pProxy);
+ return ((CFWL_Custom*)m_pImpl)->SetProxy(pProxy);
}
void FWL_SetWidgetRect(IFWL_Widget* widget, const CFX_RectF& rect) {
((CFWL_WidgetImp*)((IFWL_TargetData*)widget)->GetData())
diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h index 93aeae05b1..bd1f2da7ea 100644 --- a/xfa/src/fwl/src/core/include/fwl_noteimp.h +++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h @@ -6,7 +6,7 @@ #ifndef _FWL_NOTE_IMP_H
#define _FWL_NOTE_IMP_H
-class CFWL_Target;
+class CFWL_TargetImp;
class CFWL_WidgetImp;
class CFWL_NoteThread;
class CFWL_ToolTipImp;
diff --git a/xfa/src/fwl/src/core/include/fwl_targetimp.h b/xfa/src/fwl/src/core/include/fwl_targetimp.h index 3dd3f6aeb8..292506a2f3 100644 --- a/xfa/src/fwl/src/core/include/fwl_targetimp.h +++ b/xfa/src/fwl/src/core/include/fwl_targetimp.h @@ -4,10 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-#ifndef _FWL_TARGET_IMP_H
-#define _FWL_TARGET_IMP_H
-class IFWL_Target;
-class CFWL_Target {
+#ifndef FWL_TARGETIMP_H_
+#define FWL_TARGETIMP_H_
+
+#include "core/include/fxcrt/fx_basic.h"
+#include "xfa/include/fwl/core/fwl_target.h"
+
+class CFWL_TargetImp {
public:
virtual FX_DWORD Release();
virtual IFWL_Target* Retain();
@@ -19,13 +22,15 @@ class CFWL_Target { virtual FWL_ERR Finalize();
protected:
- CFWL_Target();
- virtual ~CFWL_Target();
+ CFWL_TargetImp();
+ virtual ~CFWL_TargetImp();
FX_DWORD m_dwRefCount;
};
+
class IFWL_TargetData : public IFWL_Target {
public:
- void* GetData();
- void SetData(void* pData);
+ CFWL_TargetImp* GetData() const { return m_pImpl; }
+ void SetData(CFWL_TargetImp* pImpl) { m_pImpl = pImpl; }
};
-#endif
+
+#endif // FWL_TARGETIMP_H_
diff --git a/xfa/src/fwl/src/core/include/fwl_threadimp.h b/xfa/src/fwl/src/core/include/fwl_threadimp.h index 735708d98c..a8e156d1b3 100644 --- a/xfa/src/fwl/src/core/include/fwl_threadimp.h +++ b/xfa/src/fwl/src/core/include/fwl_threadimp.h @@ -6,7 +6,7 @@ #ifndef _FWL_THREAD_IMP_H
#define _FWL_THREAD_IMP_H
-class CFWL_Target;
+class CFWL_TargetImp;
class CFWL_NoteDriver;
class IFWL_NoteThread;
class IFWL_NoteDriver;
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h index f32f7e1ad0..38a2e4a89a 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h +++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h @@ -15,7 +15,7 @@ class IFWL_ThemeProvider; class IFWL_DataProvider;
class IFWL_WidgetDelegate;
class CFWL_WidgetImp;
-class CFWL_WidgetImp : public CFWL_Target {
+class CFWL_WidgetImp : public CFWL_TargetImp {
public:
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h index b5d59b9dd2..4511d77ad8 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h +++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h @@ -6,7 +6,7 @@ #ifndef _FWL_WIDGETMGR_IMP_H
#define _FWL_WIDGETMGR_IMP_H
-class CFWL_Target;
+class CFWL_TargetImp;
class IFWL_Widget;
class IFWL_AdapterWidgetMgr;
class CFWL_WidgetMgrItem;
diff --git a/xfa/src/fwl/src/lightwidget/barcode.cpp b/xfa/src/fwl/src/lightwidget/barcode.cpp index 3c881b6254..9721104c70 100644 --- a/xfa/src/fwl/src/lightwidget/barcode.cpp +++ b/xfa/src/fwl/src/lightwidget/barcode.cpp @@ -9,7 +9,7 @@ CFWL_Barcode* CFWL_Barcode::Create() { return new CFWL_Barcode;
}
FWL_ERR CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -26,8 +26,8 @@ FWL_ERR CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) { if (m_pProperties->m_pOwner) {
prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
- m_pImp = IFWL_Barcode::Create();
- FWL_ERR ret = ((IFWL_Barcode*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_Barcode::Create();
+ FWL_ERR ret = ((IFWL_Barcode*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
@@ -36,12 +36,12 @@ FWL_ERR CFWL_Barcode::Initialize(const CFWL_WidgetProperties* pProperties) { CFWL_Barcode::CFWL_Barcode() {}
CFWL_Barcode::~CFWL_Barcode() {}
void CFWL_Barcode::SetType(BC_TYPE type) {
- _FWL_RETURN_IF_FAIL(m_pImp);
- ((IFWL_Barcode*)m_pImp)->SetType(type);
+ _FWL_RETURN_IF_FAIL(m_pIface);
+ ((IFWL_Barcode*)m_pIface)->SetType(type);
}
FX_BOOL CFWL_Barcode::IsProtectedType() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_Barcode*)m_pImp)->IsProtectedType();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_Barcode*)m_pIface)->IsProtectedType();
}
FWL_ERR CFWL_Barcode::CFWL_BarcodeDP::GetCaption(IFWL_Widget* pWidget,
CFX_WideString& wsCaption) {
diff --git a/xfa/src/fwl/src/lightwidget/caret.cpp b/xfa/src/fwl/src/lightwidget/caret.cpp index b182be0879..20af355b1c 100644 --- a/xfa/src/fwl/src/lightwidget/caret.cpp +++ b/xfa/src/fwl/src/lightwidget/caret.cpp @@ -9,7 +9,7 @@ CFWL_Caret* CFWL_Caret::Create() { return new CFWL_Caret;
}
FWL_ERR CFWL_Caret::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -25,24 +25,24 @@ FWL_ERR CFWL_Caret::Initialize(const CFWL_WidgetProperties* pProperties) { if (m_pProperties->m_pOwner) {
prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
- m_pImp = IFWL_Caret::Create();
- FWL_ERR ret = ((IFWL_Caret*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_Caret::Create();
+ FWL_ERR ret = ((IFWL_Caret*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
return ret;
}
FWL_ERR CFWL_Caret::ShowCaret(FX_BOOL bFlag) {
- return ((IFWL_Caret*)m_pImp)->ShowCaret(bFlag);
+ return ((IFWL_Caret*)m_pIface)->ShowCaret(bFlag);
}
FWL_ERR CFWL_Caret::GetFrequency(FX_DWORD& elapse) {
- return ((IFWL_Caret*)m_pImp)->GetFrequency(elapse);
+ return ((IFWL_Caret*)m_pIface)->GetFrequency(elapse);
}
FWL_ERR CFWL_Caret::SetFrequency(FX_DWORD elapse) {
- return ((IFWL_Caret*)m_pImp)->SetFrequency(elapse);
+ return ((IFWL_Caret*)m_pIface)->SetFrequency(elapse);
}
FWL_ERR CFWL_Caret::SetColor(CFX_Color crFill) {
- return ((IFWL_Caret*)m_pImp)->SetColor(crFill);
+ return ((IFWL_Caret*)m_pIface)->SetColor(crFill);
}
CFWL_Caret::CFWL_Caret() {}
CFWL_Caret::~CFWL_Caret() {}
diff --git a/xfa/src/fwl/src/lightwidget/checkbox.cpp b/xfa/src/fwl/src/lightwidget/checkbox.cpp index fe2a7595da..06513b7ca3 100644 --- a/xfa/src/fwl/src/lightwidget/checkbox.cpp +++ b/xfa/src/fwl/src/lightwidget/checkbox.cpp @@ -9,7 +9,7 @@ CFWL_CheckBox* CFWL_CheckBox::Create() { return new CFWL_CheckBox;
}
FWL_ERR CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -26,8 +26,8 @@ FWL_ERR CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) { if (m_pProperties->m_pOwner) {
prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
- m_pImp = IFWL_CheckBox::Create();
- FWL_ERR ret = ((IFWL_CheckBox*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_CheckBox::Create();
+ FWL_ERR ret = ((IFWL_CheckBox*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
@@ -42,10 +42,10 @@ FWL_ERR CFWL_CheckBox::SetBoxSize(FX_FLOAT fHeight) { return FWL_ERR_Succeeded;
}
int32_t CFWL_CheckBox::GetCheckState() {
- return ((IFWL_CheckBox*)m_pImp)->GetCheckState();
+ return ((IFWL_CheckBox*)m_pIface)->GetCheckState();
}
FWL_ERR CFWL_CheckBox::SetCheckState(int32_t iCheck) {
- return ((IFWL_CheckBox*)m_pImp)->SetCheckState(iCheck);
+ return ((IFWL_CheckBox*)m_pIface)->SetCheckState(iCheck);
}
CFWL_CheckBox::CFWL_CheckBox() {}
CFWL_CheckBox::~CFWL_CheckBox() {}
diff --git a/xfa/src/fwl/src/lightwidget/combobox.cpp b/xfa/src/fwl/src/lightwidget/combobox.cpp index e8ae65cf6c..aa6bb52788 100644 --- a/xfa/src/fwl/src/lightwidget/combobox.cpp +++ b/xfa/src/fwl/src/lightwidget/combobox.cpp @@ -9,7 +9,7 @@ CFWL_ComboBox* CFWL_ComboBox::Create() { return new CFWL_ComboBox;
}
FWL_ERR CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -26,8 +26,8 @@ FWL_ERR CFWL_ComboBox::Initialize(const CFWL_WidgetProperties* pProperties) { if (m_pProperties->m_pOwner) {
prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
- m_pImp = IFWL_ComboBox::Create();
- FWL_ERR ret = ((IFWL_ComboBox*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_ComboBox::Create();
+ FWL_ERR ret = ((IFWL_ComboBox*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
@@ -65,54 +65,54 @@ FWL_ERR CFWL_ComboBox::GetTextByIndex(int32_t iIndex, CFX_WideString& wsText) { return FWL_ERR_Succeeded;
}
int32_t CFWL_ComboBox::GetCurSel() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);
- return ((IFWL_ComboBox*)m_pImp)->GetCurSel();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, -1);
+ return ((IFWL_ComboBox*)m_pIface)->GetCurSel();
}
FWL_ERR CFWL_ComboBox::SetCurSel(int32_t iSel) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ComboBox*)m_pImp)->SetCurSel(iSel);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ComboBox*)m_pIface)->SetCurSel(iSel);
}
FWL_ERR CFWL_ComboBox::SetEditText(const CFX_WideStringC& wsText) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ComboBox*)m_pImp)->SetEditText(wsText);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ComboBox*)m_pIface)->SetEditText(wsText);
}
int32_t CFWL_ComboBox::GetEditTextLength() const {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_ComboBox*)m_pImp)->GetEditTextLength();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_ComboBox*)m_pIface)->GetEditTextLength();
}
FWL_ERR CFWL_ComboBox::GetEditText(CFX_WideString& wsText,
int32_t nStart,
int32_t nCount) const {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ComboBox*)m_pImp)->GetEditText(wsText, nStart, nCount);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ComboBox*)m_pIface)->GetEditText(wsText, nStart, nCount);
}
FWL_ERR CFWL_ComboBox::SetEditSelRange(int32_t nStart, int32_t nCount) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ComboBox*)m_pImp)->SetEditSelRange(nStart, nCount);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ComboBox*)m_pIface)->SetEditSelRange(nStart, nCount);
}
int32_t CFWL_ComboBox::GetEditSelRange(int32_t nIndex, int32_t& nStart) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_ComboBox*)m_pImp)->GetEditSelRange(nIndex, nStart);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_ComboBox*)m_pIface)->GetEditSelRange(nIndex, nStart);
}
int32_t CFWL_ComboBox::GetEditLimit() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_ComboBox*)m_pImp)->GetEditLimit();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_ComboBox*)m_pIface)->GetEditLimit();
}
FWL_ERR CFWL_ComboBox::SetEditLimit(int32_t nLimit) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ComboBox*)m_pImp)->SetEditLimit(nLimit);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ComboBox*)m_pIface)->SetEditLimit(nLimit);
}
FWL_ERR CFWL_ComboBox::EditDoClipboard(int32_t iCmd) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ComboBox*)m_pImp)->EditDoClipboard(iCmd);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ComboBox*)m_pIface)->EditDoClipboard(iCmd);
}
FX_BOOL CFWL_ComboBox::EditRedo(const CFX_ByteStringC& bsRecord) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditRedo(bsRecord);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditRedo(bsRecord);
}
FX_BOOL CFWL_ComboBox::EditUndo(const CFX_ByteStringC& bsRecord) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditUndo(bsRecord);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditUndo(bsRecord);
}
FWL_ERR CFWL_ComboBox::SetMaxListHeight(FX_FLOAT fMaxHeight) {
m_comboBoxData.m_fMaxListHeight = fMaxHeight;
@@ -132,74 +132,74 @@ void* CFWL_ComboBox::GetItemData(int32_t iIndex) { return pItem->m_pData;
}
FWL_ERR CFWL_ComboBox::SetListTheme(IFWL_ThemeProvider* pTheme) {
- return ((IFWL_ComboBox*)m_pImp)->GetListBoxt()->SetThemeProvider(pTheme);
+ return ((IFWL_ComboBox*)m_pIface)->GetListBoxt()->SetThemeProvider(pTheme);
}
FX_BOOL CFWL_ComboBox::AfterFocusShowDropList() {
- return ((IFWL_ComboBox*)m_pImp)->AfterFocusShowDropList();
+ return ((IFWL_ComboBox*)m_pIface)->AfterFocusShowDropList();
}
FWL_ERR CFWL_ComboBox::OpenDropDownList(FX_BOOL bActivate) {
- return ((IFWL_ComboBox*)m_pImp)->OpenDropDownList(bActivate);
+ return ((IFWL_ComboBox*)m_pIface)->OpenDropDownList(bActivate);
}
FX_BOOL CFWL_ComboBox::EditCanUndo() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditCanUndo();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditCanUndo();
}
FX_BOOL CFWL_ComboBox::EditCanRedo() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditCanRedo();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditCanRedo();
}
FX_BOOL CFWL_ComboBox::EditUndo() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditUndo();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditUndo();
}
FX_BOOL CFWL_ComboBox::EditRedo() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditRedo();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditRedo();
}
FX_BOOL CFWL_ComboBox::EditCanCopy() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditCanCopy();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditCanCopy();
}
FX_BOOL CFWL_ComboBox::EditCanCut() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditCanCut();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditCanCut();
}
FX_BOOL CFWL_ComboBox::EditCanSelectAll() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditCanSelectAll();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditCanSelectAll();
}
FX_BOOL CFWL_ComboBox::EditCopy(CFX_WideString& wsCopy) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditCopy(wsCopy);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditCopy(wsCopy);
}
FX_BOOL CFWL_ComboBox::EditCut(CFX_WideString& wsCut) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditCut(wsCut);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditCut(wsCut);
}
FX_BOOL CFWL_ComboBox::EditPaste(const CFX_WideString& wsPaste) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditPaste(wsPaste);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditPaste(wsPaste);
}
FX_BOOL CFWL_ComboBox::EditSelectAll() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditSelectAll();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditSelectAll();
}
FX_BOOL CFWL_ComboBox::EditDelete() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditDelete();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditDelete();
}
FX_BOOL CFWL_ComboBox::EditDeSelect() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->EditDeSelect();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->EditDeSelect();
}
FWL_ERR CFWL_ComboBox::GetBBox(CFX_RectF& rect) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)->GetBBox(rect);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)->GetBBox(rect);
}
FWL_ERR CFWL_ComboBox::EditModifyStylesEx(FX_DWORD dwStylesExAdded,
FX_DWORD dwStylesExRemoved) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ComboBox*)m_pImp)
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ComboBox*)m_pIface)
->EditModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
}
CFWL_ComboBox::CFWL_ComboBox() {}
diff --git a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp index 0770659f9b..b891f4cc00 100644 --- a/xfa/src/fwl/src/lightwidget/datetimepicker.cpp +++ b/xfa/src/fwl/src/lightwidget/datetimepicker.cpp @@ -10,7 +10,7 @@ CFWL_DateTimePicker* CFWL_DateTimePicker::Create() { }
FWL_ERR CFWL_DateTimePicker::Initialize(
const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -27,8 +27,8 @@ FWL_ERR CFWL_DateTimePicker::Initialize( prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
prop.m_rtWidget = m_pProperties->m_rtWidget;
- m_pImp = IFWL_DateTimePicker::Create();
- FWL_ERR ret = ((IFWL_DateTimePicker*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_DateTimePicker::Create();
+ FWL_ERR ret = ((IFWL_DateTimePicker*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
@@ -43,26 +43,26 @@ FWL_ERR CFWL_DateTimePicker::SetToday(int32_t iYear, return FWL_ERR_Succeeded;
}
int32_t CFWL_DateTimePicker::CountSelRanges() {
- return ((IFWL_DateTimePicker*)m_pImp)->CountSelRanges();
+ return ((IFWL_DateTimePicker*)m_pIface)->CountSelRanges();
}
int32_t CFWL_DateTimePicker::GetSelRange(int32_t nIndex, int32_t& nStart) {
- return ((IFWL_DateTimePicker*)m_pImp)->GetSelRange(nIndex, nStart);
+ return ((IFWL_DateTimePicker*)m_pIface)->GetSelRange(nIndex, nStart);
}
FWL_ERR CFWL_DateTimePicker::GetEditText(CFX_WideString& wsText) {
- return ((IFWL_DateTimePicker*)m_pImp)->GetEditText(wsText);
+ return ((IFWL_DateTimePicker*)m_pIface)->GetEditText(wsText);
}
FWL_ERR CFWL_DateTimePicker::SetEditText(const CFX_WideStringC& wsText) {
- return ((IFWL_DateTimePicker*)m_pImp)->SetEditText(wsText);
+ return ((IFWL_DateTimePicker*)m_pIface)->SetEditText(wsText);
}
FWL_ERR CFWL_DateTimePicker::GetCurSel(int32_t& iYear,
int32_t& iMonth,
int32_t& iDay) {
- return ((IFWL_DateTimePicker*)m_pImp)->GetCurSel(iYear, iMonth, iDay);
+ return ((IFWL_DateTimePicker*)m_pIface)->GetCurSel(iYear, iMonth, iDay);
}
FWL_ERR CFWL_DateTimePicker::SetCurSel(int32_t iYear,
int32_t iMonth,
int32_t iDay) {
- return ((IFWL_DateTimePicker*)m_pImp)->SetCurSel(iYear, iMonth, iDay);
+ return ((IFWL_DateTimePicker*)m_pIface)->SetCurSel(iYear, iMonth, iDay);
}
CFWL_DateTimePicker::CFWL_DateTimePicker() {}
CFWL_DateTimePicker::~CFWL_DateTimePicker() {}
@@ -88,52 +88,52 @@ FWL_ERR CFWL_DateTimePicker::CFWL_DateTimePickerDP::GetToday( return FWL_ERR_Succeeded;
}
FX_BOOL CFWL_DateTimePicker::CanUndo() {
- return ((IFWL_DateTimePicker*)m_pImp)->CanUndo();
+ return ((IFWL_DateTimePicker*)m_pIface)->CanUndo();
}
FX_BOOL CFWL_DateTimePicker::CanRedo() {
- return ((IFWL_DateTimePicker*)m_pImp)->CanRedo();
+ return ((IFWL_DateTimePicker*)m_pIface)->CanRedo();
}
FX_BOOL CFWL_DateTimePicker::Undo() {
- return ((IFWL_DateTimePicker*)m_pImp)->Undo();
+ return ((IFWL_DateTimePicker*)m_pIface)->Undo();
}
FX_BOOL CFWL_DateTimePicker::Redo() {
- return ((IFWL_DateTimePicker*)m_pImp)->Redo();
+ return ((IFWL_DateTimePicker*)m_pIface)->Redo();
}
FX_BOOL CFWL_DateTimePicker::CanCopy() {
- return ((IFWL_DateTimePicker*)m_pImp)->CanCopy();
+ return ((IFWL_DateTimePicker*)m_pIface)->CanCopy();
}
FX_BOOL CFWL_DateTimePicker::CanCut() {
- return ((IFWL_DateTimePicker*)m_pImp)->CanCut();
+ return ((IFWL_DateTimePicker*)m_pIface)->CanCut();
}
FX_BOOL CFWL_DateTimePicker::CanSelectAll() {
- return ((IFWL_DateTimePicker*)m_pImp)->CanSelectAll();
+ return ((IFWL_DateTimePicker*)m_pIface)->CanSelectAll();
}
FX_BOOL CFWL_DateTimePicker::Copy(CFX_WideString& wsCopy) {
- return ((IFWL_DateTimePicker*)m_pImp)->Copy(wsCopy);
+ return ((IFWL_DateTimePicker*)m_pIface)->Copy(wsCopy);
}
FX_BOOL CFWL_DateTimePicker::Cut(CFX_WideString& wsCut) {
- return ((IFWL_DateTimePicker*)m_pImp)->Copy(wsCut);
+ return ((IFWL_DateTimePicker*)m_pIface)->Copy(wsCut);
}
FX_BOOL CFWL_DateTimePicker::Paste(const CFX_WideString& wsPaste) {
- return ((IFWL_DateTimePicker*)m_pImp)->Paste(wsPaste);
+ return ((IFWL_DateTimePicker*)m_pIface)->Paste(wsPaste);
}
FX_BOOL CFWL_DateTimePicker::SelectAll() {
- return ((IFWL_DateTimePicker*)m_pImp)->SelectAll();
+ return ((IFWL_DateTimePicker*)m_pIface)->SelectAll();
}
FX_BOOL CFWL_DateTimePicker::Delete() {
- return ((IFWL_DateTimePicker*)m_pImp)->Delete();
+ return ((IFWL_DateTimePicker*)m_pIface)->Delete();
}
FX_BOOL CFWL_DateTimePicker::DeSelect() {
- return ((IFWL_DateTimePicker*)m_pImp)->DeSelect();
+ return ((IFWL_DateTimePicker*)m_pIface)->DeSelect();
}
FWL_ERR CFWL_DateTimePicker::GetBBox(CFX_RectF& rect) {
- return ((IFWL_DateTimePicker*)m_pImp)->GetBBox(rect);
+ return ((IFWL_DateTimePicker*)m_pIface)->GetBBox(rect);
}
FWL_ERR CFWL_DateTimePicker::SetEditLimit(int32_t nLimit) {
- return ((IFWL_DateTimePicker*)m_pImp)->SetEditLimit(nLimit);
+ return ((IFWL_DateTimePicker*)m_pIface)->SetEditLimit(nLimit);
}
FWL_ERR CFWL_DateTimePicker::ModifyEditStylesEx(FX_DWORD dwStylesExAdded,
FX_DWORD dwStylesExRemoved) {
- return ((IFWL_DateTimePicker*)m_pImp)
+ return ((IFWL_DateTimePicker*)m_pIface)
->ModifyEditStylesEx(dwStylesExAdded, dwStylesExRemoved);
}
diff --git a/xfa/src/fwl/src/lightwidget/edit.cpp b/xfa/src/fwl/src/lightwidget/edit.cpp index 0edc533752..0b14ae69b7 100644 --- a/xfa/src/fwl/src/lightwidget/edit.cpp +++ b/xfa/src/fwl/src/lightwidget/edit.cpp @@ -9,7 +9,7 @@ CFWL_Edit* CFWL_Edit::Create() { return new CFWL_Edit;
}
FWL_ERR CFWL_Edit::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -25,167 +25,167 @@ FWL_ERR CFWL_Edit::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
prop.m_rtWidget = m_pProperties->m_rtWidget;
- m_pImp = IFWL_Edit::Create();
- FWL_ERR ret = ((IFWL_Edit*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_Edit::Create();
+ FWL_ERR ret = ((IFWL_Edit*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
return ret;
}
FWL_ERR CFWL_Edit::SetText(const CFX_WideString& wsText) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->SetText(wsText);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->SetText(wsText);
}
int32_t CFWL_Edit::GetTextLength() const {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_Edit*)m_pImp)->GetTextLength();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_Edit*)m_pIface)->GetTextLength();
}
FWL_ERR CFWL_Edit::GetText(CFX_WideString& wsText,
int32_t nStart,
int32_t nCount) const {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->GetText(wsText, nStart, nCount);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->GetText(wsText, nStart, nCount);
}
FWL_ERR CFWL_Edit::ClearText() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->ClearText();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->ClearText();
}
int32_t CFWL_Edit::GetCaretPos() const {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);
- return ((IFWL_Edit*)m_pImp)->GetCaretPos();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, -1);
+ return ((IFWL_Edit*)m_pIface)->GetCaretPos();
}
int32_t CFWL_Edit::SetCaretPos(int32_t nIndex, FX_BOOL bBefore) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);
- return ((IFWL_Edit*)m_pImp)->SetCaretPos(nIndex, bBefore);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, -1);
+ return ((IFWL_Edit*)m_pIface)->SetCaretPos(nIndex, bBefore);
}
FWL_ERR CFWL_Edit::AddSelRange(int32_t nStart, int32_t nCount) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- ((IFWL_Edit*)m_pImp)->AddSelRange(nStart, nCount);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ ((IFWL_Edit*)m_pIface)->AddSelRange(nStart, nCount);
int32_t pos = 0;
- int32_t sum = ((IFWL_Edit*)m_pImp)->GetTextLength();
+ int32_t sum = ((IFWL_Edit*)m_pIface)->GetTextLength();
if (nCount == -1) {
pos = sum;
} else {
pos = nStart + nCount;
}
- return ((IFWL_Edit*)m_pImp)->SetCaretPos(pos);
+ return ((IFWL_Edit*)m_pIface)->SetCaretPos(pos);
}
int32_t CFWL_Edit::CountSelRanges() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_Edit*)m_pImp)->CountSelRanges();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_Edit*)m_pIface)->CountSelRanges();
}
int32_t CFWL_Edit::GetSelRange(int32_t nIndex, int32_t& nStart) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_Edit*)m_pImp)->GetSelRange(nIndex, nStart);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_Edit*)m_pIface)->GetSelRange(nIndex, nStart);
}
FWL_ERR CFWL_Edit::ClearSelections() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->ClearSelections();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->ClearSelections();
}
int32_t CFWL_Edit::GetLimit() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);
- return ((IFWL_Edit*)m_pImp)->GetLimit();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, -1);
+ return ((IFWL_Edit*)m_pIface)->GetLimit();
}
FWL_ERR CFWL_Edit::SetLimit(int32_t nLimit) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->SetLimit(nLimit);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->SetLimit(nLimit);
}
FWL_ERR CFWL_Edit::SetAliasChar(FX_WCHAR wAlias) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->SetAliasChar(wAlias);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->SetAliasChar(wAlias);
}
FWL_ERR CFWL_Edit::SetFormatString(const CFX_WideString& wsFormat) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->SetFormatString(wsFormat);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->SetFormatString(wsFormat);
}
FWL_ERR CFWL_Edit::Insert(int32_t nStart,
const FX_WCHAR* lpText,
int32_t nLen) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->Insert(nStart, lpText, nLen);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->Insert(nStart, lpText, nLen);
}
FWL_ERR CFWL_Edit::DeleteSelections() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->DeleteSelections();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->DeleteSelections();
}
FWL_ERR CFWL_Edit::DeleteRange(int32_t nStart, int32_t nCount) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->DeleteRange(nStart, nCount);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->DeleteRange(nStart, nCount);
}
FWL_ERR CFWL_Edit::ReplaceSelections(const CFX_WideStringC& wsReplace) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->ReplaceSelections(wsReplace);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->ReplaceSelections(wsReplace);
}
FWL_ERR CFWL_Edit::Replace(int32_t nStart,
int32_t nLen,
const CFX_WideStringC& wsReplace) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->Replace(nStart, nLen, wsReplace);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->Replace(nStart, nLen, wsReplace);
}
FWL_ERR CFWL_Edit::DoClipboard(int32_t iCmd) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->DoClipboard(iCmd);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->DoClipboard(iCmd);
}
FX_BOOL CFWL_Edit::Redo(const CFX_ByteStringC& bsRecord) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_Edit*)m_pImp)->Redo(bsRecord);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_Edit*)m_pIface)->Redo(bsRecord);
}
FX_BOOL CFWL_Edit::Undo(const CFX_ByteStringC& bsRecord) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_Edit*)m_pImp)->Undo(bsRecord);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_Edit*)m_pIface)->Undo(bsRecord);
}
FWL_ERR CFWL_Edit::SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->SetTabWidth(fTabWidth, bEquidistant);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->SetTabWidth(fTabWidth, bEquidistant);
}
FWL_ERR CFWL_Edit::SetNumberRange(int32_t iMin, int32_t iMax) {
if (iMin > iMax) {
return FWL_ERR_Parameter_Invalid;
}
- return ((IFWL_Edit*)m_pImp)->SetNumberRange(iMin, iMax);
+ return ((IFWL_Edit*)m_pIface)->SetNumberRange(iMin, iMax);
}
FWL_ERR CFWL_Edit::SetBackColor(FX_DWORD dwColor) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->SetBackColor(dwColor);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->SetBackColor(dwColor);
}
FWL_ERR CFWL_Edit::SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_Edit*)m_pImp)->SetFont(wsFont, fSize);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_Edit*)m_pIface)->SetFont(wsFont, fSize);
}
FX_BOOL CFWL_Edit::CanUndo() {
- return ((IFWL_Edit*)m_pImp)->CanUndo();
+ return ((IFWL_Edit*)m_pIface)->CanUndo();
}
FX_BOOL CFWL_Edit::CanRedo() {
- return ((IFWL_Edit*)m_pImp)->CanRedo();
+ return ((IFWL_Edit*)m_pIface)->CanRedo();
}
FX_BOOL CFWL_Edit::Undo() {
- return ((IFWL_Edit*)m_pImp)->Undo();
+ return ((IFWL_Edit*)m_pIface)->Undo();
}
FX_BOOL CFWL_Edit::Redo() {
- return ((IFWL_Edit*)m_pImp)->Undo();
+ return ((IFWL_Edit*)m_pIface)->Undo();
}
FX_BOOL CFWL_Edit::Copy(CFX_WideString& wsCopy) {
- return ((IFWL_Edit*)m_pImp)->Copy(wsCopy);
+ return ((IFWL_Edit*)m_pIface)->Copy(wsCopy);
}
FX_BOOL CFWL_Edit::Cut(CFX_WideString& wsCut) {
- return ((IFWL_Edit*)m_pImp)->Cut(wsCut);
+ return ((IFWL_Edit*)m_pIface)->Cut(wsCut);
}
FX_BOOL CFWL_Edit::Paste(const CFX_WideString& wsPaste) {
- return ((IFWL_Edit*)m_pImp)->Paste(wsPaste);
+ return ((IFWL_Edit*)m_pIface)->Paste(wsPaste);
}
FX_BOOL CFWL_Edit::Delete() {
- return ((IFWL_Edit*)m_pImp)->Delete();
+ return ((IFWL_Edit*)m_pIface)->Delete();
}
void CFWL_Edit::SetScrollOffset(FX_FLOAT fScrollOffset) {
- return ((IFWL_Edit*)m_pImp)->SetScrollOffset(fScrollOffset);
+ return ((IFWL_Edit*)m_pIface)->SetScrollOffset(fScrollOffset);
}
FX_BOOL CFWL_Edit::GetSuggestWords(CFX_PointF pointf,
CFX_ByteStringArray& sSuggest) {
- return ((IFWL_Edit*)m_pImp)->GetSuggestWords(pointf, sSuggest);
+ return ((IFWL_Edit*)m_pIface)->GetSuggestWords(pointf, sSuggest);
}
FX_BOOL CFWL_Edit::ReplaceSpellCheckWord(CFX_PointF pointf,
const CFX_ByteStringC& bsReplace) {
- return ((IFWL_Edit*)m_pImp)->ReplaceSpellCheckWord(pointf, bsReplace);
+ return ((IFWL_Edit*)m_pIface)->ReplaceSpellCheckWord(pointf, bsReplace);
}
CFWL_Edit::CFWL_Edit() {}
CFWL_Edit::~CFWL_Edit() {}
diff --git a/xfa/src/fwl/src/lightwidget/listbox.cpp b/xfa/src/fwl/src/lightwidget/listbox.cpp index b45e0feed1..61e8231b0e 100644 --- a/xfa/src/fwl/src/lightwidget/listbox.cpp +++ b/xfa/src/fwl/src/lightwidget/listbox.cpp @@ -9,7 +9,7 @@ CFWL_ListBox* CFWL_ListBox::Create() { return new CFWL_ListBox;
}
FWL_ERR CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -26,8 +26,8 @@ FWL_ERR CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
prop.m_rtWidget = m_pProperties->m_rtWidget;
- m_pImp = IFWL_ListBox::Create();
- FWL_ERR ret = ((IFWL_ListBox*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_ListBox::Create();
+ FWL_ERR ret = ((IFWL_ListBox*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
@@ -81,28 +81,28 @@ FX_BOOL CFWL_ListBox::DeleteAll() { return TRUE;
}
int32_t CFWL_ListBox::CountSelItems() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_ListBox*)m_pImp)->CountSelItems();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_ListBox*)m_pIface)->CountSelItems();
}
FWL_HLISTITEM CFWL_ListBox::GetSelItem(int32_t nIndexSel) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);
- return ((IFWL_ListBox*)m_pImp)->GetSelItem(nIndexSel);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, NULL);
+ return ((IFWL_ListBox*)m_pIface)->GetSelItem(nIndexSel);
}
int32_t CFWL_ListBox::GetSelIndex(int32_t nIndex) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_ListBox*)m_pImp)->GetSelIndex(nIndex);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_ListBox*)m_pIface)->GetSelIndex(nIndex);
}
FWL_ERR CFWL_ListBox::SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ListBox*)m_pImp)->SetSelItem(hItem, bSelect);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ListBox*)m_pIface)->SetSelItem(hItem, bSelect);
}
FWL_ERR CFWL_ListBox::GetItemText(FWL_HLISTITEM hItem, CFX_WideString& wsText) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ListBox*)m_pImp)->GetItemText(hItem, wsText);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ListBox*)m_pIface)->GetItemText(hItem, wsText);
}
FWL_ERR CFWL_ListBox::GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ListBox*)m_pImp)->GetScrollPos(fPos, bVert);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ListBox*)m_pIface)->GetScrollPos(fPos, bVert);
}
FWL_ERR CFWL_ListBox::SetItemHeight(FX_FLOAT fItemHeight) {
m_ListBoxDP.m_fItemHeight = fItemHeight;
@@ -124,7 +124,7 @@ FWL_ERR CFWL_ListBox::SetFocusItem(FWL_HLISTITEM hItem) { return FWL_ERR_Succeeded;
}
FWL_ERR* CFWL_ListBox::Sort(IFWL_ListBoxCompare* pCom) {
- return ((IFWL_ListBox*)m_pImp)->Sort(pCom);
+ return ((IFWL_ListBox*)m_pIface)->Sort(pCom);
}
int32_t CFWL_ListBox::CountItems() {
return m_ListBoxDP.m_arrItem.GetSize();
@@ -163,13 +163,13 @@ void* CFWL_ListBox::GetItemData(FWL_HLISTITEM hItem) { }
FWL_HLISTITEM CFWL_ListBox::GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy) {
CFX_RectF rtClient;
- m_pImp->GetClientRect(rtClient);
+ m_pIface->GetClientRect(rtClient);
fx -= rtClient.left;
fy -= rtClient.top;
FX_FLOAT fPosX = 0;
FX_FLOAT fPosY = 0;
- ((IFWL_ListBox*)m_pImp)->GetScrollPos(fx);
- ((IFWL_ListBox*)m_pImp)->GetScrollPos(fy, FALSE);
+ ((IFWL_ListBox*)m_pIface)->GetScrollPos(fx);
+ ((IFWL_ListBox*)m_pIface)->GetScrollPos(fy, FALSE);
int32_t nCount = m_ListBoxDP.CountItems(NULL);
for (int32_t i = 0; i < nCount; i++) {
FWL_HLISTITEM hItem = m_ListBoxDP.GetItem(NULL, i);
diff --git a/xfa/src/fwl/src/lightwidget/picturebox.cpp b/xfa/src/fwl/src/lightwidget/picturebox.cpp index 80f46e5ccf..9a6c7d6d0f 100644 --- a/xfa/src/fwl/src/lightwidget/picturebox.cpp +++ b/xfa/src/fwl/src/lightwidget/picturebox.cpp @@ -9,7 +9,7 @@ CFWL_PictureBox* CFWL_PictureBox::Create() { return new CFWL_PictureBox;
}
FWL_ERR CFWL_PictureBox::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -26,8 +26,8 @@ FWL_ERR CFWL_PictureBox::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
prop.m_rtWidget = m_pProperties->m_rtWidget;
- m_pImp = IFWL_PictureBox::Create();
- FWL_ERR ret = ((IFWL_PictureBox*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_PictureBox::Create();
+ FWL_ERR ret = ((IFWL_PictureBox*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/pushbutton.cpp b/xfa/src/fwl/src/lightwidget/pushbutton.cpp index 7ca1a13c0d..fb2e554f50 100644 --- a/xfa/src/fwl/src/lightwidget/pushbutton.cpp +++ b/xfa/src/fwl/src/lightwidget/pushbutton.cpp @@ -9,7 +9,7 @@ CFWL_PushButton* CFWL_PushButton::Create() { return new CFWL_PushButton;
}
FWL_ERR CFWL_PushButton::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -26,8 +26,8 @@ FWL_ERR CFWL_PushButton::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
prop.m_rtWidget = m_pProperties->m_rtWidget;
- m_pImp = IFWL_PushButton::Create();
- FWL_ERR ret = ((IFWL_PushButton*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_PushButton::Create();
+ FWL_ERR ret = ((IFWL_PushButton*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
diff --git a/xfa/src/fwl/src/lightwidget/scrollbar.cpp b/xfa/src/fwl/src/lightwidget/scrollbar.cpp index 3594769c5f..25df339d65 100644 --- a/xfa/src/fwl/src/lightwidget/scrollbar.cpp +++ b/xfa/src/fwl/src/lightwidget/scrollbar.cpp @@ -9,7 +9,7 @@ CFWL_ScrollBar* CFWL_ScrollBar::Create() { return new CFWL_ScrollBar;
}
FWL_ERR CFWL_ScrollBar::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -25,60 +25,60 @@ FWL_ERR CFWL_ScrollBar::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
prop.m_rtWidget = m_pProperties->m_rtWidget;
- m_pImp = IFWL_ScrollBar::Create();
- FWL_ERR ret = ((IFWL_ScrollBar*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_ScrollBar::Create();
+ FWL_ERR ret = ((IFWL_ScrollBar*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
return ret;
}
FX_BOOL CFWL_ScrollBar::IsVertical() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ScrollBar*)m_pImp)->IsVertical();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ScrollBar*)m_pIface)->IsVertical();
}
FWL_ERR CFWL_ScrollBar::GetRange(FX_FLOAT& fMin, FX_FLOAT& fMax) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ScrollBar*)m_pImp)->GetRange(fMin, fMax);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ScrollBar*)m_pIface)->GetRange(fMin, fMax);
}
FWL_ERR CFWL_ScrollBar::SetRange(FX_FLOAT fMin, FX_FLOAT fMax) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ScrollBar*)m_pImp)->SetRange(fMin, fMax);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ScrollBar*)m_pIface)->SetRange(fMin, fMax);
}
FX_FLOAT CFWL_ScrollBar::GetPageSize() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_ScrollBar*)m_pImp)->GetPageSize();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_ScrollBar*)m_pIface)->GetPageSize();
}
FWL_ERR CFWL_ScrollBar::SetPageSize(FX_FLOAT fPageSize) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ScrollBar*)m_pImp)->SetPageSize(fPageSize);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ScrollBar*)m_pIface)->SetPageSize(fPageSize);
}
FX_FLOAT CFWL_ScrollBar::GetStepSize() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return ((IFWL_ScrollBar*)m_pImp)->GetStepSize();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return ((IFWL_ScrollBar*)m_pIface)->GetStepSize();
}
FWL_ERR CFWL_ScrollBar::SetStepSize(FX_FLOAT fStepSize) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ScrollBar*)m_pImp)->SetStepSize(fStepSize);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ScrollBar*)m_pIface)->SetStepSize(fStepSize);
}
FX_FLOAT CFWL_ScrollBar::GetPos() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);
- return ((IFWL_ScrollBar*)m_pImp)->GetPos();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, -1);
+ return ((IFWL_ScrollBar*)m_pIface)->GetPos();
}
FWL_ERR CFWL_ScrollBar::SetPos(FX_FLOAT fPos) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ScrollBar*)m_pImp)->SetPos(fPos);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ScrollBar*)m_pIface)->SetPos(fPos);
}
FX_FLOAT CFWL_ScrollBar::GetTrackPos() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, -1);
- return ((IFWL_ScrollBar*)m_pImp)->GetTrackPos();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, -1);
+ return ((IFWL_ScrollBar*)m_pIface)->GetTrackPos();
}
FWL_ERR CFWL_ScrollBar::SetTrackPos(FX_FLOAT fTrackPos) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return ((IFWL_ScrollBar*)m_pImp)->SetTrackPos(fTrackPos);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return ((IFWL_ScrollBar*)m_pIface)->SetTrackPos(fTrackPos);
}
FX_BOOL CFWL_ScrollBar::DoScroll(FX_DWORD dwCode, FX_FLOAT fPos) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return ((IFWL_ScrollBar*)m_pImp)->DoScroll(dwCode, fPos);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return ((IFWL_ScrollBar*)m_pIface)->DoScroll(dwCode, fPos);
}
CFWL_ScrollBar::CFWL_ScrollBar() {}
CFWL_ScrollBar::~CFWL_ScrollBar() {}
diff --git a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp index 42ceeaceee..527f9aac9e 100644 --- a/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp +++ b/xfa/src/fwl/src/lightwidget/tooltipctrl.cpp @@ -15,7 +15,7 @@ CFWL_ToolTip* CFWL_ToolTip::Create() { return new CFWL_ToolTip;
}
FWL_ERR CFWL_ToolTip::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(!m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(!m_pIface, FWL_ERR_Indefinite);
if (pProperties) {
*m_pProperties = *pProperties;
}
@@ -32,8 +32,8 @@ FWL_ERR CFWL_ToolTip::Initialize(const CFWL_WidgetProperties* pProperties) { prop.m_pOwner = m_pProperties->m_pOwner->GetWidget();
}
prop.m_rtWidget = m_pProperties->m_rtWidget;
- m_pImp = IFWL_ToolTip::Create();
- FWL_ERR ret = ((IFWL_ToolTip*)m_pImp)->Initialize(prop);
+ m_pIface = IFWL_ToolTip::Create();
+ FWL_ERR ret = ((IFWL_ToolTip*)m_pIface)->Initialize(prop);
if (ret == FWL_ERR_Succeeded) {
CFWL_Widget::Initialize();
}
@@ -76,13 +76,13 @@ FWL_ERR CFWL_ToolTip::SetToolTipIconSize(CFX_SizeF fSize) { return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_ToolTip::SetAnchor(const CFX_RectF& rtAnchor) {
- return ((IFWL_ToolTip*)m_pImp)->SetAnchor(rtAnchor);
+ return ((IFWL_ToolTip*)m_pIface)->SetAnchor(rtAnchor);
}
FWL_ERR CFWL_ToolTip::Show() {
- return ((IFWL_ToolTip*)m_pImp)->Show();
+ return ((IFWL_ToolTip*)m_pIface)->Show();
}
FWL_ERR CFWL_ToolTip::Hide() {
- return ((IFWL_ToolTip*)m_pImp)->Hide();
+ return ((IFWL_ToolTip*)m_pIface)->Hide();
}
CFWL_ToolTip::CFWL_ToolTip() {}
CFWL_ToolTip::~CFWL_ToolTip() {}
diff --git a/xfa/src/fwl/src/lightwidget/widget.cpp b/xfa/src/fwl/src/lightwidget/widget.cpp index 283aed0e2f..3d97675fdb 100644 --- a/xfa/src/fwl/src/lightwidget/widget.cpp +++ b/xfa/src/fwl/src/lightwidget/widget.cpp @@ -11,156 +11,156 @@ #include "../core/include/fwl_widgetimp.h"
#include "../core/include/fwl_widgetmgrimp.h"
IFWL_Widget* CFWL_Widget::GetWidget() {
- return m_pImp;
+ return m_pIface;
}
FX_DWORD CFWL_Widget::Release() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- FX_DWORD dwRef = m_pImp->GetRefCount();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ FX_DWORD dwRef = m_pIface->GetRefCount();
if (dwRef == 1) {
- m_pImp->Finalize();
+ m_pIface->Finalize();
}
- m_pImp->Release();
+ m_pIface->Release();
if (dwRef == 1) {
- m_pImp = NULL;
+ m_pIface = NULL;
delete this;
}
return dwRef - 1;
}
CFWL_Widget* CFWL_Widget::Retain() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);
- m_pImp->Retain();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, NULL);
+ m_pIface->Retain();
return this;
}
FX_DWORD CFWL_Widget::GetRefCount() const {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 1);
- return m_pImp->GetRefCount();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 1);
+ return m_pIface->GetRefCount();
}
FWL_ERR CFWL_Widget::GetClassName(CFX_WideString& wsClass) const {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->GetClassName(wsClass);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->GetClassName(wsClass);
}
FX_DWORD CFWL_Widget::GetClassID() const {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return m_pImp->GetClassID();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return m_pIface->GetClassID();
}
FX_BOOL CFWL_Widget::IsInstance(const CFX_WideStringC& wsClass) const {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);
- return m_pImp->IsInstance(wsClass);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FALSE);
+ return m_pIface->IsInstance(wsClass);
}
static void* gs_pFWLWidget = (void*)FXBSTR_ID('l', 'i', 'g', 't');
FWL_ERR CFWL_Widget::Initialize(const CFWL_WidgetProperties* pProperties) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->SetPrivateData(gs_pFWLWidget, this, NULL);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->SetPrivateData(gs_pFWLWidget, this, NULL);
}
FWL_ERR CFWL_Widget::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->GetWidgetRect(rect, bAutoSize);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->GetWidgetRect(rect, bAutoSize);
}
FWL_ERR CFWL_Widget::GetGlobalRect(CFX_RectF& rect) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->GetGlobalRect(rect);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->GetGlobalRect(rect);
}
FWL_ERR CFWL_Widget::SetWidgetRect(const CFX_RectF& rect) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->SetWidgetRect(rect);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->SetWidgetRect(rect);
}
FWL_ERR CFWL_Widget::GetClientRect(CFX_RectF& rect) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->GetClientRect(rect);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->GetClientRect(rect);
}
CFWL_Widget* CFWL_Widget::GetParent() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);
- IFWL_Widget* parent = m_pImp->GetParent();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, NULL);
+ IFWL_Widget* parent = m_pIface->GetParent();
if (parent) {
return (CFWL_Widget*)parent->GetPrivateData(gs_pFWLWidget);
}
return NULL;
}
FWL_ERR CFWL_Widget::SetParent(CFWL_Widget* pParent) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->SetParent(pParent ? pParent->GetWidget() : NULL);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->SetParent(pParent ? pParent->GetWidget() : NULL);
}
CFWL_Widget* CFWL_Widget::GetOwner() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, NULL);
return NULL;
}
FWL_ERR CFWL_Widget::SetOwner(CFWL_Widget* pOwner) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
return FWL_ERR_Succeeded;
}
FX_DWORD CFWL_Widget::GetStyles() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return m_pImp->GetStyles();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return m_pIface->GetStyles();
}
FWL_ERR CFWL_Widget::ModifyStyles(FX_DWORD dwStylesAdded,
FX_DWORD dwStylesRemoved) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->ModifyStyles(dwStylesAdded, dwStylesRemoved);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->ModifyStyles(dwStylesAdded, dwStylesRemoved);
}
FX_DWORD CFWL_Widget::GetStylesEx() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return m_pImp->GetStylesEx();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return m_pIface->GetStylesEx();
}
FWL_ERR CFWL_Widget::ModifyStylesEx(FX_DWORD dwStylesExAdded,
FX_DWORD dwStylesExRemoved) {
- return m_pImp->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
+ return m_pIface->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
}
FX_DWORD CFWL_Widget::GetStates() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->GetStates();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->GetStates();
}
FWL_ERR CFWL_Widget::SetStates(FX_DWORD dwStates, FX_BOOL bSet) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->SetStates(dwStates, bSet);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->SetStates(dwStates, bSet);
}
FWL_ERR CFWL_Widget::SetPrivateData(void* module_id,
void* pData,
PD_CALLBACK_FREEDATA callback) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->SetPrivateData(module_id, pData, callback);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->SetPrivateData(module_id, pData, callback);
}
void* CFWL_Widget::GetPrivateData(void* module_id) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);
- return m_pImp->GetPrivateData(module_id);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, NULL);
+ return m_pIface->GetPrivateData(module_id);
}
FWL_ERR CFWL_Widget::Update() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->Update();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->Update();
}
FWL_ERR CFWL_Widget::LockUpdate() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->LockUpdate();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->LockUpdate();
}
FWL_ERR CFWL_Widget::UnlockUpdate() {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->UnlockUpdate();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->UnlockUpdate();
}
FX_DWORD CFWL_Widget::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, 0);
- return m_pImp->HitTest(fx, fy);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, 0);
+ return m_pIface->HitTest(fx, fy);
}
FWL_ERR CFWL_Widget::TransformTo(CFWL_Widget* pWidget,
FX_FLOAT& fx,
FX_FLOAT& fy) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->TransformTo(pWidget ? pWidget->GetWidget() : NULL, fx, fy);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->TransformTo(pWidget ? pWidget->GetWidget() : NULL, fx, fy);
}
FWL_ERR CFWL_Widget::TransformTo(CFWL_Widget* pWidget, CFX_RectF& rt) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->TransformTo(pWidget ? pWidget->GetWidget() : NULL, rt);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->TransformTo(pWidget ? pWidget->GetWidget() : NULL, rt);
}
FWL_ERR CFWL_Widget::GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->GetMatrix(matrix, bGlobal);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->GetMatrix(matrix, bGlobal);
}
FWL_ERR CFWL_Widget::SetMatrix(const CFX_Matrix& matrix) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->SetMatrix(matrix);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->SetMatrix(matrix);
}
FWL_ERR CFWL_Widget::DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- return m_pImp->DrawWidget(pGraphics, pMatrix);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ return m_pIface->DrawWidget(pGraphics, pMatrix);
}
FWL_ERR CFWL_Widget::GetProperties(CFWL_WidgetProperties& properties) {
properties.m_ctmOnParent = m_pProperties->m_ctmOnParent;
@@ -185,12 +185,12 @@ FWL_ERR CFWL_Widget::SetProperties(const CFWL_WidgetProperties& properties) { return FWL_ERR_Succeeded;
}
IFWL_WidgetDelegate* CFWL_Widget::SetDelegate(IFWL_WidgetDelegate* pDelegate) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, NULL);
- m_pDelegate = m_pImp->SetDelegate(pDelegate);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, NULL);
+ m_pDelegate = m_pIface->SetDelegate(pDelegate);
return m_pDelegate;
}
CFWL_Widget::CFWL_Widget()
- : m_pImp(NULL), m_pDelegate(NULL), m_pProperties(NULL) {
+ : m_pIface(NULL), m_pDelegate(NULL), m_pProperties(NULL) {
m_pProperties = new CFWL_WidgetProperties;
m_pWidgetMgr = (CFWL_WidgetMgr*)FWL_GetWidgetMgr();
FXSYS_assert(m_pWidgetMgr != NULL);
@@ -200,51 +200,51 @@ CFWL_Widget::~CFWL_Widget() { delete m_pProperties;
m_pProperties = NULL;
}
- if (m_pImp) {
- m_pImp->Finalize();
- m_pImp->Release();
- m_pImp = NULL;
+ if (m_pIface) {
+ m_pIface->Finalize();
+ m_pIface->Release();
+ m_pIface = NULL;
}
}
FWL_ERR CFWL_Widget::Repaint(const CFX_RectF* pRect) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
CFX_RectF rect;
if (pRect) {
rect = *pRect;
} else {
- m_pImp->GetWidgetRect(rect);
+ m_pIface->GetWidgetRect(rect);
rect.left = rect.top = 0;
}
- return m_pWidgetMgr->RepaintWidget(m_pImp, &rect);
+ return m_pWidgetMgr->RepaintWidget(m_pIface, &rect);
}
FWL_ERR CFWL_Widget::SetFocus(FX_BOOL bFocus) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- IFWL_NoteThread* pThread = m_pImp->GetOwnerThread();
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ IFWL_NoteThread* pThread = m_pIface->GetOwnerThread();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
IFWL_NoteDriver* pDriver = pThread->GetNoteDriver();
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
if (bFocus) {
- pDriver->SetFocus(m_pImp);
+ pDriver->SetFocus(m_pIface);
} else {
- if (((CFWL_NoteDriver*)pDriver)->GetFocus() == m_pImp) {
+ if (((CFWL_NoteDriver*)pDriver)->GetFocus() == m_pIface) {
pDriver->SetFocus(NULL);
}
}
return FWL_ERR_Succeeded;
}
FWL_ERR CFWL_Widget::SetGrab(FX_BOOL bSet) {
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- IFWL_NoteThread* pThread = m_pImp->GetOwnerThread();
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ IFWL_NoteThread* pThread = m_pIface->GetOwnerThread();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
CFWL_NoteDriver* pDriver = (CFWL_NoteDriver*)pThread->GetNoteDriver();
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);
- pDriver->SetGrab(m_pImp, bSet);
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, FWL_ERR_Indefinite);
+ pDriver->SetGrab(m_pIface, bSet);
return FWL_ERR_Succeeded;
}
void CFWL_Widget::RegisterEventTarget(CFWL_Widget* pEventSource,
FX_DWORD dwFilter) {
- _FWL_RETURN_IF_FAIL(m_pImp);
- IFWL_NoteThread* pThread = m_pImp->GetOwnerThread();
+ _FWL_RETURN_IF_FAIL(m_pIface);
+ IFWL_NoteThread* pThread = m_pIface->GetOwnerThread();
_FWL_RETURN_IF_FAIL(pThread);
IFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();
_FWL_RETURN_IF_FAIL(pNoteDriver);
@@ -253,11 +253,11 @@ void CFWL_Widget::RegisterEventTarget(CFWL_Widget* pEventSource, pNoteDriver->RegisterEventTarget(GetWidget(), pEventSourceImp, dwFilter);
}
void CFWL_Widget::DispatchEvent(CFWL_Event* pEvent) {
- _FWL_RETURN_IF_FAIL(m_pImp);
- if (m_pImp->GetOuter()) {
+ _FWL_RETURN_IF_FAIL(m_pIface);
+ if (m_pIface->GetOuter()) {
return;
}
- IFWL_NoteThread* pThread = m_pImp->GetOwnerThread();
+ IFWL_NoteThread* pThread = m_pIface->GetOwnerThread();
_FWL_RETURN_IF_FAIL(pThread);
IFWL_NoteDriver* pNoteDriver = pThread->GetNoteDriver();
_FWL_RETURN_IF_FAIL(pNoteDriver);
@@ -271,11 +271,11 @@ CFX_SizeF CFWL_Widget::CalcTextSize(const CFX_WideString& wsText, int32_t iLineWidth) {
CFX_SizeF sz;
sz.Set(0, 0);
- _FWL_RETURN_VALUE_IF_FAIL(m_pImp, sz);
- IFWL_ThemeProvider* pTheme = m_pImp->GetThemeProvider();
+ _FWL_RETURN_VALUE_IF_FAIL(m_pIface, sz);
+ IFWL_ThemeProvider* pTheme = m_pIface->GetThemeProvider();
_FWL_RETURN_VALUE_IF_FAIL(pTheme, sz);
CFWL_ThemeText calPart;
- calPart.m_pWidget = m_pImp;
+ calPart.m_pWidget = m_pIface;
calPart.m_wsText = wsText;
calPart.m_dwTTOStyles =
bMultiLine ? FDE_TTOSTYLE_LineWrap : FDE_TTOSTYLE_SingleLine;
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp index 47eecbc1ea..59c9323956 100644 --- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp @@ -251,7 +251,7 @@ FX_BOOL CXFA_FFCheckButton::OnLButtonUp(FX_DWORD dwFlags, ms.m_fx = fx;
ms.m_fy = fy;
FWLToClient(ms.m_fx, ms.m_fy);
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp index 9051cfdb02..9b70f65eae 100644 --- a/xfa/src/fxfa/src/app/xfa_fffield.cpp +++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp @@ -114,7 +114,7 @@ void CXFA_FFField::DrawFocus(CFX_Graphics* pGS, CFX_Matrix* pMatrix) { }
void CXFA_FFField::SetFWLThemeProvider() {
if (m_pNormalWidget) {
- m_pNormalWidget->m_pImp->SetThemeProvider(GetApp()->GetFWLTheme());
+ m_pNormalWidget->m_pIface->SetThemeProvider(GetApp()->GetFWLTheme());
}
}
FX_BOOL CXFA_FFField::IsLoaded() {
@@ -361,7 +361,7 @@ FX_BOOL CXFA_FFField::OnMouseEnter() { }
CFWL_MsgMouse ms;
ms.m_dwCmd = FWL_MSGMOUSECMD_MouseEnter;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
ms.m_pSrcTarget = NULL;
TranslateFWLMessage(&ms);
return TRUE;
@@ -372,7 +372,7 @@ FX_BOOL CXFA_FFField::OnMouseExit() { }
CFWL_MsgMouse ms;
ms.m_dwCmd = FWL_MSGMOUSECMD_MouseLeave;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
@@ -405,7 +405,7 @@ FX_BOOL CXFA_FFField::OnLButtonDown(FX_DWORD dwFlags, ms.m_fx = fx;
ms.m_fy = fy;
FWLToClient(ms.m_fx, ms.m_fy);
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
@@ -423,7 +423,7 @@ FX_BOOL CXFA_FFField::OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) { ms.m_fx = fx;
ms.m_fy = fy;
FWLToClient(ms.m_fx, ms.m_fy);
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
@@ -439,7 +439,7 @@ FX_BOOL CXFA_FFField::OnLButtonDblClk(FX_DWORD dwFlags, ms.m_fx = fx;
ms.m_fy = fy;
FWLToClient(ms.m_fx, ms.m_fy);
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
@@ -453,7 +453,7 @@ FX_BOOL CXFA_FFField::OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) { ms.m_fx = fx;
ms.m_fy = fy;
FWLToClient(ms.m_fx, ms.m_fy);
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
@@ -472,7 +472,7 @@ FX_BOOL CXFA_FFField::OnMouseWheel(FX_DWORD dwFlags, FWLToClient(ms.m_fx, ms.m_fy);
ms.m_fDeltaX = zDelta;
ms.m_fDeltaY = 0;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
@@ -496,7 +496,7 @@ FX_BOOL CXFA_FFField::OnRButtonDown(FX_DWORD dwFlags, ms.m_fx = fx;
ms.m_fy = fy;
FWLToClient(ms.m_fx, ms.m_fy);
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
@@ -514,7 +514,7 @@ FX_BOOL CXFA_FFField::OnRButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) { ms.m_fx = fx;
ms.m_fy = fy;
FWLToClient(ms.m_fx, ms.m_fy);
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
@@ -530,7 +530,7 @@ FX_BOOL CXFA_FFField::OnRButtonDblClk(FX_DWORD dwFlags, ms.m_fx = fx;
ms.m_fy = fy;
FWLToClient(ms.m_fx, ms.m_fy);
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
TranslateFWLMessage(&ms);
return TRUE;
}
@@ -541,7 +541,7 @@ FX_BOOL CXFA_FFField::OnSetFocus(CXFA_FFWidget* pOldWidget) { return FALSE;
}
CFWL_MsgSetFocus ms;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
ms.m_pSrcTarget = NULL;
TranslateFWLMessage(&ms);
m_dwStatus |= XFA_WIDGETSTATUS_Focused;
@@ -553,7 +553,7 @@ FX_BOOL CXFA_FFField::OnKillFocus(CXFA_FFWidget* pNewWidget) { return CXFA_FFWidget::OnKillFocus(pNewWidget);
}
CFWL_MsgKillFocus ms;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
ms.m_pSrcTarget = NULL;
TranslateFWLMessage(&ms);
m_dwStatus &= ~XFA_WIDGETSTATUS_Focused;
@@ -569,7 +569,7 @@ FX_BOOL CXFA_FFField::OnKeyDown(FX_DWORD dwKeyCode, FX_DWORD dwFlags) { ms.m_dwCmd = FWL_MSGKEYCMD_KeyDown;
ms.m_dwFlags = dwFlags;
ms.m_dwKeyCode = dwKeyCode;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
ms.m_pSrcTarget = NULL;
TranslateFWLMessage(&ms);
return TRUE;
@@ -582,7 +582,7 @@ FX_BOOL CXFA_FFField::OnKeyUp(FX_DWORD dwKeyCode, FX_DWORD dwFlags) { ms.m_dwCmd = FWL_MSGKEYCMD_KeyUp;
ms.m_dwFlags = dwFlags;
ms.m_dwKeyCode = dwKeyCode;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
ms.m_pSrcTarget = NULL;
TranslateFWLMessage(&ms);
return TRUE;
@@ -604,7 +604,7 @@ FX_BOOL CXFA_FFField::OnChar(FX_DWORD dwChar, FX_DWORD dwFlags) { ms.m_dwCmd = FWL_MSGKEYCMD_Char;
ms.m_dwFlags = dwFlags;
ms.m_dwKeyCode = dwChar;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
ms.m_pSrcTarget = NULL;
TranslateFWLMessage(&ms);
return TRUE;
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp index b22a00dd83..890169621a 100644 --- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp @@ -93,7 +93,7 @@ FX_BOOL CXFA_FFImageEdit::OnLButtonDown(FX_DWORD dwFlags, ms.m_dwFlags = dwFlags;
ms.m_fx = fx;
ms.m_fy = fy;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
FWLToClient(ms.m_fx, ms.m_fy);
TranslateFWLMessage(&ms);
IXFA_AppProvider* pAppProvider = GetAppProvider();
diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp index ce43ce0481..3ba8072ee6 100644 --- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp +++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp @@ -102,7 +102,7 @@ FX_BOOL CXFA_FFTextEdit::OnLButtonDown(FX_DWORD dwFlags, ms.m_dwFlags = dwFlags;
ms.m_fx = fx;
ms.m_fy = fy;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
FWLToClient(ms.m_fx, ms.m_fy);
TranslateFWLMessage(&ms);
return TRUE;
@@ -151,14 +151,14 @@ FX_BOOL CXFA_FFTextEdit::OnSetFocus(CXFA_FFWidget* pOldWidget) { }
CXFA_FFWidget::OnSetFocus(pOldWidget);
CFWL_MsgSetFocus ms;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
ms.m_pSrcTarget = NULL;
TranslateFWLMessage(&ms);
return TRUE;
}
FX_BOOL CXFA_FFTextEdit::OnKillFocus(CXFA_FFWidget* pNewWidget) {
CFWL_MsgKillFocus ms;
- ms.m_pDstTarget = m_pNormalWidget->m_pImp;
+ ms.m_pDstTarget = m_pNormalWidget->m_pIface;
ms.m_pSrcTarget = NULL;
TranslateFWLMessage(&ms);
m_dwStatus &= ~XFA_WIDGETSTATUS_Focused;
|