Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i, 1.30, 1.31 gdi.i, 1.44, 1.45 override.hpp, 1.63, 1.64 wx_datatypes.lua, 1.57, 1.58
|
From: John L. <jr...@us...> - 2007-03-15 00:01:50
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15657/wxLua/bindings/wxwidgets Modified Files: appframe.i gdi.i override.hpp wx_datatypes.lua Log Message: Remove wxLua_AddTrackedObject functions and just use wxLuaState::AddTrackedObject directly Remove all gc (destructor, LuaDelete) functions from the methods of a class since we can delete the objects in the single gc function in wxlbind.cpp anyway. Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** appframe.i 14 Mar 2007 05:08:09 -0000 1.30 --- appframe.i 15 Mar 2007 00:01:12 -0000 1.31 *************** *** 47,51 **** %typedef wxTraceMask unsigned long ! %class %noclassinfo %encapsulate wxLog wxLog() --- 47,51 ---- %typedef wxTraceMask unsigned long ! %class %delete %noclassinfo %encapsulate wxLog wxLog() *************** *** 55,58 **** --- 55,61 ---- static void FlushActive() static wxLog *GetActiveTarget() + // You must call SetActiveTarget(wx.NULL) before deleting any targets you've set + // and when your program exists. The wxLog must also exist for the life of + // the program as well, or until you null it. static wxLog *SetActiveTarget(wxLog *pLogger) static void Suspend() *************** *** 79,83 **** // wxLogBuffer ! %class %noclassinfo %encapsulate wxLogBuffer, wxLog wxLogBuffer() --- 82,86 ---- // wxLogBuffer ! %class %delete %noclassinfo %encapsulate wxLogBuffer, wxLog wxLogBuffer() *************** *** 88,92 **** // wxLogStderr - FIXME need to implement FILE* ! //%class %noclassinfo %encapsulate wxLogStderr, wxLog // wxLogStderr(FILE *fp = (FILE *) NULL) // redirect log output to a FILE //%endclass --- 91,95 ---- // wxLogStderr - FIXME need to implement FILE* ! //%class %delete %noclassinfo %encapsulate wxLogStderr, wxLog // wxLogStderr(FILE *fp = (FILE *) NULL) // redirect log output to a FILE //%endclass *************** *** 95,99 **** // wxLogStream - FIXME need to implement wxSTD ostream* ! //%class %noclassinfo %encapsulate wxLogStream, wxLog // wxLogStream(wxSTD ostream *ostr = NULL); // redirect log output to an ostream //%endclass --- 98,102 ---- // wxLogStream - FIXME need to implement wxSTD ostream* ! //%class %delete %noclassinfo %encapsulate wxLogStream, wxLog // wxLogStream(wxSTD ostream *ostr = NULL); // redirect log output to an ostream //%endclass *************** *** 102,106 **** // wxLogChain ! %class %noclassinfo %encapsulate wxLogChain, wxLog wxLogChain(wxLog *logger) --- 105,109 ---- // wxLogChain ! %class %delete %noclassinfo %encapsulate wxLogChain, wxLog wxLogChain(wxLog *logger) *************** *** 118,122 **** // wxLogPassThrough - a chain log target which uses itself as the new logger ! %class %noclassinfo %encapsulate wxLogPassThrough, wxLogChain wxLogPassThrough() --- 121,125 ---- // wxLogPassThrough - a chain log target which uses itself as the new logger ! %class %delete %noclassinfo %encapsulate wxLogPassThrough, wxLogChain wxLogPassThrough() *************** *** 126,130 **** // wxLogNull ! %class %noclassinfo %encapsulate %delete wxLogNull // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxLogNull() --- 129,133 ---- // wxLogNull ! %class %delete %noclassinfo %encapsulate wxLogNull // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough wxLogNull() Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** wx_datatypes.lua 14 Mar 2007 05:08:09 -0000 1.57 --- wx_datatypes.lua 15 Mar 2007 00:01:12 -0000 1.58 *************** *** 199,202 **** --- 199,203 ---- Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_ABOUTDLG && wxLUA_USE_wxAboutDialog", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxAboutDialogInfo", *************** *** 205,208 **** --- 206,210 ---- Condition = "wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxAcceleratorEntry", *************** *** 236,239 **** --- 238,242 ---- Condition = "wxLUA_USE_wxArrayInt", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxArrayInt", *************** *** 247,250 **** --- 250,254 ---- Condition = "wxLUA_USE_wxArrayString", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxArrayString", *************** *** 258,261 **** --- 262,266 ---- Condition = "wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxArrayTreeItemIds", *************** *** 264,267 **** --- 269,273 ---- Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxArrayVideoModes", *************** *** 318,330 **** Condition = "wxLUA_USE_wxDataObject && wxUSE_DATAOBJ", DefType = "class", IsNumber = false, Name = "wxBitmapDataObject", }, - wxBitmapHandler = { - Condition = "(defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)", - DefType = "class", - IsNumber = false, - Name = "wxBitmapHandler", - }, wxBitmapType = { DefType = "enum", --- 324,331 ---- Condition = "wxLUA_USE_wxDataObject && wxUSE_DATAOBJ", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxBitmapDataObject", }, wxBitmapType = { DefType = "enum", *************** *** 389,392 **** --- 390,394 ---- Condition = "wxLUA_USE_wxBusyCursor", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxBusyCursor", *************** *** 395,398 **** --- 397,401 ---- Condition = "wxLUA_USE_wxBusyCursor", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxBusyCursorSuspender", *************** *** 441,444 **** --- 444,448 ---- Condition = "wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxCalendarDateAttr", *************** *** 472,475 **** --- 476,480 ---- Condition = "wxLUA_USE_wxCaret && wxUSE_CARET", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxCaretSuspend", *************** *** 588,591 **** --- 593,597 ---- Condition = "wxLUA_USE_wxColourPenBrush", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxColourDatabase", *************** *** 647,650 **** --- 653,657 ---- Condition = "wxLUA_USE_wxConfig && wxUSE_CONFIG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxConfigPathChanger", *************** *** 685,688 **** --- 692,696 ---- Condition = "wxLUA_USE_wxCriticalSection && wxUSE_THREADS", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxCriticalSection", *************** *** 691,694 **** --- 699,703 ---- Condition = "wxLUA_USE_wxCriticalSectionLocker", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxCriticalSectionLocker", *************** *** 711,714 **** --- 720,724 ---- Condition = "wxLUA_USE_wxDC", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDCClipper", *************** *** 717,720 **** --- 727,731 ---- Condition = "wxLUA_USE_wxDataObject && wxUSE_DATAOBJ", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDataFormat", *************** *** 748,751 **** --- 759,763 ---- Condition = "wxLUA_USE_wxDataObject && wxUSE_DATAOBJ", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDataObjectComposite", *************** *** 755,758 **** --- 767,771 ---- Condition = "wxLUA_USE_wxDataObject && wxUSE_DATAOBJ", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDataObjectSimple", *************** *** 781,784 **** --- 794,798 ---- Condition = "wxLUA_USE_wxDateSpan && wxUSE_DATETIME", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDateSpan", *************** *** 787,790 **** --- 801,805 ---- Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDateTime", *************** *** 823,826 **** --- 838,842 ---- Condition = "wxLUA_USE_wxDateTime && wxUSE_DATETIME", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDateTimeArray", *************** *** 829,832 **** --- 845,849 ---- Condition = "wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDateTimeHolidayAuthority", *************** *** 836,839 **** --- 853,857 ---- Condition = "wxLUA_USE_wxDateTimeHolidayAuthority && wxUSE_DATETIME", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDateTimeWorkDays", *************** *** 849,852 **** --- 867,871 ---- Condition = "wxLUA_USE_wxDir", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDir", *************** *** 867,870 **** --- 886,890 ---- Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDisplay", *************** *** 932,935 **** --- 952,956 ---- Condition = "wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxDropSource", *************** *** 1011,1014 **** --- 1032,1036 ---- Condition = "wxLUA_USE_wxFile && wxUSE_FILE", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxFile", *************** *** 1037,1040 **** --- 1059,1063 ---- Condition = "wxLUA_USE_wxDataObject && wxUSE_DATAOBJ", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxFileDataObject", *************** *** 1070,1073 **** --- 1093,1097 ---- Condition = "wxLUA_USE_wxFileName", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxFileName", *************** *** 1175,1178 **** --- 1199,1203 ---- Condition = "wxLUA_USE_wxFontEnumerator", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxFontEnumerator", *************** *** 1218,1221 **** --- 1243,1247 ---- Condition = "wxLUA_USE_wxSizer", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxGBPosition", *************** *** 1231,1250 **** Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, Name = "wxGBSpan", }, - wxGDIImageHandler = { - Condition = "(defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)", - DefType = "class", - IsNumber = false, - Name = "wxGDIImageHandler", - }, - wxGDIImageHandlerList = { - BaseClass = "wxList", - Condition = "(wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxBitmap)", - DefType = "class", - IsNumber = false, - Name = "wxGDIImageHandlerList", - }, wxGDIObject = { BaseClass = "wxObject", --- 1257,1264 ---- Condition = "wxLUA_USE_wxSizer", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxGBSpan", }, wxGDIObject = { BaseClass = "wxObject", *************** *** 1373,1376 **** --- 1387,1391 ---- Condition = "wxLUA_USE_wxGrid && wxUSE_GRID", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxGridCellCoords", *************** *** 1539,1542 **** --- 1554,1558 ---- Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxHelpControllerHelpProvider", *************** *** 1557,1560 **** --- 1573,1577 ---- Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxHelpProvider", *************** *** 1709,1712 **** --- 1726,1730 ---- Condition = "wxLUA_USE_wxIcon", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxIconBundle", *************** *** 1715,1718 **** --- 1733,1737 ---- Condition = "wxLUA_USE_wxIcon", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxIconLocation", *************** *** 1752,1755 **** --- 1771,1775 ---- Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxImageHistogram", *************** *** 1758,1761 **** --- 1778,1782 ---- Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxImageHistogram::iterator", *************** *** 1764,1767 **** --- 1785,1789 ---- Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxImageHistogramEntry", *************** *** 1952,1955 **** --- 1974,1978 ---- Condition = "wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxListItemAttr", *************** *** 1979,1982 **** --- 2002,2006 ---- Condition = "wxUSE_INTL", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxLocale", *************** *** 2003,2006 **** --- 2027,2031 ---- Condition = "wxUSE_LOG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxLog", *************** *** 2010,2013 **** --- 2035,2039 ---- Condition = "wxUSE_LOG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxLogBuffer", *************** *** 2017,2020 **** --- 2043,2047 ---- Condition = "wxUSE_LOG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxLogChain", *************** *** 2023,2026 **** --- 2050,2054 ---- Condition = "wxUSE_LOG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxLogNull", *************** *** 2030,2033 **** --- 2058,2062 ---- Condition = "wxUSE_LOG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxLogPassThrough", *************** *** 2036,2039 **** --- 2065,2069 ---- Condition = "wxUSE_LONGLONG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxLongLong", *************** *** 2255,2258 **** --- 2285,2289 ---- Condition = "wxCHECK_VERSION(2,7,0)", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxMouseState", *************** *** 2274,2277 **** --- 2305,2309 ---- Condition = "wxLUA_USE_wxFont", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxNativeFontInfo", *************** *** 2440,2443 **** --- 2472,2476 ---- BaseClass = "wxArrayString", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxPathList", *************** *** 2466,2469 **** --- 2499,2503 ---- Condition = "wxLUA_USE_wxPointSizeRect", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxPoint", *************** *** 2472,2475 **** --- 2506,2510 ---- Condition = "wxLUA_USE_Geometry && wxUSE_GEOMETRY", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxPoint2DDouble", *************** *** 2478,2481 **** --- 2513,2517 ---- Condition = "wxLUA_USE_Geometry && wxUSE_GEOMETRY", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxPoint2DInt", *************** *** 2586,2589 **** --- 2622,2626 ---- Condition = "wxLUA_USE_wxProcess", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxProcess", *************** *** 2604,2607 **** --- 2641,2645 ---- wxPropagateOnce = { DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxPropagateOnce", *************** *** 2609,2612 **** --- 2647,2651 ---- wxPropagationDisabler = { DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxPropagationDisabler", *************** *** 2655,2658 **** --- 2694,2698 ---- Condition = "wxLUA_USE_wxPointSizeRect", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxRect", *************** *** 2661,2664 **** --- 2701,2705 ---- Condition = "wxLUA_USE_Geometry && wxUSE_GEOMETRY", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxRect2DDouble", *************** *** 2667,2670 **** --- 2708,2712 ---- Condition = "wxLUA_USE_Geometry && wxUSE_GEOMETRY", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxRect2DInt", *************** *** 2673,2676 **** --- 2715,2719 ---- Condition = "wxLUA_USE_wxRegEx && wxUSE_REGEX", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxRegEx", *************** *** 2796,2799 **** --- 2839,2843 ---- Condition = "wxLUA_USE_wxHelpController && wxUSE_HELP", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxSimpleHelpProvider", *************** *** 2816,2819 **** --- 2860,2864 ---- Condition = "wxLUA_USE_wxPointSizeRect", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxSize", *************** *** 2915,2918 **** --- 2960,2964 ---- Condition = "wxLUA_USE_wxArrayString", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxSortedArrayString", *************** *** 3026,3029 **** --- 3072,3076 ---- Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxColourPenBrush)", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxStockGDI", *************** *** 3054,3057 **** --- 3101,3105 ---- wxString = { DefType = "special", + Encapsulate = true, IsNumber = true, Name = "wxString", *************** *** 3157,3160 **** --- 3205,3209 ---- Condition = "wxLUA_USE_wxFile && wxUSE_FILE", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxTempFile", *************** *** 3163,3166 **** --- 3212,3216 ---- Condition = "wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxTextAttr", *************** *** 3194,3197 **** --- 3244,3248 ---- Condition = "wxLUA_USE_wxDataObject && wxUSE_DATAOBJ", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxTextDataObject", *************** *** 3214,3217 **** --- 3265,3269 ---- Condition = "wxLUA_USE_wxTimeSpan && wxUSE_DATETIME", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxTimeSpan", *************** *** 3328,3331 **** --- 3380,3384 ---- Condition = "wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxTreeItemId", *************** *** 3340,3343 **** --- 3393,3397 ---- Condition = "wxUSE_LONGLONG", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxULongLong", *************** *** 3379,3382 **** --- 3433,3437 ---- Condition = "(wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ)", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxURLDataObject", *************** *** 3434,3437 **** --- 3489,3493 ---- Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxVideoMode", *************** *** 3490,3493 **** --- 3546,3550 ---- wxWindowDisabler = { DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxWindowDisabler", *************** *** 3559,3562 **** --- 3616,3620 ---- Condition = "wxLUA_USE_wxXMLResource && wxUSE_XML", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxXmlNode", *************** *** 3571,3574 **** --- 3629,3633 ---- Condition = "wxLUA_USE_wxXMLResource && wxUSE_XML", DefType = "class", + Encapsulate = true, IsNumber = false, Name = "wxXmlProperty", Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** gdi.i 14 Mar 2007 05:08:09 -0000 1.44 --- gdi.i 15 Mar 2007 00:01:12 -0000 1.45 *************** *** 167,171 **** %endenum ! %class wxRegion, wxGDIObject %overload wxRegion(long x = 0, long y = 0, long width = 0, long height = 0) %overload %constructor wxRegionFromPoints(const wxPoint& topLeft, const wxPoint& bottomRight) --- 167,171 ---- %endenum ! %class %delete wxRegion, wxGDIObject %overload wxRegion(long x = 0, long y = 0, long width = 0, long height = 0) %overload %constructor wxRegionFromPoints(const wxPoint& topLeft, const wxPoint& bottomRight) *************** *** 208,212 **** // wxRegionIterator ! %class wxRegionIterator, wxObject wxRegionIterator(const wxRegion& region) --- 208,212 ---- // wxRegionIterator ! %class %delete wxRegionIterator, wxObject wxRegionIterator(const wxRegion& region) *************** *** 472,476 **** %include "wx/fontutil.h" ! %class %noclassinfo %encapsulate wxNativeFontInfo wxNativeFontInfo() %constructor wxNativeFontInfoCopy(const wxNativeFontInfo& info) --- 472,476 ---- %include "wx/fontutil.h" ! %class %delete %noclassinfo %encapsulate wxNativeFontInfo wxNativeFontInfo() %constructor wxNativeFontInfoCopy(const wxNativeFontInfo& info) *************** *** 478,482 **** // accessors and modifiers for the font elements int GetPointSize() const ! %wxchkver_2_8_1 wxSize GetPixelSize() const wxFontStyle GetStyle() const wxFontWeight GetWeight() const --- 478,482 ---- // accessors and modifiers for the font elements int GetPointSize() const ! %msw wxSize GetPixelSize() const // FIXME wxWidgets has undefined symbol in gtk/mac wxFontStyle GetStyle() const wxFontWeight GetWeight() const *************** *** 487,491 **** void SetPointSize(int pointsize) ! %wxchkver_2_8_1 void SetPixelSize(const wxSize& pixelSize) void SetStyle(wxFontStyle style) void SetWeight(wxFontWeight weight) --- 487,491 ---- void SetPointSize(int pointsize) ! %msw void SetPixelSize(const wxSize& pixelSize) void SetStyle(wxFontStyle style) void SetWeight(wxFontWeight weight) *************** *** 620,624 **** !%wxchkver_2_8 wxColour(unsigned char red, unsigned char green, unsigned char blue) ! %wxchkver_2_8 wxColour(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha) %constructor wxNamedColour(const wxString& colourName) // wxPython compatibility %constructor wxColourCopy(const wxColour& colour) --- 620,624 ---- !%wxchkver_2_8 wxColour(unsigned char red, unsigned char green, unsigned char blue) ! %wxchkver_2_8 wxColour(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha = wxALPHA_OPAQUE) %constructor wxNamedColour(const wxString& colourName) // wxPython compatibility %constructor wxColourCopy(const wxColour& colour) *************** *** 844,848 **** %class %noclassinfo %encapsulate wxStockGDI ! wxStockGDI() //static void DeleteAll() --- 844,848 ---- %class %noclassinfo %encapsulate wxStockGDI ! //wxStockGDI() use instance to get the implemented wxStockGDI //static void DeleteAll() *************** *** 938,942 **** %include "wx/iconloc.h" ! %class %noclassinfo %encapsulate wxIconLocation // ctor takes the name of the file where the icon is !%msw wxIconLocation(const wxString& filename = "") --- 938,942 ---- %include "wx/iconloc.h" ! %class %delete %noclassinfo %encapsulate wxIconLocation // ctor takes the name of the file where the icon is !%msw wxIconLocation(const wxString& filename = "") *************** *** 964,973 **** %include "wx/bitmap.h" ! %win %class %noclassinfo wxBitmapHandler // are these even necessary? ! %endclass ! %win %class %noclassinfo wxGDIImageHandler ! %endclass ! %wxchkver_2_5&%win %class %noclassinfo wxGDIImageHandlerList, wxList ! %endclass %class %delete wxBitmap, wxGDIObject --- 964,973 ---- %include "wx/bitmap.h" ! //%win %class %delete %noclassinfo wxBitmapHandler // are these even necessary? ! //%endclass ! //%win %class %delete %noclassinfo wxGDIImageHandler ! //%endclass ! //%wxchkver_2_5&%win %class %noclassinfo wxGDIImageHandlerList, wxList ! //%endclass %class %delete wxBitmap, wxGDIObject Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** override.hpp 13 Mar 2007 05:01:00 -0000 1.63 --- override.hpp 15 Mar 2007 00:01:12 -0000 1.64 *************** *** 190,194 **** if (returns != NULL) { ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxAcceleratorTable, returns); --- 190,194 ---- if (returns != NULL) { ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxAcceleratorTable, returns); *************** *** 858,862 **** returns = new wxTreeItemId(self->GetFirstChild(*item, cookie)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); --- 858,862 ---- returns = new wxTreeItemId(self->GetFirstChild(*item, cookie)); // add the new object to the tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId(returns)); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); *************** *** 893,897 **** returns = new wxTreeItemId(self->GetNextChild(*item, cookie)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); --- 893,897 ---- returns = new wxTreeItemId(self->GetNextChild(*item, cookie)); // add the new object to the tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId(returns)); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); *************** *** 924,927 **** --- 924,928 ---- { wxTreeItemId* treeId = new wxTreeItemId(selection[idx]); + wxlState.AddTrackedObject((long)treeId, new wxObject_wxTreeItemId(treeId)); wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, treeId); lua_rawseti(L, -2, idx + 1); *************** *** 948,952 **** returns = new wxTreeItemId(self->HitTest(*point, flags)); // add the new object to the tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the result datatype --- 949,953 ---- returns = new wxTreeItemId(self->HitTest(*point, flags)); // add the new object to the tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxTreeItemId(returns)); // push the result datatype *************** *** 975,979 **** returns = new wxString(str); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxString, returns); --- 976,980 ---- returns = new wxString(str); // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxString(returns)); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxString, returns); *************** *** 1157,1161 **** returns = new wxGenericValidator(boolPtr->GetBoolPtr()); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGenericValidator, returns); --- 1158,1162 ---- returns = new wxGenericValidator(boolPtr->GetBoolPtr()); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGenericValidator, returns); *************** *** 1176,1180 **** returns = new wxGenericValidator(valPtr->GetStringPtr()); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGenericValidator, returns); --- 1177,1181 ---- returns = new wxGenericValidator(valPtr->GetStringPtr()); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGenericValidator, returns); *************** *** 1195,1199 **** returns = new wxGenericValidator(valPtr->GetIntPtr()); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGenericValidator, returns); --- 1196,1200 ---- returns = new wxGenericValidator(valPtr->GetIntPtr()); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGenericValidator, returns); *************** *** 1214,1218 **** returns = new wxGenericValidator(valPtr->GetArrayPtr()); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGenericValidator, returns); --- 1215,1219 ---- returns = new wxGenericValidator(valPtr->GetArrayPtr()); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxGenericValidator, returns); *************** *** 1476,1480 **** returns = new wxBusyCursor(cursor); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxBusyCursor *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); --- 1477,1481 ---- returns = new wxBusyCursor(cursor); // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxObject_wxBusyCursor((wxBusyCursor *)returns)); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); *************** *** 2009,2015 **** returns = self->GetTimes(dtAccess, dtMod, dtCreate); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, dtAccess); ! wxLua_AddTrackedObject(wxlState, dtMod); ! wxLua_AddTrackedObject(wxlState, dtCreate); // push the constructed class pointers wxlState.PushUserDataType(s_wxluatag_wxDateTime, dtAccess); --- 2010,2016 ---- returns = self->GetTimes(dtAccess, dtMod, dtCreate); // add to tracked memory list ! wxlState.AddTrackedObject((long)dtAccess, new wxObject_wxDateTime(dtAccess)); ! wxlState.AddTrackedObject((long)dtMod, new wxObject_wxDateTime(dtMod)); ! wxlState.AddTrackedObject((long)dtCreate, new wxObject_wxDateTime(dtCreate)); // push the constructed class pointers wxlState.PushUserDataType(s_wxluatag_wxDateTime, dtAccess); *************** *** 2505,2509 **** returns = new wxBitmap(data, type, width, height, depth); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 2506,2510 ---- returns = new wxBitmap(data, type, width, height, depth); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 2530,2534 **** returns = new wxBitmap(sizeArray); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 2531,2535 ---- returns = new wxBitmap(sizeArray); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 3152,3156 **** returns = new wxImage(width, height, data, static_data); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 3153,3157 ---- returns = new wxImage(width, height, data, static_data); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 3171,3175 **** returns = new wxImage(bitmap->ConvertToImage()); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); --- 3172,3176 ---- returns = new wxImage(bitmap->ConvertToImage()); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxImage, returns); *************** *** 3777,3781 **** *returns = *self; // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPrintData, returns); --- 3778,3782 ---- *returns = *self; // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPrintData, returns); *************** *** 3795,3799 **** *returns = *self; // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPageSetupDialogData, returns); --- 3796,3800 ---- *returns = *self; // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxPageSetupDialogData, returns); *************** *** 4471,4475 **** returns = new wxLuaObject(wxlState, 1); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns); --- 4472,4476 ---- returns = new wxLuaObject(wxlState, 1); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaObject, returns); *************** *** 4522,4526 **** returns = new wxLuaPrintout(wxlState, title, pObject); // add to tracked memory list ! wxLua_AddTrackedObject(wxlState, (wxLuaPrintout *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaPrintout, returns); --- 4523,4527 ---- returns = new wxLuaPrintout(wxlState, title, pObject); // add to tracked memory list ! wxlState.AddTrackedObject((wxLuaPrintout *)returns); // push the constructed class pointer wxlState.PushUserDataType(s_wxluatag_wxLuaPrintout, returns); |
