summaryrefslogtreecommitdiff
path: root/xfa/fwl/core
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl/core')
-rw-r--r--xfa/fwl/core/cfwl_event.h16
-rw-r--r--xfa/fwl/core/cfwl_message.h14
-rw-r--r--xfa/fwl/core/cfwl_note.h10
-rw-r--r--xfa/fwl/core/cfwl_themepart.h4
-rw-r--r--xfa/fwl/core/cfwl_themetext.h2
-rw-r--r--xfa/fwl/core/cfwl_widgetimpproperties.h6
-rw-r--r--xfa/fwl/core/fwl_formimp.h10
-rw-r--r--xfa/fwl/core/fwl_gridimp.h4
-rw-r--r--xfa/fwl/core/fwl_noteimp.h10
-rw-r--r--xfa/fwl/core/fwl_panelimp.h2
-rw-r--r--xfa/fwl/core/fwl_sdadapterimp.h4
-rw-r--r--xfa/fwl/core/fwl_targetimp.h2
-rw-r--r--xfa/fwl/core/fwl_widgetimp.h28
-rw-r--r--xfa/fwl/core/fwl_widgetmgrimp.h6
-rw-r--r--xfa/fwl/core/ifwl_adapterwidgetmgr.h4
-rw-r--r--xfa/fwl/core/ifwl_form.h2
-rw-r--r--xfa/fwl/core/ifwl_notedriver.h2
-rw-r--r--xfa/fwl/core/ifwl_target.h2
-rw-r--r--xfa/fwl/core/ifwl_themeprovider.h8
-rw-r--r--xfa/fwl/core/ifwl_timer.h2
-rw-r--r--xfa/fwl/core/ifwl_widget.h16
-rw-r--r--xfa/fwl/core/ifwl_widgetmgr.h2
-rw-r--r--xfa/fwl/core/ifwl_widgetmgrdelegate.h2
-rw-r--r--xfa/fwl/core/include/ifwl_adaptertimermgr.h2
24 files changed, 80 insertions, 80 deletions
diff --git a/xfa/fwl/core/cfwl_event.h b/xfa/fwl/core/cfwl_event.h
index 97ca1d31a1..5f7a135372 100644
--- a/xfa/fwl/core/cfwl_event.h
+++ b/xfa/fwl/core/cfwl_event.h
@@ -70,7 +70,7 @@ class CFWL_Event : public CFWL_Note {
wsClass = L## #classname; \
return FWL_ERR_Succeeded; \
} \
- virtual FX_DWORD GetClassID() const { return eventhashcode; }
+ virtual uint32_t GetClassID() const { return eventhashcode; }
#define END_FWL_EVENT_DEF \
} \
@@ -79,8 +79,8 @@ class CFWL_Event : public CFWL_Note {
BEGIN_FWL_EVENT_DEF(CFWL_EvtMouse, FWL_EVTHASH_Mouse)
FX_FLOAT m_fx;
FX_FLOAT m_fy;
-FX_DWORD m_dwFlags;
-FX_DWORD m_dwCmd;
+uint32_t m_dwFlags;
+uint32_t m_dwCmd;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtMouseWheel, FWL_EVTHASH_MouseWheel)
@@ -88,13 +88,13 @@ FX_FLOAT m_fx;
FX_FLOAT m_fy;
FX_FLOAT m_fDeltaX;
FX_FLOAT m_fDeltaY;
-FX_DWORD m_dwFlags;
+uint32_t m_dwFlags;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtKey, FWL_EVTHASH_Key)
-FX_DWORD m_dwKeyCode;
-FX_DWORD m_dwFlags;
-FX_DWORD m_dwCmd;
+uint32_t m_dwKeyCode;
+uint32_t m_dwFlags;
+uint32_t m_dwCmd;
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtSetFocus, FWL_EVTHASH_SetFocus)
@@ -114,7 +114,7 @@ BEGIN_FWL_EVENT_DEF(CFWL_EvtClick, FWL_EVTHASH_Click)
END_FWL_EVENT_DEF
BEGIN_FWL_EVENT_DEF(CFWL_EvtScroll, FWL_EVTHASH_Scroll)
-FX_DWORD m_iScrollCode;
+uint32_t m_iScrollCode;
FX_FLOAT m_fPos;
FX_BOOL* m_pRet;
END_FWL_EVENT_DEF
diff --git a/xfa/fwl/core/cfwl_message.h b/xfa/fwl/core/cfwl_message.h
index f3e4a58602..7bd6af1977 100644
--- a/xfa/fwl/core/cfwl_message.h
+++ b/xfa/fwl/core/cfwl_message.h
@@ -78,7 +78,7 @@ class CFWL_Message : public CFWL_Note {
wsClass = L## #classname; \
return FWL_ERR_Succeeded; \
} \
- virtual FX_DWORD GetClassID() const { return msghashcode; }
+ virtual uint32_t GetClassID() const { return msghashcode; }
#define END_FWL_MESSAGE_DEF \
} \
@@ -93,8 +93,8 @@ END_FWL_MESSAGE_DEF
BEGIN_FWL_MESSAGE_DEF(CFWL_MsgMouse, FWL_MSGHASH_Mouse)
FX_FLOAT m_fx;
FX_FLOAT m_fy;
-FX_DWORD m_dwFlags;
-FX_DWORD m_dwCmd;
+uint32_t m_dwFlags;
+uint32_t m_dwCmd;
END_FWL_MESSAGE_DEF
BEGIN_FWL_MESSAGE_DEF(CFWL_MsgMouseWheel, FWL_MSGHASH_MouseWheel)
@@ -102,7 +102,7 @@ FX_FLOAT m_fx;
FX_FLOAT m_fy;
FX_FLOAT m_fDeltaX;
FX_FLOAT m_fDeltaY;
-FX_DWORD m_dwFlags;
+uint32_t m_dwFlags;
END_FWL_MESSAGE_DEF
BEGIN_FWL_MESSAGE_DEF(CFWL_MsgSetFocus, FWL_MSGHASH_SetFocus)
@@ -114,9 +114,9 @@ IFWL_Widget* m_pSetFocus;
END_FWL_MESSAGE_DEF
BEGIN_FWL_MESSAGE_DEF(CFWL_MsgKey, FWL_MSGHASH_Key)
-FX_DWORD m_dwKeyCode;
-FX_DWORD m_dwFlags;
-FX_DWORD m_dwCmd;
+uint32_t m_dwKeyCode;
+uint32_t m_dwFlags;
+uint32_t m_dwCmd;
END_FWL_MESSAGE_DEF
BEGIN_FWL_MESSAGE_DEF(CFWL_MsgCursor, FWL_MSGHASH_Cursor)
diff --git a/xfa/fwl/core/cfwl_note.h b/xfa/fwl/core/cfwl_note.h
index c0f105388c..d173dc6f76 100644
--- a/xfa/fwl/core/cfwl_note.h
+++ b/xfa/fwl/core/cfwl_note.h
@@ -17,9 +17,9 @@ class IFWL_Widget;
// get cast to IFWL_* types.
class CFWL_Note {
public:
- virtual FX_DWORD Release() {
+ virtual uint32_t Release() {
m_dwRefCount--;
- FX_DWORD dwRefCount = m_dwRefCount;
+ uint32_t dwRefCount = m_dwRefCount;
if (!m_dwRefCount)
delete this;
return dwRefCount;
@@ -35,7 +35,7 @@ class CFWL_Note {
return FWL_ERR_Succeeded;
}
- virtual FX_DWORD GetClassID() const { return 0; }
+ virtual uint32_t GetClassID() const { return 0; }
virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const {
return TRUE;
@@ -46,7 +46,7 @@ class CFWL_Note {
IFWL_Widget* m_pSrcTarget;
IFWL_Widget* m_pDstTarget;
- FX_DWORD m_dwExtend;
+ uint32_t m_dwExtend;
protected:
CFWL_Note(FX_BOOL bIsEvent)
@@ -60,7 +60,7 @@ class CFWL_Note {
virtual FX_BOOL Initialize() { return TRUE; }
virtual int32_t Finalize() { return 0; }
- FX_DWORD m_dwRefCount;
+ uint32_t m_dwRefCount;
FX_BOOL m_bIsEvent;
};
diff --git a/xfa/fwl/core/cfwl_themepart.h b/xfa/fwl/core/cfwl_themepart.h
index ddbdc321b2..884f38101f 100644
--- a/xfa/fwl/core/cfwl_themepart.h
+++ b/xfa/fwl/core/cfwl_themepart.h
@@ -23,8 +23,8 @@ class CFWL_ThemePart {
CFX_RectF m_rtPart;
IFWL_Widget* m_pWidget;
int32_t m_iPart;
- FX_DWORD m_dwStates;
- FX_DWORD m_dwData;
+ uint32_t m_dwStates;
+ uint32_t m_dwData;
void* m_pData;
};
diff --git a/xfa/fwl/core/cfwl_themetext.h b/xfa/fwl/core/cfwl_themetext.h
index e4c0e92ed1..7f3dde91d8 100644
--- a/xfa/fwl/core/cfwl_themetext.h
+++ b/xfa/fwl/core/cfwl_themetext.h
@@ -15,7 +15,7 @@ class CFWL_ThemeText : public CFWL_ThemePart {
public:
CFWL_ThemeText() : m_pGraphics(NULL) {}
CFX_WideString m_wsText;
- FX_DWORD m_dwTTOStyles;
+ uint32_t m_dwTTOStyles;
int32_t m_iTTOAlign;
CFX_Graphics* m_pGraphics;
};
diff --git a/xfa/fwl/core/cfwl_widgetimpproperties.h b/xfa/fwl/core/cfwl_widgetimpproperties.h
index 7a3bab603d..8b1cf864d4 100644
--- a/xfa/fwl/core/cfwl_widgetimpproperties.h
+++ b/xfa/fwl/core/cfwl_widgetimpproperties.h
@@ -31,9 +31,9 @@ class CFWL_WidgetImpProperties {
CFX_Matrix m_ctmOnParent;
CFX_RectF m_rtWidget;
- FX_DWORD m_dwStyles;
- FX_DWORD m_dwStyleExes;
- FX_DWORD m_dwStates;
+ uint32_t m_dwStyles;
+ uint32_t m_dwStyleExes;
+ uint32_t m_dwStates;
IFWL_ThemeProvider* m_pThemeProvider;
IFWL_DataProvider* m_pDataProvider;
IFWL_Widget* m_pParent;
diff --git a/xfa/fwl/core/fwl_formimp.h b/xfa/fwl/core/fwl_formimp.h
index e5c0f8022e..fbfdfae271 100644
--- a/xfa/fwl/core/fwl_formimp.h
+++ b/xfa/fwl/core/fwl_formimp.h
@@ -53,7 +53,7 @@ class CFWL_SysBtn {
}
CFX_RectF m_rtBtn;
- FX_DWORD m_dwState;
+ uint32_t m_dwState;
};
enum FORM_RESIZETYPE {
FORM_RESIZETYPE_None = 0,
@@ -76,7 +76,7 @@ class CFWL_FormImp : public CFWL_PanelImp {
CFWL_FormImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter);
virtual ~CFWL_FormImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
@@ -84,13 +84,13 @@ class CFWL_FormImp : public CFWL_PanelImp {
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
virtual FWL_ERR GetClientRect(CFX_RectF& rect);
virtual FWL_ERR Update();
- virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix = NULL);
virtual FWL_FORMSIZE GetFormSize();
virtual FWL_ERR SetFormSize(FWL_FORMSIZE eFormSize);
virtual IFWL_Widget* DoModal();
- virtual IFWL_Widget* DoModal(FX_DWORD& dwCommandID);
+ virtual IFWL_Widget* DoModal(uint32_t& dwCommandID);
virtual FWL_ERR EndDoModal();
virtual FWL_ERR SetBorderRegion(CFX_Path* pPath);
virtual void DrawBackground(CFX_Graphics* pGraphics,
@@ -105,7 +105,7 @@ class CFWL_FormImp : public CFWL_PanelImp {
void RemoveSysButtons();
void CalcContentRect(CFX_RectF& rtContent);
CFWL_SysBtn* GetSysBtnAtPoint(FX_FLOAT fx, FX_FLOAT fy);
- CFWL_SysBtn* GetSysBtnByState(FX_DWORD dwState);
+ CFWL_SysBtn* GetSysBtnByState(uint32_t dwState);
CFWL_SysBtn* GetSysBtnByIndex(int32_t nIndex);
int32_t GetSysBtnIndex(CFWL_SysBtn* pBtn);
FX_FLOAT GetCaptionHeight();
diff --git a/xfa/fwl/core/fwl_gridimp.h b/xfa/fwl/core/fwl_gridimp.h
index 3329cb779d..1ba773d95b 100644
--- a/xfa/fwl/core/fwl_gridimp.h
+++ b/xfa/fwl/core/fwl_gridimp.h
@@ -65,7 +65,7 @@ class CFWL_GridWidgetInfo {
int32_t m_iRow;
int32_t m_iRowSpan;
CFWL_GridLength m_Size[6];
- FX_DWORD m_dwMarginFlag;
+ uint32_t m_dwMarginFlag;
FX_FLOAT m_Margin[4];
FX_FLOAT m_fActualWidth;
FX_FLOAT m_fActualHeight;
@@ -76,7 +76,7 @@ class CFWL_GridImp : public CFWL_ContentImp {
CFWL_GridImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter);
virtual ~CFWL_GridImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
diff --git a/xfa/fwl/core/fwl_noteimp.h b/xfa/fwl/core/fwl_noteimp.h
index 57c70edee0..8f3e0c3737 100644
--- a/xfa/fwl/core/fwl_noteimp.h
+++ b/xfa/fwl/core/fwl_noteimp.h
@@ -42,7 +42,7 @@ class CFWL_NoteLoop : public IFWL_NoteLoop {
FWL_ERR SetMainForm(CFWL_WidgetImp* pForm);
protected:
- void GenerateCommondEvent(FX_DWORD dwCommand);
+ void GenerateCommondEvent(uint32_t dwCommand);
CFWL_WidgetImp* m_pForm;
FX_BOOL m_bContinueModal;
@@ -57,7 +57,7 @@ class CFWL_NoteDriver : public IFWL_NoteDriver {
FX_BOOL SendNote(CFWL_Note* pNote) override;
FWL_ERR RegisterEventTarget(IFWL_Widget* pListener,
IFWL_Widget* pEventSource = NULL,
- FX_DWORD dwFilter = FWL_EVENT_ALL_MASK) override;
+ uint32_t dwFilter = FWL_EVENT_ALL_MASK) override;
FWL_ERR UnregisterEventTarget(IFWL_Widget* pListener) override;
void ClearEventTargets(FX_BOOL bRemoveAll) override;
int32_t GetQueueMaxSize() const override;
@@ -116,7 +116,7 @@ class CFWL_NoteDriver : public IFWL_NoteDriver {
void* m_hookInfo;
};
-typedef CFX_MapPtrTemplate<void*, FX_DWORD> CFWL_EventSource;
+typedef CFX_MapPtrTemplate<void*, uint32_t> CFWL_EventSource;
class CFWL_EventTarget {
public:
@@ -124,9 +124,9 @@ class CFWL_EventTarget {
: m_pListener(pListener), m_pNoteDriver(pNoteDriver), m_bInvalid(FALSE) {}
~CFWL_EventTarget();
int32_t SetEventSource(IFWL_Widget* pSource,
- FX_DWORD dwFilter = FWL_EVENT_ALL_MASK);
+ uint32_t dwFilter = FWL_EVENT_ALL_MASK);
FX_BOOL ProcessEvent(CFWL_Event* pEvent);
- FX_BOOL IsFilterEvent(CFWL_Event* pEvent, FX_DWORD dwFilter);
+ FX_BOOL IsFilterEvent(CFWL_Event* pEvent, uint32_t dwFilter);
FX_BOOL IsInvalid() { return m_bInvalid; }
void FlagInvalid() { m_bInvalid = TRUE; }
diff --git a/xfa/fwl/core/fwl_panelimp.h b/xfa/fwl/core/fwl_panelimp.h
index 9462a38490..81e74c189b 100644
--- a/xfa/fwl/core/fwl_panelimp.h
+++ b/xfa/fwl/core/fwl_panelimp.h
@@ -19,7 +19,7 @@ class CFWL_PanelImp : public CFWL_WidgetImp {
IFWL_Widget* pOuter);
virtual ~CFWL_PanelImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
virtual FWL_ERR Update();
virtual IFWL_Content* GetContent();
diff --git a/xfa/fwl/core/fwl_sdadapterimp.h b/xfa/fwl/core/fwl_sdadapterimp.h
index 0e8bd7f683..2bc69796fb 100644
--- a/xfa/fwl/core/fwl_sdadapterimp.h
+++ b/xfa/fwl/core/fwl_sdadapterimp.h
@@ -45,7 +45,7 @@ class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr {
virtual FWL_ERR SetWidgetCaption(IFWL_Widget* pWidget,
const CFX_WideStringC& wsCaption);
virtual FWL_ERR SetBorderRegion(IFWL_Widget* pWidget, CFX_Path* pPath);
- virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, FX_DWORD dwAlpha);
+ virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, uint32_t dwAlpha);
virtual FWL_ERR SetFullScreen(IFWL_Widget* pWidget, FX_BOOL bFullScreen);
virtual FX_BOOL CheckMessage();
virtual FX_BOOL IsIdleMessage();
@@ -55,7 +55,7 @@ class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr {
void* pDC,
CFX_RectF* pClip = 0);
virtual void* GetWindow(IFWL_Widget* pWidget);
- virtual FX_DWORD GetKeyState(FX_DWORD dwVirtKey);
+ virtual uint32_t GetKeyState(uint32_t dwVirtKey);
virtual FWL_ERR RunLoop(IFWL_Widget* widget);
virtual FWL_ERR EndLoop();
virtual FWL_ERR InitMenu(IFWL_Menu* pMenu, IFWL_MenuDP* pMenuData);
diff --git a/xfa/fwl/core/fwl_targetimp.h b/xfa/fwl/core/fwl_targetimp.h
index 69946fbf14..c1a5e56c2a 100644
--- a/xfa/fwl/core/fwl_targetimp.h
+++ b/xfa/fwl/core/fwl_targetimp.h
@@ -15,7 +15,7 @@ class CFWL_TargetImp {
virtual ~CFWL_TargetImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
diff --git a/xfa/fwl/core/fwl_widgetimp.h b/xfa/fwl/core/fwl_widgetimp.h
index 718268fd31..e460fb9733 100644
--- a/xfa/fwl/core/fwl_widgetimp.h
+++ b/xfa/fwl/core/fwl_widgetimp.h
@@ -36,14 +36,14 @@ class CFWL_WidgetImp : public CFWL_TargetImp {
virtual IFWL_Widget* GetOwner();
virtual FWL_ERR SetOwner(IFWL_Widget* pOwner);
virtual IFWL_Widget* GetOuter();
- virtual FX_DWORD GetStyles();
- virtual FWL_ERR ModifyStyles(FX_DWORD dwStylesAdded,
- FX_DWORD dwStylesRemoved);
- virtual FX_DWORD GetStylesEx();
- virtual FWL_ERR ModifyStylesEx(FX_DWORD dwStylesExAdded,
- FX_DWORD dwStylesExRemoved);
- virtual FX_DWORD GetStates();
- virtual FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE);
+ virtual uint32_t GetStyles();
+ virtual FWL_ERR ModifyStyles(uint32_t dwStylesAdded,
+ uint32_t dwStylesRemoved);
+ virtual uint32_t GetStylesEx();
+ virtual FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded,
+ uint32_t dwStylesExRemoved);
+ virtual uint32_t GetStates();
+ virtual FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE);
virtual FWL_ERR SetPrivateData(void* module_id,
void* pData,
PD_CALLBACK_FREEDATA callback);
@@ -51,7 +51,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp {
virtual FWL_ERR Update();
virtual FWL_ERR LockUpdate();
virtual FWL_ERR UnlockUpdate();
- virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FWL_ERR TransformTo(IFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy);
virtual FWL_ERR TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt);
virtual FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE);
@@ -86,7 +86,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp {
FX_FLOAT GetBorderSize(FX_BOOL bCX = TRUE);
FX_FLOAT GetEdgeWidth();
void GetRelativeRect(CFX_RectF& rect);
- void* GetThemeCapacity(FX_DWORD dwCapacity);
+ void* GetThemeCapacity(uint32_t dwCapacity);
IFWL_ThemeProvider* GetAvailableTheme();
CFWL_WidgetImp* GetRootOuter();
CFX_SizeF CalcTextSize(const CFX_WideString& wsText,
@@ -95,7 +95,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp {
int32_t iLineWidth = -1);
void CalcTextRect(const CFX_WideString& wsText,
IFWL_ThemeProvider* pTheme,
- FX_DWORD dwTTOStyles,
+ uint32_t dwTTOStyles,
int32_t iTTOAlign,
CFX_RectF& rect);
void SetFocus(FX_BOOL bFocus);
@@ -118,7 +118,7 @@ class CFWL_WidgetImp : public CFWL_TargetImp {
CFX_RectF& rtPopup);
FX_BOOL GetScreenSize(FX_FLOAT& fx, FX_FLOAT& fy);
void RegisterEventTarget(IFWL_Widget* pEventSource = NULL,
- FX_DWORD dwFilter = FWL_EVENT_ALL_MASK);
+ uint32_t dwFilter = FWL_EVENT_ALL_MASK);
void UnregisterEventTarget();
void DispatchKeyEvent(CFWL_MsgKey* pNote);
void DispatchEvent(CFWL_Event* pEvent);
@@ -149,8 +149,8 @@ class CFWL_WidgetImp : public CFWL_TargetImp {
int32_t m_iLock;
friend class CFWL_WidgetImpDelegate;
friend void FWL_SetWidgetRect(IFWL_Widget* widget, const CFX_RectF& rect);
- friend void FWL_SetWidgetStates(IFWL_Widget* widget, FX_DWORD dwStates);
- friend void FWL_SetWidgetStyles(IFWL_Widget* widget, FX_DWORD dwStyles);
+ friend void FWL_SetWidgetStates(IFWL_Widget* widget, uint32_t dwStates);
+ friend void FWL_SetWidgetStyles(IFWL_Widget* widget, uint32_t dwStyles);
};
class CFWL_WidgetImpDelegate : public IFWL_WidgetDelegate {
diff --git a/xfa/fwl/core/fwl_widgetmgrimp.h b/xfa/fwl/core/fwl_widgetmgrimp.h
index 76e4425555..fa489971c5 100644
--- a/xfa/fwl/core/fwl_widgetmgrimp.h
+++ b/xfa/fwl/core/fwl_widgetmgrimp.h
@@ -66,7 +66,7 @@ class CFWL_WidgetMgr : public IFWL_WidgetMgr {
FX_BOOL SetWidgetIndex(IFWL_Widget* pWidget, int32_t nIndex) override;
FWL_ERR RepaintWidget(IFWL_Widget* pWidget,
const CFX_RectF* pRect = NULL) override;
- FX_DWORD GetCapability() override { return m_dwCapability; }
+ uint32_t GetCapability() override { return m_dwCapability; }
void AddWidget(IFWL_Widget* pWidget);
void InsertWidget(IFWL_Widget* pParent,
@@ -130,7 +130,7 @@ class CFWL_WidgetMgr : public IFWL_WidgetMgr {
IFWL_AdapterWidgetMgr* m_pAdapter;
CFWL_WidgetMgrDelegate* m_pDelegate;
friend class CFWL_WidgetMgrDelegate;
- FX_DWORD m_dwCapability;
+ uint32_t m_dwCapability;
#if (_FX_OS_ == _FX_WIN32_DESKTOP_) || (_FX_OS_ == _FX_WIN64_)
CFX_RectF m_rtScreen;
#endif
@@ -143,7 +143,7 @@ class CFWL_WidgetMgrDelegate : public IFWL_WidgetMgrDelegate {
// IFWL_WidgetMgrDelegate:
FWL_ERR OnSetCapability(
- FX_DWORD dwCapability = FWL_WGTMGR_DisableThread) override;
+ uint32_t dwCapability = FWL_WGTMGR_DisableThread) override;
int32_t OnProcessMessageToForm(CFWL_Message* pMessage) override;
FWL_ERR OnDrawWidget(IFWL_Widget* pWidget,
CFX_Graphics* pGraphics,
diff --git a/xfa/fwl/core/ifwl_adapterwidgetmgr.h b/xfa/fwl/core/ifwl_adapterwidgetmgr.h
index 80dbfd9bf5..1e8405ab2f 100644
--- a/xfa/fwl/core/ifwl_adapterwidgetmgr.h
+++ b/xfa/fwl/core/ifwl_adapterwidgetmgr.h
@@ -38,7 +38,7 @@ class IFWL_AdapterWidgetMgr {
virtual FWL_ERR SetWidgetCaption(IFWL_Widget* pWidget,
const CFX_WideStringC& wsCaption) = 0;
virtual FWL_ERR SetBorderRegion(IFWL_Widget* pWidget, CFX_Path* pPath) = 0;
- virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, FX_DWORD dwAlpha) = 0;
+ virtual FWL_ERR SetTransparent(IFWL_Widget* pWidget, uint32_t dwAlpha) = 0;
virtual FWL_ERR ShowWidget(IFWL_Widget* pWidget) = 0;
virtual FWL_ERR HideWidget(IFWL_Widget* pWidget) = 0;
virtual FWL_ERR SetNormal(IFWL_Widget* pWidget) = 0;
@@ -58,7 +58,7 @@ class IFWL_AdapterWidgetMgr {
void* pDC,
CFX_RectF* pClip = 0) = 0;
virtual void* GetWindow(IFWL_Widget* pWidget) = 0;
- virtual FX_DWORD GetKeyState(FX_DWORD dwVirtKey) = 0;
+ virtual uint32_t GetKeyState(uint32_t dwVirtKey) = 0;
virtual FWL_ERR RunLoop(IFWL_Widget* widget) = 0;
virtual FWL_ERR EndLoop() = 0;
virtual FWL_ERR InitMenu(IFWL_Menu* pMenu, IFWL_MenuDP* pMenuData) = 0;
diff --git a/xfa/fwl/core/ifwl_form.h b/xfa/fwl/core/ifwl_form.h
index 66391692a9..b5cb72b181 100644
--- a/xfa/fwl/core/ifwl_form.h
+++ b/xfa/fwl/core/ifwl_form.h
@@ -86,7 +86,7 @@ class IFWL_Form : public IFWL_Panel {
FWL_FORMSIZE GetFormSize();
FWL_ERR SetFormSize(FWL_FORMSIZE eFormSize);
IFWL_Widget* DoModal();
- IFWL_Widget* DoModal(FX_DWORD& dwCommandID);
+ IFWL_Widget* DoModal(uint32_t& dwCommandID);
FWL_ERR EndDoModal();
FWL_ERR SetBorderRegion(CFX_Path* pPath);
diff --git a/xfa/fwl/core/ifwl_notedriver.h b/xfa/fwl/core/ifwl_notedriver.h
index cdb751f324..706e97af15 100644
--- a/xfa/fwl/core/ifwl_notedriver.h
+++ b/xfa/fwl/core/ifwl_notedriver.h
@@ -33,7 +33,7 @@ class IFWL_NoteDriver {
virtual FWL_ERR RegisterEventTarget(
IFWL_Widget* pListener,
IFWL_Widget* pEventSource = NULL,
- FX_DWORD dwFilter = FWL_EVENT_ALL_MASK) = 0;
+ uint32_t dwFilter = FWL_EVENT_ALL_MASK) = 0;
virtual FWL_ERR UnregisterEventTarget(IFWL_Widget* pListener) = 0;
virtual void ClearEventTargets(FX_BOOL bRemoveAll) = 0;
virtual int32_t GetQueueMaxSize() const = 0;
diff --git a/xfa/fwl/core/ifwl_target.h b/xfa/fwl/core/ifwl_target.h
index fd6410e16c..f0de3b13ee 100644
--- a/xfa/fwl/core/ifwl_target.h
+++ b/xfa/fwl/core/ifwl_target.h
@@ -35,7 +35,7 @@ class IFWL_Target {
// These call into equivalent polymorphic methods of m_pImpl. There
// should be no need to override these in subclasses.
FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- FX_DWORD GetClassID() const;
+ uint32_t GetClassID() const;
FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
FWL_ERR Initialize();
FWL_ERR Finalize();
diff --git a/xfa/fwl/core/ifwl_themeprovider.h b/xfa/fwl/core/ifwl_themeprovider.h
index 2bdacd5947..f0fb1492a8 100644
--- a/xfa/fwl/core/ifwl_themeprovider.h
+++ b/xfa/fwl/core/ifwl_themeprovider.h
@@ -35,9 +35,9 @@ class IFWL_ThemeProvider {
public:
virtual ~IFWL_ThemeProvider() {}
virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget) = 0;
- virtual FX_DWORD GetThemeID(IFWL_Widget* pWidget) = 0;
- virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget,
- FX_DWORD dwThemeID,
+ virtual uint32_t GetThemeID(IFWL_Widget* pWidget) = 0;
+ virtual uint32_t SetThemeID(IFWL_Widget* pWidget,
+ uint32_t dwThemeID,
FX_BOOL bChildren = TRUE) = 0;
virtual FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix) = 0;
virtual FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget,
@@ -45,7 +45,7 @@ class IFWL_ThemeProvider {
virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams) = 0;
virtual FX_BOOL DrawText(CFWL_ThemeText* pParams) = 0;
virtual void* GetCapacity(CFWL_ThemePart* pThemePart,
- FX_DWORD dwCapacity) = 0;
+ uint32_t dwCapacity) = 0;
virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget) = 0;
virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart,
CFX_RectF& rtPart) = 0;
diff --git a/xfa/fwl/core/ifwl_timer.h b/xfa/fwl/core/ifwl_timer.h
index 42fc84be17..5f113bc021 100644
--- a/xfa/fwl/core/ifwl_timer.h
+++ b/xfa/fwl/core/ifwl_timer.h
@@ -17,7 +17,7 @@ class IFWL_Timer {
virtual int32_t Run(FWL_HTIMER hTimer) = 0;
};
FWL_HTIMER FWL_StartTimer(IFWL_Timer* pTimer,
- FX_DWORD dwElapse,
+ uint32_t dwElapse,
FX_BOOL bImmediately = TRUE);
int32_t FWL_StopTimer(FWL_HTIMER hTimer);
diff --git a/xfa/fwl/core/ifwl_widget.h b/xfa/fwl/core/ifwl_widget.h
index 06e4bebc1c..eb1183fdf1 100644
--- a/xfa/fwl/core/ifwl_widget.h
+++ b/xfa/fwl/core/ifwl_widget.h
@@ -31,12 +31,12 @@ class IFWL_Widget : public IFWL_Target {
IFWL_Widget* GetOwner();
FWL_ERR SetOwner(IFWL_Widget* pOwner);
IFWL_Widget* GetOuter();
- FX_DWORD GetStyles();
- FWL_ERR ModifyStyles(FX_DWORD dwStylesAdded, FX_DWORD dwStylesRemoved);
- FX_DWORD GetStylesEx();
- FWL_ERR ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved);
- FX_DWORD GetStates();
- FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE);
+ uint32_t GetStyles();
+ FWL_ERR ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved);
+ uint32_t GetStylesEx();
+ FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved);
+ uint32_t GetStates();
+ FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE);
FWL_ERR SetPrivateData(void* module_id,
void* pData,
PD_CALLBACK_FREEDATA callback);
@@ -44,7 +44,7 @@ class IFWL_Widget : public IFWL_Target {
FWL_ERR Update();
FWL_ERR LockUpdate();
FWL_ERR UnlockUpdate();
- FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy);
+ uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
FWL_ERR TransformTo(IFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy);
FWL_ERR TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt);
FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE);
@@ -58,7 +58,7 @@ class IFWL_Widget : public IFWL_Target {
CFX_SizeF GetOffsetFromParent(IFWL_Widget* pParent);
};
-typedef CFX_MapPtrTemplate<FX_DWORD, FX_DWORD> CFX_MapAccelerators;
+typedef CFX_MapPtrTemplate<uint32_t, uint32_t> CFX_MapAccelerators;
FWL_ERR FWL_Accelerator_SetApp(CFX_MapAccelerators* pMapAccel);
FWL_ERR FWL_Accelerator_SetThread(CFX_MapAccelerators* pMapAccel);
diff --git a/xfa/fwl/core/ifwl_widgetmgr.h b/xfa/fwl/core/ifwl_widgetmgr.h
index 5ff11f3592..648206eea9 100644
--- a/xfa/fwl/core/ifwl_widgetmgr.h
+++ b/xfa/fwl/core/ifwl_widgetmgr.h
@@ -39,7 +39,7 @@ class IFWL_WidgetMgr {
virtual FX_BOOL SetWidgetIndex(IFWL_Widget* pWidget, int32_t nIndex) = 0;
virtual FWL_ERR RepaintWidget(IFWL_Widget* pWidget,
const CFX_RectF* pRect = NULL) = 0;
- virtual FX_DWORD GetCapability() = 0;
+ virtual uint32_t GetCapability() = 0;
};
IFWL_WidgetMgr* FWL_GetWidgetMgr();
diff --git a/xfa/fwl/core/ifwl_widgetmgrdelegate.h b/xfa/fwl/core/ifwl_widgetmgrdelegate.h
index 620495722a..2435c0bc23 100644
--- a/xfa/fwl/core/ifwl_widgetmgrdelegate.h
+++ b/xfa/fwl/core/ifwl_widgetmgrdelegate.h
@@ -23,7 +23,7 @@ class IFWL_WidgetMgrDelegate {
virtual ~IFWL_WidgetMgrDelegate() {}
virtual FWL_ERR OnSetCapability(
- FX_DWORD dwCapability = FWL_WGTMGR_DisableThread) = 0;
+ uint32_t dwCapability = FWL_WGTMGR_DisableThread) = 0;
virtual int32_t OnProcessMessageToForm(CFWL_Message* pMessage) = 0;
virtual FWL_ERR OnDrawWidget(IFWL_Widget* pWidget,
CFX_Graphics* pGraphics,
diff --git a/xfa/fwl/core/include/ifwl_adaptertimermgr.h b/xfa/fwl/core/include/ifwl_adaptertimermgr.h
index 7c776704e1..64fc260ce5 100644
--- a/xfa/fwl/core/include/ifwl_adaptertimermgr.h
+++ b/xfa/fwl/core/include/ifwl_adaptertimermgr.h
@@ -16,7 +16,7 @@ class IFWL_AdapterTimerMgr {
public:
virtual ~IFWL_AdapterTimerMgr() {}
virtual FWL_ERR Start(IFWL_Timer* pTimer,
- FX_DWORD dwElapse,
+ uint32_t dwElapse,
FWL_HTIMER& hTimer,
FX_BOOL bImmediately = TRUE) = 0;
virtual FWL_ERR Stop(FWL_HTIMER hTimer) = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 10:36:13 +0000