X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b1e930a50d78b49c203f1c5e1e3172350b79586d..8a053704205a37164e1d5290b7ddb645d1f2999e:/wxPython/src/_defs.i

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 1d29d12ced..329a05f0d2 100644
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -184,7 +184,6 @@ enum {
     wxBORDER,
     wxSIMPLE_BORDER,
     wxSTATIC_BORDER,
-    wxBORDER_MASK,
     wxTRANSPARENT_WINDOW,
     wxNO_BORDER,
     wxUSER_COLOURS,
@@ -265,16 +264,19 @@ enum {
     wxPROCESS_ENTER,
     wxPASSWORD,
 
-    wxTE_PROCESS_ENTER,
-    wxTE_PROCESS_TAB,
-    wxTE_PASSWORD,
     wxTE_READONLY,
-    wxTE_RICH,
     wxTE_MULTILINE,
-    wxTE_AUTO_SCROLL,
+    wxTE_PROCESS_TAB,
+    wxTE_RICH,
     wxTE_NO_VSCROLL,
+    wxTE_AUTO_SCROLL,
+    wxTE_PROCESS_ENTER,
+    wxTE_PASSWORD,
     wxTE_AUTO_URL,
     wxTE_NOHIDESEL,
+    wxTE_DONTWRAP,
+    wxTE_LINEWRAP,
+    wxTE_WORDWRAP,
 
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
@@ -317,6 +319,7 @@ enum {
     wxSP_BORDER,
     wxSP_LIVE_UPDATE,
     wxSP_PERMIT_UNSPLIT,
+    //wxSP_SASH_AQUA,
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,
@@ -381,6 +384,7 @@ enum {
     wxID_HELP_COMMANDS,
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,
+    wxID_CLOSE_ALL,
     wxID_CUT,
     wxID_COPY,
     wxID_PASTE,
@@ -473,6 +477,7 @@ enum {
 
     wxWS_EX_VALIDATE_RECURSIVELY,
     wxWS_EX_BLOCK_EVENTS,
+    wxWS_EX_TRANSIENT,
 
     // Mapping modes (as per Windows)
     wxMM_TEXT,
@@ -489,6 +494,19 @@ enum {
 };
 
 
+enum wxBorder
+{
+    wxBORDER_DEFAULT,
+    wxBORDER_NONE,
+    wxBORDER_STATIC,
+    wxBORDER_SIMPLE,
+    wxBORDER_RAISED,
+    wxBORDER_SUNKEN,
+    wxBORDER_DOUBLE,
+    wxBORDER_MASK,
+};
+
+
 //  // Standard error codes
 //  enum  ErrCode
 //  {
@@ -871,6 +889,7 @@ enum wxEventType {
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,
+ wxEVT_CHILD_FOCUS,
  wxEVT_MOUSEWHEEL,
 
 /* Mouse event types */