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...> - 2007-07-02 01:37:14
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18643/website Modified Files: download.php Log Message: Update download for 2.8.4.1 Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** download.php 1 Jul 2007 00:10:22 -0000 1.25 --- download.php 2 Jul 2007 01:37:11 -0000 1.26 *************** *** 10,25 **** // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.8.4.0"; $apsize="9.6"; // size of the wxlua-xxx.package file (in MB) $bundlesize="16.9"; // size of the wxlua-xxx.dmg file (in MB) ! $winlink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.0-MSW_bin.zip?use_mirror=osdn"; ! $dlllink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.0-MSW_dll.zip?use_mirror=osdn"; $linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package?download"; $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-tiger.dmg?download"; ! $gzlink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.0.tar.gz?use_mirror=osdn"; ?> --- 10,25 ---- // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.8.4.1"; $apsize="9.6"; // size of the wxlua-xxx.package file (in MB) $bundlesize="16.9"; // size of the wxlua-xxx.dmg file (in MB) ! $winlink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.1-MSW_bin.zip?use_mirror=osdn"; ! $dlllink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.1-MSW_dll.zip?use_mirror=osdn"; $linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package?download"; $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-tiger.dmg?download"; ! $gzlink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.1.tar.gz?use_mirror=osdn"; ?> |
|
From: John L. <jr...@us...> - 2007-07-02 01:00:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4490/wxLua/modules/wxlua/include Modified Files: wxldefs.h Log Message: Bump version to 2.8.4.1 Fix media.wx.lua for MSW Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxldefs.h 16 Jun 2007 06:21:46 -0000 1.27 --- wxldefs.h 2 Jul 2007 01:00:16 -0000 1.28 *************** *** 39,44 **** #define wxLUA_MINOR_VERSION 8 #define wxLUA_RELEASE_NUMBER 4 ! #define wxLUA_SUBRELEASE_NUMBER 0 ! #define wxLUA_VERSION_STRING wxT("wxLua 2.8.4.0") // For non-Unix systems (i.e. when building without a configure script), --- 39,44 ---- #define wxLUA_MINOR_VERSION 8 #define wxLUA_RELEASE_NUMBER 4 ! #define wxLUA_SUBRELEASE_NUMBER 1 ! #define wxLUA_VERSION_STRING wxT("wxLua 2.8.4.1") // For non-Unix systems (i.e. when building without a configure script), |
|
From: John L. <jr...@us...> - 2007-07-02 01:00:19
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4490/wxLua/samples Modified Files: media.wx.lua Log Message: Bump version to 2.8.4.1 Fix media.wx.lua for MSW Index: media.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/media.wx.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** media.wx.lua 2 Jul 2007 00:11:43 -0000 1.1 --- media.wx.lua 2 Jul 2007 01:00:16 -0000 1.2 *************** *** 61,65 **** pause_ok = false stop_ok = true ! elseif state == wx.wxMEDIASTATE_STOPPED then play_ok = true pause_ok = false --- 61,65 ---- pause_ok = false stop_ok = true ! else --if state == wx.wxMEDIASTATE_STOPPED then play_ok = true pause_ok = false *************** *** 99,106 **** -- ----------------------------------------------------------------------- panel = wx.wxPanel(frame, wx.wxID_ANY) mediaCtrl = wx.wxMediaCtrl(panel, wx.wxID_ANY, "", ! wx.wxDefaultPosition, wx.wxDefaultSize) playButton = wx.wxButton(panel, ID_PLAY, "Play") --- 99,130 ---- -- ----------------------------------------------------------------------- + -- create a simple file menu + local fileMenu = wx.wxMenu() + fileMenu:Append(ID_LOADFILE, "Load media...\tCtrl+O", "Load a file to play...") + fileMenu:AppendSeparator() + fileMenu:Append(wx.wxID_EXIT, "E&xit\tCtrl+Q", "Quit the program") + + -- create a simple help menu + local helpMenu = wx.wxMenu() + helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Media Application") + + -- create a menu bar and append the file and help menus + local menuBar = wx.wxMenuBar() + menuBar:Append(fileMenu, "&File") + menuBar:Append(helpMenu, "&Help") + + -- attach the menu bar into the frame + frame:SetMenuBar(menuBar) + + -- create a simple status bar + frame:CreateStatusBar(1) + frame:SetStatusText("Welcome to wxLua.") + + -- ----------------------------------------------------------------------- + panel = wx.wxPanel(frame, wx.wxID_ANY) mediaCtrl = wx.wxMediaCtrl(panel, wx.wxID_ANY, "", ! wx.wxDefaultPosition, wx.wxSize(200, 200)) playButton = wx.wxButton(panel, ID_PLAY, "Play") *************** *** 227,252 **** -- ----------------------------------------------------------------------- - -- create a simple file menu - local fileMenu = wx.wxMenu() - fileMenu:Append(ID_LOADFILE, "Load media...\tCtrl+O", "Load a file to play...") - fileMenu:AppendSeparator() - fileMenu:Append(wx.wxID_EXIT, "E&xit\tCtrl+Q", "Quit the program") - - -- create a simple help menu - local helpMenu = wx.wxMenu() - helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Media Application") - - -- create a menu bar and append the file and help menus - local menuBar = wx.wxMenuBar() - menuBar:Append(fileMenu, "&File") - menuBar:Append(helpMenu, "&Help") - - -- attach the menu bar into the frame - frame:SetMenuBar(menuBar) - - -- create a simple status bar - frame:CreateStatusBar(1) - frame:SetStatusText("Welcome to wxLua.") - frame:Connect(ID_LOADFILE, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) --- 251,254 ---- |
|
From: John L. <jr...@us...> - 2007-07-02 01:00:19
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4490/wxLua/docs Modified Files: changelog.txt Log Message: Bump version to 2.8.4.1 Fix media.wx.lua for MSW Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** changelog.txt 26 Jun 2007 03:22:04 -0000 1.39 --- changelog.txt 2 Jul 2007 01:00:16 -0000 1.40 *************** *** 2,5 **** --- 2,14 ---- =============== + version 2.8.4.1 + -------------------------------------------------------------------- + + - Made wxLUA_USE_wxMediaCtrl and wxLUA_USE_wxGLCanvas 1 by default. + They are #if wxUSE_MEDIACTRL and wxUSE_GLCANVAS so they are only included + if the wxWidgets you compile against uses them. + - Added media.wx.lua sample to show off the wxMediaCtrl + - Fixed the argtags for integer arrays. + version 2.8.4.0 -------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-07-02 00:11:53
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18390/wxLua/samples Added Files: media.wx.lua Log Message: Add media sample --- NEW FILE: media.wx.lua --- ----------------------------------------------------------------------------- -- Name: media.wx.lua -- Purpose: wxMediaCtrl wxLua sample -- Author: John Labenski -- Modified by: -- Created: 07/01/2007 -- RCS-ID: -- Copyright: (c) 2007 John Labenski. All rights reserved. -- Licence: wxWidgets licence ----------------------------------------------------------------------------- frame = nil -- main wxFrame mediaCtrl = nil -- wxMediaCtrl player playButton = nil -- wxButton to "play" pauseButton = nil -- wxButton to "pause" stopButton = nil -- wxButton to "stop" timer = nil -- wxTimer to update position in media loadedMedia = false -- set to true if media is ok fileName = "" -- Name of the loaded file settingPos = false -- true when pos slider is being changed by user slider_range = 10000 -- all sliders have this range ID_LOADFILE = 1000 ID_PLAY = 1001 ID_PAUSE = 1002 ID_STOP = 1003 ID_VOLUME = 1004 ID_POSITON = 1005 ID_POSTEXT = 1006 -- --------------------------------------------------------------------------- -- Convert milliseconds to MM:SS -- --------------------------------------------------------------------------- function msToMMSS(ms) local m = math.floor(ms/(60*1000)) local s = math.floor((ms - m*60*1000)/1000) return string.format("%02d:%02d", m, s) end -- --------------------------------------------------------------------------- -- Update the GUI controls based on the mediaCtrl -- --------------------------------------------------------------------------- function UpdateButtons() local play_ok = false local pause_ok = false local stop_ok = false local state = mediaCtrl:GetState() if not loadedMedia then state = -1 end -- not valid to do anything if state == wx.wxMEDIASTATE_PLAYING then play_ok = false pause_ok = true stop_ok = true elseif state == wx.wxMEDIASTATE_PAUSED then play_ok = true pause_ok = false stop_ok = true elseif state == wx.wxMEDIASTATE_STOPPED then play_ok = true pause_ok = false stop_ok = false end playButton:Enable(play_ok) pauseButton:Enable(pause_ok) stopButton:Enable(stop_ok) volumeSlider:SetValue(mediaCtrl:GetVolume()*slider_range) end -- --------------------------------------------------------------------------- -- Entry point into the program -- --------------------------------------------------------------------------- function main() -- create the wxFrame window frame = wx.wxFrame( wx.NULL, -- no parent for toplevel windows wx.wxID_ANY, -- don't need a wxWindow ID "wxLua Media Demo", -- caption on the frame wx.wxDefaultPosition, -- let system place the frame wx.wxSize(450, 450), -- set the size of the frame wx.wxDEFAULT_FRAME_STYLE ) -- use default frame styles frame:Connect(wx.wxEVT_CLOSE_WINDOW, function (event) event:Skip() if timer then timer:Stop() -- always stop before exiting or deleting it timer:delete() timer = nil end end) -- ----------------------------------------------------------------------- panel = wx.wxPanel(frame, wx.wxID_ANY) mediaCtrl = wx.wxMediaCtrl(panel, wx.wxID_ANY, "", wx.wxDefaultPosition, wx.wxDefaultSize) playButton = wx.wxButton(panel, ID_PLAY, "Play") pauseButton = wx.wxButton(panel, ID_PAUSE, "Pause") stopButton = wx.wxButton(panel, ID_STOP, "Stop") volumeSlider = wx.wxSlider(panel, ID_VOLUME, slider_range, 0, slider_range) buttonSizer = wx.wxFlexGridSizer(1, 5, 5, 5) buttonSizer:AddGrowableCol(4) buttonSizer:Add(playButton, 0, 0) buttonSizer:Add(pauseButton, 0, 0) buttonSizer:Add(stopButton, 0, 0) buttonSizer:Add(wx.wxStaticText(panel, wx.wxID_ANY, "Volume : "), 0, wx.wxALIGN_CENTER_VERTICAL) buttonSizer:Add(volumeSlider, 1, wx.wxEXPAND) posSlider = wx.wxSlider(panel, ID_POSITON, 0, 0, slider_range) posText = wx.wxStaticText(panel, ID_POSTEXT, "Position 00:00/00:00 ") posSizer = wx.wxFlexGridSizer(1, 5, 5, 5) posSizer:AddGrowableCol(1) posSizer:Add(posText, 0, wx.wxALIGN_CENTER_VERTICAL) posSizer:Add(posSlider, 1, wx.wxEXPAND) mainSizer = wx.wxFlexGridSizer(2, 1, 5, 5) mainSizer:AddGrowableRow(0) mainSizer:AddGrowableCol(0) mainSizer:Add(mediaCtrl, 1, wx.wxEXPAND, 0) mainSizer:Add(buttonSizer, 0, wx.wxEXPAND, 0) mainSizer:Add(posSizer, 0, wx.wxEXPAND, 0) panel:SetSizer(mainSizer) mainSizer:SetSizeHints(frame) UpdateButtons() -- ----------------------------------------------------------------------- panel:Connect(ID_PLAY, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local ok = mediaCtrl:Play() if not ok then wx.wxMessageBox(string.format("Unable to play %s: Unsupported format?", fileName), "wxLua Media Demo", wx.wxICON_ERROR + wx.wxOK) end end ) panel:Connect(ID_PAUSE, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local ok = mediaCtrl:Pause() if not ok then wx.wxMessageBox(string.format("Unable to pause %s: Unsupported format?", fileName), "wxLua Media Demo", wx.wxICON_ERROR + wx.wxOK) end end ) panel:Connect(ID_STOP, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local ok = mediaCtrl:Stop() if not ok then wx.wxMessageBox(string.format("Unable to stop %s: Unsupported format?", fileName), "wxLua Media Demo", wx.wxICON_ERROR + wx.wxOK) end end ) panel:Connect(ID_VOLUME, wx.wxEVT_SCROLL_THUMBRELEASE, function (event) local pos = event:GetPosition() mediaCtrl:SetVolume(pos/slider_range) end ) panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_THUMBTRACK, function (event) settingPos = true end) panel:Connect(ID_POSITON, wx.wxEVT_SCROLL_THUMBRELEASE, function (event) if loadedMedia then local pos = event:GetPosition() local len = mediaCtrl:Length() local ok = mediaCtrl:Seek(len*pos/slider_range) if ok == wx.wxInvalidOffset then wx.wxMessageBox(string.format("Unable to seek in %s: Unsupported format?", fileName), "wxLua Media Demo", wx.wxICON_ERROR + wx.wxOK) end end settingPos = false end ) mediaCtrl:Connect(wx.wxEVT_MEDIA_STATECHANGED, function (event) UpdateButtons() end) -- ----------------------------------------------------------------------- timer = wx.wxTimer(panel) panel:Connect(wx.wxEVT_TIMER, function (event) local len = 1 -- avoid /0 local pos = 0 local str = "Position 00:00/00:00" if loadedMedia then len = mediaCtrl:Length() pos = mediaCtrl:Tell() str = string.format("Position %s/%s", msToMMSS(pos), msToMMSS(len)) end if not settingPos then posSlider:SetValue(slider_range*pos/len) end if posText:GetLabel() ~= str then posText:SetLabel(str) end end) timer:Start(300) -- ----------------------------------------------------------------------- -- create a simple file menu local fileMenu = wx.wxMenu() fileMenu:Append(ID_LOADFILE, "Load media...\tCtrl+O", "Load a file to play...") fileMenu:AppendSeparator() fileMenu:Append(wx.wxID_EXIT, "E&xit\tCtrl+Q", "Quit the program") -- create a simple help menu local helpMenu = wx.wxMenu() helpMenu:Append(wx.wxID_ABOUT, "&About", "About the wxLua Media Application") -- create a menu bar and append the file and help menus local menuBar = wx.wxMenuBar() menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") -- attach the menu bar into the frame frame:SetMenuBar(menuBar) -- create a simple status bar frame:CreateStatusBar(1) frame:SetStatusText("Welcome to wxLua.") frame:Connect(ID_LOADFILE, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local dlg = wx.wxFileDialog(frame, "Choose a media file", wx.wxGetCwd(), "", "All Files (*)|*|MP3 Music Files (*.mp3)|*.mp3|MPG Video Files (*.mpg)|*.mpg|AVI Movie Files (*.avi)|*.avi", wx.wxFD_OPEN + wx.wxFD_FILE_MUST_EXIST + wx.wxFD_CHANGE_DIR ) if dlg:ShowModal() == wx.wxID_OK then local filepath = dlg:GetPath() loadedMedia = false fileName = "" if not mediaCtrl:Load(filepath) then wx.wxMessageBox(string.format("Unable to load %s: Unsupported format?", filepath), "wxLua Media Demo", wx.wxICON_ERROR + wx.wxOK) else posSlider:SetValue(0) loadedMedia = true fileName = dlg:GetFilename() local ms = mediaCtrl:Length() local s = mediaCtrl:GetBestSize() frame:SetStatusText(string.format("Loaded: '%s' Length %s Size %dx%d", fileName, msToMMSS(ms), s:GetWidth(), s:GetHeight())) mediaCtrl:SetInitialSize() panel:GetSizer():Layout() end end dlg:Destroy() UpdateButtons() 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 Media wxLua sample.\n'.. wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua Media", wx.wxOK + wx.wxICON_INFORMATION, frame) end ) -- show the frame window frame:Show(true) end main() |
|
From: John L. <jr...@us...> - 2007-07-02 00:05:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16205/wxLua/modules/wxbind/src Modified Files: appframe.cpp gdi.cpp windows.cpp Log Message: Fix the args for int arrays in bindings generator Add wxMediaCtrl sample media.wx.lua Turn on wxGL and wxMediaCtrl in wxLua, but they're still #if wxUSE_GLCANVAS/MEDIACTRL Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** windows.cpp 30 Jun 2007 00:12:25 -0000 1.71 --- windows.cpp 2 Jul 2007 00:05:14 -0000 1.72 *************** *** 2855,2863 **** #endif // wxLUA_USE_wxPointSizeRect ! #if (wxLUA_USE_wxAcceleratorTable) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetAcceleratorTable[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxAcceleratorTable, NULL }; static int LUACALL wxLua_wxWindow_SetAcceleratorTable(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetAcceleratorTable[1] = {{ wxLua_wxWindow_SetAcceleratorTable, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetAcceleratorTable }}; ! // wxLUA_USE_wxAcceleratorTable virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) static int LUACALL wxLua_wxWindow_SetAcceleratorTable(lua_State *L) { --- 2855,2863 ---- #endif // wxLUA_USE_wxPointSizeRect ! #if wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetAcceleratorTable[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxAcceleratorTable, NULL }; static int LUACALL wxLua_wxWindow_SetAcceleratorTable(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetAcceleratorTable[1] = {{ wxLua_wxWindow_SetAcceleratorTable, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetAcceleratorTable }}; ! // virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) static int LUACALL wxLua_wxWindow_SetAcceleratorTable(lua_State *L) { *************** *** 2873,2877 **** } ! #endif // (wxLUA_USE_wxAcceleratorTable) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetAutoLayout[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; --- 2873,2877 ---- } ! #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetAutoLayout[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; *************** *** 2931,2939 **** ! #if wxLUA_USE_wxPointSizeRect static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetBestFittingSize[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetBestFittingSize[1] = {{ wxLua_wxWindow_SetBestFittingSize, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxWindow_SetBestFittingSize }}; ! // void SetBestFittingSize(const wxSize& size = wxDefaultSize) // deprecated in 2.8 use SetInitialSize static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L) { --- 2931,2939 ---- ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetBestFittingSize[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSize, NULL }; static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetBestFittingSize[1] = {{ wxLua_wxWindow_SetBestFittingSize, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxWindow_SetBestFittingSize }}; ! // !%wxchkver_2_8 void SetBestFittingSize(const wxSize& size = wxDefaultSize) // deprecated in 2.8 use SetInitialSize static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L) { *************** *** 2951,2955 **** } ! #endif // wxLUA_USE_wxPointSizeRect #if wxLUA_USE_wxCaret && wxUSE_CARET --- 2951,2955 ---- } ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect) #if wxLUA_USE_wxCaret && wxUSE_CARET *************** *** 3240,3243 **** --- 3240,3266 ---- } + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetInitialSize[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSize, NULL }; + static int LUACALL wxLua_wxWindow_SetInitialSize(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_SetInitialSize[1] = {{ wxLua_wxWindow_SetInitialSize, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxWindow_SetInitialSize }}; + // %wxchkver_2_8 void SetInitialSize(const wxSize& size = wxDefaultSize) + static int LUACALL wxLua_wxWindow_SetInitialSize(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 2 ? (const wxSize *)wxlState.GetUserDataType(2, s_wxluatag_wxSize) : &wxDefaultSize); + // get this + wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call SetInitialSize + self->SetInitialSize(*size); + + return 0; + } + + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetLabel[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxWindow_SetLabel(lua_State *L); *************** *** 4668,4674 **** #endif // wxLUA_USE_wxPointSizeRect ! #if (wxLUA_USE_wxAcceleratorTable) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) { "SetAcceleratorTable", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetAcceleratorTable, 1, NULL }, ! #endif // (wxLUA_USE_wxAcceleratorTable) && (wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL) { "SetAutoLayout", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetAutoLayout, 1, NULL }, --- 4691,4697 ---- #endif // wxLUA_USE_wxPointSizeRect ! #if wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL { "SetAcceleratorTable", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetAcceleratorTable, 1, NULL }, ! #endif // wxLUA_USE_wxAcceleratorTable && wxUSE_ACCEL { "SetAutoLayout", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetAutoLayout, 1, NULL }, *************** *** 4680,4686 **** { "SetBackgroundStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetBackgroundStyle, 1, NULL }, ! #if wxLUA_USE_wxPointSizeRect { "SetBestFittingSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetBestFittingSize, 1, NULL }, ! #endif // wxLUA_USE_wxPointSizeRect #if wxLUA_USE_wxCaret && wxUSE_CARET --- 4703,4709 ---- { "SetBackgroundStyle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetBackgroundStyle, 1, NULL }, ! #if (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect) { "SetBestFittingSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetBestFittingSize, 1, NULL }, ! #endif // (!wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxPointSizeRect) #if wxLUA_USE_wxCaret && wxUSE_CARET *************** *** 4726,4729 **** --- 4749,4757 ---- { "SetHelpText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetHelpText, 1, NULL }, { "SetId", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetId, 1, NULL }, + + #if (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) + { "SetInitialSize", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetInitialSize, 1, NULL }, + #endif // (wxLUA_USE_wxPointSizeRect) && (wxCHECK_VERSION(2,8,0)) + { "SetLabel", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetLabel, 1, NULL }, Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** gdi.cpp 30 Jun 2007 00:12:23 -0000 1.82 --- gdi.cpp 2 Jul 2007 00:05:13 -0000 1.83 *************** *** 14213,14220 **** #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor2[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLCanvas, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor2[1] = {{ wxLua_wxGLCanvas_constructor2, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatagArray_wxLua_wxGLCanvas_constructor2 }}; ! // wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L) { --- 14213,14257 ---- #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor3[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_Table, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPalette, NULL }; ! static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor3[1] = {{ wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor3 }}; ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) ! static int LUACALL wxLua_wxGLCanvas_constructor3(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxGLCanvas *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // const wxPalette palette = wxNullPalette ! const wxPalette * palette = (argCount >= 8 ? (const wxPalette *)wxlState.GetUserDataType(8, s_wxluatag_wxPalette) : &wxNullPalette); ! // const wxString name = "GLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("GLCanvas"))); ! // long style = 0 ! long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); ! // const wxSize size = wxDefaultSize ! const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); ! // const wxPoint pos = wxDefaultPosition ! const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // int attribList = 0 ! int count = 0; wxLuaSmartIntArray attribList = (argCount >= 3 ? wxlState.GetIntArray(3, count) : 0); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : wxID_ANY); ! // wxWindow parent ! wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); ! // call constructor ! returns = new wxGLCanvas(parent, id, attribList, *pos, *size, style, name, *palette); ! // add to tracked window list, it will check validity ! wxlState.AddTrackedWindow(returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxGLCanvas, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor2[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLCanvas, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor2[1] = {{ wxLua_wxGLCanvas_constructor2, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatagArray_wxLua_wxGLCanvas_constructor2 }}; ! // wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor2(lua_State *L) { *************** *** 14228,14233 **** // int attribList = 0 int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); ! // const wxString name = "wxGLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("wxGLCanvas"))); // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); --- 14265,14270 ---- // int attribList = 0 int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); ! // const wxString name = "GLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("GLCanvas"))); // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); *************** *** 14236,14241 **** // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxGLCanvas sharedCanvas wxGLCanvas * sharedCanvas = (wxGLCanvas *)wxlState.GetUserDataType(2, s_wxluatag_wxGLCanvas); --- 14273,14278 ---- // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = -1 ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : -1); // wxGLCanvas sharedCanvas wxGLCanvas * sharedCanvas = (wxGLCanvas *)wxlState.GetUserDataType(2, s_wxluatag_wxGLCanvas); *************** *** 14252,14259 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLContext, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor1[1] = {{ wxLua_wxGLCanvas_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatagArray_wxLua_wxGLCanvas_constructor1 }}; ! // wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor1(lua_State *L) { --- 14289,14296 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor1[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxGLContext, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor1(lua_State *L); // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor1[1] = {{ wxLua_wxGLCanvas_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 9, s_wxluatagArray_wxLua_wxGLCanvas_constructor1 }}; ! // wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor1(lua_State *L) { *************** *** 14267,14272 **** // int attribList = 0 int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); ! // const wxString name = "wxGLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("wxGLCanvas"))); // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); --- 14304,14309 ---- // int attribList = 0 int count = 0; wxLuaSmartIntArray attribList = (argCount >= 8 ? wxlState.GetIntArray(8, count) : 0); ! // const wxString name = "GLCanvas" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("GLCanvas"))); // long style = 0 long style = (argCount >= 6 ? (long)wxlua_getnumbertype(L, 6) : 0); *************** *** 14275,14280 **** // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxGLContext sharedContext wxGLContext * sharedContext = (wxGLContext *)wxlState.GetUserDataType(2, s_wxluatag_wxGLContext); --- 14312,14317 ---- // const wxPoint pos = wxDefaultPosition const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); ! // wxWindowID id = -1 ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : -1); // wxGLContext sharedContext wxGLContext * sharedContext = (wxGLContext *)wxlState.GetUserDataType(2, s_wxluatag_wxGLContext); *************** *** 14293,14298 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor[1] = {{ wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }}; ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L) { --- 14330,14335 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxGLCanvas_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Table, &s_wxluatag_wxPalette, NULL }; static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor[1] = {{ wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }}; ! // wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) static int LUACALL wxLua_wxGLCanvas_constructor(lua_State *L) { *************** *** 14304,14311 **** // const wxPalette palette = wxNullPalette const wxPalette * palette = (argCount >= 8 ? (const wxPalette *)wxlState.GetUserDataType(8, s_wxluatag_wxPalette) : &wxNullPalette); ! // LuaTable intTable ! YOU MUST OVERRIDE THIS FUNCTION intTable = YOU MUST OVERRIDE THIS FUNCTION ; ! // const wxString name = "wxGLCanvas" ! const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("wxGLCanvas"))); // long style = 0 long style = (argCount >= 5 ? (long)wxlua_getnumbertype(L, 5) : 0); --- 14341,14348 ---- // const wxPalette palette = wxNullPalette const wxPalette * palette = (argCount >= 8 ? (const wxPalette *)wxlState.GetUserDataType(8, s_wxluatag_wxPalette) : &wxNullPalette); ! // int attribList = 0 ! int count = 0; wxLuaSmartIntArray attribList = (argCount >= 7 ? wxlState.GetIntArray(7, count) : 0); ! // const wxString name = "GLCanvas" ! const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("GLCanvas"))); // long style = 0 long style = (argCount >= 5 ? (long)wxlua_getnumbertype(L, 5) : 0); *************** *** 14319,14323 **** wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); // call constructor ! returns = new wxGLCanvas(parent, id, *pos, *size, style, name, intTable, *palette); // add to tracked window list, it will check validity wxlState.AddTrackedWindow(returns); --- 14356,14360 ---- wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); // call constructor ! returns = new wxGLCanvas(parent, id, *pos, *size, style, name, attribList, *palette); // add to tracked window list, it will check validity wxlState.AddTrackedWindow(returns); *************** *** 14360,14364 **** static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor_overload[] = { ! { wxLua_wxGLCanvas_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 2, 9, s_wxluaargArray_None }, #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) --- 14397,14405 ---- static wxLuaBindCFunc s_wxluafunc_wxLua_wxGLCanvas_constructor_overload[] = { ! { wxLua_wxGLCanvas_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 1, 9, s_wxluaargArray_None }, ! ! #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxGLCanvas_constructor3, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor3 }, ! #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) *************** *** 14371,14375 **** #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 2, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) }; --- 14412,14416 ---- #if ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) ! { wxLua_wxGLCanvas_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 8, s_wxluatagArray_wxLua_wxGLCanvas_constructor }, #endif // ((wxLUA_USE_wxGLCanvas && wxUSE_GLCANVAS) && (wxLUA_USE_wxPalette && wxUSE_PALETTE)) && (wxLUA_USE_wxPointSizeRect) }; Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** appframe.cpp 30 Jun 2007 18:18:45 -0000 1.64 --- appframe.cpp 2 Jul 2007 00:05:13 -0000 1.65 *************** *** 2249,2253 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFrame_SetStatusWidths[] = { &s_wxluatag_wxFrame, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxFrame_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFrame_SetStatusWidths[1] = {{ wxLua_wxFrame_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFrame_SetStatusWidths }}; --- 2249,2253 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxFrame_SetStatusWidths[] = { &s_wxluatag_wxFrame, &s_wxluaarg_Table, NULL }; static int LUACALL wxLua_wxFrame_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxFrame_SetStatusWidths[1] = {{ wxLua_wxFrame_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFrame_SetStatusWidths }}; *************** *** 2763,2767 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles[] = { &s_wxluatag_wxStatusBar, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusStyles(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusStyles[1] = {{ wxLua_wxStatusBar_SetStatusStyles, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles }}; --- 2763,2767 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles[] = { &s_wxluatag_wxStatusBar, &s_wxluaarg_Table, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusStyles(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusStyles[1] = {{ wxLua_wxStatusBar_SetStatusStyles, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusStyles }}; *************** *** 2801,2805 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths[] = { &s_wxluatag_wxStatusBar, &s_wxluatag_wxArrayString, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusWidths[1] = {{ wxLua_wxStatusBar_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths }}; --- 2801,2805 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths[] = { &s_wxluatag_wxStatusBar, &s_wxluaarg_Table, NULL }; static int LUACALL wxLua_wxStatusBar_SetStatusWidths(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxStatusBar_SetStatusWidths[1] = {{ wxLua_wxStatusBar_SetStatusWidths, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStatusBar_SetStatusWidths }}; |
|
From: John L. <jr...@us...> - 2007-07-02 00:05:17
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16205/wxLua/docs Modified Files: wxlua.html wxluaref.html Log Message: Fix the args for int arrays in bindings generator Add wxMediaCtrl sample media.wx.lua Turn on wxGL and wxMediaCtrl in wxLua, but they're still #if wxUSE_GLCANVAS/MEDIACTRL Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxluaref.html 30 Jun 2007 18:18:45 -0000 1.39 --- wxluaref.html 2 Jul 2007 00:05:13 -0000 1.40 *************** *** 12876,12886 **** <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxGLCanvas">wxGLCanvas</a>, <a href="#wxWindow">wxWindow</a></font></b> <blockquote> ! <font color=#BB0055> <font color=#009900>// <i>%override</i> <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", LuaTable intTable, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)</font></font><br> ! <font color=#009900>// Note: attribList[] parameter is a lua table with integer indexes</font><br> ! <font color=#009900>// C++ Func: <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)</font><br> ! <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", LuaTable intTable, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <br> ! <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLContext">wxGLContext</a>* sharedContext, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLCanvas">wxGLCanvas</a>* sharedCanvas, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="wxGLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <br> <a href="#wxGLContext">wxGLContext</a>* GetContext() const<br> --- 12876,12883 ---- <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxGLCanvas">wxGLCanvas</a>, <a href="#wxWindow">wxWindow</a></font></b> <blockquote> ! <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLContext">wxGLContext</a>* sharedContext, wxWindowID id = -1, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, <a href="#wxGLCanvas">wxGLCanvas</a>* sharedCanvas, wxWindowID id = -1, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", int attribList[] = 0, const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> ! <a href="#wxGLCanvas">wxGLCanvas</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style=0, const <a href="#wxString">wxString</a>& name="GLCanvas", const <a href="#wxPalette">wxPalette</a>& palette = wxNullPalette)<br> <br> <a href="#wxGLContext">wxGLContext</a>* GetContext() const<br> *************** *** 18768,18777 **** virtual bool ScrollPages(int pages)<br> virtual void ScrollWindow(int dx, int dy, const <a href="#wxRect">wxRect</a>* rect = NULL)<br> ! wxLUA_USE_<a href="#wxAcceleratorTable">wxAcceleratorTable</a> virtual void SetAcceleratorTable(const <a href="#wxAcceleratorTable">wxAcceleratorTable</a>& accel)<br> <font color=#009900>//void SetAccessible(wxAccessible* accessible)</font><br> void SetAutoLayout(bool autoLayout)<br> virtual void SetBackgroundColour(const <a href="#wxColour">wxColour</a>& colour)<br> virtual void SetBackgroundStyle(<a href="#wxBackgroundStyle">wxBackgroundStyle</a> style)<br> ! void SetBestFittingSize(const <a href="#wxSize">wxSize</a>& size = wxDefaultSize) <font color=#009900>// deprecated in 2.8 use SetInitialSize</font><br> void SetCaret(<a href="#wxCaret">wxCaret</a> *caret) const<br> virtual void SetClientSize(const <a href="#wxSize">wxSize</a>& size)<br> --- 18765,18774 ---- virtual bool ScrollPages(int pages)<br> virtual void ScrollWindow(int dx, int dy, const <a href="#wxRect">wxRect</a>* rect = NULL)<br> ! virtual void SetAcceleratorTable(const <a href="#wxAcceleratorTable">wxAcceleratorTable</a>& accel)<br> <font color=#009900>//void SetAccessible(wxAccessible* accessible)</font><br> void SetAutoLayout(bool autoLayout)<br> virtual void SetBackgroundColour(const <a href="#wxColour">wxColour</a>& colour)<br> virtual void SetBackgroundStyle(<a href="#wxBackgroundStyle">wxBackgroundStyle</a> style)<br> ! !<i>%wxchkver_2_8</i> void SetBestFittingSize(const <a href="#wxSize">wxSize</a>& size = wxDefaultSize) <font color=#009900>// deprecated in 2.8 use SetInitialSize</font><br> void SetCaret(<a href="#wxCaret">wxCaret</a> *caret) const<br> virtual void SetClientSize(const <a href="#wxSize">wxSize</a>& size)<br> *************** *** 18782,18785 **** --- 18779,18783 ---- !<i>%wxchkver_2_8</i> <a href="#wxWindow">wxWindow</a>* SetDefaultItem(<a href="#wxWindow">wxWindow</a> *win)<br> <font color=#009900>// virtual void SetInitialBestSize(const <a href="#wxSize">wxSize</a>& size) protected</font><br> + <i>%wxchkver_2_8</i> void SetInitialSize(const <a href="#wxSize">wxSize</a>& size = wxDefaultSize)<br> void SetMaxSize(const <a href="#wxSize">wxSize</a>& size)<br> void SetMinSize(const <a href="#wxSize">wxSize</a>& size)<br> Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxlua.html 30 Jun 2007 18:18:45 -0000 1.28 --- wxlua.html 2 Jul 2007 00:05:13 -0000 1.29 *************** *** 4,14 **** --- 4,19 ---- + + <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> + [...5521 lines suppressed...] + + </ul> + <li>The other functions are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> + </ul> + </body> </html> |
|
From: John L. <jr...@us...> - 2007-07-02 00:05:17
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16205/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fix the args for int arrays in bindings generator Add wxMediaCtrl sample media.wx.lua Turn on wxGL and wxMediaCtrl in wxLua, but they're still #if wxUSE_GLCANVAS/MEDIACTRL Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** genwxbind.lua 30 Jun 2007 00:12:20 -0000 1.139 --- genwxbind.lua 2 Jul 2007 00:05:12 -0000 1.140 *************** *** 3141,3145 **** declare = "wxArrayInt " elseif argType == "IntArray_FromLuaTable" then ! overload_argList = overload_argList.."&s_wxluatag_wxArrayString, " argItem = "NULL; ptr = "..argName.." = wxlState.GetIntArray("..argNum..", count_)" declare = "int count_ = 0; wxLuaSmartIntArray ptr; int*" --- 3141,3145 ---- declare = "wxArrayInt " elseif argType == "IntArray_FromLuaTable" then ! overload_argList = overload_argList.."&s_wxluaarg_Table, " argItem = "NULL; ptr = "..argName.." = wxlState.GetIntArray("..argNum..", count_)" declare = "int count_ = 0; wxLuaSmartIntArray ptr; int*" *************** *** 3167,3170 **** --- 3167,3171 ---- end + overload_argList = overload_argList.."&s_wxluaarg_Table, " argItem = "wxlState.GetStringArray("..argNum..", count)" --declare = "int count = 0; wxLuaSmartStringArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " *************** *** 3176,3179 **** --- 3177,3181 ---- end + overload_argList = overload_argList.."&s_wxluaarg_Table, " argItem = "wxlState.GetIntArray("..argNum..", count)" --declare = "int count = 0; wxLuaSmartIntArray ptr; "..argTypeWithAttrib.." "..argName.."; ptr = " |
|
From: John L. <jr...@us...> - 2007-07-02 00:05:17
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16205/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Fix the args for int arrays in bindings generator Add wxMediaCtrl sample media.wx.lua Turn on wxGL and wxMediaCtrl in wxLua, but they're still #if wxUSE_GLCANVAS/MEDIACTRL Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxluasetup.h 27 Jun 2007 19:56:29 -0000 1.17 --- wxluasetup.h 2 Jul 2007 00:05:13 -0000 1.18 *************** *** 4,8 **** #define __WXLUA_SETUP__ - #define wxLUA_USE_FL 0 // depricated wxWidgets contrib #define wxLUA_USE_Geometry 1 #define wxLUA_USE_MDI 1 --- 4,7 ---- *************** *** 67,71 **** #define wxLUA_USE_wxGenericDirCtrl 1 #define wxLUA_USE_wxGenericValidator 1 ! #define wxLUA_USE_wxGLCanvas 0 #define wxLUA_USE_wxGrid 1 #define wxLUA_USE_wxHashTable 1 --- 66,70 ---- #define wxLUA_USE_wxGenericDirCtrl 1 #define wxLUA_USE_wxGenericValidator 1 ! #define wxLUA_USE_wxGLCanvas 1 // must link to lib, also wxUSE_GLCANVAS #define wxLUA_USE_wxGrid 1 #define wxLUA_USE_wxHashTable 1 *************** *** 88,92 **** #define wxLUA_USE_wxLuaPrintout 1 #define wxLUA_USE_wxMask 1 ! #define wxLUA_USE_wxMediaCtrl 0 // must link to lib #define wxLUA_USE_wxMenu 1 #define wxLUA_USE_wxMessageDialog 1 --- 87,91 ---- #define wxLUA_USE_wxLuaPrintout 1 #define wxLUA_USE_wxMask 1 ! #define wxLUA_USE_wxMediaCtrl 1 // must link to lib, also wxUSE_MEDIACTRL #define wxLUA_USE_wxMenu 1 #define wxLUA_USE_wxMessageDialog 1 *************** *** 129,133 **** #define wxLUA_USE_wxSystemOptions 1 #define wxLUA_USE_wxSystemSettings 1 ! #define wxLUA_USE_wxTabCtrl 0 #define wxLUA_USE_wxTaskBarIcon 1 #define wxLUA_USE_wxTextCtrl 1 --- 128,132 ---- #define wxLUA_USE_wxSystemOptions 1 #define wxLUA_USE_wxSystemSettings 1 ! #define wxLUA_USE_wxTabCtrl 0 // deprecated MSW only control #define wxLUA_USE_wxTaskBarIcon 1 #define wxLUA_USE_wxTextCtrl 1 |
|
From: John L. <jr...@us...> - 2007-07-02 00:05:17
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16205/wxLua/build/bakefiles Modified Files: wxlua.bkl Log Message: Fix the args for int arrays in bindings generator Add wxMediaCtrl sample media.wx.lua Turn on wxGL and wxMediaCtrl in wxLua, but they're still #if wxUSE_GLCANVAS/MEDIACTRL Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxlua.bkl 24 Apr 2007 13:48:47 -0000 1.36 --- wxlua.bkl 2 Jul 2007 00:05:13 -0000 1.37 *************** *** 66,70 **** <set-srcdir>.</set-srcdir> ! <!-- note that $(WXLUA_BASEDIR) != $(SRCDIR) since the latter is prepended with $(srcdir) for autoconf format! --> --- 66,70 ---- <set-srcdir>.</set-srcdir> ! <!-- note that $(WXLUA_BASEDIR) != $(SRCDIR) since the latter is prepended with $(srcdir) for autoconf format! --> *************** *** 145,149 **** </pkgconfig> --> ! <!-- This is not an 'all' dependency; it's a separed target to be called explicitely --> <action id="docs"> <command>@echo =============================================</command> --- 145,149 ---- </pkgconfig> --> ! <!-- This is not an 'all' dependency; it's a separed target to be called explicitly --> <action id="docs"> <command>@echo =============================================</command> *************** *** 165,169 **** </action> ! <!-- This is not an 'all' dependency; it's a separed target to be called explicitely --> <action id="compress" cond="TARGETING_WIN32=='1'"> --- 165,169 ---- </action> ! <!-- This is not an 'all' dependency; it's a separed target to be called explicitly --> <action id="compress" cond="TARGETING_WIN32=='1'"> *************** *** 179,183 **** </action> ! <!-- This is not an 'all' dependency; it's a separed target to be called explicitely --> <action id="autopackage" cond="FORMAT=='autoconf'"> <!-- This target cannot depend from distclean otherwise the default.apspec --- 179,183 ---- </action> ! <!-- This is not an 'all' dependency; it's a separed target to be called explicitly --> <action id="autopackage" cond="FORMAT=='autoconf'"> <!-- This target cannot depend from distclean otherwise the default.apspec |
|
From: John L. <jr...@us...> - 2007-07-02 00:05:17
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16205/wxLua/bindings/wxwidgets Modified Files: gdi.i windows.i Log Message: Fix the args for int arrays in bindings generator Add wxMediaCtrl sample media.wx.lua Turn on wxGL and wxMediaCtrl in wxLua, but they're still #if wxUSE_GLCANVAS/MEDIACTRL Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** windows.i 30 Jun 2007 00:12:20 -0000 1.50 --- windows.i 2 Jul 2007 00:05:13 -0000 1.51 *************** *** 249,258 **** virtual bool ScrollPages(int pages) virtual void ScrollWindow(int dx, int dy, const wxRect* rect = NULL) ! wxLUA_USE_wxAcceleratorTable virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) //void SetAccessible(wxAccessible* accessible) void SetAutoLayout(bool autoLayout) virtual void SetBackgroundColour(const wxColour& colour) virtual void SetBackgroundStyle(wxBackgroundStyle style) ! void SetBestFittingSize(const wxSize& size = wxDefaultSize) // deprecated in 2.8 use SetInitialSize void SetCaret(wxCaret *caret) const virtual void SetClientSize(const wxSize& size) --- 249,258 ---- virtual bool ScrollPages(int pages) virtual void ScrollWindow(int dx, int dy, const wxRect* rect = NULL) ! virtual void SetAcceleratorTable(const wxAcceleratorTable& accel) //void SetAccessible(wxAccessible* accessible) void SetAutoLayout(bool autoLayout) virtual void SetBackgroundColour(const wxColour& colour) virtual void SetBackgroundStyle(wxBackgroundStyle style) ! !%wxchkver_2_8 void SetBestFittingSize(const wxSize& size = wxDefaultSize) // deprecated in 2.8 use SetInitialSize void SetCaret(wxCaret *caret) const virtual void SetClientSize(const wxSize& size) *************** *** 263,266 **** --- 263,267 ---- !%wxchkver_2_8 wxWindow* SetDefaultItem(wxWindow *win) // virtual void SetInitialBestSize(const wxSize& size) protected + %wxchkver_2_8 void SetInitialSize(const wxSize& size = wxDefaultSize) void SetMaxSize(const wxSize& size) void SetMinSize(const wxSize& size) Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** gdi.i 30 Jun 2007 00:12:20 -0000 1.61 --- gdi.i 2 Jul 2007 00:05:13 -0000 1.62 *************** *** 1627,1637 **** %class wxGLCanvas, wxWindow ! // %override wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) ! // Note: attribList[] parameter is a lua table with integer indexes ! // C++ Func: wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", LuaTable intTable, const wxPalette& palette = wxNullPalette) ! ! wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="wxGLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) wxGLContext* GetContext() const --- 1627,1634 ---- %class wxGLCanvas, wxWindow ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxGLContext* sharedContext, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxGLCanvas* sharedCanvas, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", int attribList[] = 0, const wxPalette& palette = wxNullPalette) ! wxGLCanvas(wxWindow* parent, wxWindowID id = wxID_ANY, int attribList[] = 0, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style=0, const wxString& name="GLCanvas", const wxPalette& palette = wxNullPalette) wxGLContext* GetContext() const |
|
From: John L. <jr...@us...> - 2007-07-01 02:23:58
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10085/wxLua/docs Modified Files: FAQ.html Log Message: fix some bad grammar Index: FAQ.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/FAQ.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FAQ.html 25 Jun 2007 03:19:38 -0000 1.3 --- FAQ.html 1 Jul 2007 02:23:53 -0000 1.4 *************** *** 3,50 **** <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> - <title>wxLua FAQ</title> - <meta content="John Labenski" name="author"> </head> <body> <h2><u>wxLua FAQ</u></h2> <ol> <li><a href="#Why_wxLua">Why wxLua?</a></li> <ol> <li><a href="#Whats_best_for_my_needs:_wxLua">What's best for my needs: wxLua, wxPython, wxSomethingElse?</a></li> <li><a href="FAQ.html#Can_I_use_wxLua_as_script_interpreter">Can I use wxLua as script interpreter embedded in my own C++ applications?</a></li> </ol> <li><a href="#Programming_in_wxLua">Programming in wxLua</a></li> <ol> <li><a href="#wxStrings">wxStrings?</a></li> <li><a href="#wxArrayString_and_wxSortedArrayString">wxArrayString and wxSortedArrayString?</a></li> <li><a href="#wxArrayInt">wxArrayInt?</a></li> <li><a href="#When_and_how_should_you_delete_objects">When and how should you delete() objects?</a></li> <li><a href="#Why_do_the_samples_use_the_function">Why ! do the samples use the function main() is it special to wxLua?</a></li> <li><a href="#Why_are_the_error_messages_for_a_class">Why --- 3,73 ---- <head> + + <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> + + + <title>wxLua FAQ</title> + <meta content="John Labenski" name="author"> </head> + <body> + <h2><u>wxLua FAQ</u></h2> + <ol> + <li><a href="#Why_wxLua">Why wxLua?</a></li> + + <ol> + <li><a href="#Whats_best_for_my_needs:_wxLua">What's best for my needs: wxLua, wxPython, wxSomethingElse?</a></li> + <li><a href="FAQ.html#Can_I_use_wxLua_as_script_interpreter">Can I use wxLua as script interpreter embedded in my own C++ applications?</a></li> + + </ol> + <li><a href="#Programming_in_wxLua">Programming in wxLua</a></li> + + <ol> + <li><a href="#wxStrings">wxStrings?</a></li> + <li><a href="#wxArrayString_and_wxSortedArrayString">wxArrayString and wxSortedArrayString?</a></li> + <li><a href="#wxArrayInt">wxArrayInt?</a></li> + <li><a href="#When_and_how_should_you_delete_objects">When and how should you delete() objects?</a></li> + <li><a href="#Why_do_the_samples_use_the_function">Why ! do the samples use the function main() and is it special to wxLua?</a></li> ! <li><a href="#Why_are_the_error_messages_for_a_class">Why *************** *** 52,111 **** --- 75,167 ---- +1?</a></li> + + </ol> + </ol> + <hr size="2" width="100%"> <ol> + <li> + <h3><a name="Why_wxLua"></a>Why wxLua?</h3> + </li> + + <ul> + <li>Because the Lua language is easy and "fun" to program in. </li> + <li>It vaguely looks like BASIC or C which many people are familiar with.</li> + <li>The code is very readable, almost no special notation, gotchas, or oddball constructs that require a large shift in thinking from BASIC or C.</li> + <li>Size : The Lua interpreter itself is ~100Kb, wxWidgets adds the remaining few Mb.</li> + <li>Speed : Lua is one of the fastest interpreted languages, see the Great Computer Language Shootout.</li> + <li>Again, why Lua? See <a href="http://www.lua.org/about.html">http://www.lua.org/about.html</a></li> + + </ul> + + <ol> + <li> + <h4><a name="Whats_best_for_my_needs:_wxLua"></a>What's best for my needs: wxLua, wxPython, wxSomethingElse?</h4> + </li> + + <ol> + + <ol> + + </ol> + + </ol> + + <ul> + <li>It depends: wxPython has a much larger footprint and greater overhead *************** *** 113,120 **** --- 169,178 ---- library.</li> + <li>On the other hand, wxLua is as large as the wxWidgets library + ~100Kb for Lua + ~500Kb for the wxLua library.</li> + <li>wxLua can be easily interfaced with C++ code making it a powerful *************** *** 122,125 **** --- 180,184 ---- designers.</li> + <li>In conclusion, if you want to write an entire application in a *************** *** 129,146 **** --- 188,214 ---- extend your C++ applications, go for wxLua.</li> + + </ul> + <li> + <h4><a name="Can_I_use_wxLua_as_script_interpreter"></a>Can I use wxLua as script interpreter embedded in my own C++ applications?</h4> + </li> + + <ul> + <li>Yes! That's explained on the wxLua homepage. </li> + <li>This is one of the strong *************** *** 148,193 **** --- 216,287 ---- your application and let the user customize it... </li> + <li>You may create as many wxLua interpreters in a single program as you like.</li> + + </ul> + + </ol> + <li> + <h3><a name="Programming_in_wxLua"></a>Programming in wxLua</h3> + </li> + + <ol> + <li> + <h4><a name="wxStrings"></a>wxStrings?</h4> + </li> + + <ul> + <li>wxLua uses Lua strings and so all functions that take or return a wxString take or return a Lua string.</li> + <li>However, you can also use a wxString is you really want.</li> + + </ul> + <li> + <h4><a name="wxArrayString_and_wxSortedArrayString"></a>wxArrayString and wxSortedArrayString?</h4> + </li> + + <ul> + <li>All functions that take a wxArrayString or wxSortedArrayString can also take a numerically indexed table of strings.</li> + <li>Functions that return wxArrayStrings or wxSortedArrayStrings will return a *************** *** 195,225 **** wxluaref.html</li> </ul> <li> <h4><a name="wxArrayInt"></a>wxArrayInt?</h4> </li> <ul> <li>All functions that take a wxArrayInt can also take a numerically indexed table of numbers.</li> <li>Functions that return wxArrayInts will return a wxArrayInt unless specified otherwise in wxluaref.html.</li> </ul> <li> <h4><a name="When_and_how_should_you_delete_objects"></a>When and how should you delete() objects?</h4> </li> <ul> ! <li>You should read the section "C++ Classes ! CLASS_NAME" in the "Programming in wxLua" in the wxlua.html manual.</li> <li>In --- 289,337 ---- wxluaref.html</li> + + </ul> + <li> + <h4><a name="wxArrayInt"></a>wxArrayInt?</h4> + </li> + + <ul> + <li>All functions that take a wxArrayInt can also take a numerically indexed table of numbers.</li> + <li>Functions that return wxArrayInts will return a wxArrayInt unless specified otherwise in wxluaref.html.</li> + + </ul> + <li> + <h4><a name="When_and_how_should_you_delete_objects"></a>When and how should you delete() objects?</h4> + </li> + + <ul> ! ! <li>You should read the subsection "C++ Classes ! CLASS_NAME" of the "Programming in wxLua" section of the wxlua.html manual.</li> ! <li>In *************** *** 233,240 **** --- 345,354 ---- copy of them and so you may delete them.</li> + <li>Use the function "table = wxlua.GetTrackedUserdata()" to get a table of items that are tracked and occasionally print them out while developing your program.</li> + <li>Class objects that have the <i>%delete</i> tag in their declaration (see wxluaref.html) will be automatically *************** *** 246,249 **** --- 360,364 ---- longer delete it in wxLua.</li> + <li>Bottom line - don't worry about delete()ing anything except graphics objects (for MSW really) or classes that specifically *************** *** 251,267 **** garbage collector may not do so soon enough.</li> </ul> <li> <h4><a name="Why_do_the_samples_use_the_function"></a>Why ! do the samples use the function main() is it special to wxLua?</h4> </li> <ul> <li>There's nothing special about the function main() other than that it's a common name for an entry point into a program.</li> <li>It is often helpful and a good idea to encapsulate the program --- 366,391 ---- garbage collector may not do so soon enough.</li> + + </ul> + <li> + <h4><a name="Why_do_the_samples_use_the_function"></a>Why ! do the samples use the function main() and is it special to wxLua?</h4> ! </li> + + <ul> + <li>There's nothing special about the function main() other than that it's a common name for an entry point into a program.</li> + <li>It is often helpful and a good idea to encapsulate the program *************** *** 270,273 **** --- 394,398 ---- that won't be needed again.</li> + <li>Additionally, it allows you to break out of this initialization code at any point by putting <span style="font-style: italic;">"do return end"</span> *************** *** 276,293 **** --- 401,427 ---- false then ... end"</span>.</li> + + </ul> + <li> + <h4><a name="Why_are_the_error_messages_for_a_class"></a>Why are the error messages for class member function calls shifted +1?</h4> + </li> + + <ul> + <li>Because the ':' calling convention is syntaxic sugar for putting the 'self' as the first parameter.</li> + <li><i>s = wx.wxSize(1, 2); s:Set(3, 4)</i> is the same as <i>s.Set(s, 3, 4)</i> and the *************** *** 296,322 **** number.</li> <li>Unfortunately there is no way to tell whether the user has used the '.' or ':' calling convention and so the error message ! cannot be tailored for both static and nonstatic call member ! functions.</li> </ul> </ol> <ol> <ol> </ol> </ol> <ul> </ul> </ol> </body> </html> --- 430,475 ---- number.</li> + <li>Unfortunately there is no way to tell whether the user has used the '.' or ':' calling convention and so the error message ! cannot be tailored for both static and nonstatic member ! functions. Just remember that the first parameter for nonstatic class member functions is the 'self'.</li> + + </ul> + + </ol> + + <ol> + + <ol> + + </ol> + + </ol> + + <ul> + + </ul> + </ol> + </body> </html> |
|
From: John L. <jr...@us...> - 2007-07-01 00:17:48
|
Update of /cvsroot/wxlua/website/download In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29855/website/download Modified Files: fixeol.sh Log Message: clean up the script a little, add *.vcproj Index: fixeol.sh =================================================================== RCS file: /cvsroot/wxlua/website/download/fixeol.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fixeol.sh 4 May 2007 19:09:21 -0000 1.2 --- fixeol.sh 1 Jul 2007 00:17:44 -0000 1.3 *************** *** 5,21 **** dir=`pwd`/wxLua - - # NOT NECESSARY AS unix2dos will already print out the names of the processed files - # for f in `find .|grep ".dsp"`; do echo $f; done - # for f in `find .|grep ".dsw"`; do echo $f; done - # for f in `find .|grep "makefile.vc"`; do echo $f; done - # for f in `find .|grep "makefile.wat"`; do echo $f; done - # for f in `find .|grep "makefile.bcc"`; do echo $f; done - # do the UNIX -> DOS conversion ! for f in `find $dir|grep ".dsp"`; do $cmd $f; done ! for f in `find $dir|grep ".dsw"`; do $cmd $f; done ! for f in `find $dir|grep ".sln"`; do $cmd $f; done ! for f in `find $dir|grep "makefile.vc"`; do $cmd $f; done ! for f in `find $dir|grep "makefile.wat"`; do $cmd $f; done ! for f in `find $dir|grep "makefile.bcc"`; do $cmd $f; done --- 5,14 ---- dir=`pwd`/wxLua # do the UNIX -> DOS conversion ! for f in `find $dir -name "*.dsp"`; do $cmd $f; done ! for f in `find $dir -name "*.dsw"`; do $cmd $f; done ! for f in `find $dir -name "*.sln"`; do $cmd $f; done ! for f in `find $dir -name "*.vcproj"`; do $cmd $f; done ! for f in `find $dir -name "makefile.vc"`; do $cmd $f; done ! for f in `find $dir -name "makefile.wat"`; do $cmd $f; done ! for f in `find $dir -name "makefile.bcc"`; do $cmd $f; done |
|
From: John L. <jr...@us...> - 2007-07-01 00:10:25
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26770/website Modified Files: documentation.php download.php support.php Log Message: some updates to the docs, move FAQ to documentation and it's own file. Index: support.php =================================================================== RCS file: /cvsroot/wxlua/website/support.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** support.php 3 May 2006 04:45:51 -0000 1.7 --- support.php 1 Jul 2007 00:10:22 -0000 1.8 *************** *** 17,33 **** <a href="http://sourceforge.net/mailarchive/forum.php?forum_id=45270">wxlua-commit archives</a>.</p> - - <h1 id="faq">Frequently Asked Questions (FAQ)</h1> - <div class="indented"> - <h2>1. Can I use wxLua as script interpreter embedded in my own applications ?</h2> - <p>Yes ! That's explained also in the <a href="index.php">homepage</a>. This is one of the strong points of wxLua: - it can be a lightweight, fast interpreter to extend your application and let the user customize it... - You may create as many wxLua interpreters in a single program as you like.</p> - - <h2>2. What's best for my needs: wxLua, wxPython, wxSomethingElse ?</h2> - <p>It depends: <a href="http://www.wxpython.org/">wxPython</a> has a much larger footprint and greater overhead than wxLua, but it does provide more add-ons from the Python standard library.</p> - <p>On the other hand, wxLua is as large as the wxWidgets library + ~100K for lua and can be easily interfaced with C++ code making it a powerful extension language (which is exactly the intent of its designers); look at <a href="http://www.lua.org/about.html">this page</a> for more info.</p> - <p>In conclusion, if you want to write an entire application in a scripting language and you need things supported by Python which are not present in wxLua out-of-the-box, then you should use wxPython. Instead, if you want to write applications with little overhead or extend your C++ applications, go for wxLua.</p> - </div> - <?php include_once("footer.inc.php"); ?> \ No newline at end of file --- 17,19 ---- Index: documentation.php =================================================================== RCS file: /cvsroot/wxlua/website/documentation.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** documentation.php 21 May 2006 13:20:22 -0000 1.1 --- documentation.php 1 Jul 2007 00:10:22 -0000 1.2 *************** *** 8,12 **** <h1 id="reference" class="first">Reference manuals</h1> ! <p>The following links contain useful documents for those who already know Lua, wxWidgets and wxLua.<br/> If you're looking for tutorials see the "Getting started" section in the <a href="index.php">homepage</a>...</p> --- 8,12 ---- <h1 id="reference" class="first">Reference manuals</h1> ! <p>The following links contain useful documents for learning and understanding wxLua, Lua, and wxWidgets.<br/> If you're looking for tutorials see the "Getting started" section in the <a href="index.php">homepage</a>...</p> *************** *** 16,21 **** programming in lua and wxLua as well as how to use the wxLua library in a C++ program.</p> <p>The <a href="docs/wxluaref.html">wxLua class reference</a> has a complete list of wxWidgets classes ! and datatypes that wxLua wraps.<br/> ! There are also <a href="http://www.doxygen.org">doxygen</a>-generated documentation for the C++ wxLua library at <a href="docs/doxygen/html/index.html">this page</a>.</p> --- 16,22 ---- programming in lua and wxLua as well as how to use the wxLua library in a C++ program.</p> <p>The <a href="docs/wxluaref.html">wxLua class reference</a> has a complete list of wxWidgets classes ! and datatypes that wxLua wraps.</p> ! <p>The <a href="docs/FAQ.html">FAQ</a> may answer some of your questions and it highlights important points.</p> ! <p>There are also <a href="http://www.doxygen.org">doxygen</a>-generated documentation for the C++ wxLua library at <a href="docs/doxygen/html/index.html">this page</a>.</p> *************** *** 56,60 **** <li><strong>Klaas Holwerda</strong>: author of wxLuaCan sample and indefatigable source of ideas.</li> <li><strong>Francesco Montorsi</strong>: worked on the bakefile-based build system, on this website and the wxLua packaging.</li> ! <li><strong>Anders F Björklund</strong>: contributed wxMac screenshots and created wxMac package.</li> <li><strong>Did we forget you?</strong> contact us and we'll add you.</li> </ol> --- 57,62 ---- <li><strong>Klaas Holwerda</strong>: author of wxLuaCan sample and indefatigable source of ideas.</li> <li><strong>Francesco Montorsi</strong>: worked on the bakefile-based build system, on this website and the wxLua packaging.</li> ! <li><strong>Anders F Björklund</strong>: contributed wxMac screenshots and created wxMac package.</li> ! <li><strong>Reuben Thomas</strong>: wrote the bit library that wxLua includes.</li> <li><strong>Did we forget you?</strong> contact us and we'll add you.</li> </ol> Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** download.php 30 Jun 2007 23:46:38 -0000 1.24 --- download.php 1 Jul 2007 00:10:22 -0000 1.25 *************** *** 74,78 **** Instead, if you are interested to wxLua for scripting only, then go with the <strong>binaries</strong> !</p> ! <p>You can view all the downloads <a href="http://sourceforge.net/project/showfiles.php?group_id=140042">here<alt="Downloads"/></a>.</p> <div class="indented"> --- 74,78 ---- Instead, if you are interested to wxLua for scripting only, then go with the <strong>binaries</strong> !</p> ! <p><b>You can view all the downloads <a href="http://sourceforge.net/project/showfiles.php?group_id=140042">here<alt="Downloads"/></a>.</b></p> <div class="indented"> |
|
From: John L. <jr...@us...> - 2007-06-30 23:46:42
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18027/website Modified Files: download.php Log Message: update download for 2.8.4 release Index: download.php =================================================================== RCS file: /cvsroot/wxlua/website/download.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** download.php 24 Feb 2007 17:51:56 -0000 1.23 --- download.php 30 Jun 2007 23:46:38 -0000 1.24 *************** *** 10,29 **** // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.8.0.0"; ! ! $bz2size="1.1"; // size of the wxlua-xxx.tar.bz2 file (in MB) ! $zipsize="1.1"; // size of the wxlua-xxx.zip file (in MB) - $exesize="5.3"; // size of the wxlua-xxx-setup.exe file (in MB) $apsize="9.6"; // size of the wxlua-xxx.package file (in MB) $bundlesize="16.9"; // size of the wxlua-xxx.dmg file (in MB) ! $winlink="http://prdownloads.sourceforge.net/wxlua/wxLua-$latestversion-setup.exe?download"; ! $dlllink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-dlls.zip?download"; $linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package?download"; $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-tiger.dmg?download"; ! $ziplink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.zip?download"; ! $bz2link="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion.tar.bz2?download"; ?> --- 10,25 ---- // IMPORTANT: update these info when a new release is available! // ============================================================= ! $latestversion="2.8.4.0"; $apsize="9.6"; // size of the wxlua-xxx.package file (in MB) $bundlesize="16.9"; // size of the wxlua-xxx.dmg file (in MB) ! $winlink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.0-MSW_bin.zip?use_mirror=osdn"; ! $dlllink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.0-MSW_dll.zip?use_mirror=osdn"; ! $linuxlink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-1.x86.package?download"; $maclink="http://prdownloads.sourceforge.net/wxlua/wxlua-$latestversion-tiger.dmg?download"; ! $gzlink="http://downloads.sourceforge.net/wxlua/wxLua-2.8.4.0.tar.gz?use_mirror=osdn"; ?> *************** *** 77,86 **** So, if you are interested to wxLua as external, embeddable library you should download the <strong>source package</strong>.<br/> Instead, if you are interested to wxLua for scripting only, then go with the <strong>binaries</strong> !</p> <div class="indented"> <h2 id="win">...for Windows</h2> <a href="<?php echo $winlink; ?>"><img src="images/win.png" alt="Windows download"/></a> ! <p><a href="<?php echo $winlink; ?>">Binary package</a> (.exe installer) ~ <?php echo $exesize; ?> MB: self-contained; you won't need anything else.</p> ! <p>You may also want to download a <a href="<?php echo $dlllink; ?>">package</a> containing only the DLLs required for using wxWidgets bindings as a <a href="http://lua-users.org/wiki/BuildingModules">Lua module</a>.</p> <p>For problems with installation, see the <a href="support.php">support page</a>.</p> --- 73,84 ---- So, if you are interested to wxLua as external, embeddable library you should download the <strong>source package</strong>.<br/> Instead, if you are interested to wxLua for scripting only, then go with the <strong>binaries</strong> !</p> + + <p>You can view all the downloads <a href="http://sourceforge.net/project/showfiles.php?group_id=140042">here<alt="Downloads"/></a>.</p> <div class="indented"> <h2 id="win">...for Windows</h2> <a href="<?php echo $winlink; ?>"><img src="images/win.png" alt="Windows download"/></a> ! <p><a href="<?php echo $winlink; ?>">Binary package</a> : self-contained; you won't need anything else.</p> ! <p>You may also want to download a <a href="<?php echo $dlllink; ?>">package</a> containing the DLLs required for using wxWidgets bindings as a <a href="http://lua-users.org/wiki/BuildingModules">Lua module</a>.</p> <p>For problems with installation, see the <a href="support.php">support page</a>.</p> *************** *** 105,110 **** <p>Source packages are available in two formats which contain exactly the same things:</p> <ul> ! <li><a href="<?php echo $bz2link; ?>">Source package</a> (.tar.bz2) ~ <?php echo $bz2size; ?> MB</li> ! <li><a href="<?php echo $ziplink; ?>">Source package</a> (.zip) ~ <?php echo $zipsize; ?> MB</li> </ul> <p>See <a href="docs/install.html">install.html</a> for info about required libraries and how to compile and install them</p> --- 103,107 ---- <p>Source packages are available in two formats which contain exactly the same things:</p> <ul> ! <li><a href="<?php echo $gzlink; ?>">Source package</a> (.tar.gz) </li> </ul> <p>See <a href="docs/install.html">install.html</a> for info about required libraries and how to compile and install them</p> |
|
From: John L. <jr...@us...> - 2007-06-30 18:18:49
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27412/wxLua/samples Modified Files: scribble.wx.lua settings.wx.lua Removed Files: fldemo.wx.lua Log Message: Remove fl lib, it's not going to be used fix toolbar in scribble Index: scribble.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** scribble.wx.lua 14 Jun 2007 01:23:20 -0000 1.20 --- scribble.wx.lua 30 Jun 2007 18:18:45 -0000 1.21 *************** *** 61,89 **** -- Drawing functions -- --------------------------------------------------------------------------- - function CreateToolBarColourBitmap(size) - local w, h = size:GetWidth(), size:GetHeight() - local bmp = wx.wxBitmap(w, h) - local memDC = wx.wxMemoryDC() - memDC:SelectObject(bmp) -- select our bitmap to draw into - - local colour = currentPen:GetColour() - local brush = wx.wxBrush(colour, wx.wxSOLID) - memDC:SetBrush(brush) - memDC:DrawRectangle(0, 0, w, h) - memDC:SetBrush(wx.wxRED_BRUSH) - memDC:DrawRectangle(0, 0, w/3, h) - memDC:SetBrush(wx.wxGREEN_BRUSH) - memDC:DrawRectangle(w/3, 0, w/3, h) - memDC:SetBrush(wx.wxBLUE_BRUSH) - memDC:DrawRectangle(2*math.floor(w/3), 0, w/3, h) - - memDC:SelectObject(wx.wxNullBitmap) -- always release bitmap - memDC:delete() - brush:delete() - colour:delete() - - return bmp - end - function DrawPoints(drawDC) if lastDrawn == 0 then --- 61,64 ---- *************** *** 367,371 **** penWidthSpinCtrl = wx.wxSpinCtrl(toolBar, ID_PENWIDTH_SPINCTRL, "3", ! wx.wxDefaultPosition, wx.wxDefaultSize, wx.wxSP_ARROW_KEYS, 1, 100, 3) local w, h = penWidthSpinCtrl:GetSizeWH() penWidthSpinCtrl:SetSize(3*h, -1) --- 342,347 ---- penWidthSpinCtrl = wx.wxSpinCtrl(toolBar, ID_PENWIDTH_SPINCTRL, "3", ! wx.wxDefaultPosition, wx.wxDefaultSize, ! wx.wxSP_ARROW_KEYS, 1, 100, 3) local w, h = penWidthSpinCtrl:GetSizeWH() penWidthSpinCtrl:SetSize(3*h, -1) *************** *** 374,380 **** toolBar:AddSeparator() ! local bmp = CreateToolBarColourBitmap(toolBmpSize) ! toolBar:AddTool(ID_PENCOLOUR, "Color", bmp, "Choose pen color") ! bmp:delete() -- Create a custom control to choose some common colours. --- 350,366 ---- toolBar:AddSeparator() ! colourPicker = wx.wxColourPickerCtrl(toolBar, ID_PENCOLOUR, wx.wxBLACK, ! wx.wxDefaultPosition, toolBmpSize:op_sub(wx.wxSize(2,2)), ! wx.wxCLRP_DEFAULT_STYLE) ! colourPicker:SetToolTip("Choose pen color") ! colourPicker:Connect(wx.wxEVT_COMMAND_COLOURPICKER_CHANGED, ! function(event) ! local c = event:GetColour() ! currentPen:SetColour(c) ! c:delete() ! end) ! ! toolBar:AddControl(colourPicker) ! toolBar:AddSeparator() -- Create a custom control to choose some common colours. *************** *** 383,389 **** wx.wxDefaultPosition, wx.wxSize(4*colourWin_height, colourWin_height), wx.wxBORDER_NONE) local colourWinColours = { "black", "grey", "brown", "red", "orange", "green", "blue", "violet", ! "white", "light grey", "tan", "pink", "yellow", "turquoise", "sky blue", "maroon" } local colourWinBmp = wx.wxBitmap(4*colourWin_height, colourWin_height) --- 369,378 ---- wx.wxDefaultPosition, wx.wxSize(4*colourWin_height, colourWin_height), wx.wxBORDER_NONE) + -- Need help in GTK to ensure that it's positioned correctly + colourWin:SetMinSize(wx.wxSize(4*colourWin_height, colourWin_height)) + local colourWinColours = { "black", "grey", "brown", "red", "orange", "green", "blue", "violet", ! "white", "light grey", "tan", "pink", "yellow", "turquoise", "sky blue", "maroon" } local colourWinBmp = wx.wxBitmap(4*colourWin_height, colourWin_height) *************** *** 424,430 **** --- 413,432 ---- local c = wx.wxColour(colourWinColours[i]) currentPen:SetColour(c) + colourPicker:SetColour(c) c:delete() end end) + colourWin:Connect(wx.wxEVT_MOTION, + function(event) + local x, y = event:GetPositionXY() + local w, h = colourWin:GetClientSizeWH() + local i = math.floor(8*x/w)+1 + 8*math.floor(2*y/h) + if colourWinColours[i] then + local s = "Set pen color : "..colourWinColours[i] + if colourWin:GetToolTip() ~= s then + colourWin:SetToolTip(s) + end + end + end) toolBar:AddControl(colourWin) *************** *** 545,548 **** --- 547,551 ---- if c:Ok() then -- returns invalid colour if canceled currentPen:SetColour(c) + colourPicker:SetColour(c) end c:delete() Index: settings.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/settings.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** settings.wx.lua 19 Jun 2007 13:58:16 -0000 1.2 --- settings.wx.lua 30 Jun 2007 18:18:46 -0000 1.3 *************** *** 69,73 **** AddListItem({"wx.wxFileName.IsCaseSensitive()", wx.wxFileName.IsCaseSensitive()}) AddListItem({"wx.wxFileName.GetVolumeSeparator()", wx.wxFileName.GetVolumeSeparator()}) - AddListItem({"wx.wxFileName.GetVolumeSeparator()", wx.wxFileName.GetVolumeSeparator()}) --- 69,72 ---- *************** *** 152,156 **** AddListItem({"wx.wxStandardPaths:GetPluginsDir()", stdpaths:GetPluginsDir()}) AddListItem({"wx.wxStandardPaths:GetResourcesDir()", stdpaths:GetResourcesDir()}) ! --AddListItem({"wx.wxStandardPaths:GetLocalizedResourcesDir()", stdpaths:GetLocalizedResourcesDir()}) AddListItem({"wx.wxStandardPaths:GetDocumentsDir()", stdpaths:GetDocumentsDir()}) AddListItem({"wx.wxStandardPaths:GetTempDir()", stdpaths:GetTempDir()}) --- 151,155 ---- AddListItem({"wx.wxStandardPaths:GetPluginsDir()", stdpaths:GetPluginsDir()}) AddListItem({"wx.wxStandardPaths:GetResourcesDir()", stdpaths:GetResourcesDir()}) ! AddListItem({"wx.wxStandardPaths:GetLocalizedResourcesDir(\"\")", stdpaths:GetLocalizedResourcesDir("")}) AddListItem({"wx.wxStandardPaths:GetDocumentsDir()", stdpaths:GetDocumentsDir()}) AddListItem({"wx.wxStandardPaths:GetTempDir()", stdpaths:GetTempDir()}) --- fldemo.wx.lua DELETED --- |
|
From: John L. <jr...@us...> - 2007-06-30 18:18:49
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27412/wxLua/docs Modified Files: wxlua.html wxluaref.html Log Message: Remove fl lib, it's not going to be used fix toolbar in scribble Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wxluaref.html 30 Jun 2007 00:12:20 -0000 1.38 --- wxluaref.html 30 Jun 2007 18:18:45 -0000 1.39 *************** *** 3463,3466 **** --- 3463,3469 ---- <font color=#AA0000><i>%function</i> void wxSafeShowMessage(const <a href="#wxString">wxString</a>& title, const <a href="#wxString">wxString</a>& text)</font><br> <br> + <font color=#009900>// All of the wxLogXXX functions take only a single string,</font><br> + <font color=#009900>// use string.format(...) to format the string in lua.</font><br> + <br> <font color=#009900>// C++ Func: void wxLogError(const char *formatString, ...)</font><br> <font color=#AA0000><i>%function</i> void wxLogError(const <a href="#wxString">wxString</a>& message)</font><br> *************** *** 3474,3478 **** <font color=#AA0000><i>%function</i> void wxLogVerbose(const <a href="#wxString">wxString</a>& message)</font><br> <font color=#009900>// C++ Func: void wxLogStatus(<a href="#wxFrame">wxFrame</a> *frame, const char *formatString, ...)</font><br> ! <font color=#009900>// void wxLogStatus(const char *formatString, ...) // this just uses the toplevel frame</font><br> <font color=#AA0000><i>%function</i> void wxLogStatus(<a href="#wxFrame">wxFrame</a> *frame, const <a href="#wxString">wxString</a>& message)</font><br> <font color=#009900>// C++ Func: void wxLogSysError(const char *formatString, ...)</font><br> --- 3477,3481 ---- <font color=#AA0000><i>%function</i> void wxLogVerbose(const <a href="#wxString">wxString</a>& message)</font><br> <font color=#009900>// C++ Func: void wxLogStatus(<a href="#wxFrame">wxFrame</a> *frame, const char *formatString, ...)</font><br> ! <font color=#009900>// void wxLogStatus(const char *formatString, ...) // this just uses the toplevel frame, use wx.NULL for the frame</font><br> <font color=#AA0000><i>%function</i> void wxLogStatus(<a href="#wxFrame">wxFrame</a> *frame, const <a href="#wxString">wxString</a>& message)</font><br> <font color=#009900>// C++ Func: void wxLogSysError(const char *formatString, ...)</font><br> *************** *** 3485,3489 **** <font color=#009900>// void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated</font><br> <br> ! <b><font size=+1 color=#0066CC><i>%enum</i></font></b> <blockquote><font color=#0066CC> wxLOG_FatalError, <font color=#009900>// program can't continue, abort immediately</font><br> --- 3488,3495 ---- <font color=#009900>// void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated</font><br> <br> ! <i>%typedef</i> wxTraceMask unsigned long<br> ! <i>%typedef</i> wxLogLevel unsigned long<br> ! <br> ! <b><font size=+1 color=#0066CC><i>%enum</i> <font color=#009900>// wxLogLevel - uses these enums</font></font></b> <blockquote><font color=#0066CC> wxLOG_FatalError, <font color=#009900>// program can't continue, abort immediately</font><br> *************** *** 3496,3499 **** --- 3502,3506 ---- wxLOG_Trace, <font color=#009900>// trace messages are also only enabled in debug mode</font><br> wxLOG_Progress, <font color=#009900>// used for progress indicator (not yet)</font><br> + <br> wxLOG_User, <font color=#009900>// user defined levels start here</font><br> wxLOG_Max<br> *************** *** 3510,3516 **** <font color=#006666><i>%msw</i> <i>%define_string</i> wxTRACE_OleCalls <font color=#009900>//wxT("ole") // OLE interface calls</font></font><br> <br> - <i>%typedef</i> wxLogLevel unsigned long<br> - <i>%typedef</i> wxTraceMask unsigned long<br> - <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxLog">wxLog</a></font></b> <blockquote> --- 3517,3520 ---- *************** *** 3655,3659 **** <br> void Show(bool show = true)<br> ! <a href="#wxFrame">wxFrame</a> * GetFrame() const<br> <br> <font color=#009900>//virtual void OnFrameCreate(<a href="#wxFrame">wxFrame</a> *frame)</font><br> --- 3659,3663 ---- <br> void Show(bool show = true)<br> ! <a href="#wxFrame">wxFrame</a>* GetFrame() const<br> <br> <font color=#009900>//virtual void OnFrameCreate(<a href="#wxFrame">wxFrame</a> *frame)</font><br> *************** *** 3966,3970 **** bool Ok() const<br> <br> ! <font color=#009900>// believe it or not, there aren't functions to add or remove entries for MSW</font><br> <br> <font color=#009900>// operators are WXWIN_COMPATIBILITY_2_4</font><br> --- 3970,3974 ---- bool Ok() const<br> <br> ! <font color=#009900>// believe it or not, there aren't functions to add or remove wxAcceleratorEntries for MSW</font><br> <br> <font color=#009900>// operators are WXWIN_COMPATIBILITY_2_4</font><br> *************** *** 4027,4033 **** <font color=#009900>// virtual bool PopupMenu(<a href="#wxMenu">wxMenu</a>* menu)</font><br> <br> ! <font color=#009900>// call RemoveIcon() if you want your program to exit, must have called SetIcon()</font><br> bool RemoveIcon()<br> ! <font color=#009900>// call SetIcon() if have the taskbar icon displayed</font><br> bool SetIcon(const <a href="#wxIcon">wxIcon</a>& icon, const <a href="#wxString">wxString</a>& tooltip)<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> --- 4031,4037 ---- <font color=#009900>// virtual bool PopupMenu(<a href="#wxMenu">wxMenu</a>* menu)</font><br> <br> ! <font color=#009900>// call RemoveIcon() or delete this if you want your program to exit, must have called SetIcon()</font><br> bool RemoveIcon()<br> ! <font color=#009900>// call SetIcon() to have the taskbar icon displayed</font><br> bool SetIcon(const <a href="#wxIcon">wxIcon</a>& icon, const <a href="#wxString">wxString</a>& tooltip)<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> *************** *** 4176,4180 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%noclassinfo</i> <a name="wxSystemSettings">wxSystemSettings</a></font></b> <blockquote> ! <font color=#009900>//<a href="#wxSystemSettings">wxSystemSettings</a>() // all members static</font><br> <br> static <a href="#wxColour">wxColour</a> GetColour(<a href="#wxSystemColour">wxSystemColour</a> index)<br> --- 4180,4184 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%noclassinfo</i> <a name="wxSystemSettings">wxSystemSettings</a></font></b> <blockquote> ! <font color=#009900>//<a href="#wxSystemSettings">wxSystemSettings</a>() // No constructor, all members static</font><br> <br> static <a href="#wxColour">wxColour</a> GetColour(<a href="#wxSystemColour">wxSystemColour</a> index)<br> *************** *** 4392,4396 **** bool IsOk() const<br> <br> ! <font color=#009900>//bool operator==(const <a href="#wxPlatformInfo">wxPlatformInfo</a> &t) const;</font><br> <font color=#009900>//bool operator!=(const <a href="#wxPlatformInfo">wxPlatformInfo</a> &t) const</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> --- 4396,4400 ---- bool IsOk() const<br> <br> ! <font color=#009900>//bool operator==(const <a href="#wxPlatformInfo">wxPlatformInfo</a> &t) const; // we only use the wxWidget's <a href="#wxPlatformInfo">wxPlatformInfo</a></font><br> <font color=#009900>//bool operator!=(const <a href="#wxPlatformInfo">wxPlatformInfo</a> &t) const</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> *************** *** 4441,4445 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxDynamicLibraryDetails">wxDynamicLibraryDetails</a></font></b> <blockquote> ! <font color=#009900>// ctor, normally never used as these objects are only created by</font><br> <font color=#009900>// wxDynamicLibrary::ListLoaded()</font><br> <font color=#009900>//<a href="#wxDynamicLibraryDetails">wxDynamicLibraryDetails</a>() { m_address = NULL; m_length = 0; }</font><br> --- 4445,4449 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxDynamicLibraryDetails">wxDynamicLibraryDetails</a></font></b> <blockquote> ! <font color=#009900>// ctor, normally never used as these objects are only created by <a href="#wxDynamicLibrary">wxDynamicLibrary</a></font><br> <font color=#009900>// wxDynamicLibrary::ListLoaded()</font><br> <font color=#009900>//<a href="#wxDynamicLibraryDetails">wxDynamicLibraryDetails</a>() { m_address = NULL; m_length = 0; }</font><br> *************** *** 5605,5609 **** <font color=#009900>//void SetWindowStyleFlag(long style) - see <a href="#wxWindow">wxWindow</a></font><br> <br> - <br> <font color=#BB0055> <font color=#009900>// <i>%override</i> bool SortItems(lua function(long item1, long item2, long data) returning int, long data)</font></font><br> <font color=#009900>// C++ Func: bool SortItems(wxListCtrlCompare fnSortCallBack, long data)</font><br> --- 5609,5612 ---- Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxlua.html 30 Jun 2007 00:12:20 -0000 1.27 --- wxlua.html 30 Jun 2007 18:18:45 -0000 1.28 *************** *** 3,19 **** <head> <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> - <title>wxLua Documentation</title> - <meta content="John Labenski" name="author"> </head> [...4279 lines suppressed...] things up for wxLua first.</li> + <li>Returns lua's error code LUA_ERRXXX or 0 on success</li> + + </ul> + <li>The other functions are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> + </ul> + </body> </html> |
|
From: John L. <jr...@us...> - 2007-06-30 18:18:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27412/wxLua/modules/wxbind/src Modified Files: appframe.cpp Log Message: Remove fl lib, it's not going to be used fix toolbar in scribble Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** appframe.cpp 27 Jun 2007 19:56:30 -0000 1.63 --- appframe.cpp 30 Jun 2007 18:18:45 -0000 1.64 *************** *** 929,933 **** static int LUACALL wxLua_wxLogWindow_GetFrame(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_GetFrame[1] = {{ wxLua_wxLogWindow_GetFrame, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLogWindow_GetFrame }}; ! // wxFrame * GetFrame() const static int LUACALL wxLua_wxLogWindow_GetFrame(lua_State *L) { --- 929,933 ---- static int LUACALL wxLua_wxLogWindow_GetFrame(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_GetFrame[1] = {{ wxLua_wxLogWindow_GetFrame, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLogWindow_GetFrame }}; ! // wxFrame* GetFrame() const static int LUACALL wxLua_wxLogWindow_GetFrame(lua_State *L) { |
|
From: John L. <jr...@us...> - 2007-06-30 18:18:48
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27412/wxLua/bindings/wxwidgets Modified Files: appframe.i controls.i override.hpp wrappers.lst Removed Files: fl.i Log Message: Remove fl lib, it's not going to be used fix toolbar in scribble --- fl.i DELETED --- Index: wrappers.lst =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wrappers.lst,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wrappers.lst 7 Jun 2005 04:17:38 -0000 1.1 --- wrappers.lst 30 Jun 2007 18:18:44 -0000 1.2 *************** *** 10,14 **** event.i \ file.i \ - fl.i \ gdi.i \ geometry.i \ --- 10,13 ---- Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** appframe.i 27 Jun 2007 19:56:28 -0000 1.45 --- appframe.i 30 Jun 2007 18:18:44 -0000 1.46 *************** *** 21,24 **** --- 21,27 ---- %function void wxSafeShowMessage(const wxString& title, const wxString& text) + // All of the wxLogXXX functions take only a single string, + // use string.format(...) to format the string in lua. + // C++ Func: void wxLogError(const char *formatString, ...) %function void wxLogError(const wxString& message) *************** *** 32,36 **** %function void wxLogVerbose(const wxString& message) // C++ Func: void wxLogStatus(wxFrame *frame, const char *formatString, ...) ! // void wxLogStatus(const char *formatString, ...) // this just uses the toplevel frame %function void wxLogStatus(wxFrame *frame, const wxString& message) // C++ Func: void wxLogSysError(const char *formatString, ...) --- 35,39 ---- %function void wxLogVerbose(const wxString& message) // C++ Func: void wxLogStatus(wxFrame *frame, const char *formatString, ...) ! // void wxLogStatus(const char *formatString, ...) // this just uses the toplevel frame, use wx.NULL for the frame %function void wxLogStatus(wxFrame *frame, const wxString& message) // C++ Func: void wxLogSysError(const char *formatString, ...) *************** *** 43,47 **** // void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated ! %enum wxLOG_FatalError, // program can't continue, abort immediately wxLOG_Error, // a serious error, user must be informed about it --- 46,53 ---- // void wxLogTrace(wxTraceMask mask, const char *formatString, ...) - deprecated ! %typedef wxTraceMask unsigned long ! %typedef wxLogLevel unsigned long ! ! %enum // wxLogLevel - uses these enums wxLOG_FatalError, // program can't continue, abort immediately wxLOG_Error, // a serious error, user must be informed about it *************** *** 53,56 **** --- 59,63 ---- wxLOG_Trace, // trace messages are also only enabled in debug mode wxLOG_Progress, // used for progress indicator (not yet) + wxLOG_User, // user defined levels start here wxLOG_Max *************** *** 66,72 **** %msw %define_string wxTRACE_OleCalls //wxT("ole") // OLE interface calls - %typedef wxLogLevel unsigned long - %typedef wxTraceMask unsigned long - %class %delete %noclassinfo %encapsulate wxLog //wxLog() - No constructor, a base class, use one of the derived classes. --- 73,76 ---- *************** *** 201,205 **** void Show(bool show = true) ! wxFrame * GetFrame() const //virtual void OnFrameCreate(wxFrame *frame) --- 205,209 ---- void Show(bool show = true) ! wxFrame* GetFrame() const //virtual void OnFrameCreate(wxFrame *frame) *************** *** 500,504 **** bool Ok() const ! // believe it or not, there aren't functions to add or remove entries for MSW // operators are WXWIN_COMPATIBILITY_2_4 --- 504,508 ---- bool Ok() const ! // believe it or not, there aren't functions to add or remove wxAcceleratorEntries for MSW // operators are WXWIN_COMPATIBILITY_2_4 *************** *** 557,563 **** // virtual bool PopupMenu(wxMenu* menu) ! // call RemoveIcon() if you want your program to exit, must have called SetIcon() bool RemoveIcon() ! // call SetIcon() if have the taskbar icon displayed bool SetIcon(const wxIcon& icon, const wxString& tooltip) %endclass --- 561,567 ---- // virtual bool PopupMenu(wxMenu* menu) ! // call RemoveIcon() or delete this if you want your program to exit, must have called SetIcon() bool RemoveIcon() ! // call SetIcon() to have the taskbar icon displayed bool SetIcon(const wxIcon& icon, const wxString& tooltip) %endclass *************** *** 694,698 **** %class %noclassinfo wxSystemSettings ! //wxSystemSettings() // all members static static wxColour GetColour(wxSystemColour index) --- 698,702 ---- %class %noclassinfo wxSystemSettings ! //wxSystemSettings() // No constructor, all members static static wxColour GetColour(wxSystemColour index) *************** *** 897,901 **** bool IsOk() const ! //bool operator==(const wxPlatformInfo &t) const; //bool operator!=(const wxPlatformInfo &t) const %endclass --- 901,905 ---- bool IsOk() const ! //bool operator==(const wxPlatformInfo &t) const; // we only use the wxWidget's wxPlatformInfo //bool operator!=(const wxPlatformInfo &t) const %endclass *************** *** 939,943 **** %class %delete %noclassinfo %encapsulate wxDynamicLibraryDetails ! // ctor, normally never used as these objects are only created by // wxDynamicLibrary::ListLoaded() //wxDynamicLibraryDetails() { m_address = NULL; m_length = 0; } --- 943,947 ---- %class %delete %noclassinfo %encapsulate wxDynamicLibraryDetails ! // ctor, normally never used as these objects are only created by wxDynamicLibrary // wxDynamicLibrary::ListLoaded() //wxDynamicLibraryDetails() { m_address = NULL; m_length = 0; } Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** override.hpp 25 Jun 2007 03:19:37 -0000 1.80 --- override.hpp 30 Jun 2007 18:18:44 -0000 1.81 *************** *** 2147,2153 **** // ---------------------------------------------------------------------------- - // Overrides for fl.i - // ---------------------------------------------------------------------------- - // ---------------------------------------------------------------------------- // Overrides for gdi.i // ---------------------------------------------------------------------------- --- 2147,2150 ---- Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** controls.i 25 Jun 2007 03:19:37 -0000 1.45 --- controls.i 30 Jun 2007 18:18:44 -0000 1.46 *************** *** 482,486 **** //void SetWindowStyleFlag(long style) - see wxWindow - // %override bool SortItems(lua function(long item1, long item2, long data) returning int, long data) // C++ Func: bool SortItems(wxListCtrlCompare fnSortCallBack, long data) --- 482,485 ---- |
|
From: John L. <jr...@us...> - 2007-06-30 00:13:04
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9448/wxLua/docs Modified Files: binding.html wxlua.html wxluaref.html Log Message: Fix for MingW added in wxWidgets bindings for wxDefaultPoint and wxEVT_FILEPICKER/DIRPICKER... Rename the functions to get the type names from wxLua to match closer to the lua type() function, wxlua.i Change op_add_assign to just op_iadd (others as well) = op_assign is now op_set Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** wxluaref.html 28 Jun 2007 21:52:56 -0000 1.37 --- wxluaref.html 30 Jun 2007 00:12:20 -0000 1.38 *************** *** 3352,3355 **** --- 3352,3356 ---- <a href="#wxProtocolError">wxProtocolError</a><br> <a href="#wxRegionContain">wxRegionContain</a><br> + <a href="#wxRegionOp">wxRegionOp</a><br> <a href="#wxRelationship">wxRelationship</a><br> <a href="#wxRendererVersion::dummy">wxRendererVersion::dummy</a><br> *************** *** 6652,6655 **** --- 6653,6658 ---- void SetRefData(<a href="#wxObjectRefData">wxObjectRefData</a>* data)<br> void UnRef()<br> + <br> + <font color=#009900>//<i>%operator</i> <a href="#wxObject">wxObject</a>& operator=(const <a href="#wxObject">wxObject</a>& other)</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11190,11193 **** --- 11193,11198 ---- <i>%include</i> "wx/gdicmn.h"<br> <br> + <font color=#006666><i>%define</i> wxDefaultCoord</font><br> + <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxPoint">wxPoint</a></font></b> <blockquote> *************** *** 11205,11222 **** void Set(int x, int y)<br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> int x <font color=#009900>// GetX() and SetX(int x)</font></font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> int y <font color=#009900>// GetY() and SetY(int y)</font></font><br> <br> <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator=(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> bool operator==(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> bool operator!=(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator+(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator+=(const <a href="#wxPoint">wxPoint</a>& p)<br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator-=(const <a href="#wxPoint">wxPoint</a>& p)<br> ! <font color=#990099> <i>%rename</i> op_add_assign_Size <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator+=(const <a href="#wxSize">wxSize</a>& s)</font><br> ! <font color=#990099> <i>%rename</i> op_sub_assign_Size <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator-=(const <a href="#wxSize">wxSize</a>& s)</font><br> ! <font color=#990099> <i>%rename</i> op_add_Size <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator+(const <a href="#wxSize">wxSize</a>& s) const</font><br> ! <font color=#990099> <i>%rename</i> op_sub_Size <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxSize">wxSize</a>& s) const</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> --- 11210,11235 ---- void Set(int x, int y)<br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> int x <font color=#009900>// GetX() and SetX(int x)</font></font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> int y <font color=#009900>// GetY() and SetY(int y)</font></font><br> <br> <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator=(const <a href="#wxPoint">wxPoint</a>& p) const<br> ! <br> ! <i>%operator</i> bool operator==(const <a href="#wxPoint">wxPoint</a>& p) const <font color=#009900>//{ return x == p.x && y == p.y; }</font><br> ! <i>%operator</i> bool operator!=(const <a href="#wxPoint">wxPoint</a>& p) const <font color=#009900>//{ return !(*this == p); }</font><br> ! <br> ! <font color=#009900>// arithmetic operations (component wise)</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator+(const <a href="#wxPoint">wxPoint</a>& p) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x + p.x, y + p.y); }</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxPoint">wxPoint</a>& p) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x - p.x, y - p.y); }</font><br> ! <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator+=(const <a href="#wxPoint">wxPoint</a>& p) <font color=#009900>//{ x += p.x; y += p.y; return *this; }</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator-=(const <a href="#wxPoint">wxPoint</a>& p) <font color=#009900>//{ x -= p.x; y -= p.y; return *this; }</font><br> ! <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator+=(const <a href="#wxSize">wxSize</a>& s) <font color=#009900>//{ x += s.GetWidth(); y += s.GetHeight(); return *this; }</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a>& operator-=(const <a href="#wxSize">wxSize</a>& s) <font color=#009900>//{ x -= s.GetWidth(); y -= s.GetHeight(); return *this; }</font><br> ! <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator+(const <a href="#wxSize">wxSize</a>& s) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x + s.GetWidth(), y + s.GetHeight()); }</font><br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-(const <a href="#wxSize">wxSize</a>& s) const <font color=#009900>//{ return <a href="#wxPoint">wxPoint</a>(x - s.GetWidth(), y - s.GetHeight()); }</font><br> ! <br> ! <i>%operator</i> <a href="#wxPoint">wxPoint</a> operator-() const { return <a href="#wxPoint">wxPoint</a>(-x, -y); }<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11257,11260 **** --- 11270,11288 ---- void SetHeight(int height)<br> void SetWidth(int width)<br> + <br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator=(const <a href="#wxSize">wxSize</a>& s) const<br> + <br> + <i>%operator</i> bool operator==(const <a href="#wxSize">wxSize</a>& sz) const <font color=#009900>//{ return x == sz.x && y == sz.y; }</font><br> + <i>%operator</i> bool operator!=(const <a href="#wxSize">wxSize</a>& sz) const <font color=#009900>//{ return x != sz.x || y != sz.y; }</font><br> + <br> + <i>%operator</i> <a href="#wxSize">wxSize</a> operator+(const <a href="#wxSize">wxSize</a>& sz) const <font color=#009900>//{ return <a href="#wxSize">wxSize</a>(x + sz.x, y + sz.y); }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a> operator-(const <a href="#wxSize">wxSize</a>& sz) const <font color=#009900>//{ return <a href="#wxSize">wxSize</a>(x - sz.x, y - sz.y); }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a> operator/(int i) const <font color=#009900>//{ return <a href="#wxSize">wxSize</a>(x / i, y / i); }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a> operator*(int i) const <font color=#009900>//{ return <a href="#wxSize">wxSize</a>(x * i, y * i); }</font><br> + <br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator+=(const <a href="#wxSize">wxSize</a>& sz) <font color=#009900>//{ x += sz.x; y += sz.y; return *this; }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator-=(const <a href="#wxSize">wxSize</a>& sz) <font color=#009900>//{ x -= sz.x; y -= sz.y; return *this; }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator/=(const int i) <font color=#009900>//{ x /= i; y /= i; return *this; }</font><br> + <i>%operator</i> <a href="#wxSize">wxSize</a>& operator*=(const int i) <font color=#009900>//{ x *= i; y *= i; return *this; }</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11311,11314 **** --- 11339,11348 ---- void SetY(int Y)<br> <a href="#wxRect">wxRect</a> Union(const <a href="#wxRect">wxRect</a>& rect) const <font color=#009900>//<a href="#wxRect">wxRect</a>& Union(const <a href="#wxRect">wxRect</a>& rect);</font><br> + <br> + <i>%operator</i> <a href="#wxRect">wxRect</a>& operator=(const <a href="#wxRect">wxRect</a>& r) const<br> + <br> + <i>%operator</i> bool operator==(const <a href="#wxRect">wxRect</a>& rect) const<br> + <i>%operator</i> <a href="#wxRect">wxRect</a> operator+(const <a href="#wxRect">wxRect</a>& rect) const<br> + <i>%operator</i> <a href="#wxRect">wxRect</a>& operator+=(const <a href="#wxRect">wxRect</a>& rect)<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11340,11343 **** --- 11374,11391 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> + <i>%if</i> defined(wxHAS_REGION_COMBINE) <font color=#009900>// MSW and MAC</font><br> + <b><font size=+1 color=#0066CC> <i>%enum</i> <a name="wxRegionOp">wxRegionOp</a></font></b> + <blockquote><font color=#0066CC> + wxRGN_AND <font color=#009900>// Creates the intersection of the two combined regions.</font><br> + wxRGN_COPY <font color=#009900>// Creates a copy of the region</font><br> + wxRGN_DIFF <font color=#009900>// Combines the parts of first region that are not in the second one</font><br> + wxRGN_OR <font color=#009900>// Creates the union of two combined regions.</font><br> + wxRGN_XOR <font color=#009900>// Creates the union of two regions except for any overlapping areas.</font><br> + </font> + </blockquote><font color=#0066CC> <i>%endenum</i></font><br> + <br> + <font color=#006666><i>%define</i> wxHAS_REGION_COMBINE 1</font><br> + <i>%endif</i> <font color=#009900>// defined(wxHAS_REGION_COMBINE)</font><br> + <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxRegion">wxRegion</a>, <a href="#wxGDIObject">wxGDIObject</a></font></b> <blockquote> *************** *** 11349,11352 **** --- 11397,11407 ---- <br> void Clear()<br> + <br> + <i>%if</i> defined(wxHAS_REGION_COMBINE) <font color=#009900>// MSW and MAC</font><br> + bool Combine(wxCoord x, wxCoord y, wxCoord w, wxCoord h, <a href="#wxRegionOp">wxRegionOp</a> op);<br> + bool Combine(const <a href="#wxRect">wxRect</a>& rect, <a href="#wxRegionOp">wxRegionOp</a> op);<br> + bool Combine(const <a href="#wxRegion">wxRegion</a>& region, <a href="#wxRegionOp">wxRegionOp</a> op)<br> + <i>%endif</i> <font color=#009900>// defined(wxHAS_REGION_COMBINE)</font><br> + <br> <a href="#wxRegionContain">wxRegionContain</a> Contains(long x, long y)<br> <a href="#wxRegionContain">wxRegionContain</a> Contains(const <a href="#wxPoint">wxPoint</a>& pt)<br> *************** *** 11364,11368 **** bool Intersect(const <a href="#wxRegion">wxRegion</a>& region)<br> bool IsEmpty() const<br> ! <font color=#009900>//<i>%gtk</i> bool Ok() const</font><br> bool Subtract(long x, long y, long width, long height)<br> bool Subtract(const <a href="#wxRect">wxRect</a>& rect)<br> --- 11419,11424 ---- bool Intersect(const <a href="#wxRegion">wxRegion</a>& region)<br> bool IsEmpty() const<br> ! <i>%wxchkver_2_8</i> bool IsEqual(const <a href="#wxRegion">wxRegion</a>& region) const<br> ! <i>%wxchkver_2_8</i> bool Ok() const<br> bool Subtract(long x, long y, long width, long height)<br> bool Subtract(const <a href="#wxRect">wxRect</a>& rect)<br> *************** *** 11377,11380 **** --- 11433,11439 ---- bool Xor(const <a href="#wxRect">wxRect</a>& rect)<br> bool Xor(const <a href="#wxRegion">wxRegion</a>& region)<br> + <br> + <i>%operator</i> <a href="#wxRegion">wxRegion</a>& operator=(const <a href="#wxRegion">wxRegion</a>& r) const<br> + <font color=#009900>// operator == just calls IsEqual()</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11642,11645 **** --- 11701,11707 ---- void SetUnderlined(const bool underlined)<br> void SetWeight(int weight)<br> + <br> + <i>%operator</i> <a href="#wxFont">wxFont</a>& operator=(const <a href="#wxFont">wxFont</a>& f) const<br> + <i>%operator</i> bool operator == (const <a href="#wxFont">wxFont</a>& font) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11826,11829 **** --- 11888,11894 ---- void Set(unsigned long colRGB)<br> <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i></font><br> + <br> + <i>%operator</i> <a href="#wxColour">wxColour</a>& operator=(const <a href="#wxColour">wxColour</a>& c) const<br> + <i>%operator</i> bool operator == (const <a href="#wxColour">wxColour</a>& c) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11915,11918 **** --- 11980,11986 ---- void SetStyle(int style)<br> void SetWidth(int width)<br> + <br> + <i>%operator</i> <a href="#wxPen">wxPen</a>& operator=(const <a href="#wxPen">wxPen</a>& p) const<br> + <i>%operator</i> bool operator == (const <a href="#wxPen">wxPen</a>& p) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 11973,11976 **** --- 12041,12047 ---- void SetStipple(const <a href="#wxBitmap">wxBitmap</a>& bitmap)<br> void SetStyle(int style)<br> + <br> + <i>%operator</i> <a href="#wxBrush">wxBrush</a>& operator=(const <a href="#wxBrush">wxBrush</a>& b) const<br> + <i>%operator</i> bool operator == (const <a href="#wxBrush">wxBrush</a>& b) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 12117,12120 **** --- 12188,12193 ---- void SetWidth(int w)<br> <font color=#009900>//<i>%win</i> void SetSize(const <a href="#wxSize">wxSize</a>& size)</font><br> + <br> + <i>%operator</i> <a href="#wxIcon">wxIcon</a>& operator=(const <a href="#wxIcon">wxIcon</a>& i) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 12224,12227 **** --- 12297,12302 ---- <i>%win</i> void SetPalette(const <a href="#wxPalette">wxPalette</a>& palette)<br> void SetWidth(int width)<br> + <br> + <i>%operator</i> <a href="#wxBitmap">wxBitmap</a>& operator=(const <a href="#wxBitmap">wxBitmap</a>& b) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 12303,12306 **** --- 12378,12383 ---- <font color=#009900>//<i>%win</i> void SetDepth(int depth)</font><br> <font color=#009900>//<i>%win</i> void SetSize(const <a href="#wxSize">wxSize</a>& size)</font><br> + <br> + <i>%operator</i> <a href="#wxCursor">wxCursor</a>& operator=(const <a href="#wxCursor">wxCursor</a>& c) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 12324,12327 **** --- 12401,12406 ---- bool Create(const <a href="#wxBitmap">wxBitmap</a>& bitmap, const <a href="#wxColour">wxColour</a>& colour)<br> <i>%win</i> bool Create(const <a href="#wxBitmap">wxBitmap</a>& bitmap, int index)<br> + <br> + <i>%operator</i> <a href="#wxMask">wxMask</a>& operator=(const <a href="#wxMask">wxMask</a>& m) const<br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 13223,13228 **** <font color=#009900>//void ReadFrom( <a href="#wxDataInputStream">wxDataInputStream</a> &stream )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> wxInt32 m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> wxInt32 m_y</font><br> <br> <i>%operator</i> <a href="#wxPoint2DInt">wxPoint2DInt</a> operator-()<br> --- 13302,13307 ---- <font color=#009900>//void ReadFrom( <a href="#wxDataInputStream">wxDataInputStream</a> &stream )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> wxInt32 m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> wxInt32 m_y</font><br> <br> <i>%operator</i> <a href="#wxPoint2DInt">wxPoint2DInt</a> operator-()<br> *************** *** 13266,13271 **** wxDouble GetCrossProduct( const <a href="#wxPoint2DDouble">wxPoint2DDouble</a> &vec ) const<br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> wxDouble m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> wxDouble m_y</font><br> <br> <i>%operator</i> <a href="#wxPoint2DDouble">wxPoint2DDouble</a> operator-()<br> --- 13345,13350 ---- wxDouble GetCrossProduct( const <a href="#wxPoint2DDouble">wxPoint2DDouble</a> &vec ) const<br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> wxDouble m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> wxDouble m_y</font><br> <br> <i>%operator</i> <a href="#wxPoint2DDouble">wxPoint2DDouble</a> operator-()<br> *************** *** 13343,13350 **** <font color=#009900>//void Scale( wxInt32 num , wxInt32 denum )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> wxDouble m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> wxDouble m_y</font><br> ! <font color=#CC6600> <i>%rename</i> Width <i>%member</i> wxDouble m_width</font><br> ! <font color=#CC6600> <i>%rename</i> Height <i>%member</i> wxDouble m_height</font><br> <br> <font color=#009900>//<a href="#wxRect2DDouble">wxRect2DDouble</a>& operator = (const <a href="#wxRect2DDouble">wxRect2DDouble</a>& rect) - use copy constructor</font><br> --- 13422,13429 ---- <font color=#009900>//void Scale( wxInt32 num , wxInt32 denum )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> wxDouble m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> wxDouble m_y</font><br> ! <font color=#CC6600> <i>%rename</i> Width <i>%member_func</i> wxDouble m_width</font><br> ! <font color=#CC6600> <i>%rename</i> Height <i>%member_func</i> wxDouble m_height</font><br> <br> <font color=#009900>//<a href="#wxRect2DDouble">wxRect2DDouble</a>& operator = (const <a href="#wxRect2DDouble">wxRect2DDouble</a>& rect) - use copy constructor</font><br> *************** *** 13419,13426 **** <font color=#009900>//void ReadFrom( <a href="#wxDataInputStream">wxDataInputStream</a> &stream )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member</i> wxInt32 m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member</i> wxInt32 m_y</font><br> ! <font color=#CC6600> <i>%rename</i> Width <i>%member</i> wxInt32 m_width</font><br> ! <font color=#CC6600> <i>%rename</i> Height <i>%member</i> wxInt32 m_height</font><br> <br> <font color=#009900>//<a href="#wxRect2DInt">wxRect2DInt</a>& operator = (const <a href="#wxRect2DInt">wxRect2DInt</a>& rect) - use copy constructor</font><br> --- 13498,13505 ---- <font color=#009900>//void ReadFrom( <a href="#wxDataInputStream">wxDataInputStream</a> &stream )</font><br> <br> ! <font color=#CC6600> <i>%rename</i> X <i>%member_func</i> wxInt32 m_x</font><br> ! <font color=#CC6600> <i>%rename</i> Y <i>%member_func</i> wxInt32 m_y</font><br> ! <font color=#CC6600> <i>%rename</i> Width <i>%member_func</i> wxInt32 m_width</font><br> ! <font color=#CC6600> <i>%rename</i> Height <i>%member_func</i> wxInt32 m_height</font><br> <br> <font color=#009900>//<a href="#wxRect2DInt">wxRect2DInt</a>& operator = (const <a href="#wxRect2DInt">wxRect2DInt</a>& rect) - use copy constructor</font><br> *************** *** 15191,15196 **** <blockquote> <a href="#wxImageHistogramEntry">wxImageHistogramEntry</a>()<br> ! <font color=#CC6600> <i>%rename</i> Index <i>%member</i> unsigned long index <font color=#009900>// GetIndex() only, SetIndex(idx) is not allowed</font></font><br> ! <font color=#CC6600> <i>%rename</i> Value <i>%member</i> unsigned long value <font color=#009900>// GetValue() and SetValue(val)</font></font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> --- 15270,15275 ---- <blockquote> <a href="#wxImageHistogramEntry">wxImageHistogramEntry</a>()<br> ! <font color=#CC6600> <i>%member</i> unsigned long index <font color=#009900>// GetIndex() only, SetIndex(idx) is not allowed</font></font><br> ! <font color=#CC6600> <i>%member</i> unsigned long value <font color=#009900>// GetValue() and SetValue(val)</font></font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 18512,18518 **** <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxVisualAttributes">wxVisualAttributes</a></font></b> <blockquote> ! <font color=#CC6600> <i>%rename</i> Font <i>%member</i> <a href="#wxFont">wxFont</a> font</font><br> ! <font color=#990099> <i>%rename</i> ColFg <a href="#wxColour">wxColour</a> colFg</font><br> ! <font color=#990099> <i>%rename</i> ColBg <a href="#wxColour">wxColour</a> colBg</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> --- 18591,18597 ---- <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxVisualAttributes">wxVisualAttributes</a></font></b> <blockquote> ! <font color=#CC6600> <i>%member</i> <a href="#wxFont">wxFont</a> font</font><br> ! <font color=#CC6600> <i>%member</i> <a href="#wxColour">wxColour</a> colFg</font><br> ! <font color=#CC6600> <i>%member</i> <a href="#wxColour">wxColour</a> colBg</font><br> </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> <br> *************** *** 23169,23174 **** <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// Get information about the status of wxLua.</font><br> - <font color=#009900>//</font><br> - <font color=#009900>// Please take special note of</font><br> <br> <font color=#009900>// Get a table of all tracked top level windows that wxLua will Destroy()</font><br> --- 23248,23251 ---- *************** *** 23242,23256 **** <br> <font color=#009900>// Is this lua_type() (or in lua the type() function) considered equivalent</font><br> ! <font color=#AA0000><i>%function</i> int wxlua_iswxluatype(int luatype, int wxluaarg_tag)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> <a href="#wxString">wxString</a> wxlua_typename(int wxluaarg_tag)</font></font><br> ! <font color=#009900>// C++ Func: <a href="#wxString">wxString</a> wxlua_getwxluatypename(int wxluaarg_tag)</font><br> ! <font color=#009900>// Returns the tag name for both the predefined (negative) as well as the</font><br> ! <font color=#009900>// binding class tags. (C function only does predefined tags)</font><br> ! <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> wxlua_typename(int wxluaarg_tag)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> int wxlua_type(void* object)</font></font><br> ! <font color=#009900>// Get the wxlua type (tag) of the object, this is the arg tags number</font><br> ! <font color=#AA0000><i>%function</i> int wxlua_type(void* object)</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> --- 23319,23336 ---- <br> <font color=#009900>// Is this lua_type() (or in lua the type() function) considered equivalent</font><br> ! <font color=#990099><i>%rename</i> iswxluatype <i>%function</i> int wxlua_iswxluatype(int luatype, int wxluaarg_tag)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> [wxlua_typename, wxlua_type#, lua_typename, lua_type#] type(void* object)</font></font><br> ! <font color=#009900>// Given any type of object, returns four values:</font><br> ! <font color=#009900>// wxlua name of the type - wxLuaState::GetLuaTagName(wxlua_type)</font><br> ! <font color=#009900>// wxlua number of the type - wxlua_getwxluatype(lua_type(L, stack_idx)) or wxlua_ttag</font><br> ! <font color=#009900>// lua name of the type - lua_typename(L, lua_type(L, stack_idx))</font><br> ! <font color=#009900>// lua number of the type - lua_type(L, stack_idx)</font><br> ! <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> type(void* object)</font><br> <br> ! <font color=#BB0055><font color=#009900>// <i>%override</i> wString typename(int wxluaarg_tag)</font></font><br> ! <font color=#009900>// Returns the wxLua tag name for both the predefined (negative) as well as the</font><br> ! <font color=#009900>// binding class tag numbers.</font><br> ! <font color=#AA0000><i>%function</i> <a href="#wxString">wxString</a> typename(int wxluaarg_tag)</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxlua.html 16 Jun 2007 06:21:43 -0000 1.26 --- wxlua.html 30 Jun 2007 00:12:20 -0000 1.27 *************** *** 1,8 **** <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> ! <html><head> ! <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>wxLua Documentation</title> ! <meta content="John Labenski" name="author"></head> ! <body><h2><u>wxLua Documentation</u></h2> <a href="http://wxlua.sourceforge.net">wxLua</a> is a <a href="http://www.lua.org">Lua</a> --- 1,19 ---- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> [...4195 lines suppressed...] ! LuaPCall(int narg, int nresults)</li> ! ! <ul> ! ! <li>Uses lua_call to run a chunk on the stack, but sets ! things up for wxLua first.</li> ! ! <li>Returns lua's error ! code LUA_ERRXXX or 0 on success</li> ! ! </ul> ! ! <li>The other functions are documented in <span style="font-style: italic;">wxLua/modules/wxlua/include/wxlstate.h</span>.</li> ! ! </ul> ! ! </body> ! </html> Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** binding.html 25 Jun 2007 03:19:38 -0000 1.23 --- binding.html 30 Jun 2007 00:12:20 -0000 1.24 *************** *** 11,14 **** --- 11,15 ---- </head> + <body> *************** *** 866,871 **** accessed in wxLua using <i>wx.NUMBER</i>. </li> ! <li>The ! <i>NUMBER</i> can be a #define or an int. </li> --- 867,871 ---- accessed in wxLua using <i>wx.NUMBER</i>. </li> ! <li>The <i>NUMBER</i> can be a #define or an int. </li> *************** *** 963,968 **** accessed in wxLua using <i>wx.STRING</i>. </li> ! <li>The ! <i>STRING</i> must be defined as <i>"const wxChar* STRING = _("str") or --- 963,967 ---- accessed in wxLua using <i>wx.STRING</i>. </li> ! <li>The <i>STRING</i> must be defined as <i>"const wxChar* STRING = _("str") or *************** *** 1053,1057 **** <li>Note that by default, functions that return a pointer '*' or a reference '&' do NOT add the return value to the list of ! objects to be garbage collected even if it is a <i>%class</i> data type with the <i>%delete</i> tag. This is because it is assumed that the return value is 'owned' by someone else that will --- 1052,1057 ---- <li>Note that by default, functions that return a pointer '*' or a reference '&' do NOT add the return value to the list of ! objects to be garbage collected even if it is a <i>%class</i> ! data type with the <i>%delete</i> tag. This is because it is assumed that the return value is 'owned' by someone else that will *************** *** 1137,1140 **** --- 1137,1159 ---- <ul> + <li>Declare a property to access member + variables in a + class. </li> + + <li>This tag must + be used inside of the <i>%class</i> tag. </li> + + <li>The variables will be accessible only using the '.' + convention as if they were table members.</li> + + <li>If the variable is const, it is only read-only.</li> + + </ul> + + <b><i>%member_func int m_x</i><br> + + </b> + <ul> + <li>Declare a function to access member variables in a *************** *** 1153,1158 **** <li>For example, in wxPoint <i>"%rename X %member int x"</i> will generate wxPoint methods named <span style="font-style: italic;">"pt:GetX()"</span> ! and ! <span style="font-style: italic;">"pt:SetX(5)"</span> for the wxPoint class as well as properties to access them as if they were table members, <span style="font-style: italic;">print(pt:x)</span> --- 1172,1176 ---- <li>For example, in wxPoint <i>"%rename X %member int x"</i> will generate wxPoint methods named <span style="font-style: italic;">"pt:GetX()"</span> ! and <span style="font-style: italic;">"pt:SetX(5)"</span> for the wxPoint class as well as properties to access them as if they were table members, <span style="font-style: italic;">print(pt:x)</span> *************** *** 1197,1267 **** </ul> - "=" = op_assign<br> - - "==" = "op_eq"<br> - - "!=" = "op_ne"<br> - - "<" = "op_lt"<br> - - ">" = "op_gt"<br> - - "<=" = "op_le"<br> - - ">=" = "op_ge"<br> - - <br> - - "|" = "op_or"<br> - - "&" = "op_and"<br> - - "||" = "op_lor" note: lor stands or logical (boolean) or, - same for land.<br> - - "&&" = "op_land"<br> - - "!" = "op_not"<br> - - "^" = "op_xor"<br> - - <br> - - "++" = "op_inc"<br> - - "--" = "op_dec"<br> - - <br> - - "+" = "op_add"<br> - - "-" = "op_sub"<br> - - "- (unary)" = "op_neg"<br> - - "*" = "op_mul"<br> - - "/" = "op_div"<br> - - <br> - - "+=" = "op_add_assign"<br> - - "-=" = "op_sub_assign"<br> - - "*=" = "op_mul_assign"<br> - - "/=" = "op_div_assign"<br> - - "%=" = "op_mod_assign"<br> - - "&=" = "op_and_assign"<br> - - "|=" = "op_or_assign"<br> - - "^=" = "op_xor_assign"<br> - - <br> <i><b>%not_overload int FUNC_NAME(int value)</b></i><br> --- 1215,1260 ---- </ul> + <ul> + <li>"==" = "op_eq"</li> + <li>"!=" = "op_ne"</li> + <li>"<" = "op_lt"</li> + <li>">" = "op_gt"</li> + <li>"<=" = "op_le"</li> + <li>">=" = "op_ge"</li> + </ul> + <ul> + <li>"|" = "op_or"</li> + <li>"&" = "op_and"</li> + <li>"||" = "op_lor" note: "lor" stands for logical (boolean) or, + same for "land."</li> + <li>"&&" = "op_land"</li> + <li>"!" = "op_not"</li> + <li>"^" = "op_xor"</li> + </ul> + <ul> + <li>"++" = "op_inc"</li> + <li>"--" = "op_dec"</li> + <li>"- (unary)" = "op_neg"</li> + </ul> + <ul> + <li>"=" = op_set</li> + <li>"+" = "op_add"</li> + <li>"-" = "op_sub"<br> + </li> + <li>"*" = "op_mul"</li> + <li>"/" = "op_div"</li> + </ul> + <ul> + <li>"+=" = "op_iadd" note: ixxx stands for "inplace" as it modifies the original object.</li> + <li>"-=" = "op_isub"</li> + <li>"*=" = "op_imul"</li> + <li>"/=" = "op_idiv"</li> + <li>"%=" = "op_imod"</li> + <li>"&=" = "op_iand"</li> + <li>"|=" = "op_ior"</li> + <li>"^=" = "op_ixor"<br> + </li> + </ul> <i><b>%not_overload int FUNC_NAME(int value)</b></i><br> |
|
From: John L. <jr...@us...> - 2007-06-30 00:12:55
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9448/wxLua/bindings/wxwidgets Modified Files: data.i gdi.i geometry.i image.i windows.i wx_datatypes.lua wx_rules.lua Log Message: Fix for MingW added in wxWidgets bindings for wxDefaultPoint and wxEVT_FILEPICKER/DIRPICKER... Rename the functions to get the type names from wxLua to match closer to the lua type() function, wxlua.i Change op_add_assign to just op_iadd (others as well) = op_assign is now op_set Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** wx_datatypes.lua 27 Jun 2007 19:56:28 -0000 1.80 --- wx_datatypes.lua 30 Jun 2007 00:12:20 -0000 1.81 *************** *** 3045,3048 **** --- 3045,3054 ---- Name = "wxRegionIterator", }, + wxRegionOp = { + Condition = "(wxLUA_USE_wxRegion) && (defined (wxHAS_REGION_COMBINE ))", + DefType = "enum", + IsNumber = true, + Name = "wxRegionOp", + }, wxRelationship = { Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", Index: image.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/image.i,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** image.i 25 Jun 2007 03:19:37 -0000 1.30 --- image.i 30 Jun 2007 00:12:20 -0000 1.31 *************** *** 206,211 **** %class %delete %noclassinfo %encapsulate wxImageHistogramEntry wxImageHistogramEntry() ! %rename Index %member unsigned long index // GetIndex() only, SetIndex(idx) is not allowed ! %rename Value %member unsigned long value // GetValue() and SetValue(val) %endclass --- 206,211 ---- %class %delete %noclassinfo %encapsulate wxImageHistogramEntry wxImageHistogramEntry() ! %member unsigned long index // GetIndex() only, SetIndex(idx) is not allowed ! %member unsigned long value // GetValue() and SetValue(val) %endclass Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** windows.i 26 Jun 2007 03:22:04 -0000 1.49 --- windows.i 30 Jun 2007 00:12:20 -0000 1.50 *************** *** 76,82 **** %class %delete %noclassinfo %encapsulate wxVisualAttributes ! %rename Font %member wxFont font ! %rename ColFg wxColour colFg ! %rename ColBg wxColour colBg %endclass --- 76,82 ---- %class %delete %noclassinfo %encapsulate wxVisualAttributes ! %member wxFont font ! %member wxColour colFg ! %member wxColour colBg %endclass Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** gdi.i 27 Jun 2007 03:11:27 -0000 1.60 --- gdi.i 30 Jun 2007 00:12:20 -0000 1.61 *************** *** 15,18 **** --- 15,20 ---- %include "wx/gdicmn.h" + %define wxDefaultCoord + %class %delete %noclassinfo %encapsulate wxPoint %define_object wxDefaultPosition *************** *** 29,46 **** void Set(int x, int y) ! %rename X %member int x // GetX() and SetX(int x) ! %rename Y %member int y // GetY() and SetY(int y) %operator wxPoint& operator=(const wxPoint& p) const ! %operator bool operator==(const wxPoint& p) const ! %operator bool operator!=(const wxPoint& p) const ! %operator wxPoint operator+(const wxPoint& p) const ! %operator wxPoint operator-(const wxPoint& p) const ! %operator wxPoint& operator+=(const wxPoint& p) ! %operator wxPoint& operator-=(const wxPoint& p) ! %rename op_add_assign_Size %operator wxPoint& operator+=(const wxSize& s) ! %rename op_sub_assign_Size %operator wxPoint& operator-=(const wxSize& s) ! %rename op_add_Size %operator wxPoint operator+(const wxSize& s) const ! %rename op_sub_Size %operator wxPoint operator-(const wxSize& s) const %endclass --- 31,56 ---- void Set(int x, int y) ! %rename X %member_func int x // GetX() and SetX(int x) ! %rename Y %member_func int y // GetY() and SetY(int y) %operator wxPoint& operator=(const wxPoint& p) const ! ! %operator bool operator==(const wxPoint& p) const //{ return x == p.x && y == p.y; } ! %operator bool operator!=(const wxPoint& p) const //{ return !(*this == p); } ! ! // arithmetic operations (component wise) ! %operator wxPoint operator+(const wxPoint& p) const //{ return wxPoint(x + p.x, y + p.y); } ! %operator wxPoint operator-(const wxPoint& p) const //{ return wxPoint(x - p.x, y - p.y); } ! ! %operator wxPoint& operator+=(const wxPoint& p) //{ x += p.x; y += p.y; return *this; } ! %operator wxPoint& operator-=(const wxPoint& p) //{ x -= p.x; y -= p.y; return *this; } ! ! %operator wxPoint& operator+=(const wxSize& s) //{ x += s.GetWidth(); y += s.GetHeight(); return *this; } ! %operator wxPoint& operator-=(const wxSize& s) //{ x -= s.GetWidth(); y -= s.GetHeight(); return *this; } ! ! %operator wxPoint operator+(const wxSize& s) const //{ return wxPoint(x + s.GetWidth(), y + s.GetHeight()); } ! %operator wxPoint operator-(const wxSize& s) const //{ return wxPoint(x - s.GetWidth(), y - s.GetHeight()); } ! ! %operator wxPoint operator-() const { return wxPoint(-x, -y); } %endclass *************** *** 80,83 **** --- 90,108 ---- void SetHeight(int height) void SetWidth(int width) + + %operator wxSize& operator=(const wxSize& s) const + + %operator bool operator==(const wxSize& sz) const //{ return x == sz.x && y == sz.y; } + %operator bool operator!=(const wxSize& sz) const //{ return x != sz.x || y != sz.y; } + + %operator wxSize operator+(const wxSize& sz) const //{ return wxSize(x + sz.x, y + sz.y); } + %operator wxSize operator-(const wxSize& sz) const //{ return wxSize(x - sz.x, y - sz.y); } + %operator wxSize operator/(int i) const //{ return wxSize(x / i, y / i); } + %operator wxSize operator*(int i) const //{ return wxSize(x * i, y * i); } + + %operator wxSize& operator+=(const wxSize& sz) //{ x += sz.x; y += sz.y; return *this; } + %operator wxSize& operator-=(const wxSize& sz) //{ x -= sz.x; y -= sz.y; return *this; } + %operator wxSize& operator/=(const int i) //{ x /= i; y /= i; return *this; } + %operator wxSize& operator*=(const int i) //{ x *= i; y *= i; return *this; } %endclass *************** *** 133,136 **** --- 158,167 ---- void SetY(int Y) wxRect Union(const wxRect& rect) const //wxRect& Union(const wxRect& rect); + + %operator wxRect& operator=(const wxRect& r) const + + %operator bool operator==(const wxRect& rect) const + %operator wxRect operator+(const wxRect& rect) const + %operator wxRect& operator+=(const wxRect& rect) %endclass *************** *** 159,162 **** --- 190,205 ---- %endenum + %if defined(wxHAS_REGION_COMBINE) // MSW and MAC + %enum wxRegionOp + wxRGN_AND // Creates the intersection of the two combined regions. + wxRGN_COPY // Creates a copy of the region + wxRGN_DIFF // Combines the parts of first region that are not in the second one + wxRGN_OR // Creates the union of two combined regions. + wxRGN_XOR // Creates the union of two regions except for any overlapping areas. + %endenum + + %define wxHAS_REGION_COMBINE 1 + %endif // defined(wxHAS_REGION_COMBINE) + %class %delete wxRegion, wxGDIObject wxRegion(long x = 0, long y = 0, long width = 0, long height = 0) *************** *** 167,170 **** --- 210,220 ---- void Clear() + + %if defined(wxHAS_REGION_COMBINE) // MSW and MAC + bool Combine(wxCoord x, wxCoord y, wxCoord w, wxCoord h, wxRegionOp op); + bool Combine(const wxRect& rect, wxRegionOp op); + bool Combine(const wxRegion& region, wxRegionOp op) + %endif // defined(wxHAS_REGION_COMBINE) + wxRegionContain Contains(long x, long y) wxRegionContain Contains(const wxPoint& pt) *************** *** 182,186 **** bool Intersect(const wxRegion& region) bool IsEmpty() const ! //%gtk bool Ok() const bool Subtract(long x, long y, long width, long height) bool Subtract(const wxRect& rect) --- 232,237 ---- bool Intersect(const wxRegion& region) bool IsEmpty() const ! %wxchkver_2_8 bool IsEqual(const wxRegion& region) const ! %wxchkver_2_8 bool Ok() const bool Subtract(long x, long y, long width, long height) bool Subtract(const wxRect& rect) *************** *** 195,198 **** --- 246,252 ---- bool Xor(const wxRect& rect) bool Xor(const wxRegion& region) + + %operator wxRegion& operator=(const wxRegion& r) const + // operator == just calls IsEqual() %endclass *************** *** 446,449 **** --- 500,506 ---- void SetUnderlined(const bool underlined) void SetWeight(int weight) + + %operator wxFont& operator=(const wxFont& f) const + %operator bool operator == (const wxFont& font) const %endclass *************** *** 625,628 **** --- 682,688 ---- void Set(unsigned long colRGB) %endif // %wxchkver_2_8 + + %operator wxColour& operator=(const wxColour& c) const + %operator bool operator == (const wxColour& c) const %endclass *************** *** 710,713 **** --- 770,776 ---- void SetStyle(int style) void SetWidth(int width) + + %operator wxPen& operator=(const wxPen& p) const + %operator bool operator == (const wxPen& p) const %endclass *************** *** 766,769 **** --- 829,835 ---- void SetStipple(const wxBitmap& bitmap) void SetStyle(int style) + + %operator wxBrush& operator=(const wxBrush& b) const + %operator bool operator == (const wxBrush& b) const %endclass *************** *** 904,907 **** --- 970,975 ---- void SetWidth(int w) //%win void SetSize(const wxSize& size) + + %operator wxIcon& operator=(const wxIcon& i) const %endclass *************** *** 1008,1011 **** --- 1076,1081 ---- %win void SetPalette(const wxPalette& palette) void SetWidth(int width) + + %operator wxBitmap& operator=(const wxBitmap& b) const %endclass *************** *** 1084,1087 **** --- 1154,1159 ---- //%win void SetDepth(int depth) //%win void SetSize(const wxSize& size) + + %operator wxCursor& operator=(const wxCursor& c) const %endclass *************** *** 1104,1107 **** --- 1176,1181 ---- bool Create(const wxBitmap& bitmap, const wxColour& colour) %win bool Create(const wxBitmap& bitmap, int index) + + %operator wxMask& operator=(const wxMask& m) const %endclass Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wx_rules.lua 17 Jun 2007 18:36:06 -0000 1.30 --- wx_rules.lua 30 Jun 2007 00:12:20 -0000 1.31 *************** *** 145,152 **** #if defined(__MINGW32__) || defined(__GNUWIN32__) // FIX: "internal compiler error: output_operand: invalid expression as operand" ! const wxPoint wxLua_wxDefaultPositionHack = wxDefaultPosition; ! const wxSize wxLua_wxDefaultSizeHack = wxDefaultSize; ! #define wxDefaultPosition wxLua_wxDefaultPositionHack ! #define wxDefaultSize wxLua_wxDefaultSizeHack #endif //__MINGW32__ ]] --- 145,158 ---- #if defined(__MINGW32__) || defined(__GNUWIN32__) // FIX: "internal compiler error: output_operand: invalid expression as operand" ! // We set their value again later since some compilers (gcc) won't set their value yet ! static wxPoint wxLua_wxDefaultPosition = wxDefaultPosition; ! static wxSize wxLua_wxDefaultSize = wxDefaultSize; ! static wxEventType wxLua_wxEVT_COMMAND_DIRPICKER_CHANGED = wxEVT_COMMAND_DIRPICKER_CHANGED; ! static wxEventType wxLua_wxEVT_COMMAND_FILEPICKER_CHANGED = wxEVT_COMMAND_FILEPICKER_CHANGED; ! ! #define wxDefaultPosition wxLua_wxDefaultPosition ! #define wxDefaultSize wxLua_wxDefaultSize ! #define wxEVT_COMMAND_DIRPICKER_CHANGED wxLua_wxEVT_COMMAND_DIRPICKER_CHANGED ! #define wxEVT_COMMAND_FILEPICKER_CHANGED wxLua_wxEVT_COMMAND_FILEPICKER_CHANGED #endif //__MINGW32__ ]] *************** *** 221,224 **** --- 227,241 ---- wxLuaBinding_PreRegister = [[ + #if defined(__MINGW32__) || defined(__GNUWIN32__) + #undef wxDefaultPosition + #undef wxDefaultSize + #undef wxEVT_COMMAND_DIRPICKER_CHANGED + #undef wxEVT_COMMAND_FILEPICKER_CHANGED + wxLua_wxDefaultPosition = wxDefaultPosition; + wxLua_wxDefaultSize = wxDefaultSize; + wxLua_wxEVT_COMMAND_DIRPICKER_CHANGED = wxEVT_COMMAND_DIRPICKER_CHANGED; + wxLua_wxEVT_COMMAND_FILEPICKER_CHANGED = wxEVT_COMMAND_FILEPICKER_CHANGED; + #endif //__MINGW32__ + // ugly hack for wxWidgets >2.7 change to use wxStockGDI::GetXXX if (wxLua_wxBLACK == NULL) Index: geometry.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/geometry.i,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** geometry.i 25 Jun 2007 03:19:37 -0000 1.11 --- geometry.i 30 Jun 2007 00:12:20 -0000 1.12 *************** *** 47,52 **** //void ReadFrom( wxDataInputStream &stream ) ! %rename X %member wxInt32 m_x ! %rename Y %member wxInt32 m_y %operator wxPoint2DInt operator-() --- 47,52 ---- //void ReadFrom( wxDataInputStream &stream ) ! %rename X %member_func wxInt32 m_x ! %rename Y %member_func wxInt32 m_y %operator wxPoint2DInt operator-() *************** *** 89,94 **** wxDouble GetCrossProduct( const wxPoint2DDouble &vec ) const ! %rename X %member wxDouble m_x ! %rename Y %member wxDouble m_y %operator wxPoint2DDouble operator-() --- 89,94 ---- wxDouble GetCrossProduct( const wxPoint2DDouble &vec ) const ! %rename X %member_func wxDouble m_x ! %rename Y %member_func wxDouble m_y %operator wxPoint2DDouble operator-() *************** *** 165,172 **** //void Scale( wxInt32 num , wxInt32 denum ) ! %rename X %member wxDouble m_x ! %rename Y %member wxDouble m_y ! %rename Width %member wxDouble m_width ! %rename Height %member wxDouble m_height //wxRect2DDouble& operator = (const wxRect2DDouble& rect) - use copy constructor --- 165,172 ---- //void Scale( wxInt32 num , wxInt32 denum ) ! %rename X %member_func wxDouble m_x ! %rename Y %member_func wxDouble m_y ! %rename Width %member_func wxDouble m_width ! %rename Height %member_func wxDouble m_height //wxRect2DDouble& operator = (const wxRect2DDouble& rect) - use copy constructor *************** *** 240,247 **** //void ReadFrom( wxDataInputStream &stream ) ! %rename X %member wxInt32 m_x ! %rename Y %member wxInt32 m_y ! %rename Width %member wxInt32 m_width ! %rename Height %member wxInt32 m_height //wxRect2DInt& operator = (const wxRect2DInt& rect) - use copy constructor --- 240,247 ---- //void ReadFrom( wxDataInputStream &stream ) ! %rename X %member_func wxInt32 m_x ! %rename Y %member_func wxInt32 m_y ! %rename Width %member_func wxInt32 m_width ! %rename Height %member_func wxInt32 m_height //wxRect2DInt& operator = (const wxRect2DInt& rect) - use copy constructor Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** data.i 25 Jun 2007 03:19:37 -0000 1.37 --- data.i 30 Jun 2007 00:12:20 -0000 1.38 *************** *** 123,126 **** --- 123,128 ---- void SetRefData(wxObjectRefData* data) void UnRef() + + //%operator wxObject& operator=(const wxObject& other) %endclass |
|
From: John L. <jr...@us...> - 2007-06-30 00:12:54
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9448/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Fix for MingW added in wxWidgets bindings for wxDefaultPoint and wxEVT_FILEPICKER/DIRPICKER... Rename the functions to get the type names from wxLua to match closer to the lua type() function, wxlua.i Change op_add_assign to just op_iadd (others as well) = op_assign is now op_set Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** wxstc_datatypes.lua 27 Jun 2007 19:56:28 -0000 1.70 --- wxstc_datatypes.lua 30 Jun 2007 00:12:20 -0000 1.71 *************** *** 3045,3048 **** --- 3045,3054 ---- Name = "wxRegionIterator", }, + wxRegionOp = { + Condition = "(wxLUA_USE_wxRegion) && (defined (wxHAS_REGION_COMBINE ))", + DefType = "enum", + IsNumber = true, + Name = "wxRegionOp", + }, wxRelationship = { Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", |
|
From: John L. <jr...@us...> - 2007-06-30 00:12:54
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9448/wxLua/apps/wxluaedit/src Modified Files: wxledit.h wxluaedit.cpp Log Message: Fix for MingW added in wxWidgets bindings for wxDefaultPoint and wxEVT_FILEPICKER/DIRPICKER... Rename the functions to get the type names from wxLua to match closer to the lua type() function, wxlua.i Change op_add_assign to just op_iadd (others as well) = op_assign is now op_set Index: wxledit.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxledit.h 8 May 2007 00:55:12 -0000 1.18 --- wxledit.h 30 Jun 2007 00:12:17 -0000 1.19 *************** *** 31,38 **** // we use the following macro to do a compile-time check of wxLuaEdit version #if !defined(wxCHECK_STE_VERSION) ! #error "wxStEdit version is too old, need at least version 1.2.4" #endif ! #if !wxCHECK_STE_VERSION(1, 2, 3) ! #error "wxStEdit version is too old, need at least version 1.2.4" #endif --- 31,38 ---- // we use the following macro to do a compile-time check of wxLuaEdit version #if !defined(wxCHECK_STE_VERSION) ! #error "wxStEdit version is too old, need at least version 1.2.5" #endif ! #if !wxCHECK_STE_VERSION(1, 2, 5) ! #error "wxStEdit version is too old, need at least version 1.2.5" #endif *************** *** 112,119 **** // Using a customized wxLuaState by handling wxEVT_LUASHELL_wxLUA_CREATION event: // The RecreatewxLuaState function sends a wxLuaEvent with this control's id ! // in GetId(), *this as the GetEventObject(), and the preferred window ID // for the new wxLuaState in event.GetExtraLong() (typically wxID_ANY) and // the current wxLuaState in GetwxLuaState(). ! // // Your wxEVT_LUASHELL_wxLUA_CREATION event handler can set the new wxLuaState // by calling event.SetwxLuaState(wxLuaState(...)) --- 112,119 ---- // Using a customized wxLuaState by handling wxEVT_LUASHELL_wxLUA_CREATION event: // The RecreatewxLuaState function sends a wxLuaEvent with this control's id ! // in GetId(), *this as the GetEventObject(), and the preferred window ID // for the new wxLuaState in event.GetExtraLong() (typically wxID_ANY) and // the current wxLuaState in GetwxLuaState(). ! // // Your wxEVT_LUASHELL_wxLUA_CREATION event handler can set the new wxLuaState // by calling event.SetwxLuaState(wxLuaState(...)) *************** *** 123,129 **** // to that of this window so this can handle the events. // ! // If the event is skipped or not handled the RecreatewxLuaState function // will call SetLuaIntpreter(event.GetLuaInterpreter(), event.GetInt() == 1) ! // if the event's wxLuaState is valid. You can Skip(false) the event to // not have the wxLuaState recreated at all. virtual bool RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id); --- 123,129 ---- // to that of this window so this can handle the events. // ! // If the event is skipped or not handled the RecreatewxLuaState function // will call SetLuaIntpreter(event.GetLuaInterpreter(), event.GetInt() == 1) ! // if the event's wxLuaState is valid. You can Skip(false) the event to // not have the wxLuaState recreated at all. virtual bool RecreatewxLuaState(wxEvtHandler *wxlStateEvtHandler, int win_id); *************** *** 217,222 **** enum wxLuaIDE_Styles { ! WXLUAIDE_TB_FILE = 0x0001, ! WXLUAIDE_TB_LUA = 0x0002, WXLUAIDE_TOOLBAR = WXLUAIDE_TB_FILE|WXLUAIDE_TB_LUA, WXLUAIDE_DEFAULT = WXLUAIDE_TOOLBAR --- 217,222 ---- enum wxLuaIDE_Styles { ! WXLUAIDE_TB_FILE = 0x0001, // Add Open/Save items in PopulateToolBar ! WXLUAIDE_TB_LUA = 0x0002, // Add Run/Stop/Stack Dlg in PopulateToolBar WXLUAIDE_TOOLBAR = WXLUAIDE_TB_FILE|WXLUAIDE_TB_LUA, WXLUAIDE_DEFAULT = WXLUAIDE_TOOLBAR *************** *** 284,288 **** void SetToolBar(wxToolBar *toolbar); wxToolBar *GetToolBar() const { return m_editorOptions.GetToolBar(); } // may be NULL ! // add our own tools to the toolbar void PopulateToolBar(wxToolBar *toolBar, long options = WXLUAIDE_TOOLBAR) const; // create a "new" wxMenu to add to the menubar and popupmenu --- 284,288 ---- void SetToolBar(wxToolBar *toolbar); wxToolBar *GetToolBar() const { return m_editorOptions.GetToolBar(); } // may be NULL ! // add our own tools to the toolbar, see WXLUAIDE_TB_FILE, WXLUAIDE_TB_LUA void PopulateToolBar(wxToolBar *toolBar, long options = WXLUAIDE_TOOLBAR) const; // create a "new" wxMenu to add to the menubar and popupmenu Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxluaedit.cpp 14 Jun 2007 23:59:41 -0000 1.34 --- wxluaedit.cpp 30 Jun 2007 00:12:17 -0000 1.35 *************** *** 438,457 **** m_sideNotebook = new wxNotebook(m_sideSplitter, wxID_ANY); ! #if wxCHECK_STE_VERSION(1,2,2) ! #if wxCHECK_STE_VERSION(1,2,3) ! m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILE_TREECTRL, ! wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); ! #else ! m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILETREECTRL, ! wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); ! #endif m_fileTreeCtrl->SetIndent(5); m_fileTreeCtrl->AddRoot(wxT("Files")); m_sideNotebook->AddPage(m_fileTreeCtrl, wxT("Files")); - #else - m_fileListBox = new wxListBox(m_sideNotebook, ID_STF_FILELISTBOX, - wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE ); - m_sideNotebook->AddPage(m_fileListBox, wxT("Files")); - #endif m_sideSplitterWin1 = m_sideNotebook; --- 438,446 ---- m_sideNotebook = new wxNotebook(m_sideSplitter, wxID_ANY); ! m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILE_TREECTRL, ! wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); m_fileTreeCtrl->SetIndent(5); m_fileTreeCtrl->AddRoot(wxT("Files")); m_sideNotebook->AddPage(m_fileTreeCtrl, wxT("Files")); m_sideSplitterWin1 = m_sideNotebook; *************** *** 466,470 **** shell->AppendText(wxT("Welcome to the wxLuaShell, an interactive lua interpreter.\n")); shell->AppendText(wxT(" Enter lua code and press <enter> to run it.\n")); ! shell->AppendText(wxT(" Multiline code can be typed by pressing <shift>-<enter>.\n")); shell->AppendText(wxT(" The wxLua intrepreter can be restarted with the command 'reset'.\n")); shell->MarkerDeleteAll(wxSTEditorShell::markerPrompt); --- 455,459 ---- shell->AppendText(wxT("Welcome to the wxLuaShell, an interactive lua interpreter.\n")); shell->AppendText(wxT(" Enter lua code and press <enter> to run it.\n")); ! shell->AppendText(wxT(" Multiline code can be typed by pressing <shift>+<enter>.\n")); shell->AppendText(wxT(" The wxLua intrepreter can be restarted with the command 'reset'.\n")); shell->MarkerDeleteAll(wxSTEditorShell::markerPrompt); |
|
From: John L. <jr...@us...> - 2007-06-30 00:12:54
|
Update of /cvsroot/wxlua/wxLua/bindings/wxlua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9448/wxLua/bindings/wxlua Modified Files: override.hpp wxlua.i Log Message: Fix for MingW added in wxWidgets bindings for wxDefaultPoint and wxEVT_FILEPICKER/DIRPICKER... Rename the functions to get the type names from wxLua to match closer to the lua type() function, wxlua.i Change op_add_assign to just op_iadd (others as well) = op_assign is now op_set Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/wxlua.i,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxlua.i 28 Jun 2007 21:52:55 -0000 1.5 --- wxlua.i 30 Jun 2007 00:12:20 -0000 1.6 *************** *** 16,21 **** // --------------------------------------------------------------------------- // Get information about the status of wxLua. - // - // Please take special note of // Get a table of all tracked top level windows that wxLua will Destroy() --- 16,19 ---- *************** *** 87,101 **** // Is this lua_type() (or in lua the type() function) considered equivalent ! %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) ! // %override wxString wxlua_typename(int wxluaarg_tag) ! // C++ Func: wxString wxlua_getwxluatypename(int wxluaarg_tag) ! // Returns the tag name for both the predefined (negative) as well as the ! // binding class tags. (C function only does predefined tags) ! %function wxString wxlua_typename(int wxluaarg_tag) ! // %override int wxlua_type(void* object) ! // Get the wxlua type (tag) of the object, this is the arg tags number ! %function int wxlua_type(void* object) // --------------------------------------------------------------------------- --- 85,102 ---- // Is this lua_type() (or in lua the type() function) considered equivalent ! %rename iswxluatype %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) ! // %override [wxlua_typename, wxlua_type#, lua_typename, lua_type#] type(void* object) ! // Given any type of object, returns four values: ! // wxlua name of the type - wxLuaState::GetLuaTagName(wxlua_type) ! // wxlua number of the type - wxlua_getwxluatype(lua_type(L, stack_idx)) or wxlua_ttag ! // lua name of the type - lua_typename(L, lua_type(L, stack_idx)) ! // lua number of the type - lua_type(L, stack_idx) ! %function wxString type(void* object) ! // %override wString typename(int wxluaarg_tag) ! // Returns the wxLua tag name for both the predefined (negative) as well as the ! // binding class tag numbers. ! %function wxString typename(int wxluaarg_tag) // --------------------------------------------------------------------------- Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxlua/override.hpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** override.hpp 28 Jun 2007 21:52:55 -0000 1.4 --- override.hpp 30 Jun 2007 00:12:20 -0000 1.5 *************** *** 120,156 **** %end ! %override wxLua_function_wxlua_typename ! // %function wxString wxlua_getwxluatypename(int wxluaarg_tag) ! static int LUACALL wxLua_function_wxlua_typename(lua_State *L) { wxLuaState wxlState(L); - wxString returns; - // int wxluaarg_tag - int wxluaarg_tag = (int)wxlua_getnumbertype(L, 1); - // call wxlua_getwxluatypename - returns = wxlState.GetLuaTagName(wxluaarg_tag); //wxlua_getwxluatypename(wxluaarg_tag); - // push the result string - wxlState.lua_PushString(returns); ! return 1; } %end ! %override wxLua_function_wxlua_type ! // %function int wxlua_wxluatype(int wxluaarg_tag) ! static int LUACALL wxLua_function_wxlua_type(lua_State *L) { wxLuaState wxlState(L); wxString returns; // int wxluaarg_tag ! int wxluaarg_tag = wxlua_ttag(L, 1); ! if (wxluaarg_tag == WXLUA_NOTAG) ! { ! int ltype = lua_type(L, 1); ! wxluaarg_tag = wxlua_getwxluatype(ltype); ! } ! ! // push the result number ! lua_pushnumber(L, wxluaarg_tag); return 1; --- 120,167 ---- %end ! %override wxLua_function_type ! // %function int type(int wxluaarg_tag) ! static int LUACALL wxLua_function_type(lua_State *L) { wxLuaState wxlState(L); ! int ltype = lua_type(L, 1); ! const char* ltypename = lua_typename(L, ltype); ! ! int wxluaarg_tag = WXLUA_NOTAG; ! ! // this may a wxLua data ! if (ltype == LUA_TUSERDATA) ! wxluaarg_tag = wxlua_ttag(L, 1); ! ! // I guess it wasn't or isn't a userdata ! if (wxluaarg_tag == WXLUA_NOTAG) ! wxluaarg_tag = wxlua_getwxluatype(ltype); ! ! wxString tagName = wxlState.GetLuaTagName(wxluaarg_tag); //wxlua_getwxluatypename(wxluaarg_tag); ! ! // push the results ! lua_pushstring(L, wx2lua(tagName)); ! lua_pushnumber(L, wxluaarg_tag); ! ! lua_pushstring(L, ltypename); ! lua_pushnumber(L, ltype); ! ! return 4; } %end ! %override wxLua_function_typename ! // %function wxString typename(int wxluaarg_tag) ! static int LUACALL wxLua_function_typename(lua_State *L) { wxLuaState wxlState(L); wxString returns; // int wxluaarg_tag ! int wxluaarg_tag = (int)wxlua_getnumbertype(L, 1); ! // call wxlua_getwxluatypename ! returns = wxlState.GetLuaTagName(wxluaarg_tag); //wxlua_getwxluatypename(wxluaarg_tag); ! // push the result string ! wxlState.lua_PushString(returns); return 1; |
|
From: John L. <jr...@us...> - 2007-06-30 00:12:54
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9448/wxLua/bindings Modified Files: genwxbind.lua Log Message: Fix for MingW added in wxWidgets bindings for wxDefaultPoint and wxEVT_FILEPICKER/DIRPICKER... Rename the functions to get the type names from wxLua to match closer to the lua type() function, wxlua.i Change op_add_assign to just op_iadd (others as well) = op_assign is now op_set Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** genwxbind.lua 27 Jun 2007 19:56:27 -0000 1.138 --- genwxbind.lua 30 Jun 2007 00:12:20 -0000 1.139 *************** *** 1062,1066 **** -- operators for %operator ! bindingOperatorTable["="] = "op_assign" bindingOperatorTable["=="] = "op_eq" bindingOperatorTable["!="] = "op_ne" --- 1062,1066 ---- -- operators for %operator ! bindingOperatorTable["="] = "op_set" bindingOperatorTable["=="] = "op_eq" bindingOperatorTable["!="] = "op_ne" *************** *** 1085,1096 **** bindingOperatorTable["/"] = "op_div" ! bindingOperatorTable["+="] = "op_add_assign" ! bindingOperatorTable["-="] = "op_sub_assign" ! bindingOperatorTable["*="] = "op_mul_assign" ! bindingOperatorTable["/="] = "op_div_assign" ! bindingOperatorTable["%="] = "op_mod_assign" ! bindingOperatorTable["&="] = "op_and_assign" ! bindingOperatorTable["|="] = "op_or_assign" ! bindingOperatorTable["^="] = "op_xor_assign" -- bindingKeywordTable --- 1085,1096 ---- bindingOperatorTable["/"] = "op_div" ! bindingOperatorTable["+="] = "op_iadd" ! bindingOperatorTable["-="] = "op_isub" ! bindingOperatorTable["*="] = "op_imul" ! bindingOperatorTable["/="] = "op_idiv" ! bindingOperatorTable["%="] = "op_imod" ! bindingOperatorTable["&="] = "op_iand" ! bindingOperatorTable["|="] = "op_ior" ! bindingOperatorTable["^="] = "op_ixor" -- bindingKeywordTable *************** *** 1106,1109 **** --- 1106,1110 ---- bindingKeywordTable["%constructor"] = true bindingKeywordTable["%member"] = true + bindingKeywordTable["%member_func"] = true bindingKeywordTable["%operator"] = true bindingKeywordTable["%property"] = true *************** *** 1864,1867 **** --- 1865,1877 ---- end + elseif tag == "%member_func" then + lineState.DefType = "member_func" + lineState.Action = "member" + lineState.ActionMandatory = true + + if (parseState.ObjectStack[1].DefType ~= "class") and (parseState.ObjectStack[1].DefType ~= "struct") then + print("Error: %member_func is not used for a %class or %struct. "..LineTableErrString(lineTable)) + end + elseif tag == "%constructor" then lineState.IsConstructor = true *************** *** 2509,2513 **** table.insert(parseState.ConditionStack, lineState.Condition) ! elseif lineState.DefType == "member" then table.insert(parseState.ObjectStack[1].Members, AllocMember(lineState, BuildCondition(parseState.ConditionStack))) --- 2519,2523 ---- table.insert(parseState.ConditionStack, lineState.Condition) ! elseif (lineState.DefType == "member") or (lineState.DefType == "member_func") then table.insert(parseState.ObjectStack[1].Members, AllocMember(lineState, BuildCondition(parseState.ConditionStack))) *************** *** 2686,2690 **** -- member binding -- --------------------------------------------------------------- ! if member.DefType == "member" then local memberType = GetTypeDef(member.DataType) local memberGetFunc = "Get_"..member.Name --- 2696,2700 ---- -- member binding -- --------------------------------------------------------------- ! if (member.DefType == "member") or (member.DefType == "member_func") then local memberType = GetTypeDef(member.DataType) local memberGetFunc = "Get_"..member.Name *************** *** 2795,2798 **** --- 2805,2813 ---- end + -- rem out the Get function, but we need the code for the property + if member.DefType == "member" then + methodBinding.Map = " // %member"..methodBinding.Map + end + table.insert(interface.objectData[o].BindTable, methodBinding) table.insert(interface.objectData[o].BindTable, propertyBinding) *************** *** 2886,2889 **** --- 2901,2909 ---- end + -- rem out the Set function, but we need the code for the property + if member.DefType == "member" then + methodBinding.Map = " // %member"..methodBinding.Map + end + table.insert(interface.objectData[o].BindTable, methodBinding) table.insert(interface.objectData[o].BindTable, propertyBinding) |
