X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9416aa89ca06d0fb20b1002e026d2c7ac7aa6a17..0815db26866a57eb72dbda72cc060e2649da45f5:/wxPython/src/_defs.i diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index e0489610d9..1acff88052 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -191,6 +191,7 @@ enum { //wxOVERRIDE_KEY_TRANSLATIONS, wxTAB_TRAVERSAL, wxWANTS_CHARS, + wxPOPUP_WINDOW, wxHORIZONTAL, wxVERTICAL, wxBOTH, @@ -212,6 +213,7 @@ enum { wxRESIZE_BORDER, wxDIALOG_MODAL, wxDIALOG_MODELESS, + wxDIALOG_NO_PARENT, wxDEFAULT_FRAME_STYLE, wxDEFAULT_DIALOG_STYLE, @@ -219,7 +221,7 @@ enum { wxFRAME_FLOAT_ON_PARENT, wxFRAME_NO_WINDOW_MENU, wxFRAME_NO_TASKBAR, - wxFRAME_EX_CONTEXTHELP, + wxED_CLIENT_MARGIN, wxED_BUTTONS_BOTTOM, wxED_BUTTONS_RIGHT, @@ -227,14 +229,21 @@ enum { wxEXT_DIALOG_STYLE, wxCLIP_CHILDREN, + wxCLIP_SIBLINGS, wxRETAINED, wxBACKINGSTORE, - wxTB_3DBUTTONS, + wxTB_HORIZONTAL, wxTB_VERTICAL, + wxTB_3DBUTTONS, wxTB_FLAT, wxTB_DOCKABLE, + wxTB_NOICONS, + wxTB_TEXT, + wxTB_NODIVIDER, + wxTB_NOALIGN, + wxCOLOURED, wxFIXED_LENGTH, wxALIGN_LEFT, @@ -260,14 +269,22 @@ enum { wxLB_HSCROLL, wxPROCESS_ENTER, wxPASSWORD, - wxTE_PROCESS_ENTER, - wxTE_PROCESS_TAB, - wxTE_PASSWORD, + wxTE_READONLY, - wxTE_RICH, wxTE_MULTILINE, - wxTE_AUTO_SCROLL, + wxTE_PROCESS_TAB, + wxTE_RICH, + wxTE_RICH2, wxTE_NO_VSCROLL, + wxTE_AUTO_SCROLL, + wxTE_PROCESS_ENTER, + wxTE_PASSWORD, + wxTE_AUTO_URL, + wxTE_NOHIDESEL, + wxTE_DONTWRAP, + wxTE_LINEWRAP, + wxTE_WORDWRAP, + wxCB_SIMPLE, wxCB_DROPDOWN, wxCB_SORT, @@ -295,33 +312,15 @@ enum { wxSB_VERTICAL, wxST_SIZEGRIP, wxST_NO_AUTORESIZE, - wxBU_AUTODRAW, + wxBU_NOAUTODRAW, - wxTR_HAS_BUTTONS, - wxTR_EDIT_LABELS, - wxTR_LINES_AT_ROOT, - wxTR_MULTIPLE, - wxTR_SINGLE, - wxTR_HAS_VARIABLE_ROW_HEIGHT, - wxLC_ICON, - wxLC_SMALL_ICON, - wxLC_LIST, - wxLC_REPORT, - wxLC_ALIGN_TOP, - wxLC_ALIGN_LEFT, - wxLC_AUTOARRANGE, - wxLC_USER_TEXT, - wxLC_EDIT_LABELS, - wxLC_NO_HEADER, - wxLC_NO_SORT_HEADER, - wxLC_SINGLE_SEL, - wxLC_SORT_ASCENDING, - wxLC_SORT_DESCENDING, - wxLC_MASK_TYPE, - wxLC_MASK_ALIGN, - wxLC_MASK_SORT, - wxLC_HRULES, - wxLC_VRULES, + wxBU_AUTODRAW, + wxBU_LEFT, + wxBU_TOP, + wxBU_RIGHT, + wxBU_BOTTOM, + wxBU_EXACTFIT, + wxSP_VERTICAL, wxSP_HORIZONTAL, wxSP_ARROW_KEYS, @@ -380,6 +379,7 @@ enum { wxPRINT_QUALITY_MEDIUM, wxPRINT_QUALITY_LOW, wxPRINT_QUALITY_DRAFT, + wxID_OPEN, wxID_CLOSE, wxID_NEW, @@ -398,11 +398,16 @@ enum { wxID_HELP_COMMANDS, wxID_HELP_PROCEDURES, wxID_HELP_CONTEXT, + wxID_CLOSE_ALL, + wxID_CUT, wxID_COPY, wxID_PASTE, wxID_CLEAR, wxID_FIND, + wxID_DUPLICATE, + wxID_SELECTALL, + wxID_FILE1, wxID_FILE2, wxID_FILE3, @@ -412,18 +417,25 @@ enum { wxID_FILE7, wxID_FILE8, wxID_FILE9, + wxID_OK, wxID_CANCEL, wxID_APPLY, wxID_YES, wxID_NO, wxID_STATIC, - wxID_SEPARATOR, wxID_FORWARD, wxID_BACKWARD, - wxID_SETUP, + wxID_DEFAULT, wxID_MORE, - + wxID_SETUP, + wxID_RESET, + wxID_CONTEXT_HELP, + wxID_YESTOALL, + wxID_NOTOALL, + wxID_ABORT, + wxID_RETRY, + wxID_IGNORE, wxOPEN, wxSAVE, @@ -445,6 +457,9 @@ enum { wxPD_ESTIMATED_TIME, wxPD_REMAINING_TIME, + wxDD_NEW_DIR_BUTTON, + wxDD_DEFAULT_STYLE, + wxMENU_TEAROFF, wxMB_DOCKABLE, wxNO_FULL_REPAINT_ON_RESIZE, @@ -471,13 +486,11 @@ enum { wxNB_LEFT, wxNB_RIGHT, wxNB_BOTTOM, + wxNB_MULTILINE, wxLI_HORIZONTAL, wxLI_VERTICAL, - wxHW_SCROLLBAR_NEVER, - wxHW_SCROLLBAR_AUTO, - wxJOYSTICK1, wxJOYSTICK2, wxJOY_BUTTON1, @@ -487,7 +500,36 @@ enum { wxJOY_BUTTON_ANY, wxWS_EX_VALIDATE_RECURSIVELY, + wxWS_EX_BLOCK_EVENTS, + wxWS_EX_TRANSIENT, + + // Mapping modes (as per Windows) + wxMM_TEXT, + wxMM_LOMETRIC, + wxMM_HIMETRIC, + wxMM_LOENGLISH, + wxMM_HIENGLISH, + wxMM_TWIPS, + wxMM_ISOTROPIC, + wxMM_ANISOTROPIC, + wxMM_POINTS, + wxMM_METRIC, + + wxTIMER_CONTINUOUS, + wxTIMER_ONE_SHOT, +}; + +enum wxBorder +{ + wxBORDER_DEFAULT, + wxBORDER_NONE, + wxBORDER_STATIC, + wxBORDER_SIMPLE, + wxBORDER_RAISED, + wxBORDER_SUNKEN, + wxBORDER_DOUBLE, + wxBORDER_MASK, }; @@ -559,83 +601,113 @@ typedef enum { // wxSRC_AND // source _bitmap_ AND destination } form_ops_t; -enum _Virtual_keycodes { - WXK_BACK = 8, - WXK_TAB = 9, - WXK_RETURN = 13, - WXK_ESCAPE = 27, - WXK_SPACE = 32, - WXK_DELETE = 127, - - WXK_START = 300, - WXK_LBUTTON, - WXK_RBUTTON, - WXK_CANCEL, - WXK_MBUTTON, - WXK_CLEAR, - WXK_SHIFT, - WXK_CONTROL, - WXK_MENU, - WXK_PAUSE, - WXK_CAPITAL, - WXK_PRIOR, // Page up - WXK_NEXT, // Page down - WXK_END, - WXK_HOME, - WXK_LEFT, - WXK_UP, - WXK_RIGHT, - WXK_DOWN, - WXK_SELECT, - WXK_PRINT, - WXK_EXECUTE, - WXK_SNAPSHOT, - WXK_INSERT, - WXK_HELP, - WXK_NUMPAD0, - WXK_NUMPAD1, - WXK_NUMPAD2, - WXK_NUMPAD3, - WXK_NUMPAD4, - WXK_NUMPAD5, - WXK_NUMPAD6, - WXK_NUMPAD7, - WXK_NUMPAD8, - WXK_NUMPAD9, - WXK_MULTIPLY, - WXK_ADD, - WXK_SEPARATOR, - WXK_SUBTRACT, - WXK_DECIMAL, - WXK_DIVIDE, - WXK_F1, - WXK_F2, - WXK_F3, - WXK_F4, - WXK_F5, - WXK_F6, - WXK_F7, - WXK_F8, - WXK_F9, - WXK_F10, - WXK_F11, - WXK_F12, - WXK_F13, - WXK_F14, - WXK_F15, - WXK_F16, - WXK_F17, - WXK_F18, - WXK_F19, - WXK_F20, - WXK_F21, - WXK_F22, - WXK_F23, - WXK_F24, - WXK_NUMLOCK, - WXK_SCROLL, - WXK_PAGEUP, - WXK_PAGEDOWN +enum wxKeyCode { + WXK_BACK = 8, + WXK_TAB = 9, + WXK_RETURN = 13, + WXK_ESCAPE = 27, + WXK_SPACE = 32, + WXK_DELETE = 127, + + WXK_START = 300, + WXK_LBUTTON, + WXK_RBUTTON, + WXK_CANCEL, + WXK_MBUTTON, + WXK_CLEAR, + WXK_SHIFT, + WXK_ALT, + WXK_CONTROL, + WXK_MENU, + WXK_PAUSE, + WXK_CAPITAL, + WXK_PRIOR, /* Page up */ + WXK_NEXT, /* Page down */ + WXK_END, + WXK_HOME, + WXK_LEFT, + WXK_UP, + WXK_RIGHT, + WXK_DOWN, + WXK_SELECT, + WXK_PRINT, + WXK_EXECUTE, + WXK_SNAPSHOT, + WXK_INSERT, + WXK_HELP, + WXK_NUMPAD0, + WXK_NUMPAD1, + WXK_NUMPAD2, + WXK_NUMPAD3, + WXK_NUMPAD4, + WXK_NUMPAD5, + WXK_NUMPAD6, + WXK_NUMPAD7, + WXK_NUMPAD8, + WXK_NUMPAD9, + WXK_MULTIPLY, + WXK_ADD, + WXK_SEPARATOR, + WXK_SUBTRACT, + WXK_DECIMAL, + WXK_DIVIDE, + WXK_F1, + WXK_F2, + WXK_F3, + WXK_F4, + WXK_F5, + WXK_F6, + WXK_F7, + WXK_F8, + WXK_F9, + WXK_F10, + WXK_F11, + WXK_F12, + WXK_F13, + WXK_F14, + WXK_F15, + WXK_F16, + WXK_F17, + WXK_F18, + WXK_F19, + WXK_F20, + WXK_F21, + WXK_F22, + WXK_F23, + WXK_F24, + WXK_NUMLOCK, + WXK_SCROLL, + WXK_PAGEUP, + WXK_PAGEDOWN, + + WXK_NUMPAD_SPACE, + WXK_NUMPAD_TAB, + WXK_NUMPAD_ENTER, + WXK_NUMPAD_F1, + WXK_NUMPAD_F2, + WXK_NUMPAD_F3, + WXK_NUMPAD_F4, + WXK_NUMPAD_HOME, + WXK_NUMPAD_LEFT, + WXK_NUMPAD_UP, + WXK_NUMPAD_RIGHT, + WXK_NUMPAD_DOWN, + WXK_NUMPAD_PRIOR, + WXK_NUMPAD_PAGEUP, + WXK_NUMPAD_NEXT, + WXK_NUMPAD_PAGEDOWN, + WXK_NUMPAD_END, + WXK_NUMPAD_BEGIN, + WXK_NUMPAD_INSERT, + WXK_NUMPAD_DELETE, + WXK_NUMPAD_EQUAL, + WXK_NUMPAD_MULTIPLY, + WXK_NUMPAD_ADD, + WXK_NUMPAD_SEPARATOR, + WXK_NUMPAD_SUBTRACT, + WXK_NUMPAD_DECIMAL, + WXK_NUMPAD_DIVIDE + }; @@ -670,6 +742,8 @@ enum wxBitmapType wxBITMAP_TYPE_PICT_RESOURCE, wxBITMAP_TYPE_ICON, wxBITMAP_TYPE_ICON_RESOURCE, + wxBITMAP_TYPE_ANI, + wxBITMAP_TYPE_IFF, wxBITMAP_TYPE_MACCURSOR, wxBITMAP_TYPE_MACCURSOR_RESOURCE, wxBITMAP_TYPE_ANY = 50 @@ -681,8 +755,9 @@ enum wxBitmapType // Standard cursors enum wxStockCursor { - wxCURSOR_NONE, // should be 0 + wxCURSOR_NONE, wxCURSOR_ARROW, + wxCURSOR_RIGHT_ARROW, wxCURSOR_BULLSEYE, wxCURSOR_CHAR, wxCURSOR_CROSS, @@ -708,12 +783,6 @@ enum wxStockCursor wxCURSOR_WATCH, wxCURSOR_BLANK, wxCURSOR_DEFAULT, -// // Not yet implemented for Windows -// wxCURSOR_CROSS_REVERSE, -// wxCURSOR_DOUBLE_ARROW, -// wxCURSOR_BASED_ARROW_UP, -// wxCURSOR_BASED_ARROW_DOWN, - wxCURSOR_ARROWWAIT, wxCURSOR_MAX }; @@ -800,12 +869,48 @@ typedef enum { +// menu and toolbar item kinds +enum wxItemKind +{ + wxITEM_SEPARATOR = -1, + wxITEM_NORMAL, + wxITEM_CHECK, + wxITEM_RADIO, + wxITEM_MAX +}; + +enum wxHitTest +{ + wxHT_NOWHERE, + + // scrollbar + wxHT_SCROLLBAR_FIRST = wxHT_NOWHERE, + wxHT_SCROLLBAR_ARROW_LINE_1, // left or upper arrow to scroll by line + wxHT_SCROLLBAR_ARROW_LINE_2, // right or down + wxHT_SCROLLBAR_ARROW_PAGE_1, // left or upper arrow to scroll by page + wxHT_SCROLLBAR_ARROW_PAGE_2, // right or down + wxHT_SCROLLBAR_THUMB, // on the thumb + wxHT_SCROLLBAR_BAR_1, // bar to the left/above the thumb + wxHT_SCROLLBAR_BAR_2, // bar to the right/below the thumb + wxHT_SCROLLBAR_LAST, + + // window + wxHT_WINDOW_OUTSIDE, // not in this window at all + wxHT_WINDOW_INSIDE, // in the client area + wxHT_WINDOW_VERT_SCROLLBAR, // on the vertical scrollbar + wxHT_WINDOW_HORZ_SCROLLBAR, // on the horizontal scrollbar + wxHT_WINDOW_CORNER, // on the corner between 2 scrollbars + + wxHT_MAX +}; + + + #define FALSE 0 #define false 0 #define TRUE 1 #define true 1 -const char* wxVERSION_STRING; //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -828,6 +933,8 @@ enum wxEventType { wxEVT_COMMAND_SPINCTRL_UPDATED, wxEVT_COMMAND_TEXT_UPDATED, wxEVT_COMMAND_TEXT_ENTER, + wxEVT_COMMAND_TEXT_URL, + wxEVT_COMMAND_TEXT_MAXLEN, wxEVT_COMMAND_MENU_SELECTED, wxEVT_COMMAND_SLIDER_UPDATED, wxEVT_COMMAND_RADIOBOX_SELECTED, @@ -841,6 +948,7 @@ enum wxEventType { wxEVT_COMMAND_TOOL_ENTER, wxEVT_SET_FOCUS, wxEVT_KILL_FOCUS, + wxEVT_CHILD_FOCUS, wxEVT_MOUSEWHEEL, /* Mouse event types */ @@ -857,6 +965,8 @@ enum wxEventType { wxEVT_MIDDLE_DCLICK, wxEVT_RIGHT_DCLICK, + wxEVT_MOUSE_CAPTURE_CHANGED, + // Non-client mouse events wxEVT_NC_LEFT_DOWN, wxEVT_NC_LEFT_UP, @@ -871,6 +981,8 @@ enum wxEventType { wxEVT_NC_MIDDLE_DCLICK, wxEVT_NC_RIGHT_DCLICK, + wxEVT_SET_CURSOR, + /* Character input event type */ wxEVT_CHAR, wxEVT_KEY_DOWN, @@ -914,17 +1026,16 @@ enum wxEventType { wxEVT_SHOW, wxEVT_ICONIZE, wxEVT_MAXIMIZE, - wxEVT_MOUSE_CAPTURE_CHANGED, wxEVT_PAINT, wxEVT_ERASE_BACKGROUND, wxEVT_NC_PAINT, wxEVT_PAINT_ICON, - wxEVT_MENU_CHAR, - wxEVT_MENU_INIT, + wxEVT_MENU_OPEN, + wxEVT_MENU_CLOSE, wxEVT_MENU_HIGHLIGHT, - wxEVT_POPUP_MENU_INIT, wxEVT_CONTEXT_MENU, wxEVT_SYS_COLOUR_CHANGED, + wxEVT_DISPLAY_CHANGED, wxEVT_SETTING_CHANGED, wxEVT_QUERY_NEW_PALETTE, wxEVT_PALETTE_CHANGED, @@ -937,8 +1048,6 @@ enum wxEventType { wxEVT_MEASURE_ITEM, wxEVT_COMPARE_ITEM, wxEVT_INIT_DIALOG, - wxEVT_HELP, - wxEVT_DETAILED_HELP, wxEVT_IDLE, wxEVT_UPDATE_UI,