From bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 13:24:12 -0700 Subject: 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 --- xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h | 4 +-- xfa/include/fwl/adapter/fwl_adaptermonitormgr.h | 4 +-- xfa/include/fwl/adapter/fwl_adapterthreadmgr.h | 6 ++-- xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h | 6 ++-- xfa/include/fwl/adapter/fwl_sdadapterimp.h | 10 +++--- xfa/include/fwl/basewidget/fwl_barcode.h | 14 ++++---- xfa/include/fwl/basewidget/fwl_checkbox.h | 8 ++--- xfa/include/fwl/basewidget/fwl_combobox.h | 24 ++++++------- xfa/include/fwl/basewidget/fwl_datetimepicker.h | 22 ++++++------ xfa/include/fwl/basewidget/fwl_edit.h | 30 ++++++++-------- xfa/include/fwl/basewidget/fwl_listbox.h | 20 +++++------ xfa/include/fwl/basewidget/fwl_monthcalendar.h | 24 ++++++------- xfa/include/fwl/basewidget/fwl_picturebox.h | 4 +-- xfa/include/fwl/basewidget/fwl_tooltipctrl.h | 4 +-- xfa/include/fwl/basewidget/fxmath_barcode.h | 30 ++++++++-------- xfa/include/fwl/core/fwl_app.h | 2 +- xfa/include/fwl/core/fwl_content.h | 2 +- xfa/include/fwl/core/fwl_error.h | 2 +- xfa/include/fwl/core/fwl_grid.h | 16 ++++----- xfa/include/fwl/core/fwl_note.h | 18 +++++----- xfa/include/fwl/core/fwl_theme.h | 4 +-- xfa/include/fwl/core/fwl_thread.h | 10 +++--- xfa/include/fwl/core/fwl_timer.h | 4 +-- xfa/include/fwl/core/fwl_widget.h | 2 +- xfa/include/fwl/core/fwl_widgetmgr.h | 10 +++--- xfa/include/fwl/lightwidget/app.h | 2 +- xfa/include/fwl/lightwidget/barcode.h | 40 ++++++++++----------- xfa/include/fwl/lightwidget/checkbox.h | 4 +-- xfa/include/fwl/lightwidget/combobox.h | 42 +++++++++++------------ xfa/include/fwl/lightwidget/datetimepicker.h | 20 +++++------ xfa/include/fwl/lightwidget/edit.h | 28 +++++++-------- xfa/include/fwl/lightwidget/listbox.h | 18 +++++----- xfa/include/fwl/lightwidget/picturebox.h | 16 ++++----- xfa/include/fwl/lightwidget/tooltipctrl.h | 16 ++++----- xfa/include/fwl/lightwidget/widget.h | 4 +-- xfa/include/fwl/theme/formtp.h | 16 ++++----- xfa/include/fwl/theme/pushbuttontp.h | 2 +- xfa/include/fwl/theme/utils.h | 8 ++--- xfa/include/fwl/theme/widgettp.h | 4 +-- 39 files changed, 250 insertions(+), 250 deletions(-) (limited to 'xfa/include/fwl') 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; -- cgit v1.2.3