Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fxfa / src / app / xfa_ffchoicelist.h
index 72463ec..aeddedb 100644 (file)
@@ -20,10 +20,10 @@ protected:
     FX_DWORD                   GetAlignment();\r
 public:\r
     void               OnSelectChanged(IFWL_Widget *pWidget, const CFX_Int32Array &arrSels);\r
-    void                       SetItemState(FX_INT32 nIndex, FX_BOOL bSelected);\r
-    void                       InsertItem(FX_WSTR wsLabel, FX_INT32 nIndex = -1);\r
-    void                       DeleteItem(FX_INT32 nIndex);\r
-    virtual FX_INT32   OnProcessMessage(CFWL_Message *pMessage);\r
+    void                       SetItemState(int32_t nIndex, FX_BOOL bSelected);\r
+    void                       InsertItem(const CFX_WideStringC& wsLabel, int32_t nIndex = -1);\r
+    void                       DeleteItem(int32_t nIndex);\r
+    virtual int32_t    OnProcessMessage(CFWL_Message *pMessage);\r
     virtual FWL_ERR            OnProcessEvent(CFWL_Event *pEvent);\r
     virtual FWL_ERR            OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL);\r
 protected:\r
@@ -70,10 +70,10 @@ public:
     void       OnPreOpen(IFWL_Widget *pWidget);\r
     void       OnPostOpen(IFWL_Widget *pWidget);\r
     void       OnAddDoRecord(IFWL_Widget *pWidget);\r
-    void                       SetItemState(FX_INT32 nIndex, FX_BOOL bSelected);\r
-    void                       InsertItem(FX_WSTR wsLabel, FX_INT32 nIndex = -1);\r
-    void                       DeleteItem(FX_INT32 nIndex);\r
-    virtual FX_INT32   OnProcessMessage(CFWL_Message *pMessage);\r
+    void                       SetItemState(int32_t nIndex, FX_BOOL bSelected);\r
+    void                       InsertItem(const CFX_WideStringC& wsLabel, int32_t nIndex = -1);\r
+    void                       DeleteItem(int32_t nIndex);\r
+    virtual int32_t    OnProcessMessage(CFWL_Message *pMessage);\r
     virtual FWL_ERR            OnProcessEvent(CFWL_Event *pEvent);\r
     virtual FWL_ERR            OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL);\r
 protected:\r