Project file update

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index e06f24ee11dca57c60bbe8e1b2a4fcc7ce4259c3..35b274bf3a6c3b5ccc0b13a11912bb6392557769 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -233,11 +233,17 @@ enum {
 
     wxRETAINED,
     wxBACKINGSTORE,
 
     wxRETAINED,
     wxBACKINGSTORE,

-    wxTB_3DBUTTONS,
+

     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,

+    wxTB_3DBUTTONS,

     wxTB_FLAT,
     wxTB_DOCKABLE,
     wxTB_FLAT,
     wxTB_DOCKABLE,

+    wxTB_NOICONS,
+    wxTB_TEXT,
+    wxTB_NODIVIDER,
+    wxTB_NOALIGN,
+

     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,


@@ -855,11 +861,11 @@ typedef enum {
 // menu and toolbar item kinds
 enum wxItemKind
 {
 // menu and toolbar item kinds
 enum wxItemKind
 {

-    wxItem_Separator = -1,
-    wxItem_Normal,
-    wxItem_Check,
-    wxItem_Radio,
-    wxItem_Max
+    wxITEM_SEPARATOR = -1,
+    wxITEM_NORMAL,
+    wxITEM_CHECK,
+    wxITEM_RADIO,
+    wxITEM_MAX

 };
 
 enum wxHitTest
 };
 
 enum wxHitTest


@@ -894,7 +900,6 @@ enum wxHitTest
 #define TRUE 1
 #define true 1
 
 #define TRUE 1
 #define true 1
 

-const char* wxVERSION_STRING;

 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------