Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / include / fwl / basewidget / fwl_combobox.h
index 74d6bdf..ddccd6b 100644 (file)
@@ -74,7 +74,7 @@ END_FWL_EVENT_DEF
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbCloseUp, FWL_EVTHASH_CMB_CloseUp)\r
 END_FWL_EVENT_DEF\r
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbEditChanged, FWL_EVTHASH_CMB_EditChanged)\r
-FX_INT32 nChangeType;\r
+int32_t nChangeType;\r
 CFX_WideString wsInsert;\r
 CFX_WideString wsDelete;\r
 END_FWL_EVENT_DEF\r
@@ -83,12 +83,12 @@ CFX_Int32Array iArraySels;
 FX_BOOL        bLButtonUp;\r
 END_FWL_EVENT_DEF\r
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbHoverChanged, FWL_EVTHASH_CMB_HoverChanged)\r
-FX_INT32 m_iCurHover;\r
+int32_t m_iCurHover;\r
 END_FWL_EVENT_DEF\r
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbDrawItem, FWL_EVTHASH_CMB_DrawItem)\r
 CFX_Graphics *m_pGraphics;\r
 CFX_Matrix m_matrix;\r
-FX_INT32 m_index;\r
+int32_t m_index;\r
 CFX_RectF m_rtItem;\r
 END_FWL_EVENT_DEF\r
 class IFWL_ComboBoxDP : public IFWL_ListBoxDP\r
@@ -102,18 +102,18 @@ public:
     static IFWL_ComboBox* Create();\r
     FWL_ERR            Initialize(IFWL_Widget *pOuter = NULL);\r
     FWL_ERR            Initialize(const CFWL_WidgetImpProperties &properties, IFWL_Widget *pOuter = NULL);\r
-    FX_INT32   GetCurSel();\r
-    FWL_ERR            SetCurSel(FX_INT32 iSel);\r
+    int32_t    GetCurSel();\r
+    FWL_ERR            SetCurSel(int32_t iSel);\r
     FWL_ERR            SetEditText(const CFX_WideString &wsText);\r
-    FX_INT32   GetEditTextLength() const;\r
-    FWL_ERR            GetEditText(CFX_WideString &wsText, FX_INT32 nStart = 0, FX_INT32 nCount = -1) const;\r
-    FWL_ERR            SetEditSelRange(FX_INT32 nStart, FX_INT32 nCount = -1);\r
-    FX_INT32   GetEditSelRange(FX_INT32 nIndex, FX_INT32 &nStart);\r
-    FX_INT32   GetEditLimit();\r
-    FWL_ERR            SetEditLimit(FX_INT32 nLimit);\r
-    FWL_ERR            EditDoClipboard(FX_INT32 iCmd);\r
-    FX_BOOL            EditRedo(FX_BSTR bsRecord);\r
-    FX_BOOL            EditUndo(FX_BSTR bsRecord);\r
+    int32_t    GetEditTextLength() const;\r
+    FWL_ERR            GetEditText(CFX_WideString &wsText, int32_t nStart = 0, int32_t nCount = -1) const;\r
+    FWL_ERR            SetEditSelRange(int32_t nStart, int32_t nCount = -1);\r
+    int32_t    GetEditSelRange(int32_t nIndex, int32_t &nStart);\r
+    int32_t    GetEditLimit();\r
+    FWL_ERR            SetEditLimit(int32_t nLimit);\r
+    FWL_ERR            EditDoClipboard(int32_t iCmd);\r
+    FX_BOOL            EditRedo(const CFX_ByteStringC& bsRecord);\r
+    FX_BOOL            EditUndo(const CFX_ByteStringC& bsRecord);\r
     IFWL_ListBox*      GetListBoxt();\r
     FX_BOOL            AfterFocusShowDropList();\r
     FX_ERR             OpenDropDownList(FX_BOOL bActivate);\r