diff options
Diffstat (limited to 'xfa/src/fwl/src/theme')
| -rw-r--r-- | xfa/src/fwl/src/theme/comboboxtp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fwl/src/theme/formtp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fwl/src/theme/listboxtp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fwl/src/theme/monthcalendartp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fwl/src/theme/pushbuttontp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fwl/src/theme/scrollbartp.cpp | 2 | ||||
| -rw-r--r-- | xfa/src/fwl/src/theme/widgettp.cpp | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/xfa/src/fwl/src/theme/comboboxtp.cpp b/xfa/src/fwl/src/theme/comboboxtp.cpp index c7218955c9..28a1958f58 100644 --- a/xfa/src/fwl/src/theme/comboboxtp.cpp +++ b/xfa/src/fwl/src/theme/comboboxtp.cpp @@ -78,7 +78,7 @@ void CFWL_ComboBoxTP::DrawStrethHandler(CFWL_ThemeBackground *pParams, FX_DWORD pParams->m_pGraphics->SetFillColor(&cr);
pParams->m_pGraphics->FillPath(&path, FXFILL_WINDING, &pParams->m_matrix);
}
-FX_LPVOID CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
+void* CFWL_ComboBoxTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
{
if (dwCapacity == FWL_WGTCAPACITY_CMB_ComboFormHandler) {
m_fValue = FWLTHEME_CAPACITY_ComboFormHandler;
diff --git a/xfa/src/fwl/src/theme/formtp.cpp b/xfa/src/fwl/src/theme/formtp.cpp index ce12c15e78..db152edea5 100644 --- a/xfa/src/fwl/src/theme/formtp.cpp +++ b/xfa/src/fwl/src/theme/formtp.cpp @@ -144,7 +144,7 @@ FX_BOOL CFWL_FormTP::DrawText(CFWL_ThemeText *pParams) }
return CFWL_WidgetTP::DrawText(pParams);
}
-FX_LPVOID CFWL_FormTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
+void* CFWL_FormTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
{
FX_BOOL bDefPro = FALSE;
FX_BOOL bDwordVal = FALSE;
diff --git a/xfa/src/fwl/src/theme/listboxtp.cpp b/xfa/src/fwl/src/theme/listboxtp.cpp index a623509973..c16df585d9 100644 --- a/xfa/src/fwl/src/theme/listboxtp.cpp +++ b/xfa/src/fwl/src/theme/listboxtp.cpp @@ -67,7 +67,7 @@ FWL_ERR CFWL_ListBoxTP::Finalize() FinalizeTTO();
return CFWL_WidgetTP::Finalize();
}
-void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, FX_LPVOID pData , CFX_Matrix *pMatrix )
+void CFWL_ListBoxTP::DrawListBoxItem(CFX_Graphics *pGraphics, FX_DWORD dwStates, const CFX_RectF *prtItem, void* pData , CFX_Matrix *pMatrix )
{
if (dwStates & FWL_PARTSTATE_LTB_Selected) {
pGraphics->SaveGraphState();
diff --git a/xfa/src/fwl/src/theme/monthcalendartp.cpp b/xfa/src/fwl/src/theme/monthcalendartp.cpp index 2104d873f3..de7f3a847b 100644 --- a/xfa/src/fwl/src/theme/monthcalendartp.cpp +++ b/xfa/src/fwl/src/theme/monthcalendartp.cpp @@ -130,7 +130,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawText(CFWL_ThemeText *pParams) }
return CFWL_WidgetTP::DrawText(pParams);
}
-FX_LPVOID CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
+void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
{
FX_BOOL bDefPro = FALSE;
FX_BOOL bDwordVal = FALSE;
diff --git a/xfa/src/fwl/src/theme/pushbuttontp.cpp b/xfa/src/fwl/src/theme/pushbuttontp.cpp index 8194b249be..9f3127f5b7 100644 --- a/xfa/src/fwl/src/theme/pushbuttontp.cpp +++ b/xfa/src/fwl/src/theme/pushbuttontp.cpp @@ -94,7 +94,7 @@ FX_BOOL CFWL_PushButtonTP::DrawBackground(CFWL_ThemeBackground *pParams) }
return TRUE;
}
-FX_LPVOID CFWL_PushButtonTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
+void* CFWL_PushButtonTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
{
if (dwCapacity == FWL_WGTCAPACITY_PSB_Margin) {
m_fValue = 0;
diff --git a/xfa/src/fwl/src/theme/scrollbartp.cpp b/xfa/src/fwl/src/theme/scrollbartp.cpp index a90dafa17e..c10507a57e 100644 --- a/xfa/src/fwl/src/theme/scrollbartp.cpp +++ b/xfa/src/fwl/src/theme/scrollbartp.cpp @@ -23,7 +23,7 @@ FX_BOOL CFWL_ScrollBarTP::IsValidWidget(IFWL_Widget *pWidget) _FWL_RETURN_VALUE_IF_FAIL(pWidget, FALSE);
return pWidget->GetClassID() == FWL_CLASSHASH_ScrollBar;
}
-FX_LPVOID CFWL_ScrollBarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
+void* CFWL_ScrollBarTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
{
if (dwCapacity == FWL_CAPACITY_SCB_Size) {
m_fValue = 5;
diff --git a/xfa/src/fwl/src/theme/widgettp.cpp b/xfa/src/fwl/src/theme/widgettp.cpp index aac6516799..a4c876956d 100644 --- a/xfa/src/fwl/src/theme/widgettp.cpp +++ b/xfa/src/fwl/src/theme/widgettp.cpp @@ -69,7 +69,7 @@ FX_BOOL CFWL_WidgetTP::DrawText(CFWL_ThemeText *pParams) m_pTextOut->DrawLogicText(pParams->m_wsText, iLen, pParams->m_rtPart);
return TRUE;
}
-FX_LPVOID CFWL_WidgetTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
+void* CFWL_WidgetTP::GetCapacity(CFWL_ThemePart *pThemePart, FX_DWORD dwCapacity)
{
switch(dwCapacity) {
case FWL_WGTCAPACITY_CXBorder: {
@@ -162,7 +162,7 @@ FWL_ERR CFWL_WidgetTP::Finalize() CFWL_WidgetTP::~CFWL_WidgetTP()
{
}
-FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget *pWidget, FX_LPCWSTR strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont)
+FWL_ERR CFWL_WidgetTP::SetFont(IFWL_Widget *pWidget, const FX_WCHAR* strFont, FX_FLOAT fFontSize, FX_ARGB rgbFont)
{
if (!m_pTextOut) {
return FWL_ERR_Succeeded;
|