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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 78ea6acf0a..1acff88052 100644
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -233,11 +233,17 @@ enum {
 
     wxRETAINED,
     wxBACKINGSTORE,
-    wxTB_3DBUTTONS,
+
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
+    wxTB_3DBUTTONS,
     wxTB_FLAT,
     wxTB_DOCKABLE,
+    wxTB_NOICONS,
+    wxTB_TEXT,
+    wxTB_NODIVIDER,
+    wxTB_NOALIGN,
+
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
@@ -268,6 +274,7 @@ enum {
     wxTE_MULTILINE,
     wxTE_PROCESS_TAB,
     wxTE_RICH,
+    wxTE_RICH2,
     wxTE_NO_VSCROLL,
     wxTE_AUTO_SCROLL,
     wxTE_PROCESS_ENTER,
@@ -305,8 +312,15 @@ enum {
     wxSB_VERTICAL,
     wxST_SIZEGRIP,
     wxST_NO_AUTORESIZE,
-    wxBU_AUTODRAW,
+
     wxBU_NOAUTODRAW,
+    wxBU_AUTODRAW,
+    wxBU_LEFT,
+    wxBU_TOP,
+    wxBU_RIGHT,
+    wxBU_BOTTOM,
+    wxBU_EXACTFIT,
+
     wxSP_VERTICAL,
     wxSP_HORIZONTAL,
     wxSP_ARROW_KEYS,
@@ -319,7 +333,6 @@ enum {
     wxSP_BORDER,
     wxSP_LIVE_UPDATE,
     wxSP_PERMIT_UNSPLIT,
-    //wxSP_SASH_AQUA,
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,
@@ -366,6 +379,7 @@ enum {
     wxPRINT_QUALITY_MEDIUM,
     wxPRINT_QUALITY_LOW,
     wxPRINT_QUALITY_DRAFT,
+
     wxID_OPEN,
     wxID_CLOSE,
     wxID_NEW,
@@ -384,6 +398,8 @@ enum {
     wxID_HELP_COMMANDS,
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,
+    wxID_CLOSE_ALL,
+
     wxID_CUT,
     wxID_COPY,
     wxID_PASTE,
@@ -391,6 +407,7 @@ enum {
     wxID_FIND,
     wxID_DUPLICATE,
     wxID_SELECTALL,
+
     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,
@@ -400,17 +417,25 @@ enum {
     wxID_FILE7,
     wxID_FILE8,
     wxID_FILE9,
+
     wxID_OK,
     wxID_CANCEL,
     wxID_APPLY,
     wxID_YES,
     wxID_NO,
     wxID_STATIC,
-    wxID_SEPARATOR,
     wxID_FORWARD,
     wxID_BACKWARD,
-    wxID_SETUP,
+    wxID_DEFAULT,
     wxID_MORE,
+    wxID_SETUP,
+    wxID_RESET,
+    wxID_CONTEXT_HELP,
+    wxID_YESTOALL,
+    wxID_NOTOALL,
+    wxID_ABORT,
+    wxID_RETRY,
+    wxID_IGNORE,
 
     wxOPEN,
     wxSAVE,
@@ -432,6 +457,9 @@ enum {
     wxPD_ESTIMATED_TIME,
     wxPD_REMAINING_TIME,
 
+    wxDD_NEW_DIR_BUTTON,
+    wxDD_DEFAULT_STYLE,
+
     wxMENU_TEAROFF,
     wxMB_DOCKABLE,
     wxNO_FULL_REPAINT_ON_RESIZE,
@@ -463,9 +491,6 @@ enum {
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
-    wxHW_SCROLLBAR_NEVER,
-    wxHW_SCROLLBAR_AUTO,
-
     wxJOYSTICK1,
     wxJOYSTICK2,
     wxJOY_BUTTON1,
@@ -490,6 +515,8 @@ enum {
     wxMM_POINTS,
     wxMM_METRIC,
 
+    wxTIMER_CONTINUOUS,
+    wxTIMER_ONE_SHOT,
 };
 
 
@@ -715,6 +742,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
@@ -726,8 +755,9 @@ enum wxBitmapType
 // Standard cursors
 enum wxStockCursor
 {
-    wxCURSOR_NONE,          // should be 0
+    wxCURSOR_NONE,
     wxCURSOR_ARROW,
+    wxCURSOR_RIGHT_ARROW,
     wxCURSOR_BULLSEYE,
     wxCURSOR_CHAR,
     wxCURSOR_CROSS,
@@ -753,12 +783,6 @@ enum wxStockCursor
     wxCURSOR_WATCH,
     wxCURSOR_BLANK,
     wxCURSOR_DEFAULT,
-//      // Not yet implemented for Windows
-//      wxCURSOR_CROSS_REVERSE,
-//      wxCURSOR_DOUBLE_ARROW,
-//      wxCURSOR_BASED_ARROW_UP,
-//      wxCURSOR_BASED_ARROW_DOWN,
-
     wxCURSOR_ARROWWAIT,
     wxCURSOR_MAX
 };
@@ -845,12 +869,48 @@ typedef enum {
 
 
 
+// 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
+};
+
+
+
 #define FALSE 0
 #define false 0
 #define TRUE 1
 #define true 1
 
-const char* wxVERSION_STRING;
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
@@ -905,6 +965,8 @@ enum wxEventType {
  wxEVT_MIDDLE_DCLICK,
  wxEVT_RIGHT_DCLICK,
 
+ wxEVT_MOUSE_CAPTURE_CHANGED,
+
  // Non-client mouse events
  wxEVT_NC_LEFT_DOWN,
  wxEVT_NC_LEFT_UP,
@@ -919,6 +981,8 @@ enum wxEventType {
  wxEVT_NC_MIDDLE_DCLICK,
  wxEVT_NC_RIGHT_DCLICK,
 
+ wxEVT_SET_CURSOR,
+
 /* Character input event type  */
  wxEVT_CHAR,
  wxEVT_KEY_DOWN,
@@ -962,16 +1026,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,