Various small fixes and tweaks

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

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index 478dd3e5de4f3dc5b2d7fa41755478aa9a5b78c5..aa786e903ef3d123811a59b005701895227d140a 100644 (file)
--- a/utils/wxPython/src/_defs.i
+++ b/utils/wxPython/src/_defs.i
@@ -157,6 +157,8 @@ typedef unsigned int    uint;
 typedef signed   int    EBool;
 typedef unsigned int    size_t
 typedef int             wxPrintQuality;
+typedef int             wxCoord;
+
 
 //---------------------------------------------------------------------------
 
@@ -230,11 +232,16 @@ enum {
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
-    wxALIGN_CENTER,
-    wxALIGN_CENTRE,
+    wxALIGN_CENTER_HORIZONTAL,
+    wxALIGN_CENTRE_HORIZONTAL,
     wxALIGN_RIGHT,
     wxALIGN_BOTTOM,
+    wxALIGN_CENTER_VERTICAL,
+    wxALIGN_CENTRE_VERTICAL,
     wxALIGN_TOP,
+    wxALIGN_CENTER,
+    wxALIGN_CENTRE,
+    wxSHAPED,
     wxLB_NEEDED_SB,
     wxLB_ALWAYS_SB,
     wxLB_SORT,
@@ -278,6 +285,7 @@ enum {
     wxSB_HORIZONTAL,
     wxSB_VERTICAL,
     wxST_SIZEGRIP,
+    wxST_NO_AUTORESIZE,
     wxBU_AUTODRAW,
     wxBU_NOAUTODRAW,
     wxTR_HAS_BUTTONS,
@@ -351,14 +359,6 @@ enum {
     wxSIZE_AUTO,
     wxSIZE_USE_EXISTING,
     wxSIZE_ALLOW_MINUS_ONE,
-#ifndef __WXGTK__
-    wxDF_TEXT,
-    wxDF_BITMAP,
-    wxDF_METAFILE,
-    wxDF_DIB,
-    wxDF_OEMTEXT,
-    wxDF_FILENAME,
-#endif
     wxPORTRAIT,
     wxLANDSCAPE,
     wxPRINT_QUALITY_HIGH,
@@ -428,6 +428,7 @@ enum {
     wxSAVE,
     wxHIDE_READONLY,
     wxOVERWRITE_PROMPT,
+    wxFILE_MUST_EXIST,
 
     wxACCEL_ALT,
     wxACCEL_CTRL,
@@ -470,7 +471,6 @@ enum {
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
-
     wxHW_SCROLLBAR_NEVER,
     wxHW_SCROLLBAR_AUTO,
 
@@ -905,6 +905,9 @@ enum wxEventType {
  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,