some more test code for the toolbar

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

diff --git a/wxPython/src/_defs.i b/wxPython/src/_defs.i
index 553b379839e6ec4021d350413fa6c4b1a1bd2d17..54122585c6e7e83c777d6ec3e3b25a0c8e36f263 100644 (file)
--- a/wxPython/src/_defs.i
+++ b/wxPython/src/_defs.i
@@ -188,7 +188,7 @@ enum {
     wxNO_BORDER,
     wxUSER_COLOURS,
     wxNO_3D,
     wxNO_BORDER,
     wxUSER_COLOURS,
     wxNO_3D,

-//wxOVERRIDE_KEY_TRANSLATIONS,
+

     wxTAB_TRAVERSAL,
     wxWANTS_CHARS,
     wxPOPUP_WINDOW,
     wxTAB_TRAVERSAL,
     wxWANTS_CHARS,
     wxPOPUP_WINDOW,


@@ -203,6 +203,7 @@ enum {
     wxICONIZE,
     wxMINIMIZE,
     wxMAXIMIZE,
     wxICONIZE,
     wxMINIMIZE,
     wxMAXIMIZE,

+    wxCLOSE_BOX,

     wxTHICK_FRAME,
     wxSYSTEM_MENU,
     wxMINIMIZE_BOX,
     wxTHICK_FRAME,
     wxSYSTEM_MENU,
     wxMINIMIZE_BOX,


@@ -221,6 +222,7 @@ enum {
     wxFRAME_FLOAT_ON_PARENT,
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,
     wxFRAME_FLOAT_ON_PARENT,
     wxFRAME_NO_WINDOW_MENU,
     wxFRAME_NO_TASKBAR,

+    wxFRAME_SHAPED,

 
     wxED_CLIENT_MARGIN,
     wxED_BUTTONS_BOTTOM,
 
     wxED_CLIENT_MARGIN,
     wxED_BUTTONS_BOTTOM,


@@ -234,16 +236,6 @@ enum {
     wxRETAINED,
     wxBACKINGSTORE,
 
     wxRETAINED,
     wxBACKINGSTORE,
 

-    wxTB_HORIZONTAL,
-    wxTB_VERTICAL,
-    wxTB_3DBUTTONS,
-    wxTB_FLAT,
-    wxTB_DOCKABLE,
-    wxTB_NOICONS,
-    wxTB_TEXT,
-    wxTB_NODIVIDER,
-    wxTB_NOALIGN,
-

     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,


@@ -270,25 +262,6 @@ enum {
     wxPROCESS_ENTER,
     wxPASSWORD,
 
     wxPROCESS_ENTER,
     wxPASSWORD,
 

-    wxTE_READONLY,
-    wxTE_MULTILINE,
-    wxTE_PROCESS_TAB,
-    wxTE_RICH,
-    wxTE_RICH2,
-    wxTE_NO_VSCROLL,
-    wxTE_AUTO_SCROLL,
-    wxTE_PROCESS_ENTER,
-    wxTE_PASSWORD,
-    wxTE_AUTO_URL,
-    wxTE_NOHIDESEL,
-    wxTE_DONTWRAP,
-    wxTE_LINEWRAP,
-    wxTE_WORDWRAP,
-    wxTE_LEFT,
-    wxTE_RIGHT,
-    wxTE_CENTER,
-    wxTE_CENTRE,
-

     wxCB_SIMPLE,
     wxCB_DROPDOWN,
     wxCB_SORT,
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
     wxCB_SORT,


@@ -298,6 +271,7 @@ enum {
     wxRA_SPECIFY_ROWS,
     wxRA_SPECIFY_COLS,
     wxRB_GROUP,
     wxRA_SPECIFY_ROWS,
     wxRA_SPECIFY_COLS,
     wxRB_GROUP,

+    wxRB_SINGLE,

     wxGA_PROGRESSBAR,
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,
     wxGA_PROGRESSBAR,
     wxGA_HORIZONTAL,
     wxGA_VERTICAL,


@@ -325,18 +299,6 @@ enum {
     wxBU_BOTTOM,
     wxBU_EXACTFIT,
 
     wxBU_BOTTOM,
     wxBU_EXACTFIT,
 

-    wxSP_VERTICAL,
-    wxSP_HORIZONTAL,
-    wxSP_ARROW_KEYS,
-    wxSP_WRAP,
-    wxSP_NOBORDER,
-    wxSP_3D,
-    wxSP_3DSASH,
-    wxSP_3DBORDER,
-    wxSP_FULLSASH,
-    wxSP_BORDER,
-    wxSP_LIVE_UPDATE,
-    wxSP_PERMIT_UNSPLIT,

     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,
     wxFLOOD_SURFACE,
     wxFLOOD_BORDER,
     wxODDEVEN_RULE,


@@ -415,6 +377,20 @@ enum {
     wxID_DUPLICATE,
     wxID_SELECTALL,
 
     wxID_DUPLICATE,
     wxID_SELECTALL,
 

+    wxID_DELETE,
+    wxID_REPLACE,
+    wxID_REPLACE_ALL,
+    wxID_PROPERTIES,
+
+    wxID_VIEW_DETAILS,
+    wxID_VIEW_LARGEICONS,
+    wxID_VIEW_SMALLICONS,
+    wxID_VIEW_LIST,
+    wxID_VIEW_SORTDATE,
+    wxID_VIEW_SORTNAME,
+    wxID_VIEW_SORTSIZE,
+    wxID_VIEW_SORTTYPE,
+

     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,
     wxID_FILE1,
     wxID_FILE2,
     wxID_FILE3,


@@ -489,12 +465,6 @@ enum {
     wxGROW,
     wxEXPAND,
 
     wxGROW,
     wxEXPAND,
 

-    wxNB_FIXEDWIDTH,
-    wxNB_LEFT,
-    wxNB_RIGHT,
-    wxNB_BOTTOM,
-    wxNB_MULTILINE,
-

     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 
     wxLI_HORIZONTAL,
     wxLI_VERTICAL,
 


@@ -510,6 +480,11 @@ enum {
     wxWS_EX_BLOCK_EVENTS,
     wxWS_EX_TRANSIENT,
 
     wxWS_EX_BLOCK_EVENTS,
     wxWS_EX_TRANSIENT,
 

+    wxWS_EX_THEMED_BACKGROUND,
+    wxWS_EX_PROCESS_IDLE,
+    wxWS_EX_PROCESS_UI_UPDATES,
+
+

     // Mapping modes (as per Windows)
     wxMM_TEXT,
     wxMM_LOMETRIC,
     // Mapping modes (as per Windows)
     wxMM_TEXT,
     wxMM_LOMETRIC,


@@ -532,6 +507,17 @@ enum {
     wxMOUSE_BTN_MIDDLE,
     wxMOUSE_BTN_RIGHT,
 
     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,
+

 };
 
 
 };
 
 


@@ -721,7 +707,11 @@ enum wxKeyCode {
   WXK_NUMPAD_SEPARATOR,
   WXK_NUMPAD_SUBTRACT,
   WXK_NUMPAD_DECIMAL,
   WXK_NUMPAD_SEPARATOR,
   WXK_NUMPAD_SUBTRACT,
   WXK_NUMPAD_DECIMAL,

-  WXK_NUMPAD_DIVIDE
+  WXK_NUMPAD_DIVIDE,
+
+  WXK_WINDOWS_LEFT,
+  WXK_WINDOWS_RIGHT,
+  WXK_WINDOWS_MENU

 
 };
 
 
 };
 


@@ -920,11 +910,37 @@ enum wxHitTest
 };
 
 
 };
 
 

+%{
+#if ! wxUSE_HOTKEY
+enum wxHotkeyModifier
+{
+    wxMOD_NONE = 0,
+    wxMOD_ALT = 1,
+    wxMOD_CONTROL = 2,
+    wxMOD_SHIFT = 4,
+    wxMOD_WIN = 8
+};
+#define wxEVT_HOTKEY 9999
+#endif
+%}
+
+enum wxHotkeyModifier
+{
+    wxMOD_NONE = 0,
+    wxMOD_ALT = 1,
+    wxMOD_CONTROL = 2,
+    wxMOD_SHIFT = 4,
+    wxMOD_WIN = 8
+};
+
+
+enum wxUpdateUI
+{
+    wxUPDATE_UI_NONE          = 0x0000,
+    wxUPDATE_UI_RECURSE       = 0x0001,
+    wxUPDATE_UI_FROMIDLE      = 0x0002 // Invoked from On(Internal)Idle
+};

 
 

-#define FALSE 0
-#define false 0
-#define TRUE 1
-#define true 1

 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------


@@ -1003,6 +1019,7 @@ enum wxEventType {
  wxEVT_KEY_DOWN,
  wxEVT_KEY_UP,
  wxEVT_CHAR_HOOK,
  wxEVT_KEY_DOWN,
  wxEVT_KEY_UP,
  wxEVT_CHAR_HOOK,

+ wxEVT_HOTKEY,

 
  /*
   * Scrollbar event identifiers
 
  /*
   * Scrollbar event identifiers


@@ -1031,6 +1048,8 @@ enum wxEventType {
 
  wxEVT_SIZE = wxEVT_FIRST + 200,
  wxEVT_MOVE,
 
  wxEVT_SIZE = wxEVT_FIRST + 200,
  wxEVT_MOVE,

+ wxEVT_SIZING,
+ wxEVT_MOVING,

  wxEVT_CLOSE_WINDOW,
  wxEVT_END_SESSION,
  wxEVT_QUERY_END_SESSION,
  wxEVT_CLOSE_WINDOW,
  wxEVT_END_SESSION,
  wxEVT_QUERY_END_SESSION,