Added more makefiles

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

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index 1eca9aaffbb1b0db0c2357972e75aa6a7b9aa9c9..b6f1c1141b7ee25097c7b5f6f00a55d18298f301 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 wxPyTimer;
 class wxIndividualLayoutConstraint;
 class wxLayoutConstraints;

+class wxToolBar;
+class wxStatusBar;

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


@@ -113,8 +115,7 @@ enum {
     wxMINOR_VERSION,
     wxRELEASE_NUMBER,
 
     wxMINOR_VERSION,
     wxRELEASE_NUMBER,
 

-    UNKNOWN,
-    NOT_FOUND,
+    wxNOT_FOUND,

 
     wxVSCROLL,
     wxHSCROLL,
 
     wxVSCROLL,
     wxHSCROLL,


@@ -151,20 +152,22 @@ enum {
     wxDIALOG_MODELESS,
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
     wxDIALOG_MODELESS,
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,

+
+    wxFRAME_TOOL_WINDOW,
+    wxCLIP_CHILDREN,
+

     wxRETAINED,
     wxBACKINGSTORE,
     wxTB_3DBUTTONS,
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
     wxRETAINED,
     wxBACKINGSTORE,
     wxTB_3DBUTTONS,
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,

+    wxTB_FLAT,

     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
     wxALIGN_CENTER,
     wxALIGN_CENTRE,
     wxALIGN_RIGHT,
     wxCOLOURED,
     wxFIXED_LENGTH,
     wxALIGN_LEFT,
     wxALIGN_CENTER,
     wxALIGN_CENTRE,
     wxALIGN_RIGHT,

-    wxSB_MASK,
-    wxNEEDED_SB,
-    wxALWAYS_SB,

     wxLB_NEEDED_SB,
     wxLB_ALWAYS_SB,
     wxLB_SORT,
     wxLB_NEEDED_SB,
     wxLB_ALWAYS_SB,
     wxLB_SORT,


@@ -179,8 +182,6 @@ enum {
     wxTE_PASSWORD,
     wxTE_READONLY,
     wxTE_MULTILINE,
     wxTE_PASSWORD,
     wxTE_READONLY,
     wxTE_MULTILINE,

-    wxREADONLY,
-    wxEDITABLE,

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


@@ -207,6 +208,7 @@ enum {
     wxBU_NOAUTODRAW,
     wxTR_HAS_BUTTONS,
     wxTR_EDIT_LABELS,
     wxBU_NOAUTODRAW,
     wxTR_HAS_BUTTONS,
     wxTR_EDIT_LABELS,

+    wxTR_LINES_AT_ROOT,

     wxLC_ICON,
     wxLC_SMALL_ICON,
     wxLC_LIST,
     wxLC_ICON,
     wxLC_SMALL_ICON,
     wxLC_LIST,


@@ -263,12 +265,14 @@ enum {
     wxSIZE_AUTO,
     wxSIZE_USE_EXISTING,
     wxSIZE_ALLOW_MINUS_ONE,
     wxSIZE_AUTO,
     wxSIZE_USE_EXISTING,
     wxSIZE_ALLOW_MINUS_ONE,

+#ifndef __WXGTK__

     wxDF_TEXT,
     wxDF_BITMAP,
     wxDF_METAFILE,
     wxDF_DIB,
     wxDF_OEMTEXT,
     wxDF_FILENAME,
     wxDF_TEXT,
     wxDF_BITMAP,
     wxDF_METAFILE,
     wxDF_DIB,
     wxDF_OEMTEXT,
     wxDF_FILENAME,

+#endif

     wxPORTRAIT,
     wxLANDSCAPE,
     wxID_OPEN,
     wxPORTRAIT,
     wxLANDSCAPE,
     wxID_OPEN,


@@ -335,7 +339,6 @@ enum {
     wxACCEL_ALT,
     wxACCEL_CTRL,
     wxACCEL_SHIFT,
     wxACCEL_ALT,
     wxACCEL_CTRL,
     wxACCEL_SHIFT,

-

 };
 
 
 };
 
 


@@ -487,6 +490,7 @@ enum _Virtual_keycodes {
 };
 
 typedef enum {
 };
 
 typedef enum {

+ wxCURSOR_NONE = 0,

  wxCURSOR_ARROW =  1,
  wxCURSOR_BULLSEYE,
  wxCURSOR_CHAR,
  wxCURSOR_ARROW =  1,
  wxCURSOR_BULLSEYE,
  wxCURSOR_CHAR,


@@ -512,13 +516,13 @@ typedef enum {
  wxCURSOR_WAIT,
  wxCURSOR_WATCH,
  wxCURSOR_BLANK
  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;
 
 
 } _standard_cursors_t;
 
 


@@ -666,6 +670,8 @@ enum wxEventType {
  wxEVT_COMMAND_TREE_SET_INFO,
  wxEVT_COMMAND_TREE_ITEM_EXPANDED,
  wxEVT_COMMAND_TREE_ITEM_EXPANDING,
  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,
  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
  wxEVT_COMMAND_TAB_SEL_CHANGING,
  wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
  wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING

+

 };
 
 
 };
 
 


@@ -698,6 +705,58 @@ enum wxEventType {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $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
+// 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
+//

 // Revision 1.1  1998/08/09 08:25:49  RD
 // Initial version
 //
 // Revision 1.1  1998/08/09 08:25:49  RD
 // Initial version
 //