added DEP_INFO_FLAGS to compilation options

[wxWidgets.git] / wxPython / src / _defs.i

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 45ba348cf1c1b9b0383d97b8dda8380b91945bbc..4d4bc1d39605b5b3f8826d5c3ae3ff4f11c019e4 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -212,12 +212,15 @@ enum {
     wxRESIZE_BORDER,
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,
+    wxDIALOG_NO_PARENT,
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
 
     wxFRAME_TOOL_WINDOW,
     wxFRAME_FLOAT_ON_PARENT,
     wxFRAME_NO_WINDOW_MENU,
+    wxFRAME_NO_TASKBAR,
+    wxFRAME_EX_CONTEXTHELP,
     wxED_CLIENT_MARGIN,
     wxED_BUTTONS_BOTTOM,
     wxED_BUTTONS_RIGHT,
@@ -225,6 +228,7 @@ enum {
     wxEXT_DIALOG_STYLE,
 
     wxCLIP_CHILDREN,
+    wxCLIP_SIBLINGS,
 
     wxRETAINED,
     wxBACKINGSTORE,
@@ -246,6 +250,8 @@ enum {
     wxALIGN_CENTER,
     wxALIGN_CENTRE,
     wxSHAPED,
+    wxADJUST_MINSIZE,
+
     wxLB_NEEDED_SB,
     wxLB_ALWAYS_SB,
     wxLB_SORT,
@@ -299,29 +305,15 @@ 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,
     wxSP_VERTICAL,
     wxSP_HORIZONTAL,
     wxSP_ARROW_KEYS,
     wxSP_WRAP,
     wxSP_NOBORDER,
     wxSP_3D,
+    wxSP_3DSASH,
+    wxSP_3DBORDER,
+    wxSP_FULLSASH,
     wxSP_BORDER,
     wxSP_LIVE_UPDATE,
     wxSP_PERMIT_UNSPLIT,
@@ -357,6 +349,7 @@ enum {
     wxMORE,
     wxSETUP,
 
+
     wxCENTRE,
     wxCENTER,
     wxSIZE_AUTO_WIDTH,
@@ -393,6 +386,8 @@ enum {
     wxID_PASTE,
     wxID_CLEAR,
     wxID_FIND,
+    wxID_DUPLICATE,
+    wxID_SELECTALL,
     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,
@@ -409,27 +404,11 @@ enum {
     wxID_NO,
     wxID_STATIC,
     wxID_SEPARATOR,
+    wxID_FORWARD,
+    wxID_BACKWARD,
+    wxID_SETUP,
+    wxID_MORE,
 
-    wxBITMAP_TYPE_BMP,
-    wxBITMAP_TYPE_BMP_RESOURCE,
-    wxBITMAP_TYPE_ICO,
-    wxBITMAP_TYPE_ICO_RESOURCE,
-    wxBITMAP_TYPE_CUR,
-    wxBITMAP_TYPE_CUR_RESOURCE,
-    wxBITMAP_TYPE_XBM,
-    wxBITMAP_TYPE_XBM_DATA,
-    wxBITMAP_TYPE_XPM,
-    wxBITMAP_TYPE_XPM_DATA,
-    wxBITMAP_TYPE_TIF,
-    wxBITMAP_TYPE_TIF_RESOURCE,
-    wxBITMAP_TYPE_GIF,
-    wxBITMAP_TYPE_GIF_RESOURCE,
-    wxBITMAP_TYPE_PNG,
-    wxBITMAP_TYPE_PNG_RESOURCE,
-    wxBITMAP_TYPE_ANY,
-    wxBITMAP_TYPE_RESOURCE,
-    wxBITMAP_TYPE_JPEG,
-    wxBITMAP_TYPE_PCX,
 
     wxOPEN,
     wxSAVE,
@@ -437,6 +416,7 @@ enum {
     wxOVERWRITE_PROMPT,
     wxFILE_MUST_EXIST,
     wxMULTIPLE,
+    wxCHANGE_DIR,
 
     wxACCEL_ALT,
     wxACCEL_CTRL,
@@ -476,6 +456,7 @@ enum {
     wxNB_LEFT,
     wxNB_RIGHT,
     wxNB_BOTTOM,
+    wxNB_MULTILINE,
 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
@@ -491,6 +472,8 @@ enum {
     wxJOY_BUTTON4,
     wxJOY_BUTTON_ANY,
 
+    wxWS_EX_VALIDATE_RECURSIVELY,
+
 };
 
 
@@ -641,41 +624,85 @@ enum _Virtual_keycodes {
  WXK_PAGEDOWN
 };
 
-typedef enum {
- wxCURSOR_NONE = 0,
- wxCURSOR_ARROW =  1,
- wxCURSOR_BULLSEYE,
- wxCURSOR_CHAR,
- wxCURSOR_CROSS,
- wxCURSOR_HAND,
- wxCURSOR_IBEAM,
- wxCURSOR_LEFT_BUTTON,
- wxCURSOR_MAGNIFIER,
- wxCURSOR_MIDDLE_BUTTON,
- wxCURSOR_NO_ENTRY,
- wxCURSOR_PAINT_BRUSH,
- wxCURSOR_PENCIL,
- wxCURSOR_POINT_LEFT,
- wxCURSOR_POINT_RIGHT,
- wxCURSOR_QUESTION_ARROW,
- wxCURSOR_RIGHT_BUTTON,
- wxCURSOR_SIZENESW,
- wxCURSOR_SIZENS,
- wxCURSOR_SIZENWSE,
- wxCURSOR_SIZEWE,
- wxCURSOR_SIZING,
- wxCURSOR_SPRAYCAN,
- wxCURSOR_WAIT,
- wxCURSOR_WATCH,
- wxCURSOR_BLANK
-//  #ifndef __WXMSW__
-//    /* Not yet implemented for Windows */
-//    , wxCURSOR_CROSS_REVERSE,
-//    wxCURSOR_DOUBLE_ARROW,
-//    wxCURSOR_BASED_ARROW_UP,
-//    wxCURSOR_BASED_ARROW_DOWN
-//  #endif
-} _standard_cursors_t;
+
+// Bitmap flags
+enum wxBitmapType
+{
+    wxBITMAP_TYPE_INVALID,          // should be == 0 for compatibility!
+    wxBITMAP_TYPE_BMP,
+    wxBITMAP_TYPE_BMP_RESOURCE,
+    wxBITMAP_TYPE_RESOURCE = wxBITMAP_TYPE_BMP_RESOURCE,
+    wxBITMAP_TYPE_ICO,
+    wxBITMAP_TYPE_ICO_RESOURCE,
+    wxBITMAP_TYPE_CUR,
+    wxBITMAP_TYPE_CUR_RESOURCE,
+    wxBITMAP_TYPE_XBM,
+    wxBITMAP_TYPE_XBM_DATA,
+    wxBITMAP_TYPE_XPM,
+    wxBITMAP_TYPE_XPM_DATA,
+    wxBITMAP_TYPE_TIF,
+    wxBITMAP_TYPE_TIF_RESOURCE,
+    wxBITMAP_TYPE_GIF,
+    wxBITMAP_TYPE_GIF_RESOURCE,
+    wxBITMAP_TYPE_PNG,
+    wxBITMAP_TYPE_PNG_RESOURCE,
+    wxBITMAP_TYPE_JPEG,
+    wxBITMAP_TYPE_JPEG_RESOURCE,
+    wxBITMAP_TYPE_PNM,
+    wxBITMAP_TYPE_PNM_RESOURCE,
+    wxBITMAP_TYPE_PCX,
+    wxBITMAP_TYPE_PCX_RESOURCE,
+    wxBITMAP_TYPE_PICT,
+    wxBITMAP_TYPE_PICT_RESOURCE,
+    wxBITMAP_TYPE_ICON,
+    wxBITMAP_TYPE_ICON_RESOURCE,
+    wxBITMAP_TYPE_MACCURSOR,
+    wxBITMAP_TYPE_MACCURSOR_RESOURCE,
+    wxBITMAP_TYPE_ANY = 50
+};
+
+
+
+
+// Standard cursors
+enum wxStockCursor
+{
+    wxCURSOR_NONE,          // should be 0
+    wxCURSOR_ARROW,
+    wxCURSOR_BULLSEYE,
+    wxCURSOR_CHAR,
+    wxCURSOR_CROSS,
+    wxCURSOR_HAND,
+    wxCURSOR_IBEAM,
+    wxCURSOR_LEFT_BUTTON,
+    wxCURSOR_MAGNIFIER,
+    wxCURSOR_MIDDLE_BUTTON,
+    wxCURSOR_NO_ENTRY,
+    wxCURSOR_PAINT_BRUSH,
+    wxCURSOR_PENCIL,
+    wxCURSOR_POINT_LEFT,
+    wxCURSOR_POINT_RIGHT,
+    wxCURSOR_QUESTION_ARROW,
+    wxCURSOR_RIGHT_BUTTON,
+    wxCURSOR_SIZENESW,
+    wxCURSOR_SIZENS,
+    wxCURSOR_SIZENWSE,
+    wxCURSOR_SIZEWE,
+    wxCURSOR_SIZING,
+    wxCURSOR_SPRAYCAN,
+    wxCURSOR_WAIT,
+    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
+};
 
 
 
@@ -800,6 +827,7 @@ enum wxEventType {
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,
+ wxEVT_MOUSEWHEEL,
 
 /* Mouse event types */
  wxEVT_LEFT_DOWN,
@@ -816,7 +844,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,
@@ -895,6 +923,8 @@ enum wxEventType {
  wxEVT_MEASURE_ITEM,
  wxEVT_COMPARE_ITEM,
  wxEVT_INIT_DIALOG,
+ wxEVT_HELP,
+ wxEVT_DETAILED_HELP,
  wxEVT_IDLE,
  wxEVT_UPDATE_UI,
 
@@ -910,62 +940,10 @@ enum wxEventType {
  wxEVT_COMMAND_KILL_FOCUS,
  wxEVT_COMMAND_ENTER,
 
- /* Tree control event types */
- wxEVT_COMMAND_TREE_BEGIN_DRAG,
- wxEVT_COMMAND_TREE_BEGIN_RDRAG,
- wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT,
- wxEVT_COMMAND_TREE_END_LABEL_EDIT,
- wxEVT_COMMAND_TREE_DELETE_ITEM,
- wxEVT_COMMAND_TREE_GET_INFO,
- wxEVT_COMMAND_TREE_SET_INFO,
- wxEVT_COMMAND_TREE_ITEM_EXPANDED,
- wxEVT_COMMAND_TREE_ITEM_EXPANDING,
- wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
- wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
- wxEVT_COMMAND_TREE_SEL_CHANGED,
- wxEVT_COMMAND_TREE_SEL_CHANGING,
- wxEVT_COMMAND_TREE_KEY_DOWN,
- wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
- wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,
- wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK,
-
- /* List control event types */
- wxEVT_COMMAND_LIST_BEGIN_DRAG,
- wxEVT_COMMAND_LIST_BEGIN_RDRAG,
- wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT,
- wxEVT_COMMAND_LIST_END_LABEL_EDIT,
- wxEVT_COMMAND_LIST_DELETE_ITEM,
- wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS,
- wxEVT_COMMAND_LIST_GET_INFO,
- wxEVT_COMMAND_LIST_SET_INFO,
- wxEVT_COMMAND_LIST_ITEM_SELECTED,
- wxEVT_COMMAND_LIST_ITEM_DESELECTED,
- wxEVT_COMMAND_LIST_KEY_DOWN,
- wxEVT_COMMAND_LIST_INSERT_ITEM,
- wxEVT_COMMAND_LIST_COL_CLICK,
- wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
- wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
- wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK,
-
-
- /* Tab and notebook control event types */
- wxEVT_COMMAND_TAB_SEL_CHANGED,
- wxEVT_COMMAND_TAB_SEL_CHANGING,
- wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
- wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
-
- /* splitter window */
- wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING,
- wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED,
- wxEVT_COMMAND_SPLITTER_UNSPLIT,
- wxEVT_COMMAND_SPLITTER_DOUBLECLICKED,
-
  wxEVT_NAVIGATION_KEY,
 
  wxEVT_TIMER,
 
- wxEVT_END_PROCESS,
-
 };