Added WXK_SPECIAL... keycodes for special hardware buttons
Made (Un)RegisterHotKey WinCE-aware. Added wxEVT_HIBERNATE event. Now fakes wxEVT_ACTIVATE_APP to be symmetrical with wxEVT_HIBERNATE. Added wxTE_CAPITALIZE for CAPEDIT controls. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1941,7 +1941,7 @@ enum wxKeyCode
|
||||
WXK_SPACE = 32,
|
||||
WXK_DELETE = 127,
|
||||
|
||||
/* These are, by design, not compatable with unicode characters.
|
||||
/* These are, by design, not compatible with unicode characters.
|
||||
If you want to get a unicode character from a key event, use
|
||||
wxKeyEvent::GetUnicodeKey instead. */
|
||||
WXK_START = 300,
|
||||
@@ -2046,7 +2046,29 @@ enum wxKeyCode
|
||||
WXK_WINDOWS_LEFT,
|
||||
WXK_WINDOWS_RIGHT,
|
||||
WXK_WINDOWS_MENU ,
|
||||
WXK_COMMAND
|
||||
WXK_COMMAND,
|
||||
|
||||
// Hardware-specific buttons
|
||||
WXK_SPECIAL1 = 193,
|
||||
WXK_SPECIAL2,
|
||||
WXK_SPECIAL3,
|
||||
WXK_SPECIAL4,
|
||||
WXK_SPECIAL5,
|
||||
WXK_SPECIAL6,
|
||||
WXK_SPECIAL7,
|
||||
WXK_SPECIAL8,
|
||||
WXK_SPECIAL9,
|
||||
WXK_SPECIAL10,
|
||||
WXK_SPECIAL11,
|
||||
WXK_SPECIAL12,
|
||||
WXK_SPECIAL13,
|
||||
WXK_SPECIAL14,
|
||||
WXK_SPECIAL15,
|
||||
WXK_SPECIAL16,
|
||||
WXK_SPECIAL17,
|
||||
WXK_SPECIAL18,
|
||||
WXK_SPECIAL19,
|
||||
WXK_SPECIAL20
|
||||
};
|
||||
|
||||
#if wxUSE_HOTKEY
|
||||
|
@@ -273,6 +273,7 @@ BEGIN_DECLARE_EVENT_TYPES()
|
||||
DECLARE_EVENT_TYPE(wxEVT_UPDATE_UI, 440)
|
||||
DECLARE_EVENT_TYPE(wxEVT_SIZING, 441)
|
||||
DECLARE_EVENT_TYPE(wxEVT_MOVING, 442)
|
||||
DECLARE_EVENT_TYPE(wxEVT_HIBERNATE, 443)
|
||||
|
||||
// Generic command events
|
||||
// Note: a click is a higher-level event than button down/up
|
||||
@@ -1288,6 +1289,7 @@ private:
|
||||
/*
|
||||
wxEVT_ACTIVATE
|
||||
wxEVT_ACTIVATE_APP
|
||||
wxEVT_HIBERNATE
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_CORE wxActivateEvent : public wxEvent
|
||||
@@ -2686,6 +2688,7 @@ typedef void (wxEvtHandler::*wxMouseCaptureChangedEventFunction)(wxMouseCaptureC
|
||||
#define EVT_CHILD_FOCUS(func) wx__DECLARE_EVT0(wxEVT_CHILD_FOCUS, wxChildFocusEventHandler(func))
|
||||
#define EVT_ACTIVATE(func) wx__DECLARE_EVT0(wxEVT_ACTIVATE, wxActivateEventHandler(func))
|
||||
#define EVT_ACTIVATE_APP(func) wx__DECLARE_EVT0(wxEVT_ACTIVATE_APP, wxActivateEventHandler(func))
|
||||
#define EVT_HIBERNATE(func) wx__DECLARE_EVT0(wxEVT_HIBERNATE, wxActivateEventHandler(func))
|
||||
#define EVT_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_END_SESSION, wxCloseEventHandler(func))
|
||||
#define EVT_QUERY_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_QUERY_END_SESSION, wxCloseEventHandler(func))
|
||||
#define EVT_DROP_FILES(func) wx__DECLARE_EVT0(wxEVT_DROP_FILES, wxDropFilesEventHandler(func))
|
||||
|
@@ -153,6 +153,9 @@ private:
|
||||
#if wxUSE_TOOLTIPS
|
||||
WXHWND m_hwndToolTip;
|
||||
#endif // tooltips
|
||||
#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
|
||||
void* m_activateInfo;
|
||||
#endif
|
||||
|
||||
// used by IconizeChildFrames(), see comments there
|
||||
bool m_wasMinimized;
|
||||
|
@@ -123,6 +123,13 @@ const wxTextCoord wxInvalidTextCoord = -2;
|
||||
// wxTE_RICH controls - can be used together with or instead of wxTE_RICH
|
||||
#define wxTE_RICH2 0x8000
|
||||
|
||||
// reuse wxTE_RICH2's value for CAPEDIT control on Windows CE
|
||||
#if defined(__SMARTPHONE__) || defined(__POCKETPC__)
|
||||
#define wxTE_CAPITALIZE wxTE_RICH2
|
||||
#else
|
||||
#define wxTE_CAPITALIZE 0
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// wxTextCtrl::HitTest return values
|
||||
// ----------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user