X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65fe3842bf62e64307050edb554cc0ef08d6bbae..af2309c0fb59458b70a9645b140fbd1d7a4b801c:/wxPython/src/_defs.i

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 4d7168fab4..501704110a 100644
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -191,6 +191,7 @@ enum {
 //wxOVERRIDE_KEY_TRANSLATIONS,
     wxTAB_TRAVERSAL,
     wxWANTS_CHARS,
+    wxPOPUP_WINDOW,
     wxHORIZONTAL,
     wxVERTICAL,
     wxBOTH,
@@ -262,15 +263,22 @@ enum {
     wxLB_HSCROLL,
     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_RICH2,
     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,
     wxCB_SORT,
@@ -312,6 +320,7 @@ enum {
     wxSP_BORDER,
     wxSP_LIVE_UPDATE,
     wxSP_PERMIT_UNSPLIT,
+    //wxSP_SASH_AQUA,
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,
@@ -376,6 +385,7 @@ enum {
     wxID_HELP_COMMANDS,
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,
+    wxID_CLOSE_ALL,
     wxID_CUT,
     wxID_COPY,
     wxID_PASTE,
@@ -455,9 +465,6 @@ enum {
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
-    wxHW_SCROLLBAR_NEVER,
-    wxHW_SCROLLBAR_AUTO,
-
     wxJOYSTICK1,
     wxJOYSTICK2,
     wxJOY_BUTTON1,
@@ -467,7 +474,8 @@ enum {
     wxJOY_BUTTON_ANY,
 
     wxWS_EX_VALIDATE_RECURSIVELY,
-
+    wxWS_EX_BLOCK_EVENTS,
+    wxWS_EX_TRANSIENT,
 
     // Mapping modes (as per Windows)
     wxMM_TEXT,
@@ -484,6 +492,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
 //  {
@@ -693,6 +714,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
@@ -823,6 +846,33 @@ typedef enum {
 
 
 
+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
+};
+
+
+
 #define FALSE 0
 #define false 0
 #define TRUE 1
@@ -866,6 +916,7 @@ enum wxEventType {
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,
+ wxEVT_CHILD_FOCUS,
  wxEVT_MOUSEWHEEL,
 
 /* Mouse event types */
@@ -949,6 +1000,7 @@ enum wxEventType {
  wxEVT_MENU_HIGHLIGHT,
  wxEVT_POPUP_MENU_INIT,
  wxEVT_SYS_COLOUR_CHANGED,
+ wxEVT_DISPLAY_CHANGED,
  wxEVT_SETTING_CHANGED,
  wxEVT_QUERY_NEW_PALETTE,
  wxEVT_PALETTE_CHANGED,