projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hopefully fixes focus assertion
[wxWidgets.git]
/
wxPython
/
src
/
_defs.i
diff --git
a/wxPython/src/_defs.i
b/wxPython/src/_defs.i
index 4d4bc1d39605b5b3f8826d5c3ae3ff4f11c019e4..4d7168fab45272cb2dfad775fc29eb33c64c99ab 100644
(file)
--- a/
wxPython/src/_defs.i
+++ b/
wxPython/src/_defs.i
@@
-220,7
+220,7
@@
enum {
wxFRAME_FLOAT_ON_PARENT,
wxFRAME_NO_WINDOW_MENU,
wxFRAME_NO_TASKBAR,
wxFRAME_FLOAT_ON_PARENT,
wxFRAME_NO_WINDOW_MENU,
wxFRAME_NO_TASKBAR,
- wxFRAME_EX_CONTEXTHELP,
+
wxED_CLIENT_MARGIN,
wxED_BUTTONS_BOTTOM,
wxED_BUTTONS_RIGHT,
wxED_CLIENT_MARGIN,
wxED_BUTTONS_BOTTOM,
wxED_BUTTONS_RIGHT,
@@
-270,6
+270,7
@@
enum {
wxTE_MULTILINE,
wxTE_AUTO_SCROLL,
wxTE_NO_VSCROLL,
wxTE_MULTILINE,
wxTE_AUTO_SCROLL,
wxTE_NO_VSCROLL,
+ wxTE_AUTO_URL,
wxCB_SIMPLE,
wxCB_DROPDOWN,
wxCB_SORT,
wxCB_SIMPLE,
wxCB_DROPDOWN,
wxCB_SORT,
@@
-299,12
+300,6
@@
enum {
wxST_NO_AUTORESIZE,
wxBU_AUTODRAW,
wxBU_NOAUTODRAW,
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,
wxSP_VERTICAL,
wxSP_HORIZONTAL,
wxSP_ARROW_KEYS,
wxSP_VERTICAL,
wxSP_HORIZONTAL,
wxSP_ARROW_KEYS,
@@
-409,7
+404,6
@@
enum {
wxID_SETUP,
wxID_MORE,
wxID_SETUP,
wxID_MORE,
-
wxOPEN,
wxSAVE,
wxHIDE_READONLY,
wxOPEN,
wxSAVE,
wxHIDE_READONLY,
@@
-474,6
+468,19
@@
enum {
wxWS_EX_VALIDATE_RECURSIVELY,
wxWS_EX_VALIDATE_RECURSIVELY,
+
+ // 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,
+
};
};
@@
-545,83
+552,113
@@
typedef enum {
// wxSRC_AND // source _bitmap_ AND destination
} form_ops_t;
// 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
+
};
};
@@
-814,6
+851,8
@@
enum wxEventType {
wxEVT_COMMAND_SPINCTRL_UPDATED,
wxEVT_COMMAND_TEXT_UPDATED,
wxEVT_COMMAND_TEXT_ENTER,
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,
wxEVT_COMMAND_MENU_SELECTED,
wxEVT_COMMAND_SLIDER_UPDATED,
wxEVT_COMMAND_RADIOBOX_SELECTED,
@@
-909,7
+948,6
@@
enum wxEventType {
wxEVT_MENU_INIT,
wxEVT_MENU_HIGHLIGHT,
wxEVT_POPUP_MENU_INIT,
wxEVT_MENU_INIT,
wxEVT_MENU_HIGHLIGHT,
wxEVT_POPUP_MENU_INIT,
- wxEVT_CONTEXT_MENU,
wxEVT_SYS_COLOUR_CHANGED,
wxEVT_SETTING_CHANGED,
wxEVT_QUERY_NEW_PALETTE,
wxEVT_SYS_COLOUR_CHANGED,
wxEVT_SETTING_CHANGED,
wxEVT_QUERY_NEW_PALETTE,
@@
-923,8
+961,6
@@
enum wxEventType {
wxEVT_MEASURE_ITEM,
wxEVT_COMPARE_ITEM,
wxEVT_INIT_DIALOG,
wxEVT_MEASURE_ITEM,
wxEVT_COMPARE_ITEM,
wxEVT_INIT_DIALOG,
- wxEVT_HELP,
- wxEVT_DETAILED_HELP,
wxEVT_IDLE,
wxEVT_UPDATE_UI,
wxEVT_IDLE,
wxEVT_UPDATE_UI,