~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to include/common/mir_toolkit/events/event.h

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
59
59
/**@}*/
60
60
#endif
61
61
 
62
 
#include "mir_toolkit/events/event_deprecated.h"
 
62
#ifdef MIR_REQUIRE_DEPRECATED_EVENT_OPT_IN
 
63
    #ifdef MIR_INCLUDE_DEPRECATED_EVENT_HEADER
 
64
        #include "mir_toolkit/events/event_deprecated.h"
 
65
    #endif // MIR_INCLUDE_DEPRECATED_EVENT_HEADER
 
66
#else 
 
67
    #include "mir_toolkit/events/event_deprecated.h"
 
68
#endif // MIR_REQUIRE_DEPRECATED_EVENT_OPT_IN
 
69
 
 
70
 
63
71
#include "mir_toolkit/events/input/input_event.h"
64
72
#include "mir_toolkit/events/resize_event.h"
65
73
#include "mir_toolkit/events/surface_event.h"
136
144
 
137
145
/*
138
146
 * Retrieve the MirCloseSurfaceEvent associated with a MirEvent of
139
 
 * type mir_event_type_close_surface. See <mir_toolkit/events/close_surface_event.h>
140
 
 * for accessors.
 
147
 * type mir_event_type_close_surface. The event is a request to close
 
148
 * the surface it is delivered to and has no accessors.
141
149
 *
142
150
 * \param [in] event The event
143
151
 * \return           The associated MirCloseSurfaceEvent