X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83f3dd45be83ffe093e7d5523453a50d3dac4ab7..fd657b8a5907c8584db84c85535ce281bdd65193:/wxPython/src/_defs.i

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 2e02039ea5..647352d18b 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,
@@ -221,6 +222,7 @@ enum {
     wxFRAME_FLOAT_ON_PARENT,
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,
+    wxFRAME_SHAPED,
 
     wxED_CLIENT_MARGIN,
     wxED_BUTTONS_BOTTOM,
@@ -284,6 +286,10 @@ enum {
     wxTE_DONTWRAP,
     wxTE_LINEWRAP,
     wxTE_WORDWRAP,
+    wxTE_LEFT,
+    wxTE_RIGHT,
+    wxTE_CENTER,
+    wxTE_CENTRE,
 
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
@@ -294,6 +300,7 @@ enum {
     wxRA_SPECIFY_ROWS,
     wxRA_SPECIFY_COLS,
     wxRB_GROUP,
+    wxRB_SINGLE,
     wxGA_PROGRESSBAR,
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,
@@ -486,6 +493,7 @@ enum {
     wxEXPAND,
 
     wxNB_FIXEDWIDTH,
+    wxNB_TOP,
     wxNB_LEFT,
     wxNB_RIGHT,
     wxNB_BOTTOM,
@@ -528,6 +536,17 @@ enum {
     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,
+
 };
 
 
@@ -717,7 +736,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
 
 };
 
@@ -917,12 +940,6 @@ enum wxHitTest
 
 
 
-#define FALSE 0
-#define false 0
-#define TRUE 1
-#define true 1
-
-
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------