Project file update

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index e85d989f9a29404fa8fff2daf709dab8fb5d4d3a..35b274bf3a6c3b5ccc0b13a11912bb6392557769 100644 (file)
--- 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,
@@ -367,6 +373,7 @@ enum {
     wxPRINT_QUALITY_MEDIUM,
     wxPRINT_QUALITY_LOW,
     wxPRINT_QUALITY_DRAFT,
+
     wxID_OPEN,
     wxID_CLOSE,
     wxID_NEW,
@@ -386,6 +393,7 @@ enum {
     wxID_HELP_PROCEDURES,
     wxID_HELP_CONTEXT,
     wxID_CLOSE_ALL,
+
     wxID_CUT,
     wxID_COPY,
     wxID_PASTE,
@@ -393,6 +401,7 @@ enum {
     wxID_FIND,
     wxID_DUPLICATE,
     wxID_SELECTALL,
+
     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,
@@ -402,17 +411,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,
@@ -727,8 +744,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,
@@ -754,12 +772,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
 };
@@ -846,6 +858,16 @@ typedef enum {
 
 
 
+// menu and toolbar item kinds
+enum wxItemKind
+{
+    wxITEM_SEPARATOR = -1,
+    wxITEM_NORMAL,
+    wxITEM_CHECK,
+    wxITEM_RADIO,
+    wxITEM_MAX
+};
+
 enum wxHitTest
 {
     wxHT_NOWHERE,
@@ -878,7 +900,6 @@ enum wxHitTest
 #define TRUE 1
 #define true 1
 
-const char* wxVERSION_STRING;
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
@@ -998,6 +1019,7 @@ enum wxEventType {
  wxEVT_MENU_OPEN,
  wxEVT_MENU_CLOSE,
  wxEVT_MENU_HIGHLIGHT,
+ wxEVT_CONTEXT_MENU,
  wxEVT_SYS_COLOUR_CHANGED,
  wxEVT_DISPLAY_CHANGED,
  wxEVT_SETTING_CHANGED,