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/theme | |
| 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/theme')
| -rw-r--r-- | xfa/include/fwl/theme/comboboxtp.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/theme/formtp.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/theme/listboxtp.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/theme/monthcalendartp.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/theme/pushbuttontp.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/theme/scrollbartp.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/theme/widgettp.h | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/xfa/include/fwl/theme/comboboxtp.h b/xfa/include/fwl/theme/comboboxtp.h index 1ed39742e6..62b378f653 100644 --- a/xfa/include/fwl/theme/comboboxtp.h +++ b/xfa/include/fwl/theme/comboboxtp.h @@ -15,7 +15,7 @@ public: virtual ~CFWL_ComboBoxTP();
virtual FX_BOOL IsValidWidget(IFWL_Widget *pWidget);
virtual FX_BOOL DrawBackground(CFWL_ThemeBackground *pParams);
- virtual FX_LPVOID GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
+ virtual void* GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
protected:
void DrawDropDownButton(CFWL_ThemeBackground *pParams, FX_DWORD dwStates, CFX_Matrix *pMatrix);
void DrawStrethHandler(CFWL_ThemeBackground *pParams, FX_DWORD dwStates, CFX_Matrix *pMatrix);
diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h index e531b55a53..55449da6fd 100644 --- a/xfa/include/fwl/theme/formtp.h +++ b/xfa/include/fwl/theme/formtp.h @@ -20,7 +20,7 @@ public: virtual FX_DWORD SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren = TRUE);
virtual FX_BOOL DrawBackground(CFWL_ThemeBackground *pParams);
virtual FX_BOOL DrawText(CFWL_ThemeText *pParams);
- virtual FX_LPVOID GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
+ virtual void* GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
virtual FWL_ERR GetPartRect(CFWL_ThemePart *pThemePart, CFX_RectF& rtPart);
protected:
diff --git a/xfa/include/fwl/theme/listboxtp.h b/xfa/include/fwl/theme/listboxtp.h index aaae2eba38..4b82aa653a 100644 --- a/xfa/include/fwl/theme/listboxtp.h +++ b/xfa/include/fwl/theme/listboxtp.h @@ -19,6 +19,6 @@ public: virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
protected:
- void DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, FX_LPVOID pData = NULL, CFX_Matrix *pMatrix = NULL);
+ void DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, void* pData = NULL, CFX_Matrix *pMatrix = NULL);
};
#endif
diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h index 6f0624ae9c..f601600659 100644 --- a/xfa/include/fwl/theme/monthcalendartp.h +++ b/xfa/include/fwl/theme/monthcalendartp.h @@ -17,7 +17,7 @@ public: virtual FX_DWORD SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren = TRUE);
virtual FX_BOOL DrawBackground(CFWL_ThemeBackground *pParams);
virtual FX_BOOL DrawText(CFWL_ThemeText *pParams);
- virtual FX_LPVOID GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
+ virtual void* GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
protected:
diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h index f6db37b95e..20df2037ab 100644 --- a/xfa/include/fwl/theme/pushbuttontp.h +++ b/xfa/include/fwl/theme/pushbuttontp.h @@ -16,7 +16,7 @@ public: virtual FX_BOOL IsValidWidget(IFWL_Widget *pWidget);
virtual FX_DWORD SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren = TRUE);
virtual FX_BOOL DrawBackground(CFWL_ThemeBackground *pParams);
- virtual FX_LPVOID GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
+ virtual void* GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
protected:
diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h index 3153c79ead..94002fbd11 100644 --- a/xfa/include/fwl/theme/scrollbartp.h +++ b/xfa/include/fwl/theme/scrollbartp.h @@ -16,7 +16,7 @@ public: virtual FX_BOOL IsValidWidget(IFWL_Widget *pWidget);
virtual FX_DWORD SetThemeID(IFWL_Widget *pWidget, FX_DWORD dwThemeID, FX_BOOL bChildren = TRUE);
virtual FX_BOOL DrawBackground(CFWL_ThemeBackground *pParams);
- virtual FX_LPVOID GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
+ virtual void* GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
protected:
void DrawThumbBtn(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FX_BOOL bVert, FWLTHEME_STATE eState, FX_BOOL bPawButton = TRUE, CFX_Matrix *pMatrix = NULL);
void DrawTrack(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FX_BOOL bVert, FWLTHEME_STATE eState, FX_BOOL bLowerTrack, CFX_Matrix *pMatrix = NULL);
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h index 5a07c7ea03..9d0578478e 100644 --- a/xfa/include/fwl/theme/widgettp.h +++ b/xfa/include/fwl/theme/widgettp.h @@ -26,7 +26,7 @@ public: virtual FWL_ERR SetThemeMatrix(IFWL_Widget *pWidget, const CFX_Matrix &matrix);
virtual FX_BOOL DrawBackground(CFWL_ThemeBackground *pParams);
virtual FX_BOOL DrawText(CFWL_ThemeText *pParams);
- virtual FX_LPVOID GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
+ virtual void* GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity);
virtual FX_BOOL IsCustomizedLayout(IFWL_Widget *pWidget);
virtual FWL_ERR GetPartRect(CFWL_ThemePart *pThemePart, CFX_RectF &rtPart);
virtual FX_BOOL IsInPart(CFWL_ThemePart *pThemePart, FX_FLOAT fx, FX_FLOAT fy);
@@ -34,7 +34,7 @@ public: virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual ~CFWL_WidgetTP();
- FWL_ERR SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);
+ FWL_ERR SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);
FWL_ERR SetFont(IFWL_Widget *pWidget, IFX_Font *pFont, FX_FLOAT fFontSize, FX_ARGB rgbFont);
IFX_Font* GetFont(IFWL_Widget *pWidget);
protected:
|