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
This commit is contained in:
@@ -47,9 +47,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
|
#if defined(__POCKETPC__) || defined(__SMARTPHONE__)
|
||||||
#include "wx/msw/ole/oleutils.h"
|
#include <ole2.h>
|
||||||
#include <aygshell.h>
|
#include <aygshell.h>
|
||||||
#include "wx/msw/winundef.h"
|
#include "wx/msw/winundef.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if wxUSE_STATUSBAR
|
#if wxUSE_STATUSBAR
|
||||||
@@ -211,14 +211,14 @@ bool wxFrame::Create(wxWindow *parent,
|
|||||||
SetLeftMenu(wxID_EXIT, _("Done"));
|
SetLeftMenu(wxID_EXIT, _("Done"));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__POCKETPC__)
|
#if wxUSE_ACCEL && defined(__POCKETPC__)
|
||||||
// The guidelines state that Ctrl+Q should quit the app.
|
// The guidelines state that Ctrl+Q should quit the app.
|
||||||
// Let's define an accelerator table to send wxID_EXIT.
|
// Let's define an accelerator table to send wxID_EXIT.
|
||||||
wxAcceleratorEntry entries[1];
|
wxAcceleratorEntry entries[1];
|
||||||
entries[0].Set(wxACCEL_CTRL, 'Q', wxID_EXIT);
|
entries[0].Set(wxACCEL_CTRL, 'Q', wxID_EXIT);
|
||||||
wxAcceleratorTable accel(1, entries);
|
wxAcceleratorTable accel(1, entries);
|
||||||
SetAcceleratorTable(accel);
|
SetAcceleratorTable(accel);
|
||||||
#endif
|
#endif // wxUSE_ACCEL && __POCKETPC__
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user