Sample Setup.in file for Linux

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

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index 1eca9aaffbb1b0db0c2357972e75aa6a7b9aa9c9..40404a1256ff3b63263cffc5cbc24f0f9ecbef9a 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,7 +115,6 @@ enum {
     wxMINOR_VERSION,
     wxRELEASE_NUMBER,
 
     wxMINOR_VERSION,
     wxRELEASE_NUMBER,
 

-    UNKNOWN,

     NOT_FOUND,
 
     wxVSCROLL,
     NOT_FOUND,
 
     wxVSCROLL,


@@ -156,15 +157,13 @@ enum {
     wxTB_3DBUTTONS,
     wxTB_HORIZONTAL,
     wxTB_VERTICAL,
     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 +178,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 +204,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,


@@ -332,9 +330,11 @@ enum {
     wxHIDE_READONLY,
     wxOVERWRITE_PROMPT,
 
     wxHIDE_READONLY,
     wxOVERWRITE_PROMPT,
 

+#ifdef __WXMSW__

     wxACCEL_ALT,
     wxACCEL_CTRL,
     wxACCEL_SHIFT,
     wxACCEL_ALT,
     wxACCEL_CTRL,
     wxACCEL_SHIFT,

+#endif

 
 };
 
 
 };
 


@@ -487,6 +487,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 +513,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;
 
 


@@ -698,6 +699,26 @@ enum wxEventType {
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$
 /////////////////////////////////////////////////////////////////////////////
 //
 // $Log$

+// 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
 //