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 73f53067bf19d677ef4bed3826ffe7b395f7f274..90f1be2607622b1be160e9abcfed1f0db46a2ffc 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -47,9 +47,9 @@
 #endif
 
 #if defined(__POCKETPC__) || defined(__SMARTPHONE__)
 #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
 #endif
 
 #if wxUSE_STATUSBAR


@@ -211,14 +211,14 @@ bool wxFrame::Create(wxWindow *parent,
     SetLeftMenu(wxID_EXIT, _("Done"));
 #endif
 
     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);
     // 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;
 }
 
     return true;
 }