From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 20 Jun 2005 00:24:08 +0000 (+0000)
Subject: compilation fix for wxUSE_OLE and wxUSE_ACCEL==0 for WinCE
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/855ec9441047849e90759978fe11a8e050411056?ds=inline

compilation fix for wxUSE_OLE and wxUSE_ACCEL==0 for WinCE


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 73f53067bf..90f1be2607 100644
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -47,9 +47,9 @@
 #endif
 
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
-#include "wx/msw/ole/oleutils.h"
-#include <aygshell.h>
-#include "wx/msw/winundef.h"
+    #include <ole2.h>
+    #include <aygshell.h>
+    #include "wx/msw/winundef.h"
 #endif
 
 #if wxUSE_STATUSBAR
@@ -211,14 +211,14 @@ bool wxFrame::Create(wxWindow *parent,
     SetLeftMenu(wxID_EXIT, _("Done"));
 #endif
 
-#if defined(__POCKETPC__)
+#if wxUSE_ACCEL && defined(__POCKETPC__)
     // The guidelines state that Ctrl+Q should quit the app.
     // Let's define an accelerator table to send wxID_EXIT.
     wxAcceleratorEntry entries[1];
     entries[0].Set(wxACCEL_CTRL,   'Q',         wxID_EXIT);
     wxAcceleratorTable accel(1, entries);
     SetAcceleratorTable(accel);
-#endif
+#endif // wxUSE_ACCEL && __POCKETPC__
 
     return true;
 }