Merge to XFA: Remove FX_BSTR and FX_WSTR typedefs.
[pdfium.git] / xfa / src / fwl / src / lightwidget / combobox.cpp
index c0806ef..20211ca 100644 (file)
@@ -35,14 +35,14 @@ FWL_ERR     CFWL_ComboBox::Initialize(const CFWL_WidgetProperties *pProperties )
     }\r
     return ret;\r
 }\r
-int32_t CFWL_ComboBox::AddString(FX_WSTR wsText)\r
+int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText)\r
 {\r
     CFWL_ComboBoxItem *pItem = FX_NEW CFWL_ComboBoxItem;\r
     pItem->m_wsText = wsText;\r
     pItem->m_dwStyles = 0;\r
     return m_comboBoxData.m_arrItem.Add(pItem);\r
 }\r
-int32_t CFWL_ComboBox::AddString(FX_WSTR wsText, CFX_DIBitmap *pIcon)\r
+int32_t CFWL_ComboBox::AddString(const CFX_WideStringC& wsText, CFX_DIBitmap *pIcon)\r
 {\r
     CFWL_ComboBoxItem *pItem = FX_NEW CFWL_ComboBoxItem;\r
     pItem->m_wsText = wsText;\r
@@ -80,7 +80,7 @@ FWL_ERR CFWL_ComboBox::SetCurSel(int32_t iSel)
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);\r
     return ((IFWL_ComboBox*)m_pImp)->SetCurSel(iSel);\r
 }\r
-FWL_ERR CFWL_ComboBox::SetEditText(FX_WSTR wsText)\r
+FWL_ERR CFWL_ComboBox::SetEditText(const CFX_WideStringC& wsText)\r
 {\r
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);\r
     return ((IFWL_ComboBox*)m_pImp)->SetEditText(wsText);\r
@@ -120,12 +120,12 @@ FWL_ERR CFWL_ComboBox::EditDoClipboard(int32_t iCmd)
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FWL_ERR_Indefinite);\r
     return ((IFWL_ComboBox*)m_pImp)->EditDoClipboard(iCmd);\r
 }\r
-FX_BOOL CFWL_ComboBox::EditRedo(FX_BSTR bsRecord)\r
+FX_BOOL CFWL_ComboBox::EditRedo(const CFX_ByteStringC& bsRecord)\r
 {\r
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);\r
     return ((IFWL_ComboBox*)m_pImp)->EditRedo(bsRecord);\r
 }\r
-FX_BOOL CFWL_ComboBox::EditUndo(FX_BSTR bsRecord)\r
+FX_BOOL CFWL_ComboBox::EditUndo(const CFX_ByteStringC& bsRecord)\r
 {\r
     _FWL_RETURN_VALUE_IF_FAIL(m_pImp, FALSE);\r
     return ((IFWL_ComboBox*)m_pImp)->EditUndo(bsRecord);\r