Compilation fixes

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

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index 8473d0cc79dce01f33dcdcda3169aa584c8f43ce..ce3a96a54a826431d77b2690887991ec8087ffa8 100644 (file)
--- a/utils/wxPython/src/_defs.i
+++ b/utils/wxPython/src/_defs.i
@@ -23,6 +23,7 @@ class wxBitmap;
 class wxBrush;
 class wxButton;
 class wxCalculateLayoutEvent;
+class wxCaret;
 class wxCheckBox;
 class wxCheckListBox;
 class wxChoice;
@@ -109,6 +110,7 @@ class wxSashWindow;
 class wxScreenDC;
 class wxScrollBar;
 class wxScrollEvent;
+class wxScrollWinEvent;
 class wxScrolledWindow;
 class wxShowEvent;
 class wxSingleChoiceDialog;
@@ -137,6 +139,9 @@ class wxTreeItemId;
 class wxUpdateUIEvent;
 class wxWindowDC;
 class wxWindow;
+class wxSizer;
+class wxBoxSizer;
+class wxStaticBoxSizer;
 
 class wxPyApp;
 class wxPyMenu;
@@ -153,6 +158,8 @@ typedef unsigned int    uint;
 typedef signed   int    EBool;
 typedef unsigned int    size_t
 typedef int             wxPrintQuality;
+typedef int             wxCoord;
+
 
 //---------------------------------------------------------------------------
 
@@ -181,10 +188,14 @@ enum {
     wxNO_3D,
 //wxOVERRIDE_KEY_TRANSLATIONS,
     wxTAB_TRAVERSAL,
+    wxWANTS_CHARS,
     wxHORIZONTAL,
     wxVERTICAL,
     wxBOTH,
     wxCENTER_FRAME,
+    wxCENTRE_ON_SCREEN,
+    wxCENTER_ON_SCREEN,
+
     wxSTAY_ON_TOP,
     wxICONIZE,
     wxMINIMIZE,
@@ -204,6 +215,11 @@ enum {
 
     wxFRAME_TOOL_WINDOW,
     wxFRAME_FLOAT_ON_PARENT,
+    wxED_CLIENT_MARGIN,
+    wxED_BUTTONS_BOTTOM,
+    wxED_BUTTONS_RIGHT,
+    wxED_STATIC_LINE,
+    wxEXT_DIALOG_STYLE,
 
     wxCLIP_CHILDREN,
 
@@ -213,12 +229,20 @@ enum {
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
     wxTB_FLAT,
+    wxTB_DOCKABLE,
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
+    wxALIGN_CENTER_HORIZONTAL,
+    wxALIGN_CENTRE_HORIZONTAL,
+    wxALIGN_RIGHT,
+    wxALIGN_BOTTOM,
+    wxALIGN_CENTER_VERTICAL,
+    wxALIGN_CENTRE_VERTICAL,
+    wxALIGN_TOP,
     wxALIGN_CENTER,
     wxALIGN_CENTRE,
-    wxALIGN_RIGHT,
+    wxSHAPED,
     wxLB_NEEDED_SB,
     wxLB_ALWAYS_SB,
     wxLB_SORT,
@@ -234,6 +258,8 @@ enum {
     wxTE_READONLY,
     wxTE_RICH,
     wxTE_MULTILINE,
+    wxTE_AUTO_SCROLL,
+    wxTE_NO_VSCROLL,
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
     wxCB_SORT,
@@ -260,12 +286,14 @@ enum {
     wxSB_HORIZONTAL,
     wxSB_VERTICAL,
     wxST_SIZEGRIP,
+    wxST_NO_AUTORESIZE,
     wxBU_AUTODRAW,
     wxBU_NOAUTODRAW,
     wxTR_HAS_BUTTONS,
     wxTR_EDIT_LABELS,
     wxTR_LINES_AT_ROOT,
     wxTR_MULTIPLE,
+    wxTR_SINGLE,
     wxTR_HAS_VARIABLE_ROW_HEIGHT,
     wxLC_ICON,
     wxLC_SMALL_ICON,
@@ -291,6 +319,8 @@ enum {
     wxSP_NOBORDER,
     wxSP_3D,
     wxSP_BORDER,
+    wxSP_LIVE_UPDATE,
+    wxSP_PERMIT_UNSPLIT,
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,
@@ -304,6 +334,8 @@ enum {
     wxCANCEL,
     wxYES,
     wxNO,
+    wxNO_DEFAULT,
+    wxYES_DEFAULT,
     wxICON_EXCLAMATION,
     wxICON_HAND,
     wxICON_QUESTION,
@@ -311,6 +343,16 @@ enum {
     wxICON_STOP,
     wxICON_ASTERISK,
     wxICON_MASK,
+    wxICON_WARNING,
+    wxICON_ERROR,
+
+    wxFORWARD,
+    wxBACKWARD,
+    wxRESET,
+    wxHELP,
+    wxMORE,
+    wxSETUP,
+
     wxCENTRE,
     wxCENTER,
     wxSIZE_AUTO_WIDTH,
@@ -318,14 +360,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,
@@ -370,6 +404,7 @@ enum {
     wxID_YES,
     wxID_NO,
     wxID_STATIC,
+
     wxBITMAP_TYPE_BMP,
     wxBITMAP_TYPE_BMP_RESOURCE,
     wxBITMAP_TYPE_ICO,
@@ -389,11 +424,13 @@ enum {
     wxBITMAP_TYPE_ANY,
     wxBITMAP_TYPE_RESOURCE,
     wxBITMAP_TYPE_JPEG,
+    wxBITMAP_TYPE_PCX,
 
     wxOPEN,
     wxSAVE,
     wxHIDE_READONLY,
     wxOVERWRITE_PROMPT,
+    wxFILE_MUST_EXIST,
 
     wxACCEL_ALT,
     wxACCEL_CTRL,
@@ -406,10 +443,39 @@ enum {
     wxPD_ESTIMATED_TIME,
     wxPD_REMAINING_TIME,
 
-    wxNO_DEFAULT,
     wxMENU_TEAROFF,
+    wxMB_DOCKABLE,
     wxNO_FULL_REPAINT_ON_RESIZE,
 
+    wxLEFT,
+    wxRIGHT,
+    wxUP,
+    wxDOWN,
+    wxALL,
+    wxTOP,
+    wxBOTTOM,
+
+    wxNORTH,
+    wxSOUTH,
+    wxEAST,
+    wxWEST,
+
+    wxSTRETCH_NOT,
+    wxSHRINK,
+    wxGROW,
+    wxEXPAND,
+
+    wxNB_FIXEDWIDTH,
+    wxNB_LEFT,
+    wxNB_RIGHT,
+    wxNB_BOTTOM,
+
+    wxLI_HORIZONTAL,
+    wxLI_VERTICAL,
+
+    wxHW_SCROLLBAR_NEVER,
+    wxHW_SCROLLBAR_AUTO,
+
 };
 
 
@@ -477,8 +543,8 @@ typedef enum {
   wxNAND,       // (NOT src) OR (NOT dst)
   wxOR,         // src OR dst
   wxSET,        // 1
-  wxSRC_OR,     // source _bitmap_ OR destination
-  wxSRC_AND     // source _bitmap_ AND destination
+//  wxSRC_OR,     // source _bitmap_ OR destination
+//  wxSRC_AND     // source _bitmap_ AND destination
 } form_ops_t;
 
 enum _Virtual_keycodes {
@@ -703,6 +769,7 @@ enum wxEventType {
  wxEVT_COMMAND_LISTBOX_SELECTED,
  wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,
  wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,
+ wxEVT_COMMAND_SPINCTRL_UPDATED,
  wxEVT_COMMAND_TEXT_UPDATED,
  wxEVT_COMMAND_TEXT_ENTER,
  wxEVT_COMMAND_MENU_SELECTED,
@@ -763,6 +830,7 @@ enum wxEventType {
  wxEVT_SCROLL_PAGEUP,
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,
+ wxEVT_SCROLL_THUMBRELEASE,
 
  /*
   * Scrolled Window
@@ -774,6 +842,7 @@ enum wxEventType {
  wxEVT_SCROLLWIN_PAGEUP,
  wxEVT_SCROLLWIN_PAGEDOWN,
  wxEVT_SCROLLWIN_THUMBTRACK,
+ wxEVT_SCROLLWIN_THUMBRELEASE,
 
  wxEVT_SIZE = wxEVT_FIRST + 200,
  wxEVT_MOVE,
@@ -841,6 +910,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,
@@ -857,6 +929,9 @@ enum wxEventType {
  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,
@@ -870,6 +945,8 @@ enum wxEventType {
  wxEVT_COMMAND_SPLITTER_UNSPLIT,
  wxEVT_COMMAND_SPLITTER_DOUBLECLICKED,
 
+ wxEVT_NAVIGATION_KEY,
+
 };