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-09-20 04:24:30
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19032/wxLua/bindings/wxwidgets Modified Files: defsutil.i Log Message: add wxlua_check_version Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** defsutil.i 20 Sep 2006 04:07:37 -0000 1.28 --- defsutil.i 20 Sep 2006 04:24:27 -0000 1.29 *************** *** 312,315 **** --- 312,317 ---- %define %string WXLUA_VERSION_STRING + %function bool wxCHECK_WXLUA_VERSION(int major, int minor, int release) // actually a define + //----------------------------------------------------------------------------- // wxLua platform defines - FIXME add simple method wxPlatform returning unix, msw, ... |
|
From: John L. <jr...@us...> - 2006-09-20 04:07:42
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10976/wxLua/samples Modified Files: calculator.wx.lua choices.wx.lua coroutine.wx.lua dialog.wx.lua editor.wx.lua fldemo.wx.lua grid.wx.lua htmlwin.wx.lua mdi.wx.lua minimal.wx.lua printing.wx.lua scribble.wx.lua tree.wx.lua wxluasudoku.wx.lua Log Message: add wxVERSION and WXLUA_XXX_VERSION bindings and use them in the About dialog for the samples Cleanup samples for readability Index: mdi.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/mdi.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** mdi.wx.lua 25 May 2006 03:55:23 -0000 1.9 --- mdi.wx.lua 20 Sep 2006 04:07:38 -0000 1.10 *************** *** 34,76 **** end - function main() ! frame = wx.wxMDIParentFrame( wx.wxNull, wx.wxID_ANY, "wxLua MDI Demo", ! wx.wxDefaultPosition, wx.wxSize(450, 450), ! wx.wxDEFAULT_FRAME_STYLE ) ! local fileMenu = wx.wxMenu() ! fileMenu:Append(wx.wxID_NEW, "&New", "Create a new child window") ! fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") ! local helpMenu = wx.wxMenu() ! helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua MDI Application") ! local menuBar = wx.wxMenuBar() ! menuBar:Append(fileMenu, "&File") ! menuBar:Append(helpMenu, "&Help") ! frame:SetMenuBar(menuBar) ! frame:CreateStatusBar(1) ! frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) CreateChild() end ) ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close() end ) ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox('This is the "About" dialog of the MDI wxLua sample.', ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame ) ! end ) ! frame:Show(true) ! end - main() --- 34,74 ---- end ! frame = wx.wxMDIParentFrame( wx.wxNull, wx.wxID_ANY, "wxLua MDI Demo", ! wx.wxDefaultPosition, wx.wxSize(450, 450), ! wx.wxDEFAULT_FRAME_STYLE ) ! local fileMenu = wx.wxMenu() ! fileMenu:Append(wx.wxID_NEW, "&New", "Create a new child window") ! fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") ! local helpMenu = wx.wxMenu() ! helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua MDI Application") ! local menuBar = wx.wxMenuBar() ! menuBar:Append(fileMenu, "&File") ! menuBar:Append(helpMenu, "&Help") ! frame:SetMenuBar(menuBar) ! frame:CreateStatusBar(1) ! frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) CreateChild() end ) ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close() end ) ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox('This is the "About" dialog of the MDI wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame ) ! end ) ! frame:Show(true) Index: fldemo.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/fldemo.wx.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** fldemo.wx.lua 25 May 2006 03:55:23 -0000 1.4 --- fldemo.wx.lua 20 Sep 2006 04:07:38 -0000 1.5 *************** *** 9,12 **** --- 9,20 ---- ----------------------------------------------------------------------------- + -- --------------------------------------------------------------------------- + -- THIS SAMPLE DOES NOT WORK! + -- + -- NOTE: The FL library is a docking library contrib for wxWidgets, however + -- it is no longer maintained and is not currently wrapped by wxLua. + -- --------------------------------------------------------------------------- + + frame = nil *************** *** 126,130 **** frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox( 'This is the "About" dialog of the FL Demo wxLua sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 134,139 ---- frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox( 'This is the "About" dialog of the FL Demo wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, Index: choices.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/choices.wx.lua,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** choices.wx.lua 25 May 2006 03:55:23 -0000 1.8 --- choices.wx.lua 20 Sep 2006 04:07:38 -0000 1.9 *************** *** 11,17 **** function HandleEvents(event) ! -- Note: event.GetEventObject() return a wxObject, but we know that all ! -- events sent to this function will be from wxWindow deriveds ! -- classes, whose base class is a wxObject. -- Use DynamicCast to call functions from the wxWindow base class. local name = event:GetEventObject():DynamicCast("wxWindow"):GetName() --- 11,17 ---- function HandleEvents(event) ! -- Note: event.GetEventObject() returns a wxObject, but we know that all ! -- events sent to this function will be from wxWindow derived ! -- class, whose base class is a wxObject. -- Use DynamicCast to call functions from the wxWindow base class. local name = event:GetEventObject():DynamicCast("wxWindow"):GetName() *************** *** 24,28 **** wx.wxPoint(20, 20), wx.wxSize(450, 350)) frame:CreateStatusBar(1) ! frame:SetStatusText("wxEvents from contols will be displayed here", 0) local notebook = wx.wxNotebook(frame, wx.wxID_ANY, --- 24,28 ---- wx.wxPoint(20, 20), wx.wxSize(450, 350)) frame:CreateStatusBar(1) ! frame:SetStatusText("wxEvents from controls will be displayed here", 0) local notebook = wx.wxNotebook(frame, wx.wxID_ANY, *************** *** 83,86 **** --- 83,88 ---- notebook:GetBestSize():GetHeight()) + -- typically you will give a control a specific window id and connect an + -- event handler for that id, in this case respond to any id frame:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, HandleEvents) Index: minimal.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/minimal.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** minimal.wx.lua 25 May 2006 03:55:23 -0000 1.6 --- minimal.wx.lua 20 Sep 2006 04:07:38 -0000 1.7 *************** *** 73,77 **** frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the Minimal wxLua sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 73,78 ---- frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the Minimal wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** wxluasudoku.wx.lua 6 Jun 2006 05:14:32 -0000 1.55 --- wxluasudoku.wx.lua 20 Sep 2006 04:07:38 -0000 1.56 *************** *** 4733,4737 **** sudokuGUI.MenuId[sudokuGUI.ID_ABOUT] = function (event) ! wx.wxMessageBox("Welcome to wxLuaSudoku!\nWritten by John Labenski\nCopyright 2006.", "About wxLuaSudoku", wx.wxOK + wx.wxICON_INFORMATION, --- 4733,4738 ---- sudokuGUI.MenuId[sudokuGUI.ID_ABOUT] = function (event) ! wx.wxMessageBox("Welcome to wxLuaSudoku!\nWritten by John Labenski\nCopyright 2006.\n".. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLuaSudoku", wx.wxOK + wx.wxICON_INFORMATION, Index: tree.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/tree.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** tree.wx.lua 25 May 2006 03:55:23 -0000 1.6 --- tree.wx.lua 20 Sep 2006 04:07:38 -0000 1.7 *************** *** 45,49 **** frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the wxLua wxTreeCtrl sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 45,50 ---- frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the wxLua wxTreeCtrl sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, Index: htmlwin.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/htmlwin.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** htmlwin.wx.lua 25 May 2006 03:55:23 -0000 1.9 --- htmlwin.wx.lua 20 Sep 2006 04:07:38 -0000 1.10 *************** *** 14,18 **** [[<html> <head> ! <title>Bound Widget demonstration</title> </head> <body> --- 14,18 ---- [[<html> <head> ! <title>wxLua Bound Widget demonstration</title> </head> <body> *************** *** 33,118 **** </html>]] - function main() - - -- create the frame window - frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLua HtmlWindow Demo", - wx.wxDefaultPosition, wx.wxSize(450, 450), - wx.wxDEFAULT_FRAME_STYLE ) - - - -- create a simple file menu - local fileMenu = wx.wxMenu() - fileMenu:Append(wx.wxID_PREVIEW, "Print Pre&view", "Preview the HTML document") - fileMenu:Append(wx.wxID_PRINT, "&Print", "Print the HTML document") - fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") - - -- create a simple help menu - local helpMenu = wx.wxMenu() - helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua wxHtmlWindow sample") - - -- create a menu bar and append the file and help menus - local menuBar = wx.wxMenuBar() - menuBar:Append(fileMenu, "&File") - menuBar:Append(helpMenu, "&Help") - - -- insert the menu bar into the frame - frame.MenuBar = menuBar - - -- create a simple status bar - frame:CreateStatusBar(2) - frame:SetStatusText("Welcome to wxLua.") - - frame:Connect(wx.wxID_PREVIEW, wx.wxEVT_COMMAND_MENU_SELECTED, - function (event) - local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) - printing:PreviewText(htmlTextPage) - end ) - - frame:Connect(wx.wxID_PRINT, wx.wxEVT_COMMAND_MENU_SELECTED, - function (event) - local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) - printing:PrintText(htmlTextPage) - end ) - - -- connect the selection event of the exit menu item to an - -- event handler that closes the window - frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, - function (event) - frame:Close(true) - end ) - - -- connect the selection event of the about menu item - frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, - function (event) - wx.wxMessageBox('This is the "About" dialog of the wxHtmlWindow wxLua sample.', - "About wxLua", - wx.wxOK + wx.wxICON_INFORMATION, - frame ) - end) - - -- create the html window - html = wx.wxLuaHtmlWindow(frame) - - html.OnSetTitle = function(self, title) - frame.Title = frame.Title.." - "..title - end - - -- when a lua custom tag is parsed in the html, this event handler - -- will be invoked - wx.wxGetApp():Connect(wx.wxID_ANY, wx.wxEVT_HTML_TAG_HANDLER, - function (event) CreateBoundWindow(event) end) - - -- set the frame window and status bar - html:SetRelatedFrame(frame, "wxHtmlWindow wxLua Sample : %s") - html:SetRelatedStatusBar(1) - -- load the document - html:SetPage(htmlTextPage) - -- html:LoadPage("testpage.html") - - -- show the frame window - wx.wxGetApp().TopWindow = frame - frame:Show(true) - end - function CreateBoundWindow(event) local ax, ay --- 33,36 ---- *************** *** 129,133 **** -- create the control to embed ! local parent = event.HtmlParser.Window if parent then local wnd = wx.wxTextCtrl( parent, wx.wxID_ANY, --- 47,57 ---- -- create the control to embed ! local parent = nil ! if wx.wxCHECK_VERSION(2,7,0) then ! parent = event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() ! else ! parent = event.HtmlParser.Window ! end ! if parent then local wnd = wx.wxTextCtrl( parent, wx.wxID_ANY, *************** *** 147,150 **** end ! main() --- 71,154 ---- end ! ! -- create the frame window ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLua HtmlWindow Demo", ! wx.wxDefaultPosition, wx.wxSize(450, 450), ! wx.wxDEFAULT_FRAME_STYLE ) ! ! ! -- create a simple file menu ! local fileMenu = wx.wxMenu() ! fileMenu:Append(wx.wxID_PREVIEW, "Print Pre&view", "Preview the HTML document") ! fileMenu:Append(wx.wxID_PRINT, "&Print", "Print the HTML document") ! fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") ! ! -- create a simple help menu ! local helpMenu = wx.wxMenu() ! helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua wxHtmlWindow sample") ! ! -- create a menu bar and append the file and help menus ! local menuBar = wx.wxMenuBar() ! menuBar:Append(fileMenu, "&File") ! menuBar:Append(helpMenu, "&Help") ! ! -- insert the menu bar into the frame ! frame.MenuBar = menuBar ! ! -- create a simple status bar ! frame:CreateStatusBar(2) ! frame:SetStatusText("Welcome to wxLua.") ! ! frame:Connect(wx.wxID_PREVIEW, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) ! printing:PreviewText(htmlTextPage) ! end ) ! ! frame:Connect(wx.wxID_PRINT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) ! printing:PrintText(htmlTextPage) ! end ) ! ! -- connect the selection event of the exit menu item to an ! -- event handler that closes the window ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! frame:Close(true) ! end ) ! ! -- connect the selection event of the about menu item ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox('This is the "About" dialog of the wxHtmlWindow wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame ) ! end) ! ! -- create the html window ! html = wx.wxLuaHtmlWindow(frame) ! ! html.OnSetTitle = function(self, title) ! frame.Title = frame.Title.." - "..title ! end ! ! -- when a lua custom tag is parsed in the html, this event handler ! -- will be invoked ! wx.wxGetApp():Connect(wx.wxID_ANY, wx.wxEVT_HTML_TAG_HANDLER, ! function (event) CreateBoundWindow(event) end) ! ! -- set the frame window and status bar ! html:SetRelatedFrame(frame, "wxHtmlWindow wxLua Sample : %s") ! html:SetRelatedStatusBar(1) ! -- load the document ! html:SetPage(htmlTextPage) ! -- html:LoadPage("testpage.html") ! ! -- show the frame window ! wx.wxGetApp().TopWindow = frame ! frame:Show(true) ! Index: dialog.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** dialog.wx.lua 25 May 2006 03:55:23 -0000 1.6 --- dialog.wx.lua 20 Sep 2006 04:07:38 -0000 1.7 *************** *** 61,66 **** dialog:Connect(ID_CELSIUS_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) ! local celsiusString = celsiusTextCtrl:GetValue() ! if celsiusString == "" then wx.wxMessageBox("The Celsius entry is invalid, enter a number.", "Error!", --- 61,66 ---- dialog:Connect(ID_CELSIUS_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) ! local celsiusValue = tonumber(celsiusTextCtrl:GetValue()) ! if celsiusValue == nil then wx.wxMessageBox("The Celsius entry is invalid, enter a number.", "Error!", *************** *** 68,72 **** dialog) else ! local fahrenheitValue = (tonumber(celsiusString) * 9 / 5) + 32 fahrenheitTextCtrl:SetValue(fahrenheitValue) end --- 68,72 ---- dialog) else ! local fahrenheitValue = (celsiusValue * 9 / 5) + 32 fahrenheitTextCtrl:SetValue(fahrenheitValue) end *************** *** 76,81 **** dialog:Connect(ID_FAHRENHEIT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) ! local fahrenheitString = fahrenheitTextCtrl:GetValue() ! if fahrenheitString == "" then wx.wxMessageBox("The Fahrenheit entry is invalid, enter a number.", "Error!", --- 76,81 ---- dialog:Connect(ID_FAHRENHEIT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) ! local fahrenheitValue = tonumber(fahrenheitTextCtrl:GetValue()) ! if fahrenheitValue == nil then wx.wxMessageBox("The Fahrenheit entry is invalid, enter a number.", "Error!", *************** *** 83,87 **** dialog) else ! local celsiusValue = (tonumber(fahrenheitString) - 32) * 5 / 9 celsiusTextCtrl:SetValue(celsiusValue) end --- 83,87 ---- dialog) else ! local celsiusValue = (fahrenheitValue - 32) * 5 / 9 celsiusTextCtrl:SetValue(celsiusValue) end *************** *** 101,106 **** dialog:Connect(ID_ABOUT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) ! wx.wxMessageBox("Based on the C++ version by Marco Ghislanzoni", ! "Temperature converter", wx.wxOK + wx.wxICON_INFORMATION, dialog) --- 101,107 ---- dialog:Connect(ID_ABOUT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) ! wx.wxMessageBox("Based on the C++ version by Marco Ghislanzoni.\n".. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, ! "About wxLua Temperature Converter", wx.wxOK + wx.wxICON_INFORMATION, dialog) Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** editor.wx.lua 19 Sep 2006 05:01:45 -0000 1.21 --- editor.wx.lua 20 Sep 2006 04:07:38 -0000 1.22 *************** *** 1884,1888 **** <center> <font size = +2 color = "#FFFFFF"> ! <b><br>wxLua Version 2.7<br></b> </font> </center> --- 1884,1890 ---- <center> <font size = +2 color = "#FFFFFF"> ! <b><br>]].. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING.. ! [[<br></b> </font> </center> Index: grid.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/grid.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** grid.wx.lua 25 May 2006 03:55:23 -0000 1.6 --- grid.wx.lua 20 Sep 2006 04:07:38 -0000 1.7 *************** *** 8,58 **** ----------------------------------------------------------------------------- - function main() ! local frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua wxGrid Sample", ! wx.wxPoint(25, 25), wx.wxSize(350, 250)) ! local fileMenu = wx.wxMenu("", wxMENU_TEAROFF) ! fileMenu:Append(wx.wxID_EXIT, "E&xit\tCtrl-X", "Quit the program") ! local helpMenu = wx.wxMenu("", wxMENU_TEAROFF) ! helpMenu:Append(wx.wxID_ABOUT, "&About\tCtrl-A", "About the Grid wxLua Application") ! local menuBar = wx.wxMenuBar() ! menuBar:Append(fileMenu, "&File") ! menuBar:Append(helpMenu, "&Help") ! frame:SetMenuBar(menuBar) ! frame:CreateStatusBar(1) ! frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! frame:Close() ! end ) ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox('This is the "About" dialog of the Grid wxLua sample.', ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame ) ! end ) ! local grid = wx.wxGrid(frame, wx.wxID_ANY) ! grid:CreateGrid(10, 8) ! grid:SetColSize(3, 200) ! grid:SetRowSize(4, 45) ! grid:SetCellValue(0, 0, "First cell") ! grid:SetCellValue(1, 1, "Another cell") ! grid:SetCellValue(2, 2, "Yet another cell") ! grid:SetCellFont(0, 0, wx.wxFont(10, wx.wxROMAN, wx.wxITALIC, wx.wxNORMAL)) ! grid:SetCellTextColour(1, 1, wx.wxRED) ! grid:SetCellBackgroundColour(2, 2, wx.wxCYAN) ! frame:Show(true) ! end - main() --- 8,56 ---- ----------------------------------------------------------------------------- ! local frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua wxGrid Sample", ! wx.wxPoint(25, 25), wx.wxSize(350, 250)) ! local fileMenu = wx.wxMenu("", wxMENU_TEAROFF) ! fileMenu:Append(wx.wxID_EXIT, "E&xit\tCtrl-X", "Quit the program") ! local helpMenu = wx.wxMenu("", wxMENU_TEAROFF) ! helpMenu:Append(wx.wxID_ABOUT, "&About\tCtrl-A", "About the Grid wxLua Application") ! local menuBar = wx.wxMenuBar() ! menuBar:Append(fileMenu, "&File") ! menuBar:Append(helpMenu, "&Help") ! frame:SetMenuBar(menuBar) ! frame:CreateStatusBar(1) ! frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! frame:Close() ! end ) ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox('This is the "About" dialog of the wxGrid wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame ) ! end ) ! grid = wx.wxGrid(frame, wx.wxID_ANY) ! grid:CreateGrid(10, 8) ! grid:SetColSize(3, 200) ! grid:SetRowSize(4, 45) ! grid:SetCellValue(0, 0, "First cell") ! grid:SetCellValue(1, 1, "Another cell") ! grid:SetCellValue(2, 2, "Yet another cell") ! grid:SetCellFont(0, 0, wx.wxFont(10, wx.wxROMAN, wx.wxITALIC, wx.wxNORMAL)) ! grid:SetCellTextColour(1, 1, wx.wxRED) ! grid:SetCellBackgroundColour(2, 2, wx.wxCYAN) ! frame:Show(true) Index: coroutine.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/coroutine.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** coroutine.wx.lua 6 Jun 2006 21:03:54 -0000 1.2 --- coroutine.wx.lua 20 Sep 2006 04:07:38 -0000 1.3 *************** *** 20,24 **** } - -- The constructor. 'parent' is the parent window. 'workCoroutine' is the -- coroutine used to process whatever is desired. 'caption' is the caption to be --- 20,23 ---- *************** *** 28,31 **** --- 27,31 ---- -- simple little sanity test to ensure that we can call binding functions + -- it will fail on r:SetX if wx bindings aren't set for the coroutine local r = wx.wxRect(1,2,3,4) r:SetX(1) *************** *** 54,69 **** -- Handle idle events: run the coroutine's next "step" o.dialog:Connect (wx.wxEVT_IDLE, ! function (event) ! if coroutine.status (workCoroutine) ~= "dead" then ! local s, msg = coroutine.resume (workCoroutine) ! if not msg then ! o.dialog:Close() ! else ! o:setStatus (msg) ! end ! event:RequestMore() ! event:Skip() ! end ! end) -- Voilà --- 54,69 ---- -- Handle idle events: run the coroutine's next "step" o.dialog:Connect (wx.wxEVT_IDLE, ! function (event) ! if coroutine.status (workCoroutine) ~= "dead" then ! local s, msg = coroutine.resume (workCoroutine) ! if not msg then ! o.dialog:Close() ! else ! o:setStatus (msg) ! end ! event:RequestMore() ! event:Skip() ! end ! end) -- Voilà *************** *** 113,117 **** frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the Coroutine wxLua sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 113,118 ---- frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the Coroutine wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, *************** *** 125,146 **** frame:Connect (ID_THE_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, ! function (event) ! local function workFunc() ! for i = 1, 10 do ! coroutine.yield ("Performing step "..tostring(i).."/10") ! wx.wxSleep(1) ! end end ! local workCoroutine = coroutine.create (workFunc) ! local wndProgress = ! ProgressWindow:new (frame, workCoroutine, ! "Performing some long operation", ! "Performing step 1/many") ! wndProgress.dialog:ShowModal (true) ! wndProgress.dialog:Destroy() ! end) --- 126,147 ---- frame:Connect (ID_THE_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, ! function (event) ! local function workFunc() ! for i = 1, 10 do ! coroutine.yield ("Performing step "..tostring(i).."/10") ! wx.wxSleep(1) end + end ! local workCoroutine = coroutine.create (workFunc) ! local wndProgress = ! ProgressWindow:new (frame, workCoroutine, ! "Performing some long operation", ! "Performing step 1/many") ! wndProgress.dialog:ShowModal (true) ! wndProgress.dialog:Destroy() ! end) Index: printing.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/printing.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** printing.wx.lua 25 May 2006 03:55:23 -0000 1.10 --- printing.wx.lua 20 Sep 2006 04:07:38 -0000 1.11 *************** *** 276,280 **** frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the Printing wxLua sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 276,281 ---- frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the Printing wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, Index: scribble.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** scribble.wx.lua 25 May 2006 03:55:23 -0000 1.9 --- scribble.wx.lua 20 Sep 2006 04:07:38 -0000 1.10 *************** *** 316,320 **** frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the Scribble wxLua Sample.', "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 316,321 ---- frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! wx.wxMessageBox('This is the "About" dialog of the Scribble wxLua Sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, Index: calculator.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/calculator.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** calculator.wx.lua 25 May 2006 03:55:23 -0000 1.5 --- calculator.wx.lua 20 Sep 2006 04:07:38 -0000 1.6 *************** *** 10,16 **** -------------------------------------------------------------------------=--- ! dialog = nil ! res = nil ! txtDisplay = nil local xpmdata = --- 10,21 ---- -------------------------------------------------------------------------=--- ! -- --------------------------------------------------------------------------- ! -- Global variables ! dialog = nil -- the wxDialog main toplevel window ! xmlResource = nil -- the XML resource handle ! txtDisplay = nil -- statictext window for the display ! clearDisplay = nil ! lastNumber = 0 -- the last number pressed, 0 - 9 ! lastOperationId = nil -- the window id of last operation button pressed local xpmdata = *************** *** 39,42 **** --- 44,48 ---- } + -- --------------------------------------------------------------------------- -- This is a little awkward, but it's how it's done in C++ too bitmap = wx.wxBitmapFromXPMData(xpmdata) *************** *** 44,50 **** icon:CopyFromBitmap(bitmap) -- return the path part of the currently executing file ! local strAt = string.byte('@') ! function getPath() function findLast(filePath) --- 50,56 ---- icon:CopyFromBitmap(bitmap) + -- --------------------------------------------------------------------------- -- return the path part of the currently executing file ! function GetPath() function findLast(filePath) *************** *** 69,73 **** local filePath = debug.getinfo(1, "S").source ! if string.byte(filePath) == strAt then local offset = findLast(filePath) if offset ~= nil then --- 75,79 ---- local filePath = debug.getinfo(1, "S").source ! if string.byte(filePath) == string.byte('@') then local offset = findLast(filePath) if offset ~= nil then *************** *** 83,99 **** end -- Handle the clear button event function OnClear(event) txtDisplay:SetLabel("0") ! lastNumber = 0 ! lastOperation = ID_PLUS end -- Handle all number button events function OnNumber(event) ! local number = event:GetId() local displayString = txtDisplay:GetLabel() ! if displayString == "0" or clearDisplay then displayString = "" end --- 89,107 ---- end + -- --------------------------------------------------------------------------- -- Handle the clear button event function OnClear(event) txtDisplay:SetLabel("0") ! lastNumber = 0 ! lastOperationId = ID_PLUS end + -- --------------------------------------------------------------------------- -- Handle all number button events function OnNumber(event) ! local numberId = event:GetId() local displayString = txtDisplay:GetLabel() ! if (displayString == "0") or (tonumber(displayString) == nil) or clearDisplay then displayString = "" end *************** *** 102,106 **** -- Limit string length to 12 chars if string.len(displayString) < 12 then ! if number == ID_DECIMAL then -- If the first pressed char is "." then we want "0." if string.len(displayString) == 0 then --- 110,114 ---- -- Limit string length to 12 chars if string.len(displayString) < 12 then ! if numberId == ID_DECIMAL then -- If the first pressed char is "." then we want "0." if string.len(displayString) == 0 then *************** *** 110,125 **** end else ! local num = 0 ! if number == ID_0 then num = 0 ! elseif number == ID_1 then num = 1 ! elseif number == ID_2 then num = 2 ! elseif number == ID_3 then num = 3 ! elseif number == ID_4 then num = 4 ! elseif number == ID_5 then num = 5 ! elseif number == ID_6 then num = 6 ! elseif number == ID_7 then num = 7 ! elseif number == ID_8 then num = 8 ! elseif number == ID_9 then num = 9 ! end -- If first character entered is 0 we reject it --- 118,126 ---- end else ! local idTable = { [ID_0] = 0, [ID_1] = 1, [ID_2] = 2, [ID_3] = 3, ! [ID_4] = 4, [ID_5] = 5, [ID_6] = 6, [ID_7] = 7, ! [ID_8] = 8, [ID_9] = 9 } ! ! local num = idTable[numberId] -- If first character entered is 0 we reject it *************** *** 133,152 **** end ! txtDisplay:SetLabel(displayString) end end -- Calculate the operation ! function DoOperation(a, b, operation) local result = a ! if operation == ID_PLUS then result = b + a ! elseif operation == ID_MINUS then result = b - a ! elseif operation == ID_MULTIPLY then result = b * a ! elseif operation == ID_DIVIDE then if a == 0 then ! result = "Error" else result = b / a --- 134,154 ---- end ! txtDisplay:SetLabel(tostring(displayString)) end end + -- --------------------------------------------------------------------------- -- Calculate the operation ! function DoOperation(a, b, operationId) local result = a ! if operationId == ID_PLUS then result = b + a ! elseif operationId == ID_MINUS then result = b - a ! elseif operationId == ID_MULTIPLY then result = b * a ! elseif operationId == ID_DIVIDE then if a == 0 then ! result = "Divide by zero error" else result = b / a *************** *** 156,182 **** end -- Handle all operation button events function OnOperator(event) -- Get display content ! local displayString = txtDisplay:GetLabel() ! local currentOperation = tonumber(displayString) ! -- Get the required lastOperation ! local operation = event:GetId() ! displayString = DoOperation(currentOperation, lastNumber, lastOperation) lastNumber = tonumber(displayString) ! if (lastOperation ~= ID_EQUALS) or (operation == ID_EQUALS) then txtDisplay:SetLabel(displayString) end clearDisplay = 1 ! lastOperation = operation end function OnQuit(event) event:Skip() ! wx.wxMessageBox("wxLua calculator sample based on the calc sample written by Marco Ghislanzoni", ! "Calculator", wx.wxOK + wx.wxICON_INFORMATION, dialog) --- 158,194 ---- end + -- --------------------------------------------------------------------------- -- Handle all operation button events function OnOperator(event) -- Get display content ! local displayString = txtDisplay:GetLabel() ! local currentNumber = tonumber(displayString) ! -- if error message was shown, zero output and ignore operator ! if ((currentNumber == nil) or (lastNumber == nil)) then ! lastNumber = 0 ! return ! end ! -- Get the required lastOperationId ! local operationId = event:GetId() ! ! displayString = DoOperation(currentNumber, lastNumber, lastOperationId) lastNumber = tonumber(displayString) ! if (lastOperationId ~= ID_EQUALS) or (operationId == ID_EQUALS) then txtDisplay:SetLabel(displayString) end clearDisplay = 1 ! lastOperationId = operationId end + -- --------------------------------------------------------------------------- + -- Handle the quit button event function OnQuit(event) event:Skip() ! wx.wxMessageBox("wxLua calculator sample based on the calc sample written by Marco Ghislanzoni.\n".. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, ! "wxLua Calculator", wx.wxOK + wx.wxICON_INFORMATION, dialog) *************** *** 185,195 **** end ! function main() -- xml style resources (if present) ! res = wx.wxXmlResourceGetDefault() ! res:InitAllHandlers() ! local xrcFilename = getPath().."/calculator.xrc" ! while not res:Load(xrcFilename) do wx.wxMessageBox("Error loading xrc resources, please choose the path to 'calculator.xrc'.", "Calculator", --- 197,210 ---- end ! -- --------------------------------------------------------------------------- ! -- The main program as a function (makes it easy to exit on error) function main() -- xml style resources (if present) ! xmlResource = wx.wxXmlResourceGetDefault() ! xmlResource:InitAllHandlers() ! local xrcFilename = GetPath().."/calculator.xrc" ! ! -- try to load the resource and ask for path to it if not found ! while not xmlResource:Load(xrcFilename) do wx.wxMessageBox("Error loading xrc resources, please choose the path to 'calculator.xrc'.", "Calculator", *************** *** 211,215 **** dialog = wx.wxEmptyDialog() ! if not res:LoadDialogCreate(dialog, wx.wxNull, "Calculator") then wx.wxMessageBox("Error loading xrc resources!", "Calculator", --- 226,230 ---- dialog = wx.wxEmptyDialog() ! if not xmlResource:LoadDialogCreate(dialog, wx.wxNull, "Calculator") then wx.wxMessageBox("Error loading xrc resources!", "Calculator", *************** *** 226,230 **** -- initialize the txtDisplay and verify that it's ok ! txtDisplay = dialog:FindWindow(res:GetXRCID("ID_TEXT")) if not txtDisplay then wx.wxError([[Unable to find window "ID_TEXT" in the dialog]]) --- 241,245 ---- -- initialize the txtDisplay and verify that it's ok ! txtDisplay = dialog:FindWindow(xmlResource:GetXRCID("ID_TEXT")) if not txtDisplay then wx.wxError([[Unable to find window "ID_TEXT" in the dialog]]) *************** *** 235,261 **** txtDisplay:SetLabel("0") ! -- init wxWindow ID values ! ID_0 = res:GetXRCID("ID_0") ! ID_1 = res:GetXRCID("ID_1") ! ID_2 = res:GetXRCID("ID_2") ! ID_3 = res:GetXRCID("ID_3") ! ID_4 = res:GetXRCID("ID_4") ! ID_5 = res:GetXRCID("ID_5") ! ID_6 = res:GetXRCID("ID_6") ! ID_7 = res:GetXRCID("ID_7") ! ID_8 = res:GetXRCID("ID_8") ! ID_9 = res:GetXRCID("ID_9") ! ID_DECIMAL = res:GetXRCID("ID_DECIMAL") ! ID_EQUALS = res:GetXRCID("ID_EQUALS") ! ID_PLUS = res:GetXRCID("ID_PLUS") ! ID_MINUS = res:GetXRCID("ID_MINUS") ! ID_MULTIPLY = res:GetXRCID("ID_MULTIPLY") ! ID_DIVIDE = res:GetXRCID("ID_DIVIDE") ! ID_OFF = res:GetXRCID("ID_OFF") ! ID_CLEAR = res:GetXRCID("ID_CLEAR") ! lastNumber = 0 ! lastOperation = ID_PLUS ! clearDisplay = nil dialog:Connect(ID_0, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) --- 250,274 ---- txtDisplay:SetLabel("0") ! -- init global wxWindow ID values ! ID_0 = xmlResource:GetXRCID("ID_0") ! ID_1 = xmlResource:GetXRCID("ID_1") ! ID_2 = xmlResource:GetXRCID("ID_2") ! ID_3 = xmlResource:GetXRCID("ID_3") ! ID_4 = xmlResource:GetXRCID("ID_4") ! ID_5 = xmlResource:GetXRCID("ID_5") ! ID_6 = xmlResource:GetXRCID("ID_6") ! ID_7 = xmlResource:GetXRCID("ID_7") ! ID_8 = xmlResource:GetXRCID("ID_8") ! ID_9 = xmlResource:GetXRCID("ID_9") ! ID_DECIMAL = xmlResource:GetXRCID("ID_DECIMAL") ! ID_EQUALS = xmlResource:GetXRCID("ID_EQUALS") ! ID_PLUS = xmlResource:GetXRCID("ID_PLUS") ! ID_MINUS = xmlResource:GetXRCID("ID_MINUS") ! ID_MULTIPLY = xmlResource:GetXRCID("ID_MULTIPLY") ! ID_DIVIDE = xmlResource:GetXRCID("ID_DIVIDE") ! ID_OFF = xmlResource:GetXRCID("ID_OFF") ! ID_CLEAR = xmlResource:GetXRCID("ID_CLEAR") ! lastOperationId = ID_PLUS dialog:Connect(ID_0, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) *************** *** 282,303 **** accelTable = wx.wxAcceleratorTable({ { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 }, - { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0, ID_0 }, { wx.wxACCEL_NORMAL, string.byte('1'), ID_1 }, - { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD1, ID_1 }, { wx.wxACCEL_NORMAL, string.byte('2'), ID_2 }, - { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD2, ID_2 }, { wx.wxACCEL_NORMAL, string.byte('3'), ID_3 }, - { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD3, ID_3 }, { wx.wxACCEL_NORMAL, string.byte('4'), ID_4 }, - { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD4, ID_4 }, { wx.wxACCEL_NORMAL, string.byte('5'), ID_5 }, - { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD5, ID_5 }, { wx.wxACCEL_NORMAL, string.byte('6'), ID_6 }, - { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD6, ID_6 }, { wx.wxACCEL_NORMAL, string.byte('7'), ID_7 }, - { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD7, ID_7 }, { wx.wxACCEL_NORMAL, string.byte('8'), ID_8 }, - { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD8, ID_8 }, { wx.wxACCEL_NORMAL, string.byte('9'), ID_9 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD9, ID_9 }, { wx.wxACCEL_NORMAL, string.byte('.'), ID_DECIMAL }, --- 295,316 ---- accelTable = wx.wxAcceleratorTable({ { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 }, { wx.wxACCEL_NORMAL, string.byte('1'), ID_1 }, { wx.wxACCEL_NORMAL, string.byte('2'), ID_2 }, { wx.wxACCEL_NORMAL, string.byte('3'), ID_3 }, { wx.wxACCEL_NORMAL, string.byte('4'), ID_4 }, { wx.wxACCEL_NORMAL, string.byte('5'), ID_5 }, { wx.wxACCEL_NORMAL, string.byte('6'), ID_6 }, { wx.wxACCEL_NORMAL, string.byte('7'), ID_7 }, { wx.wxACCEL_NORMAL, string.byte('8'), ID_8 }, { wx.wxACCEL_NORMAL, string.byte('9'), ID_9 }, + { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0, ID_0 }, + { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD1, ID_1 }, + { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD2, ID_2 }, + { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD3, ID_3 }, + { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD4, ID_4 }, + { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD5, ID_5 }, + { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD6, ID_6 }, + { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD7, ID_7 }, + { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD8, ID_8 }, { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD9, ID_9 }, { wx.wxACCEL_NORMAL, string.byte('.'), ID_DECIMAL }, |
|
From: John L. <jr...@us...> - 2006-09-20 04:07:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10976/wxLua/modules/wxbind/src Modified Files: html.cpp wx_bind.cpp Log Message: add wxVERSION and WXLUA_XXX_VERSION bindings and use them in the About dialog for the samples Cleanup samples for readability Index: html.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** html.cpp 24 Aug 2006 05:12:27 -0000 1.18 --- html.cpp 20 Sep 2006 04:07:37 -0000 1.19 *************** *** 1909,1912 **** --- 1909,1931 ---- + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + // %wxchkver27 wxHtmlWindowInterface *GetWindowInterface() + static int LUACALL wxLua_wxHtmlWinParser_GetWindowInterface(lua_State *L) + { + wxLuaState wxlState(L); + wxHtmlWindowInterface *returns; + // get this + wxHtmlWinParser * self = (wxHtmlWinParser *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWinParser); + // call GetWindowInterface + returns = self->GetWindowInterface(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxHtmlWindowInterface, returns); + + return 1; + } + + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxHTML) // wxColour GetActualColor() const *************** *** 2447,2450 **** --- 2466,2474 ---- + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + { LuaMethod, "GetWindowInterface", wxLua_wxHtmlWinParser_GetWindowInterface, 0, 0, { 0 } }, + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + #if (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxHTML) { LuaMethod, "GetActualColor", wxLua_wxHtmlWinParser_GetActualColor, 0, 0, { 0 } }, *************** *** 2522,2525 **** --- 2546,2771 ---- + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + // ------------------------------------------------------------------------------------------------- + // Bind class wxHtmlWindowInterface + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxHtmlWindowInterface' + int s_wxluatag_wxHtmlWindowInterface = -1; + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxBitmap) + // virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg) + static int LUACALL wxLua_wxHtmlWindowInterface_SetHTMLBackgroundImage(lua_State *L) + { + wxLuaState wxlState(L); + // const wxBitmap bmpBg + const wxBitmap * bmpBg = (const wxBitmap *)wxlState.GetUserDataType(2, s_wxluatag_wxBitmap); + // get this + wxHtmlWindowInterface * self = (wxHtmlWindowInterface *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindowInterface); + // call SetHTMLBackgroundImage + self->SetHTMLBackgroundImage(*bmpBg); + + return 0; + } + + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxBitmap) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxColourPenBrush) + // virtual wxColour GetHTMLBackgroundColour() const + static int LUACALL wxLua_wxHtmlWindowInterface_GetHTMLBackgroundColour(lua_State *L) + { + wxLuaState wxlState(L); + wxColour *returns; + // get this + wxHtmlWindowInterface * self = (wxHtmlWindowInterface *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindowInterface); + // call GetHTMLBackgroundColour + // allocate a new object using the copy constructor + returns = new wxColour(self->GetHTMLBackgroundColour()); + // 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; + } + + // virtual void SetHTMLBackgroundColour(const wxColour& clr) + static int LUACALL wxLua_wxHtmlWindowInterface_SetHTMLBackgroundColour(lua_State *L) + { + wxLuaState wxlState(L); + // const wxColour clr + const wxColour * clr = (const wxColour *)wxlState.GetUserDataType(2, s_wxluatag_wxColour); + // get this + wxHtmlWindowInterface * self = (wxHtmlWindowInterface *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindowInterface); + // call SetHTMLBackgroundColour + self->SetHTMLBackgroundColour(*clr); + + return 0; + } + + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxColourPenBrush) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxCursor) + // virtual wxCursor GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor type) const + static int LUACALL wxLua_wxHtmlWindowInterface_GetHTMLCursor(lua_State *L) + { + wxLuaState wxlState(L); + wxCursor *returns; + // wxHtmlWindowInterface::HTMLCursor type + wxHtmlWindowInterface::HTMLCursor type = (wxHtmlWindowInterface::HTMLCursor)wxlState.GetEnumerationType(2); + // get this + wxHtmlWindowInterface * self = (wxHtmlWindowInterface *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindowInterface); + // call GetHTMLCursor + // allocate a new object using the copy constructor + returns = new wxCursor(self->GetHTMLCursor(type)); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxCursor *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxCursor, returns); + + return 1; + } + + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxCursor) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxHTML) + // virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) + static int LUACALL wxLua_wxHtmlWindowInterface_OnHTMLLinkClicked(lua_State *L) + { + wxLuaState wxlState(L); + // const wxHtmlLinkInfo link + const wxHtmlLinkInfo * link = (const wxHtmlLinkInfo *)wxlState.GetUserDataType(2, s_wxluatag_wxHtmlLinkInfo); + // get this + wxHtmlWindowInterface * self = (wxHtmlWindowInterface *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindowInterface); + // call OnHTMLLinkClicked + self->OnHTMLLinkClicked(*link); + + return 0; + } + + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxHTML) + + + #if ((wxLUA_USE_wxHTML) && ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML))) && (wxLUA_USE_wxPointSizeRect) + // virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell, const wxPoint& pos) const + static int LUACALL wxLua_wxHtmlWindowInterface_HTMLCoordsToWindow(lua_State *L) + { + wxLuaState wxlState(L); + wxPoint *returns; + // const wxPoint pos + const wxPoint * pos = (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint); + // wxHtmlCell cell + wxHtmlCell * cell = (wxHtmlCell *)wxlState.GetUserDataType(2, s_wxluatag_wxHtmlCell); + // get this + wxHtmlWindowInterface * self = (wxHtmlWindowInterface *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindowInterface); + // call HTMLCoordsToWindow + // allocate a new object using the copy constructor + returns = new wxPoint(self->HTMLCoordsToWindow(cell, *pos)); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxPoint *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxPoint, returns); + + return 1; + } + + #endif // ((wxLUA_USE_wxHTML) && ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML))) && (wxLUA_USE_wxPointSizeRect) + + // virtual void SetHTMLWindowTitle(const wxString& title) + static int LUACALL wxLua_wxHtmlWindowInterface_SetHTMLWindowTitle(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString title + const wxString title = lua2wx(wxlState.GetStringType(2)); + // get this + wxHtmlWindowInterface * self = (wxHtmlWindowInterface *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindowInterface); + // call SetHTMLWindowTitle + self->SetHTMLWindowTitle(title); + + return 0; + } + + // virtual wxWindow* GetHTMLWindow() + static int LUACALL wxLua_wxHtmlWindowInterface_GetHTMLWindow(lua_State *L) + { + wxLuaState wxlState(L); + wxWindow *returns; + // get this + wxHtmlWindowInterface * self = (wxHtmlWindowInterface *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindowInterface); + // call GetHTMLWindow + returns = self->GetHTMLWindow(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxWindow, returns); + + return 1; + } + + // virtual void SetHTMLStatusText(const wxString& text) + static int LUACALL wxLua_wxHtmlWindowInterface_SetHTMLStatusText(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString text + const wxString text = lua2wx(wxlState.GetStringType(2)); + // get this + wxHtmlWindowInterface * self = (wxHtmlWindowInterface *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindowInterface); + // call SetHTMLStatusText + self->SetHTMLStatusText(text); + + return 0; + } + + static int LUACALL wxLua_wxHtmlWindowInterface_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxHtmlWindowInterface_methods[] = { + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxBitmap) + { LuaMethod, "SetHTMLBackgroundImage", wxLua_wxHtmlWindowInterface_SetHTMLBackgroundImage, 1, 1, { &s_wxluatag_wxBitmap, 0 } }, + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxBitmap) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxColourPenBrush) + { LuaMethod, "GetHTMLBackgroundColour", wxLua_wxHtmlWindowInterface_GetHTMLBackgroundColour, 0, 0, { 0 } }, + { LuaMethod, "SetHTMLBackgroundColour", wxLua_wxHtmlWindowInterface_SetHTMLBackgroundColour, 1, 1, { &s_wxluatag_wxColour, 0 } }, + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxColourPenBrush) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxCursor) + { LuaMethod, "GetHTMLCursor", wxLua_wxHtmlWindowInterface_GetHTMLCursor, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxCursor) + + + #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxHTML) + { LuaMethod, "OnHTMLLinkClicked", wxLua_wxHtmlWindowInterface_OnHTMLLinkClicked, 1, 1, { &s_wxluatag_wxHtmlLinkInfo, 0 } }, + #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxHTML) + + + #if ((wxLUA_USE_wxHTML) && ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML))) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, "HTMLCoordsToWindow", wxLua_wxHtmlWindowInterface_HTMLCoordsToWindow, 2, 2, { &s_wxluatag_wxHtmlCell, &s_wxluatag_wxPoint, 0 } }, + #endif // ((wxLUA_USE_wxHTML) && ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML))) && (wxLUA_USE_wxPointSizeRect) + + { LuaMethod, "SetHTMLWindowTitle", wxLua_wxHtmlWindowInterface_SetHTMLWindowTitle, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "GetHTMLWindow", wxLua_wxHtmlWindowInterface_GetHTMLWindow, 0, 0, { 0 } }, + { LuaMethod, "SetHTMLStatusText", wxLua_wxHtmlWindowInterface_SetHTMLStatusText, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaDelete, "wxHtmlWindowInterface", wxLua_wxHtmlWindowInterface_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxHtmlWindowInterface_methods = s_wxHtmlWindowInterface_methods; + int wxHtmlWindowInterface_methodCount = sizeof(s_wxHtmlWindowInterface_methods)/sizeof(s_wxHtmlWindowInterface_methods[0]); + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + #if wxLUA_USE_wxHTML // ------------------------------------------------------------------------------------------------- Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** wx_bind.cpp 28 Aug 2006 05:26:20 -0000 1.54 --- wx_bind.cpp 20 Sep 2006 04:07:37 -0000 1.55 *************** *** 525,528 **** --- 525,533 ---- #endif // (wxUSE_SOUND) && (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxWave) + { "WXLUA_MAJOR_VERSION", WXLUA_MAJOR_VERSION }, + { "WXLUA_MINOR_VERSION", WXLUA_MINOR_VERSION }, + { "WXLUA_RELEASE_VERSION", WXLUA_RELEASE_VERSION }, + { "WXLUA_SUBRELEASE_VERSION", WXLUA_SUBRELEASE_VERSION }, + { "wxABI_VERSION", wxABI_VERSION }, { "wxALWAYS_SHOW_SB", wxALWAYS_SHOW_SB }, { "wxBACKINGSTORE", wxBACKINGSTORE }, *************** *** 558,561 **** --- 563,568 ---- { "wxIMAGE_ALPHA_TRANSPARENT", wxIMAGE_ALPHA_TRANSPARENT }, { "wxINVERT", wxINVERT }, + { "wxMAJOR_VERSION", wxMAJOR_VERSION }, + { "wxMINOR_VERSION", wxMINOR_VERSION }, { "wxMORE", wxMORE }, { "wxNO", wxNO }, *************** *** 568,571 **** --- 575,579 ---- { "wxPROCESS_ENTER", wxPROCESS_ENTER }, { "wxRAISED_BORDER", wxRAISED_BORDER }, + { "wxRELEASE_NUMBER", wxRELEASE_NUMBER }, { "wxRESET", wxRESET }, { "wxRESIZE_BOX", wxRESIZE_BOX }, *************** *** 583,586 **** --- 591,595 ---- { "wxSTATIC_BORDER", wxSTATIC_BORDER }, { "wxST_NO_AUTORESIZE", wxST_NO_AUTORESIZE }, + { "wxSUBRELEASE_NUMBER", wxSUBRELEASE_NUMBER }, { "wxSUNKEN_BORDER", wxSUNKEN_BORDER }, { "wxTAB_TRAVERSAL", wxTAB_TRAVERSAL }, *************** *** 1443,1446 **** --- 1452,1461 ---- #endif // (wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxPrint) + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + { "wxHtmlWindowInterface_HTMLCursor_Default", wxHtmlWindowInterface::HTMLCursor_Default }, + { "wxHtmlWindowInterface_HTMLCursor_Link", wxHtmlWindowInterface::HTMLCursor_Link }, + { "wxHtmlWindowInterface_HTMLCursor_Text", wxHtmlWindowInterface::HTMLCursor_Text }, + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + #if (wxLUA_USE_wxHelpController) && (wxUSE_HELP) { "wxHELP_SEARCH_ALL", wxHELP_SEARCH_ALL }, *************** *** 2611,2614 **** --- 2626,2630 ---- #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage) + { "WXLUA_VERSION_STRING", WXLUA_VERSION_STRING }, { "wxIMAGE_OPTION_FILENAME", _T("FileName") }, { "wxIMAGE_OPTION_PNG_BITDEPTH", wxIMAGE_OPTION_PNG_BITDEPTH }, *************** *** 2619,2622 **** --- 2635,2639 ---- { "wxIMAGE_OPTION_RESOLUTIONX", _T("ResolutionX") }, { "wxIMAGE_OPTION_RESOLUTIONY", _T("ResolutionY") }, + { "wxVERSION_STRING", wxVERSION_STRING }, #if wxCHECK_VERSION(2,6,0) *************** *** 3116,3119 **** --- 3133,3176 ---- } + // %function bool wxCHECK_VERSION(int major, int minor, int release) // actually a define + static int LUACALL wxLua_function_wxCHECK_VERSION(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // int release + int release = (int)wxlState.GetNumberType(3); + // int minor + int minor = (int)wxlState.GetNumberType(2); + // int major + int major = (int)wxlState.GetNumberType(1); + // call wxCHECK_VERSION + returns = wxCHECK_VERSION(major, minor, release); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // %function bool wxCHECK_VERSION_FULL(int major, int minor, int release, int subrel) // actually a define + static int LUACALL wxLua_function_wxCHECK_VERSION_FULL(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // int subrel + int subrel = (int)wxlState.GetNumberType(4); + // int release + int release = (int)wxlState.GetNumberType(3); + // int minor + int minor = (int)wxlState.GetNumberType(2); + // int major + int major = (int)wxlState.GetNumberType(1); + // call wxCHECK_VERSION_FULL + returns = wxCHECK_VERSION_FULL(major, minor, release, subrel); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + // %override wxLua_function_wxClientDisplayRect // %function void wxClientDisplayRect(int *x, int *y,int *width, int *height) *************** *** 4857,4860 **** --- 4914,4919 ---- { LuaGlobal, "wxBell", wxLua_function_wxBell, 0, 0, { 0 } }, + { LuaGlobal, "wxCHECK_VERSION", wxLua_function_wxCHECK_VERSION, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + { LuaGlobal, "wxCHECK_VERSION_FULL", wxLua_function_wxCHECK_VERSION_FULL, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaGlobal, "wxClientDisplayRect", wxLua_function_wxClientDisplayRect, 4, 4, { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 } }, { LuaGlobal, "wxColourDisplay", wxLua_function_wxColourDisplay, 0, 0, { 0 } }, *************** *** 5102,5105 **** --- 5161,5169 ---- + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + { "wxHtmlWindowInterface", wxHtmlWindowInterface_methods, wxHtmlWindowInterface_methodCount, -1, NULL, &s_wxluatag_wxHtmlWindowInterface, NULL }, + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + + #if (wxLUA_USE_wxBitmapButton) && (wxLUA_USE_wxButton) { "wxBitmapButton", wxBitmapButton_methods, wxBitmapButton_methodCount, -1, CLASSINFO(wxBitmapButton), &s_wxluatag_wxBitmapButton, "wxButton" }, |
|
From: John L. <jr...@us...> - 2006-09-20 04:07:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10976/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: add wxVERSION and WXLUA_XXX_VERSION bindings and use them in the About dialog for the samples Cleanup samples for readability Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxbind.h 28 Aug 2006 05:26:20 -0000 1.36 --- wxbind.h 20 Sep 2006 04:07:37 -0000 1.37 *************** *** 642,645 **** --- 642,649 ---- #endif // (wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHtmlWindowInterface; + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + #if (wxLUA_USE_wxBitmapButton) && (wxLUA_USE_wxButton) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBitmapButton; *************** *** 1451,1454 **** --- 1455,1463 ---- #endif // (wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) + #if (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxHtmlWindowInterface_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHtmlWindowInterface_methodCount; + #endif // (wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML) + #if (wxLUA_USE_wxBitmapButton) && (wxLUA_USE_wxButton) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxBitmapButton_methods; |
|
From: John L. <jr...@us...> - 2006-09-20 04:07:40
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10976/wxLua/docs Modified Files: changelog.txt Log Message: add wxVERSION and WXLUA_XXX_VERSION bindings and use them in the About dialog for the samples Cleanup samples for readability Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** changelog.txt 15 Sep 2006 00:10:55 -0000 1.17 --- changelog.txt 20 Sep 2006 04:07:37 -0000 1.18 *************** *** 42,45 **** --- 42,46 ---- to other files. Please include wxlua/wxlstate.h instead of this file. - Cleanup debugging socket code + - Add wxVERSION and wxCHECK_VERSION as well as WXLUA_XXX_VERSION bindings |
|
From: John L. <jr...@us...> - 2006-09-20 04:07:40
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10976/wxLua/bindings/wxwidgets Modified Files: defsutil.i html.i wx_datatypes.lua Log Message: add wxVERSION and WXLUA_XXX_VERSION bindings and use them in the About dialog for the samples Cleanup samples for readability Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** defsutil.i 24 Aug 2006 05:12:27 -0000 1.27 --- defsutil.i 20 Sep 2006 04:07:37 -0000 1.28 *************** *** 290,293 **** --- 290,316 ---- //----------------------------------------------------------------------------- + // wxWidgets version defines + + %define wxMAJOR_VERSION + %define wxMINOR_VERSION + %define wxRELEASE_NUMBER + %define wxSUBRELEASE_NUMBER + %define %string wxVERSION_STRING + + %function bool wxCHECK_VERSION(int major, int minor, int release) // actually a define + %function bool wxCHECK_VERSION_FULL(int major, int minor, int release, int subrel) // actually a define + + %define wxABI_VERSION + + //----------------------------------------------------------------------------- + // wxLua version defines + + %define WXLUA_MAJOR_VERSION + %define WXLUA_MINOR_VERSION + %define WXLUA_RELEASE_VERSION + %define WXLUA_SUBRELEASE_VERSION + %define %string WXLUA_VERSION_STRING + + //----------------------------------------------------------------------------- // wxLua platform defines - FIXME add simple method wxPlatform returning unix, msw, ... Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wx_datatypes.lua 26 May 2006 20:22:09 -0000 1.34 --- wx_datatypes.lua 20 Sep 2006 04:07:37 -0000 1.35 *************** *** 1484,1487 **** --- 1484,1499 ---- Name = "wxHtmlWindow", }, + wxHtmlWindowInterface = { + Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)", + DefType = "class", + Intrinsic = false, + Name = "wxHtmlWindowInterface", + }, + ["wxHtmlWindowInterface::HTMLCursor"] = { + Condition = "(wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)", + DefType = "enum", + Intrinsic = true, + Name = "wxHtmlWindowInterface::HTMLCursor", + }, wxICOHandler = { BaseClass = "wxBMPHandler", Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** html.i 24 Aug 2006 05:12:27 -0000 1.10 --- html.i 20 Sep 2006 04:07:37 -0000 1.11 *************** *** 262,265 **** --- 262,266 ---- wxColour GetLinkColor() const //wxFontEncoding GetOutputEncoding() const + %wxchkver27 wxHtmlWindowInterface *GetWindowInterface() !%wxchkver27 wxWindow* GetWindow() wxHtmlContainerCell* OpenContainer() *************** *** 296,299 **** --- 297,327 ---- //----------------------------------------------------------------------------- + // wxHtmlWindowInterface + + %if %wxchkver27 + + %enum wxHtmlWindowInterface::HTMLCursor + HTMLCursor_Default + HTMLCursor_Link + HTMLCursor_Text + %endenum + + %class %noclassinfo wxHtmlWindowInterface + + virtual void SetHTMLWindowTitle(const wxString& title) + virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) + //virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type, const wxString& url, wxString *redirect) const + virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell, const wxPoint& pos) const + virtual wxWindow* GetHTMLWindow() + virtual wxColour GetHTMLBackgroundColour() const + virtual void SetHTMLBackgroundColour(const wxColour& clr) + virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg) + virtual void SetHTMLStatusText(const wxString& text) + virtual wxCursor GetHTMLCursor(wxHtmlWindowInterface::HTMLCursor type) const + %endclass + + %endif + + //----------------------------------------------------------------------------- // wxHtmlDCRenderer |
|
From: John L. <jr...@us...> - 2006-09-19 05:01:49
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2624/wxLua/samples Modified Files: editor.wx.lua Log Message: reorder code in the wxLua editor to follow menu item order and capitalize functions to make them easy to find Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** editor.wx.lua 15 Sep 2006 00:10:56 -0000 1.20 --- editor.wx.lua 19 Sep 2006 05:01:45 -0000 1.21 *************** *** 9,13 **** -- Generate a unique new wxWindowID ! function newID() ID_IDCOUNTER = (ID_IDCOUNTER or wx.wxID_HIGHEST) + 1 return ID_IDCOUNTER --- 9,13 ---- -- Generate a unique new wxWindowID ! function NewID() ID_IDCOUNTER = (ID_IDCOUNTER or wx.wxID_HIGHEST) + 1 [...2860 lines suppressed...] else ! local editor = createEditor("Untitled") ! setupKeywords(editor, 1) end else ! local editor = createEditor("Untitled") ! setupKeywords(editor, 1) end --- 1999,2008 ---- notebook:SetSelection(0) else ! local editor = CreateEditor("Untitled") ! SetupKeywords(editor, 1) end else ! local editor = CreateEditor("Untitled") ! SetupKeywords(editor, 1) end |
|
From: John L. <jr...@us...> - 2006-09-19 05:01:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2624/wxLua/modules/wxluasocket/src Modified Files: Makefile Log Message: reorder code in the wxLua editor to follow menu item order and capitalize functions to make them easy to find Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile 24 May 2006 04:50:02 -0000 1.8 --- Makefile 19 Sep 2006 05:01:45 -0000 1.9 *************** *** 52,56 **** HEADERS = \ - ../include/wxldbgio.h \ ../include/wxldserv.h \ ../include/wxldtarg.h \ --- 52,55 ---- *************** *** 61,65 **** SOURCES = \ - wxldbgio.cpp \ wxldserv.cpp \ wxldtarg.cpp \ --- 60,63 ---- |
|
From: John L. <jr...@us...> - 2006-09-19 05:01:48
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2624/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: reorder code in the wxLua editor to follow menu item order and capitalize functions to make them easy to find Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** editor.h 15 Sep 2006 00:10:55 -0000 1.17 --- editor.h 19 Sep 2006 05:01:44 -0000 1.18 *************** *** 9,14 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 71989; ! const unsigned char wxLuaEditor[71990] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, --- 9,14 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 73599; [...2875 lines suppressed...] 32, 32, 32, 32,101,108,115,101, 10, ! 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 99,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32,115,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 10, 32, 32, 32, 32,101,110,100, 10, 101,108,115,101, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 99,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10, ! 32, 32, 32, 32,115,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 10, 101,110,100, 10, 10, --- 2011,2020 ---- 32, 32, 32, 32, 32, 32, 32, 32,110,111,116,101, 98,111,111,107, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40, 48, 41, 10, 32, 32, 32, 32,101,108,115,101, 10, ! 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 67,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 10, 32, 32, 32, 32,101,110,100, 10, 101,108,115,101, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 67,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10, ! 32, 32, 32, 32, 83,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 10, 101,110,100, 10, 10, |
|
From: John L. <jr...@us...> - 2006-09-18 18:18:57
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11553/modules/wxluasocket/src Modified Files: wxldtarg.cpp Log Message: remove debugging code Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wxldtarg.cpp 15 Sep 2006 00:10:56 -0000 1.21 --- wxldtarg.cpp 18 Sep 2006 18:18:54 -0000 1.22 *************** *** 237,241 **** m_clientSocket.ReadString(buffer)) { - wxSafeShowMessage(wxT("wxLUASOCKET_DEBUGGER_CMD_RUN_BUFFER") + fileName, wxString::Format(wxT("PID %d TIME %s "), getpid(), wxT(__TIME__)) + buffer); Run(fileName, buffer); } --- 237,240 ---- |
|
From: Francesco M. <fr...@us...> - 2006-09-15 16:24:40
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9387/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxlua.dsp modules_mod_wxluasocket.dsp Log Message: removed unused files Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** makefile.bcc 24 May 2006 17:20:56 -0000 1.50 --- makefile.bcc 15 Sep 2006 16:24:35 -0000 1.51 *************** *** 267,272 **** borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj WXLUA_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 267,271 ---- borland$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ borland$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj WXLUA_DLL_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 278,283 **** borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj WXBIND_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 277,281 ---- borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ borland$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj \ ! borland$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj WXBIND_LIB_CXXFLAGS = -I$(BCCDIR)\include -I..\..\..\modules\wxbind\setup \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 403,407 **** borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj \ - borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \ --- 401,404 ---- *************** *** 419,423 **** borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj \ - borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj \ borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj \ --- 416,419 ---- *************** *** 1201,1207 **** $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxlua_lib_internal.obj: ..\..\wxlua\src\internal.cpp - $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** --- 1197,1200 ---- *************** *** 1213,1219 **** $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxlua_dll_internal.obj: ..\..\wxlua\src\internal.cpp - $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj: ..\..\wxbind\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** --- 1206,1209 ---- *************** *** 1435,1441 **** $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj: ..\..\wxluasocket\src\wxldbgio.cpp - $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** --- 1425,1428 ---- *************** *** 1459,1465 **** $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj: ..\..\wxluasocket\src\wxldbgio.cpp - $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** - borland$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** --- 1446,1449 ---- Index: modules_mod_wxlua.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxlua.dsp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** modules_mod_wxlua.dsp 20 May 2006 20:17:57 -0000 1.23 --- modules_mod_wxlua.dsp 15 Sep 2006 16:24:36 -0000 1.24 *************** *** 453,460 **** # Begin Source File - SOURCE=..\..\wxlua\src\internal.cpp - # End Source File - # Begin Source File - SOURCE=..\..\wxlua\src\wxlbind.cpp # End Source File --- 453,456 ---- *************** *** 473,480 **** # Begin Source File - SOURCE=..\..\wxlua\include\internal.h - # End Source File - # Begin Source File - SOURCE=..\..\wxlua\include\wxlbind.h # End Source File --- 469,472 ---- Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.wat 24 May 2006 17:20:56 -0000 1.49 --- makefile.wat 15 Sep 2006 16:24:35 -0000 1.50 *************** *** 673,678 **** watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj & watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_lib_internal.obj WXLUA_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 673,677 ---- watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj & watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj WXLUA_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 685,690 **** watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj & watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_dll_internal.obj WXBIND_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 684,688 ---- watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj & watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj & ! watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj WXBIND_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 811,815 **** watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj & - watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj & --- 809,812 ---- *************** *** 827,831 **** watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj & - watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj & watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj & --- 824,827 ---- *************** *** 1417,1423 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxlua_lib_internal.obj : .AUTODEPEND ..\..\wxlua\src\internal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj : .AUTODEPEND ..\..\wxlua\src\wxlcallb.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $< --- 1413,1416 ---- *************** *** 1429,1435 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxlua_dll_internal.obj : .AUTODEPEND ..\..\wxlua\src\internal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXLUA_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj : .AUTODEPEND ..\..\wxbind\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXBIND_LIB_CXXFLAGS) $< --- 1422,1425 ---- *************** *** 1651,1657 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldbgio.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_LIB_CXXFLAGS) $< --- 1641,1644 ---- *************** *** 1675,1681 **** $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldbgio.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< - watcom$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj : .AUTODEPEND ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -bt=nt -zq -fo=$^@ $(WXLUASOCKET_DLL_CXXFLAGS) $< --- 1662,1665 ---- Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.gcc,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** makefile.gcc 24 May 2006 17:20:56 -0000 1.50 --- makefile.gcc 15 Sep 2006 16:24:35 -0000 1.51 *************** *** 225,230 **** mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.o \ mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o WXLUA_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 225,229 ---- mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.o \ mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.o WXLUA_DLL_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 236,241 **** mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.o \ mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_dll_internal.o WXBIND_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 235,239 ---- mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.o \ mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.o \ ! mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.o WXBIND_LIB_CXXFLAGS = -I..\..\..\modules\wxbind\setup -DHAVE_W32API_H \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 360,364 **** mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.o \ - mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.o \ --- 358,361 ---- *************** *** 375,379 **** mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.o \ - mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.o \ mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.o \ --- 372,375 ---- *************** *** 1270,1276 **** $(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxlua_lib_internal.o: ../../wxlua/src/internal.cpp - $(CXX) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.o: ../../wxlua/src/wxlcallb.cpp $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $< --- 1266,1269 ---- *************** *** 1282,1288 **** $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxlua_dll_internal.o: ../../wxlua/src/internal.cpp - $(CXX) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxbind_lib_wxlua.o: ../../wxbind/src/wxlua.cpp $(CXX) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(CPPDEPS) $< --- 1275,1278 ---- *************** *** 1504,1510 **** $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.o: ../../wxluasocket/src/wxldbgio.cpp - $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.o: ../../wxluasocket/src/wxldtarg.cpp $(CXX) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(CPPDEPS) $< --- 1494,1497 ---- *************** *** 1528,1534 **** $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.o: ../../wxluasocket/src/wxldbgio.cpp - $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< - mingw$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.o: ../../wxluasocket/src/wxldtarg.cpp $(CXX) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(CPPDEPS) $< --- 1515,1518 ---- Index: modules_mod_wxluasocket.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/modules_mod_wxluasocket.dsp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** modules_mod_wxluasocket.dsp 24 May 2006 17:20:56 -0000 1.25 --- modules_mod_wxluasocket.dsp 15 Sep 2006 16:24:36 -0000 1.26 *************** *** 457,464 **** # Begin Source File - SOURCE=..\..\wxluasocket\src\wxldbgio.cpp - # End Source File - # Begin Source File - SOURCE=..\..\wxluasocket\src\wxldserv.cpp # End Source File --- 457,460 ---- *************** *** 493,500 **** # Begin Source File - SOURCE=..\..\wxluasocket\include\wxldbgio.h - # End Source File - # Begin Source File - SOURCE=..\..\wxluasocket\include\wxldserv.h # End Source File --- 489,492 ---- Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** makefile.vc 24 May 2006 17:20:56 -0000 1.49 --- makefile.vc 15 Sep 2006 16:24:35 -0000 1.50 *************** *** 242,247 **** msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_lib_internal.obj WXLUA_DLL_CXXFLAGS = /MD$(____BUILD_43) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ --- 242,246 ---- msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlcallb.obj \ msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlbind.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_lib_wxlstate.obj WXLUA_DLL_CXXFLAGS = /MD$(____BUILD_43) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ *************** *** 256,261 **** msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_dll_internal.obj WXBIND_LIB_CXXFLAGS = /MD$(____BUILD_43) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ --- 255,259 ---- msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj \ msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlbind.obj \ ! msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlstate.obj WXBIND_LIB_CXXFLAGS = /MD$(____BUILD_43) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ *************** *** 401,405 **** msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlsock.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxlhandl.obj \ - msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldserv.obj \ --- 399,402 ---- *************** *** 419,423 **** msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlsock.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxlhandl.obj \ - msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj \ msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldserv.obj \ --- 416,419 ---- *************** *** 1195,1201 **** $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxlua_lib_internal.obj: ..\..\wxlua\src\internal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxlua_dll_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $** --- 1191,1194 ---- *************** *** 1207,1213 **** $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxlua_dll_internal.obj: ..\..\wxlua\src\internal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXLUA_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxbind_lib_wxlua.obj: ..\..\wxbind\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXBIND_LIB_CXXFLAGS) $** --- 1200,1203 ---- *************** *** 1429,1435 **** $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldbgio.obj: ..\..\wxluasocket\src\wxldbgio.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxluasocket_lib_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** --- 1419,1422 ---- *************** *** 1453,1459 **** $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldbgio.obj: ..\..\wxluasocket\src\wxldbgio.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** - msvc$(WXLIBPOSTFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) /c /nologo /TP /Fo$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** --- 1440,1443 ---- |
|
From: Francesco M. <fr...@us...> - 2006-09-15 16:24:40
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9387/build/bakefiles Modified Files: wxlua.bkl Log Message: removed unused files Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxlua.bkl 20 May 2006 11:57:27 -0000 1.25 --- wxlua.bkl 15 Sep 2006 16:24:35 -0000 1.26 *************** *** 152,157 **** <pkgconfig id="pkgconfig" cond="FORMAT=='autoconf'"> <!-- the DOT is required !! --> ! <srcdir>.$(top_builddir)</srcdir> ! <files>build/autoconf/wxlua.pc</files> </pkgconfig> --- 152,156 ---- <pkgconfig id="pkgconfig" cond="FORMAT=='autoconf'"> <!-- the DOT is required !! --> ! <src>$(top_builddir)build/autoconf/wxlua.pc</src> </pkgconfig> |
|
From: Francesco M. <fr...@us...> - 2006-09-15 16:24:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9387/modules/wxluasocket/include Removed Files: wxldbgio.h Log Message: removed unused files --- wxldbgio.h DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-09-15 16:24:40
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9387/apps Modified Files: Makefile.in Log Message: removed unused files Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** Makefile.in 9 Aug 2006 03:34:48 -0000 1.42 --- Makefile.in 15 Sep 2006 16:24:35 -0000 1.43 *************** *** 40,44 **** ### Variables: ### ! DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ --- 40,44 ---- ### Variables: ### ! DESTDIR = APP_LUA_CFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ -I$(top_srcdir)/apps/../modules/lua/include $(WX_CFLAGS) \ *************** *** 172,176 **** $(STRIP) $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! clean: rm -rf ./.deps ./.pch rm -f ./*.o --- 172,176 ---- $(STRIP) $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) ! clean: rm -rf ./.deps ./.pch rm -f ./*.o *************** *** 187,262 **** $(top_builddir)bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) ! $(__app_lua___mac_setfilecmd) ! install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_lua: rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) $(top_builddir)bin/lua5.1$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -llua5.1 ! $(__app_verbatimlua___mac_setfilecmd) ! install_app_verbatimlua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)bin/lua5.1$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_verbatimlua: rm -f $(DESTDIR)$(bindir)/lua5.1$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___os2_emxbindcmd) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@install_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@uninstall_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___os2_emxbindcmd) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) @COND_USE_WXLUACANAPP_1@$(top_builddir)bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___os2_emxbindcmd) ! @COND_USE_WXLUACANAPP_1@install_app_wxluacan: @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXLUACANAPP_1@uninstall_app_wxluacan: @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___os2_emxbindcmd) ! @COND_USE_WXLUAFREEZEAPP_1@install_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAFREEZEAPP_1@uninstall_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) --- 187,262 ---- $(top_builddir)bin/wxlua-lua$(EXEEXT): $(APP_LUA_OBJECTS) $(CC) -o $@ $(APP_LUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) ! $(__app_lua___mac_setfilecmd) ! install_app_lua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua-lua$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_lua: rm -f $(DESTDIR)$(bindir)/wxlua-lua$(EXEEXT) $(top_builddir)bin/lua5.1$(EXEEXT): $(APP_VERBATIMLUA_OBJECTS) $(CC) -o $@ $(APP_VERBATIMLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LUA_PLATFORM_SPECIFIC_LDFLAGS) -lm -llua5.1 ! $(__app_verbatimlua___mac_setfilecmd) ! install_app_verbatimlua: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(top_builddir)bin/lua5.1$(EXEEXT) $(DESTDIR)$(bindir) ! uninstall_app_verbatimlua: rm -f $(DESTDIR)$(bindir)/lua5.1$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@$(top_builddir)bin/wxlua$(EXEEXT): $(APP_WXLUA_OBJECTS) $(__app_wxlua___win32rc) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(CXX) -o $@ $(APP_WXLUA_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___mac_setfilecmd) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(__app_wxlua___os2_emxbindcmd) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@install_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxlua$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@uninstall_app_wxlua: @COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1@ rm -f $(DESTDIR)$(bindir)/wxlua$(EXEEXT) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@$(top_builddir)bin/wxluaedit$(EXEEXT): $(APP_WXLUAEDIT_OBJECTS) $(__app_wxluaedit___win32rc) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(CXX) -o $@ $(APP_WXLUAEDIT_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbindstc-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lstedit $(WX_LIBS) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___mac_setfilecmd) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(__app_wxluaedit___os2_emxbindcmd) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@install_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluaedit$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@uninstall_app_wxluaedit: @COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluaedit$(EXEEXT) @COND_USE_WXLUACANAPP_1@$(top_builddir)bin/wxluacan$(EXEEXT): $(APP_WXLUACAN_OBJECTS) $(__app_wxluacan___win32rc) @COND_USE_WXLUACANAPP_1@ $(CXX) -o $@ $(APP_WXLUACAN_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXLUACANAPP_1@ @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___mac_setfilecmd) @COND_USE_WXLUACANAPP_1@ $(__app_wxluacan___os2_emxbindcmd) ! @COND_USE_WXLUACANAPP_1@install_app_wxluacan: @COND_USE_WXLUACANAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUACANAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluacan$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXLUACANAPP_1@uninstall_app_wxluacan: @COND_USE_WXLUACANAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluacan$(EXEEXT) @COND_USE_WXLUAFREEZEAPP_1@$(top_builddir)bin/wxluafreeze$(EXEEXT): $(APP_WXLUAFREEZE_OBJECTS) $(__app_wxluafreeze___win32rc) @COND_USE_WXLUAFREEZEAPP_1@ $(CXX) -o $@ $(APP_WXLUAFREEZE_OBJECTS) $(LDFLAGS) -L$(top_builddir)lib $(LDFLAGS_GUI) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxlua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxbind-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluasocket-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_wxluadebug-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) -lwxlua_$(WX_PORT_WITHVERSION)$(WXLIBPOSTFIX)_lua-$(WX_VERSION_MAJOR).$(WX_VERSION_MINOR) $(WX_LIBS) ! @COND_USE_WXLUAFREEZEAPP_1@ @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___mac_setfilecmd) @COND_USE_WXLUAFREEZEAPP_1@ $(__app_wxluafreeze___os2_emxbindcmd) ! @COND_USE_WXLUAFREEZEAPP_1@install_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir) @COND_USE_WXLUAFREEZEAPP_1@ $(INSTALL_PROGRAM) $(top_builddir)bin/wxluafreeze$(EXEEXT) $(DESTDIR)$(bindir) ! @COND_USE_WXLUAFREEZEAPP_1@uninstall_app_wxluafreeze: @COND_USE_WXLUAFREEZEAPP_1@ rm -f $(DESTDIR)$(bindir)/wxluafreeze$(EXEEXT) |
|
From: Francesco M. <fr...@us...> - 2006-09-15 16:24:40
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9387/modules Modified Files: Makefile.in Log Message: removed unused files Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** Makefile.in 24 May 2006 17:20:55 -0000 1.44 --- Makefile.in 15 Sep 2006 16:24:35 -0000 1.45 *************** *** 191,196 **** wxlua_lib_wxlcallb.o \ wxlua_lib_wxlbind.o \ ! wxlua_lib_wxlstate.o \ ! wxlua_lib_internal.o WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXMAKINGDLL_WXLUA \ --- 191,195 ---- wxlua_lib_wxlcallb.o \ wxlua_lib_wxlbind.o \ ! wxlua_lib_wxlstate.o WXLUA_DLL_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ -I$(top_srcdir)/modules -I./$(top_srcdir) -DWXMAKINGDLL_WXLUA \ *************** *** 199,204 **** wxlua_dll_wxlcallb.o \ wxlua_dll_wxlbind.o \ ! wxlua_dll_wxlstate.o \ ! wxlua_dll_internal.o WXBIND_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) $(CPPFLAGS) \ --- 198,202 ---- wxlua_dll_wxlcallb.o \ wxlua_dll_wxlbind.o \ ! wxlua_dll_wxlstate.o WXBIND_LIB_CXXFLAGS = -I$(top_srcdir)/modules/wxbind/setup \ -I$(top_srcdir)/modules -I./$(top_srcdir) $(WX_CXXFLAGS) $(CPPFLAGS) \ *************** *** 302,306 **** wxluasocket_lib_wxlsock.o \ wxluasocket_lib_wxlhandl.o \ - wxluasocket_lib_wxldbgio.o \ wxluasocket_lib_wxldtarg.o \ wxluasocket_lib_wxldserv.o \ --- 300,303 ---- *************** *** 314,318 **** wxluasocket_dll_wxlsock.o \ wxluasocket_dll_wxlhandl.o \ - wxluasocket_dll_wxldbgio.o \ wxluasocket_dll_wxldtarg.o \ wxluasocket_dll_wxldserv.o \ --- 311,314 ---- *************** *** 926,930 **** @COND_SHARED_0@install_wxlua_lib_headers: @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0@ for f in wxlua/include/internal.h wxlua/include/wxlua.h wxlua/include/wxlstate.h wxlua/include/wxlbind.h wxlua/include/wxldefs.h wxlua/include/wxlcallb.h; do \ @COND_SHARED_0@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 922,926 ---- @COND_SHARED_0@install_wxlua_lib_headers: @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0@ for f in wxlua/include/wxlua.h wxlua/include/wxlstate.h wxlua/include/wxlbind.h wxlua/include/wxldefs.h wxlua/include/wxlcallb.h; do \ @COND_SHARED_0@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 934,938 **** @COND_SHARED_0@uninstall_wxlua_lib_headers: ! @COND_SHARED_0@ for f in wxlua/include/internal.h wxlua/include/wxlua.h wxlua/include/wxlstate.h wxlua/include/wxlbind.h wxlua/include/wxldefs.h wxlua/include/wxlcallb.h; do \ @COND_SHARED_0@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0@ done --- 930,934 ---- @COND_SHARED_0@uninstall_wxlua_lib_headers: ! @COND_SHARED_0@ for f in wxlua/include/wxlua.h wxlua/include/wxlstate.h wxlua/include/wxlbind.h wxlua/include/wxldefs.h wxlua/include/wxlcallb.h; do \ @COND_SHARED_0@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0@ done *************** *** 955,959 **** @COND_SHARED_1@install_wxlua_dll_headers: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1@ for f in wxlua/include/internal.h wxlua/include/wxlua.h wxlua/include/wxlstate.h wxlua/include/wxlbind.h wxlua/include/wxldefs.h wxlua/include/wxlcallb.h; do \ @COND_SHARED_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 951,955 ---- @COND_SHARED_1@install_wxlua_dll_headers: @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1@ for f in wxlua/include/wxlua.h wxlua/include/wxlstate.h wxlua/include/wxlbind.h wxlua/include/wxldefs.h wxlua/include/wxlcallb.h; do \ @COND_SHARED_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 963,967 **** @COND_SHARED_1@uninstall_wxlua_dll_headers: ! @COND_SHARED_1@ for f in wxlua/include/internal.h wxlua/include/wxlua.h wxlua/include/wxlstate.h wxlua/include/wxlbind.h wxlua/include/wxldefs.h wxlua/include/wxlcallb.h; do \ @COND_SHARED_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1@ done --- 959,963 ---- @COND_SHARED_1@uninstall_wxlua_dll_headers: ! @COND_SHARED_1@ for f in wxlua/include/wxlua.h wxlua/include/wxlstate.h wxlua/include/wxlbind.h wxlua/include/wxldefs.h wxlua/include/wxlcallb.h; do \ @COND_SHARED_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1@ done *************** *** 1146,1150 **** @COND_SHARED_0_USE_WXLUASOCKET_1@install_wxluasocket_lib_headers: @COND_SHARED_0_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_0_USE_WXLUASOCKET_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 1142,1146 ---- @COND_SHARED_0_USE_WXLUASOCKET_1@install_wxluasocket_lib_headers: @COND_SHARED_0_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_0_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_0_USE_WXLUASOCKET_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_0_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 1154,1158 **** @COND_SHARED_0_USE_WXLUASOCKET_1@uninstall_wxluasocket_lib_headers: ! @COND_SHARED_0_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_0_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXLUASOCKET_1@ done --- 1150,1154 ---- @COND_SHARED_0_USE_WXLUASOCKET_1@uninstall_wxluasocket_lib_headers: ! @COND_SHARED_0_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_0_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_WXLUASOCKET_1@ done *************** *** 1175,1179 **** @COND_SHARED_1_USE_WXLUASOCKET_1@install_wxluasocket_dll_headers: @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ --- 1171,1175 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@install_wxluasocket_dll_headers: @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir) ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ if test ! -d $(DESTDIR)$(includedir)/`dirname $$f` ; then \ @COND_SHARED_1_USE_WXLUASOCKET_1@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ *************** *** 1183,1187 **** @COND_SHARED_1_USE_WXLUASOCKET_1@uninstall_wxluasocket_dll_headers: ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldbgio.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXLUASOCKET_1@ done --- 1179,1183 ---- @COND_SHARED_1_USE_WXLUASOCKET_1@uninstall_wxluasocket_dll_headers: ! @COND_SHARED_1_USE_WXLUASOCKET_1@ for f in wxluasocket/include/wxlsock.h wxluasocket/include/wxldserv.h wxluasocket/include/wxluasocketdefs.h wxluasocket/include/wxldtarg.h wxluasocket/include/dservice.h wxluasocket/include/wxlhandl.h wxluasocket/include/wxluasocket_bind.h; do \ @COND_SHARED_1_USE_WXLUASOCKET_1@ rm -f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_WXLUASOCKET_1@ done *************** *** 1590,1596 **** $(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(top_srcdir)/modules/wxlua/src/wxlstate.cpp - wxlua_lib_internal.o: $(top_srcdir)/modules/wxlua/src/internal.cpp - $(CXXC) -c -o $@ $(WXLUA_LIB_CXXFLAGS) $(top_srcdir)/modules/wxlua/src/internal.cpp - wxlua_dll_wxlcallb.o: $(top_srcdir)/modules/wxlua/src/wxlcallb.cpp $(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(top_srcdir)/modules/wxlua/src/wxlcallb.cpp --- 1586,1589 ---- *************** *** 1602,1608 **** $(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(top_srcdir)/modules/wxlua/src/wxlstate.cpp - wxlua_dll_internal.o: $(top_srcdir)/modules/wxlua/src/internal.cpp - $(CXXC) -c -o $@ $(WXLUA_DLL_CXXFLAGS) $(top_srcdir)/modules/wxlua/src/internal.cpp - wxbind_lib_wxlua.o: $(top_srcdir)/modules/wxbind/src/wxlua.cpp $(CXXC) -c -o $@ $(WXBIND_LIB_CXXFLAGS) $(top_srcdir)/modules/wxbind/src/wxlua.cpp --- 1595,1598 ---- *************** *** 1824,1830 **** $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxlhandl.cpp - wxluasocket_lib_wxldbgio.o: $(top_srcdir)/modules/wxluasocket/src/wxldbgio.cpp - $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxldbgio.cpp - wxluasocket_lib_wxldtarg.o: $(top_srcdir)/modules/wxluasocket/src/wxldtarg.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_LIB_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxldtarg.cpp --- 1814,1817 ---- *************** *** 1848,1854 **** $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxlhandl.cpp - wxluasocket_dll_wxldbgio.o: $(top_srcdir)/modules/wxluasocket/src/wxldbgio.cpp - $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxldbgio.cpp - wxluasocket_dll_wxldtarg.o: $(top_srcdir)/modules/wxluasocket/src/wxldtarg.cpp $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(top_srcdir)/modules/wxluasocket/src/wxldtarg.cpp --- 1835,1838 ---- |
|
From: Francesco M. <fr...@us...> - 2006-09-15 16:24:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9387/modules/wxlua/src Removed Files: internal.cpp Log Message: removed unused files --- internal.cpp DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-09-15 16:24:40
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9387 Modified Files: Makefile.in Log Message: removed unused files Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Makefile.in 20 May 2006 13:12:33 -0000 1.17 --- Makefile.in 15 Sep 2006 16:24:35 -0000 1.18 *************** *** 35,42 **** install: all install_modules $(__install_apps___depname) samples desktop mime icon $(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig ! (cd .$(top_builddir)/ ; $(INSTALL_DATA) build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig) uninstall: uninstall_modules $(__uninstall_apps___depname) - (cd $(DESTDIR)$(libdir)/pkgconfig ; rm -f wxlua.pc) install-strip: install install-strip_modules $(__install_strip_apps___depname) --- 35,41 ---- install: all install_modules $(__install_apps___depname) samples desktop mime icon $(INSTALL_DIR) $(DESTDIR)$(libdir)/pkgconfig ! $(INSTALL_DATA) $(top_builddir)build/autoconf/wxlua.pc $(DESTDIR)$(libdir)/pkgconfig uninstall: uninstall_modules $(__uninstall_apps___depname) install-strip: install install-strip_modules $(__install_strip_apps___depname) *************** *** 53,56 **** --- 52,56 ---- rm -f ./modules/Makefile rm -f ./apps/Makefile + rm -f $(top_builddir)build/autoconf/wxlua.pc $(top_builddir)lib: *************** *** 86,90 **** samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/debugtest.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ --- 86,90 ---- samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/debugtest.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ |
|
From: Francesco M. <fr...@us...> - 2006-09-15 16:24:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9387/modules/wxluasocket/src Removed Files: wxldbgio.cpp Log Message: removed unused files --- wxldbgio.cpp DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-09-15 16:24:39
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9387/modules/wxlua/include Removed Files: internal.h Log Message: removed unused files --- internal.h DELETED --- |
|
From: Francesco M. <fr...@us...> - 2006-09-15 10:10:36
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27157 Modified Files: index.php Log Message: trying to fix stack order Index: index.php =================================================================== RCS file: /cvsroot/wxlua/website/index.php,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** index.php 19 Jul 2006 19:09:02 -0000 1.19 --- index.php 15 Sep 2006 10:10:33 -0000 1.20 *************** *** 8,15 **** <!-- ##### News sidebar ##### --> ! <div class="rightSideBar"> <p class="sideBarTitle">News</p> ! <!-- we want this box to be always on top of others --> ! <div class="sideBarText" style="z-index: 1000"><?php include_once("news.inc.php"); ?></div> </div> --- 8,15 ---- <!-- ##### News sidebar ##### --> ! <!-- we want this box to be always on top of others --> ! <div class="rightSideBar" style="z-index: 1000"> <p class="sideBarTitle">News</p> ! <div class="sideBarText"><?php include_once("news.inc.php"); ?></div> </div> *************** *** 29,33 **** <p>Want an example of how easy it is to write a cross-platform GUI? Here is a simple lua script which creates a wxFrame top level window and a menubar, just add your program to it:</p> ! <?php include_once("luasample.lua.html"); ?> <p>Easy, isn't it ? You can see more samples <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/samples/">here</a>.</p> --- 29,33 ---- <p>Want an example of how easy it is to write a cross-platform GUI? Here is a simple lua script which creates a wxFrame top level window and a menubar, just add your program to it:</p> ! <div style="z-index: 0"><?php include_once("luasample.lua.html"); ?></div> <p>Easy, isn't it ? You can see more samples <a href="http://wxlua.cvs.sourceforge.net/wxlua/wxLua/samples/">here</a>.</p> |
|
From: John L. <jr...@us...> - 2006-09-15 00:14:54
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24638/wxLua/apps/wxluaedit/src Modified Files: wxluaedit.cpp Log Message: update for debug socket changes Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxluaedit.cpp 7 Sep 2006 04:20:54 -0000 1.22 --- wxluaedit.cpp 15 Sep 2006 00:14:51 -0000 1.23 *************** *** 85,91 **** void OnLua(wxLuaEvent &event); ! void OnDebugStackEnum(wxLuaDebugEvent &event); ! void OnDebugTableEnum(wxLuaDebugEvent &event); ! void OnDebugStackEntryEnum(wxLuaDebugEvent &event); void DisplayError(const wxString &strError) const; --- 85,91 ---- void OnLua(wxLuaEvent &event); ! void OnDebugStackEnum(wxLuaDebuggerEvent &event); ! void OnDebugTableEnum(wxLuaDebuggerEvent &event); ! void OnDebugStackEntryEnum(wxLuaDebuggerEvent &event); void DisplayError(const wxString &strError) const; *************** *** 155,161 **** EVT_LUA_DEBUG_HOOK (ID_WXLUASTATE_DEBUG, wxLuaEditorApp::OnLua) ! EVT_WXLUA_DEBUG_STACK_ENUM( wxLuaEditorApp::OnDebugStackEnum) ! EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(wxLuaEditorApp::OnDebugStackEntryEnum) ! EVT_WXLUA_DEBUG_TABLE_ENUM( wxLuaEditorApp::OnDebugTableEnum) END_EVENT_TABLE() --- 155,161 ---- EVT_LUA_DEBUG_HOOK (ID_WXLUASTATE_DEBUG, wxLuaEditorApp::OnLua) ! EVT_WXLUA_DEBUGGER_STACK_ENUM( wxLuaEditorApp::OnDebugStackEnum) ! EVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM(wxLuaEditorApp::OnDebugStackEntryEnum) ! EVT_WXLUA_DEBUGGER_TABLE_ENUM( wxLuaEditorApp::OnDebugTableEnum) END_EVENT_TABLE() *************** *** 172,177 **** #endif // defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3) ! wxLuaDebugServer::SetProgramName(argv[0]); ! wxLuaDebugServer::SetNetworkName(wxGetHostName()); wxInitAllImageHandlers(); --- 172,177 ---- #endif // defined(__WXMSW__) && wxCHECK_VERSION(2, 3, 3) ! wxLuaDebuggerServer::SetProgramName(argv[0]); ! wxLuaDebuggerServer::SetNetworkName(wxGetHostName()); wxInitAllImageHandlers(); *************** *** 374,378 **** } ! void wxLuaEditorApp::OnDebugStackEnum(wxLuaDebugEvent &event) { if (wxLuaHandler::GetHandler().GetStackDialog() != NULL) --- 374,378 ---- } ! void wxLuaEditorApp::OnDebugStackEnum(wxLuaDebuggerEvent &event) { if (wxLuaHandler::GetHandler().GetStackDialog() != NULL) *************** *** 382,386 **** } ! void wxLuaEditorApp::OnDebugStackEntryEnum(wxLuaDebugEvent &event) { if (wxLuaHandler::GetHandler().GetStackDialog() != NULL) --- 382,386 ---- } ! void wxLuaEditorApp::OnDebugStackEntryEnum(wxLuaDebuggerEvent &event) { if (wxLuaHandler::GetHandler().GetStackDialog() != NULL) *************** *** 390,394 **** } ! void wxLuaEditorApp::OnDebugTableEnum(wxLuaDebugEvent &event) { if (wxLuaHandler::GetHandler().GetStackDialog() != NULL) --- 390,394 ---- } ! void wxLuaEditorApp::OnDebugTableEnum(wxLuaDebuggerEvent &event) { if (wxLuaHandler::GetHandler().GetStackDialog() != NULL) |
|
From: John L. <jr...@us...> - 2006-09-15 00:11:13
|
Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23109/wxLua/bindings/wxluasocket Modified Files: override.hpp wxluasocket.i Log Message: rename EVT_WXLUA_DEBUG_XXX to EVT_WXLUA_DEBUGGER since that's what they apply to rename wxEVT_WXLUA_DEBUG_XXX to wxEVT_WXLUA_DEBUGGER_XXX wxLuaDebugEvent renamed to wxLuaDebuggerEvent rename wxLUASOCKET_DEBUG_EVENT_XXX to wxLUASOCKET_DEBUGGEE_EVENT_XXX rename wxLUASOCKET_DEBUG_CMD_XXX to wxLUASOCKET_DEBUGGER_CMD_XXX make all wxLuaSocketBase::ReadXXX functions return bool for success checking rename wxLuaDebugServer to wxLuaDebuggerServer Index: wxluasocket.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxluasocket.i 7 Sep 2006 22:42:19 -0000 1.3 --- wxluasocket.i 15 Sep 2006 00:10:55 -0000 1.4 *************** *** 19,25 **** %include "wxluasocket/include/wxldserv.h" ! %class %delete %noclassinfo wxLuaDebugServer ! wxLuaDebugServer(int portNumber) ! %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName) bool StartClient() --- 19,25 ---- %include "wxluasocket/include/wxldserv.h" ! %class %delete %noclassinfo wxLuaDebuggerServer ! wxLuaDebuggerServer(int portNumber) ! %constructor wxLuaDebuggerServerCompile(const wxString &buffer, const wxString &fileName) bool StartClient() *************** *** 46,61 **** //----------------------------------------------------------------------------- ! // wxLuaDebugEvent ! %class %delete wxLuaDebugEvent, wxEvent ! %define %event wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED ! %define %event wxEVT_WXLUA_DEBUG_BREAK ! %define %event wxEVT_WXLUA_DEBUG_PRINT ! %define %event wxEVT_WXLUA_DEBUG_ERROR ! %define %event wxEVT_WXLUA_DEBUG_EXIT ! %define %event wxEVT_WXLUA_DEBUG_STACK_ENUM ! %define %event wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM ! %define %event wxEVT_WXLUA_DEBUG_TABLE_ENUM ! %define %event wxEVT_WXLUA_DEBUG_EVALUATE_EXPR int GetLineNumber() const --- 46,61 ---- //----------------------------------------------------------------------------- ! // wxLuaDebuggerEvent ! %class %delete wxLuaDebuggerEvent, wxEvent ! %define %event wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED ! %define %event wxEVT_WXLUA_DEBUGGER_BREAK ! %define %event wxEVT_WXLUA_DEBUGGER_PRINT ! %define %event wxEVT_WXLUA_DEBUGGER_ERROR ! %define %event wxEVT_WXLUA_DEBUGGER_EXIT ! %define %event wxEVT_WXLUA_DEBUGGER_STACK_ENUM ! %define %event wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM ! %define %event wxEVT_WXLUA_DEBUGGER_TABLE_ENUM ! %define %event wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR int GetLineNumber() const Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/override.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** override.hpp 6 Sep 2006 22:23:18 -0000 1.2 --- override.hpp 15 Sep 2006 00:10:55 -0000 1.3 *************** *** 1,5 **** ! %override wxLua_wxLuaDebugServerCompile_constructor ! // %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName) ! static int LUACALL wxLua_wxLuaDebugServerCompile_constructor(lua_State *L) { wxLuaState wxlState(L); --- 1,5 ---- ! %override wxLua_wxLuaDebuggerServerCompile_constructor ! // %constructor wxLua_wxLuaDebuggerServerCompile_constructor(const wxString &buffer, const wxString &fileName) ! static int LUACALL wxLua_wxLuaDebuggerServerCompile_constructor(lua_State *L) { wxLuaState wxlState(L); |
|
From: John L. <jr...@us...> - 2006-09-15 00:11:03
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23109/wxLua/modules/wxluadebug/include Modified Files: wxldebug.h Log Message: rename EVT_WXLUA_DEBUG_XXX to EVT_WXLUA_DEBUGGER since that's what they apply to rename wxEVT_WXLUA_DEBUG_XXX to wxEVT_WXLUA_DEBUGGER_XXX wxLuaDebugEvent renamed to wxLuaDebuggerEvent rename wxLUASOCKET_DEBUG_EVENT_XXX to wxLUASOCKET_DEBUGGEE_EVENT_XXX rename wxLUASOCKET_DEBUG_CMD_XXX to wxLUASOCKET_DEBUGGER_CMD_XXX make all wxLuaSocketBase::ReadXXX functions return bool for success checking rename wxLuaDebugServer to wxLuaDebuggerServer Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxldebug.h 13 Sep 2006 04:13:47 -0000 1.23 --- wxldebug.h 15 Sep 2006 00:10:55 -0000 1.24 *************** *** 6,15 **** // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// ! // Ray Gilbert moved class definitions out of wxLuaDebugServer, wxLuaDebugIO // to allow alternate debugger model // // Original Debugging Model: ! // wxLuaDebugServer, wxLuaDebugTarget ! // The current process acts as a server - debugger (wxLuaDebugServer) // starts a new process which starts up as a client - debuggee (wxLuaDebugTarget) // that connects back to server process. --- 6,15 ---- // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// ! // Ray Gilbert moved class definitions out of wxLuaDebuggerServer, wxLuaDebugIO // to allow alternate debugger model // // Original Debugging Model: ! // wxLuaDebuggerServer, wxLuaDebugTarget ! // The current process acts as a server - debugger (wxLuaDebuggerServer) // starts a new process which starts up as a client - debuggee (wxLuaDebugTarget) // that connects back to server process. *************** *** 149,153 **** virtual wxLuaDebugData GetGlobalData(); ! // allows for this to be subclassed for use with the wxLuaDebugServer virtual bool IsDebugServer() const { return false; } --- 149,153 ---- virtual wxLuaDebugData GetGlobalData(); ! // allows for this to be subclassed for use with the wxLuaDebuggerServer virtual bool IsDebugServer() const { return false; } |
|
From: John L. <jr...@us...> - 2006-09-15 00:11:02
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23109/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h wxldtarg.h wxlhandl.h wxlsock.h wxluasocket_bind.h Log Message: rename EVT_WXLUA_DEBUG_XXX to EVT_WXLUA_DEBUGGER since that's what they apply to rename wxEVT_WXLUA_DEBUG_XXX to wxEVT_WXLUA_DEBUGGER_XXX wxLuaDebugEvent renamed to wxLuaDebuggerEvent rename wxLUASOCKET_DEBUG_EVENT_XXX to wxLUASOCKET_DEBUGGEE_EVENT_XXX rename wxLUASOCKET_DEBUG_CMD_XXX to wxLUASOCKET_DEBUGGER_CMD_XXX make all wxLuaSocketBase::ReadXXX functions return bool for success checking rename wxLuaDebugServer to wxLuaDebuggerServer Index: wxlhandl.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlhandl.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wxlhandl.h 7 Sep 2006 04:20:54 -0000 1.8 --- wxlhandl.h 15 Sep 2006 00:10:56 -0000 1.9 *************** *** 19,23 **** #include "wxluasocket/include/wxluasocketdefs.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent; class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog; --- 19,23 ---- #include "wxluasocket/include/wxluasocketdefs.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerEvent; class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog; Index: wxlsock.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxlsock.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxlsock.h 13 Sep 2006 04:13:47 -0000 1.11 --- wxlsock.h 15 Sep 2006 00:10:56 -0000 1.12 *************** *** 62,71 **** // Read data from the socket, calls virtual int Read(...) ! unsigned char ReadByte(); ! wxInt32 ReadInt32(); ! wxUint32 ReadUInt32(); ! long ReadLong(); ! wxString ReadString(); ! wxLuaDebugData ReadDebugData(); // Write data to the socket, calls virtual void Write(...) --- 62,71 ---- // Read data from the socket, calls virtual int Read(...) ! bool ReadByte(unsigned char& value); ! bool ReadInt32(wxInt32& value); ! bool ReadUInt32(wxUint32& value); ! bool ReadLong(long& value); ! bool ReadString(wxString& value); ! bool ReadDebugData(wxLuaDebugData& data); // Write data to the socket, calls virtual void Write(...) Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxluasocket_bind.h 7 Sep 2006 22:42:19 -0000 1.5 --- wxluasocket_bind.h 15 Sep 2006 00:10:56 -0000 1.6 *************** *** 57,62 **** // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebugEvent; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebugServer; --- 57,62 ---- // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerEvent; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerServer; *************** *** 66,73 **** // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebugEvent_methods; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebugEvent_methodCount; ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebugServer_methods; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebugServer_methodCount; --- 66,73 ---- // ---------------------------------------------------------------------------- ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebuggerEvent_methods; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; ! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD* wxLuaDebuggerServer_methods; ! extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; Index: wxldtarg.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxldtarg.h 13 Sep 2006 04:13:47 -0000 1.15 --- wxldtarg.h 15 Sep 2006 00:10:56 -0000 1.16 *************** *** 21,25 **** // ---------------------------------------------------------------------------- ! // wxLuaDebugTarget - a C++ socket target that the wxLuaDebugServer run in lua // communicates with. Handles the Debugger/Debuggee IO // ---------------------------------------------------------------------------- --- 21,25 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebugTarget - a C++ socket target that the wxLuaDebuggerServer run in lua // communicates with. Handles the Debugger/Debuggee IO // ---------------------------------------------------------------------------- Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxldserv.h 13 Sep 2006 04:13:47 -0000 1.13 --- wxldserv.h 15 Sep 2006 00:10:56 -0000 1.14 *************** *** 19,82 **** #include "wxluasocket/include/wxlsock.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServer; ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent; class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog; // ---------------------------------------------------------------------------- ! // wxLuaScoketDebugEvents_Type // ---------------------------------------------------------------------------- ! enum wxLuaScoketDebugEvents_Type { ! wxLUASOCKET_DEBUG_EVENT_NONE = 0, - wxLUASOCKET_DEBUG_EVENT_BREAK, - wxLUASOCKET_DEBUG_EVENT_PRINT, - wxLUASOCKET_DEBUG_EVENT_ERROR, - wxLUASOCKET_DEBUG_EVENT_EXIT, - wxLUASOCKET_DEBUG_EVENT_STACK_ENUM, - wxLUASOCKET_DEBUG_EVENT_STACK_ENTRY_ENUM, - wxLUASOCKET_DEBUG_EVENT_TABLE_ENUM, - wxLUASOCKET_DEBUG_EVENT_EVALUATE_EXPR, - wxLUASOCKET_DEBUG_EVENT_BREAKPOINT_ADDED, - wxLUASOCKET_DEBUG_EVENT_BREAKPOINT_REMOVED }; // ---------------------------------------------------------------------------- ! // wxLuaSocketDebugCommands_Type // ---------------------------------------------------------------------------- ! enum wxLuaSocketDebugCommands_Type { ! wxLUASOCKET_DEBUG_CMD_NONE = 0, ! wxLUASOCKET_DEBUG_CMD_ADD_BREAKPOINT = 100, ! wxLUASOCKET_DEBUG_CMD_REMOVE_BREAKPOINT, ! wxLUASOCKET_DEBUG_CMD_CLEAR_ALL_BREAKPOINTS, ! wxLUASOCKET_DEBUG_CMD_RUN_BUFFER, ! wxLUASOCKET_DEBUG_CMD_DEBUG_STEP, ! wxLUASOCKET_DEBUG_CMD_DEBUG_STEPOVER, ! wxLUASOCKET_DEBUG_CMD_DEBUG_STEPOUT, ! wxLUASOCKET_DEBUG_CMD_DEBUG_CONTINUE, ! wxLUASOCKET_DEBUG_CMD_DEBUG_BREAK, ! wxLUASOCKET_DEBUG_CMD_ENUMERATE_STACK, ! wxLUASOCKET_DEBUG_CMD_ENUMERATE_STACK_ENTRY, ! wxLUASOCKET_DEBUG_CMD_ENUMERATE_TABLE_REF, ! wxLUASOCKET_DEBUG_CMD_EVALUATE_EXPR, ! wxLUASOCKET_DEBUG_CMD_RESET, ! wxLUASOCKET_DEBUG_CMD_CLEAR_DEBUG_REFERENCES, ! wxLUASOCKET_DEBUG_CMD_DISABLE_BREAKPOINT, ! wxLUASOCKET_DEBUG_CMD_ENABLE_BREAKPOINT }; // ---------------------------------------------------------------------------- ! // wxLuaDebugServerInterface - a wxLuaInterface for the wxLuaDebugServer // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServerInterface : public wxLuaInterface { public: ! wxLuaDebugServerInterface(wxLuaDebugServer* server); ! virtual ~wxLuaDebugServerInterface(); virtual wxLuaDebugData EnumerateStack(); --- 19,83 ---- #include "wxluasocket/include/wxlsock.h" ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerServer; ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerEvent; class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog; // ---------------------------------------------------------------------------- ! // wxLuaSocketDebuggeeEvents_Type - socket events sent from debuggee to debugger // ---------------------------------------------------------------------------- ! enum wxLuaSocketDebuggeeEvents_Type { ! wxLUASOCKET_DEBUGGEE_EVENT_NONE = 0, // a socket error probably ! ! wxLUASOCKET_DEBUGGEE_EVENT_BREAK, ! wxLUASOCKET_DEBUGGEE_EVENT_PRINT, ! wxLUASOCKET_DEBUGGEE_EVENT_ERROR, ! wxLUASOCKET_DEBUGGEE_EVENT_EXIT, ! wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENUM, ! wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENTRY_ENUM, ! wxLUASOCKET_DEBUGGEE_EVENT_TABLE_ENUM, ! wxLUASOCKET_DEBUGGEE_EVENT_EVALUATE_EXPR, ! wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_ADDED, ! wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_REMOVED, }; // ---------------------------------------------------------------------------- ! // wxLuaSocketDebuggerCommands_Type - socket commands sent from debugger to debuggee // ---------------------------------------------------------------------------- ! enum wxLuaSocketDebuggerCommands_Type { ! wxLUASOCKET_DEBUGGER_CMD_NONE = 0, // a socket error probably ! wxLUASOCKET_DEBUGGER_CMD_ADD_BREAKPOINT = 100, ! wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT, ! wxLUASOCKET_DEBUGGER_CMD_CLEAR_ALL_BREAKPOINTS, ! wxLUASOCKET_DEBUGGER_CMD_RUN_BUFFER, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEP, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOVER, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOUT, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE, ! wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK, ! wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK, ! wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK_ENTRY, ! wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_TABLE_REF, ! wxLUASOCKET_DEBUGGER_CMD_EVALUATE_EXPR, ! wxLUASOCKET_DEBUGGER_CMD_RESET, ! wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES, ! wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT, ! wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT }; // ---------------------------------------------------------------------------- ! // wxLuaDebuggerServerInterface - a wxLuaInterface for the wxLuaDebuggerServer // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerServerInterface : public wxLuaInterface { public: ! wxLuaDebuggerServerInterface(wxLuaDebuggerServer* server); ! virtual ~wxLuaDebuggerServerInterface(); virtual wxLuaDebugData EnumerateStack(); *************** *** 88,92 **** private: ! wxLuaDebugServer* m_pServer; }; --- 89,93 ---- private: ! wxLuaDebuggerServer* m_pServer; }; *************** *** 123,127 **** virtual void NotifyError(const wxString &msg); ! virtual int HandleDebugEvent(wxLuaScoketDebugEvents_Type event_type); virtual wxLuaSocketBase* GetSocketBase() { return NULL; } --- 124,128 ---- virtual void NotifyError(const wxString &msg); ! virtual int HandleDebugEvent(wxLuaSocketDebuggeeEvents_Type event_type); virtual wxLuaSocketBase* GetSocketBase() { return NULL; } *************** *** 132,160 **** // ---------------------------------------------------------------------------- ! // wxLuaDebugServer - a socket server for a lua program to communicate with a // wxLuaDebugTarget run in C++. // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugServer : public wxLuaDebuggerBase { protected: // ---------------------------------------------------------------------------- ! // wxLuaDebugServer::LuaThread - a wxThread for the wxLuaDebugServer // ---------------------------------------------------------------------------- class LuaThread : public wxThread { public: ! LuaThread(wxLuaDebugServer *pServer) : wxThread(wxTHREAD_JOINABLE), ! m_pServer(pServer) {} protected: virtual void *Entry(); // thread execution starts here virtual void OnExit() {} // called when the thread exits ! wxLuaDebugServer *m_pServer; }; public: ! wxLuaDebugServer(int portNumber); ! virtual ~wxLuaDebugServer(); // Set the program and network name to start the wxLua target with --- 133,161 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebuggerServer - a socket server for a lua program to communicate with a // wxLuaDebugTarget run in C++. // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerServer : public wxLuaDebuggerBase { protected: // ---------------------------------------------------------------------------- ! // wxLuaDebuggerServer::LuaThread - a wxThread for the wxLuaDebuggerServer // ---------------------------------------------------------------------------- class LuaThread : public wxThread { public: ! LuaThread(wxLuaDebuggerServer *pServer) : wxThread(wxTHREAD_JOINABLE), ! m_pServer(pServer) {} protected: virtual void *Entry(); // thread execution starts here virtual void OnExit() {} // called when the thread exits ! wxLuaDebuggerServer *m_pServer; }; public: ! wxLuaDebuggerServer(int portNumber); ! virtual ~wxLuaDebuggerServer(); // Set the program and network name to start the wxLua target with *************** *** 182,186 **** int m_portNumber; wxProcess *m_pProcess; ! wxLuaDebugServer::LuaThread *m_pThread; wxLuaStackDialog *m_pStackDialog; bool m_fShutdown; --- 183,187 ---- int m_portNumber; wxProcess *m_pProcess; ! wxLuaDebuggerServer::LuaThread *m_pThread; wxLuaStackDialog *m_pStackDialog; bool m_fShutdown; *************** *** 190,210 **** private: ! DECLARE_ABSTRACT_CLASS(wxLuaDebugServer) }; // ---------------------------------------------------------------------------- ! // wxLuaDebugEvent // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent : public wxEvent { public: ! wxLuaDebugEvent(const wxLuaDebugEvent& event); ! wxLuaDebugEvent(int eventType = wxEVT_NULL, ! int lineNumber = 0, ! const wxString &fileName = wxEmptyString, ! bool enabledFlag = false); ! virtual ~wxLuaDebugEvent(); void SetMessage(const wxString &message); --- 191,211 ---- private: ! DECLARE_ABSTRACT_CLASS(wxLuaDebuggerServer) }; // ---------------------------------------------------------------------------- ! // wxLuaDebuggerEvent // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerEvent : public wxEvent { public: ! wxLuaDebuggerEvent(const wxLuaDebuggerEvent& event); ! wxLuaDebuggerEvent(wxEventType eventType = wxEVT_NULL, ! int lineNumber = 0, ! const wxString &fileName = wxEmptyString, ! bool enabledFlag = false); ! virtual ~wxLuaDebuggerEvent(); void SetMessage(const wxString &message); *************** *** 214,223 **** wxString GetFileName() const { return m_fileName; } wxString GetMessage() const { return m_strMessage; } ! int GetReference() const { return m_nReference; } bool GetEnabledFlag() const { return m_fEnabledFlag; } wxLuaDebugData GetDebugData() const { return m_debugData; } protected: ! virtual wxEvent* Clone() const { return new wxLuaDebugEvent(*this); } int m_lineNumber; --- 215,224 ---- 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: ! virtual wxEvent* Clone() const { return new wxLuaDebuggerEvent(*this); } int m_lineNumber; *************** *** 230,270 **** private: ! DECLARE_DYNAMIC_CLASS(wxLuaDebugEvent) }; ! typedef void (wxEvtHandler::*wxLuaDebugEventFunction)(wxLuaDebugEvent&); BEGIN_DECLARE_EVENT_TYPES() ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, 2510) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAK, 2511) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_PRINT, 2512) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_ERROR, 2513) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_EXIT, 2514) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STACK_ENUM, 2515) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM, 2516) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_TABLE_ENUM, 2517) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, 2518) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STARTDEBUGGER, 2519) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_STOPDEBUGGER, 2520) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, 2521) ! DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_WXLUASOCKET, wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, 2522) END_DECLARE_EVENT_TYPES() ! #define wxLuaDebugEventHandler(func) \ ! (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxLuaDebugEventFunction, &func) ! #define EVT_WXLUA_DEBUG_CLIENT_CONNECTED(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_BREAK(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAK, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_PRINT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_PRINT, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_ERROR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_ERROR, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_EXIT(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_EXIT, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_STACK_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STACK_ENUM, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_TABLE_ENUM(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_TABLE_ENUM, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_EVALUATE_EXPR(id, fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, id, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_STARTDEBUGGER(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STARTDEBUGGER, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_STOPDEBUGGER(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_STOPDEBUGGER, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_BREAKPOINT_ADDED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), ! #define EVT_WXLUA_DEBUG_BREAKPOINT_REMOVED(fn) DECLARE_EVENT_TABLE_ENTRY(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, -1, -1, wxLuaDebugEventHandler(fn), (wxObject *) NULL), #endif // WX_LUA_DEBUG_SERVER_H --- 231,271 ---- private: ! DECLARE_DYNAMIC_CLASS(wxLuaDebuggerEvent) }; ! typedef void (wxEvtHandler::*wxLuaDebuggerEventFunction)(wxLuaDebuggerEvent&); 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() ! #define wxLuaDebuggerEventHandler(func) \ ! (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 |
|
From: John L. <jr...@us...> - 2006-09-15 00:11:00
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23109/wxLua/samples Modified Files: editor.wx.lua Log Message: rename EVT_WXLUA_DEBUG_XXX to EVT_WXLUA_DEBUGGER since that's what they apply to rename wxEVT_WXLUA_DEBUG_XXX to wxEVT_WXLUA_DEBUGGER_XXX wxLuaDebugEvent renamed to wxLuaDebuggerEvent rename wxLUASOCKET_DEBUG_EVENT_XXX to wxLUASOCKET_DEBUGGEE_EVENT_XXX rename wxLUASOCKET_DEBUG_CMD_XXX to wxLUASOCKET_DEBUGGER_CMD_XXX make all wxLuaSocketBase::ReadXXX functions return bool for success checking rename wxLuaDebugServer to wxLuaDebuggerServer Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** editor.wx.lua 7 Sep 2006 04:20:54 -0000 1.19 --- editor.wx.lua 15 Sep 2006 00:10:56 -0000 1.20 *************** *** 73,77 **** fHaveFound = nil -- true when string has been found editorApp = wx.wxGetApp() ! debugServer = nil -- wxLuaDebugServer object when debugging fIsRunning = nil -- true when the debuggee is running fIsConnected = nil -- true when a client has connected --- 73,77 ---- fHaveFound = nil -- true when string has been found editorApp = wx.wxGetApp() ! debugServer = nil -- wxLuaDebuggerServer object when debugging fIsRunning = nil -- true when the debuggee is running fIsConnected = nil -- true when a client has connected *************** *** 1519,1523 **** frame:Connect(ID_ATTACH_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED, function ( event ) ! debugServer = wx.wxLuaDebugServer(portNumber) if debugServer then debugServer:StartServerThread() --- 1519,1523 ---- frame:Connect(ID_ATTACH_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED, function ( event ) ! debugServer = wx.wxLuaDebuggerServer(portNumber) if debugServer then debugServer:StartServerThread() *************** *** 1563,1567 **** frame:Connect(ID_START_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED, function ( event ) ! debugServer = wx.wxLuaDebugServer(portNumber) if debugServer then debugServer:StartClient() --- 1563,1567 ---- frame:Connect(ID_START_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED, function ( event ) ! debugServer = wx.wxLuaDebuggerServer(portNumber) if debugServer then debugServer:StartClient() *************** *** 1583,1587 **** local id = editor:GetId() local filePath = makeDebugFileName(editor, openDocuments[id].filePath) ! wx.wxLuaDebugServerCompile(filePath, editorText) end) frame:Connect(ID_COMPILE, wx.wxEVT_UPDATE_UI, --- 1583,1587 ---- local id = editor:GetId() local filePath = makeDebugFileName(editor, openDocuments[id].filePath) ! wx.wxLuaDebuggerServerCompile(filePath, editorText) end) frame:Connect(ID_COMPILE, wx.wxEVT_UPDATE_UI, *************** *** 1719,1723 **** end) ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, function (event) if debugServer then --- 1719,1723 ---- end) ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, function (event) if debugServer then *************** *** 1746,1750 **** end ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUG_BREAK, function (event) if exitingProgram then return end --- 1746,1750 ---- end ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_BREAK, function (event) if exitingProgram then return end *************** *** 1821,1835 **** end ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUG_PRINT, function (event) displayOutput(event:GetMessage().."\n") end) ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUG_ERROR, function (event) displayOutput(event:GetMessage().."\n") end) ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUG_EXIT, function (event) for id, document in pairs(openDocuments) do --- 1821,1835 ---- end ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_PRINT, function (event) displayOutput(event:GetMessage().."\n") end) ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_ERROR, function (event) displayOutput(event:GetMessage().."\n") end) ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_EXIT, function (event) for id, document in pairs(openDocuments) do *************** *** 1848,1852 **** end) ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, function (event) if watchListCtrl then --- 1848,1852 ---- end) ! editorApp:Connect(wx.wxID_ANY, wx.wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, function (event) if watchListCtrl then |
