highlight the focused item in non report mode too

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index ec7525fc0dcb35ed26a05f5a46c3827a40d3c1d8..4d4bc1d39605b5b3f8826d5c3ae3ff4f11c019e4 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -212,6 +212,7 @@ enum {
     wxRESIZE_BORDER,
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,
     wxRESIZE_BORDER,
     wxDIALOG_MODAL,
     wxDIALOG_MODELESS,

+    wxDIALOG_NO_PARENT,

     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
 
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
 


@@ -227,6 +228,7 @@ enum {
     wxEXT_DIALOG_STYLE,
 
     wxCLIP_CHILDREN,
     wxEXT_DIALOG_STYLE,
 
     wxCLIP_CHILDREN,

+    wxCLIP_SIBLINGS,

 
     wxRETAINED,
     wxBACKINGSTORE,
 
     wxRETAINED,
     wxBACKINGSTORE,


@@ -303,25 +305,6 @@ enum {
     wxTR_MULTIPLE,
     wxTR_SINGLE,
     wxTR_HAS_VARIABLE_ROW_HEIGHT,
     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,
     wxSP_VERTICAL,
     wxSP_HORIZONTAL,
     wxSP_ARROW_KEYS,


@@ -366,6 +349,7 @@ enum {
     wxMORE,
     wxSETUP,
 
     wxMORE,
     wxSETUP,
 

+

     wxCENTRE,
     wxCENTER,
     wxSIZE_AUTO_WIDTH,
     wxCENTRE,
     wxCENTER,
     wxSIZE_AUTO_WIDTH,


@@ -402,6 +386,8 @@ enum {
     wxID_PASTE,
     wxID_CLEAR,
     wxID_FIND,
     wxID_PASTE,
     wxID_CLEAR,
     wxID_FIND,

+    wxID_DUPLICATE,
+    wxID_SELECTALL,

     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,
     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,


@@ -418,27 +404,11 @@ enum {
     wxID_NO,
     wxID_STATIC,
     wxID_SEPARATOR,
     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,
 
     wxOPEN,
     wxSAVE,


@@ -486,6 +456,7 @@ enum {
     wxNB_LEFT,
     wxNB_RIGHT,
     wxNB_BOTTOM,
     wxNB_LEFT,
     wxNB_RIGHT,
     wxNB_BOTTOM,

+    wxNB_MULTILINE,

 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,


@@ -501,6 +472,8 @@ enum {
     wxJOY_BUTTON4,
     wxJOY_BUTTON_ANY,
 
     wxJOY_BUTTON4,
     wxJOY_BUTTON_ANY,
 

+    wxWS_EX_VALIDATE_RECURSIVELY,
+

 };
 
 
 };
 
 


@@ -651,41 +624,85 @@ enum _Virtual_keycodes {
  WXK_PAGEDOWN
 };
 
  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
+};

 
 
 
 
 
 


@@ -810,6 +827,7 @@ enum wxEventType {
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,
  wxEVT_COMMAND_TOOL_ENTER,
  wxEVT_SET_FOCUS,
  wxEVT_KILL_FOCUS,

+ wxEVT_MOUSEWHEEL,

 
 /* Mouse event types */
  wxEVT_LEFT_DOWN,
 
 /* Mouse event types */
  wxEVT_LEFT_DOWN,


@@ -826,7 +844,7 @@ enum wxEventType {
  wxEVT_RIGHT_DCLICK,
 
  // Non-client mouse events
  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,
  wxEVT_NC_LEFT_UP,
  wxEVT_NC_MIDDLE_DOWN,
  wxEVT_NC_MIDDLE_UP,


@@ -905,6 +923,8 @@ enum wxEventType {
  wxEVT_MEASURE_ITEM,
  wxEVT_COMPARE_ITEM,
  wxEVT_INIT_DIALOG,
  wxEVT_MEASURE_ITEM,
  wxEVT_COMPARE_ITEM,
  wxEVT_INIT_DIALOG,

+ wxEVT_HELP,
+ wxEVT_DETAILED_HELP,

  wxEVT_IDLE,
  wxEVT_UPDATE_UI,
 
  wxEVT_IDLE,
  wxEVT_UPDATE_UI,
 


@@ -924,8 +944,6 @@ enum wxEventType {
 
  wxEVT_TIMER,
 
 
  wxEVT_TIMER,
 

- wxWS_EX_VALIDATE_RECURSIVELY,
-

 };
 
 
 };