diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-04-23 11:26:44 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-23 11:26:44 +0100 |
| commit | 6cf6e2da24787e7a1238ba105e954946edd2c8cb (patch) | |
| tree | f606aa10a5071ad023a22dcd5eacb9b9e0f0eb62 /include/vcl/window.hxx | |
| parent | 203c5c6706ac3ad44bf3fb23b689b2de8d3f872b (diff) | |
Windows compile fix for VclPtr intersection with events.
Unfortunately, not incredibly elegant for now.
Change-Id: I4ac2e6e013671e7d7830f9555c5bd6bb6b7529b8
Diffstat (limited to 'include/vcl/window.hxx')
| -rw-r--r-- | include/vcl/window.hxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index a9ee87d2995e..3134e5012258 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -31,9 +31,7 @@ #include <vcl/apptypes.hxx> #include <vcl/cursor.hxx> #include <vcl/inputctx.hxx> -#include <vcl/vclevent.hxx> -// Only for compatibility - because many people outside haven't included event.hxx -#include <vcl/event.hxx> +#include <vcl/keycodes.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <rtl/ustring.hxx> @@ -63,6 +61,7 @@ class CommandEvent; class TrackingEvent; class HelpEvent; class DataChangedEvent; +class VclSimpleEvent; class NotifyEvent; class SystemWindow; class SalFrame; @@ -1454,6 +1453,11 @@ public: } +// Only for compatibility - because many people outside haven't included event.hxx +// These require Window to be defined for VclPtr<Window> +#include <vcl/vclevent.hxx> +#include <vcl/event.hxx> + #endif // INCLUDED_VCL_WINDOW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |