X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2abc0a0f9bf1a1c4fb3e807be687850949603e5c..85bc0351f76f6d3f00460a167fc108b900e0725c:/utils/wxPython/src/_defs.i

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index 49412a7a8f..ce3a96a54a 100644
--- 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;
@@ -157,6 +158,8 @@ typedef unsigned int    uint;
 typedef signed   int    EBool;
 typedef unsigned int    size_t
 typedef int             wxPrintQuality;
+typedef int             wxCoord;
+
 
 //---------------------------------------------------------------------------
 
@@ -230,11 +233,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,
@@ -352,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,
@@ -424,6 +424,7 @@ enum {
     wxBITMAP_TYPE_ANY,
     wxBITMAP_TYPE_RESOURCE,
     wxBITMAP_TYPE_JPEG,
+    wxBITMAP_TYPE_PCX,
 
     wxOPEN,
     wxSAVE,
@@ -472,7 +473,6 @@ enum {
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
-
     wxHW_SCROLLBAR_NEVER,
     wxHW_SCROLLBAR_AUTO,
 
@@ -543,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 {
@@ -769,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,
@@ -829,6 +830,7 @@ enum wxEventType {
  wxEVT_SCROLL_PAGEUP,
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,
+ wxEVT_SCROLL_THUMBRELEASE,
 
  /*
   * Scrolled Window
@@ -840,6 +842,7 @@ enum wxEventType {
  wxEVT_SCROLLWIN_PAGEUP,
  wxEVT_SCROLLWIN_PAGEDOWN,
  wxEVT_SCROLLWIN_THUMBTRACK,
+ wxEVT_SCROLLWIN_THUMBRELEASE,
 
  wxEVT_SIZE = wxEVT_FIRST + 200,
  wxEVT_MOVE,