diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-06-20 19:28:14 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-21 21:14:36 +0200 |
| commit | bafd50ee06d982e19d54fae0f9d8f968a2dedbd4 (patch) | |
| tree | 70495da44ba8fa2c1809389f677836cae0aad14f /include | |
| parent | 4e3196ceedc2b79d58bb57dba86f2f0158d32998 (diff) | |
weld DateField Calendar floating window
Change-Id: I8d839a09b787e2b8ac1389633a39a3cd969fb1c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96816
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/calendar.hxx | 21 | ||||
| -rw-r--r-- | include/svtools/strings.hrc | 3 |
2 files changed, 6 insertions, 18 deletions
diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index 3b6ffb5bdc39..a547fb450221 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -23,18 +23,11 @@ #include <config_options.h> #include <svtools/svtdllapi.h> -#include <vcl/calendar.hxx> #include <vcl/field.hxx> +#include <vcl/weld.hxx> -class MouseEvent; -class TrackingEvent; -class KeyEvent; -class HelpEvent; -class DataChangedEvent; class FloatingWindow; -class PushButton; -class ImplCFieldFloatWin; -class Button; +struct ImplCFieldFloatWin; /************************************************************************* @@ -76,14 +69,13 @@ class UNLESS_MERGELIBS(SVT_DLLPUBLIC) CalendarField final : public DateField { private: VclPtr<ImplCFieldFloatWin> mpFloatWin; - VclPtr<Calendar> mpCalendar; - VclPtr<PushButton> mpTodayBtn; - VclPtr<PushButton> mpNoneBtn; + weld::Button* mpTodayBtn; + weld::Button* mpNoneBtn; bool mbToday; bool mbNone; - DECL_DLLPRIVATE_LINK( ImplSelectHdl, Calendar*, void ); - DECL_DLLPRIVATE_LINK( ImplClickHdl, Button*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectHdl, weld::Calendar&, void ); + DECL_DLLPRIVATE_LINK( ImplClickHdl, weld::Button&, void ); DECL_DLLPRIVATE_LINK( ImplPopupModeEndHdl, FloatingWindow*, void ); public: @@ -92,7 +84,6 @@ public: virtual void dispose() override; virtual bool ShowDropDown( bool bShow ) override; - Calendar* GetCalendar(); void EnableToday() { mbToday = true; } void EnableNone() { mbNone = true; } diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc index a71792e20026..c8b84f0e53a4 100644 --- a/include/svtools/strings.hrc +++ b/include/svtools/strings.hrc @@ -150,9 +150,6 @@ #define STR_SVT_INDEXENTRY_PHONETIC_LS NC_("STR_SVT_INDEXENTRY_PHONETIC_LS", "Phonetic (alphanumeric last, grouped by syllables)") #define STR_SVT_INDEXENTRY_PHONETIC_LC NC_("STR_SVT_INDEXENTRY_PHONETIC_LC", "Phonetic (alphanumeric last, grouped by consonants)") -#define STR_SVT_CALENDAR_TODAY NC_("STR_SVT_CALENDAR_TODAY", "Today") -#define STR_SVT_CALENDAR_NONE NC_("STR_SVT_CALENDAR_NONE", "None") - #define STR_SVT_STYLE_LIGHT NC_("STR_SVT_STYLE_LIGHT", "Light") #define STR_SVT_STYLE_LIGHT_ITALIC NC_("STR_SVT_STYLE_LIGHT_ITALIC", "Light Italic") #define STR_SVT_STYLE_NORMAL NC_("STR_SVT_STYLE_NORMAL", "Regular") |