Windows compile fix for VclPtr intersection with events.

Unfortunately, not incredibly elegant for now.

Change-Id: I4ac2e6e013671e7d7830f9555c5bd6bb6b7529b8

include/vcl/event.hxx

@@ -28,9 +28,9 @@
 #include <vcl/settings.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/outdev.hxx>
+#include <vcl/window.hxx>
 
 class AllSettings;
-namespace vcl { class Window; }
 struct IDataObject;
 
 namespace com { namespace sun { namespace star { namespace awt {

include/vcl/vclevent.hxx

@@ -25,13 +25,13 @@
 #include <vcl/dllapi.h>
 #include <vcl/impdel.hxx>
 #include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
 
 #include <com/sun/star/uno/Reference.hxx>
 
 #include <list>
 #include <vector>
 
-namespace vcl { class Window; }
 class Menu;
 
 namespace com { namespace sun { namespace star {

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: */