X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c039d08bfbb59c0abcbc705fb49f9b2cb321edf..d1e586e4b1eb201932552897bc0f7412c825635c:/utils/wxPython/src/_defs.i

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index bff71c0680..b6f1c1141b 100644
--- a/utils/wxPython/src/_defs.i
+++ b/utils/wxPython/src/_defs.i
@@ -115,7 +115,7 @@ enum {
     wxMINOR_VERSION,
     wxRELEASE_NUMBER,
 
-    NOT_FOUND,
+    wxNOT_FOUND,
 
     wxVSCROLL,
     wxHSCROLL,
@@ -152,6 +152,10 @@ enum {
     wxDIALOG_MODELESS,
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
+
+    wxFRAME_TOOL_WINDOW,
+    wxCLIP_CHILDREN,
+
     wxRETAINED,
     wxBACKINGSTORE,
     wxTB_3DBUTTONS,
@@ -204,6 +208,7 @@ enum {
     wxBU_NOAUTODRAW,
     wxTR_HAS_BUTTONS,
     wxTR_EDIT_LABELS,
+    wxTR_LINES_AT_ROOT,
     wxLC_ICON,
     wxLC_SMALL_ICON,
     wxLC_LIST,
@@ -260,12 +265,14 @@ 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,
     wxID_OPEN,
@@ -329,12 +336,9 @@ enum {
     wxHIDE_READONLY,
     wxOVERWRITE_PROMPT,
 
-#ifdef __WXMSW__
     wxACCEL_ALT,
     wxACCEL_CTRL,
     wxACCEL_SHIFT,
-#endif
-
 };
 
 
@@ -666,6 +670,8 @@ enum wxEventType {
  wxEVT_COMMAND_TREE_SET_INFO,
  wxEVT_COMMAND_TREE_ITEM_EXPANDED,
  wxEVT_COMMAND_TREE_ITEM_EXPANDING,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSED,
+ wxEVT_COMMAND_TREE_ITEM_COLLAPSING,
  wxEVT_COMMAND_TREE_SEL_CHANGED,
  wxEVT_COMMAND_TREE_SEL_CHANGING,
  wxEVT_COMMAND_TREE_KEY_DOWN,
@@ -690,6 +696,7 @@ enum wxEventType {
  wxEVT_COMMAND_TAB_SEL_CHANGING,
  wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
  wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
+
 };
 
 
@@ -698,7 +705,45 @@ enum wxEventType {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// Revision 1.10  1999/01/30 07:30:08  RD
+// Added wxSashWindow, wxSashEvent, wxLayoutAlgorithm, etc.
+//
+// Various cleanup, tweaks, minor additions, etc. to maintain
+// compatibility with the current wxWindows.
+//
+// Revision 1.9  1998/12/15 20:41:13  RD
+// Changed the import semantics from "from wxPython import *" to "from
+// wxPython.wx import *"  This is for people who are worried about
+// namespace pollution, they can use "from wxPython import wx" and then
+// prefix all the wxPython identifiers with "wx."
+//
+// Added wxTaskbarIcon for wxMSW.
+//
+// Made the events work for wxGrid.
+//
+// Added wxConfig.
+//
+// Added wxMiniFrame for wxGTK, (untested.)
+//
+// Changed many of the args and return values that were pointers to gdi
+// objects to references to reflect changes in the wxWindows API.
+//
+// Other assorted fixes and additions.
+//
+// Revision 1.8  1998/11/15 23:03:42  RD
+// Removing some ifdef's for wxGTK
+//
+// Revision 1.7  1998/11/11 03:12:24  RD
+//
+// Additions for wxTreeCtrl
+//
+// Revision 1.6  1998/10/20 06:43:53  RD
+// New wxTreeCtrl wrappers (untested)
+// some changes in helpers
+// etc.
+//
 // Revision 1.5  1998/10/02 06:40:32  RD
+//
 // Version 0.4 of wxPython for MSW.
 //
 // Revision 1.4  1998/08/18 19:48:11  RD