X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/330be5349367f48b25c9f19dbeadd0f30593c830..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/defs.h diff --git a/include/wx/defs.h b/include/wx/defs.h index 49949f1b5f..98646a60dc 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -604,7 +604,9 @@ enum wxWIN32S, /* Windows 32S API */ wxWIN95, /* Windows 95 */ wxWIN386, /* Watcom 32-bit supervisor modus */ - wxWINDOWS_CE, /* Windows CE */ + wxWINDOWS_CE, /* Windows CE (generic) */ + wxWINDOWS_POCKETPC, /* Windows CE PocketPC */ + wxWINDOWS_SMARTPHONE, /* Windows CE Smartphone */ wxMGL_UNIX, /* MGL with direct hardware access */ wxMGL_X, /* MGL on X */ wxMGL_WIN32, /* MGL on Win32 */ @@ -612,7 +614,8 @@ enum wxMGL_DOS, /* MGL on MS-DOS */ wxWINDOWS_OS2, /* Native OS/2 PM */ wxUNIX, /* wxBase under Unix */ - wxX11 /* Plain X11 and Universal widgets */ + wxX11, /* Plain X11 and Universal widgets */ + wxPALMOS /* PalmOS */ }; /* ---------------------------------------------------------------------------- */ @@ -1480,6 +1483,7 @@ enum wxBorder #define wxNB_BOTTOM 0x0080 #define wxNB_MULTILINE 0x0100 #define wxNB_NOPAGETHEME 0x0200 +#define wxNB_FLAT 0x0400 #define wxNB_DEFAULT wxNB_TOP /* @@ -1937,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, @@ -2042,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 @@ -2228,8 +2254,6 @@ enum wxUpdateUI typedef unsigned char WXCOLORREF[6]; typedef void* WXCGIMAGEREF; typedef void* WXHBITMAP; -//typedef void* WXHMETAFILE; -//typedef void* WXHICON; typedef void* WXHCURSOR; typedef void* WXHRGN; typedef void* WXRECTPTR;