Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2006-11-30 05:56:35
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6079/wxLua/bindings Modified Files: genwxbind.lua Log Message: fix wxBitmapFromFile constructor some cleanup to genwxbind Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** genwxbind.lua 29 Nov 2006 23:37:07 -0000 1.82 --- genwxbind.lua 30 Nov 2006 05:56:30 -0000 1.83 *************** *** 108,114 **** -- atable is the input table to dump the contents of -- prefix is a string prefix for debugging purposes ! -- tablelevel is tracker for recursive calls to DumpTable (do not use initially) -- --------------------------------------------------------------------------- ! function DumpTable(atable, prefix, tablelevel) if prefix == nil then prefix = "" end if tablelevel == nil then tablelevel = "" end --- 108,114 ---- -- atable is the input table to dump the contents of -- prefix is a string prefix for debugging purposes ! -- tablelevel is tracker for recursive calls to TableDump (do not use initially) -- --------------------------------------------------------------------------- ! function TableDump(atable, prefix, tablelevel) if prefix == nil then prefix = "" end if tablelevel == nil then tablelevel = "" end *************** *** 122,126 **** print(prefix..n, tablelevel.."["..k.."]", v) if type(v) == "table" then ! DumpTable(v, prefix.." ", tablelevel.."["..k.."]") end end --- 122,126 ---- print(prefix..n, tablelevel.."["..k.."]", v) if type(v) == "table" then ! TableDump(v, prefix.." ", tablelevel.."["..k.."]") end end *************** *** 531,535 **** -- --------------------------------------------------------------------------- ! -- Do the contents of the file matche the strings in the fileData table? -- the table may contain any number of \n per index -- returns true for a match or false if not --- 531,535 ---- -- --------------------------------------------------------------------------- ! -- Do the contents of the file match the strings in the fileData table? -- the table may contain any number of \n per index -- returns true for a match or false if not *************** *** 612,618 **** result = string.format("wxCHECK_VERSION(%d,%d,%d)", ver[1], ver[2], ver[3]) conditions[condition] = result -- cache result ! elseif string.find(condition, "wxLUA_USE_", 1, 1) == 1 then print("Warning unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'") ! elseif string.find(condition, "wxUSE_", 1, 1) == 1 then print("Warning unknown wxUSE_XXX tag, maybe a missing condition? '"..condition.."'") end --- 612,618 ---- result = string.format("wxCHECK_VERSION(%d,%d,%d)", ver[1], ver[2], ver[3]) conditions[condition] = result -- cache result ! elseif string.find(condition, "wxLUA_USE_", 1, 1) then print("Warning unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'") ! elseif string.find(condition, "wxUSE_", 1, 1) then print("Warning unknown wxUSE_XXX tag, maybe a missing condition? '"..condition.."'") end *************** *** 644,648 **** -- --------------------------------------------------------------------------- ! -- add conditions by && them, either may be nil -- --------------------------------------------------------------------------- function AddCondition(condition1, condition2) --- 644,648 ---- -- --------------------------------------------------------------------------- ! -- add conditions with &&, either input condition may be nil -- --------------------------------------------------------------------------- function AddCondition(condition1, condition2) *************** *** 1745,1749 **** if table.getn(parseState.ObjectStack) == 0 then ! print("Error: parseState.ObjectStack is unexpectedly empty. "..LineTableErrString(lineTable)) end --- 1745,1749 ---- if table.getn(parseState.ObjectStack) == 0 then ! print("Error: parseState.ObjectStack is unexpectedly empty on %endclass. "..LineTableErrString(lineTable)) end *************** *** 1784,1788 **** if table.getn(parseState.ObjectStack) == 0 then ! print("Error: parseState.ObjectStack is unexpectedly empty. "..LineTableErrString(lineTable)) end break -- we can stop processing line --- 1784,1788 ---- if table.getn(parseState.ObjectStack) == 0 then ! print("Error: parseState.ObjectStack is unexpectedly empty on %endstruct. "..LineTableErrString(lineTable)) end break -- we can stop processing line *************** *** 1808,1812 **** if table.getn(parseState.ObjectStack) == 0 then ! print("Error: parseState.ObjectStack is unexpectedly empty. "..LineTableErrString(lineTable)) end break -- we can stop processing line --- 1808,1812 ---- if table.getn(parseState.ObjectStack) == 0 then ! print("Error: parseState.ObjectStack is unexpectedly empty on %endenum. "..LineTableErrString(lineTable)) end break -- we can stop processing line *************** *** 1924,1932 **** lineState.DefType = "define_pointer" ! end end elseif not parseState.IsBlockComment then ! if (tag == "!") or ((lineState.DefType == "blockcondition") or lineState.InLineConditionIf) and conditionOperators[tag] then if not lineState.Condition and (conditionOperators[tag] ~= "!") then print("Error: Unexpected Conditional Operator "..tag..". "..LineTableErrString(lineTable)) --- 1924,1937 ---- lineState.DefType = "define_pointer" ! else ! print("Warning : Unhandled keyword '"..tag.."' in "..LineTableErrString(lineTable)) end end + -- --------------------------------------------------------------- + -- else !keyword[tag] + -- --------------------------------------------------------------- elseif not parseState.IsBlockComment then ! -- handle condition operators, note can have leading ! for not ! if (tag == "!") or (((lineState.DefType == "blockcondition") or lineState.InLineConditionIf) and conditionOperators[tag]) then if not lineState.Condition and (conditionOperators[tag] ~= "!") then print("Error: Unexpected Conditional Operator "..tag..". "..LineTableErrString(lineTable)) *************** *** 1971,1980 **** end - -- just ignore c++ operator FIXME remove this - --if tag == "operator" then - -- lineState.Skip = true - -- break - --end - -- add block condition if lineState.DefType == "blockcondition" then --- 1976,1979 ---- *************** *** 2068,2076 **** else ! print("Error: Expected DataType, got "..tag..". "..LineTableErrString(lineTable)) end end else ! print("Error: Unexpected parseObject "..parseState.ObjectStack[1].DefType.." "..parseState.ObjectStack[1].Name..". "..LineTableErrString(lineTable)) end elseif lineState.Action == "classname" then --- 2067,2075 ---- else ! print("Error: Expected DataType, got '"..tag.."'. "..LineTableErrString(lineTable)) end end else ! print("Error: Unexpected parseObject :"..parseState.ObjectStack[1].DefType.." "..parseState.ObjectStack[1].Name..". "..LineTableErrString(lineTable)) end elseif lineState.Action == "classname" then *************** *** 2080,2084 **** elseif lineState.Action == "classcomma" then if tag ~= "," then ! print("Error: %property expected ','. "..LineTableErrString(lineTable)) end --- 2079,2083 ---- elseif lineState.Action == "classcomma" then if tag ~= "," then ! print("Error: %class tag expected ','. "..LineTableErrString(lineTable)) end *************** *** 2136,2141 **** lineState.Name = tag ! -- local member= AllocMember(lineState) ! -- table.insert(parseState.ObjectStack[1].Members, member) lineState.Action = "propertycomma" --- 2135,2140 ---- lineState.Name = tag ! -- local member= AllocMember(lineState) ! -- table.insert(parseState.ObjectStack[1].Members, member) lineState.Action = "propertycomma" *************** *** 2625,2629 **** if table.getn(parseState.ObjectStack) ~= 0 then print("parseState.ObjectStack should be empty, has "..table.getn(parseState.ObjectStack).." items left.") ! DumpTable(parseState.ObjectStack, "parseState.ObjectStack") end --- 2624,2628 ---- if table.getn(parseState.ObjectStack) ~= 0 then print("parseState.ObjectStack should be empty, has "..table.getn(parseState.ObjectStack).." items left.") ! TableDump(parseState.ObjectStack, "parseState.ObjectStack") end |
|
From: John L. <jr...@us...> - 2006-11-30 05:56:35
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6079/wxLua/bindings/wxwidgets Modified Files: gdi.i Log Message: fix wxBitmapFromFile constructor some cleanup to genwxbind Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** gdi.i 22 Nov 2006 06:08:32 -0000 1.30 --- gdi.i 30 Nov 2006 05:56:31 -0000 1.31 *************** *** 705,709 **** %constructor wxBitmapCopy(const wxBitmap& bitmap) %constructor wxEmptyBitmap( int width, int height, int depth = -1) ! %constructor wxBitmapFromFile( const wxString& name, long type) %constructor wxBitmapFromXPMData(const char **data) %wxchkver23 %constructor wxBitmapFromImage(const wxImage &image, int depth = -1) --- 705,709 ---- %constructor wxBitmapCopy(const wxBitmap& bitmap) %constructor wxEmptyBitmap( int width, int height, int depth = -1) ! %constructor wxBitmapFromFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_ANY) %constructor wxBitmapFromXPMData(const char **data) %wxchkver23 %constructor wxBitmapFromImage(const wxImage &image, int depth = -1) |
|
From: John L. <jr...@us...> - 2006-11-29 23:37:12
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21399/wxLua/bindings Modified Files: genwxbind.lua Log Message: document genwxbind better Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.81 retrieving revision 1.82 diff -C2 -d -r1.81 -r1.82 *** genwxbind.lua 22 Nov 2006 06:08:32 -0000 1.81 --- genwxbind.lua 29 Nov 2006 23:37:07 -0000 1.82 *************** *** 1,3 **** ! ------------------------------------------------------------------------------- -- Name: genwxbind.lua -- Purpose: This script generates wrapper files from the table interface_fileTable (see below) --- 1,3 ---- ! -- --------------------------------------------------------------------------- -- Name: genwxbind.lua -- Purpose: This script generates wrapper files from the table interface_fileTable (see below) *************** *** 6,10 **** -- Copyright: Ray Gilbert [...1793 lines suppressed...] InitKeywords() - - -- BuildConditionsTable() - InitDataTypes() --- 4969,4972 ---- *************** *** 4992,4996 **** end ! -- Check for any unsed overrides and print a warning for overrideName, value in pairs_sort(overrideTableUsed) do if not value then --- 4983,4987 ---- end ! -- Check for any unused overrides and print a warning for overrideName, value in pairs_sort(overrideTableUsed) do if not value then |
|
From: John L. <jr...@us...> - 2006-11-22 21:14:02
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19437/wxLua/modules/wxbind/src Modified Files: windows.cpp wx_bind.cpp Log Message: add more wxcomap26 checks cleanup and simplify samples Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** windows.cpp 2 Nov 2006 23:38:09 -0000 1.27 --- windows.cpp 22 Nov 2006 21:13:56 -0000 1.28 *************** *** 2576,2580 **** } ! // wxSize GetBestFittingSize() const static int LUACALL wxLua_wxWindow_GetBestFittingSize(lua_State *L) { --- 2576,2580 ---- } ! // wxSize GetBestFittingSize() const // deprecated in 2.8 use GetEffectiveMinSize static int LUACALL wxLua_wxWindow_GetBestFittingSize(lua_State *L) { *************** *** 2808,2812 **** } ! // void SetBestFittingSize(const wxSize& size = wxDefaultSize) static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L) { --- 2808,2812 ---- } ! // void SetBestFittingSize(const wxSize& size = wxDefaultSize) // deprecated in 2.8 use SetInitialSize static int LUACALL wxLua_wxWindow_SetBestFittingSize(lua_State *L) { Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** wx_bind.cpp 22 Nov 2006 06:08:33 -0000 1.61 --- wx_bind.cpp 22 Nov 2006 21:13:56 -0000 1.62 *************** *** 2892,2895 **** --- 2892,2914 ---- #endif // !wxCHECK_VERSION(2,5,0) + #if (((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxAcceleratorTable)) && (wxLUA_USE_wxAcceleratorTable) + + // %wxcompat26 %function wxAcceleratorEntry* wxGetAccelFromString(const wxString& label) // deprecated in 2.8 use wxAcceleratorEntry::Create() or FromString() + static int LUACALL wxLua_function_wxGetAccelFromString(lua_State *L) + { + wxLuaState wxlState(L); + wxAcceleratorEntry *returns; + // const wxString label + const wxString label = lua2wx(wxlState.GetStringType(1)); + // call wxGetAccelFromString + returns = wxGetAccelFromString(label); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxAcceleratorEntry, returns); + + return 1; + } + + #endif // (((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxAcceleratorTable)) && (wxLUA_USE_wxAcceleratorTable) + #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) *************** *** 2948,2951 **** --- 2967,3001 ---- #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) + #if (defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6) + + // %wxcompat26 %function long wxGetElapsedTime(bool resetTimer = true) // deprecated in 2.8 use wxStopWatch + static int LUACALL wxLua_function_wxGetElapsedTime(lua_State *L) + { + wxLuaState wxlState(L); + long returns; + // get number of arguments + int argCount = lua_gettop(L); + // bool resetTimer = true + bool resetTimer = (argCount >= 1 ? wxlState.GetBooleanType(1) : true); + // call wxGetElapsedTime + returns = wxGetElapsedTime(resetTimer); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // %wxcompat26 %function void wxStartTimer() // deprecated in 2.8 use wxStopWatch + static int LUACALL wxLua_function_wxStartTimer(lua_State *L) + { + wxLuaState wxlState(L); + // call wxStartTimer + wxStartTimer(); + + return 0; + } + + #endif // (defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6) + #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxProcess) *************** *** 3618,3638 **** } - // %function long wxGetElapsedTime(bool resetTimer = true) - static int LUACALL wxLua_function_wxGetElapsedTime(lua_State *L) - { - wxLuaState wxlState(L); - long returns; - // get number of arguments - int argCount = lua_gettop(L); - // bool resetTimer = true - bool resetTimer = (argCount >= 1 ? wxlState.GetBooleanType(1) : true); - // call wxGetElapsedTime - returns = wxGetElapsedTime(resetTimer); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - // %function wxString wxGetEmailAddress() static int LUACALL wxLua_function_wxGetEmailAddress(lua_State *L) --- 3668,3671 ---- *************** *** 4336,4349 **** } - // %function void wxStartTimer() - static int LUACALL wxLua_function_wxStartTimer(lua_State *L) - { - wxLuaState wxlState(L); - // call wxStartTimer - wxStartTimer(); - - return 0; - } - // %override wxLua_function_wxUnix2DosFilename // %function wxString wxUnix2DosFilename(const wxString& s) --- 4369,4372 ---- *************** *** 4487,4509 **** #endif // wxCHECK_VERSION(2,7,0) - #if wxLUA_USE_wxAcceleratorTable - - // %function wxAcceleratorEntry* wxGetAccelFromString(const wxString& label) - static int LUACALL wxLua_function_wxGetAccelFromString(lua_State *L) - { - wxLuaState wxlState(L); - wxAcceleratorEntry *returns; - // const wxString label - const wxString label = lua2wx(wxlState.GetStringType(1)); - // call wxGetAccelFromString - returns = wxGetAccelFromString(label); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxAcceleratorEntry, returns); - - return 1; - } - - #endif // wxLUA_USE_wxAcceleratorTable - #if wxLUA_USE_wxApp --- 4510,4513 ---- *************** *** 5037,5040 **** --- 5041,5049 ---- + #if (((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxAcceleratorTable)) && (wxLUA_USE_wxAcceleratorTable) + { LuaGlobal, "wxGetAccelFromString", wxLua_function_wxGetAccelFromString, 1, 1, { &s_wxluaarg_String, 0 } }, + #endif // (((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxAcceleratorTable)) && (wxLUA_USE_wxAcceleratorTable) + + #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaGlobal, "wxArtProvider_GetBitmap", wxLua_wxArtProvider_GetBitmap, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, 0 } }, *************** *** 5047,5050 **** --- 5056,5065 ---- + #if (defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6) + { LuaGlobal, "wxGetElapsedTime", wxLua_function_wxGetElapsedTime, 1, 0, { &s_wxluaarg_Boolean, 0 } }, + { LuaGlobal, "wxStartTimer", wxLua_function_wxStartTimer, 0, 0, { 0 } }, + #endif // (defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6) + + #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxProcess) { LuaGlobal, "wxExecute", wxLua_function_wxExecute, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxProcess, 0 } }, *************** *** 5123,5127 **** { LuaGlobal, "wxFindWindowByName", wxLua_function_wxFindWindowByName, 2, 1, { &s_wxluaarg_String, &s_wxluatag_wxWindow, 0 } }, { LuaGlobal, "wxGetCwd", wxLua_function_wxGetCwd, 0, 0, { 0 } }, - { LuaGlobal, "wxGetElapsedTime", wxLua_function_wxGetElapsedTime, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaGlobal, "wxGetEmailAddress", wxLua_function_wxGetEmailAddress, 0, 0, { 0 } }, { LuaGlobal, "wxGetEnv", wxLua_function_wxGetEnv, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, --- 5138,5141 ---- *************** *** 5165,5169 **** { LuaGlobal, "wxShell", wxLua_function_wxShell, 1, 0, { &s_wxluaarg_String, 0 } }, { LuaGlobal, "wxSleep", wxLua_function_wxSleep, 1, 1, { &s_wxluaarg_Number, 0 } }, - { LuaGlobal, "wxStartTimer", wxLua_function_wxStartTimer, 0, 0, { 0 } }, { LuaGlobal, "wxUnix2DosFilename", wxLua_function_wxUnix2DosFilename, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaGlobal, "wxUnsetEnv", wxLua_function_wxUnsetEnv, 1, 1, { &s_wxluaarg_String, 0 } }, --- 5179,5182 ---- *************** *** 5192,5200 **** - #if wxLUA_USE_wxAcceleratorTable - { LuaGlobal, "wxGetAccelFromString", wxLua_function_wxGetAccelFromString, 1, 1, { &s_wxluaarg_String, 0 } }, - #endif // wxLUA_USE_wxAcceleratorTable - - #if wxLUA_USE_wxApp { LuaGlobal, "wxGetApp", wxLua_function_wxGetApp, 0, 0, { 0 } }, --- 5205,5208 ---- |
|
From: John L. <jr...@us...> - 2006-11-22 21:14:01
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19437/wxLua/samples Modified Files: calculator.wx.lua scribble.wx.lua wxluasudoku.wx.lua Log Message: add more wxcomap26 checks cleanup and simplify samples Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** wxluasudoku.wx.lua 22 Nov 2006 06:08:33 -0000 1.58 --- wxluasudoku.wx.lua 22 Nov 2006 21:13:56 -0000 1.59 *************** *** 540,549 **** local value = sudoku.GetCellValue(cell, sudokuTable) ! if not sudokuTable.row_values[row][value] then sudokuTable.row_values[row][value] = {} end ! if not sudokuTable.col_values[col][value] then sudokuTable.col_values[col][value] = {} end ! if not sudokuTable.block_values[block][value] then sudokuTable.block_values[block][value] = {} end ! sudokuTable.row_values[row][value][cell] = cell ! sudokuTable.col_values[col][value][cell] = cell ! sudokuTable.block_values[block][value][cell] = cell end end --- 540,558 ---- local value = sudoku.GetCellValue(cell, sudokuTable) ! if not sudokuTable.row_values[row][value] then ! sudokuTable.row_values[row][value] = {[cell] = cell} ! else ! sudokuTable.row_values[row][value][cell] = cell ! end ! if not sudokuTable.col_values[col][value] then ! sudokuTable.col_values[col][value] = {[cell] = cell} ! else ! sudokuTable.col_values[col][value][cell] = cell ! end ! if not sudokuTable.block_values[block][value] then ! sudokuTable.block_values[block][value] = {[cell] = cell} ! else ! sudokuTable.block_values[block][value][cell] = cell ! end end end *************** *** 798,804 **** local function add_possible(atable, rcb_key, key, cell) ! if not atable[rcb_key] then atable[rcb_key] = {} end ! if not atable[rcb_key][key] then atable[rcb_key][key] = {} end ! table.insert(atable[rcb_key][key], cell) end --- 807,817 ---- local function add_possible(atable, rcb_key, key, cell) ! if not atable[rcb_key] then ! atable[rcb_key] = { [key] = {cell} } ! elseif not atable[rcb_key][key] then ! atable[rcb_key][key] = {cell} ! else ! table.insert(atable[rcb_key][key], cell) ! end end *************** *** 1101,1105 **** function sudoku.SolveScanSingles(sudokuTable) sudokuTable = sudoku.CalcAllPossible(sudokuTable) ! local changed_cells = nil for row = 1, 9 do --- 1114,1118 ---- function sudoku.SolveScanSingles(sudokuTable) sudokuTable = sudoku.CalcAllPossible(sudokuTable) ! local changed_cells = {} for row = 1, 9 do *************** *** 1116,1120 **** sudokuTable = sudoku.SetValue(row, col, value, sudokuTable) sudokuTable = sudoku.RemovePossibleAll(row, col, value, sudokuTable) - if not changed_cells then changed_cells = {} end changed_cells[sudoku.RowColToCell(row, col)] = value end --- 1129,1132 ---- *************** *** 1123,1126 **** --- 1135,1140 ---- end + if TableIsEmpty(changed_cells) then changed_cells = nil end -- reset if not used + return sudokuTable, changed_cells end *************** *** 1136,1140 **** function sudoku.SolveScanRowsCols(scan_rows, sudokuTable) sudokuTable = sudoku.CalcAllPossible(sudokuTable) ! local changed_cells = nil for row_col1 = 1, 9 do --- 1150,1154 ---- function sudoku.SolveScanRowsCols(scan_rows, sudokuTable) sudokuTable = sudoku.CalcAllPossible(sudokuTable) ! local changed_cells = {} for row_col1 = 1, 9 do *************** *** 1165,1169 **** sudokuTable = sudoku.SetValue(r, c, value, sudokuTable) sudokuTable = sudoku.RemovePossibleAll(r, c, value, sudokuTable) - if not changed_cells then changed_cells = {} end changed_cells[cell] = value end --- 1179,1182 ---- *************** *** 1171,1174 **** --- 1184,1189 ---- end + if TableIsEmpty(changed_cells) then changed_cells = nil end -- reset if not used + return sudokuTable, changed_cells end *************** *** 1177,1181 **** function sudoku.SolveScanBlocks(sudokuTable) sudokuTable = sudoku.CalcAllPossible(sudokuTable) ! local changed_cells = nil for block = 1, 9 do --- 1192,1196 ---- function sudoku.SolveScanBlocks(sudokuTable) sudokuTable = sudoku.CalcAllPossible(sudokuTable) ! local changed_cells = {} for block = 1, 9 do *************** *** 1204,1208 **** sudokuTable = sudoku.SetValue(row, col, value, sudokuTable) sudokuTable = sudoku.RemovePossibleAll(row, col, value, sudokuTable) - if not changed_cells then changed_cells = {} end changed_cells[cell] = value end --- 1219,1222 ---- *************** *** 1210,1213 **** --- 1224,1229 ---- end + if TableIsEmpty(changed_cells) then changed_cells = nil end -- reset if not used + return sudokuTable, changed_cells end *************** *** 1243,1247 **** end ! if TableCount(changed_cells) == 0 then changed_cells = nil end -- nothing done return sudokuTable, count, changed_cells --- 1259,1263 ---- end ! if TableIsEmpty(changed_cells) then changed_cells = nil end -- nothing done return sudokuTable, count, changed_cells Index: scribble.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** scribble.wx.lua 21 Nov 2006 23:20:37 -0000 1.12 --- scribble.wx.lua 22 Nov 2006 21:13:56 -0000 1.13 *************** *** 15,22 **** mouseDown = false -- left mouse button is down pointsList = {} -- list of the points added to the drawing itemColour = 1 -- current pen colour - isRunning = true -- only false when we're about to exit isModified = false -- has the drawing been modified redrawRequired = true -- redraw the image fileName = "" -- filename to save to ID_SAVEBITMAP = wx.wxID_HIGHEST + 1 --- 15,23 ---- mouseDown = false -- left mouse button is down pointsList = {} -- list of the points added to the drawing + -- pointsList[segment] = {penColour = index, [n] = {x = x_pos, y = x_pos}} itemColour = 1 -- current pen colour isModified = false -- has the drawing been modified redrawRequired = true -- redraw the image + lastDrawn = 0 -- last point that was drawn or 0 to redraw all fileName = "" -- filename to save to ID_SAVEBITMAP = wx.wxID_HIGHEST + 1 *************** *** 27,70 **** bitmap = wx.wxEmptyBitmap(screenWidth, screenHeight) ! for key, value in pairs(penColours) do ! table.insert(pens, wx.wxPenFromColourName(value, 3, wx.wxSOLID)) end function DrawPoints(drawDC) ! for listIndex = 1, #pointsList do ! local listValue = pointsList[listIndex] drawDC:SetPen(pens[listValue.penColour]) ! local pointsValue = listValue[1] ! local lastX, lastY = pointsValue.x, pointsValue.y ! for pointsIndex = 2, #listValue do ! pointsValue = listValue[pointsIndex] ! drawDC:DrawLine(lastX, lastY, pointsValue.x, pointsValue.y) ! lastX, lastY = pointsValue.x, pointsValue.y end end drawDC:SetPen(wx.wxNullPen) end function DrawBitmap(bmp) ! local bitmapDC = wx.wxMemoryDC() -- create off screen dc to draw on ! bitmapDC:SelectObject(bmp) -- select our bitmap to draw into ! bitmapDC:Clear() ! DrawPoints(bitmapDC) ! bitmapDC:SelectObject(wx.wxNullBitmap) -- release our bitmap ! bitmapDC:Delete() -- ALWAYS Delete() any wxDCs created when done end function OnPaint(event) local dc = wx.wxPaintDC(panel) ! if redrawRequired then ! if isRunning then ! DrawBitmap(bitmap) ! end ! redrawRequired = false end ! if isRunning then dc:DrawBitmap(bitmap, 0, 0, false) end --- 28,79 ---- bitmap = wx.wxEmptyBitmap(screenWidth, screenHeight) ! for n = 1, #penColours do ! table.insert(pens, wx.wxPenFromColourName(penColours[n], 3, wx.wxSOLID)) end function DrawPoints(drawDC) ! if lastDrawn == 0 then ! drawDC:Clear() ! end ! ! local start_index = 1 ! if lastDrawn > 1 then start_index = lastDrawn end ! ! for list_index = start_index, #pointsList do ! local listValue = pointsList[list_index] drawDC:SetPen(pens[listValue.penColour]) ! local point = listValue[1] ! local last_x, last_y = point.x, point.y ! for point_index = 2, #listValue do ! point = listValue[point_index] ! drawDC:DrawLine(last_x, last_y, point.x, point.y) ! last_x, last_y = point.x, point.y end end + + lastDrawn = #pointsList drawDC:SetPen(wx.wxNullPen) end function DrawBitmap(bmp) ! local memDC = wx.wxMemoryDC() -- create off screen dc to draw on ! memDC:SelectObject(bmp) -- select our bitmap to draw into ! DrawPoints(memDC) ! memDC:SelectObject(wx.wxNullBitmap) -- always release bitmap ! memDC:Delete() -- ALWAYS Delete() any wxDCs created when done end function OnPaint(event) + -- ALWAYS create wxPaintDC in wxEVT_PAINT handler, even if unused local dc = wx.wxPaintDC(panel) ! if redrawRequired and bitmap and bitmap:Ok() then ! DrawBitmap(bitmap) end ! redrawRequired = false -- reset since we at least tried to redraw it ! ! if bitmap and bitmap:Ok() then dc:DrawBitmap(bitmap, 0, 0, false) end *************** *** 74,81 **** function OnLeftDown(event) - local pointItem = {} - pointItem.penColour = itemColour frame:SetStatusText(penColours[itemColour], 1) itemColour = itemColour + 1 if penColours[itemColour] == nil then -- have colours wrap around --- 83,91 ---- function OnLeftDown(event) frame:SetStatusText(penColours[itemColour], 1) + local pointItem = {penColour = itemColour, {x = event:GetX(), y = event:GetY()}} + table.insert(pointsList, pointItem) + itemColour = itemColour + 1 if penColours[itemColour] == nil then -- have colours wrap around *************** *** 83,90 **** end - local points = { x = event:GetX(), y = event:GetY() } - table.insert(pointItem, points) - table.insert(pointsList, pointItem) - if (not panel:HasCapture()) then panel:CaptureMouse() end mouseDown = true --- 93,96 ---- *************** *** 96,101 **** function OnLeftUp(event) if mouseDown then ! local points = { x = event:GetX(), y = event:GetY() } ! table.insert(pointsList[#pointsList], points) if panel:HasCapture() then panel:ReleaseMouse() end --- 102,112 ---- function OnLeftUp(event) if mouseDown then ! -- only add point if the mouse moved since DrawLine(1,2,1,2) won't draw anyway ! if (#pointsList[#pointsList] > 1) then ! local point = { x = event:GetX(), y = event:GetY() } ! table.insert(pointsList[#pointsList], point) ! else ! pointsList[#pointsList] = nil ! end if panel:HasCapture() then panel:ReleaseMouse() end *************** *** 112,117 **** if event:LeftIsDown() then ! local points = { x = event:GetX(), y = event:GetY() } ! table.insert(pointsList[#pointsList], points) mouseDown = true --- 123,128 ---- if event:LeftIsDown() then ! local point = { x = event:GetX(), y = event:GetY() } ! table.insert(pointsList[#pointsList], point) mouseDown = true *************** *** 139,144 **** end ! function LoadScribbles() pointsList = {} return ((pcall(dofile, fileName)) ~= nil) end --- 150,156 ---- end ! function LoadScribbles(fileName) pointsList = {} + lastDrawn = 0 return ((pcall(dofile, fileName)) ~= nil) end *************** *** 172,182 **** fh:close() return true end - - wx.wxMessageBox("Unable to save file:'"..fileName.."'.\n"..msg, - "wxLua Scribble Save error", - wx.wxOK + wx.wxICON_ERROR, - frame) - return false end --- 184,194 ---- fh:close() return true + else + wx.wxMessageBox("Unable to save file:'"..fileName.."'.\n"..msg, + "wxLua Scribble Save error", + wx.wxOK + wx.wxICON_ERROR, + frame) + return false end end *************** *** 191,195 **** if fileDialog:ShowModal() == wx.wxID_OK then fileName = fileDialog:GetPath() ! result = LoadScribbles() if result then frame:SetTitle("wxLua Scribble - " .. fileName) --- 203,207 ---- if fileDialog:ShowModal() == wx.wxID_OK then fileName = fileDialog:GetPath() ! result = LoadScribbles(fileName) if result then frame:SetTitle("wxLua Scribble - " .. fileName) *************** *** 220,230 **** function SaveChanges() ! local isOKToContinue = false if fileName == "" then ! isOKToContinue = SaveAs() else ! isOKToContinue = SaveScribbles() end ! return isOKToContinue end --- 232,242 ---- function SaveChanges() ! local saved = false if fileName == "" then ! saved = SaveAs() else ! saved = SaveScribbles() end ! return saved end *************** *** 235,248 **** wx.wxDEFAULT_FRAME_STYLE ) ! panel = wx.wxPanel(frame, wx.wxID_ANY) ! ! panel:Connect(wx.wxEVT_PAINT, OnPaint) ! panel:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) end) -- do nothing ! ! ! panel:Connect(wx.wxEVT_LEFT_DOWN, OnLeftDown ) ! panel:Connect(wx.wxEVT_LEFT_UP, OnLeftUp ) ! panel:Connect(wx.wxEVT_MOTION, OnMotion ) ! local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_NEW, "&New", "Begin a new drawing") --- 247,251 ---- wx.wxDEFAULT_FRAME_STYLE ) ! -- Create the menubar local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_NEW, "&New", "Begin a new drawing") *************** *** 261,272 **** menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") - frame:SetMenuBar(menuBar) local statusBar = frame:CreateStatusBar(3) local status_width = statusBar:GetTextExtent("88888, 88888") frame:SetStatusWidths({ -1, status_width, status_width }) frame:SetStatusText("Welcome to wxLua Scribble.") frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) --- 264,286 ---- menuBar:Append(fileMenu, "&File") menuBar:Append(helpMenu, "&Help") frame:SetMenuBar(menuBar) + -- Create the statusbar local statusBar = frame:CreateStatusBar(3) local status_width = statusBar:GetTextExtent("88888, 88888") frame:SetStatusWidths({ -1, status_width, status_width }) frame:SetStatusText("Welcome to wxLua Scribble.") + frame:SetStatusText(penColours[itemColour], 1) + -- Create a wxPanel to draw on, always a good idea, it will fill the frame + panel = wx.wxPanel(frame, wx.wxID_ANY) + + panel:Connect(wx.wxEVT_PAINT, OnPaint) + panel:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) end) -- do nothing + panel:Connect(wx.wxEVT_LEFT_DOWN, OnLeftDown ) + panel:Connect(wx.wxEVT_LEFT_UP, OnLeftUp ) + panel:Connect(wx.wxEVT_MOTION, OnMotion ) + + -- Connect menu events frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) *************** *** 281,286 **** fileName = "" ! frame:SetTitle( "wxLua Scribble") pointsList = {} redrawRequired = true isModified = false --- 295,301 ---- fileName = "" ! frame:SetTitle("wxLua Scribble") pointsList = {} + lastDrawn = 0 redrawRequired = true isModified = false *************** *** 303,313 **** frame:Connect(wx.wxID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! local isSaved = false if fileName == "" then ! isSaved = SaveAs() else ! isSaved = SaveScribbles() end ! if isSaved then isModified = false end --- 318,328 ---- frame:Connect(wx.wxID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) ! local saved = false if fileName == "" then ! saved = SaveAs() else ! saved = SaveScribbles() end ! if saved then isModified = false end *************** *** 320,330 **** end end ) frame:Connect(ID_SAVEBITMAP, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) - local w, h = panel:GetClientSize() - local bmp = wx.wxEmptyBitmap(w, h) - DrawBitmap(bmp) - local img = bmp:ConvertToImage() - local fileDialog = wx.wxFileDialog(frame, "Save wxLua scribble file as", --- 335,341 ---- end end ) + frame:Connect(ID_SAVEBITMAP, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local fileDialog = wx.wxFileDialog(frame, "Save wxLua scribble file as", *************** *** 334,343 **** wx.wxSAVE + wx.wxOVERWRITE_PROMPT) if fileDialog:ShowModal() == wx.wxID_OK then ! img:SaveFile(fileDialog:GetPath()) end fileDialog:Destroy() - bmp:Delete() - img:Delete() end ) --- 345,367 ---- wx.wxSAVE + wx.wxOVERWRITE_PROMPT) if fileDialog:ShowModal() == wx.wxID_OK then ! local w, h = panel:GetClientSize() ! local bmp = wx.wxEmptyBitmap(w, h) ! lastDrawn = 0 -- force redrawing all points ! DrawBitmap(bmp) ! lastDrawn = 0 -- force redrawing all points ! ! local img = bmp:ConvertToImage() ! if not img:SaveFile(fileDialog:GetPath()) then ! wx.wxMessageBox("There was a problem saving the image file\n"..fileDialog:GetPath(), ! "Error saving image", ! wx.wxOK + wx.wxICON_ERROR, ! frame ) ! end ! ! bmp:Delete() ! img:Delete() end fileDialog:Destroy() end ) *************** *** 366,375 **** end if isOkToClose then ! -- prevent paint events using the bitmapDC after we ! -- have deleted them ! isRunning = false bitmap:Delete() ! -- ensure the event is passed on so ! -- that it is handled event:Skip() end --- 390,397 ---- end if isOkToClose then ! -- prevent paint events using the memDC during closing bitmap:Delete() ! bitmap = nil ! -- ensure the event is passed on so that it is handled event:Skip() end Index: calculator.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/calculator.wx.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** calculator.wx.lua 26 Sep 2006 22:22:00 -0000 1.7 --- calculator.wx.lua 22 Nov 2006 21:13:56 -0000 1.8 *************** *** 200,203 **** --- 200,206 ---- -- try to load the resource and ask for path to it if not found while not xmlResource:Load(xrcFilename) do + -- must unload the file before we try again + xmlResource:Unload(xrcFilename) + wx.wxMessageBox("Error loading xrc resources, please choose the path to 'calculator.xrc'.", "Calculator", |
|
From: John L. <jr...@us...> - 2006-11-22 21:14:01
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19437/wxLua/bindings/wxwidgets Modified Files: appframe.i datetime.i windows.i Log Message: add more wxcomap26 checks cleanup and simplify samples Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** windows.i 2 Nov 2006 23:38:08 -0000 1.22 --- windows.i 22 Nov 2006 21:13:56 -0000 1.23 *************** *** 113,117 **** virtual wxColour GetBackgroundColour() const virtual wxBackgroundStyle GetBackgroundStyle() const ! wxSize GetBestFittingSize() const virtual wxSize GetBestSize() const wxCaret* GetCaret() const --- 113,117 ---- virtual wxColour GetBackgroundColour() const virtual wxBackgroundStyle GetBackgroundStyle() const ! wxSize GetBestFittingSize() const // deprecated in 2.8 use GetEffectiveMinSize virtual wxSize GetBestSize() const wxCaret* GetCaret() const *************** *** 212,216 **** virtual void SetBackgroundColour(const wxColour& colour) virtual void SetBackgroundStyle(wxBackgroundStyle style) ! void SetBestFittingSize(const wxSize& size = wxDefaultSize) void SetCaret(wxCaret *caret) const %overload virtual void SetClientSize(const wxSize& size) --- 212,216 ---- 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 %overload virtual void SetClientSize(const wxSize& size) Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** datetime.i 2 Nov 2006 23:38:08 -0000 1.18 --- datetime.i 22 Nov 2006 21:13:56 -0000 1.19 *************** *** 15,20 **** %function long wxGetUTCTime() //%function wxLongLong wxGetLocalTimeMillis() ! %function void wxStartTimer() ! %function long wxGetElapsedTime(bool resetTimer = true) %function void wxSleep(int secs) %wxchkver25 %function void wxMilliSleep(unsigned long milliseconds) --- 15,20 ---- %function long wxGetUTCTime() //%function wxLongLong wxGetLocalTimeMillis() ! %wxcompat26 %function void wxStartTimer() // deprecated in 2.8 use wxStopWatch ! %wxcompat26 %function long wxGetElapsedTime(bool resetTimer = true) // deprecated in 2.8 use wxStopWatch %function void wxSleep(int secs) %wxchkver25 %function void wxMilliSleep(unsigned long milliseconds) Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** appframe.i 6 Nov 2006 06:11:43 -0000 1.21 --- appframe.i 22 Nov 2006 21:13:56 -0000 1.22 *************** *** 294,298 **** // wxAcceleratorEntry ! %function wxAcceleratorEntry* wxGetAccelFromString(const wxString& label) %enum --- 294,298 ---- // wxAcceleratorEntry ! %wxcompat26 %function wxAcceleratorEntry* wxGetAccelFromString(const wxString& label) // deprecated in 2.8 use wxAcceleratorEntry::Create() or FromString() %enum |
|
From: John L. <jr...@us...> - 2006-11-22 06:08:37
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17631/wxLua/samples Modified Files: wxluasudoku.wx.lua Log Message: use defined(WXCOMAP_XXX) && WX_COMPAT_XXX not just #if WX_COMPAT better colours for wxluasudoku Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** wxluasudoku.wx.lua 26 Sep 2006 22:22:00 -0000 1.57 --- wxluasudoku.wx.lua 22 Nov 2006 06:08:33 -0000 1.58 *************** *** 59,64 **** local args = {...} for n = 1, #args-1 do ! if not t[args[n]] then t[args[n]] = {} end ! t = t[args[n]] end t[args[#args]] = value --- 59,65 ---- local args = {...} for n = 1, #args-1 do ! local a = args[n] ! if not t[a] then t[a] = {} end ! t = t[a] end t[args[#args]] = value *************** *** 2046,2050 **** ]] ! -- Simply way to generate unique window or menu ids and ensure they're in order function NewID() if not sudokuGUI_ID_New then sudokuGUI_ID_New = wx.wxID_HIGHEST end --- 2047,2051 ---- ]] ! -- Simple way to generate unique window or menu ids and ensure they're in order function NewID() if not sudokuGUI_ID_New then sudokuGUI_ID_New = wx.wxID_HIGHEST end *************** *** 4471,4476 **** [sudokuGUI.INVALID_VALUE_COLOUR] = wx.wxColour(255, 0, 0), [sudokuGUI.BACKGROUND_COLOUR] = wx.wxColour(255, 255, 255), ! [sudokuGUI.ODD_BACKGROUND_COLOUR] = wx.wxColour(250, 250, 200), ! [sudokuGUI.FOCUS_CELL_COLOUR] = wx.wxColour(230, 255, 230), [sudokuGUI.NAKED_PAIRS_COLOUR] = wx.wxColour(255, 0, 0), --- 4472,4477 ---- [sudokuGUI.INVALID_VALUE_COLOUR] = wx.wxColour(255, 0, 0), [sudokuGUI.BACKGROUND_COLOUR] = wx.wxColour(255, 255, 255), ! [sudokuGUI.ODD_BACKGROUND_COLOUR] = wx.wxColour(250, 250, 210), ! [sudokuGUI.FOCUS_CELL_COLOUR] = wx.wxColour(200, 220, 250), [sudokuGUI.NAKED_PAIRS_COLOUR] = wx.wxColour(255, 0, 0), |
|
From: John L. <jr...@us...> - 2006-11-22 06:08:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17631/wxLua/modules/wxbind/src Modified Files: appframe.cpp gdi.cpp wx_bind.cpp Log Message: use defined(WXCOMAP_XXX) && WX_COMPAT_XXX not just #if WX_COMPAT better colours for wxluasudoku Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** wx_bind.cpp 6 Nov 2006 06:11:44 -0000 1.60 --- wx_bind.cpp 22 Nov 2006 06:08:33 -0000 1.61 *************** *** 394,398 **** // -------------------------------------------------------------------- ! #if (!wxCHECK_VERSION(2,7,0) || WXWIN_COMPATIBILITY_2_6) && (wxLUA_USE_wxNotebook) { "wxNB_BOTTOM", wxNB_BOTTOM }, { "wxNB_FIXEDWIDTH", wxNB_FIXEDWIDTH }, --- 394,398 ---- // -------------------------------------------------------------------- ! #if (!wxCHECK_VERSION(2,7,0) || (defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxNotebook) { "wxNB_BOTTOM", wxNB_BOTTOM }, { "wxNB_FIXEDWIDTH", wxNB_FIXEDWIDTH }, *************** *** 401,405 **** { "wxNB_NOPAGETHEME", wxNB_NOPAGETHEME }, { "wxNB_RIGHT", wxNB_RIGHT }, ! #endif // (!wxCHECK_VERSION(2,7,0) || WXWIN_COMPATIBILITY_2_6) && (wxLUA_USE_wxNotebook) #if (defined(__WXMSW__)) && ((wxUSE_WAVE) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxWave)) --- 401,405 ---- { "wxNB_NOPAGETHEME", wxNB_NOPAGETHEME }, { "wxNB_RIGHT", wxNB_RIGHT }, ! #endif // (!wxCHECK_VERSION(2,7,0) || (defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxNotebook) #if (defined(__WXMSW__)) && ((wxUSE_WAVE) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxWave)) *************** *** 409,415 **** #endif // (defined(__WXMSW__)) && ((wxUSE_WAVE) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxWave)) ! #if (wxCHECK_VERSION(2,3,0) && (!wxCHECK_VERSION(2,7,0) || WXWIN_COMPATIBILITY_2_6 )) && (wxLUA_USE_wxNotebook) { "wxNB_TOP", wxNB_TOP }, ! #endif // (wxCHECK_VERSION(2,3,0) && (!wxCHECK_VERSION(2,7,0) || WXWIN_COMPATIBILITY_2_6 )) && (wxLUA_USE_wxNotebook) #if (wxCHECK_VERSION(2,3,0)) && ((wxCHECK_VERSION(2,4,0) && defined(__WXMSW__)) && (wxLUA_USE_wxTabCtrl)) --- 409,415 ---- #endif // (defined(__WXMSW__)) && ((wxUSE_WAVE) && (defined(__WXMSW__) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxWave)) ! #if (wxCHECK_VERSION(2,3,0) && (!wxCHECK_VERSION(2,7,0) || (defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6))) && (wxLUA_USE_wxNotebook) { "wxNB_TOP", wxNB_TOP }, ! #endif // (wxCHECK_VERSION(2,3,0) && (!wxCHECK_VERSION(2,7,0) || (defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6))) && (wxLUA_USE_wxNotebook) #if (wxCHECK_VERSION(2,3,0)) && ((wxCHECK_VERSION(2,4,0) && defined(__WXMSW__)) && (wxLUA_USE_wxTabCtrl)) *************** *** 1396,1399 **** --- 1396,1403 ---- #endif // !wxCHECK_VERSION(2,7,0) + #if (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4) + { "wxHIDE_READONLY", wxHIDE_READONLY }, + #endif // (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4) + #if (defined(__WXMAC__)) && (wxLUA_USE_wxCursor) { "wxCURSOR_COPY_ARROW", wxCURSOR_COPY_ARROW }, *************** *** 1673,1680 **** { "wxWINDOW_VARIANT_SMALL", wxWINDOW_VARIANT_SMALL }, - #if WXWIN_COMPATIBILITY_2_4 - { "wxHIDE_READONLY", wxHIDE_READONLY }, - #endif // WXWIN_COMPATIBILITY_2_4 - #if wxCHECK_VERSION(2,3,0) { "wxADJUST_MINSIZE", wxADJUST_MINSIZE }, --- 1677,1680 ---- *************** *** 5333,5339 **** ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) { "wxLog", wxLog_methods, wxLog_methodCount, -1, NULL, &s_wxluatag_wxLog, NULL }, ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) --- 5333,5339 ---- ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp) { "wxLog", wxLog_methods, wxLog_methodCount, -1, NULL, &s_wxluatag_wxLog, NULL }, ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp) Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** gdi.cpp 9 Nov 2006 05:13:02 -0000 1.33 --- gdi.cpp 22 Nov 2006 06:08:33 -0000 1.34 *************** *** 768,773 **** ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) ! // !%wxchkver27 bool Inside(wxCoord cx, wxCoord cy) static int LUACALL wxLua_wxRect_Inside(lua_State *L) { --- 768,773 ---- ! #if ((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxPointSizeRect) ! // %wxcompat26 bool Inside(wxCoord cx, wxCoord cy) static int LUACALL wxLua_wxRect_Inside(lua_State *L) { *************** *** 788,792 **** } ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) --- 788,792 ---- } ! #endif // ((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxPointSizeRect) *************** *** 1499,1505 **** static WXLUAMETHOD s_wxRect_methods[] = { ! #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "Inside", wxLua_wxRect_Inside, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) --- 1499,1505 ---- static WXLUAMETHOD s_wxRect_methods[] = { ! #if ((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "Inside", wxLua_wxRect_Inside, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif // ((defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)) && (wxLUA_USE_wxPointSizeRect) Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** appframe.cpp 6 Nov 2006 06:11:44 -0000 1.23 --- appframe.cpp 22 Nov 2006 06:08:33 -0000 1.24 *************** *** 27,31 **** ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) // ------------------------------------------------------------------------------------------------- // Bind class wxLog --- 27,31 ---- ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp) // ------------------------------------------------------------------------------------------------- // Bind class wxLog *************** *** 52,56 **** WXLUAMETHOD* wxLog_methods = s_wxLog_methods; int wxLog_methodCount = sizeof(s_wxLog_methods)/sizeof(s_wxLog_methods[0]); ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) --- 52,56 ---- WXLUAMETHOD* wxLog_methods = s_wxLog_methods; int wxLog_methodCount = sizeof(s_wxLog_methods)/sizeof(s_wxLog_methods[0]); ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp) |
|
From: John L. <jr...@us...> - 2006-11-22 06:08:37
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17631/wxLua/bindings Modified Files: genwxbind.lua Log Message: use defined(WXCOMAP_XXX) && WX_COMPAT_XXX not just #if WX_COMPAT better colours for wxluasudoku Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** genwxbind.lua 6 Nov 2006 06:11:42 -0000 1.80 --- genwxbind.lua 22 Nov 2006 06:08:32 -0000 1.81 *************** *** 663,677 **** conditions["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)" -- wxWidgets version compatibility checks ! conditions["%wxcompat20"] = "WXWIN_COMPATIBILITY_2" ! conditions["%wxcompat22"] = "WXWIN_COMPATIBILITY_2_2" ! conditions["%wxcompat24"] = "WXWIN_COMPATIBILITY_2_4" ! conditions["%wxcompat26"] = "WXWIN_COMPATIBILITY_2_6" ! conditions["%wxcompat28"] = "WXWIN_COMPATIBILITY_2_8" ! conditions["WXWIN_COMPATIBILITY_2"] = "WXWIN_COMPATIBILITY_2" ! conditions["WXWIN_COMPATIBILITY_2_2"] = "WXWIN_COMPATIBILITY_2_2" ! conditions["WXWIN_COMPATIBILITY_2_4"] = "WXWIN_COMPATIBILITY_2_4" ! conditions["WXWIN_COMPATIBILITY_2_6"] = "WXWIN_COMPATIBILITY_2_6" ! conditions["WXWIN_COMPATIBILITY_2_8"] = "WXWIN_COMPATIBILITY_2_8" -- wxWidgets platform checks --- 663,677 ---- conditions["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)" -- wxWidgets version compatibility checks ! conditions["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)" ! conditions["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)" ! conditions["%wxcompat24"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)" ! conditions["%wxcompat26"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)" ! conditions["%wxcompat28"] = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)" ! conditions["WXWIN_COMPATIBILITY_2"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)" ! conditions["WXWIN_COMPATIBILITY_2_2"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)" ! conditions["WXWIN_COMPATIBILITY_2_4"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)" ! conditions["WXWIN_COMPATIBILITY_2_6"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)" ! conditions["WXWIN_COMPATIBILITY_2_8"] = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)" -- wxWidgets platform checks |
|
From: John L. <jr...@us...> - 2006-11-22 06:08:37
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17631/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: use defined(WXCOMAP_XXX) && WX_COMPAT_XXX not just #if WX_COMPAT better colours for wxluasudoku Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** wxbind.h 6 Nov 2006 06:11:44 -0000 1.41 --- wxbind.h 22 Nov 2006 06:08:33 -0000 1.42 *************** *** 630,636 **** #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog; ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) --- 630,636 ---- #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog; ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp) #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) *************** *** 1454,1461 **** #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLog_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount; ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) --- 1454,1461 ---- #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLog_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount; ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp) #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) |
|
From: John L. <jr...@us...> - 2006-11-22 06:08:37
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17631/wxLua/bindings/wxwidgets Modified Files: gdi.i wx_datatypes.lua Log Message: use defined(WXCOMAP_XXX) && WX_COMPAT_XXX not just #if WX_COMPAT better colours for wxluasudoku Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wx_datatypes.lua 6 Nov 2006 06:11:43 -0000 1.39 --- wx_datatypes.lua 22 Nov 2006 06:08:32 -0000 1.40 *************** *** 1797,1801 **** }, wxLog = { ! Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp)", DefType = "class", Intrinsic = false, --- 1797,1801 ---- }, wxLog = { ! Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)", DefType = "class", Intrinsic = false, *************** *** 3293,3307 **** ["%wxchkver_2_2"] = "wxCHECK_VERSION(2,2,0)", ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)", ! ["%wxcompat20"] = "WXWIN_COMPATIBILITY_2", ! ["%wxcompat22"] = "WXWIN_COMPATIBILITY_2_2", ! ["%wxcompat24"] = "WXWIN_COMPATIBILITY_2_4", ! ["%wxcompat26"] = "WXWIN_COMPATIBILITY_2_6", ! ["%wxcompat28"] = "WXWIN_COMPATIBILITY_2_8", ["%x11"] = "defined(__WXX11__)", ! WXWIN_COMPATIBILITY_2 = "WXWIN_COMPATIBILITY_2", ! WXWIN_COMPATIBILITY_2_2 = "WXWIN_COMPATIBILITY_2_2", ! WXWIN_COMPATIBILITY_2_4 = "WXWIN_COMPATIBILITY_2_4", ! WXWIN_COMPATIBILITY_2_6 = "WXWIN_COMPATIBILITY_2_6", ! WXWIN_COMPATIBILITY_2_8 = "WXWIN_COMPATIBILITY_2_8", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_Geometry = "wxLUA_USE_Geometry", --- 3293,3307 ---- ["%wxchkver_2_2"] = "wxCHECK_VERSION(2,2,0)", ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)", ! ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)", ! ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)", ! ["%wxcompat24"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)", ! ["%wxcompat26"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", ! ["%wxcompat28"] = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", ["%x11"] = "defined(__WXX11__)", ! WXWIN_COMPATIBILITY_2 = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)", ! WXWIN_COMPATIBILITY_2_2 = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)", ! WXWIN_COMPATIBILITY_2_4 = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)", ! WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)", ! WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_Geometry = "wxLUA_USE_Geometry", Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** gdi.i 9 Nov 2006 05:13:01 -0000 1.29 --- gdi.i 22 Nov 2006 06:08:32 -0000 1.30 *************** *** 92,96 **** int GetY() wxRect Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy) ! !%wxchkver27 bool Inside(wxCoord cx, wxCoord cy) bool Intersects(const wxRect& rect) const bool IsEmpty() const --- 92,96 ---- int GetY() wxRect Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy) ! %wxcompat26 bool Inside(wxCoord cx, wxCoord cy) bool Intersects(const wxRect& rect) const bool IsEmpty() const |
|
From: John L. <jr...@us...> - 2006-11-21 23:20:54
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19073/wxLua/samples Modified Files: dialog.wx.lua scribble.wx.lua Log Message: better dialog resizing, cleanup Index: dialog.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** dialog.wx.lua 26 Sep 2006 22:22:00 -0000 1.8 --- dialog.wx.lua 21 Nov 2006 23:20:37 -0000 1.9 *************** *** 30,33 **** --- 30,34 ---- local staticBoxSizer = wx.wxStaticBoxSizer(staticBox, wx.wxVERTICAL) local flexGridSizer = wx.wxFlexGridSizer( 2, 3, 0, 0 ) + flexGridSizer:AddGrowableCol(1, 0) local celsiusStaticText = wx.wxStaticText( panel, wx.wxID_ANY, "Celcius") *************** *** 35,39 **** local celsiusButton = wx.wxButton( panel, ID_CELSIUS_BUTTON, "C -> F") flexGridSizer:AddWindow( celsiusStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( celsiusTextCtrl, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) flexGridSizer:AddWindow( celsiusButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) --- 36,40 ---- local celsiusButton = wx.wxButton( panel, ID_CELSIUS_BUTTON, "C -> F") flexGridSizer:AddWindow( celsiusStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( celsiusTextCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) flexGridSizer:AddWindow( celsiusButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) *************** *** 42,50 **** local fahrenheitButton = wx.wxButton( panel, ID_FAHRENHEIT_BUTTON, "F -> C") flexGridSizer:AddWindow( fahrenheitStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( fahrenheitTextCtrl, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) flexGridSizer:AddWindow( fahrenheitButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! staticBoxSizer:AddSizer( flexGridSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:AddSizer( staticBoxSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL ) --- 43,51 ---- local fahrenheitButton = wx.wxButton( panel, ID_FAHRENHEIT_BUTTON, "F -> C") flexGridSizer:AddWindow( fahrenheitStaticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( fahrenheitTextCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) flexGridSizer:AddWindow( fahrenheitButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! staticBoxSizer:AddSizer( flexGridSizer, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:AddSizer( staticBoxSizer, 1, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL ) Index: scribble.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** scribble.wx.lua 26 Sep 2006 22:22:00 -0000 1.11 --- scribble.wx.lua 21 Nov 2006 23:20:37 -0000 1.12 *************** *** 256,260 **** local helpMenu = wx.wxMenu() ! helpMenu:Append(wx.wxID_ABOUT, "&About...", "About the wxLua Minimal Application") local menuBar = wx.wxMenuBar() --- 256,260 ---- local helpMenu = wx.wxMenu() ! helpMenu:Append(wx.wxID_ABOUT, "&About...", "About the wxLua Scribble Application") local menuBar = wx.wxMenuBar() |
|
From: John L. <jr...@us...> - 2006-11-17 20:54:11
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6809/docs Modified Files: wxlua.html Log Message: update docs Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxlua.html 25 May 2006 04:44:10 -0000 1.7 --- wxlua.html 17 Nov 2006 20:54:02 -0000 1.8 *************** *** 3,26 **** <head> - - - - - - <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"> [...4507 lines suppressed...] - - <li>The other functions are documented in wxlstate.h.</li> - - - </ul> - - - <br> - - - </body> </html> --- 1472,1535 ---- |
|
From: John L. <jr...@us...> - 2006-11-13 18:51:43
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17898/wxLua/bindings/wxwidgets Modified Files: gdi.i Log Message: fix wxDCClipper constructor for wx 2.6 Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** gdi.i 2 Nov 2006 23:38:08 -0000 1.28 --- gdi.i 9 Nov 2006 05:13:01 -0000 1.29 *************** *** 1148,1154 **** %class %delete %noclassinfo %encapsulate wxDCClipper ! %overload wxDCClipper(wxDC& dc, const wxRegion& r) ! %overload %constructor wxDCClipperFromRect(wxDC& dc, const wxRect& r) ! //%overload %constructor wxDCClipperFromCoords(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h) %endclass --- 1148,1154 ---- %class %delete %noclassinfo %encapsulate wxDCClipper ! %overload %constructor wxDCClipper(wxDC& dc, const wxRect& r) ! //%overload wxDCClipper(wxDC& dc, const wxRegion& r) ! %overload %constructor wxDCClipperFromCoords(wxDC& dc, wxCoord x, wxCoord y, wxCoord w, wxCoord h) %endclass |
|
From: John L. <jr...@us...> - 2006-11-06 06:11:51
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21901/wxLua/modules/wxbind/src Modified Files: appframe.cpp wx_bind.cpp wxlua.cpp Log Message: code cleanup add %wxchkver_x_y_z as replacement for %wxchkverxyz Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxlua.cpp 9 Jun 2006 22:51:34 -0000 1.20 --- wxlua.cpp 6 Nov 2006 06:11:44 -0000 1.21 *************** *** 115,119 **** // get this wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call GetObject if (self->GetObject()) return 1; --- 115,119 ---- // get this wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call GetObject that if successful will push an item onto the stack if (self->GetObject()) return 1; *************** *** 121,125 **** } ! // int GetAllocationFlags() const static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L) { --- 121,125 ---- } ! // int GetAllocationFlags() const static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L) { *************** *** 136,151 **** } ! // void ModifyAllocationFlags(int iValue) ! static int LUACALL wxLua_wxLuaObject_ModifyAllocationFlags(lua_State *L) { wxLuaState wxlState(L); ! // int iValue ! int iValue = (int)wxlState.GetNumberType(2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call ModifyAllocationFlags ! self->ModifyAllocationFlags(iValue); ! return 0; } --- 136,173 ---- } ! // bool HasAllocationFlag(wxLuaObject_Type flag) ! static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L) { wxLuaState wxlState(L); ! bool returns; ! // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlState.GetEnumerationType(2); // get this wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call HasAllocationFlag ! returns = self->HasAllocationFlag(flag); ! // push the result flag ! lua_pushboolean(L, returns); ! return 1; ! } ! ! // int SetAllocationFlag(wxLuaObject_Type flag, bool set) ! static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L) ! { ! wxLuaState wxlState(L); ! int returns; ! // bool set ! bool set = wxlState.GetBooleanType(3); ! // wxLuaObject_Type flag ! wxLuaObject_Type flag = (wxLuaObject_Type)wxlState.GetEnumerationType(2); ! // get this ! wxLuaObject * self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call SetAllocationFlag ! returns = self->SetAllocationFlag(flag, set); ! // push the result number ! lua_pushnumber(L, returns); ! ! return 1; } *************** *** 182,189 **** static WXLUAMETHOD s_wxLuaObject_methods[] = { { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, { 0 } }, ! { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 0, 0, { 0 } }, { LuaMethod, "GetObject", wxLua_wxLuaObject_GetObject, 0, 0, { 0 } }, { LuaMethod, "GetAllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, { 0 } }, ! { LuaMethod, "ModifyAllocationFlags", wxLua_wxLuaObject_ModifyAllocationFlags, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaGetProp, "AllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, {0} }, { LuaGetProp, "Object", wxLua_wxLuaObject_GetObject, 0, 0, {0} }, --- 204,212 ---- static WXLUAMETHOD s_wxLuaObject_methods[] = { { LuaConstructor, "wxLuaObject", wxLua_wxLuaObject_constructor, 0, 0, { 0 } }, ! { LuaMethod, "SetObject", wxLua_wxLuaObject_SetObject, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetObject", wxLua_wxLuaObject_GetObject, 0, 0, { 0 } }, { LuaMethod, "GetAllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, { 0 } }, ! { LuaMethod, "HasAllocationFlag", wxLua_wxLuaObject_HasAllocationFlag, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SetAllocationFlag", wxLua_wxLuaObject_SetAllocationFlag, 2, 2, { &s_wxluaarg_Enumeration, &s_wxluaarg_Boolean, 0 } }, { LuaGetProp, "AllocationFlags", wxLua_wxLuaObject_GetAllocationFlags, 0, 0, {0} }, { LuaGetProp, "Object", wxLua_wxLuaObject_GetObject, 0, 0, {0} }, Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** wx_bind.cpp 2 Nov 2006 23:38:09 -0000 1.59 --- wx_bind.cpp 6 Nov 2006 06:11:44 -0000 1.60 *************** *** 1638,1641 **** --- 1638,1646 ---- { "wxIMAGE_RESOLUTION_INCHES", wxIMAGE_RESOLUTION_INCHES }, { "wxLEFT", wxLEFT }, + { "wxLUAOBJECT_ARRAYINT", wxLUAOBJECT_ARRAYINT }, + { "wxLUAOBJECT_BOOL", wxLUAOBJECT_BOOL }, + { "wxLUAOBJECT_INT", wxLUAOBJECT_INT }, + { "wxLUAOBJECT_NONE", wxLUAOBJECT_NONE }, + { "wxLUAOBJECT_STRING", wxLUAOBJECT_STRING }, { "wxMOUSE_BTN_ANY", wxMOUSE_BTN_ANY }, { "wxMOUSE_BTN_LEFT", wxMOUSE_BTN_LEFT }, *************** *** 5328,5334 **** ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) { "wxLog", wxLog_methods, wxLog_methodCount, -1, NULL, &s_wxluatag_wxLog, NULL }, ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) --- 5333,5339 ---- ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) { "wxLog", wxLog_methods, wxLog_methodCount, -1, NULL, &s_wxluatag_wxLog, NULL }, ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** appframe.cpp 23 Aug 2006 04:57:52 -0000 1.22 --- appframe.cpp 6 Nov 2006 06:11:44 -0000 1.23 *************** *** 27,31 **** ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) // ------------------------------------------------------------------------------------------------- // Bind class wxLog --- 27,31 ---- ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) // ------------------------------------------------------------------------------------------------- // Bind class wxLog *************** *** 52,56 **** WXLUAMETHOD* wxLog_methods = s_wxLog_methods; int wxLog_methodCount = sizeof(s_wxLog_methods)/sizeof(s_wxLog_methods[0]); ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) --- 52,56 ---- WXLUAMETHOD* wxLog_methods = s_wxLog_methods; int wxLog_methodCount = sizeof(s_wxLog_methods)/sizeof(s_wxLog_methods[0]); ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) |
|
From: John L. <jr...@us...> - 2006-11-06 06:11:48
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21901/wxLua/bindings/wxwidgets Modified Files: appframe.i dialogs.i override.hpp wx_datatypes.lua wxlua.i Log Message: code cleanup add %wxchkver_x_y_z as replacement for %wxchkverxyz Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** appframe.i 23 Aug 2006 04:57:52 -0000 1.20 --- appframe.i 6 Nov 2006 06:11:43 -0000 1.21 *************** *** 15,22 **** %include "wx/app.h" ! %if %wxchkver22&!%wxchkver25|%wxcompat24 %class %noclassinfo wxLog // FIXME %endclass ! %endif %function wxApp* wxGetBaseApp() // THIS IS DEPRECATED! use wxGetApp --- 15,26 ---- %include "wx/app.h" ! %if wxUSE_LOG ! %if %wxchkver_2_2&!%wxchkver_2_5|%wxcompat24 ! %class %noclassinfo wxLog // FIXME %endclass ! ! %endif %wxchkver22&!%wxchkver25|%wxcompat24 ! %endif wxUSE_LOG %function wxApp* wxGetBaseApp() // THIS IS DEPRECATED! use wxGetApp Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wx_datatypes.lua 2 Nov 2006 23:38:08 -0000 1.38 --- wx_datatypes.lua 6 Nov 2006 06:11:43 -0000 1.39 *************** *** 13,17 **** WXHANDLE = "void *", WXWidget = "unsigned long", - luaObject = "lua_State *", ["wxDateTime::wxDateTime_t"] = "unsigned short", wxDouble = "double", --- 13,16 ---- *************** *** 1798,1802 **** }, wxLog = { ! Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp)", DefType = "class", Intrinsic = false, --- 1797,1801 ---- }, wxLog = { ! Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp)", DefType = "class", Intrinsic = false, *************** *** 1823,1826 **** --- 1822,1830 ---- Name = "wxLuaObject", }, + wxLuaObject_Type = { + DefType = "enum", + Intrinsic = true, + Name = "wxLuaObject_Type", + }, wxLuaPrintout = { BaseClass = "wxPrintout", *************** *** 3287,3290 **** --- 3291,3296 ---- ["%wxchkver272"] = "wxCHECK_VERSION(2,7,2)", ["%wxchkver28"] = "wxCHECK_VERSION(2,8,0)", + ["%wxchkver_2_2"] = "wxCHECK_VERSION(2,2,0)", + ["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)", ["%wxcompat20"] = "WXWIN_COMPATIBILITY_2", ["%wxcompat22"] = "WXWIN_COMPATIBILITY_2_2", *************** *** 3332,3338 **** --- 3338,3346 ---- wxLUA_USE_wxDateSpan = "wxLUA_USE_wxDateSpan", wxLUA_USE_wxDateTime = "wxLUA_USE_wxDateTime", + wxLUA_USE_wxDateTimeHolidayAuthority = "wxLUA_USE_wxDateTimeHolidayAuthority", wxLUA_USE_wxDialog = "wxLUA_USE_wxDialog", wxLUA_USE_wxDir = "wxLUA_USE_wxDir", wxLUA_USE_wxDirDialog = "wxLUA_USE_wxDirDialog", + wxLUA_USE_wxDisplay = "wxLUA_USE_wxDisplay", wxLUA_USE_wxDragDrop = "wxLUA_USE_wxDragDrop", wxLUA_USE_wxFile = "wxLUA_USE_wxFile", *************** *** 3587,3590 **** --- 3595,3599 ---- wxUSE_UXTHEME_AUTO = "wxUSE_UXTHEME_AUTO", wxUSE_VALIDATORS = "wxUSE_VALIDATORS", + wxUSE_WAVE = "wxUSE_WAVE", wxUSE_WCHAR_T = "wxUSE_WCHAR_T", wxUSE_WCSRTOMBS = "wxUSE_WCSRTOMBS", Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxlua.i 28 Sep 2006 22:26:03 -0000 1.17 --- wxlua.i 6 Nov 2006 06:11:43 -0000 1.18 *************** *** 24,35 **** // wxLuaObject - Allows Lua data items to be used for client data. ! %typedef luaObject lua_State* %class %delete wxLuaObject, wxObject ! wxLuaObject() //(luaObject object) no parameters passed in ! void SetObject() //(luaObject object) no parameters passed in ! luaObject GetObject() const ! int GetAllocationFlags() const ! void ModifyAllocationFlags(int iValue) %property=AllocationFlags, read --- 24,43 ---- // wxLuaObject - Allows Lua data items to be used for client data. ! %enum wxLuaObject_Type ! wxLUAOBJECT_NONE ! wxLUAOBJECT_BOOL ! wxLUAOBJECT_INT ! wxLUAOBJECT_STRING ! wxLUAOBJECT_ARRAYINT ! %endenum %class %delete wxLuaObject, wxObject ! wxLuaObject() // the wxLuaState is the calling lua_State ! void SetObject(int iParam = 1) // the stack index to make the object for ! void GetObject() const // get the object, note C++ returns bool, this "returns" the object on the stack ! ! int GetAllocationFlags() const ! bool HasAllocationFlag(wxLuaObject_Type flag) ! int SetAllocationFlag(wxLuaObject_Type flag, bool set) %property=AllocationFlags, read Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** override.hpp 1 Nov 2006 23:44:46 -0000 1.55 --- override.hpp 6 Nov 2006 06:11:43 -0000 1.56 *************** *** 4433,4437 **** // get this wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call GetObject if (self->GetObject()) return 1; --- 4433,4437 ---- // get this wxLuaObject *self = (wxLuaObject *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaObject); ! // call GetObject that if successful will push an item onto the stack if (self->GetObject()) return 1; Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** dialogs.i 25 May 2006 22:50:04 -0000 1.19 --- dialogs.i 6 Nov 2006 06:11:43 -0000 1.20 *************** *** 26,30 **** wxFILE_MUST_EXIST wxMULTIPLE ! %wxchkver23 wxCHANGE_DIR %endenum --- 26,30 ---- wxFILE_MUST_EXIST wxMULTIPLE ! %wxchkver23 wxCHANGE_DIR %endenum |
|
From: John L. <jr...@us...> - 2006-11-06 06:11:47
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21901/wxLua/modules/wxlua/include Modified Files: wxlbind.h Log Message: code cleanup add %wxchkver_x_y_z as replacement for %wxchkverxyz Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxlbind.h 2 Oct 2006 21:19:23 -0000 1.24 --- wxlbind.h 6 Nov 2006 06:11:44 -0000 1.25 *************** *** 51,55 **** }; ! typedef int* wxLuaArgTag; // address of class tag struct WXDLLIMPEXP_WXLUA WXLUAMETHOD // defines a LUA method or property --- 51,55 ---- }; ! typedef int* wxLuaArgTag; // address of class tag (a pointer to it) struct WXDLLIMPEXP_WXLUA WXLUAMETHOD // defines a LUA method or property *************** *** 64,67 **** --- 64,68 ---- // wxlua arg tags for common lua types + extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_None; extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_String; extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Boolean; *************** *** 73,77 **** extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction; ! struct WXDLLIMPEXP_WXLUA WXLUACLASS // defines a LUA class interface { const char *name; // name of the class --- 74,78 ---- extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction; ! struct WXDLLIMPEXP_WXLUA WXLUACLASS // defines a LUA C++ class interface { const char *name; // name of the class *************** *** 161,169 **** enum wxLuaObject_Type { ! wxLUAOBJECT_NONE = 0, // nothing is allocated ! wxLUAOBJECT_BOOL = 1, // bool allocated ! wxLUAOBJECT_INT = 2, // int allocated ! wxLUAOBJECT_STRING = 4, // wxString allocated ! wxLUAOBJECT_ARRAYINT = 8 // wxArrayInt allocated }; --- 162,170 ---- enum wxLuaObject_Type { ! wxLUAOBJECT_NONE = 0, // nothing is allocated ! wxLUAOBJECT_BOOL = 1, // bool allocated ! wxLUAOBJECT_INT = 2, // int allocated ! wxLUAOBJECT_STRING = 4, // wxString allocated ! wxLUAOBJECT_ARRAYINT = 8 // wxArrayInt allocated }; *************** *** 172,190 **** public: wxLuaObject(); ! // Constructor that is passed a lua state and a parameter index. ! wxLuaObject(lua_State* L, int iParam, int iRef = 1); ! // Constructor that is passed a lua state and a parameter index. ! wxLuaObject(const wxLuaState& wxlState, int iParam, int iRef = 1); ! ~wxLuaObject(); ! // Get the value of the reference object (or a proxy if the object has ! // been aliased for a wxValidator class. bool GetObject(); ! // Remove any existing reference and allocate another ! void SetObject(int iParam); ! // Set the reference and lua state up from a supplied parameter. ! void SetObject(lua_State *L, int iParam); ! // The following methods are used by the wxValidator interface bool *GetBoolPtr(); int *GetIntPtr(); --- 173,188 ---- public: wxLuaObject(); ! // Constructor that is passed a lua state and a parameter index. ! wxLuaObject(const wxLuaState& wxlState, int iParam = 1); ! virtual ~wxLuaObject(); ! ! // Get the value of the reference object (or a proxy if the object has ! // been aliased for a wxValidator class. bool GetObject(); ! // Remove any existing reference and allocate another ! void SetObject(int iParam = 1); ! // The following methods are used by the wxValidator interface bool *GetBoolPtr(); int *GetIntPtr(); *************** *** 192,201 **** wxArrayInt *GetArrayPtr(); ! // Return a flag value that indicated whether the ! // object is being used by a wxValidator class (else 0). int GetAllocationFlags() const { return m_alloc_flags; } ! bool HasAllocationFlag(wxLuaObject_Type flag) const { return (m_alloc_flags & flag) != 0; } ! // Allow the flag value to be manipulated. ! void ModifyAllocationFlags(int iValue); wxLuaState GetwxLuaState() const; --- 190,199 ---- wxArrayInt *GetArrayPtr(); ! // Return a flag value that indicated whether the ! // object is being used by a wxValidator class (else 0). int GetAllocationFlags() const { return m_alloc_flags; } ! bool HasAllocationFlag(wxLuaObject_Type flag) const { return (m_alloc_flags & flag) != 0; } ! // Set or remove the single or ored allocation flag(s) ! int SetAllocationFlag(wxLuaObject_Type flag, bool set); wxLuaState GetwxLuaState() const; *************** *** 209,214 **** wxString m_string; wxArrayInt m_arrayInt; ! int m_alloc_flags; ! DECLARE_DYNAMIC_CLASS(wxLuaObject) }; --- 207,213 ---- wxString m_string; wxArrayInt m_arrayInt; ! int m_alloc_flags; ! ! DECLARE_ABSTRACT_CLASS(wxLuaObject) }; |
|
From: John L. <jr...@us...> - 2006-11-06 06:11:47
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21901/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp Log Message: code cleanup add %wxchkver_x_y_z as replacement for %wxchkverxyz Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wxlbind.cpp 2 Oct 2006 21:19:24 -0000 1.40 --- wxlbind.cpp 6 Nov 2006 06:11:44 -0000 1.41 *************** *** 33,36 **** --- 33,37 ---- // represents prototypes argument types // + int s_wxluaarg_None = 0; int s_wxluaarg_String = -2; int s_wxluaarg_Boolean = -3; *************** *** 47,68 **** // wxLuaObject //----------------------------------------------------------------------------- ! IMPLEMENT_DYNAMIC_CLASS(wxLuaObject, wxObject) ! ! wxLuaObject::wxLuaObject() ! : m_wxlState(NULL), m_iReference(LUA_NOREF), ! m_bool(false), m_int(0), m_alloc_flags(wxLUAOBJECT_NONE) ! { ! m_wxlState = new wxLuaState(false); // always created even if invalid ! } ! ! wxLuaObject::wxLuaObject(lua_State *L, int iParam, int WXUNUSED(iRef)) ! : m_wxlState(NULL), ! m_bool(false), m_int(0), m_alloc_flags(wxLUAOBJECT_NONE) ! { ! m_wxlState = new wxLuaState(L); ! m_iReference = m_wxlState->tinsert(iParam); ! } ! wxLuaObject::wxLuaObject(const wxLuaState& wxlState, int iParam, int WXUNUSED(iRef)) : m_wxlState(NULL), m_bool(false), m_int(0), m_alloc_flags(wxLUAOBJECT_NONE) --- 48,54 ---- // wxLuaObject //----------------------------------------------------------------------------- ! IMPLEMENT_ABSTRACT_CLASS(wxLuaObject, wxObject) ! wxLuaObject::wxLuaObject(const wxLuaState& wxlState, int iParam) : m_wxlState(NULL), m_bool(false), m_int(0), m_alloc_flags(wxLUAOBJECT_NONE) *************** *** 91,106 **** } ! void wxLuaObject::ModifyAllocationFlags(int iValue) { ! // FIXME - who uses and knows how to use this? ! if (iValue & 1) m_alloc_flags &= (~wxLUAOBJECT_BOOL); ! if (iValue & 2) m_alloc_flags &= (~wxLUAOBJECT_INT); ! if (iValue & 4) m_alloc_flags &= (~wxLUAOBJECT_STRING); ! if (iValue & 8) m_alloc_flags &= (~wxLUAOBJECT_ARRAYINT); ! if (iValue & 16) m_alloc_flags |= wxLUAOBJECT_BOOL; ! if (iValue & 32) m_alloc_flags |= wxLUAOBJECT_INT; ! if (iValue & 64) m_alloc_flags |= wxLUAOBJECT_STRING; ! if (iValue & 128) m_alloc_flags |= wxLUAOBJECT_ARRAYINT; } --- 77,88 ---- } ! int wxLuaObject::SetAllocationFlag(wxLuaObject_Type flag, bool set) { ! if (set) ! m_alloc_flags |= flag; ! else ! m_alloc_flags &= (~ int(flag)); ! return m_alloc_flags; } *************** *** 141,151 **** } - void wxLuaObject::SetObject(lua_State *L, int iParam) - { - wxCHECK_RET(L, wxT("Invalid lua_State")); - m_wxlState->Create(L); - SetObject(iParam); - } - void wxLuaObject::SetObject(int iParam) { --- 123,126 ---- |
|
From: John L. <jr...@us...> - 2006-11-06 06:11:47
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21901/wxLua/bindings Modified Files: genwxbind.lua Log Message: code cleanup add %wxchkver_x_y_z as replacement for %wxchkverxyz Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** genwxbind.lua 1 Nov 2006 23:44:46 -0000 1.79 --- genwxbind.lua 6 Nov 2006 06:11:42 -0000 1.80 *************** *** 33,37 **** typeDefs = {} -- all typedefs read from the interface files ! dataTypes = {} -- all datatypes; int, double, class names dataTypeAttribs = {} -- attributes for data types; unsigned, const functionAttribs = {} -- attributes for functions; static, virtual --- 33,37 ---- typeDefs = {} -- all typedefs read from the interface files ! dataTypes = {} -- all datatypes; int, double, class names, see AllocDataType dataTypeAttribs = {} -- attributes for data types; unsigned, const functionAttribs = {} -- attributes for functions; static, virtual *************** *** 71,77 **** --- 71,79 ---- end + ------------------------------------------------------------------------------- -- Replacement for pairs(table) that sorts them alphabetically, returns iterator -- Code from "Programming in Lua" by Roberto Ierusalimschy -- the input is a lua table and optional comp function (see table.sort) + ------------------------------------------------------------------------------- function pairs_sort(atable, comp_func) local a = {} *************** *** 87,90 **** --- 89,93 ---- end + ------------------------------------------------------------------------------- -- lua 5.1 doesn't have table.getn, but it's pretty useful, add it back -- table.getn only counts integer indexes starting from 1 *************** *** 93,96 **** --- 96,100 ---- -- so that we don't forget to increment it at the end. -- local i = 0; while atable[i+1] do i = i + 1; ... end + ------------------------------------------------------------------------------- if table.getn == nil then function table.getn(atable) *************** *** 103,110 **** end ! -- completely dump the contents of a table -- atable is the input table to dump the contents of -- prefix is a string prefix for debugging purposes -- tablelevel is tracker for recursive calls to DumpTable (do not use initially) function DumpTable(atable, prefix, tablelevel) if prefix == nil then prefix = "" end --- 107,116 ---- end ! ------------------------------------------------------------------------------- ! -- Completely dump the contents of a table -- atable is the input table to dump the contents of -- prefix is a string prefix for debugging purposes -- tablelevel is tracker for recursive calls to DumpTable (do not use initially) + ------------------------------------------------------------------------------- function DumpTable(atable, prefix, tablelevel) if prefix == nil then prefix = "" end *************** *** 124,128 **** --- 130,136 ---- end + ------------------------------------------------------------------------------- -- Make a deep copy of a table, including all sub tables + ------------------------------------------------------------------------------- function TableCopy(atable) local newtable = {} *************** *** 137,144 **** --- 145,156 ---- end + ------------------------------------------------------------------------------- -- A simple function to implement "cond ? A : B", eg "result = iff(cond, A, B)" + ------------------------------------------------------------------------------- function iff(cond, A, B) if cond then return A else return B end end + ------------------------------------------------------------------------------- -- allocate a data type description table (int, double, class...) + ------------------------------------------------------------------------------- function AllocDataType(name, deftype, intrinsic, abstract) local datatype = *************** *** 147,153 **** Name = name, BaseClass = nil, ! Intrinsic = intrinsic, Abstract = abstract, ! Condition = nil, } --- 159,165 ---- Name = name, BaseClass = nil, ! Intrinsic = intrinsic, -- is this data type intrinsicly a number? Abstract = abstract, ! Condition = nil, -- conditions for this data type, eg. wxLUA_USE_xxx } *************** *** 155,158 **** --- 167,173 ---- end + ------------------------------------------------------------------------------- + -- Initialize the data types with standard ones and wxWidget's types + ------------------------------------------------------------------------------- function InitDataTypes() -- Standard C data types *************** *** 218,224 **** dataTypes["LuaFunction"] = AllocDataType("LuaFunction", "wxtypedef", true) ! -- data type attributes that can precede a data type dataTypeAttribs["unsigned"] = true dataTypeAttribs["const"] = true functionAttribs["static"] = true functionAttribs["virtual"] = true --- 233,241 ---- dataTypes["LuaFunction"] = AllocDataType("LuaFunction", "wxtypedef", true) ! -- attributes that can precede a data type dataTypeAttribs["unsigned"] = true dataTypeAttribs["const"] = true + + -- attributes that can precede a function functionAttribs["static"] = true functionAttribs["virtual"] = true *************** *** 226,245 **** end ! -- Fill the input table with ! -- dataTypes["name"] = AllocDataType("name", "builtin", true) ! -- for including with other bindings that need the data types defined ! function GenerateDataTypesFileTable() ! local fileTable = {} ! ! for k, v in pairs_sort(dataTypes) do ! local intrinsic = "false" ! if v.Intrinsic then intrinsic = "true" end ! local s = "dataTypes[\""..k.."\"] = AllocDataType(\""..k.."\", \""..v.DefType.."\", "..intrinsic..")" ! table.insert(fileTable, s) ! end ! ! return fileTable ! end ! function IsDataTypeAbstract(datatype) if dataTypes[datatype] then --- 243,249 ---- end ! ------------------------------------------------------------------------------- ! -- NOT USED ! ------------------------------------------------------------------------------- function IsDataTypeAbstract(datatype) if dataTypes[datatype] then *************** *** 258,262 **** end ! -- get DataType from string function GetDataType(typedefinition) local typeData = SplitString(typedefinition, { " ", "&", "*" }) --- 262,268 ---- end ! ------------------------------------------------------------------------------- ! -- Get the dataTypes[typedefinition] from a string after removing delimiters ! ------------------------------------------------------------------------------- function GetDataType(typedefinition) local typeData = SplitString(typedefinition, { " ", "&", "*" }) *************** *** 273,281 **** end ! -- Decode Declaration function DecodeDecl(decl) ! local attrib = {} local type = nil ! local ptr = {} local cast = 0 --- 279,289 ---- end ! ------------------------------------------------------------------------------- ! -- Decode Declaration of a data type, see DecodeDataType ! ------------------------------------------------------------------------------- function DecodeDecl(decl) ! local attribs = {} local type = nil ! local ptrs = {} local cast = 0 *************** *** 285,288 **** --- 293,301 ---- while typeData[i+1] do i = i + 1 + + if cast < 0 then + print("Error in casting data type, mismatched () '"..decl.."'") + end + if typeData[i] == "(" then cast = cast + 1 *************** *** 291,297 **** elseif cast == 0 then if IsDataTypeAttrib(typeData[i]) then ! attrib[typeData[i]] = typeData[i] elseif (typeData[i] == "[]") or (typeData[i] == "*") or (typeData[i] == "&") then ! table.insert(ptr, typeData[i]) elseif dataTypes[typeData[i]] then type = typeData[i] --- 304,310 ---- elseif cast == 0 then if IsDataTypeAttrib(typeData[i]) then ! attribs[typeData[i]] = typeData[i] elseif (typeData[i] == "[]") or (typeData[i] == "*") or (typeData[i] == "&") then ! table.insert(ptrs, typeData[i]) elseif dataTypes[typeData[i]] then type = typeData[i] *************** *** 303,313 **** if not type then ! print("Cannot find type: "..decl) end ! return attrib, type, ptr end ! -- Decode DataType function DecodeDataType(decl) local attribs = {} --- 316,328 ---- if not type then ! print("Cannot find type: '"..decl.."'") end ! return attribs, type, ptrs end ! ------------------------------------------------------------------------------- ! -- Decode DataType, see TranslateDataType ! ------------------------------------------------------------------------------- function DecodeDataType(decl) local attribs = {} *************** *** 349,352 **** --- 364,370 ---- end + ------------------------------------------------------------------------------- + -- + ------------------------------------------------------------------------------- function TranslateDataType(param) local attribs = {} *************** *** 387,390 **** --- 405,411 ---- end + ------------------------------------------------------------------------------- + -- Get any conditions for this data type + ------------------------------------------------------------------------------- function GetDataTypeCondition(datatype) if dataTypes[datatype] then *************** *** 403,406 **** --- 424,430 ---- end + ------------------------------------------------------------------------------- + -- Is this data type intrinisic, eg is it basically a number + ------------------------------------------------------------------------------- function IsDataTypeIntrinsic(datatype) if dataTypes[datatype] then *************** *** 419,422 **** --- 443,449 ---- end + ------------------------------------------------------------------------------- + -- Is this data type an enum + ------------------------------------------------------------------------------- function IsDataTypeEnum(datatype) if dataTypes[datatype] and (dataTypes[datatype].DefType == "enum") then *************** *** 427,430 **** --- 454,460 ---- end + ------------------------------------------------------------------------------- + -- Is the input to this a data type? + ------------------------------------------------------------------------------- function IsDataType(datatype) if dataTypes[datatype] then *************** *** 433,436 **** --- 463,470 ---- if typeDefs[datatype] then + if not dataTypes[typeDefs[datatype]] then + print("Error - supposed datatype: '"..datatype.."' has typedef = '"..typeDefs[datatype].."' which is not a data type either") + end + return true end *************** *** 549,552 **** --- 583,611 ---- end + -- Find and return an already set condition or for a special set of conditions + -- create a new one and add it to the condition table, else return nil + function FindOrCreateCondition(condition) + local result = nil + + if conditions[condition] then + result = conditions[condition] + elseif string.find(condition, "%wxchkver", 1, 1) then + -- check for conditions like %wxchkver_1_2_3 = wxCHECK_VERSION(1,2,3) + local ver = { 0, 0, 0 } + local n = 1 + for v in string.gmatch(condition, "%d+") do + ver[n] = tonumber(v); n = n + 1 + end + result = string.format("wxCHECK_VERSION(%d,%d,%d)", ver[1], ver[2], ver[3]) + conditions[condition] = result -- cache result + elseif string.find(condition, "wxLUA_USE_", 1, 1) == 1 then + print("Warning unknown wxLUA_USE_XXX tag, maybe a missing condition? '"..condition.."'") + elseif string.find(condition, "wxUSE_", 1, 1) == 1 then + print("Warning unknown wxUSE_XXX tag, maybe a missing condition? '"..condition.."'") + end + + return result + end + -- build condition string using all conditions on condition stack function GetCondition(conditionStack) *************** *** 827,830 **** --- 886,890 ---- conditions["wxUSE_UXTHEME_AUTO"] = "wxUSE_UXTHEME_AUTO" conditions["wxUSE_VALIDATORS"] = "wxUSE_VALIDATORS" + conditions["wxUSE_WAVE"] = "wxUSE_WAVE" conditions["wxUSE_WCHAR_T"] = "wxUSE_WCHAR_T" conditions["wxUSE_WCSRTOMBS"] = "wxUSE_WCSRTOMBS" *************** *** 839,843 **** conditions["wxUSE_ZLIB"] = "wxUSE_ZLIB" ! -- wxLUA_USE_ conditions conditions["wxLUA_USE_FL"] = "wxLUA_USE_FL" conditions["wxLUA_USE_Geometry"] = "wxLUA_USE_Geometry" --- 899,903 ---- conditions["wxUSE_ZLIB"] = "wxUSE_ZLIB" ! -- wxLUA_USE_xxx conditions conditions["wxLUA_USE_FL"] = "wxLUA_USE_FL" conditions["wxLUA_USE_Geometry"] = "wxLUA_USE_Geometry" *************** *** 873,880 **** --- 933,942 ---- conditions["wxLUA_USE_wxDateSpan"] = "wxLUA_USE_wxDateSpan" conditions["wxLUA_USE_wxDateTime"] = "wxLUA_USE_wxDateTime" + conditions["wxLUA_USE_wxDateTimeHolidayAuthority"] = "wxLUA_USE_wxDateTimeHolidayAuthority" conditions["wxLUA_USE_wxDC"] = "wxLUA_USE_wxDC" conditions["wxLUA_USE_wxDialog"] = "wxLUA_USE_wxDialog" conditions["wxLUA_USE_wxDir"] = "wxLUA_USE_wxDir" conditions["wxLUA_USE_wxDirDialog"] = "wxLUA_USE_wxDirDialog" + conditions["wxLUA_USE_wxDisplay"] = "wxLUA_USE_wxDisplay" conditions["wxLUA_USE_wxDragDrop"] = "wxLUA_USE_wxDragDrop" conditions["wxLUA_USE_wxFile"] = "wxLUA_USE_wxFile" *************** *** 1473,1477 **** end elseif not parseState.IsBlockComment then ! if not conditionOperators[tag] and not conditions[tag] and not ignore[tag] then if lineState.Action == "classname" then if not dataTypes[tag] then --- 1535,1539 ---- end elseif not parseState.IsBlockComment then ! if not conditionOperators[tag] and not FindOrCreateCondition(tag) and not ignore[tag] then if lineState.Action == "classname" then if not dataTypes[tag] then *************** *** 1850,1854 **** end ! elseif conditions[tag] then if (lineState.DefType ~= "blockcondition") and not lineState.InLineConditionIf then lineState.InLineConditionIf = true --- 1912,1916 ---- end ! elseif FindOrCreateCondition(tag) then if (lineState.DefType ~= "blockcondition") and not lineState.InLineConditionIf then lineState.InLineConditionIf = true *************** *** 1867,1871 **** end ! lineState.Condition = lineState.Condition..conditions[tag] elseif not ignore[tag] then --- 1929,1933 ---- end ! lineState.Condition = lineState.Condition..FindOrCreateCondition(tag) elseif not ignore[tag] then *************** *** 4905,4911 **** local cache = loadfile(filename) cache() -- run loaded file ! print("loaded datatypes cache file: "..filename) else ! print("unable to load datatypes cache file: "..filename) end end --- 4967,4973 ---- local cache = loadfile(filename) cache() -- run loaded file ! print("Loaded datatypes cache file: "..filename) else ! print("Unable to load datatypes cache file: "..filename) end end *************** *** 4937,4944 **** end - --local fileTable = GenerateDataTypesFileTable() - --for i = 1, table.getn(fileTable) do print(fileTable[i]) end - --WriteTableToFile(interface.filename, fileData, false) - print("Done\n") end --- 4999,5002 ---- |
|
From: John L. <jr...@us...> - 2006-11-06 06:11:47
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21901/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: code cleanup add %wxchkver_x_y_z as replacement for %wxchkverxyz Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wxbind.h 2 Nov 2006 23:38:08 -0000 1.40 --- wxbind.h 6 Nov 2006 06:11:44 -0000 1.41 *************** *** 630,636 **** #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog; ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) --- 630,636 ---- #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog; ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) *************** *** 1454,1461 **** #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLog_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount; ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) --- 1454,1461 ---- #endif // (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxLog_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount; ! #endif // (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp) #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxToolbar) |
|
From: John L. <jr...@us...> - 2006-11-02 23:38:41
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/bindings Modified Files: genidocs.lua Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: genidocs.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** genidocs.lua 19 May 2006 05:31:52 -0000 1.3 --- genidocs.lua 2 Nov 2006 23:38:08 -0000 1.4 *************** *** 71,75 **** table.insert(fileTable, "<body>") ! table.insert(fileTable, "<h1>wxLua Class Reference for wxWidgets 2.6.3</h1>") return fileTable --- 71,75 ---- table.insert(fileTable, "<body>") ! table.insert(fileTable, "<h1>wxLua 2.6.3.0 Class Reference for wxWidgets 2.6.3</h1>") return fileTable *************** *** 94,98 **** end for k, v in pairs(dataTypes) do ! if v.DefType == "class" then allClasses[k] = true -- the ones we wrap end --- 94,99 ---- end for k, v in pairs(dataTypes) do ! -- hack for special classes ! if (v.DefType == "class") or (v.DefType == "wx2lua") then allClasses[k] = true -- the ones we wrap end *************** *** 110,117 **** table.insert(fileTable, MakeLink(cname).."<br>") else ! table.insert(fileTable, MakeLink(cname).." - NOT IN WX REF MANUAL<br>") end else ! table.insert(fileTable, cname.." - NOT WRAPPED<br>") end end --- 111,118 ---- table.insert(fileTable, MakeLink(cname).."<br>") else ! table.insert(fileTable, MakeLink(cname).." - (Not in wxWidgets reference manual)<br>") end else ! table.insert(fileTable, cname.." - (Not wrapped)<br>") end end *************** *** 328,334 **** local cache = loadfile(filename) cache() -- run loaded file ! print("loaded datatypes cache file: "..filename) else ! print("unable to load datatypes cache file: "..filename) end end --- 329,335 ---- local cache = loadfile(filename) cache() -- run loaded file ! --print("loaded datatypes cache file: "..filename) else ! --print("unable to load datatypes cache file: "..filename) end end |
|
From: John L. <jr...@us...> - 2006-11-02 23:38:41
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/apps/wxluaedit/src Modified Files: wxluaedit.cpp Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxluaedit.cpp 3 Oct 2006 19:52:16 -0000 1.25 --- wxluaedit.cpp 2 Nov 2006 23:38:07 -0000 1.26 *************** *** 225,229 **** --- 225,233 ---- wxLuaEditorFrame *frame = new wxLuaEditorFrame(_T("wxLuaEditor"), wxDefaultPosition, wxSize(600, 400)); + #if wxCHECK_VERSION(2,7,1) + frame->SetSizeHints(wxSize(300, 300)); + #else // < 2.7.1 frame->SetMinSize(wxSize(300, 300)); + #endif // wxCHECK_VERSION(2,7,1) frame->CreateOptions(steOptions); wxIcon icon; |
|
From: John L. <jr...@us...> - 2006-11-02 23:38:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/modules/wxbind/src Modified Files: datetime.cpp gdi.cpp image.cpp windows.cpp wx_bind.cpp Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** windows.cpp 23 Aug 2006 04:57:52 -0000 1.26 --- windows.cpp 2 Nov 2006 23:38:09 -0000 1.27 *************** *** 342,345 **** --- 342,367 ---- + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) + // !%wxchkver27 wxSize GetAdjustedBestSize() const + static int LUACALL wxLua_wxWindow_GetAdjustedBestSize(lua_State *L) + { + wxLuaState wxlState(L); + wxSize *returns; + // get this + wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call GetAdjustedBestSize + // allocate a new object using the copy constructor + returns = new wxSize(self->GetAdjustedBestSize()); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxSize *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxSize, returns); + + return 1; + } + + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) + + #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) // !%wxchkver26 wxLayoutConstraints* GetConstraints() const // deprecated use sizers *************** *** 2554,2575 **** } - // wxSize GetAdjustedBestSize() const - static int LUACALL wxLua_wxWindow_GetAdjustedBestSize(lua_State *L) - { - wxLuaState wxlState(L); - wxSize *returns; - // get this - wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); - // call GetAdjustedBestSize - // allocate a new object using the copy constructor - returns = new wxSize(self->GetAdjustedBestSize()); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxSize *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxSize, returns); - - return 1; - } - // wxSize GetBestFittingSize() const static int LUACALL wxLua_wxWindow_GetBestFittingSize(lua_State *L) --- 2576,2579 ---- *************** *** 3459,3462 **** --- 3463,3471 ---- + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, "GetAdjustedBestSize", wxLua_wxWindow_GetAdjustedBestSize, 0, 0, { 0 } }, + #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) + + #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) { LuaMethod, "GetConstraints", wxLua_wxWindow_GetConstraints, 0, 0, { 0 } }, *************** *** 3674,3678 **** { LuaMethod, "ConvertPixelsToDialogPoint", wxLua_wxWindow_ConvertPixelsToDialogPoint, 1, 1, { &s_wxluatag_wxPoint, 0 } }, { LuaMethod, "ConvertPixelsToDialogSize", wxLua_wxWindow_ConvertPixelsToDialogSize, 1, 1, { &s_wxluatag_wxSize, 0 } }, - { LuaMethod, "GetAdjustedBestSize", wxLua_wxWindow_GetAdjustedBestSize, 0, 0, { 0 } }, { LuaMethod, "GetBestFittingSize", wxLua_wxWindow_GetBestFittingSize, 0, 0, { 0 } }, { LuaMethod, "GetBestSize", wxLua_wxWindow_GetBestSize, 0, 0, { 0 } }, --- 3683,3686 ---- Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** wx_bind.cpp 1 Nov 2006 23:44:47 -0000 1.58 --- wx_bind.cpp 2 Nov 2006 23:38:09 -0000 1.59 *************** *** 2774,2777 **** --- 2774,2781 ---- #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + { &wxDefaultVideoMode, 0, "wxDefaultVideoMode", &s_wxluatag_wxVideoMode }, + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxFont { &wxNullFont, 0, "wxNullFont", &s_wxluatag_wxFont }, *************** *** 3003,3006 **** --- 3007,3048 ---- #endif // (wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxSystemSettings) + #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) + + // %static size_t GetHolidaysInRange(const wxDateTime& dtStart, const wxDateTime& dtEnd, wxDateTimeArray& holidays) + static int LUACALL wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange(lua_State *L) + { + wxLuaState wxlState(L); + size_t returns; + // wxDateTimeArray holidays + wxDateTimeArray * holidays = (wxDateTimeArray *)wxlState.GetUserDataType(3, s_wxluatag_wxDateTimeArray); + // const wxDateTime dtEnd + const wxDateTime * dtEnd = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime); + // const wxDateTime dtStart + const wxDateTime * dtStart = (const wxDateTime *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTime); + // call GetHolidaysInRange + returns = wxDateTimeHolidayAuthority::GetHolidaysInRange(*dtStart, *dtEnd, *holidays); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // %static bool IsHoliday(const wxDateTime& dt) + static int LUACALL wxLua_wxDateTimeHolidayAuthority_IsHoliday(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxDateTime dt + const wxDateTime * dt = (const wxDateTime *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTime); + // call IsHoliday + returns = wxDateTimeHolidayAuthority::IsHoliday(*dt); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) + #if (wxLUA_USE_wxFont) && (wxLUA_USE_wxSystemSettings) *************** *** 3071,3074 **** --- 3113,3135 ---- #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) + + // %static int GetFromPoint(const wxPoint& pt) + static int LUACALL wxLua_wxDisplay_GetFromPoint(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // const wxPoint pt + const wxPoint * pt = (const wxPoint *)wxlState.GetUserDataType(1, s_wxluatag_wxPoint); + // call GetFromPoint + returns = wxDisplay::GetFromPoint(*pt); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) + #if (wxLUA_USE_wxProcess) && (!wxCHECK_VERSION(2,6,0)) *************** *** 4619,4622 **** --- 4680,4741 ---- #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDateTimeHolidayAuthority + + // %static void AddAuthority(wxDateTimeHolidayAuthority *auth) + static int LUACALL wxLua_wxDateTimeHolidayAuthority_AddAuthority(lua_State *L) + { + wxLuaState wxlState(L); + // wxDateTimeHolidayAuthority auth + wxDateTimeHolidayAuthority * auth = (wxDateTimeHolidayAuthority *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeHolidayAuthority); + // call AddAuthority + wxDateTimeHolidayAuthority::AddAuthority(auth); + + return 0; + } + + // %static void ClearAllAuthorities() + static int LUACALL wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities(lua_State *L) + { + wxLuaState wxlState(L); + // call ClearAllAuthorities + wxDateTimeHolidayAuthority::ClearAllAuthorities(); + + return 0; + } + + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + + // %static size_t GetCount() + static int LUACALL wxLua_wxDisplay_GetCount(lua_State *L) + { + wxLuaState wxlState(L); + size_t returns; + // call GetCount + returns = wxDisplay::GetCount(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // %static int GetFromWindow(wxWindow* win) + static int LUACALL wxLua_wxDisplay_GetFromWindow(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // wxWindow win + wxWindow * win = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call GetFromWindow + returns = wxDisplay::GetFromWindow(win); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + #if wxLUA_USE_wxDragDrop *************** *** 4938,4941 **** --- 5057,5066 ---- + #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) + { LuaGlobal, "wxDateTimeHolidayAuthority_GetHolidaysInRange", wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange, 3, 3, { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTimeArray, 0 } }, + { LuaGlobal, "wxDateTimeHolidayAuthority_IsHoliday", wxLua_wxDateTimeHolidayAuthority_IsHoliday, 1, 1, { &s_wxluatag_wxDateTime, 0 } }, + #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) + + #if (wxLUA_USE_wxFont) && (wxLUA_USE_wxSystemSettings) { LuaGlobal, "wxSystemSettings_GetFont", wxLua_wxSystemSettings_GetFont, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, *************** *** 4953,4956 **** --- 5078,5086 ---- + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) + { LuaGlobal, "wxDisplay_GetFromPoint", wxLua_wxDisplay_GetFromPoint, 1, 1, { &s_wxluatag_wxPoint, 0 } }, + #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) + + #if (wxLUA_USE_wxProcess) && (!wxCHECK_VERSION(2,6,0)) { LuaGlobal, "wxExecute", wxLua_function_wxExecute, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluatag_wxProcess, 0 } }, *************** *** 5095,5098 **** --- 5225,5240 ---- + #if wxLUA_USE_wxDateTimeHolidayAuthority + { LuaGlobal, "wxDateTimeHolidayAuthority_AddAuthority", wxLua_wxDateTimeHolidayAuthority_AddAuthority, 1, 1, { &s_wxluatag_wxDateTimeHolidayAuthority, 0 } }, + { LuaGlobal, "wxDateTimeHolidayAuthority_ClearAllAuthorities", wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities, 0, 0, { 0 } }, + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + + + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + { LuaGlobal, "wxDisplay_GetCount", wxLua_wxDisplay_GetCount, 0, 0, { 0 } }, + { LuaGlobal, "wxDisplay_GetFromWindow", wxLua_wxDisplay_GetFromWindow, 1, 1, { &s_wxluatag_wxWindow, 0 } }, + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + + #if wxLUA_USE_wxDragDrop { LuaGlobal, "wxIsDragResultOk", wxLua_function_wxIsDragResultOk, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, *************** *** 5526,5529 **** --- 5668,5672 ---- { "wxClientDC", wxClientDC_methods, wxClientDC_methodCount, -1, CLASSINFO(wxClientDC), &s_wxluatag_wxClientDC, "wxWindowDC" }, { "wxDC", wxDC_methods, wxDC_methodCount, -1, CLASSINFO(wxDC), &s_wxluatag_wxDC, "wxObject" }, + { "wxDCClipper", wxDCClipper_methods, wxDCClipper_methodCount, -1, NULL, &s_wxluatag_wxDCClipper, NULL }, { "wxMemoryDC", wxMemoryDC_methods, wxMemoryDC_methodCount, -1, CLASSINFO(wxMemoryDC), &s_wxluatag_wxMemoryDC, "wxDC" }, { "wxMirrorDC", wxMirrorDC_methods, wxMirrorDC_methodCount, -1, CLASSINFO(wxMirrorDC), &s_wxluatag_wxMirrorDC, "wxDC" }, *************** *** 5557,5563 **** --- 5700,5713 ---- #if wxLUA_USE_wxDateTime { "wxDateTime", wxDateTime_methods, wxDateTime_methodCount, -1, NULL, &s_wxluatag_wxDateTime, NULL }, + { "wxDateTimeArray", wxDateTimeArray_methods, wxDateTimeArray_methodCount, -1, NULL, &s_wxluatag_wxDateTimeArray, NULL }, #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDateTimeHolidayAuthority + { "wxDateTimeHolidayAuthority", wxDateTimeHolidayAuthority_methods, wxDateTimeHolidayAuthority_methodCount, -1, NULL, &s_wxluatag_wxDateTimeHolidayAuthority, NULL }, + { "wxDateTimeWorkDays", wxDateTimeWorkDays_methods, wxDateTimeWorkDays_methodCount, -1, NULL, &s_wxluatag_wxDateTimeWorkDays, "wxDateTimeHolidayAuthority" }, + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + + #if wxLUA_USE_wxDialog { "wxDialog", wxDialog_methods, wxDialog_methodCount, -1, CLASSINFO(wxDialog), &s_wxluatag_wxDialog, "wxTopLevelWindow" }, *************** *** 5575,5578 **** --- 5725,5735 ---- + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + { "wxArrayVideoModes", wxArrayVideoModes_methods, wxArrayVideoModes_methodCount, -1, NULL, &s_wxluatag_wxArrayVideoModes, NULL }, + { "wxDisplay", wxDisplay_methods, wxDisplay_methodCount, -1, NULL, &s_wxluatag_wxDisplay, NULL }, + { "wxVideoMode", wxVideoMode_methods, wxVideoMode_methodCount, -1, NULL, &s_wxluatag_wxVideoMode, NULL }, + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + + #if wxLUA_USE_wxDragDrop { "wxDropFilesEvent", wxDropFilesEvent_methods, wxDropFilesEvent_methodCount, -1, CLASSINFO(wxDropFilesEvent), &s_wxluatag_wxDropFilesEvent, "wxEvent" }, *************** *** 6287,6290 **** --- 6444,6452 ---- + #if wxLUA_USE_wxDC + wxLUA_IMPLEMENT_ENCAPSULATION(wxDCClipper, wxDCClipper) + #endif // wxLUA_USE_wxDC + + #if wxLUA_USE_wxDataObject wxLUA_IMPLEMENT_ENCAPSULATION(wxBitmapDataObject, wxBitmapDataObject) *************** *** 6304,6310 **** --- 6466,6479 ---- #if wxLUA_USE_wxDateTime wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTime, wxDateTime) + wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeArray, wxDateTimeArray) #endif // wxLUA_USE_wxDateTime + #if wxLUA_USE_wxDateTimeHolidayAuthority + wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeHolidayAuthority, wxDateTimeHolidayAuthority) + wxLUA_IMPLEMENT_ENCAPSULATION(wxDateTimeWorkDays, wxDateTimeWorkDays) + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + + #if wxLUA_USE_wxDir wxLUA_IMPLEMENT_ENCAPSULATION(wxDir, wxDir) *************** *** 6312,6315 **** --- 6481,6491 ---- + #if wxLUA_USE_wxDisplay && wxUSE_DISPLAY + wxLUA_IMPLEMENT_ENCAPSULATION(wxArrayVideoModes, wxArrayVideoModes) + wxLUA_IMPLEMENT_ENCAPSULATION(wxDisplay, wxDisplay) + wxLUA_IMPLEMENT_ENCAPSULATION(wxVideoMode, wxVideoMode) + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + + #if wxLUA_USE_wxDragDrop wxLUA_IMPLEMENT_ENCAPSULATION(wxDropSource, wxDropSource) Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** image.cpp 9 Jun 2006 22:51:32 -0000 1.16 --- image.cpp 2 Nov 2006 23:38:09 -0000 1.17 *************** *** 1398,1418 **** } - // %operator bool operator==(const wxImage& image) const - static int LUACALL wxLua_wxImage_op_eq(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // const wxImage image - const wxImage * image = (const wxImage *)wxlState.GetUserDataType(2, s_wxluatag_wxImage); - // get this - wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); - // call op_eq - returns = (*self)==(*image); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - static int LUACALL wxLua_wxImage_destructor(lua_State *L) { --- 1398,1401 ---- *************** *** 1543,1547 **** { LuaMethod, "SetRGB", wxLua_wxImage_SetRGB, 5, 5, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "op_assign", wxLua_wxImage_op_assign, 1, 1, { &s_wxluatag_wxImage, 0 } }, - { LuaMethod, "op_eq", wxLua_wxImage_op_eq, 1, 1, { &s_wxluatag_wxImage, 0 } }, { LuaDelete, "wxImage", wxLua_wxImage_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxImage_Delete, 0, 0, {0} }, --- 1526,1529 ---- Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** datetime.cpp 1 Nov 2006 23:44:47 -0000 1.18 --- datetime.cpp 2 Nov 2006 23:38:09 -0000 1.19 *************** *** 1497,1500 **** --- 1497,1786 ---- + #if wxLUA_USE_wxDateTime + // ------------------------------------------------------------------------------------------------- + // Bind class wxDateTimeArray + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxDateTimeArray' + int s_wxluatag_wxDateTimeArray = -1; + + // %overload wxDateTimeArray() + static int LUACALL wxLua_wxDateTimeArray_constructor1(lua_State *L) + { + wxLuaState wxlState(L); + wxDateTimeArray *returns; + // call constructor + returns = new wxDateTimeArray(); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxDateTimeArray *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDateTimeArray, returns); + + return 1; + } + + // %overload %constructor wxDateTimeArrayCopy(const wxDateTimeArray& array) + static int LUACALL wxLua_wxDateTimeArrayCopy_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxDateTimeArray *returns; + // const wxDateTimeArray array + const wxDateTimeArray * array = (const wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call constructor + returns = new wxDateTimeArray(*array); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxDateTimeArray *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDateTimeArray, returns); + + return 1; + } + + // void Add(const wxDateTime& dateTime, size_t copies = 1) + static int LUACALL wxLua_wxDateTimeArray_Add(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // size_t copies = 1 + size_t copies = (argCount >= 3 ? (size_t)wxlState.GetNumberType(3) : 1); + // const wxDateTime dateTime + const wxDateTime * dateTime = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime); + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call Add + self->Add(*dateTime, copies); + + return 0; + } + + // void Alloc(size_t nCount) + static int LUACALL wxLua_wxDateTimeArray_Alloc(lua_State *L) + { + wxLuaState wxlState(L); + // size_t nCount + size_t nCount = (size_t)wxlState.GetNumberType(2); + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call Alloc + self->Alloc(nCount); + + return 0; + } + + // void Clear() + static int LUACALL wxLua_wxDateTimeArray_Clear(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call Clear + self->Clear(); + + return 0; + } + + // void Empty() + static int LUACALL wxLua_wxDateTimeArray_Empty(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call Empty + self->Empty(); + + return 0; + } + + // int GetCount() const + static int LUACALL wxLua_wxDateTimeArray_GetCount(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call GetCount + returns = self->GetCount(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // void Insert(const wxDateTime& dt, int nIndex, size_t copies = 1) + static int LUACALL wxLua_wxDateTimeArray_Insert(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // size_t copies = 1 + size_t copies = (argCount >= 4 ? (size_t)wxlState.GetNumberType(4) : 1); + // int nIndex + int nIndex = (int)wxlState.GetNumberType(3); + // const wxDateTime dt + const wxDateTime * dt = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime); + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call Insert + self->Insert(*dt, nIndex, copies); + + return 0; + } + + // bool IsEmpty() + static int LUACALL wxLua_wxDateTimeArray_IsEmpty(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call IsEmpty + returns = self->IsEmpty(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // wxDateTime Item(size_t nIndex) const + static int LUACALL wxLua_wxDateTimeArray_Item(lua_State *L) + { + wxLuaState wxlState(L); + wxDateTime *returns; + // size_t nIndex + size_t nIndex = (size_t)wxlState.GetNumberType(2); + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call Item + // allocate a new object using the copy constructor + returns = new wxDateTime(self->Item(nIndex)); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxDateTime *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxDateTime, returns); + + return 1; + } + + // wxDateTime Last() + static int LUACALL wxLua_wxDateTimeArray_Last(lua_State *L) + { + wxLuaState wxlState(L); + wxDateTime *returns; + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call Last + // allocate a new object using the copy constructor + returns = new wxDateTime(self->Last()); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxDateTime *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxDateTime, returns); + + return 1; + } + + // void RemoveAt(size_t nIndex, size_t count = 1) + static int LUACALL wxLua_wxDateTimeArray_RemoveAt(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // size_t count = 1 + size_t count = (argCount >= 3 ? (size_t)wxlState.GetNumberType(3) : 1); + // size_t nIndex + size_t nIndex = (size_t)wxlState.GetNumberType(2); + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call RemoveAt + self->RemoveAt(nIndex, count); + + return 0; + } + + // void Shrink() + static int LUACALL wxLua_wxDateTimeArray_Shrink(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // call Shrink + self->Shrink(); + + return 0; + } + + static int LUACALL wxLua_wxDateTimeArray_destructor(lua_State *L) + { + wxLuaState wxlState(L); + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + + static int LUACALL wxLua_wxDateTimeArray_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxDateTimeArray * self = (wxDateTimeArray *)wxlState.GetUserDataType(1, s_wxluatag_wxDateTimeArray); + // remove from tracked memory list + if (self != 0) + if (wxlState.RemoveTrackedMemory(self)) + { // if removed, reset the tag so that gc() is not called on this object. + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + + + // Overloaded function bindings + + #if (wxLUA_USE_wxDateTime) + // Overloaded functions for wxLua_wxDateTimeArray_constructor + static int LUACALL wxLua_wxDateTimeArray_constructor(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaConstructor, "wxDateTimeArray", wxLua_wxDateTimeArray_constructor1, 0, 0, { 0 } }, + { LuaConstructor, "wxDateTimeArrayCopy", wxLua_wxDateTimeArrayCopy_constructor, 1, 1, { &s_wxluatag_wxDateTimeArray, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif // (wxLUA_USE_wxDateTime) + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxDateTimeArray_methods[] = { + { LuaConstructor, "wxDateTimeArray", wxLua_wxDateTimeArray_constructor, 0, 0, { 0 } }, + { LuaConstructor, "wxDateTimeArrayCopy", wxLua_wxDateTimeArrayCopy_constructor, 1, 1, { &s_wxluatag_wxDateTimeArray, 0 } }, + { LuaMethod, "Add", wxLua_wxDateTimeArray_Add, 2, 1, { &s_wxluatag_wxDateTime, &s_wxluaarg_Number, 0 } }, + { LuaMethod, "Alloc", wxLua_wxDateTimeArray_Alloc, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "Clear", wxLua_wxDateTimeArray_Clear, 0, 0, { 0 } }, + { LuaMethod, "Empty", wxLua_wxDateTimeArray_Empty, 0, 0, { 0 } }, + { LuaMethod, "GetCount", wxLua_wxDateTimeArray_GetCount, 0, 0, { 0 } }, + { LuaMethod, "Insert", wxLua_wxDateTimeArray_Insert, 3, 2, { &s_wxluatag_wxDateTime, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + { LuaMethod, "IsEmpty", wxLua_wxDateTimeArray_IsEmpty, 0, 0, { 0 } }, + { LuaMethod, "Item", wxLua_wxDateTimeArray_Item, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "Last", wxLua_wxDateTimeArray_Last, 0, 0, { 0 } }, + { LuaMethod, "RemoveAt", wxLua_wxDateTimeArray_RemoveAt, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + { LuaMethod, "Shrink", wxLua_wxDateTimeArray_Shrink, 0, 0, { 0 } }, + { LuaDelete, "wxDateTimeArray", wxLua_wxDateTimeArray_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxDateTimeArray_Delete, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxDateTimeArray_methods = s_wxDateTimeArray_methods; + int wxDateTimeArray_methodCount = sizeof(s_wxDateTimeArray_methods)/sizeof(s_wxDateTimeArray_methods[0]); + #endif // wxLUA_USE_wxDateTime + + #if wxLUA_USE_wxTimeSpan // ------------------------------------------------------------------------------------------------- *************** *** 2571,2574 **** --- 2857,2998 ---- + #if wxLUA_USE_wxDateTimeHolidayAuthority + // ------------------------------------------------------------------------------------------------- + // Bind class wxDateTimeHolidayAuthority + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxDateTimeHolidayAuthority' + int s_wxluatag_wxDateTimeHolidayAuthority = -1; + + + #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) + // %static bool IsHoliday(const wxDateTime& dt) + static int LUACALL wxLua_wxDateTimeHolidayAuthority_IsHoliday(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxDateTime dt + const wxDateTime * dt = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime); + // call IsHoliday + returns = wxDateTimeHolidayAuthority::IsHoliday(*dt); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // %static size_t GetHolidaysInRange(const wxDateTime& dtStart, const wxDateTime& dtEnd, wxDateTimeArray& holidays) + static int LUACALL wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange(lua_State *L) + { + wxLuaState wxlState(L); + size_t returns; + // wxDateTimeArray holidays + wxDateTimeArray * holidays = (wxDateTimeArray *)wxlState.GetUserDataType(4, s_wxluatag_wxDateTimeArray); + // const wxDateTime dtEnd + const wxDateTime * dtEnd = (const wxDateTime *)wxlState.GetUserDataType(3, s_wxluatag_wxDateTime); + // const wxDateTime dtStart + const wxDateTime * dtStart = (const wxDateTime *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTime); + // call GetHolidaysInRange + returns = wxDateTimeHolidayAuthority::GetHolidaysInRange(*dtStart, *dtEnd, *holidays); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) + + // %static void ClearAllAuthorities() + static int LUACALL wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities(lua_State *L) + { + wxLuaState wxlState(L); + // call ClearAllAuthorities + wxDateTimeHolidayAuthority::ClearAllAuthorities(); + + return 0; + } + + // %static void AddAuthority(wxDateTimeHolidayAuthority *auth) + static int LUACALL wxLua_wxDateTimeHolidayAuthority_AddAuthority(lua_State *L) + { + wxLuaState wxlState(L); + // wxDateTimeHolidayAuthority auth + wxDateTimeHolidayAuthority * auth = (wxDateTimeHolidayAuthority *)wxlState.GetUserDataType(2, s_wxluatag_wxDateTimeHolidayAuthority); + // call AddAuthority + wxDateTimeHolidayAuthority::AddAuthority(auth); + + return 0; + } + + static int LUACALL wxLua_wxDateTimeHolidayAuthority_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxDateTimeHolidayAuthority_methods[] = { + + #if (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) + { LuaMethod, "IsHoliday", wxLua_wxDateTimeHolidayAuthority_IsHoliday, 1, 1, { &s_wxluatag_wxDateTime, 0 } }, + { LuaMethod, "GetHolidaysInRange", wxLua_wxDateTimeHolidayAuthority_GetHolidaysInRange, 3, 3, { &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTime, &s_wxluatag_wxDateTimeArray, 0 } }, + #endif // (wxLUA_USE_wxDateTime) && (wxLUA_USE_wxDateTimeHolidayAuthority) + + { LuaMethod, "ClearAllAuthorities", wxLua_wxDateTimeHolidayAuthority_ClearAllAuthorities, 0, 0, { 0 } }, + { LuaMethod, "AddAuthority", wxLua_wxDateTimeHolidayAuthority_AddAuthority, 1, 1, { &s_wxluatag_wxDateTimeHolidayAuthority, 0 } }, + { LuaDelete, "wxDateTimeHolidayAuthority", wxLua_wxDateTimeHolidayAuthority_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxDateTimeHolidayAuthority_methods = s_wxDateTimeHolidayAuthority_methods; + int wxDateTimeHolidayAuthority_methodCount = sizeof(s_wxDateTimeHolidayAuthority_methods)/sizeof(s_wxDateTimeHolidayAuthority_methods[0]); + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + + + #if wxLUA_USE_wxDateTimeHolidayAuthority + // ------------------------------------------------------------------------------------------------- + // Bind class wxDateTimeWorkDays + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxDateTimeWorkDays' + int s_wxluatag_wxDateTimeWorkDays = -1; + + // wxDateTimeWorkDays() + static int LUACALL wxLua_wxDateTimeWorkDays_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxDateTimeWorkDays *returns; + // call constructor + returns = new wxDateTimeWorkDays(); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxDateTimeWorkDays, returns); + + return 1; + } + + static int LUACALL wxLua_wxDateTimeWorkDays_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxDateTimeWorkDays_methods[] = { + { LuaConstructor, "wxDateTimeWorkDays", wxLua_wxDateTimeWorkDays_constructor, 0, 0, { 0 } }, + { LuaDelete, "wxDateTimeWorkDays", wxLua_wxDateTimeWorkDays_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxDateTimeWorkDays_methods = s_wxDateTimeWorkDays_methods; + int wxDateTimeWorkDays_methodCount = sizeof(s_wxDateTimeWorkDays_methods)/sizeof(s_wxDateTimeWorkDays_methods[0]); + #endif // wxLUA_USE_wxDateTimeHolidayAuthority + + #if wxLUA_USE_wxTimer // ------------------------------------------------------------------------------------------------- Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** gdi.cpp 11 Oct 2006 03:24:02 -0000 1.31 --- gdi.cpp 2 Nov 2006 23:38:09 -0000 1.32 *************** *** 767,770 **** --- 767,854 ---- int s_wxluatag_wxRect = -1; + + #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxPointSizeRect) + // !%wxchkver27 bool Inside(wxCoord cx, wxCoord cy) + static int LUACALL wxLua_wxRect_Inside(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; [...1139 lines suppressed...] + { LuaMethod, "GetClientArea", wxLua_wxDisplay_GetClientArea, 0, 0, { 0 } }, + #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY) + + { LuaConstructor, "wxDisplay", wxLua_wxDisplay_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "ChangeMode", wxLua_wxDisplay_ChangeMode, 1, 0, { &s_wxluatag_wxVideoMode, 0 } }, + { LuaMethod, "GetCount", wxLua_wxDisplay_GetCount, 0, 0, { 0 } }, + { LuaMethod, "GetCurrentMode", wxLua_wxDisplay_GetCurrentMode, 0, 0, { 0 } }, + { LuaMethod, "GetFromWindow", wxLua_wxDisplay_GetFromWindow, 1, 1, { &s_wxluatag_wxWindow, 0 } }, + { LuaMethod, "GetModes", wxLua_wxDisplay_GetModes, 1, 0, { &s_wxluatag_wxVideoMode, 0 } }, + { LuaMethod, "GetName", wxLua_wxDisplay_GetName, 0, 0, { 0 } }, + { LuaMethod, "IsOk", wxLua_wxDisplay_IsOk, 0, 0, { 0 } }, + { LuaMethod, "IsPrimary", wxLua_wxDisplay_IsPrimary, 0, 0, { 0 } }, + { LuaDelete, "wxDisplay", wxLua_wxDisplay_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxDisplay_methods = s_wxDisplay_methods; + int wxDisplay_methodCount = sizeof(s_wxDisplay_methods)/sizeof(s_wxDisplay_methods[0]); + #endif // wxLUA_USE_wxDisplay && wxUSE_DISPLAY + |
|
From: John L. <jr...@us...> - 2006-11-02 23:38:15
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/samples Modified Files: debug.wx.lua Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: debug.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/debug.wx.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** debug.wx.lua 25 May 2006 03:55:23 -0000 1.7 --- debug.wx.lua 2 Nov 2006 23:38:09 -0000 1.8 *************** *** 105,109 **** local dc = wx.wxPaintDC(frame) - dc:BeginDrawing() if running then --- 105,108 ---- *************** *** 111,115 **** end - dc:EndDrawing() dc:Delete() -- ALWAYS Delete() any wxDCs created when done end --- 110,113 ---- |
|
From: John L. <jr...@us...> - 2006-11-02 23:38:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27364/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp Log Message: Added wxDisplay and friends Added more wxDateTimeXXX classes update to compile in wxWidgets 2.7.2 Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxldebug.cpp 4 Oct 2006 22:07:23 -0000 1.22 --- wxldebug.cpp 2 Nov 2006 23:38:09 -0000 1.23 *************** *** 327,336 **** { type = wxT("C Function"); ! value.Printf(wxT("0x%p"), lua_tocfunction(L, index)); } else { type = wxT("Lua Function"); ! value.Printf(wxT("0x%p"), lua_topointer(L, index)); } break; --- 327,336 ---- { type = wxT("C Function"); ! value.Printf(wxT("%p"), lua_tocfunction(L, index)); } else { type = wxT("Lua Function"); ! value.Printf(wxT("%p"), lua_topointer(L, index)); } break; *************** *** 348,352 **** case LUA_TTHREAD: type = wxT("Thread"); ! value.Printf(wxT("0x%p"), lua_topointer(L, index)); break; --- 348,352 ---- case LUA_TTHREAD: type = wxT("Thread"); ! value.Printf(wxT("%p"), lua_topointer(L, index)); break; *************** *** 391,403 **** { if (nItems == 0) ! return wxString::Format(wxT("0x%p (tag %d)"), pItem, nTag); ! return wxString::Format(wxT("0x%p (approx %d items) (tag %d)"), pItem, nItems, nTag); } if (nItems == 0) ! return wxString::Format(wxT("0x%p"), pItem); ! return wxString::Format(wxT("0x%p (approx %d items)"), pItem, nItems); } --- 391,403 ---- { if (nItems == 0) ! return wxString::Format(wxT("%p (tag %d)"), pItem, nTag); ! return wxString::Format(wxT("%p (approx %d items) (tag %d)"), pItem, nItems, nTag); } if (nItems == 0) ! return wxString::Format(wxT("%p"), pItem); ! return wxString::Format(wxT("%p (approx %d items)"), pItem, nItems); } *************** *** 416,425 **** if (!pTagName.IsEmpty()) ! return wxString::Format(wxT("0x%p (%s)"), lua_touserdata(L, index), pTagName.c_str()); ! return wxString::Format(wxT("0x%p (%d)"), lua_touserdata(L, index), nTag); } ! return wxString::Format(wxT("0x%p"), lua_touserdata(L, index)); } --- 416,425 ---- if (!pTagName.IsEmpty()) ! return wxString::Format(wxT("%p (%s)"), lua_touserdata(L, index), pTagName.c_str()); ! return wxString::Format(wxT("%p (%d)"), lua_touserdata(L, index), nTag); } ! return wxString::Format(wxT("%p"), lua_touserdata(L, index)); } |
