X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0a651eb856b521149d67a76aaa1a704df5eacb4d..6c41903ced78c0b4115785aa80a934833abbc1ef:/wxPython/src/_defs.i

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index ddb38a57c3..a5f364d7fb 100644
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -212,6 +212,7 @@ enum {
     wxRESIZE_BORDER,
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,
+    wxDIALOG_NO_PARENT,
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
 
@@ -219,7 +220,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,6 +228,7 @@ enum {
     wxEXT_DIALOG_STYLE,
 
     wxCLIP_CHILDREN,
+    wxCLIP_SIBLINGS,
 
     wxRETAINED,
     wxBACKINGSTORE,
@@ -303,25 +305,6 @@ enum {
     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,
@@ -403,6 +386,8 @@ enum {
     wxID_PASTE,
     wxID_CLEAR,
     wxID_FIND,
+    wxID_DUPLICATE,
+    wxID_SELECTALL,
     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,
@@ -424,7 +409,6 @@ enum {
     wxID_SETUP,
     wxID_MORE,
 
-
     wxOPEN,
     wxSAVE,
     wxHIDE_READONLY,
@@ -471,6 +455,7 @@ enum {
     wxNB_LEFT,
     wxNB_RIGHT,
     wxNB_BOTTOM,
+    wxNB_MULTILINE,
 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
@@ -486,6 +471,8 @@ enum {
     wxJOY_BUTTON4,
     wxJOY_BUTTON_ANY,
 
+    wxWS_EX_VALIDATE_RECURSIVELY,
+
 };
 
 
@@ -839,6 +826,7 @@ enum wxEventType {
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,
+ wxEVT_MOUSEWHEEL,
 
 /* Mouse event types */
  wxEVT_LEFT_DOWN,
@@ -855,7 +843,7 @@ enum wxEventType {
  wxEVT_RIGHT_DCLICK,
 
  // 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,
@@ -920,7 +908,6 @@ enum wxEventType {
  wxEVT_MENU_INIT,
  wxEVT_MENU_HIGHLIGHT,
  wxEVT_POPUP_MENU_INIT,
- wxEVT_CONTEXT_MENU,
  wxEVT_SYS_COLOUR_CHANGED,
  wxEVT_SETTING_CHANGED,
  wxEVT_QUERY_NEW_PALETTE,
@@ -953,8 +940,6 @@ enum wxEventType {
 
  wxEVT_TIMER,
 
- wxWS_EX_VALIDATE_RECURSIVELY,
-
 };