X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78e8819c2e3e35d6a7383af683e8d14b295462a2..e4a7bbfc1ebf7434b7c291e6fb4a060dcd9b0aee:/wxPython/src/_defs.i diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i index cd743b007d..647352d18b 100644 --- a/wxPython/src/_defs.i +++ b/wxPython/src/_defs.i @@ -188,7 +188,7 @@ enum { wxNO_BORDER, wxUSER_COLOURS, wxNO_3D, -//wxOVERRIDE_KEY_TRANSLATIONS, + wxTAB_TRAVERSAL, wxWANTS_CHARS, wxPOPUP_WINDOW, @@ -203,6 +203,7 @@ enum { wxICONIZE, wxMINIMIZE, wxMAXIMIZE, + wxCLOSE_BOX, wxTHICK_FRAME, wxSYSTEM_MENU, wxMINIMIZE_BOX, @@ -221,6 +222,7 @@ enum { wxFRAME_FLOAT_ON_PARENT, wxFRAME_NO_WINDOW_MENU, wxFRAME_NO_TASKBAR, + wxFRAME_SHAPED, wxED_CLIENT_MARGIN, wxED_BUTTONS_BOTTOM, @@ -233,11 +235,17 @@ enum { 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, @@ -268,6 +276,7 @@ enum { wxTE_MULTILINE, wxTE_PROCESS_TAB, wxTE_RICH, + wxTE_RICH2, wxTE_NO_VSCROLL, wxTE_AUTO_SCROLL, wxTE_PROCESS_ENTER, @@ -277,6 +286,10 @@ enum { wxTE_DONTWRAP, wxTE_LINEWRAP, wxTE_WORDWRAP, + wxTE_LEFT, + wxTE_RIGHT, + wxTE_CENTER, + wxTE_CENTRE, wxCB_SIMPLE, wxCB_DROPDOWN, @@ -287,6 +300,7 @@ enum { wxRA_SPECIFY_ROWS, wxRA_SPECIFY_COLS, wxRB_GROUP, + wxRB_SINGLE, wxGA_PROGRESSBAR, wxGA_HORIZONTAL, wxGA_VERTICAL, @@ -305,8 +319,15 @@ enum { wxSB_VERTICAL, wxST_SIZEGRIP, wxST_NO_AUTORESIZE, - wxBU_AUTODRAW, + wxBU_NOAUTODRAW, + wxBU_AUTODRAW, + wxBU_LEFT, + wxBU_TOP, + wxBU_RIGHT, + wxBU_BOTTOM, + wxBU_EXACTFIT, + wxSP_VERTICAL, wxSP_HORIZONTAL, wxSP_ARROW_KEYS, @@ -365,6 +386,10 @@ enum { wxPRINT_QUALITY_MEDIUM, wxPRINT_QUALITY_LOW, wxPRINT_QUALITY_DRAFT, + + wxID_ANY, + wxID_SEPARATOR, + wxID_OPEN, wxID_CLOSE, wxID_NEW, @@ -383,6 +408,8 @@ enum { wxID_HELP_COMMANDS, wxID_HELP_PROCEDURES, wxID_HELP_CONTEXT, + wxID_CLOSE_ALL, + wxID_CUT, wxID_COPY, wxID_PASTE, @@ -390,6 +417,7 @@ enum { wxID_FIND, wxID_DUPLICATE, wxID_SELECTALL, + wxID_FILE1, wxID_FILE2, wxID_FILE3, @@ -399,17 +427,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, @@ -431,6 +467,9 @@ enum { wxPD_ESTIMATED_TIME, wxPD_REMAINING_TIME, + wxDD_NEW_DIR_BUTTON, + wxDD_DEFAULT_STYLE, + wxMENU_TEAROFF, wxMB_DOCKABLE, wxNO_FULL_REPAINT_ON_RESIZE, @@ -454,6 +493,7 @@ enum { wxEXPAND, wxNB_FIXEDWIDTH, + wxNB_TOP, wxNB_LEFT, wxNB_RIGHT, wxNB_BOTTOM, @@ -462,9 +502,6 @@ enum { wxLI_HORIZONTAL, wxLI_VERTICAL, - wxHW_SCROLLBAR_NEVER, - wxHW_SCROLLBAR_AUTO, - wxJOYSTICK1, wxJOYSTICK2, wxJOY_BUTTON1, @@ -489,6 +526,27 @@ 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, + }; @@ -678,7 +736,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 }; @@ -714,6 +776,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 @@ -725,8 +789,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, @@ -752,12 +817,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 }; @@ -844,12 +903,42 @@ 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 +}; + -const char* wxVERSION_STRING; //--------------------------------------------------------------------------- //--------------------------------------------------------------------------- @@ -904,6 +993,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, @@ -918,6 +1009,8 @@ enum wxEventType { wxEVT_NC_MIDDLE_DCLICK, wxEVT_NC_RIGHT_DCLICK, + wxEVT_SET_CURSOR, + /* Character input event type */ wxEVT_CHAR, wxEVT_KEY_DOWN, @@ -935,6 +1028,7 @@ enum wxEventType { wxEVT_SCROLL_PAGEDOWN, wxEVT_SCROLL_THUMBTRACK, wxEVT_SCROLL_THUMBRELEASE, + wxEVT_SCROLL_ENDSCROLL, /* * Scrolled Window @@ -961,16 +1055,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,