Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i,1.15,1.16 clipdrag.i,1.16,1.17 config.i,1.10,1.11 controls.i,1.17,1.18 data.i,1.13,1.14 datetime.i,1.14,1.15 defsutil.i,1.22,1.23 dialogs.i,1.17,1.18 event.i,1.12,1.13 file.i,1.10,1.11 fl.i,1.6,1.7 gdi.i,1.22,1.23 geometry.i,1.5,1.6 grid.i,1.8,1.9 help.i,1.7,1.8 html.i,1.7,1.8 image.i,1.12,1.13 mdi.i,1.7,1.8 menutool.i,1.9,1.10 override.hpp,1.39,1.40 print.i,1.9,1.10 regex.i,1.3,1.4 sizer.i,1.7,1.8 socket.i,1.7,1.8 thread.i,1.3,1.4 wave.i,1.7,1.8 windows.i,1.18,1.19 wx_datatypes.lua,1.28,1.29 wxlua.i,1.14,1.15 xml.i,1.3,1.4
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20662/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i config.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i fl.i gdi.i geometry.i grid.i help.i html.i image.i mdi.i menutool.i override.hpp print.i regex.i sizer.i socket.i thread.i wave.i windows.i wx_datatypes.lua wxlua.i xml.i Log Message: update .i files to use more HTML friendly comment markers update print.i and xml.i to 2.6.3 cleanup generate docs script to use nicer colours and whatnot Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wave.i 16 May 2006 22:47:09 -0000 1.7 --- wave.i 17 May 2006 05:02:04 -0000 1.8 *************** *** 1,14 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxSound/wxWave ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// %if wxLUA_USE_wxWave ! /////////////////////////////////////////////////////////////////////////////// // wxSound --- 1,14 ---- ! // ============================================================================ // Purpose: wxSound/wxWave ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ %if wxLUA_USE_wxWave ! //----------------------------------------------------------------------------- // wxSound *************** *** 38,42 **** %endif // %wxchkver26 ! /////////////////////////////////////////////////////////////////////////////// // wxWave --- 38,42 ---- %endif // %wxchkver26 ! //----------------------------------------------------------------------------- // wxWave *************** *** 61,65 **** %endif // %msw&!%wxchkver25 ! /////////////////////////////////////////////////////////////////////////////// // wxMediaCtrl --- 61,65 ---- %endif // %msw&!%wxchkver25 ! //----------------------------------------------------------------------------- // wxMediaCtrl *************** *** 105,109 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMediaEvent --- 105,109 ---- %endclass ! //----------------------------------------------------------------------------- // wxMediaEvent Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** menutool.i 15 May 2006 21:55:35 -0000 1.9 --- menutool.i 17 May 2006 05:02:04 -0000 1.10 *************** *** 1,12 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxMenu and wxToolbar classes ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// ! /////////////////////////////////////////////////////////////////////////////// // wxMenu --- 1,12 ---- ! // ============================================================================ // Purpose: wxMenu and wxToolbar classes ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ ! //----------------------------------------------------------------------------- // wxMenu *************** *** 75,79 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMenuBar --- 75,79 ---- %endclass ! //----------------------------------------------------------------------------- // wxMenuBar *************** *** 107,111 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMenuItem --- 107,111 ---- %endclass ! //----------------------------------------------------------------------------- // wxMenuItem *************** *** 151,155 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMenuItemList --- 151,155 ---- %endclass ! //----------------------------------------------------------------------------- // wxMenuItemList *************** *** 163,167 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMenuEvent --- 163,167 ---- %endclass ! //----------------------------------------------------------------------------- // wxMenuEvent *************** *** 182,186 **** %endif wxLUA_USE_wxMenu ! /////////////////////////////////////////////////////////////////////////////// // wxToolBarBase --- 182,186 ---- %endif wxLUA_USE_wxMenu ! //----------------------------------------------------------------------------- // wxToolBarBase *************** *** 261,265 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxToolBar --- 261,265 ---- %endclass ! //----------------------------------------------------------------------------- // wxToolBar *************** *** 273,277 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxToolBarSimple --- 273,277 ---- %endclass ! //----------------------------------------------------------------------------- // wxToolBarSimple *************** *** 285,289 **** %wxchkver22&!%wxchkver25 %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxToolBarToolBase --- 285,289 ---- %wxchkver22&!%wxchkver25 %endclass ! //----------------------------------------------------------------------------- // wxToolBarToolBase *************** *** 341,345 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxToolBarTool --- 341,345 ---- %endclass ! //----------------------------------------------------------------------------- // wxToolBarTool Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** clipdrag.i 4 May 2006 05:07:03 -0000 1.16 --- clipdrag.i 17 May 2006 05:02:04 -0000 1.17 *************** *** 1,14 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxClipboard and drag & drop and their wxDataFormat ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// // TODO - Missing wxClipboardLocker ! /////////////////////////////////////////////////////////////////////////////// // wxClipboard --- 1,14 ---- ! // ============================================================================ // Purpose: wxClipboard and drag & drop and their wxDataFormat ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ // TODO - Missing wxClipboardLocker ! //----------------------------------------------------------------------------- // wxClipboard *************** *** 37,41 **** %endif wxLUA_USE_wxClipboard ! /////////////////////////////////////////////////////////////////////////////// // wxDataFormat --- 37,41 ---- %endif wxLUA_USE_wxClipboard ! //----------------------------------------------------------------------------- // wxDataFormat *************** *** 84,88 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDataObject --- 84,88 ---- %endclass ! //----------------------------------------------------------------------------- // wxDataObject *************** *** 107,111 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDataObjectSimple --- 107,111 ---- %endclass ! //----------------------------------------------------------------------------- // wxDataObjectSimple *************** *** 125,129 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDataObjectComposite --- 125,129 ---- %endclass ! //----------------------------------------------------------------------------- // wxDataObjectComposite *************** *** 134,138 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxFileDataObject --- 134,138 ---- %endclass ! //----------------------------------------------------------------------------- // wxFileDataObject *************** *** 144,148 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxTextDataObject --- 144,148 ---- %endclass ! //----------------------------------------------------------------------------- // wxTextDataObject *************** *** 155,159 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxBitmapDataObject --- 155,159 ---- %endclass ! //----------------------------------------------------------------------------- // wxBitmapDataObject *************** *** 165,169 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxCustomDataObject --- 165,169 ---- %endclass ! //----------------------------------------------------------------------------- // wxCustomDataObject *************** *** 181,185 **** %endif wxLUA_USE_wxDataObject ! /////////////////////////////////////////////////////////////////////////////// // wxDropTarget --- 181,185 ---- %endif wxLUA_USE_wxDataObject ! //----------------------------------------------------------------------------- // wxDropTarget *************** *** 219,223 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxFileDropTarget --- 219,223 ---- %endclass ! //----------------------------------------------------------------------------- // wxFileDropTarget *************** *** 228,232 **** //%endclass ! /////////////////////////////////////////////////////////////////////////////// // wxTextDropTarget --- 228,232 ---- //%endclass ! //----------------------------------------------------------------------------- // wxTextDropTarget *************** *** 236,240 **** //%endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDropSource --- 236,240 ---- //%endclass ! //----------------------------------------------------------------------------- // wxDropSource *************** *** 252,256 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDropFilesEvent --- 252,256 ---- %endclass ! //----------------------------------------------------------------------------- // wxDropFilesEvent *************** *** 270,274 **** %endif wxLUA_USE_wxDragDrop ! /////////////////////////////////////////////////////////////////////////////// // wxMetafile --- 270,274 ---- %endif wxLUA_USE_wxDragDrop ! //----------------------------------------------------------------------------- // wxMetafile *************** *** 288,292 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMetafileDC %class %delete %noclassinfo wxMetafileDC, wxDC --- 288,292 ---- %endclass ! //----------------------------------------------------------------------------- // wxMetafileDC %class %delete %noclassinfo wxMetafileDC, wxDC Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** data.i 1 May 2006 19:36:30 -0000 1.13 --- data.i 17 May 2006 05:02:04 -0000 1.14 *************** *** 1,12 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: data classes, wxObject, arrays, lists, hash ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// ! /////////////////////////////////////////////////////////////////////////////// // wxClientData --- 1,12 ---- ! // ============================================================================ // Purpose: data classes, wxObject, arrays, lists, hash ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ ! //----------------------------------------------------------------------------- // wxClientData *************** *** 22,26 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxStringClientData --- 22,26 ---- %endclass ! //----------------------------------------------------------------------------- // wxStringClientData *************** *** 32,36 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxObject --- 32,36 ---- %endclass ! //----------------------------------------------------------------------------- // wxObject *************** *** 61,65 **** %endif wxLUA_USE_wxObject ! /////////////////////////////////////////////////////////////////////////////// // wxClassInfo --- 61,65 ---- %endif wxLUA_USE_wxObject ! //----------------------------------------------------------------------------- // wxClassInfo *************** *** 88,92 **** %endif wxLUA_USE_wxClassInfo ! /////////////////////////////////////////////////////////////////////////////// // wxValidator --- 88,92 ---- %endif wxLUA_USE_wxClassInfo ! //----------------------------------------------------------------------------- // wxValidator *************** *** 110,114 **** %endif wxLUA_USE_wxValidator ! /////////////////////////////////////////////////////////////////////////////// // wxTextValidator --- 110,114 ---- %endif wxLUA_USE_wxValidator ! //----------------------------------------------------------------------------- // wxTextValidator *************** *** 152,156 **** %endif wxLUA_USE_wxTextValidator ! /////////////////////////////////////////////////////////////////////////////// // wxGenericValidator --- 152,156 ---- %endif wxLUA_USE_wxTextValidator ! //----------------------------------------------------------------------------- // wxGenericValidator *************** *** 172,176 **** %endif wxLUA_USE_wxGenericValidator ! /////////////////////////////////////////////////////////////////////////////// // wxList --- 172,176 ---- %endif wxLUA_USE_wxGenericValidator ! //----------------------------------------------------------------------------- // wxList *************** *** 214,218 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxNode - wxList --- 214,218 ---- %endclass ! //----------------------------------------------------------------------------- // wxNode - wxList *************** *** 233,237 **** %endif wxLUA_USE_wxList ! /////////////////////////////////////////////////////////////////////////////// // wxArray - can't implement, here's the list of generic functions --- 233,237 ---- %endif wxLUA_USE_wxList ! //----------------------------------------------------------------------------- // wxArray - can't implement, here's the list of generic functions *************** *** 248,252 **** //%endclass ! /////////////////////////////////////////////////////////////////////////////// // wxArrayInt --- 248,252 ---- //%endclass ! //----------------------------------------------------------------------------- // wxArrayInt *************** *** 274,278 **** %endif wxLUA_USE_wxArrayInt ! /////////////////////////////////////////////////////////////////////////////// // wxArrayString --- 274,278 ---- %endif wxLUA_USE_wxArrayInt ! //----------------------------------------------------------------------------- // wxArrayString *************** *** 304,308 **** %endif wxLUA_USE_wxArrayString ! /////////////////////////////////////////////////////////////////////////////// // wxStringList - is deprecated in wxWidgets since 2.2 --- 304,308 ---- %endif wxLUA_USE_wxArrayString ! //----------------------------------------------------------------------------- // wxStringList - is deprecated in wxWidgets since 2.2 *************** *** 319,323 **** //%endif wxLUA_USE_wxStringList ! /////////////////////////////////////////////////////////////////////////////// // wxHashTable - lua tables are hashtables --- 319,323 ---- //%endif wxLUA_USE_wxStringList ! //----------------------------------------------------------------------------- // wxHashTable - lua tables are hashtables *************** *** 351,355 **** //%endif wxLUA_USE_wxHashTable ! /////////////////////////////////////////////////////////////////////////////// // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong --- 351,355 ---- //%endif wxLUA_USE_wxHashTable ! //----------------------------------------------------------------------------- // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wx_datatypes.lua 16 May 2006 22:47:09 -0000 1.28 --- wx_datatypes.lua 17 May 2006 05:02:05 -0000 1.29 *************** *** 1356,1359 **** --- 1356,1365 ---- Name = "wxHelpSearchMode", }, + wxHotkeyModifier = { + Condition = "wxUSE_HOTKEY", + DefType = "enum", + Intrinsic = true, + Name = "wxHotkeyModifier", + }, wxHtmlCell = { Condition = "wxLUA_USE_wxHTML", *************** *** 2013,2017 **** }, wxPageSetupDialog = { ! BaseClass = "wxDialog", Condition = "wxLUA_USE_wxPrint", DefType = "class", --- 2019,2023 ---- }, wxPageSetupDialog = { ! BaseClass = "wxObject", Condition = "wxLUA_USE_wxPrint", DefType = "class", *************** *** 2102,2105 **** --- 2108,2118 ---- Name = "wxPoint2DInt", }, + wxPostScriptDC = { + BaseClass = "wxDC", + Condition = "(wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT) && (wxLUA_USE_wxPrint)", + DefType = "class", + Intrinsic = false, + Name = "wxPostScriptDC", + }, wxPreviewCanvas = { BaseClass = "wxScrolledWindow", *************** *** 2109,2112 **** --- 2122,2132 ---- Name = "wxPreviewCanvas", }, + wxPreviewControlBar = { + BaseClass = "wxPanel", + Condition = "wxLUA_USE_wxPrint", + DefType = "class", + Intrinsic = false, + Name = "wxPreviewControlBar", + }, wxPreviewFrame = { BaseClass = "wxFrame", *************** *** 2171,2175 **** wxPrinterDC = { BaseClass = "wxDC", ! Condition = "(defined(__WXMSW__)) && (wxLUA_USE_wxPrint)", DefType = "class", Intrinsic = false, --- 2191,2195 ---- wxPrinterDC = { BaseClass = "wxDC", ! Condition = "(defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint)", DefType = "class", Intrinsic = false, Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** print.i 13 May 2006 17:20:51 -0000 1.9 --- print.i 17 May 2006 05:02:04 -0000 1.10 *************** *** 1,9 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: printing related classes ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ! ///////////////////////////////////////////////////////////////////////////// %if wxLUA_USE_wxPrint --- 1,10 ---- ! // ============================================================================ // Purpose: printing related classes ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ! // wxWidgets: Updated to 2.6.3 ! // ============================================================================ %if wxLUA_USE_wxPrint *************** *** 14,29 **** %include "wxbind/include/wxlprint.h" ! /////////////////////////////////////////////////////////////////////////////// // wxPrintout %class wxPrintout, wxObject wxDC * GetDC() void GetPageSizeMM(int *w, int *h) void GetPageSizePixels(int *w, int *h) void GetPPIPrinter(int *w, int *h) void GetPPIScreen(int *w, int *h) ! // a virtual function in wxLuaPrintout virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) ! bool IsPreview() bool HasPage(int pageNum) bool OnBeginDocument(int startPage, int endPage) void OnEndDocument() --- 15,38 ---- %include "wxbind/include/wxlprint.h" ! //----------------------------------------------------------------------------- // wxPrintout %class wxPrintout, wxObject + // virtual class, use wxLuaPrintout + wxDC * GetDC() + // %override [int minPage, int maxPage, int pageFrom, int pageTo] wxPrintout::GetPageInfo() + void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) + // %override [int w, int h] wxPrintout::GetPageSizeMM() void GetPageSizeMM(int *w, int *h) + // %override [int w, int h] wxPrintout::GetPageSizePixels() void GetPageSizePixels(int *w, int *h) + // %override [int w, int h] wxPrintout::GetPPIPrinter() void GetPPIPrinter(int *w, int *h) + // %override [int w, int h] wxPrintout::GetPPIScreen() void GetPPIScreen(int *w, int *h) ! wxString GetTitle() bool HasPage(int pageNum) + bool IsPreview() bool OnBeginDocument(int startPage, int endPage) void OnEndDocument() *************** *** 36,40 **** %if wxLUA_USE_wxLuaPrintout ! /////////////////////////////////////////////////////////////////////////////// // wxPrinter --- 45,49 ---- %if wxLUA_USE_wxLuaPrintout ! //----------------------------------------------------------------------------- // wxPrinter *************** *** 45,52 **** %endenum ! %class %delete %noclassinfo wxPrinter, wxObject wxPrinter(wxPrintDialogData* data = NULL) //bool Abort() ! void CreateAbortWindow(wxWindow* parent, wxLuaPrintout* printout) static wxPrinterError GetLastError() wxPrintDialogData& GetPrintDialogData() --- 54,63 ---- %endenum ! %class %delete wxPrinter, wxObject wxPrinter(wxPrintDialogData* data = NULL) + //bool Abort() ! virtual void CreateAbortWindow(wxWindow* parent, wxLuaPrintout* printout) ! bool GetAbort() const static wxPrinterError GetLastError() wxPrintDialogData& GetPrintDialogData() *************** *** 59,63 **** %endif wxLUA_USE_wxLuaPrintout ! /////////////////////////////////////////////////////////////////////////////// // wxPrintData --- 70,74 ---- %endif wxLUA_USE_wxLuaPrintout ! //----------------------------------------------------------------------------- // wxPrintData *************** *** 72,145 **** %enum wxPaperSize ! wxPAPER_10X11 ! wxPAPER_10X14 ! wxPAPER_11X17 ! wxPAPER_15X11 ! wxPAPER_9X11 ! wxPAPER_A_PLUS ! wxPAPER_A2 ! wxPAPER_A3 ! wxPAPER_A3_EXTRA ! wxPAPER_A3_EXTRA_TRANSVERSE ! wxPAPER_A3_TRANSVERSE wxPAPER_A4 ! wxPAPER_A4_EXTRA ! wxPAPER_A4_PLUS ! wxPAPER_A4_TRANSVERSE wxPAPER_A4SMALL wxPAPER_A5 - wxPAPER_A5_EXTRA - wxPAPER_A5_TRANSVERSE - wxPAPER_B_PLUS wxPAPER_B4 wxPAPER_B5 ! wxPAPER_B5_EXTRA ! wxPAPER_B5_TRANSVERSE ! wxPAPER_CSHEET ! wxPAPER_DSHEET wxPAPER_ENV_10 wxPAPER_ENV_11 wxPAPER_ENV_12 wxPAPER_ENV_14 ! wxPAPER_ENV_9 ! wxPAPER_ENV_B4 ! wxPAPER_ENV_B5 ! wxPAPER_ENV_B6 wxPAPER_ENV_C3 wxPAPER_ENV_C4 - wxPAPER_ENV_C5 wxPAPER_ENV_C6 wxPAPER_ENV_C65 ! wxPAPER_ENV_DL ! wxPAPER_ENV_INVITE wxPAPER_ENV_ITALY wxPAPER_ENV_MONARCH wxPAPER_ENV_PERSONAL - wxPAPER_ESHEET - wxPAPER_EXECUTIVE - wxPAPER_FANFOLD_LGL_GERMAN - wxPAPER_FANFOLD_STD_GERMAN wxPAPER_FANFOLD_US ! wxPAPER_FOLIO wxPAPER_ISO_B4 wxPAPER_JAPANESE_POSTCARD ! wxPAPER_LEDGER ! wxPAPER_LEGAL ! wxPAPER_LEGAL_EXTRA ! wxPAPER_LETTER wxPAPER_LETTER_EXTRA wxPAPER_LETTER_EXTRA_TRANSVERSE wxPAPER_LETTER_PLUS ! wxPAPER_LETTER_TRANSVERSE ! wxPAPER_LETTERSMALL ! wxPAPER_NONE ! wxPAPER_NOTE ! wxPAPER_QUARTO ! wxPAPER_STATEMENT ! wxPAPER_TABLOID ! wxPAPER_TABLOID_EXTRA %endenum ! %enum wxPrintQuality wxPRINT_QUALITY_DRAFT wxPRINT_QUALITY_HIGH --- 83,208 ---- %enum wxPaperSize ! wxPAPER_NONE ! wxPAPER_LETTER ! wxPAPER_LEGAL wxPAPER_A4 ! wxPAPER_CSHEET ! wxPAPER_DSHEET ! wxPAPER_ESHEET ! wxPAPER_LETTERSMALL ! wxPAPER_TABLOID ! wxPAPER_LEDGER ! wxPAPER_STATEMENT ! wxPAPER_EXECUTIVE ! wxPAPER_A3 wxPAPER_A4SMALL wxPAPER_A5 wxPAPER_B4 wxPAPER_B5 ! wxPAPER_FOLIO ! wxPAPER_QUARTO ! wxPAPER_10X14 ! wxPAPER_11X17 ! wxPAPER_NOTE ! wxPAPER_ENV_9 wxPAPER_ENV_10 wxPAPER_ENV_11 wxPAPER_ENV_12 wxPAPER_ENV_14 ! wxPAPER_ENV_DL ! wxPAPER_ENV_C5 wxPAPER_ENV_C3 wxPAPER_ENV_C4 wxPAPER_ENV_C6 wxPAPER_ENV_C65 ! wxPAPER_ENV_B4 ! wxPAPER_ENV_B5 ! wxPAPER_ENV_B6 wxPAPER_ENV_ITALY wxPAPER_ENV_MONARCH wxPAPER_ENV_PERSONAL wxPAPER_FANFOLD_US ! wxPAPER_FANFOLD_STD_GERMAN ! wxPAPER_FANFOLD_LGL_GERMAN ! wxPAPER_ISO_B4 wxPAPER_JAPANESE_POSTCARD ! wxPAPER_9X11 ! wxPAPER_10X11 ! wxPAPER_15X11 ! wxPAPER_ENV_INVITE wxPAPER_LETTER_EXTRA + wxPAPER_LEGAL_EXTRA + wxPAPER_TABLOID_EXTRA + wxPAPER_A4_EXTRA + wxPAPER_LETTER_TRANSVERSE + wxPAPER_A4_TRANSVERSE wxPAPER_LETTER_EXTRA_TRANSVERSE + wxPAPER_A_PLUS + wxPAPER_B_PLUS wxPAPER_LETTER_PLUS ! wxPAPER_A4_PLUS ! wxPAPER_A5_TRANSVERSE ! wxPAPER_B5_TRANSVERSE ! wxPAPER_A3_EXTRA ! wxPAPER_A5_EXTRA ! wxPAPER_B5_EXTRA ! wxPAPER_A2 ! wxPAPER_A3_TRANSVERSE ! wxPAPER_A3_EXTRA_TRANSVERSE ! ! wxPAPER_DBL_JAPANESE_POSTCARD ! wxPAPER_A6 ! wxPAPER_JENV_KAKU2 ! wxPAPER_JENV_KAKU3 ! wxPAPER_JENV_CHOU3 ! wxPAPER_JENV_CHOU4 ! wxPAPER_LETTER_ROTATED ! wxPAPER_A3_ROTATED ! wxPAPER_A4_ROTATED ! wxPAPER_A5_ROTATED ! wxPAPER_B4_JIS_ROTATED ! wxPAPER_B5_JIS_ROTATED ! wxPAPER_JAPANESE_POSTCARD_ROTATED ! wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED ! wxPAPER_A6_ROTATED ! wxPAPER_JENV_KAKU2_ROTATED ! wxPAPER_JENV_KAKU3_ROTATED ! wxPAPER_JENV_CHOU3_ROTATED ! wxPAPER_JENV_CHOU4_ROTATED ! wxPAPER_B6_JIS ! wxPAPER_B6_JIS_ROTATED ! wxPAPER_12X11 ! wxPAPER_JENV_YOU4 ! wxPAPER_JENV_YOU4_ROTATED ! wxPAPER_P16K ! wxPAPER_P32K ! wxPAPER_P32KBIG ! wxPAPER_PENV_1 ! wxPAPER_PENV_2 ! wxPAPER_PENV_3 ! wxPAPER_PENV_4 ! wxPAPER_PENV_5 ! wxPAPER_PENV_6 ! wxPAPER_PENV_7 ! wxPAPER_PENV_8 ! wxPAPER_PENV_9 ! wxPAPER_PENV_10 ! wxPAPER_P16K_ROTATED ! wxPAPER_P32K_ROTATED ! wxPAPER_P32KBIG_ROTATED ! wxPAPER_PENV_1_ROTATED ! wxPAPER_PENV_2_ROTATED ! wxPAPER_PENV_3_ROTATED ! wxPAPER_PENV_4_ROTATED ! wxPAPER_PENV_5_ROTATED ! wxPAPER_PENV_6_ROTATED ! wxPAPER_PENV_7_ROTATED ! wxPAPER_PENV_8_ROTATED ! wxPAPER_PENV_9_ROTATED ! wxPAPER_PENV_10_ROTATED %endenum ! %enum wxPrintQuality // actually not an enum, but a typedef int wxPRINT_QUALITY_DRAFT wxPRINT_QUALITY_HIGH *************** *** 177,297 **** %endif - // FIXME wxPrintData has changed fom 2.4 to 2.6 update it %class %delete wxPrintData, wxObject wxPrintData() wxPrintData *Copy() ! bool GetCollate() ! bool GetColour() ! wxDuplexMode GetDuplex() ! int GetNoCopies() ! int GetOrientation() ! wxPaperSize GetPaperId() ! wxString GetPrinterName() ! wxPrintQuality GetQuality() ! %wxchkver25 wxPrintBin GetBin() const ! wxSize GetPaperSize() ! !%wxchkver27 const wxString& GetPrinterCommand() ! !%wxchkver27 const wxString& GetPrinterOptions() ! !%wxchkver27 const wxString& GetPreviewCommand() ! wxString GetFilename() ! !%wxchkver27 const wxString& GetFontMetricPath() ! !%wxchkver27 double GetPrinterScaleX() ! !%wxchkver27 double GetPrinterScaleY() ! !%wxchkver27 long GetPrinterTranslateX() ! !%wxchkver27 long GetPrinterTranslateY() ! wxPrintMode GetPrintMode() void SetCollate(bool flag) %property=Collate, read, write - void SetColour(bool flag) %property=Colour, read, write - void SetDuplex(wxDuplexMode duplex) %property=Duplex, read, write ! void SetNoCopies(int v) %property=NoCopies, read, write - void SetOrientation(int orientation) %property=Orientation, read, write - void SetPaperId(wxPaperSize sizeId) %property=PaperId, read, write - void SetPrinterName(const wxString& printerName) - %property=PrinterName, read, write - void SetQuality(wxPrintQuality quality) - %property=Quality, read, write - void SetPaperSize(const wxSize& paperSize) %property=PaperSize, read, write ! !%wxchkver27 void SetPrinterCommand(const wxString& command) ! !%wxchkver27 %property=PrinterCommand, read, write ! !%wxchkver27 void SetPrinterOptions(const wxString& options) ! !%wxchkver27 %property=PrinterOptions, read, write ! !%wxchkver27 void SetPreviewCommand(const wxString& command) ! !%wxchkver27 %property=PreviewCommand, read, write ! void SetFilename(const wxString& filename) ! %property=Filename, read, write ! !%wxchkver27 void SetFontMetricPath(const wxString& path) ! !%wxchkver27 %property=FontMetricPath, read, write ! !%wxchkver27 void SetPrinterScaleX(double x) ! !%wxchkver27 %property=PrinterScaleX, read, write ! !%wxchkver27 void SetPrinterScaleY(double y) ! !%wxchkver27 %property=PrinterScaleY, read, write ! !%wxchkver27 void SetPrinterScaling(double x, double y) ! !%wxchkver27 void SetPrinterTranslateX(long x) ! !%wxchkver27 %property=PrinterTranslateX, read, write ! !%wxchkver27 void SetPrinterTranslateY(long y) ! !%wxchkver27 %property=PrinterTranslateY, read, write ! !%wxchkver27 void SetPrinterTranslation(long x, long y) %property=PrintMode, read, write ! void SetPrintMode(wxPrintMode printMode) %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPageSetupDialogData %class %delete wxPageSetupDialogData, wxObject wxPageSetupDialogData() ! void EnableHelp(bool flag) void EnableMargins(bool flag) void EnableOrientation(bool flag) void EnablePaper(bool flag) void EnablePrinter(bool flag) ! bool GetDefaultMinMargins() ! bool GetEnableMargins() ! %win %property=EnableMargins, read ! bool GetEnableOrientation() ! %win %property=EnableOrientation, read ! bool GetEnablePaper() ! %win %property=EnablePaper, read ! bool GetEnablePrinter() ! %win %property=EnablePrinter, read ! bool GetEnableHelp() ! %win %property=EnableHelp, read ! bool GetDefaultInfo() ! wxPoint GetMarginTopLeft() ! wxPoint GetMarginBottomRight() ! wxPoint GetMinMarginTopLeft() ! wxPoint GetMinMarginBottomRight() ! wxPaperSize GetPaperId() ! wxSize GetPaperSize() ! const wxPrintData& GetPrintData() ! void SetDefaultInfo(bool flag) %property=DefaultInfo, read, write - void SetDefaultMinMargins(bool flag) %property=DefaultMinMargins, read, write - void SetMarginTopLeft(const wxPoint& pt) - %property=MarginTopLeft, read, write - void SetMarginBottomRight(const wxPoint& pt) %property=MarginBottomRight, read, write ! void SetMinMarginTopLeft(const wxPoint& pt) ! %property=MinMarginTopLeft, read, write ! void SetMinMarginBottomRight(const wxPoint& pt) %property=MinMarginBottomRight, read, write ! void SetPaperId(wxPaperSize id) %property=PaperId, read, write - void SetPaperSize(const wxSize& size) %property=PaperSize, read, write - void SetPrintData(const wxPrintData& printData) %property=PrintData, read, write - wxPageSetupDialogData *Copy() %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPageSetupDialog --- 240,384 ---- %endif %class %delete wxPrintData, wxObject wxPrintData() + %constructor wxPrintDataCopy(const wxPrintData& data) + wxPrintData *Copy() ! ! // copied straight from cmndata.h not docs ! int GetNoCopies() const ! bool GetCollate() const ! int GetOrientation() const ! bool Ok() const ! wxString GetPrinterName() const ! bool GetColour() const ! wxDuplexMode GetDuplex() const ! wxPaperSize GetPaperId() const ! wxSize GetPaperSize() const ! wxPrintQuality GetQuality() const ! wxPrintBin GetBin() const ! wxPrintMode GetPrintMode() const ! void SetNoCopies(int v) void SetCollate(bool flag) + void SetOrientation(int orient) + void SetPrinterName(const wxString& name) + void SetColour(bool colour) + void SetDuplex(wxDuplexMode duplex) + void SetPaperId(wxPaperSize sizeId) + void SetPaperSize(const wxSize& sz) + void SetQuality(wxPrintQuality quality) + void SetBin(wxPrintBin bin) + void SetPrintMode(wxPrintMode printMode) + wxString GetFilename() const + void SetFilename( const wxString &filename ) + + %operator void operator=(const wxPrintData& data) + + // these are all WXWIN_COMPATIBILITY_2_4 and for postscript printing only + //!%wxchkver27 wxString GetPrinterCommand() + //!%wxchkver27 wxString GetPrinterOptions() + //!%wxchkver27 wxString GetPreviewCommand() + //!%wxchkver27 const wxString& GetFontMetricPath() + //!%wxchkver27 double GetPrinterScaleX() + //!%wxchkver27 double GetPrinterScaleY() + //!%wxchkver27 long GetPrinterTranslateX() + //!%wxchkver27 long GetPrinterTranslateY() + //!%wxchkver27 void SetPrinterCommand(const wxString& command) + //!%wxchkver27 void SetPrinterOptions(const wxString& options) + //!%wxchkver27 void SetPreviewCommand(const wxString& command) + //!%wxchkver27 void SetFontMetricPath(const wxString& path) + //!%wxchkver27 void SetPrinterScaleX(double x) + //!%wxchkver27 void SetPrinterScaleY(double y) + //!%wxchkver27 void SetPrinterScaling(double x, double y) + //!%wxchkver27 void SetPrinterTranslateX(long x) + //!%wxchkver27 void SetPrinterTranslateY(long y) + //!%wxchkver27 void SetPrinterTranslation(long x, long y) + %property=Collate, read, write %property=Colour, read, write %property=Duplex, read, write ! %property=Filename, read, write %property=NoCopies, read, write %property=Orientation, read, write %property=PaperId, read, write %property=PaperSize, read, write ! %property=PrinterName, read, write %property=PrintMode, read, write ! %property=Quality, read, write ! ! //!%wxchkver27 %property=FontMetricPath, read, write ! //!%wxchkver27 %property=PreviewCommand, read, write ! //!%wxchkver27 %property=PrinterCommand, read, write ! //!%wxchkver27 %property=PrinterOptions, read, write ! //!%wxchkver27 %property=PrinterScaleX, read, write ! //!%wxchkver27 %property=PrinterScaleY, read, write ! //!%wxchkver27 %property=PrinterTranslateX, read, write ! //!%wxchkver27 %property=PrinterTranslateY, read, write ! %endclass ! //----------------------------------------------------------------------------- // wxPageSetupDialogData %class %delete wxPageSetupDialogData, wxObject wxPageSetupDialogData() ! %constructor wxPageSetupDialogDataCopy(const wxPageSetupDialogData& data) ! ! wxPageSetupDialogData *Copy() ! ! // copied straight from cmndata.h not docs ! wxSize GetPaperSize() const ! wxPaperSize GetPaperId() const ! wxPoint GetMinMarginTopLeft() const ! wxPoint GetMinMarginBottomRight() const ! wxPoint GetMarginTopLeft() const ! wxPoint GetMarginBottomRight() const ! bool GetDefaultMinMargins() const ! bool GetEnableMargins() const ! bool GetEnableOrientation() const ! bool GetEnablePaper() const ! bool GetEnablePrinter() const ! bool GetDefaultInfo() const ! bool GetEnableHelp() const ! bool Ok() const ! void SetPaperSize(const wxSize& sz) ! void SetPaperId(wxPaperSize id) ! //%rename SetPaperSizeById void SetPaperSize(wxPaperSize id) ! void SetMinMarginTopLeft(const wxPoint& pt) ! void SetMinMarginBottomRight(const wxPoint& pt) ! void SetMarginTopLeft(const wxPoint& pt) ! void SetMarginBottomRight(const wxPoint& pt) ! void SetDefaultMinMargins(bool flag) ! void SetDefaultInfo(bool flag) void EnableMargins(bool flag) void EnableOrientation(bool flag) void EnablePaper(bool flag) void EnablePrinter(bool flag) ! void EnableHelp(bool flag) ! void CalculateIdFromPaperSize() ! void CalculatePaperSizeFromId() ! wxPrintData& GetPrintData() ! void SetPrintData(const wxPrintData& printData) ! ! //wxPageSetupDialogData& operator=(const wxPageSetupData& data) ! //wxPageSetupDialogData& operator=(const wxPrintData& data) ! ! %property=EnableHelp, read ! %property=EnableMargins, read ! %property=EnableOrientation, read ! %property=EnablePaper, read ! %property=EnablePrinter, read %property=DefaultInfo, read, write %property=DefaultMinMargins, read, write %property=MarginBottomRight, read, write ! %property=MarginTopLeft, read, write %property=MinMarginBottomRight, read, write ! %property=MinMarginTopLeft, read, write %property=PaperId, read, write %property=PaperSize, read, write %property=PrintData, read, write %endclass ! //----------------------------------------------------------------------------- // wxPageSetupDialog *************** *** 300,372 **** //%typedef wxPageSetupDialog wxPageSetupDialogBase ! %class wxPageSetupDialog, wxDialog wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL) ! wxPageSetupDialogData& GetPageSetupData() ! %property=PageSetupData, read int ShowModal() %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPrintDialog ! //!%wxchkver26 %class wxPrintDialog, wxDialog ! %class wxPrintDialog, wxObject // FIXME how to make this work wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL) wxPrintDialogData& GetPrintDialogData() ! %property=PrintDialogData, read wxDC* GetPrintDC() - %property=PrintDC, read int ShowModal() %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPrintDialogData %class %delete wxPrintDialogData, wxObject wxPrintDialogData() ! %constructor wxPrintDialogDataFromDialogData(wxPrintDialogData& dialogData) ! %constructor wxPrintDialogDataFromPrintData(wxPrintData& data) ! void EnableHelp(bool flag) ! void EnablePageNumbers(bool flag) void EnablePrintToFile(bool flag) void EnableSelection(bool flag) ! bool GetAllPages() ! %property=AllPages, read ! bool GetCollate() ! int GetFromPage() ! int GetMinPage() ! int GetMaxPage() ! int GetNoCopies() ! const wxPrintData& GetPrintData() ! bool GetPrintToFile() ! int GetToPage() ! void SetCollate(bool flag) %property=Collate, read, write - void SetFromPage(int page) %property=FromPage, read, write - void SetMinPage(int page) %property=MinPage, read, write - void SetMaxPage(int page) %property=MaxPage, read, write - void SetNoCopies(int n) %property=NoCopies, read, write - void SetPrintData(const wxPrintData& printData) %property=PrintData, read, write - void SetPrintToFile(bool flag) %property=PrintToFile, read, write - void SetSelection(bool flag) - !%wxchkver27 void SetSetupDialog(bool flag) - void SetToPage(int page) %property=ToPage, read, write %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPreviewCanvas %class %noclassinfo wxPreviewCanvas, wxScrolledWindow wxPreviewCanvas(wxPrintPreview *preview, wxWindow *parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxPreviewCanvas") %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPrintPreview %if wxLUA_USE_wxLuaPrintout --- 387,505 ---- //%typedef wxPageSetupDialog wxPageSetupDialogBase ! %class wxPageSetupDialog, wxObject // NOT a wxDialog in 2.6 wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL) ! ! wxPageSetupDialogData& GetPageSetupDialogData() int ShowModal() + + %property=PageSetupDialogData, read %endclass ! //----------------------------------------------------------------------------- // wxPrintDialog ! %class wxPrintDialog, wxObject // NOT a wxDialog in 2.6 wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL) + wxPrintDialogData& GetPrintDialogData() ! wxPrintData& GetPrintData(); wxDC* GetPrintDC() int ShowModal() + + %property=PrintDialogData, read + %property=PrintDC, read %endclass ! //----------------------------------------------------------------------------- // wxPrintDialogData %class %delete wxPrintDialogData, wxObject wxPrintDialogData() ! %constructor wxPrintDialogDataCopy(const wxPrintDialogData& dialogData) ! %constructor wxPrintDialogDataFromPrintData(const wxPrintData& data) ! ! // copied straight from cmndata.h not docs ! int GetFromPage() const ! int GetToPage() const ! int GetMinPage() const ! int GetMaxPage() const ! int GetNoCopies() const ! bool GetAllPages() const ! bool GetSelection() const ! bool GetCollate() const ! bool GetPrintToFile() const ! // WXWIN_COMPATIBILITY_2_4 //bool GetSetupDialog() const ! void SetFromPage(int v) ! void SetToPage(int v) ! void SetMinPage(int v) ! void SetMaxPage(int v) ! void SetNoCopies(int v) ! void SetAllPages(bool flag) ! void SetSelection(bool flag) ! void SetCollate(bool flag) ! void SetPrintToFile(bool flag) ! // WXWIN_COMPATIBILITY_2_4 //void SetSetupDialog(bool flag) { m_printSetupDialog = flag; }; void EnablePrintToFile(bool flag) void EnableSelection(bool flag) ! void EnablePageNumbers(bool flag) ! void EnableHelp(bool flag) ! bool GetEnablePrintToFile() const ! bool GetEnableSelection() const ! bool GetEnablePageNumbers() const ! bool GetEnableHelp() const ! bool Ok() const ! wxPrintData& GetPrintData() ! void SetPrintData(const wxPrintData& printData) ! ! %operator void operator=(const wxPrintDialogData& data) ! %property=Collate, read, write %property=FromPage, read, write %property=MinPage, read, write %property=MaxPage, read, write %property=NoCopies, read, write %property=PrintData, read, write %property=PrintToFile, read, write %property=ToPage, read, write %endclass ! //----------------------------------------------------------------------------- // wxPreviewCanvas %class %noclassinfo wxPreviewCanvas, wxScrolledWindow wxPreviewCanvas(wxPrintPreview *preview, wxWindow *parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxPreviewCanvas") + %endclass ! //----------------------------------------------------------------------------- ! // wxPreviewControlBar ! ! %define wxPREVIEW_PRINT ! %define wxPREVIEW_PREVIOUS ! %define wxPREVIEW_NEXT ! %define wxPREVIEW_ZOOM ! %define wxPREVIEW_FIRST ! %define wxPREVIEW_LAST ! %define wxPREVIEW_GOTO ! ! %define wxID_PREVIEW_CLOSE ! %define wxID_PREVIEW_NEXT ! %define wxID_PREVIEW_PREVIOUS ! %define wxID_PREVIEW_PRINT ! %define wxID_PREVIEW_ZOOM ! %define wxID_PREVIEW_FIRST ! %define wxID_PREVIEW_LAST ! %define wxID_PREVIEW_GOTO ! ! %class wxPreviewControlBar, wxPanel ! wxPreviewControlBar(wxPrintPreview* preview, long buttons, wxWindow* parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxPreviewControlBar") ! ! //void CreateButtons() ! virtual void SetZoomControl(int zoom) ! virtual int GetZoomControl() ! //virtual wxPrintPreviewBase *GetPrintPreview() const ! %endclass ! ! //----------------------------------------------------------------------------- // wxPrintPreview %if wxLUA_USE_wxLuaPrintout *************** *** 374,386 **** %class %noclassinfo wxPrintPreview, wxObject wxPrintPreview(wxLuaPrintout* printout, wxLuaPrintout* printoutForPrinting, wxPrintData* data=NULL) bool DrawBlankPage(wxPreviewCanvas* window, wxDC& dc) ! wxWindow* GetCanvas() int GetCurrentPage() wxFrame * GetFrame() int GetMaxPage() int GetMinPage() ! //const wxPrintData& GetPrintData() ! wxPrintout * GetPrintout() ! wxPrintout * GetPrintoutForPrinting() bool Ok() bool PaintPage(wxPreviewCanvas* window, wxDC &dc) --- 507,519 ---- %class %noclassinfo wxPrintPreview, wxObject wxPrintPreview(wxLuaPrintout* printout, wxLuaPrintout* printoutForPrinting, wxPrintData* data=NULL) + bool DrawBlankPage(wxPreviewCanvas* window, wxDC& dc) ! wxPreviewCanvas* GetCanvas() int GetCurrentPage() wxFrame * GetFrame() int GetMaxPage() int GetMinPage() ! wxPrintout* GetPrintout() ! wxPrintout* GetPrintoutForPrinting() bool Ok() bool PaintPage(wxPreviewCanvas* window, wxDC &dc) *************** *** 388,431 **** bool RenderPage(int pageNum) void SetCanvas(wxPreviewCanvas* window) - %property=Canvas, read, write void SetCurrentPage(int pageNum) void SetFrame(wxFrame *frame) - %property=Frame, read, write void SetPrintout(wxLuaPrintout *printout) - %property=Printout, read, write void SetZoom(int percent) %endclass ! //////////////////////////////////////////////////////////////////////////////// // wxPreviewFrame %class wxPreviewFrame, wxFrame wxPreviewFrame(wxPrintPreview *preview, wxFrame *parent, const wxString &title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString &name = "wxPreviewFrame") void CreateControlBar() void CreateCanvas() void Initialize() %endclass %endif wxLUA_USE_wxLuaPrintout ! /////////////////////////////////////////////////////////////////////////////// // wxPostScriptDC ! //%class %delete wxPostScriptDC, wxDC ! // %include "wx/dcps.h" ! // wxPostScriptDC(const wxPrintData& printData) ! // static void SetResolution(int ppi) ! // static int GetResolution() ! //%endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPrinterDC ! %if %msw %class %delete wxPrinterDC, wxDC - %include "wx/dcprint.h" wxPrinterDC(const wxPrintData& printData) %endclass ! %endif %endif wxLUA_USE_wxPrint --- 521,575 ---- bool RenderPage(int pageNum) void SetCanvas(wxPreviewCanvas* window) void SetCurrentPage(int pageNum) void SetFrame(wxFrame *frame) void SetPrintout(wxLuaPrintout *printout) void SetZoom(int percent) + + %property=Canvas, read, write + %property=Frame, read, write + %property=Printout, read, write %endclass ! //----------------------------------------------------------------------------- // wxPreviewFrame %class wxPreviewFrame, wxFrame wxPreviewFrame(wxPrintPreview *preview, wxFrame *parent, const wxString &title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString &name = "wxPreviewFrame") + void CreateControlBar() void CreateCanvas() void Initialize() + wxPreviewControlBar* GetControlBar() const %endclass %endif wxLUA_USE_wxLuaPrintout ! //----------------------------------------------------------------------------- // wxPostScriptDC ! %if wxUSE_PRINTING_ARCHITECTURE&wxUSE_POSTSCRIPT ! %include "wx/dcps.h" ! ! %class %delete wxPostScriptDC, wxDC ! wxPostScriptDC(const wxPrintData& printData) ! ! static void SetResolution(int ppi) ! static int GetResolution() ! %endclass ! ! %endif // wxUSE_PRINTING_ARCHITECTURE&wxUSE_POSTSCRIPT ! ! //----------------------------------------------------------------------------- // wxPrinterDC ! %if %msw|%mac ! %include "wx/dcprint.h" ! %class %delete wxPrinterDC, wxDC wxPrinterDC(const wxPrintData& printData) + %endclass ! %endif // %msw|%mac %endif wxLUA_USE_wxPrint Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** file.i 1 May 2006 19:36:30 -0000 1.10 --- file.i 17 May 2006 05:02:04 -0000 1.11 *************** *** 1,10 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxFile, wxDir, wxFileName and file functions ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// %include "wx/filefn.h" --- 1,10 ---- ! // ============================================================================ // Purpose: wxFile, wxDir, wxFileName and file functions ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ %include "wx/filefn.h" *************** *** 49,53 **** %function long wxFileSize(const wxString& fileName) ! /////////////////////////////////////////////////////////////////////////////// // wxFileName --- 49,53 ---- %function long wxFileSize(const wxString& fileName) ! //----------------------------------------------------------------------------- // wxFileName *************** *** 180,184 **** %endif wxLUA_USE_wxFileName ! /////////////////////////////////////////////////////////////////////////////// // wxFile --- 180,184 ---- %endif wxLUA_USE_wxFileName ! //----------------------------------------------------------------------------- // wxFile *************** *** 249,253 **** %endif wxLUA_USE_wxFile ! /////////////////////////////////////////////////////////////////////////////// // wxDir --- 249,253 ---- %endif wxLUA_USE_wxFile ! //----------------------------------------------------------------------------- // wxDir *************** *** 282,286 **** %endif wxLUA_USE_wxDir ! /////////////////////////////////////////////////////////////////////////////// // wxStreamBase --- 282,286 ---- %endif wxLUA_USE_wxDir ! //----------------------------------------------------------------------------- // wxStreamBase *************** *** 304,308 **** %endenum ! /////////////////////////////////////////////////////////////////////////////// // wxStreamBase --- 304,308 ---- %endenum ! //----------------------------------------------------------------------------- // wxStreamBase *************** *** 318,322 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxInputStream --- 318,322 ---- %endclass ! //----------------------------------------------------------------------------- // wxInputStream *************** *** 339,343 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxOutputStream --- 339,343 ---- %endclass ! //----------------------------------------------------------------------------- // wxOutputStream *************** *** 355,359 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxFileInputStream --- 355,359 ---- %endclass ! //----------------------------------------------------------------------------- // wxFileInputStream *************** *** 368,372 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxFileOutputStream --- 368,372 ---- %endclass ! //----------------------------------------------------------------------------- // wxFileOutputStream Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** regex.i 1 May 2006 19:36:30 -0000 1.3 --- regex.i 17 May 2006 05:02:04 -0000 1.4 *************** *** 1,12 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxRegEx ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! /////////////////////////////////////////////////////////////////////////////// ! /////////////////////////////////////////////////////////////////////////////// // wxRegEx - Regular expression support --- 1,12 ---- ! // ============================================================================ // Purpose: wxRegEx ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ ! //----------------------------------------------------------------------------- // wxRegEx - Regular expression support Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** dialogs.i 15 May 2006 22:57:29 -0000 1.17 --- dialogs.i 17 May 2006 05:02:04 -0000 1.18 *************** *** 1,10 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxDialog and all dialog classes and functions ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// --- 1,10 ---- ! // ============================================================================ // Purpose: wxDialog and all dialog classes and functions ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ *************** *** 29,33 **** %endenum ! /////////////////////////////////////////////////////////////////////////////// // Dialog functions from wxWidgets functions documentation --- 29,33 ---- %endenum ! //----------------------------------------------------------------------------- // Dialog functions from wxWidgets functions documentation *************** *** 56,60 **** // bool wxShowTip(wxWindow *parent, wxTipProvider *tipProvider, bool showAtStartup = true) ! /////////////////////////////////////////////////////////////////////////////// // wxDialog --- 56,60 ---- // bool wxShowTip(wxWindow *parent, wxTipProvider *tipProvider, bool showAtStartup = true) ! //----------------------------------------------------------------------------- // wxDialog *************** *** 99,103 **** %endif // wxLUA_USE_wxDialog ! /////////////////////////////////////////////////////////////////////////////// // wxColourDialog --- 99,103 ---- %endif // wxLUA_USE_wxDialog ! //----------------------------------------------------------------------------- // wxColourDialog *************** *** 116,120 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxColourData --- 116,120 ---- %endclass ! //----------------------------------------------------------------------------- // wxColourData *************** *** 138,142 **** %endif // wxLUA_USE_wxColourDialog ! /////////////////////////////////////////////////////////////////////////////// // wxFileDialog --- 138,142 ---- %endif // wxLUA_USE_wxColourDialog ! //----------------------------------------------------------------------------- // wxFileDialog *************** *** 179,183 **** %endif wxLUA_USE_wxFileDialog ! /////////////////////////////////////////////////////////////////////////////// // wxDirDialog --- 179,183 ---- %endif wxLUA_USE_wxFileDialog ! //----------------------------------------------------------------------------- // wxDirDialog *************** *** 205,... [truncated message content] |
