X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/daa3eac94c219acca125c79177ac662961850929..2d138379016e86c0625162f9ba0286233430a183:/wxPython/src/_defs.i?ds=inline

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index fad06d17df..8790c0705d 100644
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -188,7 +188,7 @@ enum {
     wxNO_BORDER,
     wxUSER_COLOURS,
     wxNO_3D,
-//wxOVERRIDE_KEY_TRANSLATIONS,
+
     wxTAB_TRAVERSAL,
     wxWANTS_CHARS,
     wxPOPUP_WINDOW,
@@ -203,6 +203,7 @@ enum {
     wxICONIZE,
     wxMINIMIZE,
     wxMAXIMIZE,
+    wxCLOSE_BOX,
     wxTHICK_FRAME,
     wxSYSTEM_MENU,
     wxMINIMIZE_BOX,
@@ -284,6 +285,10 @@ enum {
     wxTE_DONTWRAP,
     wxTE_LINEWRAP,
     wxTE_WORDWRAP,
+    wxTE_LEFT,
+    wxTE_RIGHT,
+    wxTE_CENTER,
+    wxTE_CENTRE,
 
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
@@ -294,6 +299,7 @@ enum {
     wxRA_SPECIFY_ROWS,
     wxRA_SPECIFY_COLS,
     wxRB_GROUP,
+    wxRB_SINGLE,
     wxGA_PROGRESSBAR,
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,
@@ -312,8 +318,15 @@ enum {
     wxSB_VERTICAL,
     wxST_SIZEGRIP,
     wxST_NO_AUTORESIZE,
-    wxBU_AUTODRAW,
+
     wxBU_NOAUTODRAW,
+    wxBU_AUTODRAW,
+    wxBU_LEFT,
+    wxBU_TOP,
+    wxBU_RIGHT,
+    wxBU_BOTTOM,
+    wxBU_EXACTFIT,
+
     wxSP_VERTICAL,
     wxSP_HORIZONTAL,
     wxSP_ARROW_KEYS,
@@ -326,7 +339,6 @@ enum {
     wxSP_BORDER,
     wxSP_LIVE_UPDATE,
     wxSP_PERMIT_UNSPLIT,
-    //wxSP_SASH_AQUA,
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,
@@ -374,6 +386,9 @@ enum {
     wxPRINT_QUALITY_LOW,
     wxPRINT_QUALITY_DRAFT,
 
+    wxID_ANY,
+    wxID_SEPARATOR,
+
     wxID_OPEN,
     wxID_CLOSE,
     wxID_NEW,
@@ -509,6 +524,27 @@ enum {
     wxMM_POINTS,
     wxMM_METRIC,
 
+    wxTIMER_CONTINUOUS,
+    wxTIMER_ONE_SHOT,
+
+    // the symbolic names for the mouse buttons
+    wxMOUSE_BTN_ANY,
+    wxMOUSE_BTN_NONE,
+    wxMOUSE_BTN_LEFT,
+    wxMOUSE_BTN_MIDDLE,
+    wxMOUSE_BTN_RIGHT,
+
+    // It looks like wxTabCtrl may rise from the dead.  Uncomment these if
+    // it gets an implementation for all platforms...
+//     wxTC_RIGHTJUSTIFY,
+//     wxTC_FIXEDWIDTH,
+//     wxTC_TOP,
+//     wxTC_LEFT,
+//     wxTC_RIGHT,
+//     wxTC_BOTTOM,
+//     wxTC_MULTILINE,
+//     wxTC_OWNERDRAW,
+
 };
 
 
@@ -698,7 +734,11 @@ enum wxKeyCode {
   WXK_NUMPAD_SEPARATOR,
   WXK_NUMPAD_SUBTRACT,
   WXK_NUMPAD_DECIMAL,
-  WXK_NUMPAD_DIVIDE
+  WXK_NUMPAD_DIVIDE,
+
+  WXK_WINDOWS_LEFT,
+  WXK_WINDOWS_RIGHT,
+  WXK_WINDOWS_MENU
 
 };
 
@@ -898,12 +938,6 @@ enum wxHitTest
 
 
 
-#define FALSE 0
-#define false 0
-#define TRUE 1
-#define true 1
-
-
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 
@@ -973,6 +1007,8 @@ enum wxEventType {
  wxEVT_NC_MIDDLE_DCLICK,
  wxEVT_NC_RIGHT_DCLICK,
 
+ wxEVT_SET_CURSOR,
+
 /* Character input event type  */
  wxEVT_CHAR,
  wxEVT_KEY_DOWN,
@@ -990,6 +1026,7 @@ enum wxEventType {
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,
  wxEVT_SCROLL_THUMBRELEASE,
+ wxEVT_SCROLL_ENDSCROLL,
 
  /*
   * Scrolled Window