@@ -132,7 +132,7 @@ namespace Util {
132
132
return hr;
133
133
}
134
134
135
- inline HRESULT setEventHandlers (_In_ IToastNotification* notification, _In_ std::shared_ptr<WinToastHandler > eventHandler) {
135
+ inline HRESULT setEventHandlers (_In_ IToastNotification* notification, _In_ std::shared_ptr<IWinToastHandler > eventHandler) {
136
136
EventRegistrationToken activatedToken, dismissedToken, failedToken;
137
137
HRESULT hr = notification->add_Activated (
138
138
Callback < Implements < RuntimeClassFlags<ClassicCom>,
@@ -151,7 +151,7 @@ namespace Util {
151
151
ToastDismissalReason reason;
152
152
if (SUCCEEDED (e->get_Reason (&reason)))
153
153
{
154
- eventHandler->toastDismissed (static_cast <WinToastHandler ::WinToastDismissalReason>(reason));
154
+ eventHandler->toastDismissed (static_cast <IWinToastHandler ::WinToastDismissalReason>(reason));
155
155
}
156
156
return S_OK;
157
157
}).Get (), &dismissedToken);
@@ -366,7 +366,7 @@ HRESULT WinToast::createShellLink() {
366
366
367
367
368
368
369
- bool WinToast::showToast (_In_ const WinToastTemplate& toast, _In_ WinToastHandler * handler) {
369
+ bool WinToast::showToast (_In_ const WinToastTemplate& toast, _In_ IWinToastHandler * handler) {
370
370
if (!isInitialized ()) {
371
371
DEBUG_MSG (" Error when launching the toast. WinToast is not initialized =(" );
372
372
return _isInitialized;
@@ -383,7 +383,7 @@ bool WinToast::showToast(_In_ const WinToastTemplate& toast, _In_ WinToastHandl
383
383
if (SUCCEEDED (hr)) {
384
384
hr = _notificationFactory->CreateToastNotification (xmlDocument (), &_notification);
385
385
if (SUCCEEDED (hr)) {
386
- hr = Util::setEventHandlers (notification (), std::shared_ptr<WinToastHandler >(handler));
386
+ hr = Util::setEventHandlers (notification (), std::shared_ptr<IWinToastHandler >(handler));
387
387
if (SUCCEEDED (hr)) {
388
388
hr = _notifier->Show (notification ());
389
389
}
@@ -441,7 +441,6 @@ WinToastTemplate::WinToastTemplate(const WinToastTemplateType& type) :
441
441
initComponentsFromType ();
442
442
}
443
443
444
-
445
444
WinToastTemplate::~WinToastTemplate ()
446
445
{
447
446
_textFields.clear ();
@@ -461,35 +460,3 @@ void WinToastTemplate::initComponentsFromType() {
461
460
_hasImage = _type < Text01;
462
461
_textFields = std::vector<std::wstring>(TextFieldsCount[_type], L" " );
463
462
}
464
-
465
-
466
- void WinToastHandler::toastActivated () const {
467
- std::wcout << L" The user clicked in this toast" << std::endl;
468
-
469
- }
470
-
471
- void WinToastHandler::toastFailed () const {
472
- std::wcout << L" Error showing current toast" << std::endl;
473
- }
474
-
475
- void WinToastHandler::toastDismissed (WinToastHandler::WinToastDismissalReason state) const {
476
- switch (state) {
477
- case UserCanceled:
478
- std::wcout << L" The user dismissed this toast" << std::endl;
479
- break ;
480
- case ApplicationHidden:
481
- std::wcout << L" The application hid the toast using ToastNotifier.hide()" << std::endl;
482
- break ;
483
- case TimedOut:
484
- std::wcout << L" The toast has timed out" << std::endl;
485
- break ;
486
- default :
487
- std::wcout << L" Toast not activated" << std::endl;
488
- break ;
489
- }
490
- }
491
-
492
-
493
-
494
-
495
-
0 commit comments