Removed minor differences between wxMSW and wxGTK

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

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index e586aa942e7eb9fac133f04dfd148789b5c9a756..1db1acc6ad1b3ee9135b7860931f16f78a1a7144 100644 (file)
--- a/utils/wxPython/src/_defs.i
+++ b/utils/wxPython/src/_defs.i
@@ -92,6 +92,8 @@ class wxSlider;
 class wxPyTimer;
 class wxIndividualLayoutConstraint;
 class wxLayoutConstraints;
+class wxToolBar;
+class wxStatusBar;
 
 //---------------------------------------------------------------------------
 
@@ -113,7 +115,6 @@ enum {
     wxMINOR_VERSION,
     wxRELEASE_NUMBER,
 
-    UNKNOWN,
     NOT_FOUND,
 
     wxVSCROLL,
@@ -151,11 +152,15 @@ enum {
     wxDIALOG_MODELESS,
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
+
+    wxFRAME_TOOL_WINDOW,
+
     wxRETAINED,
     wxBACKINGSTORE,
     wxTB_3DBUTTONS,
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
+    wxTB_FLAT,
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
@@ -202,6 +207,7 @@ enum {
     wxBU_NOAUTODRAW,
     wxTR_HAS_BUTTONS,
     wxTR_EDIT_LABELS,
+    wxTR_LINES_AT_ROOT,
     wxLC_ICON,
     wxLC_SMALL_ICON,
     wxLC_LIST,
@@ -330,7 +336,6 @@ enum {
     wxACCEL_ALT,
     wxACCEL_CTRL,
     wxACCEL_SHIFT,
-
 };
 
 
@@ -482,6 +487,7 @@ enum _Virtual_keycodes {
 };
 
 typedef enum {
+ wxCURSOR_NONE = 0,
  wxCURSOR_ARROW =  1,
  wxCURSOR_BULLSEYE,
  wxCURSOR_CHAR,
@@ -507,13 +513,13 @@ typedef enum {
  wxCURSOR_WAIT,
  wxCURSOR_WATCH,
  wxCURSOR_BLANK
-//#ifdef __X__
-//  /* Not yet implemented for Windows */
-//  , wxCURSOR_CROSS_REVERSE,
-//  wxCURSOR_DOUBLE_ARROW,
-//  wxCURSOR_BASED_ARROW_UP,
-//  wxCURSOR_BASED_ARROW_DOWN
-//#endif
+//  #ifndef __WXMSW__
+//    /* Not yet implemented for Windows */
+//    , wxCURSOR_CROSS_REVERSE,
+//    wxCURSOR_DOUBLE_ARROW,
+//    wxCURSOR_BASED_ARROW_UP,
+//    wxCURSOR_BASED_ARROW_DOWN
+//  #endif
 } _standard_cursors_t;
 
 
@@ -661,6 +667,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,
@@ -693,6 +701,49 @@ enum wxEventType {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
+// 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
+// more wxGTK compatibility things.
+//
+// It builds now but there are serious runtime problems...
+//
+// Revision 1.3  1998/08/14 23:36:33  RD
+// Beginings of wxGTK compatibility
+//
 // Revision 1.2  1998/08/14 03:16:35  RD
 // removed some definitions that got removed from defs.h
 //