X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65fe3842bf62e64307050edb554cc0ef08d6bbae..3b6d8c19fc54a137c3faa99b1e7ab253ed836131:/wxPython/src/_defs.i?ds=sidebyside diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index 4d7168fab4..5e58282c49 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -188,9 +188,10 @@ enum { wxNO_BORDER, wxUSER_COLOURS, wxNO_3D, -//wxOVERRIDE_KEY_TRANSLATIONS, + wxTAB_TRAVERSAL, wxWANTS_CHARS, + wxPOPUP_WINDOW, wxHORIZONTAL, wxVERTICAL, wxBOTH, @@ -202,6 +203,7 @@ enum { wxICONIZE, wxMINIMIZE, wxMAXIMIZE, + wxCLOSE_BOX, wxTHICK_FRAME, wxSYSTEM_MENU, wxMINIMIZE_BOX, @@ -220,6 +222,7 @@ enum { wxFRAME_FLOAT_ON_PARENT, wxFRAME_NO_WINDOW_MENU, wxFRAME_NO_TASKBAR, + wxFRAME_SHAPED, wxED_CLIENT_MARGIN, wxED_BUTTONS_BOTTOM, @@ -232,11 +235,7 @@ enum { wxRETAINED, wxBACKINGSTORE, - wxTB_3DBUTTONS, - wxTB_HORIZONTAL, - wxTB_VERTICAL, - wxTB_FLAT, - wxTB_DOCKABLE, + wxCOLOURED, wxFIXED_LENGTH, wxALIGN_LEFT, @@ -262,15 +261,7 @@ enum { wxLB_HSCROLL, wxPROCESS_ENTER, wxPASSWORD, - wxTE_PROCESS_ENTER, - wxTE_PROCESS_TAB, - wxTE_PASSWORD, - wxTE_READONLY, - wxTE_RICH, - wxTE_MULTILINE, - wxTE_AUTO_SCROLL, - wxTE_NO_VSCROLL, - wxTE_AUTO_URL, + wxCB_SIMPLE, wxCB_DROPDOWN, wxCB_SORT, @@ -280,6 +271,7 @@ enum { wxRA_SPECIFY_ROWS, wxRA_SPECIFY_COLS, wxRB_GROUP, + wxRB_SINGLE, wxGA_PROGRESSBAR, wxGA_HORIZONTAL, wxGA_VERTICAL, @@ -298,20 +290,15 @@ enum { wxSB_VERTICAL, wxST_SIZEGRIP, wxST_NO_AUTORESIZE, - wxBU_AUTODRAW, + wxBU_NOAUTODRAW, - wxSP_VERTICAL, - wxSP_HORIZONTAL, - wxSP_ARROW_KEYS, - wxSP_WRAP, - wxSP_NOBORDER, - wxSP_3D, - wxSP_3DSASH, - wxSP_3DBORDER, - wxSP_FULLSASH, - wxSP_BORDER, - wxSP_LIVE_UPDATE, - wxSP_PERMIT_UNSPLIT, + wxBU_AUTODRAW, + wxBU_LEFT, + wxBU_TOP, + wxBU_RIGHT, + wxBU_BOTTOM, + wxBU_EXACTFIT, + wxFLOOD_SURFACE, wxFLOOD_BORDER, wxODDEVEN_RULE, @@ -358,6 +345,10 @@ enum { wxPRINT_QUALITY_MEDIUM, wxPRINT_QUALITY_LOW, wxPRINT_QUALITY_DRAFT, + + wxID_ANY, + wxID_SEPARATOR, + wxID_OPEN, wxID_CLOSE, wxID_NEW, @@ -376,6 +367,9 @@ enum { wxID_HELP_COMMANDS, wxID_HELP_PROCEDURES, wxID_HELP_CONTEXT, + wxID_CLOSE_ALL, + wxID_PREFERENCES, + wxID_CUT, wxID_COPY, wxID_PASTE, @@ -383,6 +377,21 @@ enum { wxID_FIND, wxID_DUPLICATE, wxID_SELECTALL, + + wxID_DELETE, + wxID_REPLACE, + wxID_REPLACE_ALL, + wxID_PROPERTIES, + + wxID_VIEW_DETAILS, + wxID_VIEW_LARGEICONS, + wxID_VIEW_SMALLICONS, + wxID_VIEW_LIST, + wxID_VIEW_SORTDATE, + wxID_VIEW_SORTNAME, + wxID_VIEW_SORTSIZE, + wxID_VIEW_SORTTYPE, + wxID_FILE1, wxID_FILE2, wxID_FILE3, @@ -392,17 +401,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, @@ -424,9 +441,13 @@ enum { wxPD_ESTIMATED_TIME, wxPD_REMAINING_TIME, + wxDD_NEW_DIR_BUTTON, + wxDD_DEFAULT_STYLE, + wxMENU_TEAROFF, wxMB_DOCKABLE, wxNO_FULL_REPAINT_ON_RESIZE, + wxFULL_REPAINT_ON_RESIZE, wxLEFT, wxRIGHT, @@ -446,18 +467,9 @@ enum { wxGROW, wxEXPAND, - wxNB_FIXEDWIDTH, - wxNB_LEFT, - wxNB_RIGHT, - wxNB_BOTTOM, - wxNB_MULTILINE, - wxLI_HORIZONTAL, wxLI_VERTICAL, - wxHW_SCROLLBAR_NEVER, - wxHW_SCROLLBAR_AUTO, - wxJOYSTICK1, wxJOYSTICK2, wxJOY_BUTTON1, @@ -467,6 +479,12 @@ enum { wxJOY_BUTTON_ANY, wxWS_EX_VALIDATE_RECURSIVELY, + wxWS_EX_BLOCK_EVENTS, + wxWS_EX_TRANSIENT, + + wxWS_EX_THEMED_BACKGROUND, + wxWS_EX_PROCESS_IDLE, + wxWS_EX_PROCESS_UI_UPDATES, // Mapping modes (as per Windows) @@ -481,6 +499,40 @@ enum { wxMM_POINTS, wxMM_METRIC, + wxTIMER_CONTINUOUS, + wxTIMER_ONE_SHOT, + + // the symbolic names for the mouse buttons + wxMOUSE_BTN_ANY, + wxMOUSE_BTN_NONE, + wxMOUSE_BTN_LEFT, + wxMOUSE_BTN_MIDDLE, + wxMOUSE_BTN_RIGHT, + + // It looks like wxTabCtrl may rise from the dead. Uncomment these if + // it gets an implementation for all platforms... +// wxTC_RIGHTJUSTIFY, +// wxTC_FIXEDWIDTH, +// wxTC_TOP, +// wxTC_LEFT, +// wxTC_RIGHT, +// wxTC_BOTTOM, +// wxTC_MULTILINE, +// wxTC_OWNERDRAW, + +}; + + +enum wxBorder +{ + wxBORDER_DEFAULT, + wxBORDER_NONE, + wxBORDER_STATIC, + wxBORDER_SIMPLE, + wxBORDER_RAISED, + wxBORDER_SUNKEN, + wxBORDER_DOUBLE, + wxBORDER_MASK, }; @@ -657,7 +709,11 @@ enum wxKeyCode { WXK_NUMPAD_SEPARATOR, WXK_NUMPAD_SUBTRACT, WXK_NUMPAD_DECIMAL, - WXK_NUMPAD_DIVIDE + WXK_NUMPAD_DIVIDE, + + WXK_WINDOWS_LEFT, + WXK_WINDOWS_RIGHT, + WXK_WINDOWS_MENU }; @@ -693,6 +749,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 @@ -704,8 +762,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, @@ -731,12 +790,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 }; @@ -823,12 +876,74 @@ typedef enum { -#define FALSE 0 -#define false 0 -#define TRUE 1 -#define true 1 +// 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 +}; + + +%{ +#if ! wxUSE_HOTKEY +enum wxHotkeyModifier +{ + wxMOD_NONE = 0, + wxMOD_ALT = 1, + wxMOD_CONTROL = 2, + wxMOD_SHIFT = 4, + wxMOD_WIN = 8 +}; +#define wxEVT_HOTKEY 9999 +#endif +%} + +enum wxHotkeyModifier +{ + wxMOD_NONE = 0, + wxMOD_ALT = 1, + wxMOD_CONTROL = 2, + wxMOD_SHIFT = 4, + wxMOD_WIN = 8 +}; + + +enum wxUpdateUI +{ + wxUPDATE_UI_NONE = 0x0000, + wxUPDATE_UI_RECURSE = 0x0001, + wxUPDATE_UI_FROMIDLE = 0x0002 // Invoked from On(Internal)Idle +}; + -const char* wxVERSION_STRING; //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -866,6 +981,7 @@ enum wxEventType { wxEVT_COMMAND_TOOL_ENTER, wxEVT_SET_FOCUS, wxEVT_KILL_FOCUS, + wxEVT_CHILD_FOCUS, wxEVT_MOUSEWHEEL, /* Mouse event types */ @@ -882,6 +998,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, @@ -896,11 +1014,14 @@ enum wxEventType { wxEVT_NC_MIDDLE_DCLICK, wxEVT_NC_RIGHT_DCLICK, + wxEVT_SET_CURSOR, + /* Character input event type */ wxEVT_CHAR, wxEVT_KEY_DOWN, wxEVT_KEY_UP, wxEVT_CHAR_HOOK, + wxEVT_HOTKEY, /* * Scrollbar event identifiers @@ -913,6 +1034,7 @@ enum wxEventType { wxEVT_SCROLL_PAGEDOWN, wxEVT_SCROLL_THUMBTRACK, wxEVT_SCROLL_THUMBRELEASE, + wxEVT_SCROLL_ENDSCROLL, /* * Scrolled Window @@ -928,6 +1050,8 @@ enum wxEventType { wxEVT_SIZE = wxEVT_FIRST + 200, wxEVT_MOVE, + wxEVT_SIZING, + wxEVT_MOVING, wxEVT_CLOSE_WINDOW, wxEVT_END_SESSION, wxEVT_QUERY_END_SESSION, @@ -939,16 +1063,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,