]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/_defs.i
Added IsEditCancelled/SetEditCanceled
[wxWidgets.git] / wxPython / src / _defs.i
index ec7525fc0dcb35ed26a05f5a46c3827a40d3c1d8..5e58282c49d2d8d600cf315040f96b96d8be6ada 100644 (file)
@@ -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,
@@ -212,6 +214,7 @@ enum {
     wxRESIZE_BORDER,
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,
+    wxDIALOG_NO_PARENT,
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
 
@@ -219,7 +222,8 @@ enum {
     wxFRAME_FLOAT_ON_PARENT,
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,
-    wxFRAME_EX_CONTEXTHELP,
+    wxFRAME_SHAPED,
+
     wxED_CLIENT_MARGIN,
     wxED_BUTTONS_BOTTOM,
     wxED_BUTTONS_RIGHT,
@@ -227,14 +231,11 @@ enum {
     wxEXT_DIALOG_STYLE,
 
     wxCLIP_CHILDREN,
+    wxCLIP_SIBLINGS,
 
     wxRETAINED,
     wxBACKINGSTORE,
-    wxTB_3DBUTTONS,
-    wxTB_HORIZONTAL,
-    wxTB_VERTICAL,
-    wxTB_FLAT,
-    wxTB_DOCKABLE,
+
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
@@ -260,14 +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,
+
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
     wxCB_SORT,
@@ -277,6 +271,7 @@ enum {
     wxRA_SPECIFY_ROWS,
     wxRA_SPECIFY_COLS,
     wxRB_GROUP,
+    wxRB_SINGLE,
     wxGA_PROGRESSBAR,
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,
@@ -295,45 +290,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,
-    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,
@@ -366,6 +331,7 @@ enum {
     wxMORE,
     wxSETUP,
 
+
     wxCENTRE,
     wxCENTER,
     wxSIZE_AUTO_WIDTH,
@@ -379,6 +345,10 @@ enum {
     wxPRINT_QUALITY_MEDIUM,
     wxPRINT_QUALITY_LOW,
     wxPRINT_QUALITY_DRAFT,
+
+    wxID_ANY,
+    wxID_SEPARATOR,
+
     wxID_OPEN,
     wxID_CLOSE,
     wxID_NEW,
@@ -397,11 +367,31 @@ enum {
     wxID_HELP_COMMANDS,
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,
+    wxID_CLOSE_ALL,
+    wxID_PREFERENCES,
+
     wxID_CUT,
     wxID_COPY,
     wxID_PASTE,
     wxID_CLEAR,
     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,
@@ -411,34 +401,25 @@ enum {
     wxID_FILE7,
     wxID_FILE8,
     wxID_FILE9,
+
     wxID_OK,
     wxID_CANCEL,
     wxID_APPLY,
     wxID_YES,
     wxID_NO,
     wxID_STATIC,
-    wxID_SEPARATOR,
-
-    wxBITMAP_TYPE_BMP,
-    wxBITMAP_TYPE_BMP_RESOURCE,
-    wxBITMAP_TYPE_ICO,
-    wxBITMAP_TYPE_ICO_RESOURCE,
-    wxBITMAP_TYPE_CUR,
-    wxBITMAP_TYPE_CUR_RESOURCE,
-    wxBITMAP_TYPE_XBM,
-    wxBITMAP_TYPE_XBM_DATA,
-    wxBITMAP_TYPE_XPM,
-    wxBITMAP_TYPE_XPM_DATA,
-    wxBITMAP_TYPE_TIF,
-    wxBITMAP_TYPE_TIF_RESOURCE,
-    wxBITMAP_TYPE_GIF,
-    wxBITMAP_TYPE_GIF_RESOURCE,
-    wxBITMAP_TYPE_PNG,
-    wxBITMAP_TYPE_PNG_RESOURCE,
-    wxBITMAP_TYPE_ANY,
-    wxBITMAP_TYPE_RESOURCE,
-    wxBITMAP_TYPE_JPEG,
-    wxBITMAP_TYPE_PCX,
+    wxID_FORWARD,
+    wxID_BACKWARD,
+    wxID_DEFAULT,
+    wxID_MORE,
+    wxID_SETUP,
+    wxID_RESET,
+    wxID_CONTEXT_HELP,
+    wxID_YESTOALL,
+    wxID_NOTOALL,
+    wxID_ABORT,
+    wxID_RETRY,
+    wxID_IGNORE,
 
     wxOPEN,
     wxSAVE,
@@ -460,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,
@@ -482,17 +467,9 @@ enum {
     wxGROW,
     wxEXPAND,
 
-    wxNB_FIXEDWIDTH,
-    wxNB_LEFT,
-    wxNB_RIGHT,
-    wxNB_BOTTOM,
-
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
-    wxHW_SCROLLBAR_NEVER,
-    wxHW_SCROLLBAR_AUTO,
-
     wxJOYSTICK1,
     wxJOYSTICK2,
     wxJOY_BUTTON1,
@@ -501,6 +478,61 @@ enum {
     wxJOY_BUTTON4,
     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)
+    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,
+
+    // 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,
 };
 
 
@@ -572,120 +604,195 @@ 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,
+
+  WXK_WINDOWS_LEFT,
+  WXK_WINDOWS_RIGHT,
+  WXK_WINDOWS_MENU
+
 };
 
-typedef enum {
- wxCURSOR_NONE = 0,
- wxCURSOR_ARROW =  1,
- wxCURSOR_BULLSEYE,
- wxCURSOR_CHAR,
- wxCURSOR_CROSS,
- wxCURSOR_HAND,
- wxCURSOR_IBEAM,
- wxCURSOR_LEFT_BUTTON,
- wxCURSOR_MAGNIFIER,
- wxCURSOR_MIDDLE_BUTTON,
- wxCURSOR_NO_ENTRY,
- wxCURSOR_PAINT_BRUSH,
- wxCURSOR_PENCIL,
- wxCURSOR_POINT_LEFT,
- wxCURSOR_POINT_RIGHT,
- wxCURSOR_QUESTION_ARROW,
- wxCURSOR_RIGHT_BUTTON,
- wxCURSOR_SIZENESW,
- wxCURSOR_SIZENS,
- wxCURSOR_SIZENWSE,
- wxCURSOR_SIZEWE,
- wxCURSOR_SIZING,
- wxCURSOR_SPRAYCAN,
- wxCURSOR_WAIT,
- wxCURSOR_WATCH,
- wxCURSOR_BLANK
-//  #ifndef __WXMSW__
-//    /* Not yet implemented for Windows */
-//    , wxCURSOR_CROSS_REVERSE,
-//    wxCURSOR_DOUBLE_ARROW,
-//    wxCURSOR_BASED_ARROW_UP,
-//    wxCURSOR_BASED_ARROW_DOWN
-//  #endif
-} _standard_cursors_t;
+
+// Bitmap flags
+enum wxBitmapType
+{
+    wxBITMAP_TYPE_INVALID,          // should be == 0 for compatibility!
+    wxBITMAP_TYPE_BMP,
+    wxBITMAP_TYPE_BMP_RESOURCE,
+    wxBITMAP_TYPE_RESOURCE = wxBITMAP_TYPE_BMP_RESOURCE,
+    wxBITMAP_TYPE_ICO,
+    wxBITMAP_TYPE_ICO_RESOURCE,
+    wxBITMAP_TYPE_CUR,
+    wxBITMAP_TYPE_CUR_RESOURCE,
+    wxBITMAP_TYPE_XBM,
+    wxBITMAP_TYPE_XBM_DATA,
+    wxBITMAP_TYPE_XPM,
+    wxBITMAP_TYPE_XPM_DATA,
+    wxBITMAP_TYPE_TIF,
+    wxBITMAP_TYPE_TIF_RESOURCE,
+    wxBITMAP_TYPE_GIF,
+    wxBITMAP_TYPE_GIF_RESOURCE,
+    wxBITMAP_TYPE_PNG,
+    wxBITMAP_TYPE_PNG_RESOURCE,
+    wxBITMAP_TYPE_JPEG,
+    wxBITMAP_TYPE_JPEG_RESOURCE,
+    wxBITMAP_TYPE_PNM,
+    wxBITMAP_TYPE_PNM_RESOURCE,
+    wxBITMAP_TYPE_PCX,
+    wxBITMAP_TYPE_PCX_RESOURCE,
+    wxBITMAP_TYPE_PICT,
+    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
+};
+
+
+
+
+// Standard cursors
+enum wxStockCursor
+{
+    wxCURSOR_NONE,
+    wxCURSOR_ARROW,
+    wxCURSOR_RIGHT_ARROW,
+    wxCURSOR_BULLSEYE,
+    wxCURSOR_CHAR,
+    wxCURSOR_CROSS,
+    wxCURSOR_HAND,
+    wxCURSOR_IBEAM,
+    wxCURSOR_LEFT_BUTTON,
+    wxCURSOR_MAGNIFIER,
+    wxCURSOR_MIDDLE_BUTTON,
+    wxCURSOR_NO_ENTRY,
+    wxCURSOR_PAINT_BRUSH,
+    wxCURSOR_PENCIL,
+    wxCURSOR_POINT_LEFT,
+    wxCURSOR_POINT_RIGHT,
+    wxCURSOR_QUESTION_ARROW,
+    wxCURSOR_RIGHT_BUTTON,
+    wxCURSOR_SIZENESW,
+    wxCURSOR_SIZENS,
+    wxCURSOR_SIZENWSE,
+    wxCURSOR_SIZEWE,
+    wxCURSOR_SIZING,
+    wxCURSOR_SPRAYCAN,
+    wxCURSOR_WAIT,
+    wxCURSOR_WATCH,
+    wxCURSOR_BLANK,
+    wxCURSOR_DEFAULT,
+    wxCURSOR_ARROWWAIT,
+    wxCURSOR_MAX
+};
 
 
 
@@ -769,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;
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
@@ -797,6 +966,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,
@@ -810,6 +981,8 @@ enum wxEventType {
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,
+ wxEVT_CHILD_FOCUS,
+ wxEVT_MOUSEWHEEL,
 
 /* Mouse event types */
  wxEVT_LEFT_DOWN,
@@ -825,8 +998,10 @@ enum wxEventType {
  wxEVT_MIDDLE_DCLICK,
  wxEVT_RIGHT_DCLICK,
 
+ wxEVT_MOUSE_CAPTURE_CHANGED,
+
  // Non-client mouse events
- wxEVT_NC_LEFT_DOWN = wxEVT_FIRST + 100,
+ wxEVT_NC_LEFT_DOWN,
  wxEVT_NC_LEFT_UP,
  wxEVT_NC_MIDDLE_DOWN,
  wxEVT_NC_MIDDLE_UP,
@@ -839,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
@@ -856,6 +1034,7 @@ enum wxEventType {
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,
  wxEVT_SCROLL_THUMBRELEASE,
+ wxEVT_SCROLL_ENDSCROLL,
 
  /*
   * Scrolled Window
@@ -871,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,
@@ -882,17 +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,
@@ -924,8 +1104,6 @@ enum wxEventType {
 
  wxEVT_TIMER,
 
- wxWS_EX_VALIDATE_RECURSIVELY,
-
 };