diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
| commit | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch) | |
| tree | 4cfbe682869d89900f33751c37f6a84865beeb0a /xfa/include | |
| parent | b116136da234afcad018bb44a3ccb64b9ad2a554 (diff) | |
| download | pdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz | |
Merge to XFA: Use stdint.h types throughout PDFium.
Near-automatic merge, plus re-running scripts to update
additional usage.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1172793002
Diffstat (limited to 'xfa/include')
46 files changed, 569 insertions, 569 deletions
diff --git a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h index 82a098ebbb..196e6503d9 100644 --- a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h @@ -22,8 +22,8 @@ public: virtual FWL_ERR Empty() = 0;
virtual FX_BOOL IsDataAvailable(FX_DWORD dwFormat) = 0;
virtual FWL_HCLIPBOARDDATA GetData(FX_DWORD dwFormat) = 0;
- virtual FWL_ERR SetData(FX_DWORD dwFormat, FX_BYTE *pBuf, FX_INT32 iSize) = 0;
- virtual FX_INT32 GetDataSize(FWL_HCLIPBOARDDATA hData) = 0;
+ virtual FWL_ERR SetData(FX_DWORD dwFormat, uint8_t *pBuf, int32_t iSize) = 0;
+ virtual int32_t GetDataSize(FWL_HCLIPBOARDDATA hData) = 0;
virtual FX_LPVOID LockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0;
virtual FX_BOOL UnLockDataBuffer(FWL_HCLIPBOARDDATA hData) = 0;
virtual FWL_ERR SetStringData(FX_WSTR ws) = 0;
diff --git a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h index bd194964c9..8830a3de81 100644 --- a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h +++ b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h @@ -13,8 +13,8 @@ typedef struct _FWL_HMONITOR { class IFWL_AdapterMonitorMgr
{
public:
- virtual FX_INT32 CountMonitors() = 0;
- virtual FWL_HMONITOR GetMonitor(FX_INT32 nIndex) = 0;
+ virtual int32_t CountMonitors() = 0;
+ virtual FWL_HMONITOR GetMonitor(int32_t nIndex) = 0;
virtual FWL_HMONITOR GetCurrentMonitor() = 0;
virtual FWL_HMONITOR GetMonitorByRect(const CFX_RectF &rect) = 0;
virtual FWL_HMONITOR GetMonitorByPoint(FX_FLOAT fx, FX_FLOAT fy) = 0;
diff --git a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h index ad6cd58245..f3e01855b0 100644 --- a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h @@ -16,8 +16,8 @@ public: virtual FWL_ERR Start(IFWL_Thread *pThread, FWL_HTHREAD &hThread, FX_BOOL bSuspended = FALSE) = 0;
virtual FWL_ERR Resume(FWL_HTHREAD hThread) = 0;
virtual FWL_ERR Suspend(FWL_HTHREAD hThread) = 0;
- virtual FWL_ERR Kill(FWL_HTHREAD hThread, FX_INT32 iExitCode) = 0;
- virtual FWL_ERR Stop(FWL_HTHREAD hThread, FX_INT32 iExitCode) = 0;
+ virtual FWL_ERR Kill(FWL_HTHREAD hThread, int32_t iExitCode) = 0;
+ virtual FWL_ERR Stop(FWL_HTHREAD hThread, int32_t iExitCode) = 0;
virtual IFWL_Thread* GetCurrentThread() = 0;
};
class IFWL_AdapterSemaphore
@@ -28,6 +28,6 @@ public: virtual FWL_ERR Wait() const = 0;
virtual FWL_ERR Post() = 0;
virtual FWL_ERR Value(FX_DWORD &val) const = 0;
- virtual FWL_ERR Reset(FX_INT32 init) = 0;
+ virtual FWL_ERR Reset(int32_t init) = 0;
};
#endif
diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h index fbc296f7fa..e8c3b89674 100644 --- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h @@ -37,7 +37,7 @@ public: virtual FX_BOOL IsIdleMessage() = 0;
virtual FWL_ERR DispatchMessage() = 0;
virtual FWL_ERR RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect) = 0;
- virtual FWL_ERR Exit(FX_INT32 iExitCode) = 0;
+ virtual FWL_ERR Exit(int32_t iExitCode) = 0;
virtual FWL_ERR CreateWidgetWithNativeId(IFWL_Widget *pWidget, FX_LPVOID UserData) = 0;
virtual FWL_ERR GetWidgetDC(IFWL_Widget *pWidget, FX_LPVOID &pDC) = 0;
virtual FWL_ERR ReleaseWidgetDC(IFWL_Widget *pWidget, FX_LPVOID pDC, CFX_RectF *pClip = 0) = 0;
@@ -46,8 +46,8 @@ public: virtual FWL_ERR RunLoop(IFWL_Widget *widget) = 0;
virtual FWL_ERR EndLoop() = 0;
virtual FWL_ERR InitMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0;
- virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, FX_INT32 iType) = 0;
- virtual FX_INT32 TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0;
+ virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, int32_t iType) = 0;
+ virtual int32_t TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData) = 0;
virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook *hook) = 0;
virtual FWL_ERR GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b) = 0;
virtual FX_BOOL GetPopupPos(IFWL_Widget* pWidget, FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight, const CFX_RectF &rtAnchor, CFX_RectF &rtPopup) = 0;
diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h index 6f8170ff5c..323a0ba4fc 100644 --- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h +++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h @@ -31,7 +31,7 @@ public: virtual FWL_ERR SetMinimize(IFWL_Widget *pWidget);
virtual FWL_ERR RunWidget(IFWL_Widget *pWidget);
virtual FWL_ERR RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect);
- virtual FWL_ERR Exit(FX_INT32 iExitCode);
+ virtual FWL_ERR Exit(int32_t iExitCode);
virtual FWL_ERR CreateWidgetWithNativeId(IFWL_Widget *pWidget, void *vp);
virtual FX_BOOL GetPopupPos(IFWL_Widget* pWidget, FX_FLOAT fMinHeight, FX_FLOAT fMaxHeight, const CFX_RectF &rtAnchor, CFX_RectF &rtPopup);
public:
@@ -51,8 +51,8 @@ public: virtual FWL_ERR RunLoop(IFWL_Widget *widget);
virtual FWL_ERR EndLoop();
virtual FWL_ERR InitMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData);
- virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, FX_INT32 iType);
- virtual FX_INT32 TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData);
+ virtual FWL_ERR UpdateMenu(IFWL_Menu *pMenu, FX_LPCVOID hItem, int32_t iType);
+ virtual int32_t TrackPopupMenu(IFWL_Menu *pMenu, IFWL_MenuDP *pMenuData);
virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook *hook);
virtual FWL_ERR GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b);
};
@@ -65,8 +65,8 @@ public: virtual FWL_ERR Start(IFWL_Thread *pThread, FWL_HTHREAD &hThread, FX_BOOL bSuspended = FALSE);
virtual FWL_ERR Resume(FWL_HTHREAD hThread);
virtual FWL_ERR Suspend(FWL_HTHREAD hThread);
- virtual FWL_ERR Kill(FWL_HTHREAD hThread, FX_INT32 iExitCode);
- virtual FWL_ERR Stop(FWL_HTHREAD hThread, FX_INT32 iExitCode);
+ virtual FWL_ERR Kill(FWL_HTHREAD hThread, int32_t iExitCode);
+ virtual FWL_ERR Stop(FWL_HTHREAD hThread, int32_t iExitCode);
virtual IFWL_Thread* GetCurrentThread();
};
#endif
diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h index ba6e99691e..08f28b7b7d 100644 --- a/xfa/include/fwl/basewidget/fwl_barcode.h +++ b/xfa/include/fwl/basewidget/fwl_barcode.h @@ -34,17 +34,17 @@ class IFWL_BarcodeDP : public IFWL_EditDP {
public:
virtual BC_CHAR_ENCODING GetCharEncoding() = 0;
- virtual FX_INT32 GetModuleHeight() = 0;
- virtual FX_INT32 GetModuleWidth() = 0;
- virtual FX_INT32 GetDataLength() = 0;
- virtual FX_INT32 GetCalChecksum() = 0;
+ virtual int32_t GetModuleHeight() = 0;
+ virtual int32_t GetModuleWidth() = 0;
+ virtual int32_t GetDataLength() = 0;
+ virtual int32_t GetCalChecksum() = 0;
virtual FX_BOOL GetPrintChecksum() = 0;
virtual BC_TEXT_LOC GetTextLocation() = 0;
- virtual FX_INT32 GetWideNarrowRatio() = 0;
+ virtual int32_t GetWideNarrowRatio() = 0;
virtual FX_CHAR GetStartChar() = 0;
virtual FX_CHAR GetEndChar() = 0;
- virtual FX_INT32 GetVersion() = 0;
- virtual FX_INT32 GetErrorCorrectionLevel() = 0;
+ virtual int32_t GetVersion() = 0;
+ virtual int32_t GetErrorCorrectionLevel() = 0;
virtual FX_BOOL GetTruncated() = 0;
virtual FX_DWORD GetBarcodeAttributeMask() = 0;
};
diff --git a/xfa/include/fwl/basewidget/fwl_checkbox.h b/xfa/include/fwl/basewidget/fwl_checkbox.h index 625ad489c2..0576dedcf3 100644 --- a/xfa/include/fwl/basewidget/fwl_checkbox.h +++ b/xfa/include/fwl/basewidget/fwl_checkbox.h @@ -74,8 +74,8 @@ public: static IFWL_CheckBox* Create();
FWL_ERR Initialize(IFWL_Widget *pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL);
- FX_INT32 GetCheckState();
- FWL_ERR SetCheckState(FX_INT32 iCheck);
+ int32_t GetCheckState();
+ FWL_ERR SetCheckState(int32_t iCheck);
protected:
IFWL_CheckBox();
virtual ~IFWL_CheckBox();
@@ -86,8 +86,8 @@ public: static IFWL_RadioButton* Create();
FWL_ERR Initialize(IFWL_Widget *pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL);
- FX_INT32 GetCheckState();
- FWL_ERR SetCheckState(FX_INT32 iCheck);
+ int32_t GetCheckState();
+ FWL_ERR SetCheckState(int32_t iCheck);
protected:
IFWL_RadioButton();
virtual ~IFWL_RadioButton();
diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h index 74d6bdf24b..950189bbba 100644 --- a/xfa/include/fwl/basewidget/fwl_combobox.h +++ b/xfa/include/fwl/basewidget/fwl_combobox.h @@ -74,7 +74,7 @@ END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbCloseUp, FWL_EVTHASH_CMB_CloseUp)
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbEditChanged, FWL_EVTHASH_CMB_EditChanged)
-FX_INT32 nChangeType;
+int32_t nChangeType;
CFX_WideString wsInsert;
CFX_WideString wsDelete;
END_FWL_EVENT_DEF
@@ -83,12 +83,12 @@ CFX_Int32Array iArraySels; FX_BOOL bLButtonUp;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbHoverChanged, FWL_EVTHASH_CMB_HoverChanged)
-FX_INT32 m_iCurHover;
+int32_t m_iCurHover;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbDrawItem, FWL_EVTHASH_CMB_DrawItem)
CFX_Graphics *m_pGraphics;
CFX_Matrix m_matrix;
-FX_INT32 m_index;
+int32_t m_index;
CFX_RectF m_rtItem;
END_FWL_EVENT_DEF
class IFWL_ComboBoxDP : public IFWL_ListBoxDP
@@ -102,16 +102,16 @@ public: static IFWL_ComboBox* Create();
FWL_ERR Initialize(IFWL_Widget *pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL);
- FX_INT32 GetCurSel();
- FWL_ERR SetCurSel(FX_INT32 iSel);
+ int32_t GetCurSel();
+ FWL_ERR SetCurSel(int32_t iSel);
FWL_ERR SetEditText(const CFX_WideString &wsText);
- FX_INT32 GetEditTextLength() const;
- FWL_ERR GetEditText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const;
- FWL_ERR SetEditSelRange(FX_INT32 nStart, FX_INT32 nCount = -1);
- FX_INT32 GetEditSelRange(FX_INT32 nIndex, FX_INT32 &nStart);
- FX_INT32 GetEditLimit();
- FWL_ERR SetEditLimit(FX_INT32 nLimit);
- FWL_ERR EditDoClipboard(FX_INT32 iCmd);
+ int32_t GetEditTextLength() const;
+ FWL_ERR GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const;
+ FWL_ERR SetEditSelRange(int32_t nStart, int32_t nCount = -1);
+ int32_t GetEditSelRange(int32_t nIndex, int32_t &nStart);
+ int32_t GetEditLimit();
+ FWL_ERR SetEditLimit(int32_t nLimit);
+ FWL_ERR EditDoClipboard(int32_t iCmd);
FX_BOOL EditRedo(FX_BSTR bsRecord);
FX_BOOL EditUndo(FX_BSTR bsRecord);
IFWL_ListBox* GetListBoxt();
diff --git a/xfa/include/fwl/basewidget/fwl_datetimepicker.h b/xfa/include/fwl/basewidget/fwl_datetimepicker.h index 898264eeec..3f2a60d792 100644 --- a/xfa/include/fwl/basewidget/fwl_datetimepicker.h +++ b/xfa/include/fwl/basewidget/fwl_datetimepicker.h @@ -54,17 +54,17 @@ BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpEditChanged, FWL_EVTHASH_DTP_EditChanged) CFX_WideString m_wsText;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpHoverChanged, FWL_EVTHASH_DTP_HoverChanged)
-FX_INT32 hoverday;
+int32_t hoverday;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_Event_DtpSelectChanged, FWL_EVTHASH_DTP_SelectChanged)
-FX_INT32 iYear;
-FX_INT32 iMonth;
-FX_INT32 iDay;
+int32_t iYear;
+int32_t iMonth;
+int32_t iDay;
END_FWL_EVENT_DEF
class IFWL_DateTimePickerDP : public IFWL_DataProvider
{
public:
- virtual FWL_ERR GetToday(IFWL_Widget *pWidget, FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay) = 0;
+ virtual FWL_ERR GetToday(IFWL_Widget *pWidget, int32_t &iYear, int32_t &iMonth, int32_t &iDay) = 0;
};
class IFWL_DateTimePicker : public IFWL_Widget
{
@@ -72,12 +72,12 @@ public: static IFWL_DateTimePicker* Create();
FWL_ERR Initialize(IFWL_Widget *pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL);
- FWL_ERR GetCurSel(FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay);
- FWL_ERR SetCurSel(FX_INT32 iYear, FX_INT32 iMonth, FX_INT32 iDay);
+ FWL_ERR GetCurSel(int32_t &iYear, int32_t &iMonth, int32_t &iDay);
+ FWL_ERR SetCurSel(int32_t iYear, int32_t iMonth, int32_t iDay);
FWL_ERR SetEditText(const CFX_WideString &wsText);
- FWL_ERR GetEditText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const;
- FX_INT32 CountSelRanges();
- FX_INT32 GetSelRange(FX_INT32 nIndex, FX_INT32 &nStart);
+ FWL_ERR GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const;
+ int32_t CountSelRanges();
+ int32_t GetSelRange(int32_t nIndex, int32_t &nStart);
FX_BOOL CanUndo();
FX_BOOL CanRedo();
FX_BOOL Undo();
@@ -92,7 +92,7 @@ public: FX_BOOL Delete();
FX_BOOL DeSelect();
FWL_ERR GetBBox(CFX_RectF &rect);
- FWL_ERR SetEditLimit(FX_INT32 nLimit);
+ FWL_ERR SetEditLimit(int32_t nLimit);
FWL_ERR ModifyEditStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved);
protected:
IFWL_DateTimePicker();
diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h index 18bdee662b..78072d0cf8 100644 --- a/xfa/include/fwl/basewidget/fwl_edit.h +++ b/xfa/include/fwl/basewidget/fwl_edit.h @@ -78,7 +78,7 @@ BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtAddDoRecord, FWL_EVTHASH_EDT_AddDoRecord) CFX_ByteString m_wsDoRecord;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtTextChanged, FWL_EVTHASH_EDT_TextChanged)
-FX_INT32 nChangeType;
+int32_t nChangeType;
CFX_WideString wsInsert;
CFX_WideString wsDelete;
CFX_WideString wsPrevText;
@@ -121,25 +121,25 @@ public: FWL_ERR Initialize(IFWL_Widget *pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL);
FWL_ERR SetText(const CFX_WideString &wsText);
- FX_INT32 GetTextLength() const;
- FWL_ERR GetText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const;
+ int32_t GetTextLength() const;
+ FWL_ERR GetText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const;
FWL_ERR ClearText();
- FX_INT32 GetCaretPos() const;
- FX_INT32 SetCaretPos(FX_INT32 nIndex, FX_BOOL bBefore = TRUE);
- FWL_ERR AddSelRange(FX_INT32 nStart, FX_INT32 nCount = -1);
- FX_INT32 CountSelRanges();
- FX_INT32 GetSelRange(FX_INT32 nIndex, FX_INT32 &nStart);
+ int32_t GetCaretPos() const;
+ int32_t SetCaretPos(int32_t nIndex, FX_BOOL bBefore = TRUE);
+ FWL_ERR AddSelRange(int32_t nStart, int32_t nCount = -1);
+ int32_t CountSelRanges();
+ int32_t GetSelRange(int32_t nIndex, int32_t &nStart);
FWL_ERR ClearSelections();
- FX_INT32 GetLimit();
- FWL_ERR SetLimit(FX_INT32 nLimit);
+ int32_t GetLimit();
+ FWL_ERR SetLimit(int32_t nLimit);
FWL_ERR SetAliasChar(FX_WCHAR wAlias);
FWL_ERR SetFormatString(const CFX_WideString &wsFormat);
- FWL_ERR Insert(FX_INT32 nStart, FX_LPCWSTR lpText, FX_INT32 nLen);
+ FWL_ERR Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen);
FWL_ERR DeleteSelections();
- FWL_ERR DeleteRange(FX_INT32 nStart, FX_INT32 nCount = -1);
+ FWL_ERR DeleteRange(int32_t nStart, int32_t nCount = -1);
FWL_ERR ReplaceSelections(const CFX_WideStringC &wsReplace);
- FWL_ERR Replace(FX_INT32 nStart, FX_INT32 nLen, const CFX_WideStringC &wsReplace);
- FWL_ERR DoClipboard(FX_INT32 iCmd);
+ FWL_ERR Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC &wsReplace);
+ FWL_ERR DoClipboard(int32_t iCmd);
FX_BOOL Copy(CFX_WideString &wsCopy);
FX_BOOL Cut(CFX_WideString &wsCut);
FX_BOOL Paste(const CFX_WideString &wsPaste);
@@ -152,7 +152,7 @@ public: FX_BOOL CanRedo();
FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant);
FWL_ERR SetOuter(IFWL_Widget *pOuter);
- FWL_ERR SetNumberRange(FX_INT32 iMin, FX_INT32 iMax);
+ FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax);
FWL_ERR SetBackColor(FX_DWORD dwColor);
FWL_ERR SetFont(const CFX_WideString &wsFont, FX_FLOAT fSize);
void SetScrollOffset(FX_FLOAT fScrollOffset);
diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h index 4b2f2555c5..466d919a5e 100644 --- a/xfa/include/fwl/basewidget/fwl_listbox.h +++ b/xfa/include/fwl/basewidget/fwl_listbox.h @@ -54,7 +54,7 @@ END_FWL_EVENT_DEF BEGIN_FWL_EVENT_DEF(CFWL_EvtLtbDrawItem, FWL_EVTHASH_LTB_DrawItem)
CFX_Graphics *m_pGraphics;
CFX_Matrix m_matrix;
-FX_INT32 m_index;
+int32_t m_index;
CFX_RectF m_rect;
END_FWL_EVENT_DEF
typedef struct _FWL_HLISTITEM {
@@ -62,15 +62,15 @@ typedef struct _FWL_HLISTITEM { }* FWL_HLISTITEM;
typedef struct _FWL_ListBoxItemData {
IFWL_ListBoxDP *pDataProvider;
- FX_INT32 iIndex;
+ int32_t iIndex;
} FWL_ListBoxItemData;
class IFWL_ListBoxDP : public IFWL_DataProvider
{
public:
- virtual FX_INT32 CountItems(IFWL_Widget *pWidget) = 0;
- virtual FWL_HLISTITEM GetItem(IFWL_Widget *pWidget, FX_INT32 nIndex) = 0;
- virtual FX_INT32 GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;
- virtual FX_BOOL SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_INT32 nIndex) = 0;
+ virtual int32_t CountItems(IFWL_Widget *pWidget) = 0;
+ virtual FWL_HLISTITEM GetItem(IFWL_Widget *pWidget, int32_t nIndex) = 0;
+ virtual int32_t GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;
+ virtual FX_BOOL SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, int32_t nIndex) = 0;
virtual FX_DWORD GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;
virtual FWL_ERR GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText) = 0;
virtual FWL_ERR GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF &rtItem) = 0;
@@ -88,7 +88,7 @@ public: class IFWL_ListBoxCompare
{
public:
- virtual FX_INT32 Compare(FWL_HLISTITEM hLeft, FWL_HLISTITEM hRight) = 0;
+ virtual int32_t Compare(FWL_HLISTITEM hLeft, FWL_HLISTITEM hRight) = 0;
};
class IFWL_ListBox : public IFWL_Widget
{
@@ -96,9 +96,9 @@ public: static IFWL_ListBox* Create();
FWL_ERR Initialize(IFWL_Widget *pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL);
- FX_INT32 CountSelItems();
- FWL_HLISTITEM GetSelItem(FX_INT32 nIndexSel);
- FX_INT32 GetSelIndex(FX_INT32 nIndex);
+ int32_t CountSelItems();
+ FWL_HLISTITEM GetSelItem(int32_t nIndexSel);
+ int32_t GetSelIndex(int32_t nIndex);
FWL_ERR SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect = TRUE);
FWL_ERR GetItemText(FWL_HLISTITEM hItem, CFX_WideString &wsText);
FWL_ERR GetScrollPos(FX_FLOAT &fPos, FX_BOOL bVert = TRUE);
diff --git a/xfa/include/fwl/basewidget/fwl_monthcalendar.h b/xfa/include/fwl/basewidget/fwl_monthcalendar.h index 7ad8f8a364..ba6deef746 100644 --- a/xfa/include/fwl/basewidget/fwl_monthcalendar.h +++ b/xfa/include/fwl/basewidget/fwl_monthcalendar.h @@ -97,21 +97,21 @@ class IFWL_MonthCalendar; #define FWL_NOTEHASH_MCD_DATASELECTED 1085596932
#define FWL_EVTHASH_MCD_DateChanged 54212227
BEGIN_FWL_EVENT_DEF(CFWL_Event_McdDateSelected, FWL_NOTEHASH_MCD_DATASELECTED)
-FX_INT32 m_iStartDay;
-FX_INT32 m_iEndDay;
+int32_t m_iStartDay;
+int32_t m_iEndDay;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EventMcdDateChanged, FWL_EVTHASH_MCD_DateChanged)
-FX_INT32 m_iOldYear;
-FX_INT32 m_iOldMonth;
-FX_INT32 m_iStartDay;
-FX_INT32 m_iEndDay;
+int32_t m_iOldYear;
+int32_t m_iOldMonth;
+int32_t m_iStartDay;
+int32_t m_iEndDay;
END_FWL_EVENT_DEF
class IFWL_MonthCalendarDP : public IFWL_DataProvider
{
public:
- virtual FX_INT32 GetCurDay(IFWL_Widget *pWidget) = 0;
- virtual FX_INT32 GetCurMonth(IFWL_Widget *pWidget) = 0;
- virtual FX_INT32 GetCurYear(IFWL_Widget *pWidget) = 0;
+ virtual int32_t GetCurDay(IFWL_Widget *pWidget) = 0;
+ virtual int32_t GetCurMonth(IFWL_Widget *pWidget) = 0;
+ virtual int32_t GetCurYear(IFWL_Widget *pWidget) = 0;
};
class IFWL_MonthCalendar : public IFWL_Widget
{
@@ -120,9 +120,9 @@ public: FWL_ERR Initialize(IFWL_Widget *pOuter = NULL);
FWL_ERR Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL);
- FX_INT32 CountSelect();
- FX_BOOL GetSelect(FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay, FX_INT32 nIndex = 0);
- FX_BOOL SetSelect(FX_INT32 iYear, FX_INT32 iMonth, FX_INT32 iDay);
+ int32_t CountSelect();
+ FX_BOOL GetSelect(int32_t &iYear, int32_t &iMonth, int32_t &iDay, int32_t nIndex = 0);
+ FX_BOOL SetSelect(int32_t iYear, int32_t iMonth, int32_t iDay);
protected:
IFWL_MonthCalendar();
virtual ~IFWL_MonthCalendar();
diff --git a/xfa/include/fwl/basewidget/fwl_picturebox.h b/xfa/include/fwl/basewidget/fwl_picturebox.h index 419fd4e0d1..c6b732ca63 100644 --- a/xfa/include/fwl/basewidget/fwl_picturebox.h +++ b/xfa/include/fwl/basewidget/fwl_picturebox.h @@ -37,8 +37,8 @@ public: virtual CFX_DIBitmap* GetPicture(IFWL_Widget *pWidget) = 0;
virtual CFX_DIBitmap* GetErrorPicture(IFWL_Widget *pWidget) = 0;
virtual CFX_DIBitmap* GetInitialPicture(IFWL_Widget *pWidget) = 0;
- virtual FX_INT32 GetOpacity(IFWL_Widget *pWidget) = 0;
- virtual FX_INT32 GetFlipMode(IFWL_Widget *pWidget) = 0;
+ virtual int32_t GetOpacity(IFWL_Widget *pWidget) = 0;
+ virtual int32_t GetFlipMode(IFWL_Widget *pWidget) = 0;
virtual FWL_ERR GetMatrix(IFWL_Widget *pWidget, CFX_Matrix &matrix) = 0;
};
class IFWL_PictureBox : public IFWL_Widget
diff --git a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h index d27b9a2638..2df14126f1 100644 --- a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h +++ b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h @@ -24,8 +24,8 @@ class IFWL_ToolTipDP : public IFWL_DataProvider {
public:
virtual FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption) = 0;
- virtual FX_INT32 GetInitialDelay(IFWL_Widget *pWidget) = 0;
- virtual FX_INT32 GetAutoPopDelay(IFWL_Widget *pWidget) = 0;
+ virtual int32_t GetInitialDelay(IFWL_Widget *pWidget) = 0;
+ virtual int32_t GetAutoPopDelay(IFWL_Widget *pWidget) = 0;
virtual CFX_DIBitmap* GetToolTipIcon(IFWL_Widget *pWidget) = 0;
virtual CFX_SizeF GetToolTipIconSize(IFWL_Widget *pWidget) = 0;
};
diff --git a/xfa/include/fwl/basewidget/fxmath_barcode.h b/xfa/include/fwl/basewidget/fxmath_barcode.h index d885ac4c57..3fcd341892 100644 --- a/xfa/include/fwl/basewidget/fxmath_barcode.h +++ b/xfa/include/fwl/basewidget/fxmath_barcode.h @@ -11,30 +11,30 @@ class IFX_Barcode public:
virtual void Release() = 0;
virtual BC_TYPE GetType() = 0;
- virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e) = 0;
- virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e) = 0;
- virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e) = 0;
- virtual CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 height, FX_INT32 &errorCode) = 0;
- virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &errorCode) = 0;
+ virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0;
+ virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0;
+ virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0;
+ virtual CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t height, int32_t &errorCode) = 0;
+ virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &errorCode) = 0;
virtual FX_BOOL SetCharEncoding(BC_CHAR_ENCODING encoding) = 0;
- virtual FX_BOOL SetModuleHeight(FX_INT32 moduleHeight) = 0;
- virtual FX_BOOL SetModuleWidth(FX_INT32 moduleWidth) = 0;
- virtual FX_BOOL SetHeight(FX_INT32 height) = 0;
- virtual FX_BOOL SetWidth(FX_INT32 width) = 0;
+ virtual FX_BOOL SetModuleHeight(int32_t moduleHeight) = 0;
+ virtual FX_BOOL SetModuleWidth(int32_t moduleWidth) = 0;
+ virtual FX_BOOL SetHeight(int32_t height) = 0;
+ virtual FX_BOOL SetWidth(int32_t width) = 0;
virtual FX_BOOL CheckContentValidity(FX_WSTR contents) = 0;
virtual FX_BOOL SetPrintChecksum(FX_BOOL checksum) = 0;
- virtual FX_BOOL SetDataLength(FX_INT32 length) = 0;
- virtual FX_BOOL SetCalChecksum(FX_INT32 state) = 0;
+ virtual FX_BOOL SetDataLength(int32_t length) = 0;
+ virtual FX_BOOL SetCalChecksum(int32_t state) = 0;
virtual FX_BOOL SetFont(CFX_Font* pFont) = 0;
virtual FX_BOOL SetFontSize(FX_FLOAT size) = 0;
- virtual FX_BOOL SetFontStyle(FX_INT32 style) = 0;
+ virtual FX_BOOL SetFontStyle(int32_t style) = 0;
virtual FX_BOOL SetFontColor(FX_ARGB color) = 0;
virtual FX_BOOL SetTextLocation(BC_TEXT_LOC location) = 0;
- virtual FX_BOOL SetWideNarrowRatio(FX_INT32 ratio) = 0;
+ virtual FX_BOOL SetWideNarrowRatio(int32_t ratio) = 0;
virtual FX_BOOL SetStartChar(FX_CHAR start) = 0;
virtual FX_BOOL SetEndChar(FX_CHAR end) = 0;
- virtual FX_BOOL SetVersion(FX_INT32 version) = 0;
- virtual FX_BOOL SetErrorCorrectionLevel (FX_INT32 level) = 0;
+ virtual FX_BOOL SetVersion(int32_t version) = 0;
+ virtual FX_BOOL SetErrorCorrectionLevel (int32_t level) = 0;
virtual FX_BOOL SetTruncated(FX_BOOL truncated) = 0;
};
IFX_Barcode* FX_Barcode_Create(BC_TYPE type);
diff --git a/xfa/include/fwl/core/fwl_app.h b/xfa/include/fwl/core/fwl_app.h index 89f6309a31..b0cb1857e4 100644 --- a/xfa/include/fwl/core/fwl_app.h +++ b/xfa/include/fwl/core/fwl_app.h @@ -22,7 +22,7 @@ public: virtual IFWL_AdapterNative* GetAdapterNative() = 0;
virtual IFWL_WidgetMgr* GetWidgetMgr() = 0;
virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) = 0;
- virtual FWL_ERR Exit(FX_INT32 iExitCode = 0) = 0;
+ virtual FWL_ERR Exit(int32_t iExitCode = 0) = 0;
};
IFWL_App* FWL_GetApp();
void FWL_SetApp(IFWL_App *pApp);
diff --git a/xfa/include/fwl/core/fwl_content.h b/xfa/include/fwl/core/fwl_content.h index 51d5e9e8df..4a00154ef3 100644 --- a/xfa/include/fwl/core/fwl_content.h +++ b/xfa/include/fwl/core/fwl_content.h @@ -13,7 +13,7 @@ class IFWL_Content : public IFWL_Widget public:
static IFWL_Content* Create();
FWL_ERR Initialize();
- FWL_ERR InsertWidget(IFWL_Widget *pChild, FX_INT32 nIndex = -1);
+ FWL_ERR InsertWidget(IFWL_Widget *pChild, int32_t nIndex = -1);
FWL_ERR RemoveWidget(IFWL_Widget *pWidget);
FWL_ERR RemoveAllWidgets();
FWL_ERR GetMinSize(FX_FLOAT &fWidth, FX_FLOAT &fHeight);
diff --git a/xfa/include/fwl/core/fwl_error.h b/xfa/include/fwl/core/fwl_error.h index d790bee5ac..465808a116 100644 --- a/xfa/include/fwl/core/fwl_error.h +++ b/xfa/include/fwl/core/fwl_error.h @@ -6,7 +6,7 @@ #ifndef _FWL_ERROR_H
#define _FWL_ERROR_H
-typedef FX_INT32 FWL_ERR;
+typedef int32_t FWL_ERR;
#define FWL_ERR_Succeeded 0
#define FWL_ERR_Indefinite -1
#define FWL_ERR_Parameter_Invalid -100
diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h index e86c3dabe9..0d4e2d61f8 100644 --- a/xfa/include/fwl/core/fwl_grid.h +++ b/xfa/include/fwl/core/fwl_grid.h @@ -46,10 +46,10 @@ public: FWL_ERR Initialize();
FWL_ERR Initialize(CFWL_WidgetImpProperties &properties);
- FWL_HGRIDCOLROW InsertColRow(FX_BOOL bColumn, FX_INT32 nIndex = -1);
- FX_INT32 CountColRows(FX_BOOL bColumn);
- FWL_HGRIDCOLROW GetColRow(FX_BOOL bColumn, FX_INT32 nIndex);
- FX_INT32 GetIndex(FWL_HGRIDCOLROW hColRow);
+ FWL_HGRIDCOLROW InsertColRow(FX_BOOL bColumn, int32_t nIndex = -1);
+ int32_t CountColRows(FX_BOOL bColumn);
+ FWL_HGRIDCOLROW GetColRow(FX_BOOL bColumn, int32_t nIndex);
+ int32_t GetIndex(FWL_HGRIDCOLROW hColRow);
FX_FLOAT GetSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT &eUnit);
FWL_ERR SetSize(FWL_HGRIDCOLROW hColRow, FX_FLOAT fSize, FWL_GRIDUNIT eUnit);
FX_FLOAT GetMinSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT &eUnit);
@@ -58,10 +58,10 @@ public: FWL_ERR SetMaxSize(FWL_HGRIDCOLROW hColRow, FX_FLOAT fSize, FWL_GRIDUNIT eUnit);
FX_BOOL DeleteColRow(FWL_HGRIDCOLROW hColRow);
FX_BOOL IsColumn(FWL_HGRIDCOLROW hColRow);
- FX_INT32 GetWidgetPos(IFWL_Widget *pWidget, FX_BOOL bColumn);
- FWL_ERR SetWidgetPos(IFWL_Widget *pWidget, FX_INT32 iPos, FX_BOOL bColumn);
- FX_INT32 GetWidgetSpan(IFWL_Widget *pWidget, FX_BOOL bColumn);
- FWL_ERR SetWidgetSpan(IFWL_Widget *pWidget, FX_INT32 iSpan, FX_BOOL bColumn);
+ int32_t GetWidgetPos(IFWL_Widget *pWidget, FX_BOOL bColumn);
+ FWL_ERR SetWidgetPos(IFWL_Widget *pWidget, int32_t iPos, FX_BOOL bColumn);
+ int32_t GetWidgetSpan(IFWL_Widget *pWidget, FX_BOOL bColumn);
+ FWL_ERR SetWidgetSpan(IFWL_Widget *pWidget, int32_t iSpan, FX_BOOL bColumn);
FX_FLOAT GetWidgetSize(IFWL_Widget *pWidget, FWL_GRIDSIZE eSize, FWL_GRIDUNIT &eUnit);
FWL_ERR SetWidgetSize(IFWL_Widget *pWidget, FWL_GRIDSIZE eSize, FX_FLOAT fSize, FWL_GRIDUNIT eUit);
FX_BOOL GetWidgetMargin(IFWL_Widget *pWidget, FWL_GRIDMARGIN eMargin, FX_FLOAT &fMargin);
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h index 1cc88a6593..7e553a9eb2 100644 --- a/xfa/include/fwl/core/fwl_note.h +++ b/xfa/include/fwl/core/fwl_note.h @@ -174,7 +174,7 @@ protected: {
return TRUE;
}
- virtual FX_INT32 Finalize()
+ virtual int32_t Finalize()
{
return 0;
}
@@ -235,8 +235,8 @@ END_FWL_MESSAGE_DEF BEGIN_FWL_MESSAGE_DEF(CFWL_MsgCursor, FWL_MSGHASH_Cursor)
END_FWL_MESSAGE_DEF
BEGIN_FWL_MESSAGE_DEF(CFWL_MsgSize, FWL_MSGHASH_Size)
-FX_INT32 m_iWidth;
-FX_INT32 m_iHeight;
+int32_t m_iWidth;
+int32_t m_iHeight;
END_FWL_MESSAGE_DEF
BEGIN_FWL_MESSAGE_DEF(CFWL_MsgWindowMove, FWL_MSGHASH_WindowMove)
FX_FLOAT m_fx;
@@ -321,7 +321,7 @@ FX_FLOAT m_fPosY; IFWL_Widget *m_pOwner;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtMenuCommand, FWL_EVTHASH_MenuCommand)
-FX_INT32 m_iCommand;
+int32_t m_iCommand;
FX_LPVOID m_pData;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtSizeChanged, FWL_EVTHASH_SizeChanged)
@@ -351,8 +351,8 @@ public: virtual FWL_ERR RegisterEventTarget(IFWL_Widget *pListener, IFWL_Widget *pEventSource = NULL, FX_DWORD dwFilter = FWL_EVENT_ALL_MASK) = 0;
virtual FWL_ERR UnregisterEventTarget(IFWL_Widget *pListener) = 0;
virtual void ClearEventTargets(FX_BOOL bRemoveAll) = 0;
- virtual FX_INT32 GetQueueMaxSize() const = 0;
- virtual FWL_ERR SetQueueMaxSize(const FX_INT32 size) = 0;
+ virtual int32_t GetQueueMaxSize() const = 0;
+ virtual FWL_ERR SetQueueMaxSize(const int32_t size) = 0;
virtual IFWL_NoteThread* GetOwnerThread() const = 0;
virtual FWL_ERR PushNoteLoop(IFWL_NoteLoop *pNoteLoop) = 0;
virtual IFWL_NoteLoop* PopNoteLoop() = 0;
@@ -364,7 +364,7 @@ class IFWL_NoteLoop {
public:
virtual FX_BOOL PreProcessMessage(CFWL_Message *pMessage) = 0;
- virtual FWL_ERR Idle(FX_INT32 count) = 0;
+ virtual FWL_ERR Idle(int32_t count) = 0;
};
class IFWL_ToolTipTarget
{
@@ -382,8 +382,8 @@ public: };
FWL_ERR FWL_AddToolTipTarget(IFWL_ToolTipTarget *pTarget);
FWL_ERR FWL_RemoveToolTipTarget(IFWL_ToolTipTarget *pTarget);
-FWL_ERR FWL_SetToolTipInitialDelay(FX_INT32 iDelayTime);
-FWL_ERR FWL_SetToolTipAutoPopDelay(FX_INT32 iDelayTime);
+FWL_ERR FWL_SetToolTipInitialDelay(int32_t iDelayTime);
+FWL_ERR FWL_SetToolTipAutoPopDelay(int32_t iDelayTime);
typedef FX_BOOL (*FWLMessageHookCallback)(CFWL_Message *msg, FX_LPVOID info);
FWL_ERR FWL_SetHook(IFWL_NoteDriver *driver, FWLMessageHookCallback callback, FX_LPVOID info);
#endif
diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h index 59d5ab0a2a..cc29e351d1 100644 --- a/xfa/include/fwl/core/fwl_theme.h +++ b/xfa/include/fwl/core/fwl_theme.h @@ -42,7 +42,7 @@ public: CFX_Matrix m_matrix;
CFX_RectF m_rtPart;
IFWL_Widget *m_pWidget;
- FX_INT32 m_iPart;
+ int32_t m_iPart;
FX_DWORD m_dwStates;
FX_DWORD m_dwData;
FX_LPVOID m_pData;
@@ -69,7 +69,7 @@ public: }
CFX_WideString m_wsText;
FX_DWORD m_dwTTOStyles;
- FX_INT32 m_iTTOAlign;
+ int32_t m_iTTOAlign;
CFX_Graphics *m_pGraphics;
};
class IFWL_ThemeProvider
diff --git a/xfa/include/fwl/core/fwl_thread.h b/xfa/include/fwl/core/fwl_thread.h index 9ce742b368..9b001f4fcb 100644 --- a/xfa/include/fwl/core/fwl_thread.h +++ b/xfa/include/fwl/core/fwl_thread.h @@ -25,8 +25,8 @@ public: FWL_HTHREAD FWL_StartThread(IFWL_Thread *pThread, FX_BOOL bSuspended = FALSE);
FWL_ERR FWL_ResumeThread(FWL_HTHREAD hThread);
FWL_ERR FWL_SuspendThread(FWL_HTHREAD hThread);
-FWL_ERR FWL_KillThread(FWL_HTHREAD hThread, FX_INT32 iExitCode);
-FWL_ERR FWL_StopThread(FWL_HTHREAD hThread, FX_INT32 iExitCode);
+FWL_ERR FWL_KillThread(FWL_HTHREAD hThread, int32_t iExitCode);
+FWL_ERR FWL_StopThread(FWL_HTHREAD hThread, int32_t iExitCode);
FWL_ERR FWL_Sleep(FX_DWORD dwMilliseconds);
class IFWL_NoteThread : public IFWL_Thread
{
@@ -50,7 +50,7 @@ typedef struct _FWL_HSEMAPHORE { FWL_HSEMAPHORE FWL_CreateSemaphore();
FWL_ERR FWL_DestroySemaphore(FWL_HSEMAPHORE hSemaphore);
FWL_ERR FWL_WaitSemaphore(FWL_HSEMAPHORE hSemaphore);
-FWL_ERR FWL_PostSemaphore(FWL_HSEMAPHORE hSemaphore, FX_INT32 down = 1);
-FWL_ERR FWL_GetSemaphoreValue(FWL_HSEMAPHORE hSemaphore, FX_INT32 &value);
-FWL_ERR FWL_ResetSemaphore(FWL_HSEMAPHORE hSemaphore, FX_INT32 init);
+FWL_ERR FWL_PostSemaphore(FWL_HSEMAPHORE hSemaphore, int32_t down = 1);
+FWL_ERR FWL_GetSemaphoreValue(FWL_HSEMAPHORE hSemaphore, int32_t &value);
+FWL_ERR FWL_ResetSemaphore(FWL_HSEMAPHORE hSemaphore, int32_t init);
#endif
diff --git a/xfa/include/fwl/core/fwl_timer.h b/xfa/include/fwl/core/fwl_timer.h index 3e83c299ff..a71cff72be 100644 --- a/xfa/include/fwl/core/fwl_timer.h +++ b/xfa/include/fwl/core/fwl_timer.h @@ -13,8 +13,8 @@ typedef struct _FWL_HTIMER { class IFWL_Timer
{
public:
- virtual FX_INT32 Run(FWL_HTIMER hTimer) = 0;
+ virtual int32_t Run(FWL_HTIMER hTimer) = 0;
};
FWL_HTIMER FWL_StartTimer(IFWL_Timer *pTimer, FX_DWORD dwElapse, FX_BOOL bImmediately = TRUE);
-FX_INT32 FWL_StopTimer(FWL_HTIMER hTimer);
+int32_t FWL_StopTimer(FWL_HTIMER hTimer);
#endif
diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h index 3127f0683d..c7ef2d48ca 100644 --- a/xfa/include/fwl/core/fwl_widget.h +++ b/xfa/include/fwl/core/fwl_widget.h @@ -59,7 +59,7 @@ public: class IFWL_WidgetDelegate
{
public:
- virtual FX_INT32 OnProcessMessage(CFWL_Message *pMessage) = 0;
+ virtual int32_t OnProcessMessage(CFWL_Message *pMessage) = 0;
virtual FWL_ERR OnProcessEvent(CFWL_Event *pEvent) = 0;
virtual FWL_ERR OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL) = 0;
};
diff --git a/xfa/include/fwl/core/fwl_widgetmgr.h b/xfa/include/fwl/core/fwl_widgetmgr.h index 8db4f34503..9fcb4b682c 100644 --- a/xfa/include/fwl/core/fwl_widgetmgr.h +++ b/xfa/include/fwl/core/fwl_widgetmgr.h @@ -23,11 +23,11 @@ enum FWL_WGTRELATION { class IFWL_WidgetMgr
{
public:
- virtual FX_INT32 CountWidgets(IFWL_Widget *pParent = NULL) = 0;
- virtual IFWL_Widget* GetWidget(FX_INT32 nIndex, IFWL_Widget *pParent = NULL) = 0;
+ virtual int32_t CountWidgets(IFWL_Widget *pParent = NULL) = 0;
+ virtual IFWL_Widget* GetWidget(int32_t nIndex, IFWL_Widget *pParent = NULL) = 0;
virtual IFWL_Widget* GetWidget(IFWL_Widget *pWidget, FWL_WGTRELATION eRelation) = 0;
- virtual FX_INT32 GetWidgetIndex(IFWL_Widget *pWidget) = 0;
- virtual FX_BOOL SetWidgetIndex(IFWL_Widget *pWidget, FX_INT32 nIndex) = 0;
+ virtual int32_t GetWidgetIndex(IFWL_Widget *pWidget) = 0;
+ virtual FX_BOOL SetWidgetIndex(IFWL_Widget *pWidget, int32_t nIndex) = 0;
virtual FX_BOOL IsWidget(FX_LPVOID pObj) = 0;
virtual FWL_ERR RepaintWidget(IFWL_Widget *pWidget, const CFX_RectF *pRect = NULL) = 0;
virtual FX_DWORD GetCapability() = 0;
@@ -40,7 +40,7 @@ class IFWL_WidgetMgrDelegate {
public:
virtual FWL_ERR OnSetCapability(FX_DWORD dwCapability = FWL_WGTMGR_DisableThread) = 0;
- virtual FX_INT32 OnProcessMessageToForm(CFWL_Message *pMessage) = 0;
+ virtual int32_t OnProcessMessageToForm(CFWL_Message *pMessage) = 0;
virtual FWL_ERR OnDrawWidget(IFWL_Widget *pWidget, CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL) = 0;
};
FWL_ERR FWL_WidgetMgrSnapshot(IFWL_Widget *pWidget, const CFX_WideString *saveFile, const CFX_Matrix *pMatrix = NULL);
diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h index b69be8368b..72d9dc01c7 100644 --- a/xfa/include/fwl/lightwidget/app.h +++ b/xfa/include/fwl/lightwidget/app.h @@ -16,7 +16,7 @@ public: virtual ~CFWL_App();
FWL_ERR Initialize();
CFWL_Theme* GetTheme();
- FWL_ERR Exit(FX_INT32 iExitCode = 0);
+ FWL_ERR Exit(int32_t iExitCode = 0);
IFWL_App* GetApp();
protected:
IFWL_App *m_pAppImp;
diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h index e8fcfea476..242b432ab1 100644 --- a/xfa/include/fwl/lightwidget/barcode.h +++ b/xfa/include/fwl/lightwidget/barcode.h @@ -25,23 +25,23 @@ public: m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_CHARENCODING;
m_barcodeData.m_eCharEncoding = encoding;
}
- void SetModuleHeight(FX_INT32 height)
+ void SetModuleHeight(int32_t height)
{
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_MODULEHEIGHT;
m_barcodeData.m_nModuleHeight = height;
}
- void SetModuleWidth(FX_INT32 width)
+ void SetModuleWidth(int32_t width)
{
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_MODULEWIDTH;
m_barcodeData.m_nModuleWidth = width;
}
- void SetDataLength(FX_INT32 dataLength)
+ void SetDataLength(int32_t dataLength)
{
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_DATALENGTH;
m_barcodeData.m_nDataLength = dataLength;
((IFWL_Barcode*)m_pImp)->SetLimit(dataLength);
}
- void SetCalChecksum(FX_INT32 calChecksum)
+ void SetCalChecksum(int32_t calChecksum)
{
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_CALCHECKSUM;
m_barcodeData.m_nCalChecksum = calChecksum;
@@ -56,7 +56,7 @@ public: m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_TEXTLOCATION;
m_barcodeData.m_eTextLocation = location;
}
- void SetWideNarrowRatio(FX_INT32 ratio)
+ void SetWideNarrowRatio(int32_t ratio)
{
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_WIDENARROWRATIO;
m_barcodeData.m_nWideNarrowRatio = ratio;
@@ -71,12 +71,12 @@ public: m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_ENDCHAR;
m_barcodeData.m_cEndChar = endChar;
}
- void SetVersion(FX_INT32 version)
+ void SetVersion(int32_t version)
{
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_VERSION;
m_barcodeData.m_nVersion = version;
}
- void SetErrorCorrectionLevel(FX_INT32 ecLevel)
+ void SetErrorCorrectionLevel(int32_t ecLevel)
{
m_barcodeData.m_dwAttributeMask |= FWL_BCDATTRIBUTE_ECLEVEL;
m_barcodeData.m_nECLevel = ecLevel;
@@ -102,22 +102,22 @@ protected: {
return m_eCharEncoding;
}
- FX_INT32 m_nModuleHeight, m_nModuleWidth;
- virtual FX_INT32 GetModuleHeight()
+ int32_t m_nModuleHeight, m_nModuleWidth;
+ virtual int32_t GetModuleHeight()
{
return m_nModuleHeight;
}
- virtual FX_INT32 GetModuleWidth()
+ virtual int32_t GetModuleWidth()
{
return m_nModuleWidth;
}
- FX_INT32 m_nDataLength;
- virtual FX_INT32 GetDataLength()
+ int32_t m_nDataLength;
+ virtual int32_t GetDataLength()
{
return m_nDataLength;
}
- FX_INT32 m_nCalChecksum;
- virtual FX_INT32 GetCalChecksum()
+ int32_t m_nCalChecksum;
+ virtual int32_t GetCalChecksum()
{
return m_nCalChecksum;
}
@@ -132,8 +132,8 @@ protected: {
return m_eTextLocation;
}
- FX_INT32 m_nWideNarrowRatio;
- virtual FX_INT32 GetWideNarrowRatio()
+ int32_t m_nWideNarrowRatio;
+ virtual int32_t GetWideNarrowRatio()
{
return m_nWideNarrowRatio;
}
@@ -146,13 +146,13 @@ protected: {
return m_cEndChar;
}
- FX_INT32 m_nVersion;
- virtual FX_INT32 GetVersion()
+ int32_t m_nVersion;
+ virtual int32_t GetVersion()
{
return m_nVersion;
}
- FX_INT32 m_nECLevel;
- virtual FX_INT32 GetErrorCorrectionLevel()
+ int32_t m_nECLevel;
+ virtual int32_t GetErrorCorrectionLevel()
{
return m_nECLevel;
}
diff --git a/xfa/include/fwl/lightwidget/checkbox.h b/xfa/include/fwl/lightwidget/checkbox.h index 2f7b2bac97..ebad96fd8e 100644 --- a/xfa/include/fwl/lightwidget/checkbox.h +++ b/xfa/include/fwl/lightwidget/checkbox.h @@ -20,8 +20,8 @@ public: FWL_ERR GetCaption(CFX_WideString &wsCaption);
FWL_ERR SetCaption(FX_WSTR wsCaption);
FWL_ERR SetBoxSize(FX_FLOAT fHeight);
- FX_INT32 GetCheckState();
- FWL_ERR SetCheckState(FX_INT32 iCheck);
+ int32_t GetCheckState();
+ FWL_ERR SetCheckState(int32_t iCheck);
CFWL_CheckBox();
virtual ~CFWL_CheckBox();
protected:
diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h index 46aec5bc8a..594c056e83 100644 --- a/xfa/include/fwl/lightwidget/combobox.h +++ b/xfa/include/fwl/lightwidget/combobox.h @@ -17,27 +17,27 @@ class CFWL_ComboBox : public CFWL_Widget public:
static CFWL_ComboBox* Create();
FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL);
- FX_INT32 AddString(FX_WSTR wsText);
- FX_INT32 AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon);
- FX_INT32 RemoveAt(FX_INT32 iIndex);
- FX_INT32 RemoveAll();
- FX_INT32 CountItems();
- FWL_ERR GetTextByIndex(FX_INT32 iIndex, CFX_WideString &wsText);
- FX_INT32 GetCurSel();
- FWL_ERR SetCurSel(FX_INT32 iSel);
+ int32_t AddString(FX_WSTR wsText);
+ int32_t AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon);
+ int32_t RemoveAt(int32_t iIndex);
+ int32_t RemoveAll();
+ int32_t CountItems();
+ FWL_ERR GetTextByIndex(int32_t iIndex, CFX_WideString &wsText);
+ int32_t GetCurSel();
+ FWL_ERR SetCurSel(int32_t iSel);
FWL_ERR SetEditText(FX_WSTR wsText);
- FX_INT32 GetEditTextLength() const;
- FWL_ERR GetEditText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const ;
- FWL_ERR SetEditSelRange(FX_INT32 nStart, FX_INT32 nCount = -1);
- FX_INT32 GetEditSelRange(FX_INT32 nIndex, FX_INT32 &nStart);
- FX_INT32 GetEditLimit();
- FWL_ERR SetEditLimit(FX_INT32 nLimit);
- FWL_ERR EditDoClipboard(FX_INT32 iCmd);
+ int32_t GetEditTextLength() const;
+ FWL_ERR GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const ;
+ FWL_ERR SetEditSelRange(int32_t nStart, int32_t nCount = -1);
+ int32_t GetEditSelRange(int32_t nIndex, int32_t &nStart);
+ int32_t GetEditLimit();
+ FWL_ERR SetEditLimit(int32_t nLimit);
+ FWL_ERR EditDoClipboard(int32_t iCmd);
FX_BOOL EditRedo(FX_BSTR bsRecord);
FX_BOOL EditUndo(FX_BSTR bsRecord);
FWL_ERR SetMaxListHeight(FX_FLOAT fMaxHeight);
- FWL_ERR SetItemData(FX_INT32 iIndex, FX_LPVOID pData);
- FX_LPVOID GetItemData(FX_INT32 iIndex);
+ FWL_ERR SetItemData(int32_t iIndex, FX_LPVOID pData);
+ FX_LPVOID GetItemData(int32_t iIndex);
FWL_ERR SetListTheme(IFWL_ThemeProvider *pTheme);
FX_BOOL AfterFocusShowDropList();
FWL_ERR OpenDropDownList(FX_BOOL bActivate);
@@ -70,10 +70,10 @@ protected: return FWL_ERR_Succeeded;
}
- virtual FX_INT32 CountItems(IFWL_Widget *pWidget);
- virtual FWL_HLISTITEM GetItem(IFWL_Widget *pWidget, FX_INT32 nIndex);
- virtual FX_INT32 GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
- virtual FX_BOOL SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_INT32 nIndex);
+ virtual int32_t CountItems(IFWL_Widget *pWidget);
+ virtual FWL_HLISTITEM GetItem(IFWL_Widget *pWidget, int32_t nIndex);
+ virtual int32_t GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
+ virtual FX_BOOL SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, int32_t nIndex);
virtual FX_DWORD GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
virtual FWL_ERR GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);
diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h index 73a382c08c..4af07a99bc 100644 --- a/xfa/include/fwl/lightwidget/datetimepicker.h +++ b/xfa/include/fwl/lightwidget/datetimepicker.h @@ -16,13 +16,13 @@ class CFWL_DateTimePicker : public CFWL_Widget public:
static CFWL_DateTimePicker* Create();
FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL);
- FWL_ERR SetToday(FX_INT32 iYear, FX_INT32 iMonth, FX_INT32 iDay);
+ FWL_ERR SetToday(int32_t iYear, int32_t iMonth, int32_t iDay);
FWL_ERR GetEditText(CFX_WideString &wsText);
FWL_ERR SetEditText(FX_WSTR wsText);
- FX_INT32 CountSelRanges();
- FX_INT32 GetSelRange(FX_INT32 nIndex, FX_INT32 &nStart);
- FWL_ERR GetCurSel(FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay);
- FWL_ERR SetCurSel(FX_INT32 iYear, FX_INT32 iMonth, FX_INT32 iDay);
+ int32_t CountSelRanges();
+ int32_t GetSelRange(int32_t nIndex, int32_t &nStart);
+ FWL_ERR GetCurSel(int32_t &iYear, int32_t &iMonth, int32_t &iDay);
+ FWL_ERR SetCurSel(int32_t iYear, int32_t iMonth, int32_t iDay);
FX_BOOL CanUndo();
FX_BOOL CanRedo();
FX_BOOL Undo();
@@ -37,7 +37,7 @@ public: FX_BOOL Delete();
FX_BOOL DeSelect();
FWL_ERR GetBBox(CFX_RectF &rect);
- FWL_ERR SetEditLimit(FX_INT32 nLimit);
+ FWL_ERR SetEditLimit(int32_t nLimit);
FWL_ERR ModifyEditStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved);
protected:
CFWL_DateTimePicker();
@@ -47,10 +47,10 @@ protected: public:
CFWL_DateTimePickerDP();
virtual FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption);
- virtual FWL_ERR GetToday(IFWL_Widget *pWidget, FX_INT32 &iYear, FX_INT32 &iMonth, FX_INT32 &iDay);
- FX_INT32 m_iYear;
- FX_INT32 m_iMonth;
- FX_INT32 m_iDay;
+ virtual FWL_ERR GetToday(IFWL_Widget *pWidget, int32_t &iYear, int32_t &iMonth, int32_t &iDay);
+ int32_t m_iYear;
+ int32_t m_iMonth;
+ int32_t m_iDay;
CFX_WideString m_wsData;
};
CFWL_DateTimePickerDP m_DateTimePickerDP;
diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h index 8299a20322..d95baa20e1 100644 --- a/xfa/include/fwl/lightwidget/edit.h +++ b/xfa/include/fwl/lightwidget/edit.h @@ -15,29 +15,29 @@ public: static CFWL_Edit* Create();
FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL);
FWL_ERR SetText(const CFX_WideString &wsText);
- FX_INT32 GetTextLength() const;
- FWL_ERR GetText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const;
+ int32_t GetTextLength() const;
+ FWL_ERR GetText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const;
FWL_ERR ClearText();
- FX_INT32 GetCaretPos() const;
- FX_INT32 SetCaretPos(FX_INT32 nIndex, FX_BOOL bBefore = TRUE);
- FWL_ERR AddSelRange(FX_INT32 nStart, FX_INT32 nCount = -1);
- FX_INT32 CountSelRanges();
- FX_INT32 GetSelRange(FX_INT32 nIndex, FX_INT32 &nStart);
+ int32_t GetCaretPos() const;
+ int32_t SetCaretPos(int32_t nIndex, FX_BOOL bBefore = TRUE);
+ FWL_ERR AddSelRange(int32_t nStart, int32_t nCount = -1);
+ int32_t CountSelRanges();
+ int32_t GetSelRange(int32_t nIndex, int32_t &nStart);
FWL_ERR ClearSelections();
- FX_INT32 GetLimit();
- FWL_ERR SetLimit(FX_INT32 nLimit);
+ int32_t GetLimit();
+ FWL_ERR SetLimit(int32_t nLimit);
FWL_ERR SetAliasChar(FX_WCHAR wAlias);
FWL_ERR SetFormatString(const CFX_WideString &wsFormat);
- FWL_ERR Insert(FX_INT32 nStart, FX_LPCWSTR lpText, FX_INT32 nLen);
+ FWL_ERR Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen);
FWL_ERR DeleteSelections();
- FWL_ERR DeleteRange(FX_INT32 nStart, FX_INT32 nCount = -1);
+ FWL_ERR DeleteRange(int32_t nStart, int32_t nCount = -1);
FWL_ERR ReplaceSelections(const CFX_WideStringC &wsReplace);
- FWL_ERR Replace(FX_INT32 nStart, FX_INT32 nLen, const CFX_WideStringC &wsReplace);
- FWL_ERR DoClipboard(FX_INT32 iCmd);
+ FWL_ERR Replace(int32_t nStart, int32_t nLen, const CFX_WideStringC &wsReplace);
+ FWL_ERR DoClipboard(int32_t iCmd);
FX_BOOL Redo(FX_BSTR bsRecord);
FX_BOOL Undo(FX_BSTR bsRecord);
FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant);
- FWL_ERR SetNumberRange(FX_INT32 iMin, FX_INT32 iMax);
+ FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax);
FWL_ERR SetBackColor(FX_DWORD dwColor);
FWL_ERR SetFont(const CFX_WideString &wsFont, FX_FLOAT fSize);
FX_BOOL CanUndo();
diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h index 55eddabb48..a8d024abaa 100644 --- a/xfa/include/fwl/lightwidget/listbox.h +++ b/xfa/include/fwl/lightwidget/listbox.h @@ -20,9 +20,9 @@ public: FWL_HLISTITEM AddString(FX_WSTR wsAdd, FX_BOOL bSelect = FALSE);
FX_BOOL DeleteString(FWL_HLISTITEM hItem);
FX_BOOL DeleteAll();
- FX_INT32 CountSelItems();
- FWL_HLISTITEM GetSelItem(FX_INT32 nIndexSel);
- FX_INT32 GetSelIndex(FX_INT32 nIndex);
+ int32_t CountSelItems();
+ FWL_HLISTITEM GetSelItem(int32_t nIndexSel);
+ int32_t GetSelIndex(int32_t nIndex);
FWL_ERR SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect = TRUE);
FWL_ERR GetItemText(FWL_HLISTITEM hItem, CFX_WideString &wsText);
FWL_ERR GetScrollPos(FX_FLOAT &fPos, FX_BOOL bVert = TRUE);
@@ -30,8 +30,8 @@ public: FWL_HLISTITEM GetFocusItem();
FWL_ERR SetFocusItem(FWL_HLISTITEM hItem);
FWL_ERR* Sort(IFWL_ListBoxCompare *pCom);
- FX_INT32 CountItems();
- FWL_HLISTITEM GetItem(FX_INT32 nIndex);
+ int32_t CountItems();
+ FWL_HLISTITEM GetItem(int32_t nIndex);
FWL_ERR SetItemString(FWL_HLISTITEM hItem, FX_WSTR wsText);
FWL_ERR GetItemString(FWL_HLISTITEM hItem, CFX_WideString &wsText);
FWL_ERR SetItemData(FWL_HLISTITEM hItem, FX_LPVOID pData);
@@ -48,10 +48,10 @@ protected: ~CFWL_ListBoxDP();
virtual FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption);
- virtual FX_INT32 CountItems(IFWL_Widget *pWidget);
- virtual FWL_HLISTITEM GetItem(IFWL_Widget *pWidget, FX_INT32 nIndex);
- virtual FX_INT32 GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
- virtual FX_BOOL SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_INT32 nIndex);
+ virtual int32_t CountItems(IFWL_Widget *pWidget);
+ virtual FWL_HLISTITEM GetItem(IFWL_Widget *pWidget, int32_t nIndex);
+ virtual int32_t GetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
+ virtual FX_BOOL SetItemIndex(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, int32_t nIndex);
virtual FX_DWORD GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem);
virtual FWL_ERR GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText);
diff --git a/xfa/include/fwl/lightwidget/picturebox.h b/xfa/include/fwl/lightwidget/picturebox.h index dd87d6806b..d15c2510a0 100644 --- a/xfa/include/fwl/lightwidget/picturebox.h +++ b/xfa/include/fwl/lightwidget/picturebox.h @@ -20,10 +20,10 @@ public: FWL_ERR SetPicture(CFX_DIBitmap *pBitmap);
FX_FLOAT GetRotation();
FWL_ERR SetRotation(FX_FLOAT fRotation);
- FX_INT32 GetFlipMode();
- FWL_ERR SetFlipMode(FX_INT32 iFlipMode);
- FX_INT32 GetOpacity();
- FWL_ERR SetOpacity(FX_INT32 iOpacity);
+ int32_t GetFlipMode();
+ FWL_ERR SetFlipMode(int32_t iFlipMode);
+ int32_t GetOpacity();
+ FWL_ERR SetOpacity(int32_t iOpacity);
FWL_ERR GetScale(FX_FLOAT &fScaleX, FX_FLOAT &fScaleY);
FWL_ERR SetScale(FX_FLOAT fScaleX, FX_FLOAT fScaleY);
FWL_ERR GetOffset(FX_FLOAT &fx, FX_FLOAT &fy);
@@ -47,12 +47,12 @@ protected: virtual CFX_DIBitmap* GetPicture(IFWL_Widget *pWidget);
virtual CFX_DIBitmap* GetErrorPicture(IFWL_Widget *pWidget);
virtual CFX_DIBitmap* GetInitialPicture(IFWL_Widget *pWidget);
- virtual FX_INT32 GetOpacity(IFWL_Widget *pWidget);
- virtual FX_INT32 GetFlipMode(IFWL_Widget *pWidget);
+ virtual int32_t GetOpacity(IFWL_Widget *pWidget);
+ virtual int32_t GetFlipMode(IFWL_Widget *pWidget);
virtual FWL_ERR GetMatrix(IFWL_Widget *pWidget, CFX_Matrix &matrix);
CFX_DIBitmap *m_pBitmap;
- FX_INT32 m_iOpacity;
- FX_INT32 m_iFlipMode;
+ int32_t m_iOpacity;
+ int32_t m_iFlipMode;
FX_FLOAT m_fRotation;
FX_FLOAT m_fScaleX;
FX_FLOAT m_fScaleY;
diff --git a/xfa/include/fwl/lightwidget/tooltipctrl.h b/xfa/include/fwl/lightwidget/tooltipctrl.h index 114696ff13..821e042533 100644 --- a/xfa/include/fwl/lightwidget/tooltipctrl.h +++ b/xfa/include/fwl/lightwidget/tooltipctrl.h @@ -18,10 +18,10 @@ public: FWL_ERR Initialize(const CFWL_WidgetProperties *pProperties = NULL);
FWL_ERR GetCaption(CFX_WideString &wsCaption);
FWL_ERR SetCaption(FX_WSTR wsCaption);
- FX_INT32 GetInitialDelay();
- FX_INT32 SetInitialDelay(FX_INT32 nDelayTime);
- FX_INT32 GetAutoPopDelay();
- FX_INT32 SetAutoPopDelay(FX_INT32 nDelayTime);
+ int32_t GetInitialDelay();
+ int32_t SetInitialDelay(int32_t nDelayTime);
+ int32_t GetAutoPopDelay();
+ int32_t SetAutoPopDelay(int32_t nDelayTime);
CFX_DIBitmap* GetToolTipIcon();
FWL_ERR SetToolTipIcon(CFX_DIBitmap* pBitmap);
CFX_SizeF GetToolTipIconSize();
@@ -37,14 +37,14 @@ protected: public:
CFWL_ToolTipDP();
FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption);
- FX_INT32 GetInitialDelay(IFWL_Widget *pWidget);
- FX_INT32 GetAutoPopDelay(IFWL_Widget *pWidget);
+ int32_t GetInitialDelay(IFWL_Widget *pWidget);
+ int32_t GetAutoPopDelay(IFWL_Widget *pWidget);
CFX_DIBitmap* GetToolTipIcon(IFWL_Widget *pWidget);
CFX_SizeF GetToolTipIconSize(IFWL_Widget *pWidget);
CFX_RectF GetAnchor();
CFX_WideString m_wsCaption;
- FX_INT32 m_nInitDelayTime;
- FX_INT32 m_nAutoPopDelayTime;
+ int32_t m_nInitDelayTime;
+ int32_t m_nAutoPopDelayTime;
CFX_DIBitmap* m_pBitmap;
CFX_SizeF m_fIconSize;
CFX_RectF m_fAnchor;
diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index 222ce1c768..d581c7fb40 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -83,7 +83,7 @@ public: virtual ~CFWL_Widget();
void RegisterEventTarget(CFWL_Widget *pEventSource = NULL, FX_DWORD dwFilter = FWL_EVENT_ALL_MASK);
void DispatchEvent(CFWL_Event *pEvent);
- CFX_SizeF CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine = FALSE, FX_INT32 iLineWidth = -1);
+ CFX_SizeF CalcTextSize(const CFX_WideString &wsText, FX_BOOL bMultiLine = FALSE, int32_t iLineWidth = -1);
IFWL_Widget *m_pImp;
IFWL_WidgetDelegate *m_pDelegate;
CFWL_WidgetMgr *m_pWidgetMgr;
@@ -94,7 +94,7 @@ class CFWL_WidgetDelegate public:
CFWL_WidgetDelegate();
virtual ~CFWL_WidgetDelegate();
- virtual FX_INT32 OnProcessMessage(CFWL_Message *pMessage);
+ virtual int32_t OnProcessMessage(CFWL_Message *pMessage);
virtual FWL_ERR OnProcessEvent(CFWL_Event *pEvent);
virtual FWL_ERR OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL);
};
diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h index 8f715e77b6..e531b55a53 100644 --- a/xfa/include/fwl/theme/formtp.h +++ b/xfa/include/fwl/theme/formtp.h @@ -30,14 +30,14 @@ protected: void CalCaption(IFWL_Widget *pWidget, CFX_RectF &rect);
void CalIcon(IFWL_Widget *pWidget, CFX_RectF &rect);
- void DrawFormBorder(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);
- void DrawCaption(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);
- void DrawNarrowCaption(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);
- void DrawCloseBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);
- void DrawMinMaxBoxCommon(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);
- void DrawMinimizeBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);
- void DrawMaximizeBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, FX_BOOL bMax, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);
- void DrawIconImage(CFX_Graphics *pGraphics, CFX_DIBitmap *pDIBitmap, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, FX_INT32 iActive = 0);
+ void DrawFormBorder(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);
+ void DrawCaption(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);
+ void DrawNarrowCaption(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);
+ void DrawCloseBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);
+ void DrawMinMaxBoxCommon(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);
+ void DrawMinimizeBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);
+ void DrawMaximizeBox(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, FX_BOOL bMax, CFX_Matrix *pMatrix, int32_t iActive = 0);
+ void DrawIconImage(CFX_Graphics *pGraphics, CFX_DIBitmap *pDIBitmap, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix, int32_t iActive = 0);
void SetThemeData(FX_DWORD dwID);
void TransModeColor(FX_ARGB clrFore, FX_ARGB &clrBack);
void DeactiveForm();
diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h index b27afc47f4..f6db37b95e 100644 --- a/xfa/include/fwl/theme/pushbuttontp.h +++ b/xfa/include/fwl/theme/pushbuttontp.h @@ -28,7 +28,7 @@ protected: void SetBackgroudColor(FX_DWORD *pData);
void SetCaptionColor(FX_DWORD *pData);
void SetCornerColor(FX_DWORD *pData);
- FX_INT32 GetColorID(FX_DWORD dwStates);
+ int32_t GetColorID(FX_DWORD dwStates);
struct PBThemeData {
FX_ARGB clrBorder[5];
diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h index f1b6b55876..fbad2ad977 100644 --- a/xfa/include/fwl/theme/utils.h +++ b/xfa/include/fwl/theme/utils.h @@ -28,10 +28,10 @@ typedef struct _FWLCOLOR { union {
FX_DWORD color;
struct {
- FX_BYTE b;
- FX_BYTE g;
- FX_BYTE r;
- FX_BYTE a;
+ uint8_t b;
+ uint8_t g;
+ uint8_t r;
+ uint8_t a;
};
};
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h index 57348e4c75..5a07c7ea03 100644 --- a/xfa/include/fwl/theme/widgettp.h +++ b/xfa/include/fwl/theme/widgettp.h @@ -47,7 +47,7 @@ protected: void DrawBorder(CFX_Graphics *pGraphics, const CFX_RectF *pRect, CFX_Matrix *pMatrix = NULL);
void FillBackground(CFX_Graphics *pGraphics, const CFX_RectF *pRect, CFX_Matrix *pMatrix = NULL);
void FillSoildRect(CFX_Graphics *pGraphics, FX_ARGB fillColor, const CFX_RectF *pRect, CFX_Matrix *pMatrix = NULL);
- void DrawAxialShading(CFX_Graphics *pGraphics, FX_FLOAT fx1, FX_FLOAT fy1, FX_FLOAT fx2, FX_FLOAT fy2, FX_ARGB beginColor, FX_ARGB endColor, CFX_Path *path, FX_INT32 fillMode = FXFILL_WINDING, CFX_Matrix *pMatrix = NULL);
+ void DrawAxialShading(CFX_Graphics *pGraphics, FX_FLOAT fx1, FX_FLOAT fy1, FX_FLOAT fx2, FX_FLOAT fy2, FX_ARGB beginColor, FX_ARGB endColor, CFX_Path *path, int32_t fillMode = FXFILL_WINDING, CFX_Matrix *pMatrix = NULL);
void DrawAnnulusRect(CFX_Graphics *pGraphics, FX_ARGB fillColor, const CFX_RectF *pRect, FX_FLOAT fRingWidth = 1, CFX_Matrix *pMatrix = NULL);
void DrawAnnulusCircle(CFX_Graphics *pGraphics, FX_ARGB fillColor, const CFX_RectF *pRect, FX_FLOAT fWidth = 1, CFX_Matrix *pMatrix = NULL);
void DrawFocus(CFX_Graphics *pGraphics, const CFX_RectF *pRect, CFX_Matrix *pMatrix = NULL);
@@ -55,7 +55,7 @@ protected: void DrawArrow(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_DIRECTION eDict, FX_ARGB argSign, CFX_Matrix *pMatrix = NULL);
void DrawBtn(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL);
void DrawArrowBtn(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL);
- FWLCOLOR BlendColor(FWLCOLOR srcColor, FWLCOLOR renderColor, FX_BYTE scale);
+ FWLCOLOR BlendColor(FWLCOLOR srcColor, FWLCOLOR renderColor, uint8_t scale);
FX_DWORD m_dwRefCount;
IFDE_TextOut *m_pTextOut;
IFX_Font *m_pFDEFont;
diff --git a/xfa/include/fxbarcode/BC_BarCode.h b/xfa/include/fxbarcode/BC_BarCode.h index 1893bc3e98..29820c7ce7 100644 --- a/xfa/include/fxbarcode/BC_BarCode.h +++ b/xfa/include/fxbarcode/BC_BarCode.h @@ -42,18 +42,18 @@ public: CBC_CodeBase();
virtual ~CBC_CodeBase();
virtual BC_TYPE GetType() = 0;
- virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e) = 0;
- virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e) = 0;
- virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e) = 0;
- virtual CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e) = 0;
- virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e) = 0;
+ virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0;
+ virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0;
+ virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0;
+ virtual CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e) = 0;
+ virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e) = 0;
- virtual FX_BOOL SetCharEncoding(FX_INT32 encoding);
- virtual FX_BOOL SetModuleHeight(FX_INT32 moduleHeight);
- virtual FX_BOOL SetModuleWidth(FX_INT32 moduleWidth);
+ virtual FX_BOOL SetCharEncoding(int32_t encoding);
+ virtual FX_BOOL SetModuleHeight(int32_t moduleHeight);
+ virtual FX_BOOL SetModuleWidth(int32_t moduleWidth);
- virtual FX_BOOL SetHeight(FX_INT32 height);
- virtual FX_BOOL SetWidth(FX_INT32 width);
+ virtual FX_BOOL SetHeight(int32_t height);
+ virtual FX_BOOL SetWidth(int32_t width);
virtual void SetBackgroundColor(FX_ARGB backgroundColor);
virtual void SetBarcodeColor(FX_ARGB foregroundColor);
protected:
@@ -66,19 +66,19 @@ public: CBC_OneCode();
virtual ~CBC_OneCode();
virtual BC_TYPE GetType() = 0;
- virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e) = 0;
- virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e) = 0;
- virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e) = 0;
- virtual CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e) = 0;
- virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e) = 0;
+ virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0;
+ virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0;
+ virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0;
+ virtual CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e) = 0;
+ virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e) = 0;
virtual FX_BOOL CheckContentValidity(FX_WSTR contents);
virtual CFX_WideString FilterContents(FX_WSTR contents);
virtual void SetPrintChecksum(FX_BOOL checksum);
- virtual void SetDataLength(FX_INT32 length);
+ virtual void SetDataLength(int32_t length);
virtual void SetCalChecksum(FX_BOOL calc);
virtual FX_BOOL SetFont(CFX_Font * cFont);
virtual void SetFontSize(FX_FLOAT size);
- virtual void SetFontStyle(FX_INT32 style);
+ virtual void SetFontStyle(int32_t style);
virtual void SetFontColor(FX_ARGB color);
};
class CBC_Code39 : public CBC_OneCode
@@ -88,17 +88,17 @@ public: CBC_Code39(FX_BOOL usingCheckDigit);
CBC_Code39(FX_BOOL usingCheckDigit, FX_BOOL extendedMode);
virtual ~CBC_Code39();
- FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
- FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
- FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
- CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
- CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
+ FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
+ FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
+ FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
+ CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
+ CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
BC_TYPE GetType()
{
return BC_CODE39;
}
FX_BOOL SetTextLocation(BC_TEXT_LOC location);
- FX_BOOL SetWideNarrowRatio(FX_INT32 ratio);
+ FX_BOOL SetWideNarrowRatio(int32_t ratio);
private:
CFX_WideString m_renderContents;
};
@@ -107,11 +107,11 @@ class CBC_Codabar : public CBC_OneCode public:
CBC_Codabar();
virtual ~CBC_Codabar();
- FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
- FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
- FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
- CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
- CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
+ FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
+ FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
+ FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
+ CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
+ CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
BC_TYPE GetType()
{
return BC_CODABAR;
@@ -119,7 +119,7 @@ public: FX_BOOL SetStartChar(FX_CHAR start);
FX_BOOL SetEndChar(FX_CHAR end);
FX_BOOL SetTextLocation(BC_TEXT_LOC location);
- FX_BOOL SetWideNarrowRatio(FX_INT32 ratio);
+ FX_BOOL SetWideNarrowRatio(int32_t ratio);
private:
CFX_WideString m_renderContents;
};
@@ -130,11 +130,11 @@ private: public:
CBC_Code128(BC_TYPE type);
virtual ~CBC_Code128();
- FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
- FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
- FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
- CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
- CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
+ FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
+ FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
+ FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
+ CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
+ CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
BC_TYPE GetType()
{
return BC_CODE128;
@@ -148,11 +148,11 @@ class CBC_EAN8 : public CBC_OneCode public:
CBC_EAN8();
virtual ~CBC_EAN8();
- FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
- FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
- FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
- CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
- CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
+ FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
+ FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
+ FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
+ CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
+ CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
BC_TYPE GetType()
{
return BC_EAN8;
@@ -166,11 +166,11 @@ class CBC_EAN13 : public CBC_OneCode public:
CBC_EAN13();
virtual ~CBC_EAN13();
- FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
- FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
- FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
- CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
- CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
+ FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
+ FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
+ FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
+ CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
+ CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
BC_TYPE GetType()
{
return BC_EAN13;
@@ -184,11 +184,11 @@ class CBC_UPCA : public CBC_OneCode public:
CBC_UPCA();
virtual ~CBC_UPCA();
- FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
- FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
- FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
- CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
- CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
+ FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
+ FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
+ FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
+ CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
+ CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
BC_TYPE GetType()
{
return BC_UPCA;
@@ -202,33 +202,33 @@ class CBC_QRCode : public CBC_CodeBase public:
CBC_QRCode();
virtual ~CBC_QRCode();
- FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
- FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
- FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
- CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
- CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
+ FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
+ FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
+ FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
+ CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
+ CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
BC_TYPE GetType()
{
return BC_QR_CODE;
}
- FX_BOOL SetVersion(FX_INT32 version);
- FX_BOOL SetErrorCorrectionLevel (FX_INT32 level);
+ FX_BOOL SetVersion(int32_t version);
+ FX_BOOL SetErrorCorrectionLevel (int32_t level);
};
class CBC_PDF417I : public CBC_CodeBase
{
public:
CBC_PDF417I();
virtual ~CBC_PDF417I();
- FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
- FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
- FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
- CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
- CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
+ FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
+ FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
+ FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
+ CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
+ CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
BC_TYPE GetType()
{
return BC_PDF417;
}
- FX_BOOL SetErrorCorrectionLevel (FX_INT32 level);
+ FX_BOOL SetErrorCorrectionLevel (int32_t level);
void SetTruncated(FX_BOOL truncated);
};
class CBC_DataMatrix : public CBC_CodeBase
@@ -236,11 +236,11 @@ class CBC_DataMatrix : public CBC_CodeBase public:
CBC_DataMatrix();
virtual ~CBC_DataMatrix();
- FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
- FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
- FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
- CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
- CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
+ FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
+ FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
+ FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
+ CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
+ CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
BC_TYPE GetType()
{
return BC_DATAMATRIX;
diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h index da39113062..b732f98d9c 100644 --- a/xfa/include/fxfa/fxfa.h +++ b/xfa/include/fxfa/fxfa.h @@ -217,7 +217,7 @@ public: * @param[in] dwButtonType Button type, refer to XFA_MESSAGEBUTTON.
* @return A valid integer representing the value of the button pressed by the user, refer to XFA_ID.
*/
- virtual FX_INT32 MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle = FX_WSTRC(L""),
+ virtual int32_t MsgBox(FX_WSTR wsMessage, FX_WSTR wsTitle = FX_WSTRC(L""),
FX_DWORD dwIconType = 0, FX_DWORD dwButtonType = 0) = 0;
/**
@@ -227,8 +227,8 @@ public: virtual void Response(CFX_WideString &wsAnswer, FX_WSTR wsQuestion, FX_WSTR wsTitle = FX_WSTRC(L""),
FX_WSTR wsDefaultAnswer = FX_WSTRC(L""), FX_BOOL bMark = TRUE) = 0;
- virtual FX_INT32 GetDocumentCountInBatch() = 0;
- virtual FX_INT32 GetCurDocumentInBatch() = 0;
+ virtual int32_t GetDocumentCountInBatch() = 0;
+ virtual int32_t GetCurDocumentInBatch() = 0;
/**
* Download something from somewhere.
@@ -259,7 +259,7 @@ public: */
virtual FX_BOOL PutRequestURL(FX_WSTR wsURL, FX_WSTR wsData, FX_WSTR wsEncode) = 0;
- virtual void LoadString(FX_INT32 iStringID, CFX_WideString &wsString) = 0;
+ virtual void LoadString(int32_t iStringID, CFX_WideString &wsString) = 0;
virtual FX_BOOL ShowFileDialog(FX_WSTR wsTitle, FX_WSTR wsFilter, CFX_WideStringArray &wsPathArr, FX_BOOL bOpen = TRUE) = 0;
virtual IFWL_AdapterTimerMgr* GetTimerMgr() = 0;
};
@@ -342,9 +342,9 @@ public: {
return FALSE;
}
- virtual FX_INT32 CountPages(IXFA_Doc* hDoc) = 0;
- virtual FX_INT32 GetCurrentPage(IXFA_Doc* hDoc) = 0;
- virtual void SetCurrentPage(IXFA_Doc* hDoc, FX_INT32 iCurPage) = 0;
+ virtual int32_t CountPages(IXFA_Doc* hDoc) = 0;
+ virtual int32_t GetCurrentPage(IXFA_Doc* hDoc) = 0;
+ virtual void SetCurrentPage(IXFA_Doc* hDoc, int32_t iCurPage) = 0;
virtual FX_BOOL IsCalculationsEnabled(IXFA_Doc* hDoc) = 0;
virtual void SetCalculationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;
virtual void GetTitle(IXFA_Doc* hDoc, CFX_WideString &wsTitle) = 0;
@@ -355,12 +355,12 @@ public: virtual FX_BOOL IsValidationsEnabled(IXFA_Doc* hDoc) = 0;
virtual void SetValidationsEnabled(IXFA_Doc* hDoc, FX_BOOL bEnabled) = 0;
virtual void SetFocusWidget(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
- virtual void Print(IXFA_Doc* hDoc, FX_INT32 nStartPage, FX_INT32 nEndPage, FX_DWORD dwOptions) = 0;
- virtual FX_INT32 AbsPageCountInBatch(IXFA_Doc* hDoc) = 0;
- virtual FX_INT32 AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
- virtual FX_INT32 SheetCountInBatch(IXFA_Doc* hDoc) = 0;
- virtual FX_INT32 SheetInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
- virtual FX_INT32 Verify(IXFA_Doc* hDoc, CXFA_Node* pSigNode, FX_BOOL bUsed = TRUE)
+ virtual void Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, FX_DWORD dwOptions) = 0;
+ virtual int32_t AbsPageCountInBatch(IXFA_Doc* hDoc) = 0;
+ virtual int32_t AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
+ virtual int32_t SheetCountInBatch(IXFA_Doc* hDoc) = 0;
+ virtual int32_t SheetInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0;
+ virtual int32_t Verify(IXFA_Doc* hDoc, CXFA_Node* pSigNode, FX_BOOL bUsed = TRUE)
{
return 0;
}
@@ -409,14 +409,14 @@ public: virtual IXFA_DocProvider* GetDocProvider(IXFA_Doc* hDoc) = 0;
virtual FX_DWORD GetDocType(IXFA_Doc* hDoc) = 0;
- virtual FX_INT32 StartLoad(IXFA_Doc* hDoc) = 0;
- virtual FX_INT32 DoLoad(IXFA_Doc* hDoc, IFX_Pause *pPause = NULL) = 0;
+ virtual int32_t StartLoad(IXFA_Doc* hDoc) = 0;
+ virtual int32_t DoLoad(IXFA_Doc* hDoc, IFX_Pause *pPause = NULL) = 0;
virtual void StopLoad(IXFA_Doc* hDoc) = 0;
virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, FX_DWORD dwView = 0) = 0;
- virtual FX_INT32 CountPackages(IXFA_Doc* hDoc) = 0;
- virtual void GetPackageName(IXFA_Doc* hDoc, FX_INT32 iPackage, CFX_WideStringC &wsPackage) = 0;
+ virtual int32_t CountPackages(IXFA_Doc* hDoc) = 0;
+ virtual void GetPackageName(IXFA_Doc* hDoc, int32_t iPackage, CFX_WideStringC &wsPackage) = 0;
virtual FX_BOOL SavePackage(IXFA_Doc* hDoc, FX_WSTR wsPackage, IFX_FileWrite* pFile, IXFA_ChecksumContext *pCSContext = NULL) = 0;
virtual FX_BOOL CloseDoc(IXFA_Doc* hDoc) = 0;
@@ -498,12 +498,12 @@ public: XFA_EVENTTYPE m_eType;
CFX_WideString m_wsResult;
FX_BOOL m_bCancelAction;
- FX_INT32 m_iCommitKey;
+ int32_t m_iCommitKey;
FX_BOOL m_bKeyDown;
FX_BOOL m_bModifier;
FX_BOOL m_bReenter;
- FX_INT32 m_iSelEnd;
- FX_INT32 m_iSelStart;
+ int32_t m_iSelEnd;
+ int32_t m_iSelStart;
FX_BOOL m_bShift;
CFX_WideString m_wsChange;
CFX_WideString m_wsFullText;
@@ -514,7 +514,7 @@ public: CFX_WideString m_wsSoapFaultCode;
CFX_WideString m_wsSoapFaultString;
FX_BOOL m_bIsFormReady;
- FX_INT32 m_iValidateActivities;
+ int32_t m_iValidateActivities;
};
#define XFA_EVENTERROR_Sucess 1
#define XFA_EVENTERROR_Error -1
@@ -529,18 +529,18 @@ public: virtual ~IXFA_DocView() { }
virtual IXFA_Doc* GetDoc() = 0;
- virtual FX_INT32 StartLayout(FX_INT32 iStartPage = 0) = 0;
- virtual FX_INT32 DoLayout(IFX_Pause *pPause = NULL) = 0;
+ virtual int32_t StartLayout(int32_t iStartPage = 0) = 0;
+ virtual int32_t DoLayout(IFX_Pause *pPause = NULL) = 0;
virtual void StopLayout() = 0;
- virtual FX_INT32 GetLayoutStatus() = 0;
+ virtual int32_t GetLayoutStatus() = 0;
virtual void UpdateDocView() = 0;
- virtual FX_INT32 CountPageViews() = 0;
- virtual IXFA_PageView* GetPageView(FX_INT32 nIndex) = 0;
+ virtual int32_t CountPageViews() = 0;
+ virtual IXFA_PageView* GetPageView(int32_t nIndex) = 0;
virtual IXFA_Widget* GetWidgetByName(FX_WSTR wsName) = 0;
virtual CXFA_WidgetAcc* GetWidgetAccByName(FX_WSTR wsName) = 0;
virtual void ResetWidgetData(CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;
- virtual FX_INT32 ProcessWidgetEvent(CXFA_EventParam* pParam, CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;
+ virtual int32_t ProcessWidgetEvent(CXFA_EventParam* pParam, CXFA_WidgetAcc* pWidgetAcc = NULL) = 0;
virtual IXFA_WidgetHandler* GetWidgetHandler() = 0;
virtual IXFA_WidgetIterator* CreateWidgetIterator() = 0;
virtual IXFA_WidgetAccIterator* CreateWidgetAccIterator(XFA_WIDGETORDER eOrder = XFA_WIDGETORDER_PreOrder) = 0;
@@ -561,12 +561,12 @@ public: virtual ~IXFA_PageView() { }
virtual IXFA_DocView* GetDocView() = 0;
- virtual FX_INT32 GetPageViewIndex() = 0;
+ virtual int32_t GetPageViewIndex() = 0;
virtual void GetPageViewRect(CFX_RectF &rtPage) = 0;
- virtual void GetDisplayMatrix(CFX_Matrix &mt, const CFX_Rect &rtDisp, FX_INT32 iRotate) = 0;
+ virtual void GetDisplayMatrix(CFX_Matrix &mt, const CFX_Rect &rtDisp, int32_t iRotate) = 0;
- virtual FX_INT32 LoadPageView(IFX_Pause *pPause = NULL) = 0;
+ virtual int32_t LoadPageView(IFX_Pause *pPause = NULL) = 0;
virtual void UnloadPageView() = 0;
virtual IXFA_Widget* GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0;
virtual IXFA_WidgetIterator* CreateWidgetIterator(FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form, FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) = 0;
@@ -590,8 +590,8 @@ class IXFA_RenderContext {
public:
virtual void Release() = 0;
- virtual FX_INT32 StartRender(IXFA_PageView* pPageView, CFX_Graphics* pGS, const CFX_Matrix& pMatrix, const CXFA_RenderOptions& options) = 0;
- virtual FX_INT32 DoRender(IFX_Pause* pPause = NULL) = 0;
+ virtual int32_t StartRender(IXFA_PageView* pPageView, CFX_Graphics* pGS, const CFX_Matrix& pMatrix, const CXFA_RenderOptions& options) = 0;
+ virtual int32_t DoRender(IFX_Pause* pPause = NULL) = 0;
virtual void StopRender() = 0;
protected:
~IXFA_RenderContext() { }
@@ -638,7 +638,7 @@ public: virtual FX_BOOL GetBBox(IXFA_Widget* hWidget, CFX_RectF &rtBox, FX_DWORD dwStatus, FX_BOOL bDrawFocus = FALSE) = 0;
virtual CXFA_WidgetAcc* GetDataAcc(IXFA_Widget* hWidget) = 0;
- virtual void GetName(IXFA_Widget* hWidget, CFX_WideString &wsName, FX_INT32 iNameType = 0) = 0;
+ virtual void GetName(IXFA_Widget* hWidget, CFX_WideString &wsName, int32_t iNameType = 0) = 0;
virtual FX_BOOL GetToolTip(IXFA_Widget* hWidget, CFX_WideString &wsToolTip) = 0;
virtual void SetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id, FX_LPVOID pData, PD_CALLBACK_FREEDATA callback) = 0;
virtual FX_LPVOID GetPrivateData(IXFA_Widget* hWidget, FX_LPVOID module_id) = 0;
@@ -648,7 +648,7 @@ public: virtual FX_BOOL OnLButtonUp(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
virtual FX_BOOL OnLButtonDblClk(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
virtual FX_BOOL OnMouseMove(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
- virtual FX_BOOL OnMouseWheel(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_SHORT zDelta, FX_FLOAT fx, FX_FLOAT fy) = 0;
+ virtual FX_BOOL OnMouseWheel(IXFA_Widget* hWidget, FX_DWORD dwFlags, int16_t zDelta, FX_FLOAT fx, FX_FLOAT fy) = 0;
virtual FX_BOOL OnRButtonDown(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
virtual FX_BOOL OnRButtonUp(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
virtual FX_BOOL OnRButtonDblClk(IXFA_Widget* hWidget, FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0;
@@ -661,7 +661,7 @@ public: virtual void RenderWidget(IXFA_Widget* hWidget, CFX_Graphics* pGS, CFX_Matrix* pMatrix = NULL, FX_BOOL bHighlight = FALSE) = 0;
virtual FX_BOOL HasEvent(CXFA_WidgetAcc* pWidgetAcc, XFA_EVENTTYPE eEventType) = 0;
- virtual FX_INT32 ProcessEvent(CXFA_WidgetAcc* pWidgetAcc, CXFA_EventParam* pParam) = 0;
+ virtual int32_t ProcessEvent(CXFA_WidgetAcc* pWidgetAcc, CXFA_EventParam* pParam) = 0;
};
class IXFA_WidgetIterator
{
diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h index 6e45060b19..dcf1ac2e95 100644 --- a/xfa/include/fxfa/fxfa_basic.h +++ b/xfa/include/fxfa/fxfa_basic.h @@ -76,7 +76,7 @@ enum XFA_XDPPACKET_FLAGS { XFA_XDPPACKET_FLAGS_SUPPORTMANY = 16,
};
typedef struct _XFA_PACKETINFO {
- FX_UINT32 uHash;
+ uint32_t uHash;
FX_LPCWSTR pName;
XFA_XDPPACKET eName;
FX_LPCWSTR pURI;
@@ -919,14 +919,14 @@ enum XFA_ELEMENT { };
#define XFA_ELEMENT_UNKNOWN ((XFA_ELEMENT)-1)
typedef struct _XFA_ELEMENTINFO {
- FX_UINT32 uHash;
+ uint32_t uHash;
FX_LPCWSTR pName;
XFA_ELEMENT eName;
FX_DWORD dwPackets;
FX_DWORD eObjectType;
} XFA_ELEMENTINFO, * XFA_LPELEMENTINFO;
typedef XFA_ELEMENTINFO const * XFA_LPCELEMENTINFO;
-FX_INT32 XFA_GetElementCount();
+int32_t XFA_GetElementCount();
XFA_LPCELEMENTINFO XFA_GetElementByName(FX_WSTR wsName);
XFA_LPCELEMENTINFO XFA_GetElementByID(XFA_ELEMENT eName);
enum XFA_ATTRIBUTETYPE {
@@ -938,7 +938,7 @@ enum XFA_ATTRIBUTETYPE { XFA_ATTRIBUTETYPE_Measure,
};
typedef struct _XFA_ATTRIBUTEINFO {
- FX_UINT32 uHash;
+ uint32_t uHash;
FX_LPCWSTR pName;
XFA_ATTRIBUTE eName;
XFA_ATTRIBUTETYPE eType;
@@ -946,14 +946,14 @@ typedef struct _XFA_ATTRIBUTEINFO { FX_LPVOID pDefValue;
} XFA_ATTRIBUTEINFO, * XFA_LPATTRIBUTEINFO;
typedef XFA_ATTRIBUTEINFO const * XFA_LPCATTRIBUTEINFO;
-FX_INT32 XFA_GetAttributeCount();
+int32_t XFA_GetAttributeCount();
XFA_LPCATTRIBUTEINFO XFA_GetAttributeByName(FX_WSTR wsName);
XFA_LPCATTRIBUTEINFO XFA_GetAttributeByID(XFA_ATTRIBUTE eName);
FX_BOOL XFA_GetAttributeDefaultValue(FX_LPVOID &pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, FX_DWORD dwPacket);
XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);
CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);
FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);
-FX_INT32 XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);
+int32_t XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);
CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);
typedef struct _XFA_ELEMENTHIERARCHY {
FX_WORD wStart;
@@ -966,25 +966,25 @@ typedef struct _XFA_SCRIPTHIERARCHY { FX_WORD wMethodCount;
FX_WORD wAttributeStart;
FX_WORD wAttributeCount;
- FX_SHORT wParentIndex;
+ int16_t wParentIndex;
} XFA_SCRIPTHIERARCHY, * XFA_LPSCRIPTHIERARCHY;
typedef XFA_SCRIPTHIERARCHY const * XFA_LPCSCRIPTHIERARCHY;
-FX_LPCWORD XFA_GetElementChildren(XFA_ELEMENT eElement, FX_INT32 &iCount);
-FX_LPCBYTE XFA_GetElementAttributes(XFA_ELEMENT eElement, FX_INT32 &iCount);
+FX_LPCWORD XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t &iCount);
+FX_LPCBYTE XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t &iCount);
XFA_LPCELEMENTINFO XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, FX_DWORD dwPacket);
XFA_LPCATTRIBUTEINFO XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, FX_DWORD dwPacket);
#define XFA_PROPERTYFLAG_OneOf 0x01
#define XFA_PROPERTYFLAG_DefaultOneOf 0x02
typedef struct _XFA_PROPERTY {
FX_WORD eName;
- FX_BYTE uOccur;
- FX_BYTE uFlags;
+ uint8_t uOccur;
+ uint8_t uFlags;
} XFA_PROPERTY, * XFA_LPPROPERTY;
typedef XFA_PROPERTY const * XFA_LPCPROPERTY;
-XFA_LPCPROPERTY XFA_GetElementProperties(XFA_ELEMENT eElement, FX_INT32 &iCount);
+XFA_LPCPROPERTY XFA_GetElementProperties(XFA_ELEMENT eElement, int32_t &iCount);
XFA_LPCPROPERTY XFA_GetPropertyOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eProperty, FX_DWORD dwPacket);
typedef struct _XFA_ATTRIBUTEENUMINFO {
- FX_UINT32 uHash;
+ uint32_t uHash;
FX_LPCWSTR pName;
XFA_ATTRIBUTEENUM eName;
} XFA_ATTRIBUTEENUMINFO, * XFA_LPATTRIBUTEENUMINFO;
@@ -1049,12 +1049,12 @@ class CFXJSE_Arguments; class CXFA_Object;
typedef void (CXFA_Object::*XFA_METHOD_CALLBACK) (CFXJSE_Arguments* pArguments);
typedef struct _XFA_METHODINFO {
- FX_UINT32 uHash;
+ uint32_t uHash;
FX_LPCWSTR pName;
XFA_METHOD_CALLBACK lpfnCallback;
} XFA_METHODINFO, * XFA_LPMETHODINFO;
typedef XFA_METHODINFO const * XFA_LPCMETHODINFO;
-FX_INT32 XFA_GetMethodCount();
+int32_t XFA_GetMethodCount();
XFA_LPCMETHODINFO XFA_GetMethodByName(XFA_ELEMENT eElement, FX_WSTR wsMethodName);
typedef void (CXFA_Object::*XFA_ATTRIBUTE_CALLBACK) (FXJSE_HVALUE hValue, FX_BOOL bSetting, XFA_ATTRIBUTE eAttribute);
enum XFA_SCRIPT_TYPE {
@@ -1062,10 +1062,10 @@ enum XFA_SCRIPT_TYPE { XFA_SCRIPT_Object,
};
typedef struct _XFA_SCRIPTATTRIBUTEINFO {
- FX_UINT32 uHash;
+ uint32_t uHash;
FX_LPCWSTR pName;
XFA_ATTRIBUTE_CALLBACK lpfnCallback;
- FX_INT32 eAttribute;
+ int32_t eAttribute;
FX_WORD eValueType;
} XFA_SCRIPTATTRIBUTEINFO, * XFA_LPSCRIPTATTRIBUTEINFO;
typedef XFA_SCRIPTATTRIBUTEINFO const * XFA_LPCSCRIPTATTRIBUTEINFO;
diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h index d78a87dd64..888000805f 100644 --- a/xfa/include/fxfa/fxfa_objectacc.h +++ b/xfa/include/fxfa/fxfa_objectacc.h @@ -89,28 +89,28 @@ public: CXFA_Fill(CXFA_Node* pNode);
~CXFA_Fill();
- FX_INT32 GetPresence();
+ int32_t GetPresence();
FX_ARGB GetColor(FX_BOOL bText = FALSE);
void SetColor(FX_ARGB color);
- FX_INT32 GetFillType();
+ int32_t GetFillType();
- FX_INT32 GetPattern(FX_ARGB& foreColor);
+ int32_t GetPattern(FX_ARGB& foreColor);
- FX_INT32 GetStipple(FX_ARGB& stippleColor);
+ int32_t GetStipple(FX_ARGB& stippleColor);
- FX_INT32 GetLinear(FX_ARGB& endColor);
+ int32_t GetLinear(FX_ARGB& endColor);
- FX_INT32 GetRadial(FX_ARGB& endColor);
- FX_BOOL SetPresence(FX_INT32 iPresence);
- FX_BOOL SetFillType(FX_INT32 iType);
- FX_BOOL SetPattern(FX_INT32 iPattern, FX_ARGB foreColor);
- FX_BOOL SetStipple(FX_INT32 iStipple, FX_ARGB stippleColor);
- FX_BOOL SetLinear(FX_INT32 iLinear, FX_ARGB endColor);
- FX_BOOL SetRadial(FX_INT32 iRadial, FX_ARGB endColor);
+ int32_t GetRadial(FX_ARGB& endColor);
+ FX_BOOL SetPresence(int32_t iPresence);
+ FX_BOOL SetFillType(int32_t iType);
+ FX_BOOL SetPattern(int32_t iPattern, FX_ARGB foreColor);
+ FX_BOOL SetStipple(int32_t iStipple, FX_ARGB stippleColor);
+ FX_BOOL SetLinear(int32_t iLinear, FX_ARGB endColor);
+ FX_BOOL SetRadial(int32_t iRadial, FX_ARGB endColor);
};
class CXFA_Margin : public CXFA_Data
{
@@ -138,17 +138,17 @@ public: FX_FLOAT GetLetterSpacing();
- FX_INT32 GetLineThrough();
+ int32_t GetLineThrough();
- FX_INT32 GetLineThroughPeriod();
+ int32_t GetLineThroughPeriod();
- FX_INT32 GetOverline();
+ int32_t GetOverline();
- FX_INT32 GetOverlinePeriod();
+ int32_t GetOverlinePeriod();
- FX_INT32 GetUnderline();
+ int32_t GetUnderline();
- FX_INT32 GetUnderlinePeriod();
+ int32_t GetUnderlinePeriod();
FX_FLOAT GetFontSize();
@@ -167,21 +167,21 @@ public: FX_BOOL SetHorizontalScale(FX_FLOAT fHorizontalScale);
FX_BOOL SetVerticalScale(FX_FLOAT fVerticalScale);
FX_BOOL SetLetterSpacing(FX_FLOAT fLetterSpacing, XFA_UNIT eUnit);
- FX_BOOL SetLineThrough(FX_INT32 iLineThrough);
- FX_BOOL SetLineThroughPeriod(FX_INT32 iLineThroughPeriod);
- FX_BOOL SetOverline(FX_INT32 iOverline);
- FX_BOOL SetOverlinePeriod(FX_INT32 iOverlinePeriod);
- FX_BOOL SetUnderline(FX_INT32 iUnderline);
- FX_BOOL SetUnderlinePeriod(FX_INT32 iUnderlinePeriod);
+ FX_BOOL SetLineThrough(int32_t iLineThrough);
+ FX_BOOL SetLineThroughPeriod(int32_t iLineThroughPeriod);
+ FX_BOOL SetOverline(int32_t iOverline);
+ FX_BOOL SetOverlinePeriod(int32_t iOverlinePeriod);
+ FX_BOOL SetUnderline(int32_t iUnderline);
+ FX_BOOL SetUnderlinePeriod(int32_t iUnderlinePeriod);
};
class CXFA_Caption : public CXFA_Data
{
public:
CXFA_Caption(CXFA_Node* pNode);
- FX_INT32 GetPresence();
+ int32_t GetPresence();
- FX_INT32 GetPlacementType();
+ int32_t GetPlacementType();
FX_FLOAT GetReserve();
@@ -192,8 +192,8 @@ public: CXFA_Value GetValue();
CXFA_Para GetPara();
- FX_BOOL SetPresence(FX_INT32 iPresence);
- FX_BOOL SetPlacementType(FX_INT32 iType);
+ FX_BOOL SetPresence(int32_t iPresence);
+ FX_BOOL SetPlacementType(int32_t iType);
FX_BOOL SetReserve(FX_FLOAT fReserve);
};
class CXFA_Para : public CXFA_Data
@@ -201,42 +201,42 @@ class CXFA_Para : public CXFA_Data public:
CXFA_Para(CXFA_Node* pNode);
- FX_INT32 GetHorizontalAlign();
+ int32_t GetHorizontalAlign();
- FX_INT32 GetVerticalAlign();
+ int32_t GetVerticalAlign();
FX_FLOAT GetLineHeight();
FX_FLOAT GetMarginLeft();
FX_FLOAT GetMarginRight();
- FX_INT32 GetOrphans();
+ int32_t GetOrphans();
FX_FLOAT GetRadixOffset();
FX_FLOAT GetSpaceAbove();
FX_FLOAT GetSpaceBelow();
FX_FLOAT GetTextIndent();
- FX_INT32 GetWidows();
- FX_BOOL SetHorizontalAlign(FX_INT32 iHorizontalAlign);
- FX_BOOL SetVerticalAlign(FX_INT32 iVerticalAlign);
+ int32_t GetWidows();
+ FX_BOOL SetHorizontalAlign(int32_t iHorizontalAlign);
+ FX_BOOL SetVerticalAlign(int32_t iVerticalAlign);
FX_BOOL SetLineHeight(FX_FLOAT fLineHeight);
FX_BOOL SetMarginLeft(FX_FLOAT fMarginLeft);
FX_BOOL SetMarginRight(FX_FLOAT fMarginRight);
- FX_BOOL SetOrphans(FX_INT32 iOrphans);
+ FX_BOOL SetOrphans(int32_t iOrphans);
FX_BOOL SetRadixOffset(FX_FLOAT fRadixOffset);
FX_BOOL SetSpaceAbove(FX_FLOAT fSpaceAbove);
FX_BOOL SetSpaceBelow(FX_FLOAT fSpaceBelow);
FX_BOOL SetTextIndent(FX_FLOAT fTextIndent);
- FX_BOOL SetWidows(FX_INT32 iWidows);
+ FX_BOOL SetWidows(int32_t iWidows);
};
class CXFA_Keep : public CXFA_Data
{
public:
CXFA_Keep(CXFA_Node *pNode, CXFA_Node *pParent);
- FX_INT32 GetIntact();
- FX_INT32 GetNext();
- FX_INT32 GetPrevious();
- FX_BOOL SetIntact(FX_INT32 iIntact);
- FX_BOOL SetNext(FX_INT32 iNext);
- FX_BOOL SetPrevious(FX_INT32 iPrevious);
+ int32_t GetIntact();
+ int32_t GetNext();
+ int32_t GetPrevious();
+ FX_BOOL SetIntact(int32_t iIntact);
+ FX_BOOL SetNext(int32_t iNext);
+ FX_BOOL SetPrevious(int32_t iPrevious);
private:
CXFA_Node *m_pParent;
};
@@ -260,13 +260,13 @@ public: CXFA_Event(CXFA_Node* pNode);
- FX_INT32 GetActivity();
+ int32_t GetActivity();
- FX_INT32 GetEventType();
+ int32_t GetEventType();
void GetRef(CFX_WideStringC &wsRef);
- FX_INT32 GetExecuteRunAt();
- FX_INT32 GetExecuteType();
+ int32_t GetExecuteRunAt();
+ int32_t GetExecuteType();
void GetExecuteConnection(CFX_WideString &wsConnection);
@@ -276,14 +276,14 @@ public: CXFA_Submit GetSubmit();
- FX_INT32 GetSignDataOperation();
+ int32_t GetSignDataOperation();
void GetSignDataTarget(CFX_WideString &wsTarget);
- FX_BOOL SetActivity(FX_INT32 iActivity);
- FX_BOOL SetEventType(FX_INT32 iEventType);
- FX_BOOL SetExecuteRunAt(FX_INT32 iExecuteRunAt);
- FX_BOOL SetExecuteType(FX_INT32 iExecuteType);
+ FX_BOOL SetActivity(int32_t iActivity);
+ FX_BOOL SetEventType(int32_t iEventType);
+ FX_BOOL SetExecuteRunAt(int32_t iExecuteRunAt);
+ FX_BOOL SetExecuteType(int32_t iExecuteType);
FX_BOOL SetExecuteConnection(const CFX_WideString& wsConnection);
- FX_BOOL SetSignDataOperation(FX_INT32 iOperation);
+ FX_BOOL SetSignDataOperation(int32_t iOperation);
FX_BOOL SetSignDataTarget(const CFX_WideString& wsTarget);
};
enum XFA_SCRIPTTYPE {
@@ -298,11 +298,11 @@ public: void GetBinding(CFX_WideString &wsBinding);
XFA_SCRIPTTYPE GetContentType();
- FX_INT32 GetRunAt();
+ int32_t GetRunAt();
void GetExpression(CFX_WideString &wsExpression);
FX_BOOL SetBinding(const CFX_WideString& wsBinding);
FX_BOOL SetContentType(XFA_SCRIPTTYPE eType);
- FX_BOOL SetRunAt(FX_INT32 iRunAt);
+ FX_BOOL SetRunAt(int32_t iRunAt);
FX_BOOL SetExpression(const CFX_WideString& wsExpression);
};
class CXFA_Submit : public CXFA_Data
@@ -310,11 +310,11 @@ class CXFA_Submit : public CXFA_Data public:
CXFA_Submit(CXFA_Node* pNode);
FX_BOOL IsSubmitEmbedPDF();
- FX_INT32 GetSubmitFormat();
+ int32_t GetSubmitFormat();
void GetSubmitTarget(CFX_WideStringC &wsTarget);
XFA_TEXTENCODING GetSubmitTextEncoding();
void GetSubmitXDPContent(CFX_WideStringC &wsContent);
- FX_BOOL SetSubmitFormat(FX_INT32 iSubmitFormat);
+ FX_BOOL SetSubmitFormat(int32_t iSubmitFormat);
FX_BOOL SetSubmitTarget(const CFX_WideString& wsTarget);
FX_BOOL SetSubmitTextEncoding(XFA_TEXTENCODING eTextEncoding);
FX_BOOL SetSubmitXDPContent(const CFX_WideString& wsContent);
@@ -339,23 +339,23 @@ class CXFA_Line : public CXFA_Data {
public:
CXFA_Line(CXFA_Node* pNode) : CXFA_Data(pNode) {}
- FX_INT32 GetHand();
+ int32_t GetHand();
FX_BOOL GetSlop();
CXFA_Edge GetEdge();
- FX_BOOL SetHand(FX_INT32 iHand);
- FX_BOOL SetSlop(FX_INT32 iSlop);
+ FX_BOOL SetHand(int32_t iHand);
+ FX_BOOL SetSlop(int32_t iSlop);
};
class CXFA_Text : public CXFA_Data
{
public:
CXFA_Text(CXFA_Node* pNode);
void GetName(CFX_WideStringC &wsName);
- FX_INT32 GetMaxChars();
+ int32_t GetMaxChars();
void GetRid(CFX_WideStringC &wsRid);
void GetContent(CFX_WideString &wsText);
void SetContent(CFX_WideString wsText, FX_BOOL bNotify = TRUE);
FX_BOOL SetName(const CFX_WideString& wsName);
- FX_BOOL SetMaxChars(FX_INT32 iMaxChars);
+ FX_BOOL SetMaxChars(int32_t iMaxChars);
FX_BOOL SetRid(const CFX_WideString& wsRid);
};
class CXFA_ExData : public CXFA_Data
@@ -364,30 +364,30 @@ public: CXFA_ExData(CXFA_Node* pNode);
void GetContentType(CFX_WideStringC &wsContentType);
void GetHref(CFX_WideStringC &wsHref);
- FX_INT32 GetMaxLength();
+ int32_t GetMaxLength();
void GetRid(CFX_WideStringC &wsRid);
- FX_INT32 GetTransferEncoding();
+ int32_t GetTransferEncoding();
void GetContent(CFX_WideString &wsText);
FX_BOOL SetContentType(const CFX_WideString& wsContentType);
FX_BOOL SetHref(const CFX_WideString& wsHref);
- FX_BOOL SetMaxLength(FX_INT32 iMaxLength);
+ FX_BOOL SetMaxLength(int32_t iMaxLength);
FX_BOOL SetRid(const CFX_WideString& wsRid);
- FX_BOOL SetTransferEncoding(FX_INT32 iTransferEncoding);
+ FX_BOOL SetTransferEncoding(int32_t iTransferEncoding);
FX_BOOL SetContent(const CFX_WideString& wsText, FX_BOOL bNotify = FALSE, FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);
};
class CXFA_Image : public CXFA_Data
{
public:
CXFA_Image(CXFA_Node* pNode, FX_BOOL bDefValue);
- FX_INT32 GetAspect();
+ int32_t GetAspect();
FX_BOOL GetContentType(CFX_WideString &wsContentType);
FX_BOOL GetHref(CFX_WideString &wsHref);
- FX_INT32 GetTransferEncoding();
+ int32_t GetTransferEncoding();
FX_BOOL GetContent(CFX_WideString &wsText);
- FX_BOOL SetAspect(FX_INT32 iAspect);
+ FX_BOOL SetAspect(int32_t iAspect);
FX_BOOL SetContentType(const CFX_WideString& wsContentType);
FX_BOOL SetHref(const CFX_WideString& wsHref);
- FX_BOOL SetTransferEncoding(FX_INT32 iTransferEncoding);
+ FX_BOOL SetTransferEncoding(int32_t iTransferEncoding);
FX_BOOL SetContent(const CFX_WideString& wsText);
protected:
FX_BOOL m_bDefValue;
@@ -397,21 +397,21 @@ class CXFA_Calculate : public CXFA_Data public:
CXFA_Calculate(CXFA_Node* pNode);
- FX_INT32 GetOverride();
+ int32_t GetOverride();
CXFA_Script GetScript();
void GetMessageText(CFX_WideString &wsMessage);
- FX_BOOL SetOverride(FX_INT32 iOverride);
+ FX_BOOL SetOverride(int32_t iOverride);
FX_BOOL SetMessageText(const CFX_WideString& wsMessage);
};
class CXFA_Validate : public CXFA_Data
{
public:
CXFA_Validate(CXFA_Node* pNode);
- FX_INT32 GetFormatTest();
+ int32_t GetFormatTest();
FX_BOOL SetFormatTest(CFX_WideString wsValue);
- FX_INT32 GetNullTest();
+ int32_t GetNullTest();
FX_BOOL SetNullTest(CFX_WideString wsValue);
- FX_INT32 GetScriptTest();
+ int32_t GetScriptTest();
void GetFormatMessageText(CFX_WideString &wsMessage);
void SetFormatMessageText(CFX_WideString wsMessage);
void GetNullMessageText(CFX_WideString &wsMessage);
@@ -423,24 +423,24 @@ public: protected:
void GetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType);
void SetMessageText(CFX_WideString &wsMessage, FX_WSTR wsMessageType);
- FX_BOOL SetTestValue(FX_INT32 iType, CFX_WideString &wsValue, XFA_ATTRIBUTEENUM eName);
+ FX_BOOL SetTestValue(int32_t iType, CFX_WideString &wsValue, XFA_ATTRIBUTEENUM eName);
};
class CXFA_Variables : public CXFA_Data
{
public:
CXFA_Variables(CXFA_Node* pNode);
- FX_INT32 CountScripts();
- CXFA_Script GetScript(FX_INT32 nIndex);
+ int32_t CountScripts();
+ CXFA_Script GetScript(int32_t nIndex);
};
class CXFA_Bind : public CXFA_Data
{
public:
CXFA_Bind(CXFA_Node* pNode);
- FX_INT32 GetMatch();
+ int32_t GetMatch();
void GetRef(CFX_WideStringC &wsRef);
void GetPicture(CFX_WideString &wsPicture);
- FX_BOOL SetMatch(FX_INT32 iMatch);
+ FX_BOOL SetMatch(int32_t iMatch);
FX_BOOL SetRef(const CFX_WideString& wsRef);
FX_BOOL SetPicture(const CFX_WideString& wsPicture);
};
@@ -489,15 +489,15 @@ public: return GetClassID() == XFA_ELEMENT_Edge;
}
- FX_INT32 GetPresence() const;
+ int32_t GetPresence() const;
FX_BOOL IsVisible() const
{
return GetPresence() == XFA_ATTRIBUTEENUM_Visible;
}
- FX_INT32 GetCapType() const;
+ int32_t GetCapType() const;
- FX_INT32 GetStrokeType() const;
+ int32_t GetStrokeType() const;
FX_FLOAT GetThickness() const;
CXFA_Measurement GetMSThickness() const;
@@ -509,7 +509,7 @@ public: void SetColor(FX_ARGB argb);
- FX_INT32 GetJoinType() const;
+ int32_t GetJoinType() const;
FX_BOOL IsInverted() const;
@@ -551,19 +551,19 @@ public: return GetClassID() == XFA_ELEMENT_Rectangle;
}
- FX_INT32 GetBreak() const;
+ int32_t GetBreak() const;
- FX_INT32 GetHand() const;
+ int32_t GetHand() const;
- FX_INT32 GetPresence() const;
+ int32_t GetPresence() const;
- FX_INT32 CountCorners() const;
+ int32_t CountCorners() const;
- CXFA_Corner GetCorner(FX_INT32 nIndex) const;
+ CXFA_Corner GetCorner(int32_t nIndex) const;
- FX_INT32 CountEdges() const;
+ int32_t CountEdges() const;
- CXFA_Edge GetEdge(FX_INT32 nIndex = 0) const;
+ CXFA_Edge GetEdge(int32_t nIndex = 0) const;
void GetStrokes(CXFA_StrokeArray &strokes) const;
@@ -591,7 +591,7 @@ public: FX_BOOL SameStyles() const;
- FX_INT32 Get3DStyle(FX_BOOL &bVisible, FX_FLOAT &fThickness) const;
+ int32_t Get3DStyle(FX_BOOL &bVisible, FX_FLOAT &fThickness) const;
};
class CXFA_Arc : public CXFA_Box
{
@@ -627,12 +627,12 @@ public: XFA_ELEMENT GetUIType();
CFX_WideString GetRawValue();
- FX_INT32 GetAccess(FX_BOOL bTemplate = FALSE);
+ int32_t GetAccess(FX_BOOL bTemplate = FALSE);
FX_BOOL GetAccessKey(CFX_WideStringC &wsAccessKey);
- FX_INT32 GetAnchorType();
- FX_INT32 GetColSpan();
- FX_INT32 GetPresence();
- FX_INT32 GetRotate();
+ int32_t GetAnchorType();
+ int32_t GetColSpan();
+ int32_t GetPresence();
+ int32_t GetRotate();
CXFA_Border GetBorder(FX_BOOL bModified = FALSE);
CXFA_Caption GetCaption(FX_BOOL bModified = FALSE);
CXFA_Font GetFont(FX_BOOL bModified = FALSE);
@@ -640,7 +640,7 @@ public: CXFA_Para GetPara(FX_BOOL bModified = FALSE);
CXFA_Keep GetKeep(FX_BOOL bModified = FALSE);
void GetEventList(CXFA_NodeArray &events);
- FX_INT32 GetEventByActivity(FX_INT32 iActivity,
+ int32_t GetEventByActivity(int32_t iActivity,
CXFA_NodeArray &events,
FX_BOOL bIsFormReady = FALSE);
CXFA_Value GetDefaultValue(FX_BOOL bModified = FALSE);
@@ -659,12 +659,12 @@ public: FX_BOOL GetMaxWidth(FX_FLOAT &fMaxWidth);
FX_BOOL GetMaxHeight(FX_FLOAT &fMaxHeight);
CXFA_BindItems GetBindItems();
- FX_BOOL SetAccess(FX_INT32 iAccess, FX_BOOL bNotify = TRUE);
+ FX_BOOL SetAccess(int32_t iAccess, FX_BOOL bNotify = TRUE);
FX_BOOL SetAccessKey(const CFX_WideString& wsAccessKey);
- FX_BOOL SetAnchorType(FX_INT32 iType);
- FX_BOOL SetColSpan(FX_INT32 iColSpan);
- FX_BOOL SetPresence(FX_INT32 iPresence);
- FX_BOOL SetRotate(FX_INT32 iRotate);
+ FX_BOOL SetAnchorType(int32_t iType);
+ FX_BOOL SetColSpan(int32_t iColSpan);
+ FX_BOOL SetPresence(int32_t iPresence);
+ FX_BOOL SetRotate(int32_t iRotate);
FX_BOOL SetRelevant(const CFX_WideString& wsRelevant);
FX_BOOL SetStatus(FX_DWORD dwStatus);
FX_BOOL SetWidth(FX_FLOAT fWidth);
@@ -675,20 +675,20 @@ public: FX_BOOL SetMaxHeight(FX_FLOAT fMaxHeight);
FX_BOOL SetPos(FX_FLOAT x, FX_FLOAT y);
FX_BOOL SetName(const CFX_WideString& wsName);
- FX_BOOL SetButtonHighlight(FX_INT32 iButtonHighlight);
+ FX_BOOL SetButtonHighlight(int32_t iButtonHighlight);
FX_BOOL SetButtonRollover(const CFX_WideString &wsRollover, FX_BOOL bRichText);
FX_BOOL SetButtonDown(const CFX_WideString& wsDown, FX_BOOL bRichText);
- FX_BOOL SetCheckButtonShape(FX_INT32 iCheckButtonShape);
- FX_BOOL SetCheckButtonMark(FX_INT32 iCheckButtonMark);
+ FX_BOOL SetCheckButtonShape(int32_t iCheckButtonShape);
+ FX_BOOL SetCheckButtonMark(int32_t iCheckButtonMark);
FX_BOOL SetCheckButtonSize(FX_FLOAT fCheckButtonMark);
CXFA_Border GetUIBorder(FX_BOOL bModified = FALSE);
CXFA_Margin GetUIMargin(FX_BOOL bModified = FALSE);
void GetUIMargin(CFX_RectF &rtUIMargin);
- FX_INT32 GetButtonHighlight();
+ int32_t GetButtonHighlight();
FX_BOOL GetButtonRollover(CFX_WideString &wsRollover, FX_BOOL &bRichText);
FX_BOOL GetButtonDown(CFX_WideString &wsDown, FX_BOOL &bRichText);
- FX_INT32 GetCheckButtonShape();
- FX_INT32 GetCheckButtonMark();
+ int32_t GetCheckButtonShape();
+ int32_t GetCheckButtonMark();
FX_FLOAT GetCheckButtonSize();
FX_BOOL IsAllowNeutral();
FX_BOOL IsRadioButton();
@@ -703,32 +703,32 @@ public: FX_BOOL bSyncData = TRUE);
CXFA_Node* GetExclGroupFirstMember();
CXFA_Node* GetExclGroupNextMember(CXFA_Node* pNode);
- FX_INT32 GetChoiceListCommitOn();
+ int32_t GetChoiceListCommitOn();
FX_BOOL IsChoiceListAllowTextEntry();
- FX_INT32 GetChoiceListOpen();
+ int32_t GetChoiceListOpen();
FX_BOOL IsListBox();
- FX_INT32 CountChoiceListItems(FX_BOOL bSaveValue = FALSE);
- FX_BOOL GetChoiceListItem(CFX_WideString &wsText, FX_INT32 nIndex, FX_BOOL bSaveValue = FALSE);
+ int32_t CountChoiceListItems(FX_BOOL bSaveValue = FALSE);
+ FX_BOOL GetChoiceListItem(CFX_WideString &wsText, int32_t nIndex, FX_BOOL bSaveValue = FALSE);
void GetChoiceListItems(CFX_WideStringArray &wsTextArray, FX_BOOL bSaveValue = FALSE);
- FX_INT32 CountSelectedItems();
- FX_INT32 GetSelectedItem(FX_INT32 nIndex = 0);
+ int32_t CountSelectedItems();
+ int32_t GetSelectedItem(int32_t nIndex = 0);
void GetSelectedItems(CFX_Int32Array &iSelArray);
void GetSelectedItemsValue(CFX_WideStringArray &wsSelTextArray);
- FX_BOOL GetItemState(FX_INT32 nIndex);
- void SetItemState(FX_INT32 nIndex, FX_BOOL bSelected,
+ FX_BOOL GetItemState(int32_t nIndex);
+ void SetItemState(int32_t nIndex, FX_BOOL bSelected,
FX_BOOL bNotify = FALSE, FX_BOOL bScriptModify = FALSE,
FX_BOOL bSyncData = TRUE);
void SetSelectdItems(CFX_Int32Array &iSelArray, FX_BOOL bNotify = FALSE,
FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);
void ClearAllSelections();
void InsertItem(const CFX_WideString &wsLabel, const CFX_WideString &wsValue,
- FX_INT32 nIndex = -1, FX_BOOL bNotify = FALSE);
+ int32_t nIndex = -1, FX_BOOL bNotify = FALSE);
void GetItemLabel(FX_WSTR wsValue, CFX_WideString &wsLabel);
void GetItemValue(FX_WSTR wsLabel, CFX_WideString &wsValue);
- FX_BOOL DeleteItem(FX_INT32 nIndex, FX_BOOL bNotify = FALSE,
+ FX_BOOL DeleteItem(int32_t nIndex, FX_BOOL bNotify = FALSE,
FX_BOOL bScriptModify = FALSE, FX_BOOL bSyncData = TRUE);
- FX_INT32 GetHorizontalScrollPolicy();
- FX_INT32 GetNumberOfCells();
+ int32_t GetHorizontalScrollPolicy();
+ int32_t GetNumberOfCells();
FX_BOOL IsDateTimeEditUsePicker();
FX_BOOL SetValue(const CFX_WideString& wsValue, XFA_VALUEPICTURE eValueType);
FX_BOOL GetPictureContent(CFX_WideString &wsPicture, XFA_VALUEPICTURE ePicture);
@@ -738,25 +738,25 @@ public: FX_BOOL GetFormatDataValue(FX_WSTR wsValue, CFX_WideString &wsFormatedValue);
void NormalizeNumStr(const CFX_WideString& wsValue, CFX_WideString& wsOutput);
CFX_WideString GetBarcodeType();
- FX_BOOL GetBarcodeAttribute_CharEncoding(FX_INT32& val);
- FX_BOOL GetBarcodeAttribute_Checksum(FX_INT32& val);
- FX_BOOL GetBarcodeAttribute_DataLength(FX_INT32& val);
+ FX_BOOL GetBarcodeAttribute_CharEncoding(int32_t& val);
+ FX_BOOL GetBarcodeAttribute_Checksum(int32_t& val);
+ FX_BOOL GetBarcodeAttribute_DataLength(int32_t& val);
FX_BOOL GetBarcodeAttribute_StartChar(FX_CHAR& val);
FX_BOOL GetBarcodeAttribute_EndChar(FX_CHAR& val);
- FX_BOOL GetBarcodeAttribute_ECLevel(FX_INT32& val);
- FX_BOOL GetBarcodeAttribute_ModuleWidth(FX_INT32& val);
- FX_BOOL GetBarcodeAttribute_ModuleHeight(FX_INT32& val);
+ FX_BOOL GetBarcodeAttribute_ECLevel(int32_t& val);
+ FX_BOOL GetBarcodeAttribute_ModuleWidth(int32_t& val);
+ FX_BOOL GetBarcodeAttribute_ModuleHeight(int32_t& val);
FX_BOOL GetBarcodeAttribute_PrintChecksum(FX_BOOL& val);
- FX_BOOL GetBarcodeAttribute_TextLocation(FX_INT32& val);
+ FX_BOOL GetBarcodeAttribute_TextLocation(int32_t& val);
FX_BOOL GetBarcodeAttribute_Truncate(FX_BOOL& val);
FX_BOOL GetBarcodeAttribute_WideNarrowRatio(FX_FLOAT& val);
void GetPasswordChar(CFX_WideString &wsPassWord);
FX_BOOL IsAllowRichText();
FX_BOOL IsMultiLine();
- FX_INT32 GetVerticalScrollPolicy();
- FX_INT32 GetMaxChars(XFA_ELEMENT& eType);
- FX_BOOL GetFracDigits(FX_INT32 &iFracDigits);
- FX_BOOL GetLeadDigits(FX_INT32 &iLeadDigits);
+ int32_t GetVerticalScrollPolicy();
+ int32_t GetMaxChars(XFA_ELEMENT& eType);
+ FX_BOOL GetFracDigits(int32_t &iFracDigits);
+ FX_BOOL GetLeadDigits(int32_t &iLeadDigits);
CXFA_Filter GetFilter(FX_BOOL bModified = FALSE);
CXFA_Manifest GetManifest(FX_BOOL bModified = FALSE);
@@ -764,7 +764,7 @@ public: FX_BOOL m_bPreNull;
protected:
void SyncValue(const CFX_WideString& wsValue, FX_BOOL bNotify);
- void InsertListTextItem(CXFA_Node* pItems, FX_WSTR wsText, FX_INT32 nIndex = -1);
+ void InsertListTextItem(CXFA_Node* pItems, FX_WSTR wsText, int32_t nIndex = -1);
void FormatNumStr(const CFX_WideString& wsValue, IFX_Locale* pLocale, CFX_WideString& wsOutput);
CXFA_Node* m_pUiChildNode;
@@ -774,12 +774,12 @@ class CXFA_Occur : public CXFA_Data {
public:
CXFA_Occur(CXFA_Node* pNode);
- FX_INT32 GetMax();
- FX_INT32 GetMin();
- FX_INT32 GetInitial();
- FX_BOOL GetOccurInfo(FX_INT32& iMin, FX_INT32& iMax, FX_INT32& iInit);
- void SetMax(FX_INT32 iMax);
- void SetMin(FX_INT32 iMin);
+ int32_t GetMax();
+ int32_t GetMin();
+ int32_t GetInitial();
+ FX_BOOL GetOccurInfo(int32_t& iMin, int32_t& iMax, int32_t& iInit);
+ void SetMax(int32_t iMax);
+ void SetMin(int32_t iMin);
};
class CXFA_Filter : public CXFA_Data
{
@@ -803,7 +803,7 @@ public: CFX_WideString GetHandlerContent();
XFA_ATTRIBUTEENUM GetlockDocumentType();
CFX_WideString GetlockDocumentContent();
- FX_INT32 GetMDPPermissions();
+ int32_t GetMDPPermissions();
XFA_ATTRIBUTEENUM GetMDPSignatureType();
CXFA_Reasons GetReasons(FX_BOOL bModified = FALSE);
@@ -822,64 +822,64 @@ class CXFA_WrapCertificate : public CXFA_Data public:
CXFA_WrapCertificate(CXFA_Node* pNode) : CXFA_Data(pNode) {}
XFA_ATTRIBUTEENUM GetType();
- FX_INT32 CountCertificates();
- CXFA_Certificate GetCertificate(FX_INT32 nIndex);
+ int32_t CountCertificates();
+ CXFA_Certificate GetCertificate(int32_t nIndex);
};
class CXFA_Oids : public CXFA_Data
{
public:
CXFA_Oids(CXFA_Node* pNode) : CXFA_Data(pNode) {}
XFA_ATTRIBUTEENUM GetOidsType();
- FX_INT32 CountOids();
- CFX_WideString GetOidContent(FX_INT32 nIndex);
+ int32_t CountOids();
+ CFX_WideString GetOidContent(int32_t nIndex);
};
class CXFA_SubjectDNs : public CXFA_Data
{
public:
CXFA_SubjectDNs(CXFA_Node* pNode) : CXFA_Data(pNode) {}
XFA_ATTRIBUTEENUM GetSubjectDNsType();
- FX_INT32 CountSubjectDNs();
- CFX_WideString GetSubjectDNString(FX_INT32 nIndex, XFA_ATTRIBUTE eAttribute);
- CFX_WideString GetSubjectDNContent(FX_INT32 nIndex);
+ int32_t CountSubjectDNs();
+ CFX_WideString GetSubjectDNString(int32_t nIndex, XFA_ATTRIBUTE eAttribute);
+ CFX_WideString GetSubjectDNContent(int32_t nIndex);
};
class CXFA_DigestMethods : public CXFA_Data
{
public:
CXFA_DigestMethods(CXFA_Node* pNode) : CXFA_Data(pNode) {}
XFA_ATTRIBUTEENUM GetDigestMethodsType();
- FX_INT32 CountDigestMethods();
- CFX_WideString GetDigestMethodContent(FX_INT32 nIndex);
+ int32_t CountDigestMethods();
+ CFX_WideString GetDigestMethodContent(int32_t nIndex);
};
class CXFA_Encodings : public CXFA_Data
{
public:
CXFA_Encodings(CXFA_Node* pNode) : CXFA_Data(pNode) {}
XFA_ATTRIBUTEENUM GetEncodingsType();
- FX_INT32 CountEncodings();
- CFX_WideString GetEncodingContent(FX_INT32 nIndex);
+ int32_t CountEncodings();
+ CFX_WideString GetEncodingContent(int32_t nIndex);
};
class CXFA_EncryptionMethods : public CXFA_Data
{
public:
CXFA_EncryptionMethods(CXFA_Node* pNode) : CXFA_Data(pNode) {}
XFA_ATTRIBUTEENUM GetEncryptionMethodsType();
- FX_INT32 CountEncryptionMethods();
- CFX_WideString GetEncryptionMethodContent(FX_INT32 nIndex);
+ int32_t CountEncryptionMethods();
+ CFX_WideString GetEncryptionMethodContent(int32_t nIndex);
};
class CXFA_Reasons : public CXFA_Data
{
public:
CXFA_Reasons(CXFA_Node* pNode) : CXFA_Data(pNode) {}
XFA_ATTRIBUTEENUM GetReasonsType();
- FX_INT32 CountReasons();
- CFX_WideString GetReasonContent(FX_INT32 nIndex);
+ int32_t CountReasons();
+ CFX_WideString GetReasonContent(int32_t nIndex);
};
class CXFA_Manifest : public CXFA_Data
{
public:
CXFA_Manifest(CXFA_Node* pNode) : CXFA_Data(pNode) {}
XFA_ATTRIBUTEENUM GetAction();
- FX_INT32 CountReives();
- CFX_WideString GetRefContent(FX_INT32 nIndex);
+ int32_t CountReives();
+ CFX_WideString GetRefContent(int32_t nIndex);
};
#endif
diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h index 4488502bf7..0ec3eaaaf4 100644 --- a/xfa/include/fxfa/fxfa_widget.h +++ b/xfa/include/fxfa/fxfa_widget.h @@ -25,7 +25,7 @@ public: CXFA_WidgetAcc(CXFA_FFDocView* pDocView, CXFA_Node* pNode);
~CXFA_WidgetAcc();
- FX_BOOL GetName(CFX_WideString &wsName, FX_INT32 iNameType = 0);
+ FX_BOOL GetName(CFX_WideString &wsName, int32_t iNameType = 0);
FX_BOOL ProcessValueChanged();
public:
@@ -41,21 +41,21 @@ public: CXFA_FFApp* GetApp();
IXFA_AppProvider* GetAppProvider();
- FX_INT32 ProcessEvent(FX_INT32 iActivity, CXFA_EventParam* pEventParam);
- FX_INT32 ProcessEvent(CXFA_Event& event, CXFA_EventParam* pEventParam);
- FX_INT32 ProcessCalculate();
- FX_INT32 ProcessValidate(FX_INT32 iFlags = 0);
- FX_INT32 ExecuteScript(CXFA_Script script, CXFA_EventParam* pEventParam, FXJSE_HVALUE* pRetValue = NULL);
+ int32_t ProcessEvent(int32_t iActivity, CXFA_EventParam* pEventParam);
+ int32_t ProcessEvent(CXFA_Event& event, CXFA_EventParam* pEventParam);
+ int32_t ProcessCalculate();
+ int32_t ProcessValidate(int32_t iFlags = 0);
+ int32_t ExecuteScript(CXFA_Script script, CXFA_EventParam* pEventParam, FXJSE_HVALUE* pRetValue = NULL);
CXFA_FFWidget* GetNextWidget(CXFA_FFWidget* pWidget);
void StartWidgetLayout(FX_FLOAT &fCalcWidth, FX_FLOAT& fCalcHeight);
- FX_BOOL FindSplitPos(FX_INT32 iBlockIndex, FX_FLOAT &fCalcHeight);
+ FX_BOOL FindSplitPos(int32_t iBlockIndex, FX_FLOAT &fCalcHeight);
FX_BOOL LoadCaption();
FX_BOOL LoadText();
FX_BOOL LoadImageImage();
FX_BOOL LoadImageEditImage();
- void GetImageDpi(FX_INT32 &iImageXDpi, FX_INT32 &iImageYDpi);
- void GetImageEditDpi(FX_INT32 &iImageXDpi, FX_INT32 &iImageYDpi);
+ void GetImageDpi(int32_t &iImageXDpi, int32_t &iImageYDpi);
+ void GetImageEditDpi(int32_t &iImageXDpi, int32_t &iImageYDpi);
CXFA_TextLayout* GetCaptionTextLayout();
CXFA_TextLayout* GetTextLayout();
CFX_DIBitmap* GetImageImage();
@@ -73,9 +73,9 @@ public: FX_FLOAT GetLineHeight();
CXFA_WidgetLayoutData* GetWidgetLayoutData();
protected:
- void ProcessScriptTestValidate(CXFA_Validate validate, FX_INT32 iRet, FXJSE_HVALUE pRetValue, FX_BOOL bVersionFlag);
- FX_INT32 ProcessFormatTestValidate(CXFA_Validate validate, FX_BOOL bVersionFlag);
- FX_INT32 ProcessNullTestValidate(CXFA_Validate validate, FX_INT32 iFlags, FX_BOOL bVersionFlag);
+ void ProcessScriptTestValidate(CXFA_Validate validate, int32_t iRet, FXJSE_HVALUE pRetValue, FX_BOOL bVersionFlag);
+ int32_t ProcessFormatTestValidate(CXFA_Validate validate, FX_BOOL bVersionFlag);
+ int32_t ProcessNullTestValidate(CXFA_Validate validate, int32_t iFlags, FX_BOOL bVersionFlag);
void GetValidateCaptionName(CFX_WideString& wsCaptionName, FX_BOOL bVersionFlag);
void GetValidateMessage(IXFA_AppProvider* pAppProvider, CFX_WideString& wsMessage, FX_BOOL bError, FX_BOOL bVersionFlag);
void CalcCaptionSize(CFX_SizeF &szCap);
diff --git a/xfa/include/fxgraphics/fx_graphics.h b/xfa/include/fxgraphics/fx_graphics.h index cb86116fa9..99fe7e194f 100644 --- a/xfa/include/fxgraphics/fx_graphics.h +++ b/xfa/include/fxgraphics/fx_graphics.h @@ -23,7 +23,7 @@ typedef int FX_ERR; #define _FX_ERR_CHECK_GOTO_POSITION_IF_FAIL(arg, pos) {if ((arg) != FX_ERR_Succeeded) goto pos;}
#define FX_SHADING_Steps 256
-typedef FX_INT32 FX_DashStyle;
+typedef int32_t FX_DashStyle;
enum {
FX_DASHSTYLE_Solid = 0,
FX_DASHSTYLE_Dash = 1,
@@ -31,7 +31,7 @@ enum { FX_DASHSTYLE_DashDot = 3,
FX_DASHSTYLE_DashDotDot = 4
};
-typedef FX_INT32 FX_StrokeAlignment;
+typedef int32_t FX_StrokeAlignment;
enum {
FX_STROKEALIGNMENT_Center = 0,
FX_STROKEALIGNMENT_Inset = 1,
@@ -39,7 +39,7 @@ enum { FX_STROKEALIGNMENT_Left = 3,
FX_STROKEALIGNMENT_Right = 4
};
-typedef FX_INT32 FX_HatchStyle;
+typedef int32_t FX_HatchStyle;
enum {
FX_HATCHSTYLE_Horizontal = 0,
FX_HATCHSTYLE_Vertical = 1,
@@ -95,8 +95,8 @@ enum { FX_HATCHSTYLE_OutlinedDiamond = 51,
FX_HATCHSTYLE_SolidDiamond = 52
};
-typedef FX_INT32 FX_DeviceCap;
-typedef FX_INT32 FX_FillMode;
+typedef int32_t FX_DeviceCap;
+typedef int32_t FX_FillMode;
class CFX_RenderDevice;
class CFX_GraphStateData;
class CFX_Matrix;
@@ -121,8 +121,8 @@ public: FX_ERR Create(CFX_RenderDevice * renderDevice, FX_BOOL isAntialiasing = TRUE);
- FX_ERR Create(FX_INT32 width,
- FX_INT32 height,
+ FX_ERR Create(int32_t width,
+ int32_t height,
FXDIB_Format format,
FX_BOOL isNative = TRUE,
FX_BOOL isAntialiasing = TRUE);
@@ -132,7 +132,7 @@ public: - FX_ERR GetDeviceCap(const FX_INT32 capID, FX_DeviceCap & capVal);
+ FX_ERR GetDeviceCap(const int32_t capID, FX_DeviceCap & capVal);
FX_ERR IsPrinterDevice(FX_BOOL & isPrinter);
FX_ERR EnableAntialiasing(FX_BOOL isAntialiasing);
@@ -148,11 +148,11 @@ public: FX_ERR SetLineCap(CFX_GraphStateData::LineCap lineCap);
- FX_ERR GetDashCount(FX_INT32 & dashCount);
+ FX_ERR GetDashCount(int32_t & dashCount);
FX_ERR GetLineDash(FX_FLOAT & dashPhase, FX_FLOAT * dashArray);
- FX_ERR SetLineDash(FX_FLOAT dashPhase, FX_FLOAT * dashArray, FX_INT32 dashCount);
+ FX_ERR SetLineDash(FX_FLOAT dashPhase, FX_FLOAT * dashArray, int32_t dashCount);
FX_ERR SetLineDash(FX_DashStyle dashStyle);
@@ -224,7 +224,7 @@ public: FX_ERR SetCharSpacing(const FX_FLOAT spacing);
- FX_ERR SetTextDrawingMode(const FX_INT32 mode);
+ FX_ERR SetTextDrawingMode(const int32_t mode);
FX_ERR ShowText(const CFX_PointF & point,
@@ -295,7 +295,7 @@ private: protected:
- FX_INT32 _type;
+ int32_t _type;
private:
struct TInfo {
CFX_GraphStateData _graphState;
@@ -417,7 +417,7 @@ public: FX_ERR Set(CFX_Shading * shading);
private:
- FX_INT32 _type;
+ int32_t _type;
union {
struct {
FX_ARGB _argb;
@@ -448,7 +448,7 @@ public: virtual ~CFX_Pattern();
private:
- FX_INT32 _type;
+ int32_t _type;
CFX_Matrix _matrix;
union {
struct {
@@ -498,7 +498,7 @@ public: private:
FX_ERR InitArgbArray();
private:
- FX_INT32 _type;
+ int32_t _type;
CFX_PointF _beginPoint;
CFX_PointF _endPoint;
FX_FLOAT _beginRadius;
diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h index aeec9af0a0..c0ec9c91d6 100644 --- a/xfa/include/fxjse/fxjse.h +++ b/xfa/include/fxjse/fxjse.h @@ -41,18 +41,18 @@ class CFXJSE_Arguments {
public:
FXJSE_HRUNTIME GetRuntime() const;
- FX_INT32 GetLength() const;
- FXJSE_HVALUE GetValue(FX_INT32 index) const;
- FX_BOOL GetBoolean(FX_INT32 index) const;
- FX_INT32 GetInt32(FX_INT32 index) const;
- FX_FLOAT GetFloat(FX_INT32 index) const;
- CFX_ByteString GetUTF8String(FX_INT32 index) const;
- FX_LPVOID GetObject(FX_INT32 index, FXJSE_HCLASS hClass = NULL) const;
+ int32_t GetLength() const;
+ FXJSE_HVALUE GetValue(int32_t index) const;
+ FX_BOOL GetBoolean(int32_t index) const;
+ int32_t GetInt32(int32_t index) const;
+ FX_FLOAT GetFloat(int32_t index) const;
+ CFX_ByteString GetUTF8String(int32_t index) const;
+ FX_LPVOID GetObject(int32_t index, FXJSE_HCLASS hClass = NULL) const;
FXJSE_HVALUE GetReturnValue();
};
typedef void (*FXJSE_FuncCallback) (FXJSE_HOBJECT hThis, FX_BSTR szFuncName, CFXJSE_Arguments &args);
typedef void (*FXJSE_PropAccessor) (FXJSE_HOBJECT hObject, FX_BSTR szPropName, FXJSE_HVALUE hValue);
-typedef FX_INT32(*FXJSE_PropTypeGetter) (FXJSE_HOBJECT hObject, FX_BSTR szPropName, FX_BOOL bQueryIn);
+typedef int32_t(*FXJSE_PropTypeGetter) (FXJSE_HOBJECT hObject, FX_BSTR szPropName, FX_BOOL bQueryIn);
typedef FX_BOOL (*FXJSE_PropDeleter) (FXJSE_HOBJECT hObject, FX_BSTR szPropName);
typedef struct _FXJSE_FUNCTION {
FX_LPCSTR name;
@@ -75,8 +75,8 @@ typedef struct _FXJSE_CLASS { FXJSE_FuncCallback constructor;
FXJSE_PROPERTY* properties;
FXJSE_FUNCTION* methods;
- FX_INT32 propNum;
- FX_INT32 methNum;
+ int32_t propNum;
+ int32_t methNum;
FXJSE_PropTypeGetter dynPropTypeGetter;
FXJSE_PropAccessor dynPropGetter;
FXJSE_PropAccessor dynPropSetter;
@@ -101,31 +101,31 @@ FX_BOOL FXJSE_Value_IsDate (FXJSE_HVALUE hValue); FX_BOOL FXJSE_Value_ToBoolean (FXJSE_HVALUE hValue);
FX_FLOAT FXJSE_Value_ToFloat (FXJSE_HVALUE hValue);
FXJSE_DOUBLE FXJSE_Value_ToDouble (FXJSE_HVALUE hValue);
-FX_INT32 FXJSE_Value_ToInteger (FXJSE_HVALUE hValue);
+int32_t FXJSE_Value_ToInteger (FXJSE_HVALUE hValue);
void FXJSE_Value_ToUTF8String (FXJSE_HVALUE hValue, CFX_ByteString& szStrOutput);
FX_LPVOID FXJSE_Value_ToObject (FXJSE_HVALUE hValue, FXJSE_HCLASS hClass);
void FXJSE_Value_SetUndefined (FXJSE_HVALUE hValue);
void FXJSE_Value_SetNull (FXJSE_HVALUE hValue);
void FXJSE_Value_SetBoolean (FXJSE_HVALUE hValue, FX_BOOL bBoolean);
void FXJSE_Value_SetUTF8String (FXJSE_HVALUE hValue, FX_BSTR szString);
-void FXJSE_Value_SetInteger (FXJSE_HVALUE hValue, FX_INT32 nInteger);
+void FXJSE_Value_SetInteger (FXJSE_HVALUE hValue, int32_t nInteger);
void FXJSE_Value_SetFloat (FXJSE_HVALUE hValue, FX_FLOAT fFloat);
void FXJSE_Value_SetDouble (FXJSE_HVALUE hValue, FXJSE_DOUBLE dDouble);
void FXJSE_Value_SetObject (FXJSE_HVALUE hValue, FX_LPVOID lpObject, FXJSE_HCLASS hClass);
-void FXJSE_Value_SetArray (FXJSE_HVALUE hValue, FX_UINT32 uValueCount, FXJSE_HVALUE* rgValues);
+void FXJSE_Value_SetArray (FXJSE_HVALUE hValue, uint32_t uValueCount, FXJSE_HVALUE* rgValues);
void FXJSE_Value_SetDate (FXJSE_HVALUE hValue, FXJSE_DOUBLE dDouble);
void FXJSE_Value_Set (FXJSE_HVALUE hValue, FXJSE_HVALUE hOriginalValue);
FX_BOOL FXJSE_Value_GetObjectProp (FXJSE_HVALUE hValue, FX_BSTR szPropName, FXJSE_HVALUE hPropValue);
FX_BOOL FXJSE_Value_SetObjectProp (FXJSE_HVALUE hValue, FX_BSTR szPropName, FXJSE_HVALUE hPropValue);
-FX_BOOL FXJSE_Value_GetObjectPropByIdx (FXJSE_HVALUE hValue, FX_UINT32 uPropIdx, FXJSE_HVALUE hPropValue);
-FX_BOOL FXJSE_Value_SetObjectPropByIdx (FXJSE_HVALUE hValue, FX_UINT32 uPropIdx, FXJSE_HVALUE hPropValue);
+FX_BOOL FXJSE_Value_GetObjectPropByIdx (FXJSE_HVALUE hValue, uint32_t uPropIdx, FXJSE_HVALUE hPropValue);
+FX_BOOL FXJSE_Value_SetObjectPropByIdx (FXJSE_HVALUE hValue, uint32_t uPropIdx, FXJSE_HVALUE hPropValue);
FX_BOOL FXJSE_Value_DeleteObjectProp (FXJSE_HVALUE hValue, FX_BSTR szPropName);
FX_BOOL FXJSE_Value_ObjectHasOwnProp (FXJSE_HVALUE hValue, FX_BSTR szPropName, FX_BOOL bUseTypeGetter);
FX_BOOL FXJSE_Value_SetObjectOwnProp (FXJSE_HVALUE hValue, FX_BSTR szPropName, FXJSE_HVALUE hPropValue);
-FX_BOOL FXJSE_Value_CallFunction (FXJSE_HVALUE hFunction, FXJSE_HVALUE hThis, FXJSE_HVALUE hRetValue, FX_UINT32 nArgCount, FXJSE_HVALUE* lpArgs);
+FX_BOOL FXJSE_Value_CallFunction (FXJSE_HVALUE hFunction, FXJSE_HVALUE hThis, FXJSE_HVALUE hRetValue, uint32_t nArgCount, FXJSE_HVALUE* lpArgs);
FX_BOOL FXJSE_Value_SetFunctionBind (FXJSE_HVALUE hValue, FXJSE_HVALUE hOldFunction, FXJSE_HVALUE hNewThis);
FX_BOOL FXJSE_ExecuteScript(FXJSE_HCONTEXT hContext, FX_LPCSTR szScript, FXJSE_HVALUE hRetValue, FXJSE_HVALUE hNewThisObject = NULL);
void FXJSE_ThrowMessage(FX_BSTR utf8Name, FX_BSTR utf8Message);
FX_BOOL FXJSE_ReturnValue_GetMessage(FXJSE_HVALUE hRetValue, CFX_ByteString& utf8Name, CFX_ByteString& utf8Message);
-FX_BOOL FXJSE_ReturnValue_GetLineInfo(FXJSE_HVALUE hRetValue, FX_INT32& nLine, FX_INT32& nCol);
+FX_BOOL FXJSE_ReturnValue_GetLineInfo(FXJSE_HVALUE hRetValue, int32_t& nLine, int32_t& nCol);
#endif
|