summaryrefslogtreecommitdiff
path: root/fpdfsdk/include/pdfwindow
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/include/pdfwindow')
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Caret.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_ComboBox.h14
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Edit.h14
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_EditCtrl.h34
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_FontMap.h46
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Icon.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_IconList.h50
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Label.h6
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_ListBox.h22
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_ListCtrl.h6
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Note.h36
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_ScrollBar.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Utils.h36
-rw-r--r--fpdfsdk/include/pdfwindow/PWL_Wnd.h56
14 files changed, 163 insertions, 163 deletions
diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h
index b827f18d3f..8efbf79341 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Caret.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h
@@ -46,7 +46,7 @@ private:
CPDF_Point m_ptHead;
CPDF_Point m_ptFoot;
FX_FLOAT m_fWidth;
- FX_INT32 m_nDelay;
+ int32_t m_nDelay;
CPDF_Rect m_rcInvalid;
};
diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
index 826f4dcc3e..7abdeeffce 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h
@@ -61,7 +61,7 @@ public:
virtual FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag);
virtual FX_BOOL OnChar(FX_WORD nChar, FX_DWORD nFlag);
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
virtual void CreateChildWnd(const PWL_CREATEPARAM & cp);
virtual void RePosChildWnd();
@@ -80,11 +80,11 @@ public:
void SetText(FX_LPCWSTR text);
void AddString(FX_LPCWSTR string);
- FX_INT32 GetSelect() const;
- void SetSelect(FX_INT32 nItemIndex);
+ int32_t GetSelect() const;
+ void SetSelect(int32_t nItemIndex);
- void SetEditSel(FX_INT32 nStartChar,FX_INT32 nEndChar);
- void GetEditSel(FX_INT32 & nStartChar, FX_INT32 & nEndChar ) const;
+ void SetEditSel(int32_t nStartChar,int32_t nEndChar);
+ void GetEditSel(int32_t & nStartChar, int32_t & nEndChar ) const;
void Clear();
void SelectAll();
FX_BOOL IsPopup() const;
@@ -105,8 +105,8 @@ private:
FX_BOOL m_bPopup;
CPDF_Rect m_rcOldWindow;
- FX_INT32 m_nPopupWhere;
- FX_INT32 m_nSelectItem;
+ int32_t m_nPopupWhere;
+ int32_t m_nSelectItem;
IPWL_Filler_Notify* m_pFillerNotify;
public:
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index 9a133d15cc..63625641ce 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -20,8 +20,8 @@ class IPWL_Filler_Notify
public:
virtual ~IPWL_Filler_Notify() { }
virtual void QueryWherePopup(void* pPrivateData, FX_FLOAT fPopupMin,FX_FLOAT fPopupMax,
- FX_INT32 & nRet, FX_FLOAT & fPopupRet) = 0; //nRet: (0:bottom 1:top)
- virtual void OnBeforeKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, FX_INT32 nKeyCode,
+ int32_t & nRet, FX_FLOAT & fPopupRet) = 0; //nRet: (0:bottom 1:top)
+ virtual void OnBeforeKeyStroke(FX_BOOL bEditOrList, void* pPrivateData, int32_t nKeyCode,
CFX_WideString & strChange, const CFX_WideString& strChangeEx,
int nSelStart, int nSelEnd,
FX_BOOL bKeyDown, FX_BOOL & bRC, FX_BOOL & bExit, FX_DWORD nFlag) = 0;
@@ -58,10 +58,10 @@ public:
void SetAlignFormatH(PWL_EDIT_ALIGNFORMAT_H nFormat = PEAH_LEFT, FX_BOOL bPaint = TRUE); //0:left 1:right 2:middle
void SetAlignFormatV(PWL_EDIT_ALIGNFORMAT_V nFormat = PEAV_TOP, FX_BOOL bPaint = TRUE); //0:top 1:bottom 2:center
- void SetCharArray(FX_INT32 nCharArray);
- void SetLimitChar(FX_INT32 nLimitChar);
+ void SetCharArray(int32_t nCharArray);
+ void SetLimitChar(int32_t nLimitChar);
- void SetHorzScale(FX_INT32 nHorzScale, FX_BOOL bPaint = TRUE);
+ void SetHorzScale(int32_t nHorzScale, FX_BOOL bPaint = TRUE);
void SetCharSpace(FX_FLOAT fCharSpace, FX_BOOL bPaint = TRUE);
void SetLineLeading(FX_FLOAT fLineLeading, FX_BOOL bPaint = TRUE);
@@ -87,7 +87,7 @@ public:
FX_BOOL IsTextFull() const;
- static FX_FLOAT GetCharArrayAutoFontSize(CPDF_Font* pFont, const CPDF_Rect& rcPlate, FX_INT32 nCharArray);
+ static FX_FLOAT GetCharArrayAutoFontSize(CPDF_Font* pFont, const CPDF_Rect& rcPlate, int32_t nCharArray);
void SetFillerNotify(IPWL_Filler_Notify* pNotify) {m_pFillerNotify = pNotify;}
@@ -116,7 +116,7 @@ private:
FX_BOOL IsVScrollBarVisible() const;
void SetParamByFlag();
- FX_FLOAT GetCharArrayAutoFontSize(FX_INT32 nCharArray);
+ FX_FLOAT GetCharArrayAutoFontSize(int32_t nCharArray);
CPDF_Point GetWordRightBottomPoint(const CPVT_WordPlace& wpWord);
CPVT_WordRange CombineWordRange(const CPVT_WordRange& wr1, const CPVT_WordRange& wr2);
diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
index 600c348446..2eb779ddc8 100644
--- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h
@@ -37,7 +37,7 @@ class IPWL_Edit_Notify
public:
virtual ~IPWL_Edit_Notify() { }
//when the position of caret is changed in edit
- virtual void OnCaretMove(FX_INT32 x1, FX_INT32 y1, FX_INT32 x2, FX_INT32 y2) {}
+ virtual void OnCaretMove(int32_t x1, int32_t y1, int32_t x2, int32_t y2) {}
virtual void OnContentChange(const CPDF_Rect& rcContent){}
//OprType: 0 InsertWord
//1 InsertReturn
@@ -73,7 +73,7 @@ public:
virtual FX_BOOL OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag);
virtual FX_BOOL OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag);
virtual FX_BOOL OnMouseMove(const CPDF_Point & point, FX_DWORD nFlag);
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
virtual void CreateChildWnd(const PWL_CREATEPARAM & cp);
virtual void RePosChildWnd();
@@ -88,20 +88,20 @@ public:
virtual void CutText();
CPDF_Rect GetContentRect() const;
- void GetCaretPos(FX_INT32& x, FX_INT32& y) const;
+ void GetCaretPos(int32_t& x, int32_t& y) const;
FX_BOOL IsModified() const;
CFX_WideString GetText() const;
- void SetSel(FX_INT32 nStartChar,FX_INT32 nEndChar);
- void GetSel(FX_INT32 & nStartChar, FX_INT32 & nEndChar ) const;
- void GetTextRange(const CPDF_Rect& rect, FX_INT32 & nStartChar, FX_INT32 & nEndChar) const;
- CFX_WideString GetText(FX_INT32 & nStartChar, FX_INT32 & nEndChar) const;
+ void SetSel(int32_t nStartChar,int32_t nEndChar);
+ void GetSel(int32_t & nStartChar, int32_t & nEndChar ) const;
+ void GetTextRange(const CPDF_Rect& rect, int32_t & nStartChar, int32_t & nEndChar) const;
+ CFX_WideString GetText(int32_t & nStartChar, int32_t & nEndChar) const;
void Clear();
void SelectAll();
- FX_INT32 GetCaret() const;
- void SetCaret(FX_INT32 nPos);
- FX_INT32 GetTotalWords() const;
+ int32_t GetCaret() const;
+ void SetCaret(int32_t nPos);
+ int32_t GetTotalWords() const;
void Paint();
@@ -111,11 +111,11 @@ public:
void SetEditNotify(IPWL_Edit_Notify* pNotify) {m_pEditNotify = pNotify;}
- void SetCharSet(FX_BYTE nCharSet){m_nCharSet = nCharSet;}
- FX_INT32 GetCharSet() const;
+ void SetCharSet(uint8_t nCharSet){m_nCharSet = nCharSet;}
+ int32_t GetCharSet() const;
- void SetCodePage(FX_INT32 nCodePage){m_nCodePage = nCodePage;}
- FX_INT32 GetCodePage() const {return m_nCodePage;}
+ void SetCodePage(int32_t nCodePage){m_nCodePage = nCodePage;}
+ int32_t GetCodePage() const {return m_nCodePage;}
CPDF_Font * GetCaretFont() const;
FX_FLOAT GetCaretFontSize() const;
@@ -129,7 +129,7 @@ public:
protected:
virtual void ShowVScrollBar(FX_BOOL bShow);
- virtual void InsertWord(FX_WORD word, FX_INT32 nCharset);
+ virtual void InsertWord(FX_WORD word, int32_t nCharset);
virtual void InsertReturn();
virtual void InsertText(FX_LPCWSTR csText);
@@ -169,8 +169,8 @@ protected:
IPWL_Edit_Notify* m_pEditNotify;
private:
- FX_INT32 m_nCharSet;
- FX_INT32 m_nCodePage;
+ int32_t m_nCharSet;
+ int32_t m_nCodePage;
};
#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
index cdce862b29..4f44660cb2 100644
--- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h
@@ -16,13 +16,13 @@ class IFX_SystemHandler;
struct CPWL_FontMap_Data
{
CPDF_Font* pFont;
- FX_INT32 nCharset;
+ int32_t nCharset;
CFX_ByteString sFontName;
};
struct CPWL_FontMap_Native
{
- FX_INT32 nCharset;
+ int32_t nCharset;
CFX_ByteString sFontName;
};
@@ -65,51 +65,51 @@ public:
CPWL_FontMap(IFX_SystemHandler* pSystemHandler);
virtual ~CPWL_FontMap();
- virtual CPDF_Font* GetPDFFont(FX_INT32 nFontIndex);
- virtual CFX_ByteString GetPDFFontAlias(FX_INT32 nFontIndex);
- virtual FX_INT32 GetWordFontIndex(FX_WORD word, FX_INT32 nCharset, FX_INT32 nFontIndex);
- virtual FX_INT32 CharCodeFromUnicode(FX_INT32 nFontIndex, FX_WORD word);
- virtual FX_INT32 CharSetFromUnicode(FX_WORD word, FX_INT32 nOldCharset);
+ virtual CPDF_Font* GetPDFFont(int32_t nFontIndex);
+ virtual CFX_ByteString GetPDFFontAlias(int32_t nFontIndex);
+ virtual int32_t GetWordFontIndex(FX_WORD word, int32_t nCharset, int32_t nFontIndex);
+ virtual int32_t CharCodeFromUnicode(int32_t nFontIndex, FX_WORD word);
+ virtual int32_t CharSetFromUnicode(FX_WORD word, int32_t nOldCharset);
public:
virtual void Initial(FX_LPCSTR fontname = NULL);
void SetSystemHandler(IFX_SystemHandler* pSystemHandler);
- FX_INT32 GetFontMapCount() const;
- const CPWL_FontMap_Data* GetFontMapData(FX_INT32 nIndex) const;
+ int32_t GetFontMapCount() const;
+ const CPWL_FontMap_Data* GetFontMapData(int32_t nIndex) const;
public:
- static FX_INT32 GetNativeCharset();
- CFX_ByteString GetNativeFontName(FX_INT32 nCharset);
+ static int32_t GetNativeCharset();
+ CFX_ByteString GetNativeFontName(int32_t nCharset);
- static CFX_ByteString GetDefaultFontByCharset(FX_INT32 nCharset);
+ static CFX_ByteString GetDefaultFontByCharset(int32_t nCharset);
- CPDF_Font* AddFontToDocument(CPDF_Document* pDoc, CFX_ByteString& sFontName, FX_BYTE nCharset);
+ CPDF_Font* AddFontToDocument(CPDF_Document* pDoc, CFX_ByteString& sFontName, uint8_t nCharset);
static FX_BOOL IsStandardFont(const CFX_ByteString& sFontName);
CPDF_Font* AddStandardFont(CPDF_Document* pDoc, CFX_ByteString& sFontName);
CPDF_Font* AddSystemFont(CPDF_Document* pDoc, CFX_ByteString& sFontName,
- FX_BYTE nCharset);
+ uint8_t nCharset);
protected:
- virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, FX_INT32 nCharset);
+ virtual CPDF_Font* FindFontSameCharset(CFX_ByteString& sFontAlias, int32_t nCharset);
virtual void AddedFont(CPDF_Font* pFont, const CFX_ByteString& sFontAlias);
- FX_BOOL KnowWord(FX_INT32 nFontIndex, FX_WORD word);
+ FX_BOOL KnowWord(int32_t nFontIndex, FX_WORD word);
virtual CPDF_Document* GetDocument();
void Empty();
- FX_INT32 GetFontIndex(const CFX_ByteString& sFontName, FX_INT32 nCharset, FX_BOOL bFind);
- FX_INT32 GetPWLFontIndex(FX_WORD word, FX_INT32 nCharset);
- FX_INT32 AddFontData(CPDF_Font* pFont, const CFX_ByteString& sFontAlias, FX_INT32 nCharset = DEFAULT_CHARSET);
+ int32_t GetFontIndex(const CFX_ByteString& sFontName, int32_t nCharset, FX_BOOL bFind);
+ int32_t GetPWLFontIndex(FX_WORD word, int32_t nCharset);
+ int32_t AddFontData(CPDF_Font* pFont, const CFX_ByteString& sFontAlias, int32_t nCharset = DEFAULT_CHARSET);
- CFX_ByteString EncodeFontAlias(const CFX_ByteString& sFontName, FX_INT32 nCharset);
+ CFX_ByteString EncodeFontAlias(const CFX_ByteString& sFontName, int32_t nCharset);
CFX_ByteString EncodeFontAlias(const CFX_ByteString& sFontName);
private:
- CFX_ByteString GetFontName(FX_INT32 nFontIndex);
- FX_INT32 FindFont(const CFX_ByteString& sFontName, FX_INT32 nCharset = DEFAULT_CHARSET);
+ CFX_ByteString GetFontName(int32_t nFontIndex);
+ int32_t FindFont(const CFX_ByteString& sFontName, int32_t nCharset = DEFAULT_CHARSET);
- CFX_ByteString GetNativeFont(FX_INT32 nCharset);
+ CFX_ByteString GetNativeFont(int32_t nCharset);
public:
using CharsetFontMap = FPDF_CharsetFontMap;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h
index cb56a9929e..c09f7a9fe8 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Icon.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h
@@ -45,7 +45,7 @@ public:
virtual void GetScale(FX_FLOAT & fHScale,FX_FLOAT & fVScale);
virtual void GetImageOffset(FX_FLOAT & x,FX_FLOAT & y);
- FX_INT32 GetScaleMethod();
+ int32_t GetScaleMethod();
FX_BOOL IsProportionalScale();
void GetIconPosition(FX_FLOAT & fLeft, FX_FLOAT & fBottom);
FX_BOOL GetFittingBounds();
diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h
index d074b76be1..74438c2afd 100644
--- a/fpdfsdk/include/pdfwindow/PWL_IconList.h
+++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h
@@ -21,7 +21,7 @@ class IPWL_IconList_Notify
{
public:
virtual ~IPWL_IconList_Notify() { }
- virtual void OnNoteListSelChanged(FX_INT32 nItemIndex) = 0;
+ virtual void OnNoteListSelChanged(int32_t nItemIndex) = 0;
};
class CPWL_IconList_Item : public CPWL_Wnd
@@ -37,7 +37,7 @@ public:
void SetSelect(FX_BOOL bSelected);
FX_BOOL IsSelected() const;
void SetData(void* pData);
- void SetIcon(FX_INT32 nIconIndex);
+ void SetIcon(int32_t nIconIndex);
void SetText(const CFX_WideString& str);
void SetIconFillColor(const CPWL_Color& color);
CFX_WideString GetText() const;
@@ -50,7 +50,7 @@ protected:
virtual void OnDisabled();
private:
- FX_INT32 m_nIconIndex;
+ int32_t m_nIconIndex;
void* m_pData;
FX_BOOL m_bSelected;
CPWL_Label* m_pText;
@@ -60,20 +60,20 @@ private:
class CPWL_IconList_Content : public CPWL_ListCtrl
{
public:
- CPWL_IconList_Content(FX_INT32 nListCount);
+ CPWL_IconList_Content(int32_t nListCount);
virtual ~CPWL_IconList_Content();
- void SetSelect(FX_INT32 nIndex);
- FX_INT32 GetSelect() const;
+ void SetSelect(int32_t nIndex);
+ int32_t GetSelect() const;
void SetNotify(IPWL_IconList_Notify* pNotify);
void EnableNotify(FX_BOOL bNotify);
- void SetListData(FX_INT32 nItemIndex, void* pData);
- void SetListIcon(FX_INT32 nItemIndex, FX_INT32 nIconIndex);
- void SetListString(FX_INT32 nItemIndex, const CFX_WideString& str);
+ void SetListData(int32_t nItemIndex, void* pData);
+ void SetListIcon(int32_t nItemIndex, int32_t nIconIndex);
+ void SetListString(int32_t nItemIndex, const CFX_WideString& str);
void SetIconFillColor(const CPWL_Color& color);
- CFX_WideString GetListString(FX_INT32 nItemIndex) const;
+ CFX_WideString GetListString(int32_t nItemIndex) const;
IPWL_IconList_Notify* GetNotify() const;
- void ScrollToItem(FX_INT32 nItemIndex);
+ void ScrollToItem(int32_t nItemIndex);
protected:
virtual void CreateChildWnd(const PWL_CREATEPARAM & cp);
@@ -83,46 +83,46 @@ protected:
virtual FX_BOOL OnKeyDown(FX_WORD nChar, FX_DWORD nFlag);
private:
- CPWL_IconList_Item* GetListItem(FX_INT32 nItemIndex) const;
- void SelectItem(FX_INT32 nItemIndex, FX_BOOL bSelect);
- FX_INT32 FindItemIndex(const CPDF_Point& point);
+ CPWL_IconList_Item* GetListItem(int32_t nItemIndex) const;
+ void SelectItem(int32_t nItemIndex, FX_BOOL bSelect);
+ int32_t FindItemIndex(const CPDF_Point& point);
FX_BOOL m_nSelectIndex;
IPWL_IconList_Notify* m_pNotify;
FX_BOOL m_bEnableNotify;
FX_BOOL m_bMouseDown;
- FX_INT32 m_nListCount;
+ int32_t m_nListCount;
};
class PWL_CLASS CPWL_IconList : public CPWL_Wnd
{
public:
- CPWL_IconList(FX_INT32 nListCount);
+ CPWL_IconList(int32_t nListCount);
virtual ~CPWL_IconList();
virtual FX_BOOL OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag);
- void SetSelect(FX_INT32 nIndex);
- void SetTopItem(FX_INT32 nIndex);
- FX_INT32 GetSelect() const;
+ void SetSelect(int32_t nIndex);
+ void SetTopItem(int32_t nIndex);
+ int32_t GetSelect() const;
void SetNotify(IPWL_IconList_Notify* pNotify);
void EnableNotify(FX_BOOL bNotify);
- void SetListData(FX_INT32 nItemIndex, void* pData);
- void SetListIcon(FX_INT32 nItemIndex, FX_INT32 nIconIndex);
- void SetListString(FX_INT32 nItemIndex, const CFX_WideString& str);
+ void SetListData(int32_t nItemIndex, void* pData);
+ void SetListIcon(int32_t nItemIndex, int32_t nIconIndex);
+ void SetListString(int32_t nItemIndex, const CFX_WideString& str);
void SetIconFillColor(const CPWL_Color& color);
- CFX_WideString GetListString(FX_INT32 nItemIndex) const;
+ CFX_WideString GetListString(int32_t nItemIndex) const;
protected:
virtual void OnCreated();
virtual void RePosChildWnd();
virtual void CreateChildWnd(const PWL_CREATEPARAM & cp);
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
private:
CPWL_IconList_Content* m_pListContent;
- FX_INT32 m_nListCount;
+ int32_t m_nListCount;
};
#endif // FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h
index f724a0a82b..be083db486 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Label.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Label.h
@@ -23,11 +23,11 @@ public:
void SetText(FX_LPCWSTR csText);
CFX_WideString GetText() const;
- void SetLimitChar(FX_INT32 nLimitChar);
- void SetHorzScale(FX_INT32 nHorzScale);
+ void SetLimitChar(int32_t nLimitChar);
+ void SetHorzScale(int32_t nHorzScale);
void SetCharSpace(FX_FLOAT fCharSpace);
CPDF_Rect GetContentRect() const;
- FX_INT32 GetTotalWords();
+ int32_t GetTotalWords();
CFX_ByteString GetTextAppearanceStream(const CPDF_Point & ptOffset) const;
protected:
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index e8e9036b8e..c5a6df76dd 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -57,7 +57,7 @@ public:
virtual FX_BOOL OnMouseWheel(short zDelta, const CPDF_Point & point, FX_DWORD nFlag);
virtual void KillFocus();
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
virtual void RePosChildWnd();
virtual void SetText(FX_LPCWSTR csText,FX_BOOL bRefresh = TRUE);
virtual CFX_WideString GetText() const;
@@ -68,21 +68,21 @@ public:
void OnNotifySelChanged(FX_BOOL bKeyDown, FX_BOOL & bExit , FX_DWORD nFlag);
void AddString(FX_LPCWSTR string);
- void SetTopVisibleIndex(FX_INT32 nItemIndex);
- void ScrollToListItem(FX_INT32 nItemIndex);
+ void SetTopVisibleIndex(int32_t nItemIndex);
+ void ScrollToListItem(int32_t nItemIndex);
void ResetContent();
void Reset();
- void Select(FX_INT32 nItemIndex);
- void SetCaret(FX_INT32 nItemIndex);
+ void Select(int32_t nItemIndex);
+ void SetCaret(int32_t nItemIndex);
void SetHoverSel(FX_BOOL bHoverSel);
- FX_INT32 GetCount() const;
+ int32_t GetCount() const;
FX_BOOL IsMultipleSel() const;
- FX_INT32 GetCaretIndex() const;
- FX_INT32 GetCurSel() const;
- FX_BOOL IsItemSelected(FX_INT32 nItemIndex) const;
- FX_INT32 GetTopVisibleIndex() const;
- FX_INT32 FindNext(FX_INT32 nIndex,FX_WCHAR nChar) const;
+ int32_t GetCaretIndex() const;
+ int32_t GetCurSel() const;
+ FX_BOOL IsItemSelected(int32_t nItemIndex) const;
+ int32_t GetTopVisibleIndex() const;
+ int32_t FindNext(int32_t nIndex,FX_WCHAR nChar) const;
CPDF_Rect GetContentRect() const;
FX_FLOAT GetFirstHeight() const;
CPDF_Rect GetListRect() const;
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
index 65df7aecfc..56a1fbf919 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h
@@ -22,8 +22,8 @@ public:
void SetTopSpace(FX_FLOAT fSpace);
void SetBottomSpace(FX_FLOAT fSpace);
void ResetFace();
- void ResetContent(FX_INT32 nStart);
- FX_INT32 GetItemIndex(CPWL_Wnd* pItem);
+ void ResetContent(int32_t nStart);
+ int32_t GetItemIndex(CPWL_Wnd* pItem);
FX_FLOAT GetContentsHeight(FX_FLOAT fLimitWidth);
CPDF_Point InToOut(const CPDF_Point& point) const;
CPDF_Point OutToIn(const CPDF_Point& point) const;
@@ -35,7 +35,7 @@ protected:
virtual void DrawChildAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device);
private:
- void ResetAll(FX_BOOL bMove,FX_INT32 nStart);
+ void ResetAll(FX_BOOL bMove,int32_t nStart);
CPDF_Rect m_rcContent;
CPDF_Point m_ptScroll;
diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h
index c5cdc4dd9c..a9e6dda05b 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Note.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Note.h
@@ -43,8 +43,8 @@ public:
virtual void OnSetContents(IPWL_NoteItem* pItem) = 0;
virtual void OnSetDateTime(IPWL_NoteItem* pItem) = 0;
virtual void OnSetSubjectName(IPWL_NoteItem* pItem) = 0;
- virtual void OnPopupMenu(FX_INT32 x, FX_INT32 y) = 0;
- virtual void OnPopupMenu(IPWL_NoteItem* pItem, FX_INT32 x, FX_INT32 y) = 0;
+ virtual void OnPopupMenu(int32_t x, int32_t y) = 0;
+ virtual void OnPopupMenu(IPWL_NoteItem* pItem, int32_t x, int32_t y) = 0;
};
class IPWL_NoteHandler
@@ -66,8 +66,8 @@ public:
virtual void SetContents(const CFX_WideString& sContents) = 0;
virtual IPWL_NoteItem* CreateSubItem() = 0;
- virtual FX_INT32 CountSubItems() const = 0;
- virtual IPWL_NoteItem* GetSubItems(FX_INT32 index) const = 0;
+ virtual int32_t CountSubItems() const = 0;
+ virtual IPWL_NoteItem* GetSubItems(int32_t index) const = 0;
virtual void DeleteSubItem(IPWL_NoteItem* pNoteItem) = 0;
virtual void SetFocus() = 0;
@@ -88,7 +88,7 @@ public:
CPWL_Note_Icon();
virtual ~CPWL_Note_Icon();
- void SetIconType(FX_INT32 nType);
+ void SetIconType(int32_t nType);
public:
@@ -96,7 +96,7 @@ protected:
virtual void DrawThisAppearance(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device);
private:
- FX_INT32 m_nType;
+ int32_t m_nType;
};
class CPWL_Note_CloseBox : public CPWL_Button
@@ -148,7 +148,7 @@ public:
virtual void SetText(FX_LPCWSTR csText);
protected:
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
virtual void RePosChildWnd();
virtual void OnSetFocus();
virtual void OnKillFocus();
@@ -187,7 +187,7 @@ public:
virtual ~CPWL_Note_Contents();
virtual CFX_ByteString GetClassName() const;
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
virtual FX_BOOL OnLButtonDown(const CPDF_Point& point, FX_DWORD nFlag);
void SetEditFocus(FX_BOOL bLast);
@@ -199,8 +199,8 @@ public:
CPWL_NoteItem* CreateSubItem();
void DeleteSubItem(IPWL_NoteItem* pNoteItem);
- FX_INT32 CountSubItems() const;
- IPWL_NoteItem* GetSubItems(FX_INT32 index) const;
+ int32_t CountSubItems() const;
+ IPWL_NoteItem* GetSubItems(int32_t index) const;
virtual IPWL_NoteItem* GetHitNoteItem(const CPDF_Point& point);
void EnableRead(FX_BOOL bEnabled);
@@ -228,8 +228,8 @@ public:
virtual void SetContents(const CFX_WideString& sContents);
virtual IPWL_NoteItem* CreateSubItem();
- virtual FX_INT32 CountSubItems() const;
- virtual IPWL_NoteItem* GetSubItems(FX_INT32 index) const;
+ virtual int32_t CountSubItems() const;
+ virtual IPWL_NoteItem* GetSubItems(int32_t index) const;
virtual void DeleteSubItem(IPWL_NoteItem* pNoteItem);
virtual void SetFocus(){SetNoteFocus(FALSE);}
@@ -250,7 +250,7 @@ public:
virtual IPWL_NoteItem* GetHitNoteItem(const CPDF_Point& point);
virtual IPWL_NoteItem* GetFocusedNoteItem() const;
- virtual void ResetSubjectName(FX_INT32 nItemIndex);
+ virtual void ResetSubjectName(int32_t nItemIndex);
void EnableRead(FX_BOOL bEnabled);
void EnableModify(FX_BOOL bEnabled);
@@ -258,7 +258,7 @@ protected:
virtual void RePosChildWnd();
virtual void CreateChildWnd(const PWL_CREATEPARAM & cp);
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
public:
virtual FX_FLOAT GetItemHeight(FX_FLOAT fLimitWidth);
@@ -304,7 +304,7 @@ public:
virtual void SetAuthorName(const CFX_WideString& sName);
virtual CFX_WideString GetAuthorName() const;
virtual void SetBkColor(const CPWL_Color& color);
- virtual void ResetSubjectName(FX_INT32 nItemIndex){}
+ virtual void ResetSubjectName(int32_t nItemIndex){}
virtual FX_BOOL IsTopItem() const {return TRUE;}
virtual const CPWL_Note* GetNote() const;
virtual IPWL_NoteNotify* GetNoteNotify() const;
@@ -312,7 +312,7 @@ public:
public:
IPWL_NoteItem* Reply();
void EnableNotify(FX_BOOL bEnabled);
- void SetIconType(FX_INT32 nType);
+ void SetIconType(int32_t nType);
void SetOptionsText(const CFX_WideString& sText);
void EnableRead(FX_BOOL bEnabled);
void EnableModify(FX_BOOL bEnabled);
@@ -321,7 +321,7 @@ public:
void SetReplyString(const CFX_WideString& string);
//0-normal / 1-caption / 2-leftbottom corner / 3-rightbottom corner / 4-close / 5-options
- FX_INT32 NoteHitTest(const CPDF_Point& point) const;
+ int32_t NoteHitTest(const CPDF_Point& point) const;
CPDF_Rect GetCaptionRect() const {return m_rcCaption;}
IPopup_Note* GetPopupNote() const {return m_pPopupNote;}
@@ -334,7 +334,7 @@ protected:
virtual void RePosChildWnd();
virtual void CreateChildWnd(const PWL_CREATEPARAM & cp);
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
FX_BOOL ResetScrollBar();
void RePosNoteChildren();
diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
index 2f0473f1d2..bf92399e88 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h
@@ -112,7 +112,7 @@ public:
virtual FX_BOOL OnLButtonDown(const CPDF_Point & point, FX_DWORD nFlag);
virtual FX_BOOL OnLButtonUp(const CPDF_Point & point, FX_DWORD nFlag);
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
virtual void CreateChildWnd(const PWL_CREATEPARAM & cp);
diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h
index 51514f2513..9f121e80a8 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h
@@ -18,7 +18,7 @@ struct CPWL_Color;
template<class T> T PWL_MIN (const T & i, const T & j) { return ((i < j) ? i : j); }
template<class T> T PWL_MAX (const T & i, const T & j) { return ((i > j) ? i : j); }
-#define PWL_PDF2WIN(color) (FX_BYTE(color*255))
+#define PWL_PDF2WIN(color) (uint8_t(color*255))
#define PWL_WIN2PDF(color) ((FX_FLOAT)((FX_FLOAT)color/255.0f))
#define PWL_MAKEDWORD(low,high) ((FX_DWORD)((FX_WORD)(low) | (FX_DWORD)(((FX_WORD)(high))<<16)))
@@ -119,17 +119,17 @@ public:
static CPDF_Rect MaxRect(const CPDF_Rect & rect1,const CPDF_Rect & rect2);
static CPDF_Rect OffsetRect(const CPDF_Rect & rect,FX_FLOAT x,FX_FLOAT y);
static CPDF_Point OffsetPoint(const CPDF_Point & point,FX_FLOAT x,FX_FLOAT y);
- static FX_COLORREF PWLColorToFXColor(const CPWL_Color& color, FX_INT32 nTransparancy = 255);
+ static FX_COLORREF PWLColorToFXColor(const CPWL_Color& color, int32_t nTransparancy = 255);
static FX_BOOL IsBlackOrWhite(const CPWL_Color& color);
static CPWL_Color GetReverseColor(const CPWL_Color& color);
static CFX_ByteString GetColorAppStream(const CPWL_Color & color,const FX_BOOL & bFillOrStroke = TRUE);
static CFX_ByteString GetBorderAppStream(const CPDF_Rect & rect, FX_FLOAT fWidth,
const CPWL_Color & color, const CPWL_Color & crLeftTop, const CPWL_Color & crRightBottom,
- FX_INT32 nStyle, const CPWL_Dash & dash);
+ int32_t nStyle, const CPWL_Dash & dash);
static CFX_ByteString GetCircleBorderAppStream(const CPDF_Rect & rect, FX_FLOAT fWidth,
const CPWL_Color & color, const CPWL_Color & crLeftTop, const CPWL_Color & crRightBottom,
- FX_INT32 nStyle, const CPWL_Dash & dash);
+ int32_t nStyle, const CPWL_Dash & dash);
static CFX_ByteString GetRectFillAppStream(const CPDF_Rect & rect,const CPWL_Color & color);
static CFX_ByteString GetCircleFillAppStream(const CPDF_Rect & rect,const CPWL_Color & color);
@@ -140,12 +140,12 @@ public:
const CFX_WideString & sLabel,
const CPWL_Color & crText,
FX_FLOAT fFontSize,
- FX_INT32 nLayOut);
+ int32_t nLayOut);
static CFX_ByteString GetCheckBoxAppStream(const CPDF_Rect & rcBBox,
- FX_INT32 nStyle,
+ int32_t nStyle,
const CPWL_Color & crText);
static CFX_ByteString GetRadioButtonAppStream(const CPDF_Rect & rcBBox,
- FX_INT32 nStyle,
+ int32_t nStyle,
const CPWL_Color & crText);
static CFX_ByteString GetEditAppStream(IFX_Edit* pEdit, const CPDF_Point & ptOffset, const CPVT_WordRange * pRange = NULL,
@@ -156,12 +156,12 @@ public:
const CPDF_Point & ptOffset,
const CPVT_WordRange * pRange = NULL);
static CFX_ByteString GetTextAppStream(const CPDF_Rect & rcBBox,IFX_Edit_FontMap * pFontMap,
- const CFX_WideString & sText, FX_INT32 nAlignmentH, FX_INT32 nAlignmentV,
+ const CFX_WideString & sText, int32_t nAlignmentH, int32_t nAlignmentV,
FX_FLOAT fFontSize, FX_BOOL bMultiLine, FX_BOOL bAutoReturn, const CPWL_Color & crText);
static CFX_ByteString GetDropButtonAppStream(const CPDF_Rect & rcBBox);
static void DrawFillRect(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,const CPDF_Rect & rect,
- const CPWL_Color & color, FX_INT32 nTransparancy);
+ const CPWL_Color & color, int32_t nTransparancy);
static void DrawFillRect(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
const CPDF_Rect & rect,const FX_COLORREF & color);
static void DrawStrokeRect(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,const CPDF_Rect & rect,
@@ -171,12 +171,12 @@ public:
static void DrawBorder(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
const CPDF_Rect & rect, FX_FLOAT fWidth,
const CPWL_Color & color, const CPWL_Color & crLeftTop, const CPWL_Color & crRightBottom,
- FX_INT32 nStyle, const CPWL_Dash & dash, FX_INT32 nTransparancy);
+ int32_t nStyle, const CPWL_Dash & dash, int32_t nTransparancy);
static void DrawFillArea(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
- const CPDF_Point* pPts, FX_INT32 nCount, const FX_COLORREF& color);
+ const CPDF_Point* pPts, int32_t nCount, const FX_COLORREF& color);
static void DrawShadow(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
FX_BOOL bVertical, FX_BOOL bHorizontal, CPDF_Rect rect,
- FX_INT32 nTransparancy, FX_INT32 nStartGray, FX_INT32 nEndGray);
+ int32_t nTransparancy, int32_t nStartGray, int32_t nEndGray);
static void DrawEditSpellCheck(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device, IFX_Edit* pEdit,
const CPDF_Rect& rcClip, const CPDF_Point& ptOffset, const CPVT_WordRange* pRange,
IPWL_SpellCheck* pSpellCheck);
@@ -190,18 +190,18 @@ public:
static void ConvertCMYK2GRAY(FX_FLOAT dC,FX_FLOAT dM,FX_FLOAT dY,FX_FLOAT dK,FX_FLOAT &dGray);
static void ConvertGRAY2CMYK(FX_FLOAT dGray,FX_FLOAT &dC,FX_FLOAT &dM,FX_FLOAT &dY,FX_FLOAT &dK);
- static void PWLColorToARGB(const CPWL_Color& color, FX_INT32& alpha, FX_FLOAT& red, FX_FLOAT& green, FX_FLOAT& blue);
+ static void PWLColorToARGB(const CPWL_Color& color, int32_t& alpha, FX_FLOAT& red, FX_FLOAT& green, FX_FLOAT& blue);
public:
- static CFX_ByteString GetIconAppStream(FX_INT32 nType, const CPDF_Rect& rect, const CPWL_Color& crFill,
+ static CFX_ByteString GetIconAppStream(int32_t nType, const CPDF_Rect& rect, const CPWL_Color& crFill,
const CPWL_Color& crStroke = PWL_DEFAULT_BLACKCOLOR);
static void DrawIconAppStream(CFX_RenderDevice* pDevice, CPDF_Matrix* pUser2Device,
- FX_INT32 nType, const CPDF_Rect & rect, const CPWL_Color& crFill,
- const CPWL_Color& crStroke, const FX_INT32 nTransparancy);
+ int32_t nType, const CPDF_Rect & rect, const CPWL_Color& crFill,
+ const CPWL_Color& crStroke, const int32_t nTransparancy);
private:
- static CFX_ByteString GetAppStreamFromArray(const CPWL_PathData* pPathData, FX_INT32 nCount);
- static void GetPathDataFromArray(CFX_PathData& path, const CPWL_PathData* pPathData, FX_INT32 nCount);
+ static CFX_ByteString GetAppStreamFromArray(const CPWL_PathData* pPathData, int32_t nCount);
+ static void GetPathDataFromArray(CFX_PathData& path, const CPWL_PathData* pPathData, int32_t nCount);
static CFX_ByteString GetAppStream_Check(const CPDF_Rect & rcBBox, const CPWL_Color & crText);
static CFX_ByteString GetAppStream_Circle(const CPDF_Rect & rcBBox, const CPWL_Color & crText);
diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
index 4fa1c7639b..970480f14a 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h
@@ -107,25 +107,25 @@ class IPWL_SpellCheck;
struct CPWL_Dash
{
- CPWL_Dash(FX_INT32 dash, FX_INT32 gap, FX_INT32 phase) : nDash(dash), nGap(gap), nPhase(phase)
+ CPWL_Dash(int32_t dash, int32_t gap, int32_t phase) : nDash(dash), nGap(gap), nPhase(phase)
{}
- FX_INT32 nDash;
- FX_INT32 nGap;
- FX_INT32 nPhase;
+ int32_t nDash;
+ int32_t nGap;
+ int32_t nPhase;
};
struct PWL_CLASS CPWL_Color
{
- CPWL_Color(FX_INT32 type = COLORTYPE_TRANSPARENT, FX_FLOAT color1 = 0.0f, FX_FLOAT color2 = 0.0f, FX_FLOAT color3 = 0.0f, FX_FLOAT color4 = 0.0f)
+ CPWL_Color(int32_t type = COLORTYPE_TRANSPARENT, FX_FLOAT color1 = 0.0f, FX_FLOAT color2 = 0.0f, FX_FLOAT color3 = 0.0f, FX_FLOAT color4 = 0.0f)
: nColorType(type), fColor1(color1), fColor2(color2), fColor3(color3), fColor4(color4)
{}
- CPWL_Color(FX_INT32 r, FX_INT32 g, FX_INT32 b) :
+ CPWL_Color(int32_t r, int32_t g, int32_t b) :
nColorType(COLORTYPE_RGB), fColor1(r/255.0f), fColor2(g/255.0f), fColor3(b/255.0f), fColor4(0)
{}
- void ConvertColorType(FX_INT32 nColorType);
+ void ConvertColorType(int32_t nColorType);
/*
COLORTYPE_TRANSPARENT
@@ -133,7 +133,7 @@ struct PWL_CLASS CPWL_Color
COLORTYPE_CMYK
COLORTYPE_GRAY
*/
- FX_INT32 nColorType;
+ int32_t nColorType;
FX_FLOAT fColor1,fColor2,fColor3,fColor4;
};
@@ -194,7 +194,7 @@ public:
5 L"&Delete"
6 L"&Select All\tCtrl+A"
*/
- virtual CFX_WideString LoadPopupMenuString(FX_INT32 nIndex) = 0;
+ virtual CFX_WideString LoadPopupMenuString(int32_t nIndex) = 0;
};
class IPWL_FocusHandler
@@ -242,18 +242,18 @@ public:
CPWL_Color sBackgroundColor; //optional
FX_HWND hAttachedWnd; //required for no-reader framework
IPWL_SpellCheck* pSpellCheck; //required for spellchecking
- FX_INT32 nBorderStyle; //optional
- FX_INT32 dwBorderWidth; //optional
+ int32_t nBorderStyle; //optional
+ int32_t dwBorderWidth; //optional
CPWL_Color sBorderColor; //optional
CPWL_Color sTextColor; //optional
CPWL_Color sTextStrokeColor; //optional
- FX_INT32 nTransparency; //optional
+ int32_t nTransparency; //optional
FX_FLOAT fFontSize; //optional
CPWL_Dash sDash; //optional
void* pAttachedData; //optional
CPWL_Wnd* pParentWnd; //ignore
CPWL_MsgControl* pMsgControl; //ignore
- FX_INT32 eCursorType; //ignore
+ int32_t eCursorType; //ignore
CPDF_Matrix mtChild; //ignore
};
@@ -263,12 +263,12 @@ public:
CPWL_Timer(CPWL_TimerHandler* pAttached, IFX_SystemHandler* pSystemHandler);
virtual ~CPWL_Timer();
- FX_INT32 SetPWLTimer(FX_INT32 nElapse);
+ int32_t SetPWLTimer(int32_t nElapse);
void KillPWLTimer();
- static void TimerProc(FX_INT32 idEvent);
+ static void TimerProc(int32_t idEvent);
private:
- FX_INT32 m_nTimerID;
+ int32_t m_nTimerID;
CPWL_TimerHandler* m_pAttached;
IFX_SystemHandler* m_pSystemHandler;
};
@@ -279,7 +279,7 @@ public:
CPWL_TimerHandler();
virtual ~CPWL_TimerHandler();
- void BeginTimer(FX_INT32 nElapse);
+ void BeginTimer(int32_t nElapse);
void EndTimer();
virtual void TimerProc();
virtual IFX_SystemHandler* GetSystemHandler() const = 0;
@@ -324,7 +324,7 @@ public:
void SetCapture();
void ReleaseCapture();
- virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, FX_INTPTR wParam = 0, FX_INTPTR lParam = 0);
+ virtual void OnNotify(CPWL_Wnd* pWnd, FX_DWORD msg, intptr_t wParam = 0, intptr_t lParam = 0);
virtual void SetTextColor(const CPWL_Color & color);
virtual void SetTextStrokeColor(const CPWL_Color & color);
virtual void SetVisible(FX_BOOL bVisible);
@@ -335,9 +335,9 @@ public:
virtual CPWL_Color GetTextColor() const;
virtual CPWL_Color GetTextStrokeColor() const;
virtual FX_FLOAT GetFontSize() const;
- virtual FX_INT32 GetInnerBorderWidth() const;
- virtual CPWL_Color GetBorderLeftTopColor(FX_INT32 nBorderStyle) const;
- virtual CPWL_Color GetBorderRightBottomColor(FX_INT32 nBorderStyle) const;
+ virtual int32_t GetInnerBorderWidth() const;
+ virtual CPWL_Color GetBorderLeftTopColor(int32_t nBorderStyle) const;
+ virtual CPWL_Color GetBorderRightBottomColor(int32_t nBorderStyle) const;
virtual FX_BOOL IsModified() const {return FALSE;}
@@ -345,9 +345,9 @@ public:
void SetBackgroundColor(const CPWL_Color & color);
void SetBorderColor(const CPWL_Color & color);
- void SetBorderWidth(FX_INT32 nBorderWidth);
+ void SetBorderWidth(int32_t nBorderWidth);
void SetClipRect(const CPDF_Rect & rect);
- void SetBorderStyle(FX_INT32 eBorderStyle);
+ void SetBorderStyle(int32_t eBorderStyle);
void SetBorderDash(const CPWL_Dash & sDash);
CPDF_Rect GetOriginWindowRect() const;
@@ -356,14 +356,14 @@ public:
CPDF_Point GetCenterPoint() const;
CPDF_Rect GetClientCenterSquare() const;
CPDF_Rect GetWindowCenterSquare() const;
- FX_INT32 GetBorderWidth() const;
+ int32_t GetBorderWidth() const;
FX_BOOL IsVisible() const {return m_bVisible;}
FX_BOOL HasFlag(FX_DWORD dwFlags) const;
void AddFlag(FX_DWORD dwFlags);
void RemoveFlag(FX_DWORD dwFlags);
CPDF_Rect GetClipRect() const;
CPWL_Wnd* GetParentWindow() const;
- FX_INT32 GetBorderStyle() const;
+ int32_t GetBorderStyle() const;
CPWL_Dash GetBorderDash() const;
void* GetAttachedData() const;
@@ -381,8 +381,8 @@ public:
virtual IFX_SystemHandler* GetSystemHandler() const;
IPWL_FocusHandler* GetFocusHandler() const;
- FX_INT32 GetTransparency();
- void SetTransparency(FX_INT32 nTransparency);
+ int32_t GetTransparency();
+ void SetTransparency(int32_t nTransparency);
CPDF_Matrix GetChildToRoot() const;
CPDF_Matrix GetChildMatrix() const;
@@ -431,7 +431,7 @@ protected:
void InvalidateRectMove(const CPDF_Rect & rcOld, const CPDF_Rect & rcNew);
- void PWLtoWnd(const CPDF_Point & point, FX_INT32& x, FX_INT32& y) const;
+ void PWLtoWnd(const CPDF_Point & point, int32_t& x, int32_t& y) const;
FX_RECT PWLtoWnd(const CPDF_Rect & rect) const;
FX_HWND GetAttachedHWnd() const;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 20:16:38 +0000