diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-10 14:33:37 -0700 |
| commit | d7e5cc754a937605d1f73db5e7967c58ddd80742 (patch) | |
| tree | ed28e012c4d6a46b7f29f15a0c060474c27d4286 /xfa/include/fwl/basewidget | |
| parent | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (diff) | |
| download | pdfium-d7e5cc754a937605d1f73db5e7967c58ddd80742.tar.xz | |
Merge to XFA: Remove typdefs for pointer types in fx_system.h.
Original Review URL: https://codereview.chromium.org/1171733003
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1178613002.
Diffstat (limited to 'xfa/include/fwl/basewidget')
| -rw-r--r-- | xfa/include/fwl/basewidget/fwl_edit.h | 4 | ||||
| -rw-r--r-- | xfa/include/fwl/basewidget/fwl_listbox.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/include/fwl/basewidget/fwl_edit.h index 78072d0cf8..ae8aea0bd3 100644 --- a/xfa/include/fwl/basewidget/fwl_edit.h +++ b/xfa/include/fwl/basewidget/fwl_edit.h @@ -112,7 +112,7 @@ class IFWL_EditDP : public IFWL_DataProvider #define FWL_EDT_FIND_FLAGS_WholeWord (1L << 1)
#define FWL_EDT_FIND_FLAGS_NoCase (1L << 2)
typedef struct _FWL_HEDTFIND {
- FX_LPVOID pData;
+ void* pData;
}* FWL_HEDTFIND;
class IFWL_Edit : public IFWL_Widget
{
@@ -134,7 +134,7 @@ public: FWL_ERR SetLimit(int32_t nLimit);
FWL_ERR SetAliasChar(FX_WCHAR wAlias);
FWL_ERR SetFormatString(const CFX_WideString &wsFormat);
- FWL_ERR Insert(int32_t nStart, FX_LPCWSTR lpText, int32_t nLen);
+ FWL_ERR Insert(int32_t nStart, const FX_WCHAR* lpText, int32_t nLen);
FWL_ERR DeleteSelections();
FWL_ERR DeleteRange(int32_t nStart, int32_t nCount = -1);
FWL_ERR ReplaceSelections(const CFX_WideStringC &wsReplace);
diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/include/fwl/basewidget/fwl_listbox.h index 466d919a5e..3d0fa116ce 100644 --- a/xfa/include/fwl/basewidget/fwl_listbox.h +++ b/xfa/include/fwl/basewidget/fwl_listbox.h @@ -58,7 +58,7 @@ int32_t m_index; CFX_RectF m_rect;
END_FWL_EVENT_DEF
typedef struct _FWL_HLISTITEM {
- FX_LPVOID pData;
+ void* pData;
}* FWL_HLISTITEM;
typedef struct _FWL_ListBoxItemData {
IFWL_ListBoxDP *pDataProvider;
@@ -74,9 +74,9 @@ public: virtual FX_DWORD GetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;
virtual FWL_ERR GetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_WideString &wsText) = 0;
virtual FWL_ERR GetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, CFX_RectF &rtItem) = 0;
- virtual FX_LPVOID GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;
+ virtual void* GetItemData(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;
virtual FWL_ERR SetItemStyles(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_DWORD dwStyle) = 0;
- virtual FWL_ERR SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, FX_LPCWSTR pszText) = 0;
+ virtual FWL_ERR SetItemText(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText) = 0;
virtual FWL_ERR SetItemRect(IFWL_Widget *pWidget, FWL_HLISTITEM hItem, const CFX_RectF &rtItem) = 0;
virtual FX_FLOAT GetItemHeight(IFWL_Widget *pWidget) = 0;
virtual CFX_DIBitmap* GetItemIcon(IFWL_Widget *pWidget, FWL_HLISTITEM hItem) = 0;
|