| Index: xfa/fwl/core/cfwl_datetimepicker.cpp
|
| diff --git a/xfa/fwl/core/cfwl_datetimepicker.cpp b/xfa/fwl/core/cfwl_datetimepicker.cpp
|
| index fb4a39fe35c7bfccfc75de0f7b972ea7adad9a5b..efc2b62cf7629d214a2627870704c9f197b2feae 100644
|
| --- a/xfa/fwl/core/cfwl_datetimepicker.cpp
|
| +++ b/xfa/fwl/core/cfwl_datetimepicker.cpp
|
| @@ -35,15 +35,6 @@ void CFWL_DateTimePicker::Initialize() {
|
| CFWL_Widget::Initialize();
|
| }
|
|
|
| -FWL_Error CFWL_DateTimePicker::SetToday(int32_t iYear,
|
| - int32_t iMonth,
|
| - int32_t iDay) {
|
| - m_iYear = iYear;
|
| - m_iMonth = iMonth;
|
| - m_iDay = iDay;
|
| - return FWL_Error::Succeeded;
|
| -}
|
| -
|
| int32_t CFWL_DateTimePicker::CountSelRanges() {
|
| return ToDateTimePicker(GetWidget())->CountSelRanges();
|
| }
|
| @@ -52,100 +43,40 @@ int32_t CFWL_DateTimePicker::GetSelRange(int32_t nIndex, int32_t& nStart) {
|
| return ToDateTimePicker(GetWidget())->GetSelRange(nIndex, nStart);
|
| }
|
|
|
| -FWL_Error CFWL_DateTimePicker::GetEditText(CFX_WideString& wsText) {
|
| - return ToDateTimePicker(GetWidget())->GetEditText(wsText);
|
| -}
|
| -
|
| -FWL_Error CFWL_DateTimePicker::SetEditText(const CFX_WideString& wsText) {
|
| - return ToDateTimePicker(GetWidget())->SetEditText(wsText);
|
| +void CFWL_DateTimePicker::GetEditText(CFX_WideString& wsText) {
|
| + ToDateTimePicker(GetWidget())->GetEditText(wsText);
|
| }
|
|
|
| -FWL_Error CFWL_DateTimePicker::GetCurSel(int32_t& iYear,
|
| - int32_t& iMonth,
|
| - int32_t& iDay) {
|
| - return ToDateTimePicker(GetWidget())->GetCurSel(iYear, iMonth, iDay);
|
| +void CFWL_DateTimePicker::SetEditText(const CFX_WideString& wsText) {
|
| + ToDateTimePicker(GetWidget())->SetEditText(wsText);
|
| }
|
|
|
| -FWL_Error CFWL_DateTimePicker::SetCurSel(int32_t iYear,
|
| - int32_t iMonth,
|
| - int32_t iDay) {
|
| - return ToDateTimePicker(GetWidget())->SetCurSel(iYear, iMonth, iDay);
|
| +void CFWL_DateTimePicker::SetCurSel(int32_t iYear,
|
| + int32_t iMonth,
|
| + int32_t iDay) {
|
| + ToDateTimePicker(GetWidget())->SetCurSel(iYear, iMonth, iDay);
|
| }
|
|
|
| -FWL_Error CFWL_DateTimePicker::GetCaption(IFWL_Widget* pWidget,
|
| - CFX_WideString& wsCaption) {
|
| +void CFWL_DateTimePicker::GetCaption(IFWL_Widget* pWidget,
|
| + CFX_WideString& wsCaption) {
|
| wsCaption = m_wsData;
|
| - return FWL_Error::Succeeded;
|
| }
|
|
|
| -FWL_Error CFWL_DateTimePicker::GetToday(IFWL_Widget* pWidget,
|
| - int32_t& iYear,
|
| - int32_t& iMonth,
|
| - int32_t& iDay) {
|
| +void CFWL_DateTimePicker::GetToday(IFWL_Widget* pWidget,
|
| + int32_t& iYear,
|
| + int32_t& iMonth,
|
| + int32_t& iDay) {
|
| iYear = m_iYear;
|
| iMonth = m_iMonth;
|
| iDay = m_iDay;
|
| - return FWL_Error::Succeeded;
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::CanUndo() {
|
| - return ToDateTimePicker(GetWidget())->CanUndo();
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::CanRedo() {
|
| - return ToDateTimePicker(GetWidget())->CanRedo();
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::Undo() {
|
| - return ToDateTimePicker(GetWidget())->Undo();
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::Redo() {
|
| - return ToDateTimePicker(GetWidget())->Redo();
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::CanCopy() {
|
| - return ToDateTimePicker(GetWidget())->CanCopy();
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::CanCut() {
|
| - return ToDateTimePicker(GetWidget())->CanCut();
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::CanSelectAll() {
|
| - return ToDateTimePicker(GetWidget())->CanSelectAll();
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::Copy(CFX_WideString& wsCopy) {
|
| - return ToDateTimePicker(GetWidget())->Copy(wsCopy);
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::Cut(CFX_WideString& wsCut) {
|
| - return ToDateTimePicker(GetWidget())->Copy(wsCut);
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::Paste(const CFX_WideString& wsPaste) {
|
| - return ToDateTimePicker(GetWidget())->Paste(wsPaste);
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::SelectAll() {
|
| - return ToDateTimePicker(GetWidget())->SelectAll();
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::Delete() {
|
| - return ToDateTimePicker(GetWidget())->Delete();
|
| -}
|
| -
|
| -bool CFWL_DateTimePicker::DeSelect() {
|
| - return ToDateTimePicker(GetWidget())->DeSelect();
|
| }
|
|
|
| -FWL_Error CFWL_DateTimePicker::GetBBox(CFX_RectF& rect) {
|
| - return ToDateTimePicker(GetWidget())->GetBBox(rect);
|
| +void CFWL_DateTimePicker::GetBBox(CFX_RectF& rect) {
|
| + ToDateTimePicker(GetWidget())->GetBBox(rect);
|
| }
|
|
|
| -FWL_Error CFWL_DateTimePicker::SetEditLimit(int32_t nLimit) {
|
| - return ToDateTimePicker(GetWidget())->SetEditLimit(nLimit);
|
| +void CFWL_DateTimePicker::SetEditLimit(int32_t nLimit) {
|
| + ToDateTimePicker(GetWidget())->SetEditLimit(nLimit);
|
| }
|
|
|
| void CFWL_DateTimePicker::ModifyEditStylesEx(uint32_t dwStylesExAdded,
|
|
|