Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2006-11-02 23:38:14
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/bindings/wxwidgets Modified Files: datetime.i gdi.i image.i windows.i wx_datatypes.lua Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** windows.i 23 Aug 2006 04:57:52 -0000 1.21 --- windows.i 2 Nov 2006 23:38:08 -0000 1.22 *************** *** 110,114 **** wxAcceleratorTable* GetAcceleratorTable() const //wxAccessible* GetAccessible() ! wxSize GetAdjustedBestSize() const virtual wxColour GetBackgroundColour() const virtual wxBackgroundStyle GetBackgroundStyle() const --- 110,114 ---- wxAcceleratorTable* GetAcceleratorTable() const //wxAccessible* GetAccessible() ! !%wxchkver27 wxSize GetAdjustedBestSize() const virtual wxColour GetBackgroundColour() const virtual wxBackgroundStyle GetBackgroundStyle() const Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** datetime.i 1 Nov 2006 23:44:46 -0000 1.17 --- datetime.i 2 Nov 2006 23:38:08 -0000 1.18 *************** *** 205,208 **** --- 205,228 ---- %endclass + //----------------------------------------------------------------------------- + // wxDateTimeArray + + %class %delete %noclassinfo %encapsulate wxDateTimeArray + %overload wxDateTimeArray() + %overload %constructor wxDateTimeArrayCopy(const wxDateTimeArray& array) + + void Add(const wxDateTime& dateTime, size_t copies = 1) + void Alloc(size_t nCount) + void Clear() + void Empty() + int GetCount() const + void Insert(const wxDateTime& dt, int nIndex, size_t copies = 1) + bool IsEmpty() + wxDateTime Item(size_t nIndex) const + wxDateTime Last() + void RemoveAt(size_t nIndex, size_t count = 1) + void Shrink() + %endclass + %endif wxLUA_USE_wxDateTime *************** *** 302,305 **** --- 322,349 ---- //----------------------------------------------------------------------------- + // wxDateTimeHolidayAuthority + + %if wxLUA_USE_wxDateTimeHolidayAuthority + + %class %noclassinfo %encapsulate wxDateTimeHolidayAuthority + // no constructor since this class has pure virtual functions + + %static bool IsHoliday(const wxDateTime& dt) + %static size_t GetHolidaysInRange(const wxDateTime& dtStart, const wxDateTime& dtEnd, wxDateTimeArray& holidays) + %static void ClearAllAuthorities() + %static void AddAuthority(wxDateTimeHolidayAuthority *auth) + + %endclass + + //----------------------------------------------------------------------------- + // wxDateTimeWorkDays + + %class %noclassinfo %encapsulate wxDateTimeWorkDays, wxDateTimeHolidayAuthority + wxDateTimeWorkDays() + %endclass + + %endif wxLUA_USE_wxDateTimeHolidayAuthority + + //----------------------------------------------------------------------------- // wxTimer Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wx_datatypes.lua 1 Nov 2006 23:44:46 -0000 1.37 --- wx_datatypes.lua 2 Nov 2006 23:38:08 -0000 1.38 *************** *** 229,232 **** --- 229,238 ---- Name = "wxArrayTreeItemIds", }, + wxArrayVideoModes = { + Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", + DefType = "class", + Intrinsic = false, + Name = "wxArrayVideoModes", + }, wxArtProvider = { BaseClass = "wxObject", *************** *** 619,622 **** --- 625,634 ---- Name = "wxDC", }, + wxDCClipper = { + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxDCClipper", + }, wxDataFormat = { Condition = "wxLUA_USE_wxDataObject", *************** *** 713,716 **** --- 725,747 ---- Name = "wxDateTime::WeekDay", }, + wxDateTimeArray = { + Condition = "wxLUA_USE_wxDateTime", + DefType = "class", + Intrinsic = false, + Name = "wxDateTimeArray", + }, + wxDateTimeHolidayAuthority = { + Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", + DefType = "class", + Intrinsic = false, + Name = "wxDateTimeHolidayAuthority", + }, + wxDateTimeWorkDays = { + BaseClass = "wxDateTimeHolidayAuthority", + Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", + DefType = "class", + Intrinsic = false, + Name = "wxDateTimeWorkDays", + }, wxDialog = { BaseClass = "wxTopLevelWindow", *************** *** 738,741 **** --- 769,778 ---- Name = "wxDirection", }, + wxDisplay = { + Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", + DefType = "class", + Intrinsic = false, + Name = "wxDisplay", + }, wxDocChildFrame = { BaseClass = "wxFrame", *************** *** 3027,3030 **** --- 3064,3073 ---- Name = "wxValidator", }, + wxVideoMode = { + Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", + DefType = "class", + Intrinsic = false, + Name = "wxVideoMode", + }, wxView = { BaseClass = "wxEvtHandler", Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** gdi.i 11 Oct 2006 03:24:01 -0000 1.27 --- gdi.i 2 Nov 2006 23:38:08 -0000 1.28 *************** *** 75,78 **** --- 75,81 ---- %overload %constructor wxRectFromSize(const wxSize& size) + %wxchkver27 %overload bool Contains(wxCoord dx, wxCoord dy) const + %wxchkver27 %overload %rename ContainsPoint bool Contains(const wxPoint& pt) const + %wxchkver27 %overload %rename ContainsRect bool Contains(const wxRect& rect) const wxRect Deflate(wxCoord dx, wxCoord dy) const //wxRect& Deflate(wxCoord dx, wxCoord dy) int GetBottom() *************** *** 89,93 **** int GetY() wxRect Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy) ! bool Inside(wxCoord cx, wxCoord cy) bool Intersects(const wxRect& rect) const bool IsEmpty() const --- 92,96 ---- int GetY() wxRect Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy) ! !%wxchkver27 bool Inside(wxCoord cx, wxCoord cy) bool Intersects(const wxRect& rect) const bool IsEmpty() const *************** *** 955,959 **** // %win wxDC() wxDC is abstract use wxXXXDC ! void BeginDrawing() bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false) void CalcBoundingBox(wxCoord x, wxCoord y) --- 958,962 ---- // %win wxDC() wxDC is abstract use wxXXXDC ! //void BeginDrawing() // these are deprecated in 2.8 and didn't do anything anyway bool Blit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC* source, wxCoord xsrc, wxCoord ysrc, int logicalFunc = wxCOPY, bool useMask = false) void CalcBoundingBox(wxCoord x, wxCoord y) *************** *** 993,997 **** void DrawText(const wxString& text, wxCoord x, wxCoord y) void EndDoc() ! void EndDrawing() void EndPage() void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE) --- 996,1000 ---- void DrawText(const wxString& text, wxCoord x, wxCoord y) void EndDoc() ! //void EndDrawing() // these are deprecated in 2.8 and didn't do anything anyway void EndPage() void FloodFill(wxCoord x, wxCoord y, const wxColour& colour, int style=wxFLOOD_SURFACE) *************** *** 1063,1067 **** %class %delete wxMemoryDC, wxDC wxMemoryDC() ! void SelectObject(const wxBitmap& bitmap) %endclass --- 1066,1070 ---- %class %delete wxMemoryDC, wxDC wxMemoryDC() ! void SelectObject(wxBitmap& bitmap) // not const in >=2.8 %endclass *************** *** 1114,1121 **** %overload wxBufferedDC() %overload %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %overload %constructor wxBufferedDCFromBitmap(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %overload void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %overload %rename InitFromBitmap void Init(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass --- 1117,1124 ---- %overload wxBufferedDC() %overload %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %overload %constructor wxBufferedDCFromBitmap(wxDC *dc, wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) // not const bitmap >= 2.8 %overload void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %overload %rename InitFromBitmap void Init(wxDC *dc, wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) // not const bitmap in >= 2.8 %endclass *************** *** 1127,1131 **** %class %delete wxBufferedPaintDC, wxBufferedDC %overload wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA) ! %overload %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass --- 1130,1134 ---- %class %delete wxBufferedPaintDC, wxBufferedDC %overload wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA) ! %overload %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) // not const bitmap in >= 2.8 %endclass *************** *** 1139,1142 **** --- 1142,1156 ---- %endclass + //----------------------------------------------------------------------------- + // wxDCClipper + + %include "wx/dc.h" + + %class %delete %noclassinfo %encapsulate wxDCClipper + %overload wxDCClipper(wxDC& dc, const wxRegion& r) + %overload %constructor wxDCClipperFromRect(wxDC& dc, const wxRect& r) + //%overload %constructor wxDCClipperFromCoords(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h) + %endclass + %endif wxLUA_USE_wxDC *************** *** 1233,1234 **** --- 1247,1312 ---- %endif wxLUA_USE_wxGLCanvas & wxUSE_GLCANVAS + + //----------------------------------------------------------------------------- + // wxVideoMode + + %if wxLUA_USE_wxDisplay & wxUSE_DISPLAY + + %include "wx/display.h" + + %class %noclassinfo %encapsulate wxVideoMode + %define %object wxDefaultVideoMode + + wxVideoMode(int width = 0, int height = 0, int depth = 0, int freq = 0) + + bool Matches(const wxVideoMode& other) const + int GetWidth() const + int GetHeight() const + int GetDepth() const + bool IsOk() const + + %operator bool operator==(const wxVideoMode& v) const + %endclass + + //----------------------------------------------------------------------------- + // wxArrayVideoModes + + %class %delete %noclassinfo %encapsulate wxArrayVideoModes + %overload wxArrayVideoModes() + %overload %constructor wxArrayVideoModesCopy(const wxArrayVideoModes& array) + + void Add(const wxVideoMode& vm, size_t copies = 1) + void Alloc(size_t nCount) + void Clear() + void Empty() + int GetCount() const + void Insert(const wxVideoMode& vm, int nIndex, size_t copies = 1) + bool IsEmpty() + wxVideoMode Item(size_t nIndex) const + wxVideoMode Last() + void RemoveAt(size_t nIndex, size_t count = 1) + void Shrink() + %endclass + + + //----------------------------------------------------------------------------- + // wxDisplay + + %class %noclassinfo %encapsulate wxDisplay + wxDisplay(size_t index = 0) + + bool ChangeMode(const wxVideoMode& mode = wxDefaultVideoMode) + %static size_t GetCount() + wxVideoMode GetCurrentMode() const + // int GetDepth() const // in docs BUT not in C++ header + %static int GetFromPoint(const wxPoint& pt) + %static int GetFromWindow(wxWindow* win) + wxRect GetGeometry() const + wxRect GetClientArea() const + wxArrayVideoModes GetModes(const wxVideoMode& mode = wxDefaultVideoMode) const + wxString GetName() const + bool IsOk() const + bool IsPrimary() + %endclass + + %endif wxLUA_USE_wxDisplay & wxUSE_DISPLAY Index: image.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** image.i 17 May 2006 05:02:04 -0000 1.13 --- image.i 2 Nov 2006 23:38:08 -0000 1.14 *************** *** 162,166 **** %operator wxImage& operator=(const wxImage& image) ! %operator bool operator==(const wxImage& image) const %endclass --- 162,166 ---- %operator wxImage& operator=(const wxImage& image) ! //%operator bool operator==(const wxImage& image) const // not in 2.8 %endclass |
|
From: John L. <jr...@us...> - 2006-11-02 23:38:12
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/docs Modified Files: wxluaref.html Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluaref.html 28 Aug 2006 05:29:22 -0000 1.9 --- wxluaref.html 2 Nov 2006 23:38:08 -0000 1.10 *************** *** 7,50 **** </head> <body> ! <h1>wxLua Class Reference for wxWidgets 2.6.3</h1> <h2>wxWidgets Classes</h2> ! <a href="#wxANIHandler">wxANIHandler</a> - NOT IN WX REF MANUAL<br> <a href="#wxAcceleratorEntry">wxAcceleratorEntry</a><br> <a href="#wxAcceleratorTable">wxAcceleratorTable</a><br> ! wxAccessible - NOT WRAPPED<br> <a href="#wxActivateEvent">wxActivateEvent</a><br> <a href="#wxApp">wxApp</a><br> [...5063 lines suppressed...] + <font color=#000077> <i>%property</i>=Text, read, write</font><br> + <font color=#000077> <i>%property</i>=Length, read, write</font><br> + <font color=#000077> <i>%property</i>=LinesAdded, read, write</font><br> + <font color=#000077> <i>%property</i>=Line, read, write</font><br> + <font color=#000077> <i>%property</i>=FoldLevelNow, read, write</font><br> + <font color=#000077> <i>%property</i>=FoldLevelPrev, read, write</font><br> + <font color=#000077> <i>%property</i>=Margin, read, write</font><br> + <font color=#000077> <i>%property</i>=Message, read, write</font><br> + <font color=#000077> <i>%property</i>=WParam, read, write</font><br> + <font color=#000077> <i>%property</i>=LParam, read, write</font><br> + <font color=#000077> <i>%property</i>=ListType, read, write</font><br> + <font color=#000077> <i>%property</i>=X, read, write</font><br> + <font color=#000077> <i>%property</i>=Y, read, write</font><br> + <font color=#000077> <i>%property</i>=DragText, read, write</font><br> + <font color=#000077> <i>%property</i>=DragAllowMove, read, write</font><br> + <font color=#000077> <i>%property</i>=DragResult, read, write</font><br> + <font color=#000077> <i>%property</i>=Shift, read</font><br> + <font color=#000077> <i>%property</i>=Control, read</font><br> <font color=#000077> <i>%property</i>=Alt, read</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> |
|
From: John L. <jr...@us...> - 2006-11-02 23:38:12
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxstc_datatypes.lua 1 Nov 2006 23:44:46 -0000 1.33 --- wxstc_datatypes.lua 2 Nov 2006 23:38:08 -0000 1.34 *************** *** 229,232 **** --- 229,238 ---- Name = "wxArrayTreeItemIds", }, + wxArrayVideoModes = { + Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", + DefType = "class", + Intrinsic = false, + Name = "wxArrayVideoModes", + }, wxArtProvider = { BaseClass = "wxObject", *************** *** 619,622 **** --- 625,634 ---- Name = "wxDC", }, + wxDCClipper = { + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxDCClipper", + }, wxDataFormat = { Condition = "wxLUA_USE_wxDataObject", *************** *** 713,716 **** --- 725,747 ---- Name = "wxDateTime::WeekDay", }, + wxDateTimeArray = { + Condition = "wxLUA_USE_wxDateTime", + DefType = "class", + Intrinsic = false, + Name = "wxDateTimeArray", + }, + wxDateTimeHolidayAuthority = { + Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", + DefType = "class", + Intrinsic = false, + Name = "wxDateTimeHolidayAuthority", + }, + wxDateTimeWorkDays = { + BaseClass = "wxDateTimeHolidayAuthority", + Condition = "wxLUA_USE_wxDateTimeHolidayAuthority", + DefType = "class", + Intrinsic = false, + Name = "wxDateTimeWorkDays", + }, wxDialog = { BaseClass = "wxTopLevelWindow", *************** *** 738,741 **** --- 769,778 ---- Name = "wxDirection", }, + wxDisplay = { + Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", + DefType = "class", + Intrinsic = false, + Name = "wxDisplay", + }, wxDocChildFrame = { BaseClass = "wxFrame", *************** *** 3038,3041 **** --- 3075,3084 ---- Name = "wxValidator", }, + wxVideoMode = { + Condition = "wxLUA_USE_wxDisplay && wxUSE_DISPLAY", + DefType = "class", + Intrinsic = false, + Name = "wxVideoMode", + }, wxView = { BaseClass = "wxEvtHandler", |
|
From: John L. <jr...@us...> - 2006-11-02 23:38:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxbind.h 1 Nov 2006 23:44:46 -0000 1.39 --- wxbind.h 2 Nov 2006 23:38:08 -0000 1.40 *************** *** 291,294 **** --- 291,298 ---- #endif // wxLUA_USE_wxDir + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #include "wx/display.h" + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxDragDrop #include "wx/dnd.h" *************** *** 913,916 **** --- 917,921 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxClientDC; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDC; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDCClipper; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMemoryDC; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMirrorDC; *************** *** 940,945 **** --- 945,956 ---- #if wxLUA_USE_wxDateTime extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTime; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeArray; #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDateTimeHolidayAuthority + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeHolidayAuthority; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateTimeWorkDays; + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + #if wxLUA_USE_wxDialog extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDialog; *************** *** 954,957 **** --- 965,974 ---- #endif // wxLUA_USE_wxDirDialog + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxArrayVideoModes; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDisplay; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxVideoMode; + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxDragDrop extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDropFilesEvent; *************** *** 1847,1850 **** --- 1864,1869 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDC_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDC_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDCClipper_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDCClipper_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMemoryDC_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxMemoryDC_methodCount; *************** *** 1889,1894 **** --- 1908,1922 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDateTime_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTime_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDateTimeArray_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeArray_methodCount; #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDateTimeHolidayAuthority + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDateTimeHolidayAuthority_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeHolidayAuthority_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDateTimeWorkDays_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDateTimeWorkDays_methodCount; + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + #if wxLUA_USE_wxDialog extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDialog_methods; *************** *** 1906,1909 **** --- 1934,1946 ---- #endif // wxLUA_USE_wxDirDialog + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxArrayVideoModes_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxArrayVideoModes_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDisplay_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDisplay_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxVideoMode_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxVideoMode_methodCount; + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxDragDrop extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDropFilesEvent_methods; *************** *** 2610,2613 **** --- 2647,2654 ---- #endif // wxLUA_USE_wxCriticalSectionLocker + #if wxLUA_USE_wxDC + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDCClipper, wxDCClipper) + #endif // wxLUA_USE_wxDC + #if wxLUA_USE_wxDataObject wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBitmapDataObject, wxBitmapDataObject) *************** *** 2625,2634 **** --- 2666,2687 ---- #if wxLUA_USE_wxDateTime wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTime, wxDateTime) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeArray, wxDateTimeArray) #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDateTimeHolidayAuthority + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDateTimeWorkDays, wxDateTimeWorkDays) + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + #if wxLUA_USE_wxDir wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDir, wxDir) #endif // wxLUA_USE_wxDir + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxArrayVideoModes, wxArrayVideoModes) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDisplay, wxDisplay) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxVideoMode, wxVideoMode) + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxDragDrop wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDropSource, wxDropSource) |
|
From: John L. <jr...@us...> - 2006-11-02 23:38:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluasetup.h 1 Nov 2006 23:44:46 -0000 1.9 --- wxluasetup.h 2 Nov 2006 23:38:09 -0000 1.10 *************** *** 37,44 **** --- 37,46 ---- #define wxLUA_USE_wxDateSpan 1 #define wxLUA_USE_wxDateTime 1 + #define wxLUA_USE_wxDateTimeHolidayAuthority 1 #define wxLUA_USE_wxDC 1 #define wxLUA_USE_wxDialog 1 #define wxLUA_USE_wxDir 1 #define wxLUA_USE_wxDirDialog 1 + #define wxLUA_USE_wxDisplay 1 #define wxLUA_USE_wxDragDrop 1 #define wxLUA_USE_wxFile 1 |
|
From: John L. <jr...@us...> - 2006-11-01 23:44:55
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12400/wxLua/bindings Modified Files: genwxbind.lua Log Message: added wxDatePickerCtrl to bindings Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** genwxbind.lua 11 Oct 2006 03:24:01 -0000 1.78 --- genwxbind.lua 1 Nov 2006 23:44:46 -0000 1.79 *************** *** 870,873 **** --- 870,874 ---- conditions["wxLUA_USE_wxCriticalSectionLocker"] = "wxLUA_USE_wxCriticalSectionLocker" conditions["wxLUA_USE_wxDataObject"] = "wxLUA_USE_wxDataObject" + conditions["wxLUA_USE_wxDatePickerCtrl"] = "wxLUA_USE_wxDatePickerCtrl" conditions["wxLUA_USE_wxDateSpan"] = "wxLUA_USE_wxDateSpan" conditions["wxLUA_USE_wxDateTime"] = "wxLUA_USE_wxDateTime" |
|
From: John L. <jr...@us...> - 2006-11-01 23:44:55
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12400/wxLua/modules/wxbind/src Modified Files: datetime.cpp wx_bind.cpp Log Message: added wxDatePickerCtrl to bindings Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** wx_bind.cpp 28 Sep 2006 22:26:04 -0000 1.57 --- wx_bind.cpp 1 Nov 2006 23:44:47 -0000 1.58 *************** *** 223,226 **** --- 223,227 ---- { &wxEVT_CALENDAR_WEEKDAY_CLICKED, "wxEVT_CALENDAR_WEEKDAY_CLICKED", &s_wxluatag_wxCalendarEvent }, { &wxEVT_CALENDAR_YEAR_CHANGED, "wxEVT_CALENDAR_YEAR_CHANGED", &s_wxluatag_wxCalendarEvent }, + { &wxEVT_DATE_CHANGED, "wxEVT_DATE_CHANGED", &s_wxluatag_wxDateEvent }, #endif // wxLUA_USE_wxCalendarCtrl *************** *** 1819,1822 **** --- 1820,1831 ---- #endif // wxLUA_USE_wxDataObject + #if wxLUA_USE_wxDatePickerCtrl + { "wxDP_ALLOWNONE", wxDP_ALLOWNONE }, + { "wxDP_DEFAULT", wxDP_DEFAULT }, + { "wxDP_DROPDOWN", wxDP_DROPDOWN }, + { "wxDP_SHOWCENTURY", wxDP_SHOWCENTURY }, + { "wxDP_SPIN", wxDP_SPIN }, + #endif // wxLUA_USE_wxDatePickerCtrl + #if wxLUA_USE_wxDateTime { "wxDateTime_ADT", wxDateTime::ADT }, *************** *** 5536,5539 **** --- 5545,5553 ---- + #if wxLUA_USE_wxDatePickerCtrl + { "wxDatePickerCtrl", wxDatePickerCtrl_methods, wxDatePickerCtrl_methodCount, -1, CLASSINFO(wxDatePickerCtrl), &s_wxluatag_wxDatePickerCtrl, "wxControl" }, + #endif // wxLUA_USE_wxDatePickerCtrl + + #if wxLUA_USE_wxDateSpan { "wxDateSpan", wxDateSpan_methods, wxDateSpan_methodCount, -1, NULL, &s_wxluatag_wxDateSpan, NULL }, Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** datetime.cpp 9 Jun 2006 22:51:31 -0000 1.17 --- datetime.cpp 1 Nov 2006 23:44:47 -0000 1.18 *************** *** 3911,3912 **** --- 3911,4098 ---- #endif // wxLUA_USE_wxCalendarCtrl + + #if wxLUA_USE_wxDatePickerCtrl + // ------------------------------------------------------------------------------------------------- + // Bind class wxDatePickerCtrl + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxDatePickerCtrl' + int s_wxluatag_wxDatePickerCtrl = -1; + + + #if (((wxLUA_USE_wxDateTime) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxDatePickerCtrl)) && (wxLUA_USE_wxPointSizeRect) + // wxDatePickerCtrl(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl") + static int LUACALL wxLua_wxDatePickerCtrl_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxDatePickerCtrl *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxDatePickerCtrl" + const wxString name = (argCount >= 8 ? lua2wx(wxlState.GetStringType(8)) : wxString(wxT("wxDatePickerCtrl"))); + // const wxValidator validator = wxDefaultValidator + const wxValidator * validator = (argCount >= 7 ? (const wxValidator *)wxlState.GetUserDataType(7, s_wxluatag_wxValidator) : &wxDefaultValidator); + // long style = wxDP_DEFAULT | wxDP_SHOWCENTURY + long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxDP_DEFAULT | wxDP_SHOWCENTURY); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxDateTime dt = wxDefaultDateTime + const wxDateTime * dt = (argCount >= 3 ? (const wxDateTime *)wxlState.GetUserDataType(3, s_wxluatag_wxDateTime) : &wxDefaultDateTime); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlState.GetNumberType(2); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call constructor + returns = new wxDatePickerCtrl(parent, id, *dt, *pos, *size, style, *validator, name); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDatePickerCtrl, returns); + + return 1; + } + + // bool Create(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl") + static int LUACALL wxLua_wxDatePickerCtrl_Create(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxDatePickerCtrl" + const wxString name = (argCount >= 9 ? lua2wx(wxlState.GetStringType(9)) : wxString(wxT("wxDatePickerCtrl"))); + // const wxValidator validator = wxDefaultValidator + const wxValidator * validator = (argCount >= 8 ? (const wxValidator *)wxlState.GetUserDataType(8, s_wxluatag_wxValidator) : &wxDefaultValidator); + // long style = wxDP_DEFAULT | wxDP_SHOWCENTURY + long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDP_DEFAULT | wxDP_SHOWCENTURY); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxDateTime dt = wxDefaultDateTime + const wxDateTime * dt = (argCount >= 4 ? (const wxDateTime *)wxlState.GetUserDataType(4, s_wxluatag_wxDateTime) : &wxDefaultDateTime); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlState.GetNumberType(3); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl); + // call Create + returns = self->Create(parent, id, *dt, *pos, *size, style, *validator, name); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (((wxLUA_USE_wxDateTime) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxDatePickerCtrl)) && (wxLUA_USE_wxPointSizeRect) + + + #if (wxLUA_USE_wxDatePickerCtrl) && (wxLUA_USE_wxDateTime) + // %override wxLua_wxDatePickerCtrl_GetRange + // bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const + static int LUACALL wxLua_wxDatePickerCtrl_GetRange(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + + wxDateTime *dt1 = new wxDateTime(); + wxDateTime *dt2 = new wxDateTime(); + // get this + wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl); + // call GetRange + returns = self->GetRange(dt1, dt2); + // push the result flag + lua_pushboolean(L, returns); + wxlState.PushUserDataType(s_wxluatag_wxDateTime, dt1); + wxlState.PushUserDataType(s_wxluatag_wxDateTime, dt2); + + return 3; + } + + // wxDateTime GetValue() const + static int LUACALL wxLua_wxDatePickerCtrl_GetValue(lua_State *L) + { + wxLuaState wxlState(L); + wxDateTime *returns; + // get this + wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl); + // call GetValue + // allocate a new object using the copy constructor + returns = new wxDateTime(self->GetValue()); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxDateTime *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxDateTime, returns); + + return 1; + } + + // void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) + static int LUACALL wxLua_wxDatePickerCtrl_SetRange(lua_State *L) + { + wxLuaState wxlState(L); + // const wxDateTime dt2 + const wxDateTime * dt2 = (const wxDateTime *)wxlState.GetUserDataType(3, s_wxluatag_wxDateTime); + // const wxDateTime dt1 + const wxDateTime * dt1 = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime); + // get this + wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl); + // call SetRange + self->SetRange(*dt1, *dt2); + + return 0; + } + + // void SetValue(const wxDateTime& dt) + static int LUACALL wxLua_wxDatePickerCtrl_SetValue(lua_State *L) + { + wxLuaState wxlState(L); + // const wxDateTime dt + const wxDateTime * dt = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime); + // get this + wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl); + // call SetValue + self->SetValue(*dt); + + return 0; + } + + #endif // (wxLUA_USE_wxDatePickerCtrl) && (wxLUA_USE_wxDateTime) + + static int LUACALL wxLua_wxDatePickerCtrl_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxDatePickerCtrl_methods[] = { + + #if (((wxLUA_USE_wxDateTime) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxDatePickerCtrl)) && (wxLUA_USE_wxPointSizeRect) + { LuaConstructor, "wxDatePickerCtrl", wxLua_wxDatePickerCtrl_constructor, 8, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, + { LuaMethod, "Create", wxLua_wxDatePickerCtrl_Create, 8, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxDateTime, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, + #endif // (((wxLUA_USE_wxDateTime) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxDatePickerCtrl)) && (wxLUA_USE_wxPointSizeRect) + + + #if (wxLUA_USE_wxDatePickerCtrl) && (wxLUA_USE_wxDateTime) + { LuaMethod, "GetRange", wxLua_wxDatePickerCtrl_GetRange, 2, 2, { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, 0 } }, + { LuaMethod, "GetValue", wxLua_wxDatePickerCtrl_GetValue, 0, 0, { 0 } }, + { LuaMethod, "SetRange", wxLua_wxDatePickerCtrl_SetRange, 2, 2, { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, 0 } }, + { LuaMethod, "SetValue", wxLua_wxDatePickerCtrl_SetValue, 1, 1, { &s_wxluatag_wxDateTime, 0 } }, + #endif // (wxLUA_USE_wxDatePickerCtrl) && (wxLUA_USE_wxDateTime) + + { LuaDelete, "wxDatePickerCtrl", wxLua_wxDatePickerCtrl_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxDatePickerCtrl_methods = s_wxDatePickerCtrl_methods; + int wxDatePickerCtrl_methodCount = sizeof(s_wxDatePickerCtrl_methods)/sizeof(s_wxDatePickerCtrl_methods[0]); + #endif // wxLUA_USE_wxDatePickerCtrl + |
|
From: John L. <jr...@us...> - 2006-11-01 23:44:54
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12400/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: added wxDatePickerCtrl to bindings Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxstc_datatypes.lua 11 Oct 2006 03:24:01 -0000 1.32 --- wxstc_datatypes.lua 1 Nov 2006 23:44:46 -0000 1.33 *************** *** 664,667 **** --- 664,674 ---- Name = "wxDateEvent", }, + wxDatePickerCtrl = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_wxDatePickerCtrl", + DefType = "class", + Intrinsic = false, + Name = "wxDatePickerCtrl", + }, wxDateSpan = { Condition = "wxLUA_USE_wxDateSpan", *************** *** 3290,3293 **** --- 3297,3301 ---- wxLUA_USE_wxDC = "wxLUA_USE_wxDC", wxLUA_USE_wxDataObject = "wxLUA_USE_wxDataObject", + wxLUA_USE_wxDatePickerCtrl = "wxLUA_USE_wxDatePickerCtrl", wxLUA_USE_wxDateSpan = "wxLUA_USE_wxDateSpan", wxLUA_USE_wxDateTime = "wxLUA_USE_wxDateTime", |
|
From: John L. <jr...@us...> - 2006-11-01 23:44:54
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12400/wxLua/bindings/wxwidgets Modified Files: datetime.i override.hpp wx_datatypes.lua Log Message: added wxDatePickerCtrl to bindings Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** datetime.i 18 May 2006 05:47:39 -0000 1.16 --- datetime.i 1 Nov 2006 23:44:46 -0000 1.17 *************** *** 437,441 **** --- 437,445 ---- // wxDateEvent + %include "wx/dateevt.h" + %class %delete wxDateEvent, wxCommandEvent + %define %event wxEVT_DATE_CHANGED + wxDateEvent(wxWindow *win, const wxDateTime& dt, wxEventType type) *************** *** 468,469 **** --- 472,502 ---- %endif wxLUA_USE_wxCalendarCtrl + + //----------------------------------------------------------------------------- + // wxDatePickerCtrl + + %if wxLUA_USE_wxDatePickerCtrl + + %include "wx/datectrl.h" + + %enum + wxDP_SPIN + wxDP_DROPDOWN + wxDP_DEFAULT + wxDP_ALLOWNONE + wxDP_SHOWCENTURY + %endenum + + %class wxDatePickerCtrl, wxControl + wxDatePickerCtrl(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl") + bool Create(wxWindow *parent, wxWindowID id, const wxDateTime& dt = wxDefaultDateTime, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDP_DEFAULT | wxDP_SHOWCENTURY, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxDatePickerCtrl") + + // %override [bool, wxDateTime dt1, wxDateTime dt2] wxDatePickerCtrl::GetRange() const + bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const + wxDateTime GetValue() const + void SetRange(const wxDateTime& dt1, const wxDateTime& dt2) + void SetValue(const wxDateTime& dt) + %endclass + + %endif wxLUA_USE_wxDatePickerCtrl + Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wx_datatypes.lua 11 Oct 2006 03:24:01 -0000 1.36 --- wx_datatypes.lua 1 Nov 2006 23:44:46 -0000 1.37 *************** *** 664,667 **** --- 664,674 ---- Name = "wxDateEvent", }, + wxDatePickerCtrl = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_wxDatePickerCtrl", + DefType = "class", + Intrinsic = false, + Name = "wxDatePickerCtrl", + }, wxDateSpan = { Condition = "wxLUA_USE_wxDateSpan", *************** *** 3279,3282 **** --- 3286,3290 ---- wxLUA_USE_wxDC = "wxLUA_USE_wxDC", wxLUA_USE_wxDataObject = "wxLUA_USE_wxDataObject", + wxLUA_USE_wxDatePickerCtrl = "wxLUA_USE_wxDatePickerCtrl", wxLUA_USE_wxDateSpan = "wxLUA_USE_wxDateSpan", wxLUA_USE_wxDateTime = "wxLUA_USE_wxDateTime", Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** override.hpp 5 Oct 2006 05:10:47 -0000 1.54 --- override.hpp 1 Nov 2006 23:44:46 -0000 1.55 *************** *** 1302,1305 **** --- 1302,1327 ---- %end + %override wxLua_wxDatePickerCtrl_GetRange + // bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const + static int LUACALL wxLua_wxDatePickerCtrl_GetRange(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + + wxDateTime *dt1 = new wxDateTime(); + wxDateTime *dt2 = new wxDateTime(); + // get this + wxDatePickerCtrl * self = (wxDatePickerCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxDatePickerCtrl); + // call GetRange + returns = self->GetRange(dt1, dt2); + // push the result flag + lua_pushboolean(L, returns); + wxlState.PushUserDataType(s_wxluatag_wxDateTime, dt1); + wxlState.PushUserDataType(s_wxluatag_wxDateTime, dt2); + + return 3; + } + %end + // ---------------------------------------------------------------------------- // Overrides for defsutil.i |
|
From: John L. <jr...@us...> - 2006-11-01 23:44:54
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12400/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: added wxDatePickerCtrl to bindings Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxluasetup.h 25 May 2006 22:50:05 -0000 1.8 --- wxluasetup.h 1 Nov 2006 23:44:46 -0000 1.9 *************** *** 4,8 **** #define __WXLUA_SETUP__ ! #define wxLUA_USE_FL 0 #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 --- 4,8 ---- #define __WXLUA_SETUP__ ! #define wxLUA_USE_FL 0 // depricated wxWidgets contrib #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 *************** *** 34,37 **** --- 34,38 ---- #define wxLUA_USE_wxCriticalSectionLocker 1 #define wxLUA_USE_wxDataObject 1 + #define wxLUA_USE_wxDatePickerCtrl 1 #define wxLUA_USE_wxDateSpan 1 #define wxLUA_USE_wxDateTime 1 |
|
From: John L. <jr...@us...> - 2006-11-01 23:44:54
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12400/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: added wxDatePickerCtrl to bindings Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxbind.h 31 Oct 2006 21:51:15 -0000 1.38 --- wxbind.h 1 Nov 2006 23:44:46 -0000 1.39 *************** *** 196,199 **** --- 196,200 ---- #if wxLUA_USE_wxCalendarCtrl #include "wx/calctrl.h" + #include "wx/dateevt.h" #include "wx/event.h" #endif // wxLUA_USE_wxCalendarCtrl *************** *** 270,273 **** --- 271,278 ---- #endif // wxLUA_USE_wxDataObject + #if wxLUA_USE_wxDatePickerCtrl + #include "wx/datectrl.h" + #endif // wxLUA_USE_wxDatePickerCtrl + #if wxLUA_USE_wxDateSpan #include "wx/datetime.h" *************** *** 925,928 **** --- 930,937 ---- #endif // wxLUA_USE_wxDataObject + #if wxLUA_USE_wxDatePickerCtrl + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDatePickerCtrl; + #endif // wxLUA_USE_wxDatePickerCtrl + #if wxLUA_USE_wxDateSpan extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDateSpan; *************** *** 1867,1870 **** --- 1876,1884 ---- #endif // wxLUA_USE_wxDataObject + #if wxLUA_USE_wxDatePickerCtrl + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDatePickerCtrl_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxDatePickerCtrl_methodCount; + #endif // wxLUA_USE_wxDatePickerCtrl + #if wxLUA_USE_wxDateSpan extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDateSpan_methods; |
|
From: John L. <jr...@us...> - 2006-10-31 21:51:21
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23929/wxLua/bindings/wxwidgets Modified Files: wx_rules.lua Log Message: fix WXDLLIMPEXP_WXBIND for wxLuaTreeItemData Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wx_rules.lua 28 Aug 2006 05:26:20 -0000 1.23 --- wx_rules.lua 31 Oct 2006 21:51:15 -0000 1.24 *************** *** 89,93 **** // wxLuaTreeItemData - our treeitem data that allows us to get/set an index // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaTreeItemData : public wxTreeItemData { public: --- 89,93 ---- // wxLuaTreeItemData - our treeitem data that allows us to get/set an index // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXBIND wxLuaTreeItemData : public wxTreeItemData { public: |
|
From: John L. <jr...@us...> - 2006-10-31 21:51:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23929/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: fix WXDLLIMPEXP_WXBIND for wxLuaTreeItemData Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxbind.h 20 Sep 2006 04:07:37 -0000 1.37 --- wxbind.h 31 Oct 2006 21:51:15 -0000 1.38 *************** *** 24,28 **** // wxLuaTreeItemData - our treeitem data that allows us to get/set an index // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUA wxLuaTreeItemData : public wxTreeItemData { public: --- 24,28 ---- // wxLuaTreeItemData - our treeitem data that allows us to get/set an index // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXBIND wxLuaTreeItemData : public wxTreeItemData { public: |
|
From: John L. <jr...@us...> - 2006-10-11 03:24:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11324/wxLua/modules/wxbindstc/src Modified Files: stc.cpp Log Message: osx fixes, compiles and runs now Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** stc.cpp 26 Sep 2006 05:05:55 -0000 1.16 --- stc.cpp 11 Oct 2006 03:24:02 -0000 1.17 *************** *** 28,31 **** --- 28,103 ---- + #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) + // %wxchkver271 wxColour GetCaretLineBackground(); + static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBackground(lua_State *L) + { + wxLuaState wxlState(L); + wxColour *returns; + // get this + wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); + // call GetCaretLineBackground + // allocate a new object using the copy constructor + returns = new wxColour(self->GetCaretLineBackground()); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxColour, returns); + + return 1; + } + + // %wxchkver271 void SetCaretLineBackground(const wxColour& back); + static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBackground(lua_State *L) + { + wxLuaState wxlState(L); + // const wxColour back + const wxColour * back = (const wxColour *)wxlState.GetUserDataType(2, s_wxluatag_wxColour); + // get this + wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); + // call SetCaretLineBackground + self->SetCaretLineBackground(*back); + + return 0; + } + + #endif // (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) + + + #if (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) + // !%wxchkver271 wxColour GetCaretLineBack(); + static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L) + { + wxLuaState wxlState(L); + wxColour *returns; + // get this + wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); + // call GetCaretLineBack + // allocate a new object using the copy constructor + returns = new wxColour(self->GetCaretLineBack()); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxColour, returns); + + return 1; + } + + // !%wxchkver271 void SetCaretLineBack(const wxColour& back); + static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L) + { + wxLuaState wxlState(L); + // const wxColour back + const wxColour * back = (const wxColour *)wxlState.GetUserDataType(2, s_wxluatag_wxColour); + // get this + wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); + // call SetCaretLineBack + self->SetCaretLineBack(*back); + + return 0; + } + + #endif // (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) // int FormatRange(bool doDraw, int startPos, int endPos, wxDC* draw, wxDC* target, const wxRect& renderRect, const wxRect& pageRect); *************** *** 6181,6216 **** } - // wxColour GetCaretLineBack(); - static int LUACALL wxLua_wxStyledTextCtrl_GetCaretLineBack(lua_State *L) - { - wxLuaState wxlState(L); - wxColour *returns; - // get this - wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); - // call GetCaretLineBack - // allocate a new object using the copy constructor - returns = new wxColour(self->GetCaretLineBack()); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxColour, returns); - - return 1; - } - - // void SetCaretLineBack(const wxColour& back); - static int LUACALL wxLua_wxStyledTextCtrl_SetCaretLineBack(lua_State *L) - { - wxLuaState wxlState(L); - // const wxColour back - const wxColour * back = (const wxColour *)wxlState.GetUserDataType(2, s_wxluatag_wxColour); - // get this - wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); - // call SetCaretLineBack - self->SetCaretLineBack(*back); - - return 0; - } - // wxColour GetCaretForeground(); static int LUACALL wxLua_wxStyledTextCtrl_GetCaretForeground(lua_State *L) --- 6253,6256 ---- *************** *** 6545,6548 **** --- 6585,6604 ---- static WXLUAMETHOD s_wxStyledTextCtrl_methods[] = { + #if (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) + { LuaMethod, "GetCaretLineBackground", wxLua_wxStyledTextCtrl_GetCaretLineBackground, 0, 0, { 0 } }, + { LuaMethod, "SetCaretLineBackground", wxLua_wxStyledTextCtrl_SetCaretLineBackground, 1, 1, { &s_wxluatag_wxColour, 0 } }, + { LuaGetProp, "CaretLineBackground", wxLua_wxStyledTextCtrl_GetCaretLineBackground, 0, 0, {0} }, + { LuaSetProp, "CaretLineBackground", wxLua_wxStyledTextCtrl_SetCaretLineBackground, 1, 1, {0} }, + #endif // (wxCHECK_VERSION(2,7,1)) && (wxLUA_USE_wxColourPenBrush) + + + #if (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) + { LuaMethod, "GetCaretLineBack", wxLua_wxStyledTextCtrl_GetCaretLineBack, 0, 0, { 0 } }, + { LuaMethod, "SetCaretLineBack", wxLua_wxStyledTextCtrl_SetCaretLineBack, 1, 1, { &s_wxluatag_wxColour, 0 } }, + { LuaGetProp, "CaretLineBack", wxLua_wxStyledTextCtrl_GetCaretLineBack, 0, 0, {0} }, + { LuaSetProp, "CaretLineBack", wxLua_wxStyledTextCtrl_SetCaretLineBack, 1, 1, {0} }, + #endif // (wxLUA_USE_wxColourPenBrush) && (!wxCHECK_VERSION(2,7,1)) + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDC) { LuaMethod, "FormatRange", wxLua_wxStyledTextCtrl_FormatRange, 7, 7, { &s_wxluaarg_Boolean, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxDC, &s_wxluatag_wxDC, &s_wxluatag_wxRect, &s_wxluatag_wxRect, 0 } }, *************** *** 7086,7091 **** { LuaMethod, "SetWhitespaceForeground", wxLua_wxStyledTextCtrl_SetWhitespaceForeground, 2, 2, { &s_wxluaarg_Boolean, &s_wxluatag_wxColour, 0 } }, { LuaMethod, "SetWhitespaceBackground", wxLua_wxStyledTextCtrl_SetWhitespaceBackground, 2, 2, { &s_wxluaarg_Boolean, &s_wxluatag_wxColour, 0 } }, - { LuaMethod, "GetCaretLineBack", wxLua_wxStyledTextCtrl_GetCaretLineBack, 0, 0, { 0 } }, - { LuaMethod, "SetCaretLineBack", wxLua_wxStyledTextCtrl_SetCaretLineBack, 1, 1, { &s_wxluatag_wxColour, 0 } }, { LuaMethod, "GetCaretForeground", wxLua_wxStyledTextCtrl_GetCaretForeground, 0, 0, { 0 } }, { LuaMethod, "CallTipSetBackground", wxLua_wxStyledTextCtrl_CallTipSetBackground, 1, 1, { &s_wxluatag_wxColour, 0 } }, --- 7142,7145 ---- *************** *** 7098,7103 **** { LuaMethod, "SetHotspotActiveForeground", wxLua_wxStyledTextCtrl_SetHotspotActiveForeground, 2, 2, { &s_wxluaarg_Boolean, &s_wxluatag_wxColour, 0 } }, { LuaMethod, "SetHotspotActiveBackground", wxLua_wxStyledTextCtrl_SetHotspotActiveBackground, 2, 2, { &s_wxluaarg_Boolean, &s_wxluatag_wxColour, 0 } }, - { LuaGetProp, "CaretLineBack", wxLua_wxStyledTextCtrl_GetCaretLineBack, 0, 0, {0} }, - { LuaSetProp, "CaretLineBack", wxLua_wxStyledTextCtrl_SetCaretLineBack, 1, 1, {0} }, { LuaGetProp, "EdgeColour", wxLua_wxStyledTextCtrl_GetEdgeColour, 0, 0, {0} }, { LuaSetProp, "EdgeColour", wxLua_wxStyledTextCtrl_SetEdgeColour, 1, 1, {0} }, --- 7152,7155 ---- |
|
From: John L. <jr...@us...> - 2006-10-11 03:24:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11324/wxLua/modules/wxluasocket/src Modified Files: wxlsock.cpp Log Message: osx fixes, compiles and runs now Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxlsock.cpp 5 Oct 2006 05:10:47 -0000 1.19 --- wxlsock.cpp 11 Oct 2006 03:24:03 -0000 1.20 *************** *** 34,38 **** // prints to the console for unix and to a file (see below) for MSW the socket // cmd/event and the socket read/write ! #define DEBUG_WXLUASOCKET #ifdef DEBUG_WXLUASOCKET --- 34,38 ---- // prints to the console for unix and to a file (see below) for MSW the socket // cmd/event and the socket read/write ! //#define DEBUG_WXLUASOCKET #ifdef DEBUG_WXLUASOCKET |
|
From: John L. <jr...@us...> - 2006-10-11 03:24:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11324/wxLua/modules/wxbind/src Modified Files: controls.cpp event.cpp gdi.cpp Log Message: osx fixes, compiles and runs now Index: event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** event.cpp 5 Oct 2006 05:10:47 -0000 1.25 --- event.cpp 11 Oct 2006 03:24:02 -0000 1.26 *************** *** 214,218 **** evttype_idx = 4; ! if (wxlState.IsNumberType(3)) lastId = (int)lua_tonumber(L, 3); else --- 214,218 ---- evttype_idx = 4; ! if (wxlState.IsEnumerationType(3)) lastId = (int)lua_tonumber(L, 3); else *************** *** 223,227 **** } ! if (wxlState.IsNumberType(2)) winId = (int)lua_tonumber(L, 2); else --- 223,227 ---- } ! if (wxlState.IsEnumerationType(2)) winId = (int)lua_tonumber(L, 2); else *************** *** 238,242 **** evttype_idx = 3; ! if (wxlState.IsNumberType(2)) winId = (int)lua_tonumber(L, 2); else --- 238,242 ---- evttype_idx = 3; ! if (wxlState.IsEnumerationType(2)) winId = (int)lua_tonumber(L, 2); else *************** *** 262,266 **** } ! if (wxlState.IsNumberType(evttype_idx)) eventType = (int)lua_tonumber(L, evttype_idx); else --- 262,266 ---- } ! if (wxlState.IsEnumerationType(evttype_idx)) eventType = (int)lua_tonumber(L, evttype_idx); else Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** controls.cpp 9 Jun 2006 22:51:31 -0000 1.31 --- controls.cpp 11 Oct 2006 03:24:02 -0000 1.32 *************** *** 2530,2535 **** ! #if ((defined(__WXMSW__) || defined(__WXMAC__) || wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxListCtrl)) && (wxLUA_USE_wxTextCtrl) ! // %win|%mac|%wxchkver27 wxTextCtrl* GetEditControl() const static int LUACALL wxLua_wxListCtrl_GetEditControl(lua_State *L) { --- 2530,2535 ---- ! #if ((defined(__WXMSW__) || wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxListCtrl)) && (wxLUA_USE_wxTextCtrl) ! // %win|%wxchkver27 wxTextCtrl* GetEditControl() const static int LUACALL wxLua_wxListCtrl_GetEditControl(lua_State *L) { *************** *** 2546,2550 **** } ! #endif // ((defined(__WXMSW__) || defined(__WXMAC__) || wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxListCtrl)) && (wxLUA_USE_wxTextCtrl) --- 2546,2550 ---- } ! #endif // ((defined(__WXMSW__) || wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxListCtrl)) && (wxLUA_USE_wxTextCtrl) *************** *** 3729,3735 **** ! #if ((defined(__WXMSW__) || defined(__WXMAC__) || wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxListCtrl)) && (wxLUA_USE_wxTextCtrl) { LuaMethod, "GetEditControl", wxLua_wxListCtrl_GetEditControl, 0, 0, { 0 } }, ! #endif // ((defined(__WXMSW__) || defined(__WXMAC__) || wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxListCtrl)) && (wxLUA_USE_wxTextCtrl) --- 3729,3735 ---- ! #if ((defined(__WXMSW__) || wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxListCtrl)) && (wxLUA_USE_wxTextCtrl) { LuaMethod, "GetEditControl", wxLua_wxListCtrl_GetEditControl, 0, 0, { 0 } }, ! #endif // ((defined(__WXMSW__) || wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxListCtrl)) && (wxLUA_USE_wxTextCtrl) Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** gdi.cpp 12 Jun 2006 03:50:38 -0000 1.30 --- gdi.cpp 11 Oct 2006 03:24:02 -0000 1.31 *************** *** 3553,3556 **** --- 3553,3575 ---- int s_wxluatag_wxColour = -1; + + #if (!defined(__WXMAC__)) && (wxLUA_USE_wxColourPenBrush) + // !%mac long GetPixel() const + static int LUACALL wxLua_wxColour_GetPixel(lua_State *L) + { + wxLuaState wxlState(L); + long returns; + // get this + wxColour * self = (wxColour *)wxlState.GetUserDataType(1, s_wxluatag_wxColour); + // call GetPixel + returns = self->GetPixel(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // (!defined(__WXMAC__)) && (wxLUA_USE_wxColourPenBrush) + // wxColour(const unsigned char red, const unsigned char green, const unsigned char blue) static int LUACALL wxLua_wxColour_constructor(lua_State *L) *************** *** 3623,3641 **** } - // long GetPixel() const - static int LUACALL wxLua_wxColour_GetPixel(lua_State *L) - { - wxLuaState wxlState(L); - long returns; - // get this - wxColour * self = (wxColour *)wxlState.GetUserDataType(1, s_wxluatag_wxColour); - // call GetPixel - returns = self->GetPixel(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - // unsigned char Green() const static int LUACALL wxLua_wxColour_Green(lua_State *L) --- 3642,3645 ---- *************** *** 3732,3740 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxColour_methods[] = { { LuaConstructor, "wxColour", wxLua_wxColour_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaConstructor, "wxNamedColour", wxLua_wxNamedColour_constructor, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaConstructor, "wxColourCopy", wxLua_wxColourCopy_constructor, 1, 1, { &s_wxluatag_wxColour, 0 } }, { LuaMethod, "Blue", wxLua_wxColour_Blue, 0, 0, { 0 } }, - { LuaMethod, "GetPixel", wxLua_wxColour_GetPixel, 0, 0, { 0 } }, { LuaMethod, "Green", wxLua_wxColour_Green, 0, 0, { 0 } }, { LuaMethod, "Ok", wxLua_wxColour_Ok, 0, 0, { 0 } }, --- 3736,3748 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxColour_methods[] = { + + #if (!defined(__WXMAC__)) && (wxLUA_USE_wxColourPenBrush) + { LuaMethod, "GetPixel", wxLua_wxColour_GetPixel, 0, 0, { 0 } }, + #endif // (!defined(__WXMAC__)) && (wxLUA_USE_wxColourPenBrush) + { LuaConstructor, "wxColour", wxLua_wxColour_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaConstructor, "wxNamedColour", wxLua_wxNamedColour_constructor, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaConstructor, "wxColourCopy", wxLua_wxColourCopy_constructor, 1, 1, { &s_wxluatag_wxColour, 0 } }, { LuaMethod, "Blue", wxLua_wxColour_Blue, 0, 0, { 0 } }, { LuaMethod, "Green", wxLua_wxColour_Green, 0, 0, { 0 } }, { LuaMethod, "Ok", wxLua_wxColour_Ok, 0, 0, { 0 } }, |
|
From: John L. <jr...@us...> - 2006-10-11 03:24:05
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11324/wxLua/bindings/wxwidgets Modified Files: controls.i gdi.i wx_datatypes.lua Log Message: osx fixes, compiles and runs now Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** wx_datatypes.lua 20 Sep 2006 04:07:37 -0000 1.35 --- wx_datatypes.lua 11 Oct 2006 03:24:01 -0000 1.36 *************** *** 3228,3232 **** --- 3228,3239 ---- ["%wxchkver25"] = "wxCHECK_VERSION(2,5,0)", ["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)", + ["%wxchkver261"] = "wxCHECK_VERSION(2,6,1)", + ["%wxchkver262"] = "wxCHECK_VERSION(2,6,2)", + ["%wxchkver263"] = "wxCHECK_VERSION(2,6,2)", + ["%wxchkver264"] = "wxCHECK_VERSION(2,6,4)", + ["%wxchkver265"] = "wxCHECK_VERSION(2,6,5)", ["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)", + ["%wxchkver271"] = "wxCHECK_VERSION(2,7,1)", + ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)", ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)", ["%wxcompat20"] = "WXWIN_COMPATIBILITY_2", Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** gdi.i 12 Jun 2006 03:50:36 -0000 1.26 --- gdi.i 11 Oct 2006 03:24:01 -0000 1.27 *************** *** 457,461 **** unsigned char Blue() const ! long GetPixel() const unsigned char Green() const bool Ok() const --- 457,461 ---- unsigned char Blue() const ! !%mac long GetPixel() const unsigned char Green() const bool Ok() const Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** controls.i 26 May 2006 20:22:09 -0000 1.22 --- controls.i 11 Oct 2006 03:24:01 -0000 1.23 *************** *** 405,409 **** int GetColumnWidth(int col) const int GetCountPerPage() const ! %win|%mac|%wxchkver27 wxTextCtrl* GetEditControl() const wxImageList* GetImageList(int which) const bool GetItem(wxListItem& info) const --- 405,409 ---- int GetColumnWidth(int col) const int GetCountPerPage() const ! %win|%wxchkver27 wxTextCtrl* GetEditControl() const wxImageList* GetImageList(int which) const bool GetItem(wxListItem& info) const |
|
From: John L. <jr...@us...> - 2006-10-11 03:24:05
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11324/wxLua/bindings Modified Files: genwxbind.lua Log Message: osx fixes, compiles and runs now Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** genwxbind.lua 28 Aug 2006 05:26:19 -0000 1.77 --- genwxbind.lua 11 Oct 2006 03:24:01 -0000 1.78 *************** *** 593,597 **** --- 593,605 ---- conditions["%wxchkver25"] = "wxCHECK_VERSION(2,5,0)" conditions["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)" + conditions["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)" + conditions["%wxchkver261"] = "wxCHECK_VERSION(2,6,1)" + conditions["%wxchkver262"] = "wxCHECK_VERSION(2,6,2)" + conditions["%wxchkver263"] = "wxCHECK_VERSION(2,6,2)" + conditions["%wxchkver264"] = "wxCHECK_VERSION(2,6,4)" + conditions["%wxchkver265"] = "wxCHECK_VERSION(2,6,5)" conditions["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)" + conditions["%wxchkver271"] = "wxCHECK_VERSION(2,7,1)" + conditions["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)" conditions["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)" -- wxWidgets version compatibility checks |
|
From: John L. <jr...@us...> - 2006-10-11 03:24:05
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11324/wxLua/bindings/wxstc Modified Files: stc.i wxstc_datatypes.lua Log Message: osx fixes, compiles and runs now Index: stc.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/stc.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** stc.i 26 Sep 2006 05:05:55 -0000 1.6 --- stc.i 11 Oct 2006 03:24:01 -0000 1.7 *************** *** 2017,2024 **** // Get the colour of the background of the line containing the caret. ! wxColour GetCaretLineBack(); // Set the colour of the background of the line containing the caret. ! void SetCaretLineBack(const wxColour& back); // Set a style to be changeable or not (read only). --- 2017,2026 ---- // Get the colour of the background of the line containing the caret. ! !%wxchkver271 wxColour GetCaretLineBack(); ! %wxchkver271 wxColour GetCaretLineBackground(); // Set the colour of the background of the line containing the caret. ! !%wxchkver271 void SetCaretLineBack(const wxColour& back); ! %wxchkver271 void SetCaretLineBackground(const wxColour& back); // Set a style to be changeable or not (read only). *************** *** 3202,3206 **** %property=MaxLineState, read %property=CaretLineVisible, read, write ! %property=CaretLineBack, read, write %property=Indent, read, write %property=UseTabs, read, write --- 3204,3209 ---- %property=MaxLineState, read %property=CaretLineVisible, read, write ! !%wxchkver271 %property=CaretLineBack, read, write ! %wxchkver271 %property=CaretLineBackground, read, write %property=Indent, read, write %property=UseTabs, read, write Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxstc_datatypes.lua 26 Sep 2006 05:05:55 -0000 1.31 --- wxstc_datatypes.lua 11 Oct 2006 03:24:01 -0000 1.32 *************** *** 3239,3243 **** --- 3239,3250 ---- ["%wxchkver25"] = "wxCHECK_VERSION(2,5,0)", ["%wxchkver26"] = "wxCHECK_VERSION(2,6,0)", + ["%wxchkver261"] = "wxCHECK_VERSION(2,6,1)", + ["%wxchkver262"] = "wxCHECK_VERSION(2,6,2)", + ["%wxchkver263"] = "wxCHECK_VERSION(2,6,2)", + ["%wxchkver264"] = "wxCHECK_VERSION(2,6,4)", + ["%wxchkver265"] = "wxCHECK_VERSION(2,6,5)", ["%wxchkver27"] = "wxCHECK_VERSION(2,7,0)", + ["%wxchkver271"] = "wxCHECK_VERSION(2,7,1)", + ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)", ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)", ["%wxcompat20"] = "WXWIN_COMPATIBILITY_2", |
|
From: John L. <jr...@us...> - 2006-10-08 18:58:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25032/modules/wxluasocket/include Modified Files: wxldserv.h Log Message: compilation fix, MSVC doesn't allow member classes access to protected functions, gcc does Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxldserv.h 5 Oct 2006 05:10:47 -0000 1.23 --- wxldserv.h 8 Oct 2006 18:58:33 -0000 1.24 *************** *** 268,275 **** virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; } protected: bool StartServerThread(); bool WaitForConnect(int timeOut); - void ThreadFunction(); wxLuaSocket *m_serverSocket; --- 268,278 ---- virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; } + // The thread function for the running LuaThread, only to be called by the + // thread. + void ThreadFunction(); + protected: bool StartServerThread(); bool WaitForConnect(int timeOut); wxLuaSocket *m_serverSocket; |
|
From: John L. <jr...@us...> - 2006-10-05 05:10:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28254/wxLua/modules/wxluasocket/src Modified Files: dservice.cpp wxldserv.cpp wxldtarg.cpp wxlsock.cpp wxluasocket_bind.cpp Log Message: change wxLuaDebugeeEvent wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED to wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED add wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED and send it when a read/write fails make wxEvtHandler::Connect check for numbers only, NOT nil or bool enhance the wxLuaSocketException replace more nil bool values with true/false in editor.wx.lua Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxldtarg.cpp 4 Oct 2006 05:55:02 -0000 1.29 --- wxldtarg.cpp 5 Oct 2006 05:10:47 -0000 1.30 *************** *** 158,161 **** --- 158,163 ---- { NotifyExit(); + wxMilliSleep(900); + if (m_fConnected) { *************** *** 441,444 **** --- 443,448 ---- { NotifyExit(); + wxMilliSleep(900); + m_forceBreak = true; m_resetRequested = true; Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxluasocket_bind.cpp 28 Sep 2006 22:26:06 -0000 1.6 --- wxluasocket_bind.cpp 5 Oct 2006 05:10:47 -0000 1.7 *************** *** 29,33 **** { { &wxEVT_WXLUA_DEBUGGER_BREAK, "wxEVT_WXLUA_DEBUGGER_BREAK", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, "wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED", &s_wxluatag_wxLuaDebuggerEvent }, { &wxEVT_WXLUA_DEBUGGER_ERROR, "wxEVT_WXLUA_DEBUGGER_ERROR", &s_wxluatag_wxLuaDebuggerEvent }, { &wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, "wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR", &s_wxluatag_wxLuaDebuggerEvent }, --- 29,34 ---- { { &wxEVT_WXLUA_DEBUGGER_BREAK, "wxEVT_WXLUA_DEBUGGER_BREAK", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, "wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED", &s_wxluatag_wxLuaDebuggerEvent }, { &wxEVT_WXLUA_DEBUGGER_ERROR, "wxEVT_WXLUA_DEBUGGER_ERROR", &s_wxluatag_wxLuaDebuggerEvent }, { &wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, "wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR", &s_wxluatag_wxLuaDebuggerEvent }, Index: dservice.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** dservice.cpp 4 Oct 2006 22:07:23 -0000 1.27 --- dservice.cpp 5 Oct 2006 05:10:47 -0000 1.28 *************** *** 486,494 **** wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; dSocket->WriteCmd(wxLUASOCKET_DEBUGGEE_EVENT_BREAK); - #if wxCHECK_VERSION(2,3,0) dSocket->WriteString(fileName.GetFullPath()); - #else - dSocket->WriteString(fileName); - #endif dSocket->WriteInt32(lineNumber); --- 486,490 ---- Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wxldserv.cpp 4 Oct 2006 22:07:23 -0000 1.29 --- wxldserv.cpp 5 Oct 2006 05:10:47 -0000 1.30 *************** *** 34,38 **** // ---------------------------------------------------------------------------- ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED) DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_BREAK) DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_PRINT) --- 34,39 ---- // ---------------------------------------------------------------------------- ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED) DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_BREAK) DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_PRINT) *************** *** 51,61 **** wxLuaDebuggerEvent::wxLuaDebuggerEvent(const wxLuaDebuggerEvent& event) ! :wxEvent(event), ! m_lineNumber(event.m_lineNumber), ! m_fileName(event.m_fileName), ! m_strMessage(event.m_strMessage), ! m_fHasMessage(event.m_fHasMessage), ! m_nReference(event.m_nReference), ! m_fEnabledFlag(event.m_fEnabledFlag) { SetDebugData(event.GetReference(), event.GetDebugData().Copy()); --- 52,62 ---- wxLuaDebuggerEvent::wxLuaDebuggerEvent(const wxLuaDebuggerEvent& event) ! :wxEvent(event), ! m_lineNumber(event.m_lineNumber), ! m_fileName(event.m_fileName), ! m_strMessage(event.m_strMessage), ! m_fHasMessage(event.m_fHasMessage), ! m_nReference(event.m_nReference), ! m_fEnabledFlag(event.m_fEnabledFlag) { SetDebugData(event.GetReference(), event.GetDebugData().Copy()); *************** *** 76,82 **** } ! void wxLuaDebuggerEvent::SetMessage(const wxString &pMessage) { ! m_strMessage = pMessage; m_fHasMessage = true; } --- 77,83 ---- } ! void wxLuaDebuggerEvent::SetMessage(const wxString& message) { ! m_strMessage = message; m_fHasMessage = true; } *************** *** 113,117 **** { wxCHECK_RET(m_luaDebugger, wxT("Invalid wxLuaDebuggerServer")); ! wxBeginBusyCursor(); m_luaDebugger->EnumerateStack(); } --- 114,118 ---- { wxCHECK_RET(m_luaDebugger, wxT("Invalid wxLuaDebuggerServer")); ! wxBeginBusyCursor(); // ended in wxLuaDebuggerBase::OnDebugXXX m_luaDebugger->EnumerateStack(); } *************** *** 120,124 **** { wxCHECK_RET(m_luaDebugger, wxT("Invalid wxLuaDebuggerServer")); ! wxBeginBusyCursor(); m_luaDebugger->EnumerateStackEntry(nEntry); } --- 121,125 ---- { wxCHECK_RET(m_luaDebugger, wxT("Invalid wxLuaDebuggerServer")); ! wxBeginBusyCursor(); // ended in wxLuaDebuggerBase::OnDebugXXX m_luaDebugger->EnumerateStackEntry(nEntry); } *************** *** 127,131 **** { wxCHECK_RET(m_luaDebugger, wxT("Invalid wxLuaDebuggerServer")); ! wxBeginBusyCursor(); m_luaDebugger->EnumerateTable(nRef, nEntry, (long)treeId.m_pItem); } --- 128,132 ---- { wxCHECK_RET(m_luaDebugger, wxT("Invalid wxLuaDebuggerServer")); ! wxBeginBusyCursor(); // ended in wxLuaDebuggerBase::OnDebugXXX m_luaDebugger->EnumerateTable(nRef, nEntry, (long)treeId.m_pItem); } *************** *** 134,138 **** { wxCHECK_RET(m_luaDebugger, wxT("Invalid wxLuaDebuggerServer")); ! wxBeginBusyCursor(); m_luaDebugger->EnumerateTable(-1, -1, (long)treeId.m_pItem); } --- 135,139 ---- { wxCHECK_RET(m_luaDebugger, wxT("Invalid wxLuaDebuggerServer")); ! wxBeginBusyCursor(); // ended in wxLuaDebuggerBase::OnDebugXXX m_luaDebugger->EnumerateTable(-1, -1, (long)treeId.m_pItem); } *************** *** 148,154 **** BEGIN_EVENT_TABLE(wxLuaDebuggerBase, wxEvtHandler) ! EVT_WXLUA_DEBUGGER_STACK_ENUM( wxLuaDebuggerBase::OnDebugStackEnum) ! EVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM(wxLuaDebuggerBase::OnDebugStackEntryEnum) ! EVT_WXLUA_DEBUGGER_TABLE_ENUM( wxLuaDebuggerBase::OnDebugTableEnum) EVT_END_PROCESS(ID_WXLUASOCKET_DEBUGGEE_PROCESS, wxLuaDebuggerBase::OnEndDebugeeProcess) --- 149,155 ---- BEGIN_EVENT_TABLE(wxLuaDebuggerBase, wxEvtHandler) ! EVT_WXLUA_DEBUGGER_STACK_ENUM( wxID_ANY, wxLuaDebuggerBase::OnDebugStackEnum) ! EVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM( wxID_ANY, wxLuaDebuggerBase::OnDebugStackEntryEnum) ! EVT_WXLUA_DEBUGGER_TABLE_ENUM( wxID_ANY, wxLuaDebuggerBase::OnDebugTableEnum) EVT_END_PROCESS(ID_WXLUASOCKET_DEBUGGEE_PROCESS, wxLuaDebuggerBase::OnEndDebugeeProcess) *************** *** 189,323 **** bool wxLuaDebuggerBase::AddBreakPoint(const wxString &fileName, int lineNumber) { ! return GetSocketBase() && GetSocketBase()->IsConnected() && GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ADD_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteInt32(lineNumber); } bool wxLuaDebuggerBase::RemoveBreakPoint(const wxString &fileName, int lineNumber) { ! return GetSocketBase() && GetSocketBase()->IsConnected() && GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteInt32(lineNumber); } bool wxLuaDebuggerBase::DisableBreakPoint(const wxString &fileName, int lineNumber) { ! return GetSocketBase() && GetSocketBase()->IsConnected() && GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteInt32(lineNumber); } bool wxLuaDebuggerBase::EnableBreakPoint(const wxString &fileName, int lineNumber) { ! return GetSocketBase() && GetSocketBase()->IsConnected() && GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteInt32(lineNumber); } bool wxLuaDebuggerBase::ClearAllBreakPoints() { ! return GetSocketBase() && GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_CLEAR_ALL_BREAKPOINTS); } bool wxLuaDebuggerBase::Run(const wxString &fileName, const wxString &buffer) { ! return GetSocketBase() && GetSocketBase()->IsConnected() && GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_RUN_BUFFER) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteString(buffer); } bool wxLuaDebuggerBase::Step() { ! return GetSocketBase() && GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEP); } bool wxLuaDebuggerBase::StepOver() { ! return GetSocketBase() && GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOVER); } bool wxLuaDebuggerBase::StepOut() { ! return GetSocketBase() && GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOUT); } bool wxLuaDebuggerBase::Continue() { ! return GetSocketBase() && GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE); } bool wxLuaDebuggerBase::Break() { ! return GetSocketBase() && GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK); } bool wxLuaDebuggerBase::Reset() { ! return GetSocketBase() && GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_RESET); } bool wxLuaDebuggerBase::EnumerateStack() { ! return GetSocketBase() && GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK); } bool wxLuaDebuggerBase::EnumerateStackEntry(int stackEntry) { ! return GetSocketBase() && GetSocketBase()->IsConnected() && GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK_ENTRY) && ! GetSocketBase()->WriteInt32(stackEntry); } bool wxLuaDebuggerBase::EnumerateTable(int tableRef, int nIndex, long nItemNode) { ! return GetSocketBase() && GetSocketBase()->IsConnected() && GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_TABLE_REF) && GetSocketBase()->WriteInt32(tableRef) && GetSocketBase()->WriteInt32(nIndex) && ! GetSocketBase()->WriteLong(nItemNode); } bool wxLuaDebuggerBase::CleanupDebugReferences() { ! return GetSocketBase() && GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES); } bool wxLuaDebuggerBase::EvaluateExpr(int exprRef, const wxString &strExpression) { ! return GetSocketBase() && GetSocketBase()->IsConnected() && GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_EVALUATE_EXPR) && GetSocketBase()->WriteInt32(exprRef) && ! GetSocketBase()->WriteString(strExpression); ! } ! ! bool wxLuaDebuggerBase::Compile(const wxString &fileName, const wxString &buffer) ! { ! wxLuaState wxlState(true); // new clean state to compile in ! wxString errMsg; ! int line_num = -1; ! int ret = wxlState.CompileString(buffer, fileName, &errMsg, &line_num); ! ! if (errMsg.IsEmpty()) ! errMsg = _T("Compiled ok.\n"); ! ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_ERROR, this); ! debugEvent.SetMessage(errMsg); ! SendEvent(debugEvent); ! ! return ret == -1; } --- 190,307 ---- bool wxLuaDebuggerBase::AddBreakPoint(const wxString &fileName, int lineNumber) { ! return CheckSocketConnected() && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ADD_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteInt32(lineNumber)); } bool wxLuaDebuggerBase::RemoveBreakPoint(const wxString &fileName, int lineNumber) { ! return CheckSocketConnected() && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteInt32(lineNumber)); } bool wxLuaDebuggerBase::DisableBreakPoint(const wxString &fileName, int lineNumber) { ! return CheckSocketConnected() && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteInt32(lineNumber)); } bool wxLuaDebuggerBase::EnableBreakPoint(const wxString &fileName, int lineNumber) { ! return CheckSocketConnected() && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteInt32(lineNumber)); } bool wxLuaDebuggerBase::ClearAllBreakPoints() { ! return CheckSocketConnected() && CheckSocketWrite( ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_CLEAR_ALL_BREAKPOINTS)); } bool wxLuaDebuggerBase::Run(const wxString &fileName, const wxString &buffer) { ! return CheckSocketConnected() && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_RUN_BUFFER) && GetSocketBase()->WriteString(fileName) && ! GetSocketBase()->WriteString(buffer)); } bool wxLuaDebuggerBase::Step() { ! return CheckSocketConnected() && CheckSocketWrite( ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEP)); } bool wxLuaDebuggerBase::StepOver() { ! return CheckSocketConnected() && CheckSocketWrite( ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOVER)); } bool wxLuaDebuggerBase::StepOut() { ! return CheckSocketConnected() && CheckSocketWrite( ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOUT)); } bool wxLuaDebuggerBase::Continue() { ! return CheckSocketConnected() && CheckSocketWrite( ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE)); } bool wxLuaDebuggerBase::Break() { ! return CheckSocketConnected() && CheckSocketWrite( ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK)); } bool wxLuaDebuggerBase::Reset() { ! return CheckSocketConnected() && CheckSocketWrite( ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_RESET)); } bool wxLuaDebuggerBase::EnumerateStack() { ! return CheckSocketConnected() && CheckSocketWrite( ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK)); } bool wxLuaDebuggerBase::EnumerateStackEntry(int stackEntry) { ! return CheckSocketConnected() && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK_ENTRY) && ! GetSocketBase()->WriteInt32(stackEntry)); } bool wxLuaDebuggerBase::EnumerateTable(int tableRef, int nIndex, long nItemNode) { ! return CheckSocketConnected() && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_TABLE_REF) && GetSocketBase()->WriteInt32(tableRef) && GetSocketBase()->WriteInt32(nIndex) && ! GetSocketBase()->WriteLong(nItemNode)); } bool wxLuaDebuggerBase::CleanupDebugReferences() { ! return CheckSocketConnected() && CheckSocketWrite( ! GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES)); } bool wxLuaDebuggerBase::EvaluateExpr(int exprRef, const wxString &strExpression) { ! return CheckSocketConnected() && CheckSocketWrite( GetSocketBase()->WriteCmd(wxLUASOCKET_DEBUGGER_CMD_EVALUATE_EXPR) && GetSocketBase()->WriteInt32(exprRef) && ! GetSocketBase()->WriteString(strExpression)); } *************** *** 333,338 **** wxInt32 lineNumber = 0; ! if (GetSocketBase()->ReadString(fileName) && ! GetSocketBase()->ReadInt32(lineNumber)) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAK, this, lineNumber, fileName); --- 317,323 ---- wxInt32 lineNumber = 0; ! if (CheckSocketRead( ! GetSocketBase()->ReadString(fileName) && ! GetSocketBase()->ReadInt32(lineNumber))) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAK, this, lineNumber, fileName); *************** *** 347,351 **** wxString strMessage; ! if (GetSocketBase()->ReadString(strMessage)) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_PRINT, this); --- 332,337 ---- wxString strMessage; ! if (CheckSocketRead( ! GetSocketBase()->ReadString(strMessage))) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_PRINT, this); *************** *** 361,365 **** wxString strMessage; ! if (GetSocketBase()->ReadString(strMessage)) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_ERROR, this); --- 347,352 ---- wxString strMessage; ! if (CheckSocketRead( ! GetSocketBase()->ReadString(strMessage))) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_ERROR, this); *************** *** 381,385 **** wxLuaDebugData debugData; ! if (GetSocketBase()->ReadDebugData(debugData)) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_STACK_ENUM, this); --- 368,373 ---- wxLuaDebugData debugData; ! if (CheckSocketRead( ! GetSocketBase()->ReadDebugData(debugData))) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_STACK_ENUM, this); *************** *** 396,401 **** wxLuaDebugData debugData; ! if (GetSocketBase()->ReadInt32(stackRef) && ! GetSocketBase()->ReadDebugData(debugData)) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, this); --- 384,390 ---- wxLuaDebugData debugData; ! if (CheckSocketRead( ! GetSocketBase()->ReadInt32(stackRef) && ! GetSocketBase()->ReadDebugData(debugData))) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, this); *************** *** 412,417 **** wxLuaDebugData debugData; ! if (GetSocketBase()->ReadLong(itemNode) && ! GetSocketBase()->ReadDebugData(debugData)) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, this); --- 401,407 ---- wxLuaDebugData debugData; ! if (CheckSocketRead( ! GetSocketBase()->ReadLong(itemNode) && ! GetSocketBase()->ReadDebugData(debugData))) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, this); *************** *** 428,433 **** wxString strResult; ! if (GetSocketBase()->ReadInt32(exprRef) && ! GetSocketBase()->ReadString(strResult)) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, this); --- 418,424 ---- wxString strResult; ! if (CheckSocketRead( ! GetSocketBase()->ReadInt32(exprRef) && ! GetSocketBase()->ReadString(strResult))) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, this); *************** *** 446,452 **** wxInt32 enabled = 0; ! if (GetSocketBase()->ReadString(fileName) && GetSocketBase()->ReadInt32(line) && ! GetSocketBase()->ReadInt32(enabled)) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, this, line, fileName, enabled ? true : false); --- 437,444 ---- wxInt32 enabled = 0; ! if (CheckSocketRead( ! GetSocketBase()->ReadString(fileName) && GetSocketBase()->ReadInt32(line) && ! GetSocketBase()->ReadInt32(enabled))) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, this, line, fileName, enabled ? true : false); *************** *** 462,467 **** wxInt32 line = 0; ! if (GetSocketBase()->ReadString(fileName) && ! GetSocketBase()->ReadInt32(line)) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, this, line, fileName); --- 454,460 ---- wxInt32 line = 0; ! if (CheckSocketRead( ! GetSocketBase()->ReadString(fileName) && ! GetSocketBase()->ReadInt32(line))) { wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, this, line, fileName); *************** *** 478,481 **** --- 471,526 ---- } + + bool wxLuaDebuggerBase::CheckSocketConnected(bool send_event) + { + if (GetSocketBase() == NULL) + { + if (send_event) + { + wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, this); + debugEvent.SetMessage(wxT("Debugger socket not created.")); + SendEvent(debugEvent); + } + + return false; + } + + if (!GetSocketBase()->IsConnected()) + { + if (send_event) + { + wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, this); + debugEvent.SetMessage(wxT("Debugger socket not connected.")); + SendEvent(debugEvent); + } + + return false; + } + + return true; + } + bool wxLuaDebuggerBase::CheckSocketRead(bool read_ok) + { + if (!read_ok) + { + wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, this); + debugEvent.SetMessage(wxT("Failed reading from the debugger socket.")); + SendEvent(debugEvent); + } + + return read_ok; + } + bool wxLuaDebuggerBase::CheckSocketWrite(bool write_ok) + { + if (!write_ok) + { + wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, this); + debugEvent.SetMessage(wxT("Failed writing to the debugger socket.")); + SendEvent(debugEvent); + } + + return write_ok; + } + bool wxLuaDebuggerBase::DisplayStackDialog(wxWindow *parent, wxWindowID id) { *************** *** 564,596 **** { StopServer(); - - if (m_pThread != NULL) - delete m_pThread; } bool wxLuaDebuggerServer::StartServer() { m_serverSocket = new wxLuaSocket; ! if (m_serverSocket != NULL) { ! m_serverSocket->m_name = wxString::Format(wxT("wxLuaDebuggerServer::m_serverSocket (%ld)"), (long)wxGetProcessId()); ! ! try ! { ! // listen on the specified port ! m_serverSocket->Listen(m_port_number); ! return StartServerThread(); ! } ! catch(wxLuaSocketException & e) ! { ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_ERROR, this); ! debugEvent.SetMessage(wxString::Format(_("Error while opening listening socket. %s"), e.description().c_str())); ! AddPendingEvent(debugEvent); ! delete m_serverSocket; ! m_serverSocket = NULL; ! m_fShutdown = true; ! } } --- 609,637 ---- { StopServer(); } bool wxLuaDebuggerServer::StartServer() { + wxCHECK_MSG(m_serverSocket == NULL, false, wxT("Debugger server socket already created")); + + m_fShutdown = false; m_serverSocket = new wxLuaSocket; + m_serverSocket->m_name = wxString::Format(wxT("wxLuaDebuggerServer::m_serverSocket (%ld)"), (long)wxGetProcessId()); ! try { ! // listen on the specified port ! m_serverSocket->Listen(m_port_number); ! return StartServerThread(); ! } ! catch(wxLuaSocketException & e) ! { ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_ERROR, this); ! debugEvent.SetMessage(wxString::Format(_("Error while opening listening socket. %s"), e.description().c_str())); ! AddPendingEvent(debugEvent); ! delete m_serverSocket; ! m_serverSocket = NULL; ! m_fShutdown = true; } *************** *** 600,604 **** bool wxLuaDebuggerServer::StartClient() { ! if ((m_debuggeeProcess == NULL) && m_serverSocket && !m_fShutdown && (m_pThread != NULL)) { m_debuggeeProcess = new wxProcess(this, ID_WXLUASOCKET_DEBUGGEE_PROCESS); --- 641,648 ---- bool wxLuaDebuggerServer::StartClient() { ! wxCHECK_MSG(m_serverSocket, false, wxT("Debugger server not started")); ! wxCHECK_MSG(m_pThread, false, wxT("Debugger server thread not running")); ! ! if ((m_debuggeeProcess == NULL) && !m_fShutdown) { m_debuggeeProcess = new wxProcess(this, ID_WXLUASOCKET_DEBUGGEE_PROCESS); *************** *** 611,614 **** --- 655,659 ---- return (m_debuggeeProcessID > 0); } + return false; } *************** *** 616,627 **** bool wxLuaDebuggerServer::StartServerThread() { ! if (m_serverSocket && !m_fShutdown && (m_pThread == NULL)) { m_pThread = new wxLuaDebuggerServer::LuaThread(this); ! return ((m_pThread != NULL) && (m_pThread->Create() == wxTHREAD_NO_ERROR) && (m_pThread->Run() == wxTHREAD_NO_ERROR)); } return false; } --- 661,676 ---- bool wxLuaDebuggerServer::StartServerThread() { ! wxCHECK_MSG(m_serverSocket, false, wxT("Debugger server not started")); ! wxCHECK_MSG(m_pThread == NULL, false, wxT("Debugger server thread already created")); ! ! if (!m_fShutdown) { m_pThread = new wxLuaDebuggerServer::LuaThread(this); ! return ((m_pThread != NULL) && (m_pThread->Create() == wxTHREAD_NO_ERROR) && (m_pThread->Run() == wxTHREAD_NO_ERROR)); } + return false; } *************** *** 629,632 **** --- 678,683 ---- bool wxLuaDebuggerServer::StopServer() { + // NO checks, can always call stop server + // Set the shutdown flag m_fShutdown = true; *************** *** 653,657 **** } ! // close the server socket if (m_serverSocket != NULL) { --- 704,709 ---- } ! // close the server socket, if accepted socket created it will already ! // have been deleted if (m_serverSocket != NULL) { *************** *** 686,689 **** --- 738,744 ---- m_pThread->Wait(); + delete m_pThread; + m_pThread = NULL; + return true; } *************** *** 692,744 **** { wxCHECK_RET(m_serverSocket, wxT("Invalid server socket")); try { m_acceptedSocket = new wxLuaSocket(m_serverSocket->Accept()); ! if (m_acceptedSocket != NULL) ! { ! m_acceptedSocket->m_name = wxString::Format(wxT("wxLuaDebuggerServer::m_acceptedSocket (%ld)"), (long)wxGetProcessId()); ! wxLuaSocket *serverSocket = m_serverSocket; ! m_serverSocket = NULL; ! delete serverSocket; ! wxMilliSleep(500); // why ?? ! // if not shutdown requested ! if (!m_fShutdown) { ! try { ! // Notify that a client has connected and we are ready to debug ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, this); ! AddPendingEvent(debugEvent); ! ! // Enter the debug loop ! while (!m_fShutdown && m_acceptedSocket) ! { ! unsigned char debugEvent = 0; // wxLuaSocketDebuggeeEvents_Type ! if (//m_acceptedSocket->IsReadable() && ! m_acceptedSocket->ReadCmd(debugEvent)) ! { ! if (debugEvent == wxLUASOCKET_DEBUGGEE_EVENT_EXIT) ! m_fShutdown = true; ! HandleDebuggeeEvent(debugEvent); ! } ! } ! } ! catch(wxLuaSocketException &) ! { } } ! // delete the accepted socket ! if (m_acceptedSocket != NULL) ! { ! wxLuaSocket *acceptedSocket = m_acceptedSocket; ! m_acceptedSocket = NULL; ! delete acceptedSocket; ! } } } --- 747,795 ---- { wxCHECK_RET(m_serverSocket, wxT("Invalid server socket")); + wxCHECK_RET(m_acceptedSocket == NULL, wxT("The debugger server has already accepted a socket connection")); try { m_acceptedSocket = new wxLuaSocket(m_serverSocket->Accept()); ! m_acceptedSocket->m_name = wxString::Format(wxT("wxLuaDebuggerServer::m_acceptedSocket (%ld)"), (long)wxGetProcessId()); ! wxLuaSocket *serverSocket = m_serverSocket; ! m_serverSocket = NULL; ! delete serverSocket; ! wxMilliSleep(500); // why ?? ! try ! { ! // Notify that a client has connected and we are ready to debug ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, this); ! AddPendingEvent(debugEvent); ! ! // Enter the debug loop ! while (!m_fShutdown && m_acceptedSocket) { ! unsigned char debugEvent = 0; // wxLuaSocketDebuggeeEvents_Type ! if (//m_acceptedSocket->IsReadable() && ! m_acceptedSocket->ReadCmd(debugEvent)) { ! HandleDebuggeeEvent(debugEvent); ! if (debugEvent == wxLUASOCKET_DEBUGGEE_EVENT_EXIT) ! m_fShutdown = true; } } + } + catch(wxLuaSocketException &) + { + wxPrintf(wxT("I'm here!\n")); ! } ! ! // delete the accepted socket ! if (m_acceptedSocket != NULL) ! { ! wxLuaSocket *acceptedSocket = m_acceptedSocket; ! m_acceptedSocket = NULL; ! delete acceptedSocket; } } *************** *** 853,857 **** // Notify that a client has connected and we are ready to debug ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, this); AddPendingEvent(debugEvent); --- 904,908 ---- // Notify that a client has connected and we are ready to debug ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, this); AddPendingEvent(debugEvent); Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxlsock.cpp 4 Oct 2006 05:55:02 -0000 1.18 --- wxlsock.cpp 5 Oct 2006 05:10:47 -0000 1.19 *************** *** 34,38 **** // prints to the console for unix and to a file (see below) for MSW the socket // cmd/event and the socket read/write ! //#define DEBUG_WXLUASOCKET #ifdef DEBUG_WXLUASOCKET --- 34,38 ---- // prints to the console for unix and to a file (see below) for MSW the socket // cmd/event and the socket read/write ! #define DEBUG_WXLUASOCKET #ifdef DEBUG_WXLUASOCKET *************** *** 338,347 **** { if (m_sockstate != SOCKET_CLOSED) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CLOSED); m_sock = ::socket(AF_INET, SOCK_STREAM, 0); if (m_sock == INVALID_SOCKET) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_INVALID_SOCKET); sockaddr_in localAddr = { 0 }; --- 338,347 ---- { if (m_sockstate != SOCKET_CLOSED) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CLOSED, m_name); m_sock = ::socket(AF_INET, SOCK_STREAM, 0); if (m_sock == INVALID_SOCKET) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_INVALID_SOCKET, m_name); sockaddr_in localAddr = { 0 }; *************** *** 352,359 **** if (::bind(m_sock, (sockaddr *) &localAddr, sizeof(localAddr)) == SOCKET_ERROR) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_BIND_FAILED); if (::listen(m_sock, backLog) == SOCKET_ERROR) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_LISTEN_FAILED); memset(&m_sockaddress, 0, sizeof(m_sockaddress)); --- 352,359 ---- if (::bind(m_sock, (sockaddr *) &localAddr, sizeof(localAddr)) == SOCKET_ERROR) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_BIND_FAILED, m_name); if (::listen(m_sock, backLog) == SOCKET_ERROR) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_LISTEN_FAILED, m_name); memset(&m_sockaddress, 0, sizeof(m_sockaddress)); *************** *** 364,368 **** { if (m_sockstate != SOCKET_LISTENING) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_LISTENING); sockaddr_in fromAddr = { 0 }; --- 364,368 ---- { if (m_sockstate != SOCKET_LISTENING) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_LISTENING, m_name); sockaddr_in fromAddr = { 0 }; *************** *** 371,375 **** socket_type acceptedSocket = ::accept(m_sock, (sockaddr *)&fromAddr, &length); if (acceptedSocket == INVALID_SOCKET) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_ACCEPT_FAILED); return wxLuaAcceptedSocket(acceptedSocket, fromAddr); --- 371,375 ---- socket_type acceptedSocket = ::accept(m_sock, (sockaddr *)&fromAddr, &length); if (acceptedSocket == INVALID_SOCKET) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_ACCEPT_FAILED, m_name); return wxLuaAcceptedSocket(acceptedSocket, fromAddr); *************** *** 381,389 **** if (m_sockstate != SOCKET_CLOSED) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CLOSED); m_sock = ::socket(AF_INET, SOCK_STREAM, 0); if (m_sock == INVALID_SOCKET) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_INVALID_SOCKET); unsigned long address = ::inet_addr(wx2lua(addr)); --- 381,389 ---- if (m_sockstate != SOCKET_CLOSED) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CLOSED, m_name); m_sock = ::socket(AF_INET, SOCK_STREAM, 0); if (m_sock == INVALID_SOCKET) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_INVALID_SOCKET, m_name); unsigned long address = ::inet_addr(wx2lua(addr)); *************** *** 394,401 **** if (pHost == NULL) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_ADDRESS_NOT_RESOLVED); if (pHost->h_addrtype != AF_INET) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_INCOMPATIBLE_TYPE); memset(&m_sockaddress, 0, sizeof(m_sockaddress)); --- 394,401 ---- if (pHost == NULL) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_ADDRESS_NOT_RESOLVED, m_name); if (pHost->h_addrtype != AF_INET) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_INCOMPATIBLE_TYPE, m_name); memset(&m_sockaddress, 0, sizeof(m_sockaddress)); *************** *** 406,410 **** if (::connect(m_sock, (sockaddr *) &m_sockaddress, sizeof(m_sockaddress)) == SOCKET_ERROR) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_CONNECT_FAILED); m_sockstate = SOCKET_CONNECTED; --- 406,410 ---- if (::connect(m_sock, (sockaddr *) &m_sockaddress, sizeof(m_sockaddress)) == SOCKET_ERROR) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_CONNECT_FAILED, m_name); m_sockstate = SOCKET_CONNECTED; *************** *** 414,418 **** { if ((m_sockstate != SOCKET_CONNECTED) && (m_sockstate != SOCKET_ACCEPTED)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED); return lua2wx(inet_ntoa(m_sockaddress.sin_addr)); --- 414,418 ---- { if ((m_sockstate != SOCKET_CONNECTED) && (m_sockstate != SOCKET_ACCEPTED)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED, m_name); return lua2wx(inet_ntoa(m_sockaddress.sin_addr)); *************** *** 422,426 **** { if ((m_sockstate != SOCKET_CONNECTED) && (m_sockstate != SOCKET_ACCEPTED)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED); return ntohs(m_sockaddress.sin_port); --- 422,426 ---- { if ((m_sockstate != SOCKET_CONNECTED) && (m_sockstate != SOCKET_ACCEPTED)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED, m_name); return ntohs(m_sockaddress.sin_port); *************** *** 431,435 **** { if ((m_sockstate != SOCKET_CONNECTED) && (m_sockstate != SOCKET_ACCEPTED)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED); int length = length_; --- 431,435 ---- { if ((m_sockstate != SOCKET_CONNECTED) && (m_sockstate != SOCKET_ACCEPTED)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED, m_name); int length = length_; *************** *** 444,448 **** //wxSafeShowMessage(wxT("wxLuaSocket::Write Socket Error"), wxString::Format(wxT("%s wxLuaSocket::Write SOCKET_ERROR %s line %d len %d"), wxT(__TIME__), wxT(__FILE__), __LINE__, (int)length_)); //return num_written; ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_SEND_FAILED); } --- 444,448 ---- //wxSafeShowMessage(wxT("wxLuaSocket::Write Socket Error"), wxString::Format(wxT("%s wxLuaSocket::Write SOCKET_ERROR %s line %d len %d"), wxT(__TIME__), wxT(__FILE__), __LINE__, (int)length_)); //return num_written; ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_SEND_FAILED, m_name); } *************** *** 458,462 **** { if ((m_sockstate != SOCKET_CONNECTED) && (m_sockstate != SOCKET_ACCEPTED)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED); int length = length_; --- 458,462 ---- { if ((m_sockstate != SOCKET_CONNECTED) && (m_sockstate != SOCKET_ACCEPTED)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_NOT_CONNECTED, m_name); int length = length_; *************** *** 473,477 **** { //wxSafeShowMessage(wxT("wxLuaSocket::Read Socket Error"), wxString::Format(wxT("%s '%s' wxLuaSocket::Read SOCKET_ERROR %s line %d len %d"), wxT(__TIME__), m_name.c_str(), wxT(__FILE__), __LINE__, (int)length_)); ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_RECEIVE_FAILED); } --- 473,477 ---- { //wxSafeShowMessage(wxT("wxLuaSocket::Read Socket Error"), wxString::Format(wxT("%s '%s' wxLuaSocket::Read SOCKET_ERROR %s line %d len %d"), wxT(__TIME__), m_name.c_str(), wxT(__FILE__), __LINE__, (int)length_)); ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_RECEIVE_FAILED, m_name); } *************** *** 499,506 **** #ifdef WIN32 if (::closesocket(m_sock) == SOCKET_ERROR) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_CLOSE_FAILED); #else if (::close(m_sock)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_CLOSE_FAILED); #endif else --- 499,506 ---- #ifdef WIN32 if (::closesocket(m_sock) == SOCKET_ERROR) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_CLOSE_FAILED, m_name); #else if (::close(m_sock)) ! throw wxLuaSocketException(wxLuaSocketException::SOCKET_CLOSE_FAILED, m_name); #endif else *************** *** 518,522 **** // ---------------------------------------------------------------------------- ! wxLuaSocketException::wxLuaSocketException(SocketErrorCode code) : m_code(code) { #ifdef WIN32 --- 518,523 ---- // ---------------------------------------------------------------------------- ! wxLuaSocketException::wxLuaSocketException(SocketErrorCode code, const wxString& msg) ! :m_code(code), m_msg(msg) { #ifdef WIN32 *************** *** 555,559 **** m_description = lua2wx(strerror(errno)); m_errnum = errno; ! printf("ERRNO %d '%s'\n", errno, strerror(errno)); #endif if (m_description.IsEmpty()) --- 556,560 ---- m_description = lua2wx(strerror(errno)); m_errnum = errno; ! wxPrintf(wxT("ERRNO %d '%s' code: %d msg: '%s'\n"), errno, m_description.c_str(), code, m_msg.c_str()); #endif if (m_description.IsEmpty()) |
|
From: John L. <jr...@us...> - 2006-10-05 05:10:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28254/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h wxlsock.h Log Message: change wxLuaDebugeeEvent wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED to wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED add wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED and send it when a read/write fails make wxEvtHandler::Connect check for numbers only, NOT nil or bool enhance the wxLuaSocketException replace more nil bool values with true/false in editor.wx.lua Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxldserv.h 4 Oct 2006 22:07:23 -0000 1.22 --- wxldserv.h 5 Oct 2006 05:10:47 -0000 1.23 *************** *** 95,100 **** // functions will act as a middle man to get the wxLuaDebugData through the // socket connection to the debuggee using the wxLuaDebuggerBase. ! // Note that the wxLuaState is not used in this case since it 'exists' in ! // the debuggee process. // ---------------------------------------------------------------------------- --- 95,100 ---- // functions will act as a middle man to get the wxLuaDebugData through the // socket connection to the debuggee using the wxLuaDebuggerBase. ! // Note: The wxLuaState of the wxLuaStackDialog is not used in this case ! // since it 'exists' in the debuggee process. // ---------------------------------------------------------------------------- *************** *** 120,123 **** --- 120,124 ---- protected: wxLuaDebuggerBase* m_luaDebugger; + private: DECLARE_ABSTRACT_CLASS(wxLuaDebuggerStackDialog) *************** *** 140,151 **** virtual ~wxLuaDebuggerBase(); - // Start the debugger server to listen for a debuggee. After creation - // you must call StartServer to actually start the server. - virtual bool StartServer() = 0; - // Stop the debugger server - virtual bool StopServer() = 0; - // Start a debuggee client to be debugged by this - virtual bool StartClient() = 0; - // These functions all send socket commands wxLUASOCKET_DEBUGGER_CMD_XXX // and the appropriate data to the debuggee. --- 141,144 ---- *************** *** 169,176 **** bool EvaluateExpr(int exprRef, const wxString &strExpression); - // compile the buffer in a temp lua_State returning true on success. - // Always sends a wxEVT_WXLUA_DEBUGGER_ERROR event with a message. - bool Compile(const wxString &fileName, const wxString &buffer); - // Handle the wxLuaSocketDebuggeeEvents_Type event sent by the debuggee. // returns the input event_type if ok or -1 on error --- 162,165 ---- *************** *** 181,184 **** --- 170,182 ---- // Get the debugger socket to read/write data to the debuggee virtual wxLuaSocketBase* GetSocketBase() = 0; + // Check if the socket is connected and if not send a + // wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED event with a socket error msg + virtual bool CheckSocketConnected(bool send_event = true); + // Check if the input is true (eg. return of a socket read) and if not send a + // wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED with a read error msg + virtual bool CheckSocketRead(bool read_ok); + // Check if the input is true (eg. return of a socket write) and if not send a + // wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED with a write error msg + virtual bool CheckSocketWrite(bool write_ok); // Send the event to this wxEvtHandler *************** *** 218,222 **** protected: int m_port_number; // the socket port to listen to ! wxLuaStackDialog *m_stackDialog; wxProcess *m_debuggeeProcess; // wxProcess of the debuggee long m_debuggeeProcessID; // id of the debuggee wxProcess --- 216,220 ---- protected: int m_port_number; // the socket port to listen to ! wxLuaStackDialog *m_stackDialog; // the stack dialog to wxProcess *m_debuggeeProcess; // wxProcess of the debuggee long m_debuggeeProcessID; // id of the debuggee wxProcess *************** *** 260,274 **** virtual ~wxLuaDebuggerServer(); bool StartServer(); bool StopServer(); bool StartClient(); bool StartServerThread(); bool WaitForConnect(int timeOut); void ThreadFunction(); - virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; } - - protected: wxLuaSocket *m_serverSocket; wxLuaSocket *m_acceptedSocket; --- 258,276 ---- virtual ~wxLuaDebuggerServer(); + // Start the debugger server to listen for a debuggee. After creation + // you must call StartServer to actually start the server. returns success bool StartServer(); + // Stop the debugger server, returns success bool StopServer(); + // Start a debuggee client to be debugged by this, returns success bool StartClient(); + virtual wxLuaSocketBase* GetSocketBase() { return m_acceptedSocket; } + + protected: bool StartServerThread(); bool WaitForConnect(int timeOut); void ThreadFunction(); wxLuaSocket *m_serverSocket; wxLuaSocket *m_acceptedSocket; *************** *** 295,300 **** --- 297,306 ---- virtual ~wxLuaDebuggerwxSocketServer(); + // Start the debugger server to listen for a debuggee. After creation + // you must call StartServer to actually start the server. returns success bool StartServer(); + // Stop the debugger server, returns success bool StopServer(); + // Start a debuggee client to be debugged by this, returns success bool StartClient(); *************** *** 320,324 **** // ---------------------------------------------------------------------------- ! // wxLuaDebuggerEvent // ---------------------------------------------------------------------------- --- 326,331 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebuggerEvent - wxEvent sent from the wxLuaDebuggerXXX to notify when ! // the debuggee has taken action or status of the debugger. // ---------------------------------------------------------------------------- *************** *** 338,345 **** int GetLineNumber() const { return m_lineNumber;} wxString GetFileName() const { return m_fileName; } ! wxString GetMessage() const { return m_strMessage; } ! long GetReference() const { return m_nReference; } ! bool GetEnabledFlag() const { return m_fEnabledFlag; } wxLuaDebugData GetDebugData() const { return m_debugData; } protected: --- 345,353 ---- int GetLineNumber() const { return m_lineNumber;} wxString GetFileName() const { return m_fileName; } ! wxString GetMessage() const { return m_strMessage; } // check HasMessage ! bool HasMessage() const { return m_fHasMessage; } ! long GetReference() const { return m_nReference; } // lua reference wxLuaDebugData GetDebugData() const { return m_debugData; } + bool GetEnabledFlag() const { return m_fEnabledFlag; } protected: *************** *** 351,356 **** bool m_fHasMessage; long m_nReference; - bool m_fEnabledFlag; wxLuaDebugData m_debugData; private: --- 359,364 ---- bool m_fHasMessage; long m_nReference; wxLuaDebugData m_debugData; + bool m_fEnabledFlag; private: *************** *** 361,377 **** BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, 2510) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_BREAK, 2511) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_PRINT, 2512) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_ERROR, 2513) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_EXIT, 2514) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STACK_ENUM, 2515) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, 2516) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, 2517) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, 2518) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER, 2519) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER, 2520) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, 2521) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, 2522) END_DECLARE_EVENT_TYPES() --- 369,398 ---- BEGIN_DECLARE_EVENT_TYPES() ! // The debuggee has connected to the debugger through the socket connection ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, 2510) ! // The debuggee has disconnected to the debugger through the socket connection ! // check Has/GetMessage for a description why ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, 2510) ! // The debuggee has sent a wxLUASOCKET_DEBUGGEE_EVENT_BREAK ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_BREAK, 2511) ! // The debuggee has sent a wxLUASOCKET_DEBUGGEE_EVENT_PRINT ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_PRINT, 2512) ! // The debuggee has sent a wxEVT_WXLUA_DEBUGGER_ERROR ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_ERROR, 2513) ! // The debuggee has sent a wxEVT_WXLUA_DEBUGGER_EXIT ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_EXIT, 2514) ! // The debuggee has sent a wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENUM ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STACK_ENUM, 2515) ! // The debuggee has sent a wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENTRY_ENUM ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, 2516) ! // The debuggee has sent a wxLUASOCKET_DEBUGGEE_EVENT_TABLE_ENUM ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, 2517) ! // The debuggee has sent a wxLUASOCKET_DEBUGGEE_EVENT_EVALUATE_EXPR ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, 2518) ! ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER, 2519) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER, 2520) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, 2521) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, 2522) END_DECLARE_EVENT_TYPES() *************** *** 379,395 **** (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxLuaDebuggerEventFunction, &func) ! #define EVT_WXLUA_DEBUGGER_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAK, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_PRINT, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_ERROR, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_EXIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_EXIT, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STACK_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STACK_ENUM, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_TABLE_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_EVALUATE_EXPR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STARTDEBUGGER(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STOPDEBUGGER(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, -1, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), #endif // WX_LUA_DEBUG_SERVER_H --- 400,416 ---- (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxLuaDebuggerEventFunction, &func) ! #define EVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAK, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_PRINT, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_ERROR, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_EXIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_EXIT, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STACK_ENUM(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STACK_ENUM, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_TABLE_ENUM(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_EVALUATE_EXPR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STARTDEBUGGER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_STOPDEBUGGER(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, id, -1, wxLuaDebuggerEventHandler(fn), (wxObject *) NULL), #endif // WX_LUA_DEBUG_SERVER_H Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxlsock.h 3 Oct 2006 05:12:45 -0000 1.18 --- wxlsock.h 5 Oct 2006 05:10:47 -0000 1.19 *************** *** 216,222 **** // constructors ! wxLuaSocketException(SocketErrorCode code); wxLuaSocketException(const wxLuaSocketException &e) ! : m_code(e.m_code), m_errnum(e.m_errnum) {} SocketErrorCode GetCode() const { return m_code; } --- 216,222 ---- // constructors ! wxLuaSocketException(SocketErrorCode code, const wxString& msg); wxLuaSocketException(const wxLuaSocketException &e) ! : m_code(e.m_code), m_msg(e.m_msg), m_errnum(e.m_errnum) {} SocketErrorCode GetCode() const { return m_code; } *************** *** 228,231 **** --- 228,232 ---- SocketErrorCode m_code; + wxString m_msg; int m_errnum; wxString m_description; |
|
From: John L. <jr...@us...> - 2006-10-05 05:10:51
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28254/wxLua/samples Modified Files: editor.wx.lua Log Message: change wxLuaDebugeeEvent wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED to wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED add wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED and send it when a read/write fails make wxEvtHandler::Connect check for numbers only, NOT nil or bool enhance the wxLuaSocketException replace more nil bool values with true/false in editor.wx.lua Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** editor.wx.lua 4 Oct 2006 22:07:23 -0000 1.31 --- editor.wx.lua 5 Oct 2006 05:10:48 -0000 1.32 *************** *** 328,332 **** else local filePath = openDocuments[id].filePath ! openDocuments[id].isModified = nil if resetModTime and filePath and string.len(filePath) > 0 then openDocuments[id].modTime = GetFileModTime(filePath) --- 328,332 ---- else local filePath = openDocuments[id].filePath ! openDocuments[id].isModified = false if resetModTime and filePath and string.len(filePath) > 0 then openDocuments[id].modTime = GetFileModTime(filePath) *************** *** 491,495 **** document.filePath = nil document.modTime = nil ! document.isModified = nil openDocuments[id] = document end --- 491,495 ---- document.filePath = nil document.modTime = nil ! document.isModified = false openDocuments[id] = document end *************** *** 831,835 **** local id = editor:GetId() if openDocuments[id] then ! event:Enable(openDocuments[id].isModified ~= nil) end end --- 831,835 ---- local id = editor:GetId() if openDocuments[id] then ! event:Enable(openDocuments[id].isModified) end end *************** *** 838,842 **** function SaveFileAs(editor) local id = editor:GetId() ! local saved = nil local fn = wx.wxFileName(openDocuments[id].filePath) fn:Normalize() -- want absolute path for dialog --- 838,842 ---- function SaveFileAs(editor) local id = editor:GetId() ! local saved = false local fn = wx.wxFileName(openDocuments[id].filePath) fn:Normalize() -- want absolute path for dialog *************** *** 1006,1010 **** end end ! document.isModified = nil end end --- 1006,1010 ---- end end ! document.isModified = false end end *************** *** 1508,1511 **** --- 1508,1512 ---- if openDocuments[id].isModified then SaveFile(editor, openDocuments[id].filePath) + openDocuments[id].isModified = false end *************** *** 1542,1547 **** function CreateDebugServer() ! local debugServer = wx.wxLuaDebuggerServer(portNumber) ! if not debugServer then return nil end local ok = debugServer:StartServer() --- 1543,1547 ---- function CreateDebugServer() ! debugServer = wx.wxLuaDebuggerServer(portNumber) local ok = debugServer:StartServer() *************** *** 1559,1563 **** end ! debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, function (event) local ok = false --- 1559,1563 ---- end ! debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED, function (event) local ok = false *************** *** 1586,1594 **** end) function DebuggerIgnoreFile(fileName) ! ignoreFlag = nil for idx, ignoreFile in pairs(ignoredFilesList) do if string.upper(ignoreFile) == string.upper(fileName) then ! ignoreFlag = 1 end end --- 1586,1601 ---- end) + debugServer:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED, + function (event) + DisplayOutput(event:GetMessage().."\n") + debugServer:Delete() + debugServer = nil + end) + function DebuggerIgnoreFile(fileName) ! ignoreFlag = false for idx, ignoreFile in pairs(ignoredFilesList) do if string.upper(ignoreFile) == string.upper(fileName) then ! ignoreFlag = true end end *************** *** 1697,1706 **** end) - - return debugServer end - frame:Connect(ID_START_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) --- 1704,1710 ---- *************** *** 1734,1740 **** fIsConnected = false if debugServer then ! debugServer:Reset() ! debugServer:Delete() debugServer = nil end SetAllEditorsReadOnly(false) --- 1738,1746 ---- fIsConnected = false if debugServer then ! local ds = debugServer debugServer = nil + ds:Reset() + ds:StopServer() + ds:Delete() end SetAllEditorsReadOnly(false) *************** *** 1894,1898 **** local dlg = wx.wxDialog(frame, wx.wxID_ANY, "About wxLua IDE") - local topsizer = wx.wxBoxSizer(wx.wxVERTICAL) local html = wx.wxLuaHtmlWindow(dlg, wx.wxID_ANY, --- 1900,1903 ---- *************** *** 1909,1915 **** html:GetInternalRepresentation():GetHeight()) topsizer:AddWindow(html, 1, wx.wxALL, 10) topsizer:AddWindow(line, 0, wx.wxEXPAND + wx.wxLEFT + wx.wxRIGHT, 10) - topsizer:AddWindow(button, 0, wx.wxALL + wx.wxALIGN_RIGHT, 15) --- 1914,1920 ---- html:GetInternalRepresentation():GetHeight()) + local topsizer = wx.wxBoxSizer(wx.wxVERTICAL) topsizer:AddWindow(html, 1, wx.wxALL, 10) topsizer:AddWindow(line, 0, wx.wxEXPAND + wx.wxLEFT + wx.wxRIGHT, 10) topsizer:AddWindow(button, 0, wx.wxALL + wx.wxALIGN_RIGHT, 15) |
|
From: John L. <jr...@us...> - 2006-10-05 05:10:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28254/wxLua/modules/wxbind/src Modified Files: event.cpp Log Message: change wxLuaDebugeeEvent wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED to wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED add wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED and send it when a read/write fails make wxEvtHandler::Connect check for numbers only, NOT nil or bool enhance the wxLuaSocketException replace more nil bool values with true/false in editor.wx.lua Index: event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** event.cpp 9 Jun 2006 22:51:32 -0000 1.24 --- event.cpp 5 Oct 2006 05:10:47 -0000 1.25 *************** *** 101,105 **** evttype_idx = 4; ! if (wxlState.IsNumberType(3)) lastId = (int)lua_tonumber(L, 3); else --- 101,105 ---- evttype_idx = 4; ! if (wxlState.IsEnumerationType(3)) lastId = (int)lua_tonumber(L, 3); else *************** *** 110,114 **** } ! if (wxlState.IsNumberType(2)) winId = (int)lua_tonumber(L, 2); else --- 110,114 ---- } ! if (wxlState.IsEnumerationType(2)) winId = (int)lua_tonumber(L, 2); else *************** *** 126,130 **** evttype_idx = 3; ! if (wxlState.IsNumberType(2)) winId = (int)lua_tonumber(L, 2); else --- 126,130 ---- evttype_idx = 3; ! if (wxlState.IsEnumerationType(2)) winId = (int)lua_tonumber(L, 2); else *************** *** 173,181 **** } ! if (wxlState.IsNumberType(evttype_idx)) eventType = (int)lua_tonumber(L, evttype_idx); else { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid event type, expected a number for parameter %d, got '%s'."), evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); return 0; --- 173,181 ---- } ! if (wxlState.IsEnumerationType(evttype_idx)) eventType = (int)lua_tonumber(L, evttype_idx); else { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid wxEvent type, expected a number for parameter %d, got '%s'."), evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); return 0; |
|
From: John L. <jr...@us...> - 2006-10-05 05:10:51
|
Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28254/wxLua/bindings/wxluasocket Modified Files: wxluasocket.i Log Message: change wxLuaDebugeeEvent wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED to wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED add wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED and send it when a read/write fails make wxEvtHandler::Connect check for numbers only, NOT nil or bool enhance the wxLuaSocketException replace more nil bool values with true/false in editor.wx.lua Index: wxluasocket.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket.i,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxluasocket.i 4 Oct 2006 22:07:22 -0000 1.6 --- wxluasocket.i 5 Oct 2006 05:10:46 -0000 1.7 *************** *** 51,55 **** %class %delete wxLuaDebuggerEvent, wxEvent ! %define %event wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED %define %event wxEVT_WXLUA_DEBUGGER_BREAK %define %event wxEVT_WXLUA_DEBUGGER_PRINT --- 51,56 ---- %class %delete wxLuaDebuggerEvent, wxEvent ! %define %event wxEVT_WXLUA_DEBUGGER_DEBUGGEE_CONNECTED ! %define %event wxEVT_WXLUA_DEBUGGER_DEBUGGEE_DISCONNECTED %define %event wxEVT_WXLUA_DEBUGGER_BREAK %define %event wxEVT_WXLUA_DEBUGGER_PRINT |
