Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets wx_datatypes.lua, 1.94, 1.95 wxbase_base.i, 1.3, 1.4 wxbase_datetime.i, 1.2, 1.3 wxcore_controls.i, 1.6, 1.7 wxcore_gdi.i, 1.4, 1.5 wxcore_geometry.i, 1.1, 1.2 wxcore_image.i, 1.3, 1.4 wxcore_print.i, 1.5, 1.6 wxcore_windows.i, 1.4, 1.5
|
From: John L. <jr...@us...> - 2008-10-22 05:31:50
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9558/wxLua/bindings/wxwidgets Modified Files: wx_datatypes.lua wxbase_base.i wxbase_datetime.i wxcore_controls.i wxcore_gdi.i wxcore_geometry.i wxcore_image.i wxcore_print.i wxcore_windows.i Log Message: Swap parameters to the %typedef tag to follow C/C++ nomenclature Call AllocDataType in genwxbind.lua for the %typedef automatically. Index: wxcore_gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_gdi.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxcore_gdi.i 22 Jan 2008 04:04:24 -0000 1.4 --- wxcore_gdi.i 22 Oct 2008 05:31:45 -0000 1.5 *************** *** 829,833 **** %if wxLUA_USE_wxIcon ! %typedef WXHANDLE void* %class %delete wxIcon, wxGDIObject --- 829,833 ---- %if wxLUA_USE_wxIcon ! %typedef void* WXHANDLE %class %delete wxIcon, wxGDIObject *************** *** 952,956 **** %if wxLUA_USE_wxCursor ! //%typedef WXHANDLE void* %include "wx/cursor.h" --- 952,956 ---- %if wxLUA_USE_wxCursor ! //%typedef void* WXHANDLE %include "wx/cursor.h" Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.94 retrieving revision 1.95 diff -C2 -d -r1.94 -r1.95 *** wx_datatypes.lua 21 Oct 2008 04:23:18 -0000 1.94 --- wx_datatypes.lua 22 Oct 2008 05:31:45 -0000 1.95 *************** *** 1132,1135 **** --- 1132,1140 ---- ValueType = "enum", }, + ["wxDateTime::wxDateTime_t"] = { + IsNumber = true, + Name = "wxDateTime::wxDateTime_t", + ValueType = "number", + }, wxDateTimeArray = { ["%encapsulate"] = true, *************** *** 2586,2589 **** --- 2591,2599 ---- ValueType = "class", }, + wxLogLevel = { + IsNumber = true, + Name = "wxLogLevel", + ValueType = "number", + }, wxLogNull = { ["%encapsulate"] = true, *************** *** 2920,2923 **** --- 2930,2938 ---- ValueType = "class", }, + wxNotebookPage = { + IsNumber = false, + Name = "wxNotebookPage", + ValueType = "class", + }, wxNotebookSizer = { BaseClass = "wxSizer", *************** *** 4086,4089 **** --- 4101,4109 ---- ValueType = "class", }, + wxTraceMask = { + IsNumber = true, + Name = "wxTraceMask", + ValueType = "number", + }, wxTreeCtrl = { BaseClass = "wxControl", Index: wxcore_geometry.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_geometry.i,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxcore_geometry.i 16 Jul 2007 19:34:25 -0000 1.1 --- wxcore_geometry.i 22 Oct 2008 05:31:45 -0000 1.2 *************** *** 10,15 **** %if wxLUA_USE_Geometry && wxUSE_GEOMETRY ! %typedef wxInt32 int ! %typedef wxDouble double %enum wxOutCode --- 10,15 ---- %if wxLUA_USE_Geometry && wxUSE_GEOMETRY ! %typedef int wxInt32 ! %typedef double wxDouble %enum wxOutCode Index: wxcore_print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_print.i,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxcore_print.i 10 Jan 2008 23:06:23 -0000 1.5 --- wxcore_print.i 22 Oct 2008 05:31:45 -0000 1.6 *************** *** 10,14 **** %if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE ! %typedef wxPreviewWindow wxScrolledWindow %include "wx/print.h" --- 10,14 ---- %if wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE ! %typedef wxScrolledWindow wxPreviewWindow %include "wx/print.h" *************** *** 397,401 **** %include "wx/printdlg.h" ! //%typedef wxPageSetupDialog wxPageSetupDialogBase %class wxPageSetupDialog, wxObject // NOT a wxDialog in 2.6 --- 397,401 ---- %include "wx/printdlg.h" ! //%typedef wxPageSetupDialogBase wxPageSetupDialog %class wxPageSetupDialog, wxObject // NOT a wxDialog in 2.6 Index: wxbase_base.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_base.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxbase_base.i 22 Dec 2007 06:07:08 -0000 1.3 --- wxbase_base.i 22 Oct 2008 05:31:45 -0000 1.4 *************** *** 346,351 **** // void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated ! %typedef wxTraceMask unsigned long ! %typedef wxLogLevel unsigned long %enum // wxLogLevel - uses these enums --- 346,351 ---- // void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated ! %typedef unsigned long wxTraceMask ! %typedef unsigned long wxLogLevel %enum // wxLogLevel - uses these enums Index: wxcore_image.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_image.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxcore_image.i 18 Dec 2007 01:03:32 -0000 1.3 --- wxcore_image.i 22 Oct 2008 05:31:45 -0000 1.4 *************** *** 467,472 **** %include "wx/artprov.h" ! //%typedef wxArtClient wxString Just treat these as wxStrings ! //%typedef wxArtID wxString // ---------------------------------------------------------------------------- --- 467,472 ---- %include "wx/artprov.h" ! //%typedef wxString wxArtClient Just treat these as wxStrings ! //%typedef wxString wxArtID // ---------------------------------------------------------------------------- Index: wxcore_windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_windows.i,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxcore_windows.i 17 Jan 2008 22:37:29 -0000 1.4 --- wxcore_windows.i 22 Oct 2008 05:31:45 -0000 1.5 *************** *** 90,97 **** %endenum ! //%mac|%x11|%motif %typedef WXWidget void* ! //%gtk %typedef WXWidget unsigned long // GtkWidget* what could you do with it? ! //%mgl %typedef WXWidget window_t ! //%msw|%os2 %typedef WXWidget unsigned long %class %delete %noclassinfo %encapsulate wxVisualAttributes --- 90,97 ---- %endenum ! //%mac|%x11|%motif %typedef void* WXWidget ! //%gtk %typedef unsigned long WXWidget // GtkWidget* what could you do with it? ! //%mgl %typedef window_t WXWidget ! //%msw|%os2 %typedef unsigned long WXWidget %class %delete %noclassinfo %encapsulate wxVisualAttributes *************** *** 490,494 **** %endenum ! %typedef wxNotebookPage wxWindow %class wxNotebook, wxBookCtrlBase --- 490,494 ---- %endenum ! %typedef wxWindow wxNotebookPage %class wxNotebook, wxBookCtrlBase Index: wxbase_datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_datetime.i,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxbase_datetime.i 18 Dec 2007 01:03:32 -0000 1.2 --- wxbase_datetime.i 22 Oct 2008 05:31:45 -0000 1.3 *************** *** 132,136 **** %endenum ! %typedef wxDateTime::wxDateTime_t unsigned short %class %delete %noclassinfo %encapsulate wxDateTime --- 132,136 ---- %endenum ! %typedef unsigned short wxDateTime::wxDateTime_t %class %delete %noclassinfo %encapsulate wxDateTime Index: wxcore_controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_controls.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxcore_controls.i 26 Mar 2008 05:01:31 -0000 1.6 --- wxcore_controls.i 22 Oct 2008 05:31:45 -0000 1.7 *************** *** 830,834 **** %endenum ! %typedef wxTextCoord long %define wxOutOfRangeTextCoord %define wxInvalidTextCoord --- 830,834 ---- %endenum ! %typedef long wxTextCoord %define wxOutOfRangeTextCoord %define wxInvalidTextCoord |
