@@ -32,9 +32,15 @@ protected: \
3232// Winrt events need a method for adding a callback to the event and removing
3333// the callback. This macro will define them both for you, because they
3434// don't really vary from event to event.
35- #define DEFINE_EVENT (className, name, eventHandler, args ) \
36- winrt::event_token className::name (const args& handler) { return eventHandler.add (handler); } \
37- void className::name (const winrt::event_token& token) noexcept { eventHandler.remove (token); }
35+ #define DEFINE_EVENT (className, name, eventHandler, args ) \
36+ winrt::event_token className::name (const args& handler) \
37+ { \
38+ return eventHandler.add (handler); \
39+ } \
40+ void className::name (const winrt::event_token& token) noexcept \
41+ { \
42+ eventHandler.remove (token); \
43+ }
3844
3945// This is a helper macro to make declaring events easier.
4046// This will declare the event handler and the methods for adding and removing a
@@ -53,22 +59,34 @@ private:
5359// the callback. This macro will define them both for you, because they
5460// don't really vary from event to event.
5561// Use this if you have a Windows.Foundation.TypedEventHandler
56- #define DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER (className, name, eventHandler, sender, args ) \
57- winrt::event_token className::name (const Windows::Foundation::TypedEventHandler<sender, args>& handler) { return eventHandler.add (handler); } \
58- void className::name (const winrt::event_token& token) noexcept { eventHandler.remove (token); }
62+ #define DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER (className, name, eventHandler, sender, args ) \
63+ winrt::event_token className::name (const Windows::Foundation::TypedEventHandler<sender, args>& handler) \
64+ { \
65+ return eventHandler.add (handler); \
66+ } \
67+ void className::name (const winrt::event_token& token) noexcept \
68+ { \
69+ eventHandler.remove (token); \
70+ }
5971
6072// This is a helper macro for both declaring the signature of an event, and
6173// defining the body. Winrt events need a method for adding a callback to the
6274// event and removing the callback. This macro will both declare the method
6375// signatures and define them both for you, because they don't really vary from
6476// event to event.
6577// Use this in a classes header if you have a Windows.Foundation.TypedEventHandler
66- #define TYPED_EVENT (name, sender, args ) \
67- public: \
68- winrt::event_token name (const winrt::Windows::Foundation::TypedEventHandler<sender, args>& handler) { return _##name##Handlers.add (handler); } \
69- void name (const winrt::event_token& token) { _##name##Handlers.remove (token); } \
70- \
71- private: \
78+ #define TYPED_EVENT (name, sender, args ) \
79+ public: \
80+ winrt::event_token name (const winrt::Windows::Foundation::TypedEventHandler<sender, args>& handler) \
81+ { \
82+ return _##name##Handlers.add (handler); \
83+ } \
84+ void name (const winrt::event_token& token) \
85+ { \
86+ _##name##Handlers.remove (token); \
87+ } \
88+ \
89+ private: \
7290 winrt::event<winrt::Windows::Foundation::TypedEventHandler<sender, args>> _##name##Handlers;
7391
7492// This is a helper macro for both declaring the signature of a callback (nee event) and
@@ -77,12 +95,18 @@ private:
7795// signatures and define them both for you, because they don't really vary from
7896// event to event.
7997// Use this in a class's header if you have a "delegate" type in your IDL.
80- #define WINRT_CALLBACK (name, args ) \
81- public: \
82- winrt::event_token name (const args& handler) { return _##name##Handlers.add (handler); } \
83- void name (const winrt::event_token& token) { _##name##Handlers.remove (token); } \
84- \
85- protected: \
98+ #define WINRT_CALLBACK (name, args ) \
99+ public: \
100+ winrt::event_token name (const args& handler) \
101+ { \
102+ return _##name##Handlers.add (handler); \
103+ } \
104+ void name (const winrt::event_token& token) \
105+ { \
106+ _##name##Handlers.remove (token); \
107+ } \
108+ \
109+ protected: \
86110 winrt::event<args> _##name##Handlers;
87111
88112// This is a helper macro for both declaring the signature and body of an event
@@ -91,16 +115,28 @@ protected:
91115// "proxied" to the handling type. Case in point: many of the events on App are
92116// just forwarded straight to TerminalPage. This macro will both declare the
93117// method signatures and define them both for you.
94- #define FORWARDED_TYPED_EVENT (name, sender, args, handler, handlerName ) \
95- public: \
96- winrt::event_token name (const Windows::Foundation::TypedEventHandler<sender, args>& h) { return handler->handlerName (h); } \
97- void name (const winrt::event_token& token) noexcept { handler->handlerName (token); }
118+ #define FORWARDED_TYPED_EVENT (name, sender, args, handler, handlerName ) \
119+ public: \
120+ winrt::event_token name (const Windows::Foundation::TypedEventHandler<sender, args>& h) \
121+ { \
122+ return handler->handlerName (h); \
123+ } \
124+ void name (const winrt::event_token& token) noexcept \
125+ { \
126+ handler->handlerName (token); \
127+ }
98128
99129// Same thing, but handler is a projected type, not an implementation
100- #define PROJECTED_FORWARDED_TYPED_EVENT (name, sender, args, handler, handlerName ) \
101- public: \
102- winrt::event_token name (const Windows::Foundation::TypedEventHandler<sender, args>& h) { return handler.handlerName (h); } \
103- void name (const winrt::event_token& token) noexcept { handler.handlerName (token); }
130+ #define PROJECTED_FORWARDED_TYPED_EVENT (name, sender, args, handler, handlerName ) \
131+ public: \
132+ winrt::event_token name (const Windows::Foundation::TypedEventHandler<sender, args>& h) \
133+ { \
134+ return handler.handlerName (h); \
135+ } \
136+ void name (const winrt::event_token& token) noexcept \
137+ { \
138+ handler.handlerName (token); \
139+ }
104140
105141// This is a bit like *FORWARDED_TYPED_EVENT. When you use a forwarded event,
106142// the handler gets added to the object that's raising the event. For example,
@@ -121,17 +157,26 @@ public:
121157// _core.TitleChanged({ get_weak(), &TermControl::_bubbleTitleChanged });
122158#define BUBBLED_FORWARDED_TYPED_EVENT (name, sender, args ) \
123159 TYPED_EVENT (name, sender, args) \
124- void _bubble##name(const sender& s, const args& a) { _##name##Handlers (s, a); }
160+ void _bubble##name(const sender& s, const args& a) \
161+ { \
162+ _##name##Handlers (s, a); \
163+ }
125164
126165// Use this macro to quick implement both the getter and setter for a property.
127166// This should only be used for simple types where there's no logic in the
128167// getter/setter beyond just accessing/updating the value.
129- #define WINRT_PROPERTY (type, name, ...) \
130- public: \
131- type name () const noexcept { return _##name; } \
132- void name (const type& value) noexcept { _##name = value; } \
133- \
134- private: \
168+ #define WINRT_PROPERTY (type, name, ...) \
169+ public: \
170+ type name () const noexcept \
171+ { \
172+ return _##name; \
173+ } \
174+ void name (const type& value) noexcept \
175+ { \
176+ _##name = value; \
177+ } \
178+ \
179+ private: \
135180 type _##name{ __VA_ARGS__ };
136181
137182// Use this macro to quickly implement both the getter and setter for an
@@ -143,7 +188,10 @@ private: \
143188// (like when the class is being initialized).
144189#define WINRT_OBSERVABLE_PROPERTY (type, name, event, ...) \
145190public: \
146- type name () const noexcept { return _##name; }; \
191+ type name () const noexcept \
192+ { \
193+ return _##name; \
194+ }; \
147195 void name (const type& value) \
148196 { \
149197 if (_##name != value) \
0 commit comments