diff options
Diffstat (limited to 'xfa/include/fxfa')
-rw-r--r-- | xfa/include/fxfa/fxfa.h | 60 | ||||
-rw-r--r-- | xfa/include/fxfa/fxfa_basic.h | 28 | ||||
-rw-r--r-- | xfa/include/fxfa/fxfa_objectacc.h | 4 | ||||
-rw-r--r-- | xfa/include/fxfa/fxfa_widget.h | 2 |
4 files changed, 47 insertions, 47 deletions
diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h index 0015ae443d..c55ddf25f0 100644 --- a/xfa/include/fxfa/fxfa.h +++ b/xfa/include/fxfa/fxfa.h @@ -213,7 +213,7 @@ class IXFA_AppProvider { * @param[in] dwType The system code for the appropriate sound.0 (Error)1 * (Warning)2 (Question)3 (Status)4 (Default) */ - virtual void Beep(FX_DWORD dwType) = 0; + virtual void Beep(uint32_t dwType) = 0; /** * Displays a message box. @@ -224,8 +224,8 @@ class IXFA_AppProvider { */ virtual int32_t MsgBox(const CFX_WideStringC& wsMessage, const CFX_WideStringC& wsTitle = FX_WSTRC(L""), - FX_DWORD dwIconType = 0, - FX_DWORD dwButtonType = 0) = 0; + uint32_t dwIconType = 0, + uint32_t dwButtonType = 0) = 0; /** * Get a response from the user. @@ -295,11 +295,11 @@ class IXFA_FontMgr { virtual IFX_Font* GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) = 0; virtual IFX_Font* GetDefaultFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) = 0; }; class IXFA_App { @@ -368,7 +368,7 @@ class IXFA_DocProvider { virtual void SetChangeMark(IXFA_Doc* hDoc) = 0; virtual void InvalidateRect(IXFA_PageView* pPageView, const CFX_RectF& rt, - FX_DWORD dwFlags = 0) = 0; + uint32_t dwFlags = 0) = 0; virtual void DisplayCaret(IXFA_Widget* hWidget, FX_BOOL bVisible, const CFX_RectF* pRtAnchor) = 0; @@ -380,10 +380,10 @@ class IXFA_DocProvider { virtual FX_BOOL PopupMenu(IXFA_Widget* hWidget, CFX_PointF ptPopup, const CFX_RectF* pRectExclude = NULL) = 0; - virtual void PageViewEvent(IXFA_PageView* pPageView, FX_DWORD dwFlags) = 0; + virtual void PageViewEvent(IXFA_PageView* pPageView, uint32_t dwFlags) = 0; virtual void WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, - FX_DWORD dwEvent, + uint32_t dwEvent, void* pParam = NULL, void* pAdditional = NULL) = 0; virtual FX_BOOL RenderCustomWidget(IXFA_Widget* hWidget, @@ -413,7 +413,7 @@ class IXFA_DocProvider { virtual void Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, - FX_DWORD dwOptions) = 0; + uint32_t 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; @@ -478,12 +478,12 @@ class IXFA_DocHandler { virtual void ReleaseDoc(IXFA_Doc* hDoc) = 0; virtual IXFA_DocProvider* GetDocProvider(IXFA_Doc* hDoc) = 0; - virtual FX_DWORD GetDocType(IXFA_Doc* hDoc) = 0; + virtual uint32_t GetDocType(IXFA_Doc* hDoc) = 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 IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, uint32_t dwView = 0) = 0; virtual int32_t CountPackages(IXFA_Doc* hDoc) = 0; virtual void GetPackageName(IXFA_Doc* hDoc, @@ -650,8 +650,8 @@ class IXFA_PageView { 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 | + uint32_t dwTraverseWay = XFA_TRAVERSEWAY_Form, + uint32_t dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) = 0; }; @@ -717,10 +717,10 @@ class IXFA_WidgetHandler { IXFA_Widget* hBefore = NULL) = 0; virtual IXFA_PageView* GetPageView(IXFA_Widget* hWidget) = 0; virtual void GetRect(IXFA_Widget* hWidget, CFX_RectF& rt) = 0; - virtual FX_DWORD GetStatus(IXFA_Widget* hWidget) = 0; + virtual uint32_t GetStatus(IXFA_Widget* hWidget) = 0; virtual FX_BOOL GetBBox(IXFA_Widget* hWidget, CFX_RectF& rtBox, - FX_DWORD dwStatus, + uint32_t dwStatus, FX_BOOL bDrawFocus = FALSE) = 0; virtual CXFA_WidgetAcc* GetDataAcc(IXFA_Widget* hWidget) = 0; @@ -737,49 +737,49 @@ class IXFA_WidgetHandler { virtual FX_BOOL OnMouseEnter(IXFA_Widget* hWidget) = 0; virtual FX_BOOL OnMouseExit(IXFA_Widget* hWidget) = 0; virtual FX_BOOL OnLButtonDown(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnLButtonUp(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnLButtonDblClk(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnMouseMove(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnMouseWheel(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, int16_t zDelta, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnRButtonDown(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnRButtonUp(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnRButtonDblClk(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnKeyDown(IXFA_Widget* hWidget, - FX_DWORD dwKeyCode, - FX_DWORD dwFlags) = 0; + uint32_t dwKeyCode, + uint32_t dwFlags) = 0; virtual FX_BOOL OnKeyUp(IXFA_Widget* hWidget, - FX_DWORD dwKeyCode, - FX_DWORD dwFlags) = 0; + uint32_t dwKeyCode, + uint32_t dwFlags) = 0; virtual FX_BOOL OnChar(IXFA_Widget* hWidget, - FX_DWORD dwChar, - FX_DWORD dwFlags) = 0; - virtual FX_DWORD OnHitTest(IXFA_Widget* hWidget, + uint32_t dwChar, + uint32_t dwFlags) = 0; + virtual uint32_t OnHitTest(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnSetCursor(IXFA_Widget* hWidget, diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h index 5c0c5db935..ff151d19ab 100644 --- a/xfa/include/fxfa/fxfa_basic.h +++ b/xfa/include/fxfa/fxfa_basic.h @@ -84,11 +84,11 @@ struct XFA_PACKETINFO { const FX_WCHAR* pName; XFA_XDPPACKET eName; const FX_WCHAR* pURI; - FX_DWORD eFlags; + uint32_t eFlags; }; const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName); -const XFA_PACKETINFO* XFA_GetPacketByID(FX_DWORD dwPacket); +const XFA_PACKETINFO* XFA_GetPacketByID(uint32_t dwPacket); const XFA_PACKETINFO* XFA_GetPacketByIndex(XFA_PACKET ePacket); enum XFA_ATTRIBUTEENUM { @@ -923,8 +923,8 @@ struct XFA_ELEMENTINFO { uint32_t uHash; const FX_WCHAR* pName; XFA_ELEMENT eName; - FX_DWORD dwPackets; - FX_DWORD eObjectType; + uint32_t dwPackets; + uint32_t eObjectType; }; int32_t XFA_GetElementCount(); const XFA_ELEMENTINFO* XFA_GetElementByName(const CFX_WideStringC& wsName); @@ -942,7 +942,7 @@ struct XFA_ATTRIBUTEINFO { const FX_WCHAR* pName; XFA_ATTRIBUTE eName; XFA_ATTRIBUTETYPE eType; - FX_DWORD dwPackets; + uint32_t dwPackets; void* pDefValue; }; int32_t XFA_GetAttributeCount(); @@ -952,22 +952,22 @@ FX_BOOL XFA_GetAttributeDefaultValue(void*& pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, - FX_DWORD dwPacket); + uint32_t dwPacket); XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); int32_t XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); struct XFA_ELEMENTHIERARCHY { uint16_t wStart; uint16_t wCount; @@ -986,10 +986,10 @@ const uint16_t* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t& iCount); const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t& iCount); const XFA_ELEMENTINFO* XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, - FX_DWORD dwPacket); + uint32_t dwPacket); const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); #define XFA_PROPERTYFLAG_OneOf 0x01 #define XFA_PROPERTYFLAG_DefaultOneOf 0x02 struct XFA_PROPERTY { @@ -1001,7 +1001,7 @@ const XFA_PROPERTY* XFA_GetElementProperties(XFA_ELEMENT eElement, int32_t& iCount); const XFA_PROPERTY* XFA_GetPropertyOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eProperty, - FX_DWORD dwPacket); + uint32_t dwPacket); struct XFA_ATTRIBUTEENUMINFO { uint32_t uHash; const FX_WCHAR* pName; diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h index f390566c74..782b62f9d1 100644 --- a/xfa/include/fxfa/fxfa_objectacc.h +++ b/xfa/include/fxfa/fxfa_objectacc.h @@ -333,7 +333,7 @@ class CXFA_Stroke : public CXFA_Data { int32_t GetJoinType() const; FX_BOOL IsInverted() const; FX_FLOAT GetRadius() const; - FX_BOOL SameStyles(CXFA_Stroke stroke, FX_DWORD dwFlags = 0) const; + FX_BOOL SameStyles(CXFA_Stroke stroke, uint32_t dwFlags = 0) const; }; class CXFA_Corner : public CXFA_Stroke { @@ -434,7 +434,7 @@ class CXFA_WidgetData : public CXFA_Data { CXFA_Validate GetValidate(FX_BOOL bModified = FALSE); CXFA_Bind GetBind(FX_BOOL bModified = FALSE); CXFA_Assist GetAssist(FX_BOOL bModified = FALSE); - FX_DWORD GetRelevantStatus(); + uint32_t GetRelevantStatus(); FX_BOOL GetWidth(FX_FLOAT& fWidth); FX_BOOL GetHeight(FX_FLOAT& fHeight); FX_BOOL GetMinWidth(FX_FLOAT& fMinWidth); diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h index 7b9241832c..f1fcffefc4 100644 --- a/xfa/include/fxfa/fxfa_widget.h +++ b/xfa/include/fxfa/fxfa_widget.h @@ -65,7 +65,7 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { void SetImageImage(CFX_DIBitmap* newImage); void SetImageEditImage(CFX_DIBitmap* newImage); void UpdateUIDisplay(CXFA_FFWidget* pExcept = NULL); - void NotifyEvent(FX_DWORD dwEvent, + void NotifyEvent(uint32_t dwEvent, CXFA_FFWidget* pWidget = NULL, void* pParam = NULL, void* pAdditional = NULL); |