Compilation fixes

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

diff --git a/utils/wxPython/src/_defs.i b/utils/wxPython/src/_defs.i
index 40404a1256ff3b63263cffc5cbc24f0f9ecbef9a..ce3a96a54a826431d77b2690887991ec8087ffa8 100644 (file)
--- a/utils/wxPython/src/_defs.i
+++ b/utils/wxPython/src/_defs.i
@@ -15,85 +15,138 @@
 //---------------------------------------------------------------------------
 // Forward declares...
 
 //---------------------------------------------------------------------------
 // Forward declares...
 

-class wxPyApp;
-class wxEvtHandler;
-class wxWindow;
-class wxFrame;
-class wxMiniFrame;
-class wxPanel;
-class wxDialog;
-class wxMenu;
-class wxPyMenu;
-class wxMenuBar;
-class wxMenuItem;
-class wxEvent;
-class wxSizeEvent;
+class wxAcceleratorEntry;
+class wxAcceleratorTable;
+class wxActivateEvent;
+class wxBitmapButton;
+class wxBitmap;
+class wxBrush;
+class wxButton;
+class wxCalculateLayoutEvent;
+class wxCaret;
+class wxCheckBox;
+class wxCheckListBox;
+class wxChoice;
+class wxClientDC;

 class wxCloseEvent;
 class wxCloseEvent;

+class wxColourData;
+class wxColourDialog;
+class wxColour;
+class wxComboBox;

 class wxCommandEvent;
 class wxCommandEvent;

-class wxScrollEvent;
-class wxMouseEvent;
-class wxKeyEvent;
-class wxMoveEvent;
-class wxPaintEvent;
+class wxConfig;
+class wxControl;
+class wxCursor;
+class wxDC;
+class wxDialog;
+class wxDirDialog;
+class wxDropFilesEvent;

 class wxEraseEvent;
 class wxEraseEvent;

+class wxEvent;
+class wxEvtHandler;
+class wxFileDialog;

 class wxFocusEvent;
 class wxFocusEvent;

-class wxActivateEvent;
-class wxInitDialogEvent;
-class wxMenuEvent;
-class wxShowEvent;
+class wxFontData;
+class wxFontDialog;
+class wxFont;
+class wxFrame;
+class wxGauge;
+class wxGridCell;
+class wxGridEvent;
+class wxGrid;

 class wxIconizeEvent;
 class wxIconizeEvent;

-class wxMaximizeEvent;
-class wxJoystickEvent;
-class wxDropFilesEvent;
+class wxIcon;

 class wxIdleEvent;
 class wxIdleEvent;

-class wxUpdateUIEvent;
-class wxSysColourChangedEvent;
-class wxSize;
-class wxRealPoint;
-class wxPoint;
-class wxRect;
-class wxBitmap;
+class wxImageList;
+class wxIndividualLayoutConstraint;
+class wxInitDialogEvent;
+class wxJoystickEvent;
+class wxKeyEvent;
+class wxLayoutAlgorithm;
+class wxLayoutConstraints;
+class wxListBox;
+class wxListCtrl;
+class wxListEvent;
+class wxListItem;
+class wxMDIChildFrame;
+class wxMDIClientWindow;
+class wxMDIParentFrame;

 class wxMask;
 class wxMask;

-class wxIcon;
-class wxCursor;
-class wxFont;
-class wxColour;
-class wxPen;
-class wxBrush;
-class wxDC;
+class wxMaximizeEvent;

 class wxMemoryDC;
 class wxMemoryDC;

-class wxScreenDC;
-class wxClientDC;
+class wxMenuBar;
+class wxMenuEvent;
+class wxMenuItem;
+class wxMenu;
+class wxMessageDialog;
+class wxMetaFileDC;
+class wxMiniFrame;
+class wxMouseEvent;
+class wxMoveEvent;
+class wxNotebookEvent;
+class wxNotebook;
+class wxPageSetupData;
+class wxPageSetupDialog;

 class wxPaintDC;
 class wxPaintDC;

+class wxPaintEvent;
+class wxPalette;
+class wxPanel;
+class wxPen;
+class wxPoint;

 class wxPostScriptDC;
 class wxPostScriptDC;

+class wxPrintData;
+class wxPrintDialog;

 class wxPrinterDC;
 class wxPrinterDC;

-class wxMetaFileDC;
-class wxMDIParentFrame;
-class wxMDIChildFrame;
-class wxMDIClientWindow;
-class wxControl;
-class wxButton;
-class wxBitmapButton;
-class wxCheckBox;
-class wxChoice;
-class wxComboBox;
-class wxGauge;
-class wxStaticBox;
-class wxStaticText;
-class wxListBox;
-class wxTextCtrl;
-class wxScrollBar;
-class wxSpinButton;
-class wxStaticBitmap;
+class wxQueryLayoutInfoEvent;

 class wxRadioBox;
 class wxRadioButton;
 class wxRadioBox;
 class wxRadioButton;

+class wxRealPoint;
+class wxRect;
+class wxRegionIterator;
+class wxRegion;
+class wxSashEvent;
+class wxSashLayoutWindow;
+class wxSashWindow;
+class wxScreenDC;
+class wxScrollBar;
+class wxScrollEvent;
+class wxScrollWinEvent;
+class wxScrolledWindow;
+class wxShowEvent;
+class wxSingleChoiceDialog;
+class wxSizeEvent;
+class wxSize;

 class wxSlider;
 class wxSlider;

+class wxSpinButton;
+class wxSpinEvent;
+class wxSplitterWindow;
+class wxStaticBitmap;
+class wxStaticBox;
+class wxStaticText;
+class wxStatusBar;
+class wxSysColourChangedEvent;
+class wxTaskBarIcon;
+class wxTextCtrl;
+class wxTextEntryDialog;
+class wxTimer;
+class wxToolBarTool;
+class wxToolBar;
+class wxToolTip;
+class wxTreeCtrl;
+class wxTreeEvent;
+class wxTreeItemData;
+class wxTreeItemId;
+class wxUpdateUIEvent;
+class wxWindowDC;
+class wxWindow;
+class wxSizer;
+class wxBoxSizer;
+class wxStaticBoxSizer;

 
 

+class wxPyApp;
+class wxPyMenu;

 class wxPyTimer;
 class wxPyTimer;

-class wxIndividualLayoutConstraint;
-class wxLayoutConstraints;
-class wxToolBar;
-class wxStatusBar;
+

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


@@ -103,6 +156,9 @@ typedef short int       WXTYPE;
 typedef int             wxWindowID;
 typedef unsigned int    uint;
 typedef signed   int    EBool;
 typedef int             wxWindowID;
 typedef unsigned int    uint;
 typedef signed   int    EBool;

+typedef unsigned int    size_t
+typedef int             wxPrintQuality;
+typedef int             wxCoord;

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


@@ -115,7 +171,7 @@ enum {
     wxMINOR_VERSION,
     wxRELEASE_NUMBER,
 
     wxMINOR_VERSION,
     wxRELEASE_NUMBER,
 

-    NOT_FOUND,
+    wxNOT_FOUND,

 
     wxVSCROLL,
     wxHSCROLL,
 
     wxVSCROLL,
     wxHSCROLL,


@@ -132,10 +188,14 @@ enum {
     wxNO_3D,
 //wxOVERRIDE_KEY_TRANSLATIONS,
     wxTAB_TRAVERSAL,
     wxNO_3D,
 //wxOVERRIDE_KEY_TRANSLATIONS,
     wxTAB_TRAVERSAL,

+    wxWANTS_CHARS,

     wxHORIZONTAL,
     wxVERTICAL,
     wxBOTH,
     wxCENTER_FRAME,
     wxHORIZONTAL,
     wxVERTICAL,
     wxBOTH,
     wxCENTER_FRAME,

+    wxCENTRE_ON_SCREEN,
+    wxCENTER_ON_SCREEN,
+

     wxSTAY_ON_TOP,
     wxICONIZE,
     wxMINIMIZE,
     wxSTAY_ON_TOP,
     wxICONIZE,
     wxMINIMIZE,


@@ -152,18 +212,37 @@ enum {
     wxDIALOG_MODELESS,
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,
     wxDIALOG_MODELESS,
     wxDEFAULT_FRAME_STYLE,
     wxDEFAULT_DIALOG_STYLE,

+
+    wxFRAME_TOOL_WINDOW,
+    wxFRAME_FLOAT_ON_PARENT,
+    wxED_CLIENT_MARGIN,
+    wxED_BUTTONS_BOTTOM,
+    wxED_BUTTONS_RIGHT,
+    wxED_STATIC_LINE,
+    wxEXT_DIALOG_STYLE,
+
+    wxCLIP_CHILDREN,
+

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

+    wxTB_DOCKABLE,

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

+    wxALIGN_CENTER_HORIZONTAL,
+    wxALIGN_CENTRE_HORIZONTAL,
+    wxALIGN_RIGHT,
+    wxALIGN_BOTTOM,
+    wxALIGN_CENTER_VERTICAL,
+    wxALIGN_CENTRE_VERTICAL,
+    wxALIGN_TOP,

     wxALIGN_CENTER,
     wxALIGN_CENTRE,
     wxALIGN_CENTER,
     wxALIGN_CENTRE,

-    wxALIGN_RIGHT,
+    wxSHAPED,

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


@@ -177,17 +256,23 @@ enum {
     wxTE_PROCESS_ENTER,
     wxTE_PASSWORD,
     wxTE_READONLY,
     wxTE_PROCESS_ENTER,
     wxTE_PASSWORD,
     wxTE_READONLY,

+    wxTE_RICH,

     wxTE_MULTILINE,
     wxTE_MULTILINE,

+    wxTE_AUTO_SCROLL,
+    wxTE_NO_VSCROLL,

     wxCB_SIMPLE,
     wxCB_DROPDOWN,
     wxCB_SORT,
     wxCB_READONLY,
     wxRA_HORIZONTAL,
     wxRA_VERTICAL,
     wxCB_SIMPLE,
     wxCB_DROPDOWN,
     wxCB_SORT,
     wxCB_READONLY,
     wxRA_HORIZONTAL,
     wxRA_VERTICAL,

+    wxRA_SPECIFY_ROWS,
+    wxRA_SPECIFY_COLS,

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

+    wxGA_SMOOTH,

     wxSL_HORIZONTAL,
     wxSL_VERTICAL,
     wxSL_AUTOTICKS,
     wxSL_HORIZONTAL,
     wxSL_VERTICAL,
     wxSL_AUTOTICKS,


@@ -200,11 +285,16 @@ enum {
     wxSL_SELRANGE,
     wxSB_HORIZONTAL,
     wxSB_VERTICAL,
     wxSL_SELRANGE,
     wxSB_HORIZONTAL,
     wxSB_VERTICAL,

+    wxST_SIZEGRIP,
+    wxST_NO_AUTORESIZE,

     wxBU_AUTODRAW,
     wxBU_NOAUTODRAW,
     wxTR_HAS_BUTTONS,
     wxTR_EDIT_LABELS,
     wxTR_LINES_AT_ROOT,
     wxBU_AUTODRAW,
     wxBU_NOAUTODRAW,
     wxTR_HAS_BUTTONS,
     wxTR_EDIT_LABELS,
     wxTR_LINES_AT_ROOT,

+    wxTR_MULTIPLE,
+    wxTR_SINGLE,
+    wxTR_HAS_VARIABLE_ROW_HEIGHT,

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


@@ -229,11 +319,8 @@ enum {
     wxSP_NOBORDER,
     wxSP_3D,
     wxSP_BORDER,
     wxSP_NOBORDER,
     wxSP_3D,
     wxSP_BORDER,

-    wxTAB_MULTILINE,
-    wxTAB_RIGHTJUSTIFY,
-    wxTAB_FIXEDWIDTH,
-    wxTAB_OWNERDRAW,
-//    wxSB_SIZEGRIP,
+    wxSP_LIVE_UPDATE,
+    wxSP_PERMIT_UNSPLIT,

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


@@ -247,6 +334,8 @@ enum {
     wxCANCEL,
     wxYES,
     wxNO,
     wxCANCEL,
     wxYES,
     wxNO,

+    wxNO_DEFAULT,
+    wxYES_DEFAULT,

     wxICON_EXCLAMATION,
     wxICON_HAND,
     wxICON_QUESTION,
     wxICON_EXCLAMATION,
     wxICON_HAND,
     wxICON_QUESTION,


@@ -254,6 +343,16 @@ enum {
     wxICON_STOP,
     wxICON_ASTERISK,
     wxICON_MASK,
     wxICON_STOP,
     wxICON_ASTERISK,
     wxICON_MASK,

+    wxICON_WARNING,
+    wxICON_ERROR,
+
+    wxFORWARD,
+    wxBACKWARD,
+    wxRESET,
+    wxHELP,
+    wxMORE,
+    wxSETUP,
+

     wxCENTRE,
     wxCENTER,
     wxSIZE_AUTO_WIDTH,
     wxCENTRE,
     wxCENTER,
     wxSIZE_AUTO_WIDTH,


@@ -261,14 +360,12 @@ enum {
     wxSIZE_AUTO,
     wxSIZE_USE_EXISTING,
     wxSIZE_ALLOW_MINUS_ONE,
     wxSIZE_AUTO,
     wxSIZE_USE_EXISTING,
     wxSIZE_ALLOW_MINUS_ONE,

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

     wxPORTRAIT,
     wxLANDSCAPE,
     wxPORTRAIT,
     wxLANDSCAPE,

+    wxPRINT_QUALITY_HIGH,
+    wxPRINT_QUALITY_MEDIUM,
+    wxPRINT_QUALITY_LOW,
+    wxPRINT_QUALITY_DRAFT,

     wxID_OPEN,
     wxID_CLOSE,
     wxID_NEW,
     wxID_OPEN,
     wxID_CLOSE,
     wxID_NEW,


@@ -306,6 +403,8 @@ enum {
     wxID_APPLY,
     wxID_YES,
     wxID_NO,
     wxID_APPLY,
     wxID_YES,
     wxID_NO,

+    wxID_STATIC,
+

     wxBITMAP_TYPE_BMP,
     wxBITMAP_TYPE_BMP_RESOURCE,
     wxBITMAP_TYPE_ICO,
     wxBITMAP_TYPE_BMP,
     wxBITMAP_TYPE_BMP_RESOURCE,
     wxBITMAP_TYPE_ICO,


@@ -324,29 +423,70 @@ enum {
     wxBITMAP_TYPE_PNG_RESOURCE,
     wxBITMAP_TYPE_ANY,
     wxBITMAP_TYPE_RESOURCE,
     wxBITMAP_TYPE_PNG_RESOURCE,
     wxBITMAP_TYPE_ANY,
     wxBITMAP_TYPE_RESOURCE,

+    wxBITMAP_TYPE_JPEG,
+    wxBITMAP_TYPE_PCX,

 
     wxOPEN,
     wxSAVE,
     wxHIDE_READONLY,
     wxOVERWRITE_PROMPT,
 
     wxOPEN,
     wxSAVE,
     wxHIDE_READONLY,
     wxOVERWRITE_PROMPT,

+    wxFILE_MUST_EXIST,

 
 

-#ifdef __WXMSW__

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

-#endif
+
+    wxPD_AUTO_HIDE,
+    wxPD_APP_MODAL,
+    wxPD_CAN_ABORT,
+    wxPD_ELAPSED_TIME,
+    wxPD_ESTIMATED_TIME,
+    wxPD_REMAINING_TIME,
+
+    wxMENU_TEAROFF,
+    wxMB_DOCKABLE,
+    wxNO_FULL_REPAINT_ON_RESIZE,
+
+    wxLEFT,
+    wxRIGHT,
+    wxUP,
+    wxDOWN,
+    wxALL,
+    wxTOP,
+    wxBOTTOM,
+
+    wxNORTH,
+    wxSOUTH,
+    wxEAST,
+    wxWEST,
+
+    wxSTRETCH_NOT,
+    wxSHRINK,
+    wxGROW,
+    wxEXPAND,
+
+    wxNB_FIXEDWIDTH,
+    wxNB_LEFT,
+    wxNB_RIGHT,
+    wxNB_BOTTOM,
+
+    wxLI_HORIZONTAL,
+    wxLI_VERTICAL,
+
+    wxHW_SCROLLBAR_NEVER,
+    wxHW_SCROLLBAR_AUTO,

 
 };
 
 
 
 };
 
 

-/// Standard error codes
-enum  ErrCode
-{
-  ERR_PARAM = (-4000),
-  ERR_NODATA,
-  ERR_CANCEL,
-  ERR_SUCCESS = 0
-};
+//  // Standard error codes
+//  enum  ErrCode
+//  {
+//    ERR_PARAM = (-4000),
+//    ERR_NODATA,
+//    ERR_CANCEL,
+//    ERR_SUCCESS = 0
+//  };

 
 
 enum {
 
 
 enum {


@@ -403,8 +543,8 @@ typedef enum {
   wxNAND,       // (NOT src) OR (NOT dst)
   wxOR,         // src OR dst
   wxSET,        // 1
   wxNAND,       // (NOT src) OR (NOT dst)
   wxOR,         // src OR dst
   wxSET,        // 1

-  wxSRC_OR,     // source _bitmap_ OR destination
-  wxSRC_AND     // source _bitmap_ AND destination
+//  wxSRC_OR,     // source _bitmap_ OR destination
+//  wxSRC_AND     // source _bitmap_ AND destination

 } form_ops_t;
 
 enum _Virtual_keycodes {
 } form_ops_t;
 
 enum _Virtual_keycodes {


@@ -523,11 +663,93 @@ typedef enum {
 } _standard_cursors_t;
 
 
 } _standard_cursors_t;
 
 

+
+typedef enum {
+    wxPAPER_NONE,               // Use specific dimensions
+    wxPAPER_LETTER,             // Letter, 8 1/2 by 11 inches
+    wxPAPER_LEGAL,              // Legal, 8 1/2 by 14 inches
+    wxPAPER_A4,                 // A4 Sheet, 210 by 297 millimeters
+    wxPAPER_CSHEET,             // C Sheet, 17 by 22 inches
+    wxPAPER_DSHEET,             // D Sheet, 22 by 34 inches
+    wxPAPER_ESHEET,             // E Sheet, 34 by 44 inches
+    wxPAPER_LETTERSMALL,        // Letter Small, 8 1/2 by 11 inches
+    wxPAPER_TABLOID,            // Tabloid, 11 by 17 inches
+    wxPAPER_LEDGER,             // Ledger, 17 by 11 inches
+    wxPAPER_STATEMENT,          // Statement, 5 1/2 by 8 1/2 inches
+    wxPAPER_EXECUTIVE,          // Executive, 7 1/4 by 10 1/2 inches
+    wxPAPER_A3,                 // A3 sheet, 297 by 420 millimeters
+    wxPAPER_A4SMALL,            // A4 small sheet, 210 by 297 millimeters
+    wxPAPER_A5,                 // A5 sheet, 148 by 210 millimeters
+    wxPAPER_B4,                 // B4 sheet, 250 by 354 millimeters
+    wxPAPER_B5,                 // B5 sheet, 182-by-257-millimeter paper
+    wxPAPER_FOLIO,              // Folio, 8-1/2-by-13-inch paper
+    wxPAPER_QUARTO,             // Quarto, 215-by-275-millimeter paper
+    wxPAPER_10X14,              // 10-by-14-inch sheet
+    wxPAPER_11X17,              // 11-by-17-inch sheet
+    wxPAPER_NOTE,               // Note, 8 1/2 by 11 inches
+    wxPAPER_ENV_9,              // #9 Envelope, 3 7/8 by 8 7/8 inches
+    wxPAPER_ENV_10,             // #10 Envelope, 4 1/8 by 9 1/2 inches
+    wxPAPER_ENV_11,             // #11 Envelope, 4 1/2 by 10 3/8 inches
+    wxPAPER_ENV_12,             // #12 Envelope, 4 3/4 by 11 inches
+    wxPAPER_ENV_14,             // #14 Envelope, 5 by 11 1/2 inches
+    wxPAPER_ENV_DL,             // DL Envelope, 110 by 220 millimeters
+    wxPAPER_ENV_C5,             // C5 Envelope, 162 by 229 millimeters
+    wxPAPER_ENV_C3,             // C3 Envelope, 324 by 458 millimeters
+    wxPAPER_ENV_C4,             // C4 Envelope, 229 by 324 millimeters
+    wxPAPER_ENV_C6,             // C6 Envelope, 114 by 162 millimeters
+    wxPAPER_ENV_C65,            // C65 Envelope, 114 by 229 millimeters
+    wxPAPER_ENV_B4,             // B4 Envelope, 250 by 353 millimeters
+    wxPAPER_ENV_B5,             // B5 Envelope, 176 by 250 millimeters
+    wxPAPER_ENV_B6,             // B6 Envelope, 176 by 125 millimeters
+    wxPAPER_ENV_ITALY,          // Italy Envelope, 110 by 230 millimeters
+    wxPAPER_ENV_MONARCH,        // Monarch Envelope, 3 7/8 by 7 1/2 inches
+    wxPAPER_ENV_PERSONAL,       // 6 3/4 Envelope, 3 5/8 by 6 1/2 inches
+    wxPAPER_FANFOLD_US,         // US Std Fanfold, 14 7/8 by 11 inches
+    wxPAPER_FANFOLD_STD_GERMAN, // German Std Fanfold, 8 1/2 by 12 inches
+    wxPAPER_FANFOLD_LGL_GERMAN, // German Legal Fanfold, 8 1/2 by 13 inches
+
+    wxPAPER_ISO_B4,             // B4 (ISO) 250 x 353 mm
+    wxPAPER_JAPANESE_POSTCARD,  // Japanese Postcard 100 x 148 mm
+    wxPAPER_9X11,               // 9 x 11 in
+    wxPAPER_10X11,              // 10 x 11 in
+    wxPAPER_15X11,              // 15 x 11 in
+    wxPAPER_ENV_INVITE,         // Envelope Invite 220 x 220 mm
+    wxPAPER_LETTER_EXTRA,       // Letter Extra 9 \275 x 12 in
+    wxPAPER_LEGAL_EXTRA,        // Legal Extra 9 \275 x 15 in
+    wxPAPER_TABLOID_EXTRA,      // Tabloid Extra 11.69 x 18 in
+    wxPAPER_A4_EXTRA,           // A4 Extra 9.27 x 12.69 in
+    wxPAPER_LETTER_TRANSVERSE,  // Letter Transverse 8 \275 x 11 in
+    wxPAPER_A4_TRANSVERSE,      // A4 Transverse 210 x 297 mm
+    wxPAPER_LETTER_EXTRA_TRANSVERSE, // Letter Extra Transverse 9\275 x 12 in
+    wxPAPER_A_PLUS,             // SuperA/SuperA/A4 227 x 356 mm
+    wxPAPER_B_PLUS,             // SuperB/SuperB/A3 305 x 487 mm
+    wxPAPER_LETTER_PLUS,        // Letter Plus 8.5 x 12.69 in
+    wxPAPER_A4_PLUS,            // A4 Plus 210 x 330 mm
+    wxPAPER_A5_TRANSVERSE,      // A5 Transverse 148 x 210 mm
+    wxPAPER_B5_TRANSVERSE,      // B5 (JIS) Transverse 182 x 257 mm
+    wxPAPER_A3_EXTRA,           // A3 Extra 322 x 445 mm
+    wxPAPER_A5_EXTRA,           // A5 Extra 174 x 235 mm
+    wxPAPER_B5_EXTRA,           // B5 (ISO) Extra 201 x 276 mm
+    wxPAPER_A2,                 // A2 420 x 594 mm
+    wxPAPER_A3_TRANSVERSE,      // A3 Transverse 297 x 420 mm
+    wxPAPER_A3_EXTRA_TRANSVERSE // A3 Extra Transverse 322 x 445 mm
+
+} wxPaperSize ;
+
+typedef enum {
+    wxDUPLEX_SIMPLEX, // Non-duplex
+    wxDUPLEX_HORIZONTAL,
+    wxDUPLEX_VERTICAL
+} wxDuplexMode;
+
+
+

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

+const char* wxVERSION_STRING;

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


@@ -547,6 +769,7 @@ enum wxEventType {
  wxEVT_COMMAND_LISTBOX_SELECTED,
  wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,
  wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,
  wxEVT_COMMAND_LISTBOX_SELECTED,
  wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,
  wxEVT_COMMAND_CHECKLISTBOX_TOGGLED,

+ wxEVT_COMMAND_SPINCTRL_UPDATED,

  wxEVT_COMMAND_TEXT_UPDATED,
  wxEVT_COMMAND_TEXT_ENTER,
  wxEVT_COMMAND_MENU_SELECTED,
  wxEVT_COMMAND_TEXT_UPDATED,
  wxEVT_COMMAND_TEXT_ENTER,
  wxEVT_COMMAND_MENU_SELECTED,


@@ -593,6 +816,9 @@ enum wxEventType {
 
 /* Character input event type  */
  wxEVT_CHAR,
 
 /* Character input event type  */
  wxEVT_CHAR,

+ wxEVT_KEY_DOWN,
+ wxEVT_KEY_UP,
+ wxEVT_CHAR_HOOK,

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


@@ -604,6 +830,19 @@ enum wxEventType {
  wxEVT_SCROLL_PAGEUP,
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,
  wxEVT_SCROLL_PAGEUP,
  wxEVT_SCROLL_PAGEDOWN,
  wxEVT_SCROLL_THUMBTRACK,

+ wxEVT_SCROLL_THUMBRELEASE,
+
+ /*
+  * Scrolled Window
+  */
+ wxEVT_SCROLLWIN_TOP,
+ wxEVT_SCROLLWIN_BOTTOM,
+ wxEVT_SCROLLWIN_LINEUP,
+ wxEVT_SCROLLWIN_LINEDOWN,
+ wxEVT_SCROLLWIN_PAGEUP,
+ wxEVT_SCROLLWIN_PAGEDOWN,
+ wxEVT_SCROLLWIN_THUMBTRACK,
+ wxEVT_SCROLLWIN_THUMBRELEASE,

 
  wxEVT_SIZE = wxEVT_FIRST + 200,
  wxEVT_MOVE,
 
  wxEVT_SIZE = wxEVT_FIRST + 200,
  wxEVT_MOVE,


@@ -612,8 +851,6 @@ enum wxEventType {
  wxEVT_QUERY_END_SESSION,
  wxEVT_ACTIVATE_APP,
  wxEVT_POWER,
  wxEVT_QUERY_END_SESSION,
  wxEVT_ACTIVATE_APP,
  wxEVT_POWER,

- wxEVT_CHAR_HOOK,
- wxEVT_KEY_UP,

  wxEVT_ACTIVATE,
  wxEVT_CREATE,
  wxEVT_DESTROY,
  wxEVT_ACTIVATE,
  wxEVT_CREATE,
  wxEVT_DESTROY,


@@ -646,6 +883,7 @@ enum wxEventType {
  wxEVT_IDLE,
  wxEVT_UPDATE_UI,
 
  wxEVT_IDLE,
  wxEVT_UPDATE_UI,
 

+

  /* Generic command events */
  // Note: a click is a higher-level event
  // than button down/up
  /* Generic command events */
  // Note: a click is a higher-level event
  // than button down/up


@@ -667,9 +905,14 @@ 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,

+ wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
+ wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,
+ wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK,

 
  /* List control event types */
  wxEVT_COMMAND_LIST_BEGIN_DRAG,
 
  /* List control event types */
  wxEVT_COMMAND_LIST_BEGIN_DRAG,


@@ -685,41 +928,28 @@ enum wxEventType {
  wxEVT_COMMAND_LIST_KEY_DOWN,
  wxEVT_COMMAND_LIST_INSERT_ITEM,
  wxEVT_COMMAND_LIST_COL_CLICK,
  wxEVT_COMMAND_LIST_KEY_DOWN,
  wxEVT_COMMAND_LIST_INSERT_ITEM,
  wxEVT_COMMAND_LIST_COL_CLICK,

+ wxEVT_COMMAND_LIST_ITEM_ACTIVATED,
+ wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK,
+ wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK,
+

 
  /* Tab and notebook control event types */
  wxEVT_COMMAND_TAB_SEL_CHANGED,
  wxEVT_COMMAND_TAB_SEL_CHANGING,
  wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,
 
  /* Tab and notebook control event types */
  wxEVT_COMMAND_TAB_SEL_CHANGED,
  wxEVT_COMMAND_TAB_SEL_CHANGING,
  wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED,

- wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
+ wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING,
+
+ /* splitter window */
+ wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING,
+ wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED,
+ wxEVT_COMMAND_SPLITTER_UNSPLIT,
+ wxEVT_COMMAND_SPLITTER_DOUBLECLICKED,
+
+ wxEVT_NAVIGATION_KEY,
+

 };
 
 
 
 
 };
 
 
 
 

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