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: Francesco M. <fr...@us...> - 2006-05-20 11:57:31
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14727/build/bakefiles Modified Files: wxlua.bkl Log Message: Added option checking for win32 Index: wxlua.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxlua.bkl,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxlua.bkl 12 Apr 2006 18:04:05 -0000 1.24 --- wxlua.bkl 20 May 2006 11:57:27 -0000 1.25 *************** *** 32,35 **** --- 32,38 ---- <set var="VARS_DONT_ELIMINATE" append="1"> + <!-- compilers (at least with MINGW there are problems if these get removed) --> + CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS + <!-- generic options --> SHARED BUILD UNICODE *************** *** 42,46 **** <!-- modules options --> ! USE_WXBINDSTC USE_WXLUADEBUG USE_WXLUASOCKET INSTALL_CUSTOM_WXBIND </set> </if> --- 45,49 ---- <!-- modules options --> ! USE_WXBINDSTC USE_WXLUADEBUG USE_WXLUASOCKET USE_LUAMODULE INSTALL_CUSTOM_WXBIND </set> </if> *************** *** 200,202 **** --- 203,228 ---- </if> + + + + <!-- ================================================================== --> + <!-- OPTIONS CHECKING FOR MAKEFILES --> + <!-- ================================================================== --> + + + <!-- TODO: the following error is enabled only for MSVC and AUTOCONF (see configure.ac) currently ! --> + + <!-- Longer explanation of the error: it just makes no sense to link a SHARED build of wxLua to a + STATIC build of wxWidgets since *any* object file which ends up in a .DLL/.SO needs to be compiled + with special flags (e.g. -fPIC with GCC) - trying to link a SHARED build of wxLua to a + STATIC build of wxWidgets would be equivalent to put object files compiled for a static build + in a DLL - this will just fail at link-time with lots of difficult-to-understand error message !!! + --> + <fragment format="msvc"> + !if "$(SHARED)" == "1" && "$(WX_SHARED)" == "0" + !error Cannot build a SHARED version of wxLua (SHARED is 1) against a static version of wxWidgets (WX_SHARED is 0) ! You can only do the opposite (STATIC build of wxLua against SHARED build of wxWidgets) + !endif + </fragment> + + </makefile> |
|
From: Francesco M. <fr...@us...> - 2006-05-20 11:33:44
|
Update of /cvsroot/wxlua/wxLua/apps/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6217/apps/build/bakefiles Modified Files: apps.bkl options.bkl Log Message: minor changes Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/options.bkl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** options.bkl 12 Apr 2006 05:08:48 -0000 1.8 --- options.bkl 20 May 2006 11:33:40 -0000 1.9 *************** *** 64,68 **** <description>Compile the wxLuaFreeze app ?</description> </option> - </if> <if cond="TARGETING_IDE=='1'"> --- 64,67 ---- *************** *** 75,80 **** <set var="USE_WXLUACANAPP">1</set> <set var="USE_WXLUAEDITAPP">1</set> - <set var="WXSTEDIT_DIR">$(WXSTEDIT_DIR_DEFAULT)</set> <set var="USE_WXLUAFREEZEAPP">1</set> </if> --- 74,80 ---- <set var="USE_WXLUACANAPP">1</set> <set var="USE_WXLUAEDITAPP">1</set> <set var="USE_WXLUAFREEZEAPP">1</set> + + <set var="WXSTEDIT_DIR">$(WXSTEDIT_DIR_DEFAULT)</set> </if> Index: apps.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/bakefiles/apps.bkl,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** apps.bkl 14 May 2006 13:11:49 -0000 1.38 --- apps.bkl 20 May 2006 11:33:40 -0000 1.39 *************** *** 54,57 **** --- 54,59 ---- <set var="WXLUAFREEZEAPP_HDR">$(fileList('wxluafreeze/src/*.h'))</set> + + <!-- ================================================================== --> <!-- The list of wxLua OPTIONS --> *************** *** 118,122 **** <!-- ================================================================== --> ! <!-- The WXLUACAN application target --> <!-- ================================================================== --> --- 120,124 ---- <!-- ================================================================== --> ! <!-- The WXLUACAN application target --> <!-- ================================================================== --> *************** *** 150,167 **** </exe> - <!-- ================================================================== --> - <!-- The WXLUAFREEZE application target --> - <!-- ================================================================== --> - - <exe id="app_wxluafreeze" template="wxluaapp" cond="USE_WXLUAFREEZEAPP=='1'"> - <sources>$(WXLUAFREEZEAPP_SRC)</sources> - <headers>$(WXLUAFREEZEAPP_HDR)</headers> - - <exename>wxluafreeze</exename> - <win32-res>wxluafreeze/src/wxluafreeze.rc</win32-res> - - <wxlua-allstdlibs/> - <wx-alllibs-req-bywxlua/> - </exe> - </makefile> --- 152,154 ---- |
|
From: John L. <jr...@us...> - 2006-05-19 15:07:38
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4433/wxLua/apps/wxluaedit/src Modified Files: wxluaedit.cpp Log Message: fix wxluaedit to work with older wxstedit libs < 1.2.2 Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxluaedit.cpp 19 May 2006 05:31:51 -0000 1.17 --- wxluaedit.cpp 19 May 2006 15:07:32 -0000 1.18 *************** *** 201,205 **** --- 201,207 ---- } + #if wxCHECK_STE_VERSION(1,2,2) frame->UpdateFileTreeCtrl(); + #endif frame->Show(true); *************** *** 237,246 **** m_sideSplitter->SetMinimumPaneSize(10); m_sideNotebook = new wxNotebook(m_sideSplitter, wxID_ANY); m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILETREECTRL, wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); m_fileTreeCtrl->SetIndent(5); m_fileTreeCtrl->AddRoot(wxT("Files")); - m_sideNotebook->AddPage(m_fileTreeCtrl, wxT("Files")); m_sideSplitterWin1 = m_sideNotebook; --- 239,255 ---- m_sideSplitter->SetMinimumPaneSize(10); m_sideNotebook = new wxNotebook(m_sideSplitter, wxID_ANY); + + #if wxCHECK_STE_VERSION(1,2,2) m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILETREECTRL, wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); m_fileTreeCtrl->SetIndent(5); m_fileTreeCtrl->AddRoot(wxT("Files")); m_sideNotebook->AddPage(m_fileTreeCtrl, wxT("Files")); + #else + m_fileListBox = new wxListBox(m_sideNotebook, ID_STF_FILELISTBOX, + wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE ); + m_sideNotebook->AddPage(m_fileListBox, wxT("Files")); + #endif + m_sideSplitterWin1 = m_sideNotebook; |
|
From: John L. <jr...@us...> - 2006-05-19 05:32:00
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27971/wxLua/docs Modified Files: wxluaref.html Log Message: update wxLuaEdit to use wxTreeCtrl for selecting files, update for wxStEdit cleanup docs to create links only to classnames, not when the classname is part of a longer name Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxluaref.html 17 May 2006 05:31:12 -0000 1.3 --- wxluaref.html 19 May 2006 05:31:52 -0000 1.4 *************** *** 624,628 **** <h2>Colours used to denote types</h2> <font color=#007700>Enums - %enum</font><br> ! <font color=#007755>Defines - %define [%string] [%object]</font><br> <font color=#557700>Events - %define %event</font><br> <font color=#AA0000>Classes - %class</font><br> --- 624,628 ---- <h2>Colours used to denote types</h2> <font color=#007700>Enums - %enum</font><br> ! <font color=#007755>Defines - %define [%string] [%object] [%pointer]</font><br> <font color=#557700>Events - %define %event</font><br> [...9482 lines suppressed...] //void AddStyledText(const wxMemoryBuffer& data)<br> --- 13352,13356 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxStyledTextCtrl">wxStyledTextCtrl</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> ! wxStyledTextCtrl(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxString">wxString</a> &name = "wxStyledTextCtrl")<br> void AddText(const <a href="#wxString">wxString</a>& text)<br> //void AddStyledText(const wxMemoryBuffer& data)<br> *************** *** 13707,13711 **** <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_STC_ZOOM</font><br> <br> ! wxStyledTextEvent(<a href="#wxEventType">wxEventType</a> commandType = 0, int id = 0)<br> void SetPosition(int pos)<br> void SetKey(int k)<br> --- 13750,13754 ---- <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_STC_ZOOM</font><br> <br> ! wxStyledTextEvent(wxEventType commandType = 0, int id = 0)<br> void SetPosition(int pos)<br> void SetKey(int k)<br> |
|
From: John L. <jr...@us...> - 2006-05-19 05:32:00
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27971/wxLua/bindings Modified Files: genidocs.lua Log Message: update wxLuaEdit to use wxTreeCtrl for selecting files, update for wxStEdit cleanup docs to create links only to classnames, not when the classname is part of a longer name Index: genidocs.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** genidocs.lua 17 May 2006 05:02:04 -0000 1.2 --- genidocs.lua 19 May 2006 05:31:52 -0000 1.3 *************** *** 30,34 **** table.insert(fileTable, MakeColour("Enums - %enum", enumColour).."<br>") ! table.insert(fileTable, MakeColour("Defines - %define [%string] [%object]", defineColour).."<br>") table.insert(fileTable, MakeColour("Events - %define %event", eventColour).."<br>") --- 30,34 ---- table.insert(fileTable, MakeColour("Enums - %enum", enumColour).."<br>") ! table.insert(fileTable, MakeColour("Defines - %define [%string] [%object] [%pointer]", defineColour).."<br>") table.insert(fileTable, MakeColour("Events - %define %event", eventColour).."<br>") *************** *** 238,245 **** used[cname] = true for w in string.gmatch(line, "([%w_]+)") do ! if (not string.find(cname, w, 1, 1)) and (not used[w]) and dataTypes[w] and (dataTypes[w].DefType ~= "builtin") then used[w] = true ! out_line = string.gsub(out_line, w, MakeLink(w)) end end --- 238,259 ---- used[cname] = true + local function replace_pattern(w) + + end + for w in string.gmatch(line, "([%w_]+)") do ! if ((string.len(cname) == 0) or (not string.find(w, cname, 1, 1))) and ! (not used[w]) and ! dataTypes[w] and (dataTypes[w].DefType ~= "builtin") and (dataTypes[w].DefType ~= "wxtypedef") then used[w] = true ! -- replace the classname with a link, but not if it's part of a name ! --out_line = string.gsub(out_line, w, MakeLink(w)) ! local pat = "[ %&%*%(%)%{%}%[%]%+%-%=%<%>%.%-%+%|%/]" ! local s, e = string.find(out_line, w..pat, 1) ! while s do ! local link = MakeLink(w) ! out_line = string.sub(out_line, 1, s-1)..link..string.sub(out_line, e) ! s, e = string.find(out_line, w..pat, s+string.len(link)) ! end end end |
|
From: John L. <jr...@us...> - 2006-05-19 05:32:00
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27971/wxLua/apps/wxluaedit/src Modified Files: wxluaedit.cpp Log Message: update wxLuaEdit to use wxTreeCtrl for selecting files, update for wxStEdit cleanup docs to create links only to classnames, not when the classname is part of a longer name Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxluaedit.cpp 19 Apr 2006 04:27:20 -0000 1.16 --- wxluaedit.cpp 19 May 2006 05:31:51 -0000 1.17 *************** *** 201,204 **** --- 201,205 ---- } + frame->UpdateFileTreeCtrl(); frame->Show(true); *************** *** 236,242 **** m_sideSplitter->SetMinimumPaneSize(10); m_sideNotebook = new wxNotebook(m_sideSplitter, wxID_ANY); ! m_fileListBox = new wxListBox(m_sideNotebook, ID_STF_FILELISTBOX, ! wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE ); ! m_sideNotebook->AddPage(m_fileListBox, wxT("Files")); m_sideSplitterWin1 = m_sideNotebook; --- 237,246 ---- m_sideSplitter->SetMinimumPaneSize(10); m_sideNotebook = new wxNotebook(m_sideSplitter, wxID_ANY); ! m_fileTreeCtrl = new wxTreeCtrl(m_sideNotebook, ID_STF_FILETREECTRL, ! wxDefaultPosition, wxDefaultSize, wxTR_SINGLE|wxTR_HAS_BUTTONS|wxTR_HIDE_ROOT ); ! m_fileTreeCtrl->SetIndent(5); ! m_fileTreeCtrl->AddRoot(wxT("Files")); ! ! m_sideNotebook->AddPage(m_fileTreeCtrl, wxT("Files")); m_sideSplitterWin1 = m_sideNotebook; |
|
From: Francesco M. <fr...@us...> - 2006-05-18 09:50:12
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28547 Modified Files: index.php Log Message: added reference docs link to lua docs Index: index.php =================================================================== RCS file: /cvsroot/wxlua/website/index.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** index.php 16 May 2006 20:12:51 -0000 1.16 --- index.php 18 May 2006 09:50:02 -0000 1.17 *************** *** 49,53 **** <ol> <li>the <a href="http://www.wxwidgets.org/manuals/2.6.2/wx_contents.html">wxWidgets documentation</a></li> ! <li>the <a href="http://www.lua.org/pil/">Lua reference manual</a></li> <li>the <a href="docs.php">wxLua documentation</a></li> <li>the <a href="http://lua-users.org/wiki">LuaWiki</a> and <a href="http://www.wxwidgets.org/wiki">wxWiki</a></li> --- 49,53 ---- <ol> <li>the <a href="http://www.wxwidgets.org/manuals/2.6.2/wx_contents.html">wxWidgets documentation</a></li> ! <li>the <a href="http://www.lua.org/manual/5.1/">Lua 5.1 reference manual</a> and the <a href="http://www.lua.org/pil/">Programming in Lua</a> online book</li> <li>the <a href="docs.php">wxLua documentation</a></li> <li>the <a href="http://lua-users.org/wiki">LuaWiki</a> and <a href="http://www.wxwidgets.org/wiki">wxWiki</a></li> |
|
From: John L. <jr...@us...> - 2006-05-18 05:47:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8015/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlstate.cpp Log Message: add binding tag for LuaFunction add %overload up to file.i, note static funcs don't work now add SortItems function for wxListCtrl, untested tabs -> spaces Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** wxlstate.cpp 14 May 2006 07:48:09 -0000 1.68 --- wxlstate.cpp 18 May 2006 05:47:40 -0000 1.69 *************** *** 590,594 **** { #ifdef WXLUA_LUA_NEWTHREAD ! wxLuaState_SetupThreadHandlers(); #endif //WXLUA_LUA_NEWTHREAD --- 590,594 ---- { #ifdef WXLUA_LUA_NEWTHREAD ! wxLuaState_SetupThreadHandlers(); #endif //WXLUA_LUA_NEWTHREAD *************** *** 3145,3158 **** int arg; int i; ! int j; int bestMethod = -1; int invalidArg = -1; ! int maxargs = -1; ! int minargs = -1; int ltype; ! // do nothing ! if (!overloadedMethods && overloadedMethodCount == 0) ! return 0; // get number of arguments called from lua --- 3145,3158 ---- int arg; int i; ! int j; int bestMethod = -1; int invalidArg = -1; ! int maxargs = -1; ! int minargs = -1; int ltype; ! // do nothing ! if (!overloadedMethods && overloadedMethodCount == 0) ! return 0; // get number of arguments called from lua *************** *** 3167,3201 **** } ! // prepare overload function table ! WXLUAMETHOD** overloadFunctionTable = new WXLUAMETHOD*[overloadedMethodCount]; for (i = 0; i < overloadedMethodCount; i++) { ! if (maxargs == -1 || maxargs < overloadedMethods[i].maxargs) ! maxargs = overloadedMethods[i].maxargs; ! if (minargs == -1 || minargs > overloadedMethods[i].minargs) ! minargs = overloadedMethods[i].minargs; ! overloadFunctionTable[i] = (overloadedMethods+i); ! } #if !defined(WXLUA_OVERLOAD_SORTED) ! // sort overload on the fly to get proper function selection ! // order by minargs DESC, maxargs DESC for (i = 0; i < overloadedMethodCount; i++) { ! for (j = i + 1; j < overloadedMethodCount; j++) ! { ! if (overloadFunctionTable[j]->minargs > overloadFunctionTable[i]->minargs || ! overloadFunctionTable[j]->minargs == overloadFunctionTable[i]->minargs && ! overloadFunctionTable[j]->maxargs > overloadFunctionTable[i]->maxargs) ! { ! // swap order ! WXLUAMETHOD* swap = overloadFunctionTable[i]; ! overloadFunctionTable[i] = overloadFunctionTable[j]; ! overloadFunctionTable[j] = swap; ! } ! } ! } #endif --- 3167,3201 ---- } ! // prepare overload function table ! WXLUAMETHOD** overloadFunctionTable = new WXLUAMETHOD*[overloadedMethodCount]; for (i = 0; i < overloadedMethodCount; i++) { ! if (maxargs == -1 || maxargs < overloadedMethods[i].maxargs) ! maxargs = overloadedMethods[i].maxargs; ! if (minargs == -1 || minargs > overloadedMethods[i].minargs) ! minargs = overloadedMethods[i].minargs; ! overloadFunctionTable[i] = (overloadedMethods+i); ! } #if !defined(WXLUA_OVERLOAD_SORTED) ! // sort overload on the fly to get proper function selection ! // order by minargs DESC, maxargs DESC for (i = 0; i < overloadedMethodCount; i++) { ! for (j = i + 1; j < overloadedMethodCount; j++) ! { ! if (overloadFunctionTable[j]->minargs > overloadFunctionTable[i]->minargs || ! overloadFunctionTable[j]->minargs == overloadFunctionTable[i]->minargs && ! overloadFunctionTable[j]->maxargs > overloadFunctionTable[i]->maxargs) ! { ! // swap order ! WXLUAMETHOD* swap = overloadFunctionTable[i]; ! overloadFunctionTable[i] = overloadFunctionTable[j]; ! overloadFunctionTable[j] = swap; ! } ! } ! } #endif *************** *** 3210,3217 **** // does this method have any more arguments? if (!overloadFunctionTable[i]->argtags || !overloadFunctionTable[i]->argtags[arg]) ! { ! match = false; break; ! } // get argument tag id --- 3210,3217 ---- // does this method have any more arguments? if (!overloadFunctionTable[i]->argtags || !overloadFunctionTable[i]->argtags[arg]) ! { ! match = false; break; ! } // get argument tag id *************** *** 3275,3278 **** --- 3275,3286 ---- } } + else if (tag == s_wxluaarg_LuaFunction) + { + if (!lua_IsFunction(arg+1+lua_argStart)) + { + match = false; + break; + } + } else if (!IsUserDataType(arg+1+lua_argStart, tag)) { *************** *** 3302,3308 **** } ! lua_Debug ar; ! lua_GetStack(0, &ar); ! lua_GetInfo("n", &ar); wxString name = lua2wx(ar.name); --- 3310,3316 ---- } ! lua_Debug ar; ! lua_GetStack(0, &ar); ! lua_GetInfo("n", &ar); wxString name = lua2wx(ar.name); *************** *** 3392,3407 **** fnOverload += wxT("number"); } ! else if (tag == s_wxluaarg_LightUserData) ! { fnOverload += wxT("lightuserdata"); ! } ! else if (tag == s_wxluaarg_UserData) ! { fnOverload += wxT("userdata"); ! } ! else if (tag == s_wxluaarg_LuaTable) ! { fnOverload += wxT("luatable"); ! } else { --- 3400,3419 ---- fnOverload += wxT("number"); } ! else if (tag == s_wxluaarg_LightUserData) ! { fnOverload += wxT("lightuserdata"); ! } ! else if (tag == s_wxluaarg_UserData) ! { fnOverload += wxT("userdata"); ! } ! else if (tag == s_wxluaarg_LuaTable) ! { fnOverload += wxT("luatable"); ! } ! else if (tag == s_wxluaarg_LuaFunction) ! { ! fnOverload += wxT("luafunction"); ! } else { Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxlbind.cpp 14 May 2006 07:48:09 -0000 1.33 --- wxlbind.cpp 18 May 2006 05:47:40 -0000 1.34 *************** *** 34,44 **** // represents prototypes argument types // ! int s_wxluaarg_String = -2; ! int s_wxluaarg_Boolean = -3; ! int s_wxluaarg_Enumeration = -4; ! int s_wxluaarg_Number = -5; ! int s_wxluaarg_LightUserData = -6; // raw data ! int s_wxluaarg_UserData = -7; // raw data ! int s_wxluaarg_LuaTable = -8; WX_DEFINE_LIST(wxLuaBindingList); --- 34,45 ---- // represents prototypes argument types // ! int s_wxluaarg_String = -2; ! int s_wxluaarg_Boolean = -3; ! int s_wxluaarg_Enumeration = -4; ! int s_wxluaarg_Number = -5; ! int s_wxluaarg_LightUserData = -6; // raw data ! int s_wxluaarg_UserData = -7; // raw data ! int s_wxluaarg_LuaTable = -8; ! int s_wxluaarg_LuaFunction = -9; WX_DEFINE_LIST(wxLuaBindingList); *************** *** 483,490 **** // sort the event list into order for faster lookup. ! qsort(m_eventList, ! m_eventCount, ! sizeof(WXLUAEVENT), ! wxLuaEventListCompareFn); } --- 484,488 ---- // sort the event list into order for faster lookup. ! qsort(m_eventList, m_eventCount, sizeof(WXLUAEVENT), wxLuaEventListCompareFn); } |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8015/wxLua/modules/wxbind/src Modified Files: clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp event.cpp file.cpp gdi.cpp wx_bind.cpp Log Message: add binding tag for LuaFunction add %overload up to file.i, note static funcs don't work now add SortItems function for wxListCtrl, untested tabs -> spaces Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** config.cpp 15 May 2006 21:55:35 -0000 1.17 --- config.cpp 18 May 2006 05:47:39 -0000 1.18 *************** *** 592,596 **** } ! // static wxConfigBase* Set(wxConfigBase *pConfig = NULL) static int LUACALL wxLua_wxConfigBase_Set(lua_State *L) { --- 592,596 ---- } ! // %static wxConfigBase* Set(wxConfigBase *pConfig = NULL) static int LUACALL wxLua_wxConfigBase_Set(lua_State *L) { *************** *** 736,743 **** { LuaMethod, "GetAppName", wxLua_wxConfigBase_GetAppName, 0, 0, { 0 } }, { LuaMethod, "GetEntryType", wxLua_wxConfigBase_GetEntryType, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "GetFirstGroup", wxLua_wxConfigBase_GetFirstGroup, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "GetFirstEntry", wxLua_wxConfigBase_GetFirstEntry, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "GetNextGroup", wxLua_wxConfigBase_GetNextGroup, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "GetNextEntry", wxLua_wxConfigBase_GetNextEntry, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, 0 } }, { LuaMethod, "GetNumberOfEntries", wxLua_wxConfigBase_GetNumberOfEntries, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "GetNumberOfGroups", wxLua_wxConfigBase_GetNumberOfGroups, 1, 0, { &s_wxluaarg_Boolean, 0 } }, --- 736,743 ---- { LuaMethod, "GetAppName", wxLua_wxConfigBase_GetAppName, 0, 0, { 0 } }, { LuaMethod, "GetEntryType", wxLua_wxConfigBase_GetEntryType, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "GetFirstGroup", wxLua_wxConfigBase_GetFirstGroup, 0, 0, { 0 } }, ! { LuaMethod, "GetFirstEntry", wxLua_wxConfigBase_GetFirstEntry, 0, 0, { 0 } }, ! { LuaMethod, "GetNextGroup", wxLua_wxConfigBase_GetNextGroup, 0, 0, { 0 } }, ! { LuaMethod, "GetNextEntry", wxLua_wxConfigBase_GetNextEntry, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetNumberOfEntries", wxLua_wxConfigBase_GetNumberOfEntries, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "GetNumberOfGroups", wxLua_wxConfigBase_GetNumberOfGroups, 1, 0, { &s_wxluaarg_Boolean, 0 } }, *************** *** 748,754 **** { LuaMethod, "IsExpandingEnvVars", wxLua_wxConfigBase_IsExpandingEnvVars, 0, 0, { 0 } }, { LuaMethod, "IsRecordingDefaults", wxLua_wxConfigBase_IsRecordingDefaults, 0, 0, { 0 } }, ! { LuaMethod, "Read", wxLua_wxConfigBase_Read, 3, 2, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "ReadInt", wxLua_wxConfigBase_ReadInt, 3, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "ReadFloat", wxLua_wxConfigBase_ReadFloat, 3, 2, { &s_wxluaarg_String, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "RenameEntry", wxLua_wxConfigBase_RenameEntry, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "RenameGroup", wxLua_wxConfigBase_RenameGroup, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, --- 748,754 ---- { LuaMethod, "IsExpandingEnvVars", wxLua_wxConfigBase_IsExpandingEnvVars, 0, 0, { 0 } }, { LuaMethod, "IsRecordingDefaults", wxLua_wxConfigBase_IsRecordingDefaults, 0, 0, { 0 } }, ! { LuaMethod, "Read", wxLua_wxConfigBase_Read, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "ReadInt", wxLua_wxConfigBase_ReadInt, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "ReadFloat", wxLua_wxConfigBase_ReadFloat, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "RenameEntry", wxLua_wxConfigBase_RenameEntry, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "RenameGroup", wxLua_wxConfigBase_RenameGroup, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** file.cpp 3 May 2006 22:52:18 -0000 1.16 --- file.cpp 18 May 2006 05:47:39 -0000 1.17 *************** *** 286,291 **** } ! // void Assign(const wxFileName& filepath) ! static int LUACALL wxLua_wxFileName_Assign(lua_State *L) { wxLuaState wxlState(L); --- 286,291 ---- } ! // %overload void Assign(const wxFileName& filepath) ! static int LUACALL wxLua_wxFileName_Assign1(lua_State *L) { wxLuaState wxlState(L); *************** *** 300,304 **** } ! // %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignFullName(lua_State *L) { --- 300,304 ---- } ! // %overload %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignFullName(lua_State *L) { *************** *** 318,322 **** } ! // %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignVolume(lua_State *L) { --- 318,322 ---- } ! // %overload %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignVolume(lua_State *L) { *************** *** 342,346 **** } ! // %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignPath(lua_State *L) { --- 342,346 ---- } ! // %overload %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignPath(lua_State *L) { *************** *** 362,366 **** } ! // %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignPathNameExt(lua_State *L) { --- 362,366 ---- } ! // %overload %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) static int LUACALL wxLua_wxFileName_AssignPathNameExt(lua_State *L) { *************** *** 1424,1427 **** --- 1424,1448 ---- + // Overloaded function bindings + + #if (wxLUA_USE_wxFileName) + // Overloaded functions for wxLua_wxFileName_Assign + static int LUACALL wxLua_wxFileName_Assign(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "Assign", wxLua_wxFileName_Assign1, 1, 1, { &s_wxluatag_wxFileName, 0 } }, + { LuaMethod, "AssignFullName", wxLua_wxFileName_AssignFullName, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, + { LuaMethod, "AssignVolume", wxLua_wxFileName_AssignVolume, 5, 4, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, + { LuaMethod, "AssignPath", wxLua_wxFileName_AssignPath, 3, 2, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, + { LuaMethod, "AssignPathNameExt", wxLua_wxFileName_AssignPathNameExt, 4, 3, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + *************** *** 1512,1518 **** { LuaMethod, "SetName", wxLua_wxFileName_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetVolume", wxLua_wxFileName_SetVolume, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SplitPath", wxLua_wxFileName_SplitPath, 5, 4, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SplitPathVolume", wxLua_wxFileName_SplitPathVolume, 6, 5, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SplitVolume", wxLua_wxFileName_SplitVolume, 4, 3, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "Touch", wxLua_wxFileName_Touch, 0, 0, { 0 } }, { LuaMethod, "op_assign", wxLua_wxFileName_op_assign, 1, 1, { &s_wxluatag_wxFileName, 0 } }, --- 1533,1539 ---- { LuaMethod, "SetName", wxLua_wxFileName_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetVolume", wxLua_wxFileName_SetVolume, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaMethod, "SplitPath", wxLua_wxFileName_SplitPath, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SplitPathVolume", wxLua_wxFileName_SplitPathVolume, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SplitVolume", wxLua_wxFileName_SplitVolume, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "Touch", wxLua_wxFileName_Touch, 0, 0, { 0 } }, { LuaMethod, "op_assign", wxLua_wxFileName_op_assign, 1, 1, { &s_wxluatag_wxFileName, 0 } }, *************** *** 1946,1950 **** { LuaMethod, "SeekEnd", wxLua_wxFile_SeekEnd, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "Tell", wxLua_wxFile_Tell, 0, 0, { 0 } }, ! { LuaMethod, "Write", wxLua_wxFile_Write, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "WriteString", wxLua_wxFile_WriteString, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaDelete, "wxFile", wxLua_wxFile_destructor, 0, 0, {0} }, --- 1967,1971 ---- { LuaMethod, "SeekEnd", wxLua_wxFile_SeekEnd, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "Tell", wxLua_wxFile_Tell, 0, 0, { 0 } }, ! { LuaMethod, "Write", wxLua_wxFile_Write, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "WriteString", wxLua_wxFile_WriteString, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaDelete, "wxFile", wxLua_wxFile_destructor, 0, 0, {0} }, *************** *** 2563,2570 **** { LuaMethod, "LastRead", wxLua_wxInputStream_LastRead, 0, 0, { 0 } }, { LuaMethod, "Peek", wxLua_wxInputStream_Peek, 0, 0, { 0 } }, ! { LuaMethod, "Read", wxLua_wxInputStream_Read, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "ReadStream", wxLua_wxInputStream_ReadStream, 1, 1, { &s_wxluatag_wxOutputStream, 0 } }, { LuaMethod, "TellI", wxLua_wxInputStream_TellI, 0, 0, { 0 } }, ! { LuaMethod, "Unget", wxLua_wxInputStream_Unget, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Ungetch", wxLua_wxInputStream_Ungetch, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxInputStream", wxLua_wxInputStream_destructor, 0, 0, {0} }, --- 2584,2591 ---- { LuaMethod, "LastRead", wxLua_wxInputStream_LastRead, 0, 0, { 0 } }, { LuaMethod, "Peek", wxLua_wxInputStream_Peek, 0, 0, { 0 } }, ! { LuaMethod, "Read", wxLua_wxInputStream_Read, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "ReadStream", wxLua_wxInputStream_ReadStream, 1, 1, { &s_wxluatag_wxOutputStream, 0 } }, { LuaMethod, "TellI", wxLua_wxInputStream_TellI, 0, 0, { 0 } }, ! { LuaMethod, "Unget", wxLua_wxInputStream_Unget, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Ungetch", wxLua_wxInputStream_Ungetch, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxInputStream", wxLua_wxInputStream_destructor, 0, 0, {0} }, *************** *** 2726,2730 **** { LuaMethod, "PutC", wxLua_wxOutputStream_PutC, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "TellO", wxLua_wxOutputStream_TellO, 0, 0, { 0 } }, ! { LuaMethod, "Write", wxLua_wxOutputStream_Write, 2, 2, { &s_wxluaarg_LightUserData, &s_wxluaarg_Number, 0 } }, { LuaMethod, "WriteStream", wxLua_wxOutputStream_WriteStream, 1, 1, { &s_wxluatag_wxInputStream, 0 } }, { LuaDelete, "wxOutputStream", wxLua_wxOutputStream_destructor, 0, 0, {0} }, --- 2747,2751 ---- { LuaMethod, "PutC", wxLua_wxOutputStream_PutC, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "TellO", wxLua_wxOutputStream_TellO, 0, 0, { 0 } }, ! { LuaMethod, "Write", wxLua_wxOutputStream_Write, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "WriteStream", wxLua_wxOutputStream_WriteStream, 1, 1, { &s_wxluatag_wxInputStream, 0 } }, { LuaDelete, "wxOutputStream", wxLua_wxOutputStream_destructor, 0, 0, {0} }, Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** data.cpp 17 May 2006 22:47:10 -0000 1.20 --- data.cpp 18 May 2006 05:47:39 -0000 1.21 *************** *** 1016,1021 **** #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) ! // wxNode *Append(wxObject *object) ! static int LUACALL wxLua_wxList_Append(lua_State *L) { wxLuaState wxlState(L); --- 1016,1021 ---- #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) ! // %overload wxNode *Append(wxObject *object) ! static int LUACALL wxLua_wxList_Append1(lua_State *L) { wxLuaState wxlState(L); *************** *** 1033,1037 **** } ! // %rename AppendNumKey wxNode *Append(long key, wxObject *object) static int LUACALL wxLua_wxList_AppendNumKey(lua_State *L) { --- 1033,1037 ---- } ! // %overload %rename AppendNumKey wxNode *Append(long key, wxObject *object) static int LUACALL wxLua_wxList_AppendNumKey(lua_State *L) { *************** *** 1052,1056 **** } ! // %rename AppendStringKey wxNode *Append(const wxString& key, wxObject *object) static int LUACALL wxLua_wxList_AppendStringKey(lua_State *L) { --- 1052,1056 ---- } ! // %overload %rename AppendStringKey wxNode *Append(const wxString& key, wxObject *object) static int LUACALL wxLua_wxList_AppendStringKey(lua_State *L) { *************** *** 1088,1093 **** } ! // wxNode* Find(wxObject* pObject) ! static int LUACALL wxLua_wxList_Find(lua_State *L) { wxLuaState wxlState(L); --- 1088,1093 ---- } ! // %overload wxNode* Find(wxObject* pObject) ! static int LUACALL wxLua_wxList_Find1(lua_State *L) { wxLuaState wxlState(L); *************** *** 1122,1127 **** } ! // wxNode *Insert(wxObject *pObject) ! static int LUACALL wxLua_wxList_Insert(lua_State *L) { wxLuaState wxlState(L); --- 1122,1127 ---- } ! // %overload wxNode *Insert(wxObject *pObject) ! static int LUACALL wxLua_wxList_Insert1(lua_State *L) { wxLuaState wxlState(L); *************** *** 1139,1143 **** } ! // %rename InsertAt wxNode *Insert(size_t position, wxObject *pObject) static int LUACALL wxLua_wxList_InsertAt(lua_State *L) { --- 1139,1143 ---- } ! // %overload %rename InsertAt wxNode *Insert(size_t position, wxObject *pObject) static int LUACALL wxLua_wxList_InsertAt(lua_State *L) { *************** *** 1158,1162 **** } ! // %rename InsertBefore wxNode *Insert(wxNode *pNode, wxObject *pObject) static int LUACALL wxLua_wxList_InsertBefore(lua_State *L) { --- 1158,1162 ---- } ! // %overload %rename InsertBefore wxNode *Insert(wxNode *pNode, wxObject *pObject) static int LUACALL wxLua_wxList_InsertBefore(lua_State *L) { *************** *** 1252,1256 **** } ! // %rename FindNumKey wxNode *Find(long key) static int LUACALL wxLua_wxList_FindNumKey(lua_State *L) { --- 1252,1256 ---- } ! // %overload %rename FindNumKey wxNode *Find(long key) static int LUACALL wxLua_wxList_FindNumKey(lua_State *L) { *************** *** 1269,1273 **** } ! // %rename FindStringKey wxNode *Find(const wxString &key) static int LUACALL wxLua_wxList_FindStringKey(lua_State *L) { --- 1269,1273 ---- } ! // %overload %rename FindStringKey wxNode *Find(const wxString &key) static int LUACALL wxLua_wxList_FindStringKey(lua_State *L) { *************** *** 1370,1373 **** --- 1370,1440 ---- + // Overloaded function bindings + + #if ((wxLUA_USE_wxList) && (wxLUA_USE_wxObject)) + // Overloaded functions for wxLua_wxList_Append + static int LUACALL wxLua_wxList_Append(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + + #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) + { LuaMethod, "Append", wxLua_wxList_Append1, 1, 1, { &s_wxluatag_wxObject, 0 } }, + { LuaMethod, "AppendNumKey", wxLua_wxList_AppendNumKey, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxObject, 0 } }, + { LuaMethod, "AppendStringKey", wxLua_wxList_AppendStringKey, 2, 2, { &s_wxluaarg_String, &s_wxluatag_wxObject, 0 } }, + #endif + + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + + + #if ((wxLUA_USE_wxList) && (wxLUA_USE_wxObject))||(wxLUA_USE_wxList) + // Overloaded functions for wxLua_wxList_Find + static int LUACALL wxLua_wxList_Find(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + + #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) + { LuaMethod, "Find", wxLua_wxList_Find1, 1, 1, { &s_wxluatag_wxObject, 0 } }, + #endif + + { LuaMethod, "FindNumKey", wxLua_wxList_FindNumKey, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "FindStringKey", wxLua_wxList_FindStringKey, 1, 1, { &s_wxluaarg_String, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + + + #if ((wxLUA_USE_wxList) && (wxLUA_USE_wxObject)) + // Overloaded functions for wxLua_wxList_Insert + static int LUACALL wxLua_wxList_Insert(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + + #if (wxLUA_USE_wxList) && (wxLUA_USE_wxObject) + { LuaMethod, "Insert", wxLua_wxList_Insert1, 1, 1, { &s_wxluatag_wxObject, 0 } }, + { LuaMethod, "InsertAt", wxLua_wxList_InsertAt, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxObject, 0 } }, + { LuaMethod, "InsertBefore", wxLua_wxList_InsertBefore, 2, 2, { &s_wxluatag_wxNode, &s_wxluatag_wxObject, 0 } }, + #endif + + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** controls.cpp 17 May 2006 22:47:10 -0000 1.25 --- controls.cpp 18 May 2006 05:47:39 -0000 1.26 *************** *** 111,115 **** #if (wxLUA_USE_wxButton) && (wxLUA_USE_wxPointSizeRect) ! // static wxSize GetDefaultSize() static int LUACALL wxLua_wxButton_GetDefaultSize(lua_State *L) { --- 111,115 ---- #if (wxLUA_USE_wxButton) && (wxLUA_USE_wxPointSizeRect) ! // static wxSize GetDefaultSize() // static is ok, use on existing button static int LUACALL wxLua_wxButton_GetDefaultSize(lua_State *L) { *************** *** 218,222 **** } ! // bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") static int LUACALL wxLua_wxBitmapButton_Create(lua_State *L) { --- 218,222 ---- } ! // bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") static int LUACALL wxLua_wxBitmapButton_Create(lua_State *L) { *************** *** 255,259 **** #if ((wxLUA_USE_wxBitmapButton) && (wxLUA_USE_wxButton)) && (wxLUA_USE_wxBitmap) ! // wxBitmap& GetBitmapDisabled() const static int LUACALL wxLua_wxBitmapButton_GetBitmapDisabled(lua_State *L) { --- 255,259 ---- #if ((wxLUA_USE_wxBitmapButton) && (wxLUA_USE_wxButton)) && (wxLUA_USE_wxBitmap) ! // wxBitmap GetBitmapDisabled() const static int LUACALL wxLua_wxBitmapButton_GetBitmapDisabled(lua_State *L) { *************** *** 263,267 **** wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapDisabled ! returns = &self->GetBitmapDisabled(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 263,270 ---- wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapDisabled ! // allocate a new object using the copy constructor ! returns = new wxBitmap(self->GetBitmapDisabled()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 270,274 **** } ! // wxBitmap& GetBitmapFocus() const static int LUACALL wxLua_wxBitmapButton_GetBitmapFocus(lua_State *L) { --- 273,277 ---- } ! // wxBitmap GetBitmapFocus() const static int LUACALL wxLua_wxBitmapButton_GetBitmapFocus(lua_State *L) { *************** *** 278,282 **** wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapFocus ! returns = &self->GetBitmapFocus(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 281,288 ---- wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapFocus ! // allocate a new object using the copy constructor ! returns = new wxBitmap(self->GetBitmapFocus()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 285,289 **** } ! // wxBitmap& GetBitmapLabel() const static int LUACALL wxLua_wxBitmapButton_GetBitmapLabel(lua_State *L) { --- 291,295 ---- } ! // wxBitmap GetBitmapLabel() const static int LUACALL wxLua_wxBitmapButton_GetBitmapLabel(lua_State *L) { *************** *** 293,297 **** wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapLabel ! returns = &self->GetBitmapLabel(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 299,306 ---- wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapLabel ! // allocate a new object using the copy constructor ! returns = new wxBitmap(self->GetBitmapLabel()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 300,304 **** } ! // wxBitmap& GetBitmapSelected() const static int LUACALL wxLua_wxBitmapButton_GetBitmapSelected(lua_State *L) { --- 309,313 ---- } ! // wxBitmap GetBitmapSelected() const static int LUACALL wxLua_wxBitmapButton_GetBitmapSelected(lua_State *L) { *************** *** 308,312 **** wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapSelected ! returns = &self->GetBitmapSelected(); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); --- 317,324 ---- wxBitmapButton * self = (wxBitmapButton *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmapButton); // call GetBitmapSelected ! // allocate a new object using the copy constructor ! returns = new wxBitmap(self->GetBitmapSelected()); ! // add the new object to the tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBitmap *)returns); // push the result datatype wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); *************** *** 315,319 **** } ! // void SetBitmapDisabled(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapDisabled(lua_State *L) { --- 327,331 ---- } ! // void SetBitmapDisabled(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapDisabled(lua_State *L) { *************** *** 329,333 **** } ! // void SetBitmapFocus(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapFocus(lua_State *L) { --- 341,345 ---- } ! // void SetBitmapFocus(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapFocus(lua_State *L) { *************** *** 343,347 **** } ! // void SetBitmapLabel(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapLabel(lua_State *L) { --- 355,359 ---- } ! // void SetBitmapLabel(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapLabel(lua_State *L) { *************** *** 357,361 **** } ! // void SetBitmapSelected(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapSelected(lua_State *L) { --- 369,373 ---- } ! // void SetBitmapSelected(const wxBitmap& bitmap) static int LUACALL wxLua_wxBitmapButton_SetBitmapSelected(lua_State *L) { *************** *** 599,603 **** } ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") static int LUACALL wxLua_wxCheckBox_Create(lua_State *L) { --- 611,615 ---- } ! // bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") static int LUACALL wxLua_wxCheckBox_Create(lua_State *L) { *************** *** 634,676 **** #endif ! ! #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCheckBox) ! // %wxchkver22&!%wxchkver23 %rename IsChecked bool GetValue() const ! static int LUACALL wxLua_wxCheckBox_IsChecked(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxCheckBox * self = (wxCheckBox *)wxlState.GetUserDataType(1, s_wxluatag_wxCheckBox); ! // call GetValue ! returns = self->GetValue(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! #endif ! ! ! #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCheckBox) ! // %wxchkver23 bool IsChecked() const ! static int LUACALL wxLua_wxCheckBox_IsChecked(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxCheckBox * self = (wxCheckBox *)wxlState.GetUserDataType(1, s_wxluatag_wxCheckBox); ! // call IsChecked ! returns = self->IsChecked(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! #endif ! ! // bool GetValue() const static int LUACALL wxLua_wxCheckBox_GetValue(lua_State *L) { --- 646,650 ---- #endif ! // bool GetValue() const static int LUACALL wxLua_wxCheckBox_GetValue(lua_State *L) { *************** *** 732,736 **** } ! // void SetValue(const bool state) static int LUACALL wxLua_wxCheckBox_SetValue(lua_State *L) { --- 706,725 ---- } ! // bool IsChecked() const ! static int LUACALL wxLua_wxCheckBox_IsChecked(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxCheckBox * self = (wxCheckBox *)wxlState.GetUserDataType(1, s_wxluatag_wxCheckBox); ! // call IsChecked ! returns = self->IsChecked(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! // void SetValue(const bool state) static int LUACALL wxLua_wxCheckBox_SetValue(lua_State *L) { *************** *** 777,794 **** #endif - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCheckBox) - { LuaMethod, "IsChecked", wxLua_wxCheckBox_IsChecked, 0, 0, { 0 } }, - #endif - - - #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCheckBox) - { LuaMethod, "IsChecked", wxLua_wxCheckBox_IsChecked, 0, 0, { 0 } }, - #endif - { LuaMethod, "GetValue", wxLua_wxCheckBox_GetValue, 0, 0, { 0 } }, { LuaMethod, "Get3StateValue", wxLua_wxCheckBox_Get3StateValue, 0, 0, { 0 } }, { LuaMethod, "Is3rdStateAllowedForUser", wxLua_wxCheckBox_Is3rdStateAllowedForUser, 0, 0, { 0 } }, { LuaMethod, "Is3State", wxLua_wxCheckBox_Is3State, 0, 0, { 0 } }, { LuaMethod, "SetValue", wxLua_wxCheckBox_SetValue, 1, 1, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "Set3StateValue", wxLua_wxCheckBox_Set3StateValue, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, --- 766,774 ---- #endif { LuaMethod, "GetValue", wxLua_wxCheckBox_GetValue, 0, 0, { 0 } }, { LuaMethod, "Get3StateValue", wxLua_wxCheckBox_Get3StateValue, 0, 0, { 0 } }, { LuaMethod, "Is3rdStateAllowedForUser", wxLua_wxCheckBox_Is3rdStateAllowedForUser, 0, 0, { 0 } }, { LuaMethod, "Is3State", wxLua_wxCheckBox_Is3State, 0, 0, { 0 } }, + { LuaMethod, "IsChecked", wxLua_wxCheckBox_IsChecked, 0, 0, { 0 } }, { LuaMethod, "SetValue", wxLua_wxCheckBox_SetValue, 1, 1, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "Set3StateValue", wxLua_wxCheckBox_Set3StateValue, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, *************** *** 1007,1011 **** } ! // %overload %rename InsertWithClientData int Insert(const wxString& item, int pos, wxClientData *clientData) static int LUACALL wxLua_wxControlWithItems_InsertWithClientData(lua_State *L) { --- 987,991 ---- } ! // %overload %rename InsertWithClientData int Insert(const wxString& item, int pos, wxClientData *clientData) static int LUACALL wxLua_wxControlWithItems_InsertWithClientData(lua_State *L) { *************** *** 1252,1256 **** } ! // bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_Create(lua_State *L) { --- 1232,1236 ---- } ! // bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") static int LUACALL wxLua_wxChoice_Create(lua_State *L) { *************** *** 1287,1291 **** #endif ! // int GetCurrentSelection() const static int LUACALL wxLua_wxChoice_GetCurrentSelection(lua_State *L) { --- 1267,1271 ---- #endif ! // int GetCurrentSelection() const static int LUACALL wxLua_wxChoice_GetCurrentSelection(lua_State *L) { *************** *** 1640,1644 **** } ! // %rename SetMark void SetSelection(long from, long to) static int LUACALL wxLua_wxComboBox_SetMark(lua_State *L) { --- 1620,1624 ---- } ! // %rename SetMark void SetSelection(long from, long to) // wxPython name static int LUACALL wxLua_wxComboBox_SetMark(lua_State *L) { *************** *** 2063,2068 **** #endif - #if (wxLUA_USE_wxListBox) && (wxLUA_USE_wxArrayInt) // %override wxLua_wxListBox_GetSelections // int GetSelections(wxArrayInt& selections) const --- 2043,2060 ---- #endif + // void Deselect(int n) + static int LUACALL wxLua_wxListBox_Deselect(lua_State *L) + { + wxLuaState wxlState(L); + // int n + int n = (int)wxlState.GetNumberType(2); + // get this + wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); + // call Deselect + self->Deselect(n); + + return 0; + } // %override wxLua_wxListBox_GetSelections // int GetSelections(wxArrayInt& selections) const *************** *** 2085,2104 **** } - #endif - - // void Deselect(int n) - static int LUACALL wxLua_wxListBox_Deselect(lua_State *L) - { - wxLuaState wxlState(L); - // int n - int n = (int)wxlState.GetNumberType(2); - // get this - wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); - // call Deselect - self->Deselect(n); - - return 0; - } - // void InsertItems(const wxArrayString_FromLuaTable& items, int pos) static int LUACALL wxLua_wxListBox_InsertItems(lua_State *L) --- 2077,2080 ---- *************** *** 2215,2224 **** #endif - - #if (wxLUA_USE_wxListBox) && (wxLUA_USE_wxArrayInt) - { LuaMethod, "GetSelections", wxLua_wxListBox_GetSelections, 1, 1, { &s_wxluatag_wxArrayInt, 0 } }, - #endif - { LuaMethod, "Deselect", wxLua_wxListBox_Deselect, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "InsertItems", wxLua_wxListBox_InsertItems, 2, 2, { &s_wxluaarg_LuaTable, &s_wxluaarg_Number, 0 } }, { LuaMethod, "IsSelected", wxLua_wxListBox_IsSelected, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 2191,2196 ---- #endif { LuaMethod, "Deselect", wxLua_wxListBox_Deselect, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "GetSelections", wxLua_wxListBox_GetSelections, 0, 0, { 0 } }, { LuaMethod, "InsertItems", wxLua_wxListBox_InsertItems, 2, 2, { &s_wxluaarg_LuaTable, &s_wxluaarg_Number, 0 } }, { LuaMethod, "IsSelected", wxLua_wxListBox_IsSelected, 1, 1, { &s_wxluaarg_Number, 0 } }, *************** *** 2514,2537 **** - #if (wxLUA_USE_wxImageList) && ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxListCtrl)) - // %wxchkver22&!%wxchkver23 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) - static int LUACALL wxLua_wxListCtrl_AssignImageList(lua_State *L) - { - wxLuaState wxlState(L); - // int which - int which = (int)wxlState.GetNumberType(3); - // wxImageList imageList - wxImageList * imageList = (wxImageList *)wxlState.GetUserDataType(2, s_wxluatag_wxImageList); - // get this - wxListCtrl * self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl); - // call SetImageList - self->SetImageList(imageList, which); - - return 0; - } - - #endif - - #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxColourPenBrush) // wxColour GetTextColour() const --- 2486,2489 ---- *************** *** 2678,2682 **** #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect) ! // %rename FindItemAtPos long FindItem(long start, const wxPoint& pt, int direction) static int LUACALL wxLua_wxListCtrl_FindItemAtPos(lua_State *L) { --- 2630,2634 ---- #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect) ! // %overload %rename FindItemAtPos long FindItem(long start, const wxPoint& pt, int direction) static int LUACALL wxLua_wxListCtrl_FindItemAtPos(lua_State *L) { *************** *** 2951,2956 **** } ! // long FindItem(long start, const wxString& str, const bool partial = false) ! static int LUACALL wxLua_wxListCtrl_FindItem(lua_State *L) { wxLuaState wxlState(L); --- 2903,2908 ---- } ! // %overload long FindItem(long start, const wxString& str, const bool partial = false) ! static int LUACALL wxLua_wxListCtrl_FindItem1(lua_State *L) { wxLuaState wxlState(L); *************** *** 2974,2978 **** } ! // %rename FindItemData long FindItem(long start, long data) static int LUACALL wxLua_wxListCtrl_FindItemData(lua_State *L) { --- 2926,2930 ---- } ! // %overload %rename FindItemData long FindItem(long start, long data) static int LUACALL wxLua_wxListCtrl_FindItemData(lua_State *L) { *************** *** 3197,3202 **** } ! // long InsertColumn(long col, wxListItem& info) ! static int LUACALL wxLua_wxListCtrl_InsertColumn(lua_State *L) { wxLuaState wxlState(L); --- 3149,3154 ---- } ! // %overload %rename InsertColumnItem long InsertColumn(long col, wxListItem& info) // wxPython name ! static int LUACALL wxLua_wxListCtrl_InsertColumnItem(lua_State *L) { wxLuaState wxlState(L); *************** *** 3216,3221 **** } ! // %rename InsertColumnItem long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, int width = -1) ! static int LUACALL wxLua_wxListCtrl_InsertColumnItem(lua_State *L) { wxLuaState wxlState(L); --- 3168,3173 ---- } ! // %overload long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, int width = -1) ! static int LUACALL wxLua_wxListCtrl_InsertColumn1(lua_State *L) { wxLuaState wxlState(L); *************** *** 3258,3262 **** } ! // %rename InsertStringItem long InsertItem(long index, const wxString& label) static int LUACALL wxLua_wxListCtrl_InsertStringItem(lua_State *L) { --- 3210,3214 ---- } ! // %rename InsertStringItem long InsertItem(long index, const wxString& label) // wxPython name static int LUACALL wxLua_wxListCtrl_InsertStringItem(lua_State *L) { *************** *** 3277,3281 **** } ! // %rename InsertImageItem long InsertItem(long index, int imageIndex) static int LUACALL wxLua_wxListCtrl_InsertImageItem(lua_State *L) { --- 3229,3233 ---- } ! // %rename InsertImageItem long InsertItem(long index, int imageIndex) // wxPython name static int LUACALL wxLua_wxListCtrl_InsertImageItem(lua_State *L) { *************** *** 3296,3300 **** } ! // %rename InsertImageStringItem long InsertItem(long index, const wxString& label, int imageIndex) static int LUACALL wxLua_wxListCtrl_InsertImageStringItem(lua_State *L) { --- 3248,3252 ---- } ! // %rename InsertImageStringItem long InsertItem(long index, const wxString& label, int imageIndex) // wxPython name static int LUACALL wxLua_wxListCtrl_InsertImageStringItem(lua_State *L) { *************** *** 3391,3395 **** } ! // %rename SetStringItem long SetItem(long index, int col, const wxString& label, int imageId = -1) static int LUACALL wxLua_wxListCtrl_SetStringItem(lua_State *L) { --- 3343,3347 ---- } ! // %rename SetStringItem long SetItem(long index, int col, const wxString& label, int imageId = -1) // wxPython name static int LUACALL wxLua_wxListCtrl_SetStringItem(lua_State *L) { *************** *** 3523,3526 **** --- 3475,3525 ---- } + // %override wxLua_wxListCtrl_SortItems + + static int wxLua_LCF_tag = -1; + static wxLuaState wxLua_LCF_wxlState; + + int wxCALLBACK wxLua_ListCompareFunction(long item1, long item2, long sortData) + { + lua_State *L = wxLua_LCF_wxlState.GetLuaState(); + lua_rawgeti(L, LUA_REGISTRYINDEX, wxLua_LCF_tag); + lua_pushnumber(L, item1); + lua_pushnumber(L, item2); + lua_pushnumber(L, sortData); + wxLua_LCF_wxlState.LuaCall(3, 1); + + int returns = (int)wxLua_LCF_wxlState.GetNumberType(1); + return returns; + } + + // bool SortItems(LuaFunction fnSortCallBack, long data) + static int LUACALL wxLua_wxListCtrl_SortItems(lua_State *L) + { + wxLuaState wxlState(L); + wxLua_LCF_wxlState = wxlState; + long returns; + // long data + long data = (long)wxlState.GetNumberType(3); + // get this + wxListCtrl *self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl); + + lua_pop(L, 1); + // lua sort function, was index 2 is now index 1 + if (lua_isfunction (L, 1)) + wxLua_LCF_tag = luaL_ref(L, LUA_REGISTRYINDEX); // pops it from stack + else + wxlState.terror(wxString::Format(_("wxLua: Expected lua function for parameter %d, but got '%s'."), + 2, wxlState.lua_TypeNameIndex(1).c_str())); + + // call SortItems + returns = self->SortItems(wxLua_ListCompareFunction, data); + wxLua_LCF_wxlState.Destroy(); + wxLua_LCF_tag = -1; + // push the result number + lua_pushnumber(L, returns); + // return the number of parameters + return 1; + } + static int LUACALL wxLua_wxListCtrl_destructor(lua_State *) { *************** *** 3530,3533 **** --- 3529,3572 ---- + // Overloaded function bindings + + #if ((wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect))||(wxLUA_USE_wxListCtrl) + // Overloaded functions for wxLua_wxListCtrl_FindItem + static int LUACALL wxLua_wxListCtrl_FindItem(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + + #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxPointSizeRect) + { LuaMethod, "FindItemAtPos", wxLua_wxListCtrl_FindItemAtPos, 3, 3, { &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluaarg_Number, 0 } }, + #endif + + { LuaMethod, "FindItem", wxLua_wxListCtrl_FindItem1, 3, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "FindItemData", wxLua_wxListCtrl_FindItemData, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + + + #if (wxLUA_USE_wxListCtrl) + // Overloaded functions for wxLua_wxListCtrl_InsertColumn + static int LUACALL wxLua_wxListCtrl_InsertColumn(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "InsertColumnItem", wxLua_wxListCtrl_InsertColumnItem, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxListItem, 0 } }, + { LuaMethod, "InsertColumn", wxLua_wxListCtrl_InsertColumn1, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + *************** *** 3556,3564 **** - #if (wxLUA_USE_wxImageList) && ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxListCtrl)) - { LuaMethod, "AssignImageList", wxLua_wxListCtrl_AssignImageList, 2, 2, { &s_wxluatag_wxImageList, &s_wxluaarg_Number, 0 } }, - #endif - - #if (wxLUA_USE_wxListCtrl) && (wxLUA_USE_wxColourPenBrush) { LuaMethod, "GetTextColour", wxLua_wxListCtrl_GetTextColour, 0, 0, { 0 } }, --- 3595,3598 ---- *************** *** 3588,3592 **** { LuaMethod, "GetItemRect", wxLua_wxListCtrl_GetItemRect, 3, 2, { &s_wxluaarg_Number, &s_wxluatag_wxRect, &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetViewRect", wxLua_wxListCtrl_GetViewRect, 0, 0, { 0 } }, ! { LuaMethod, "HitTest", wxLua_wxListCtrl_HitTest, 2, 2, { &s_wxluatag_wxPoint, &s_wxluaarg_LightUserData, 0 } }, { LuaMethod, "SetItemPosition", wxLua_wxListCtrl_SetItemPosition, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif --- 3622,3626 ---- { LuaMethod, "GetItemRect", wxLua_wxListCtrl_GetItemRect, 3, 2, { &s_wxluaarg_Number, &s_wxluatag_wxRect, &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetViewRect", wxLua_wxListCtrl_GetViewRect, 0, 0, { 0 } }, ! { LuaMethod, "HitTest", wxLua_wxListCtrl_HitTest, 1, 1, { &s_wxluatag_wxPoint, 0 } }, { LuaMethod, "SetItemPosition", wxLua_wxListCtrl_SetItemPosition, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif *************** *** 3619,3624 **** { LuaMethod, "GetSelectedItemCount", wxLua_wxListCtrl_GetSelectedItemCount, 0, 0, { 0 } }, { LuaMethod, "GetTopItem", wxLua_wxListCtrl_GetTopItem, 0, 0, { 0 } }, ! { LuaMethod, "InsertColumn", wxLua_wxListCtrl_InsertColumn, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxListItem, 0 } }, ! { LuaMethod, "InsertColumnItem", wxLua_wxListCtrl_InsertColumnItem, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "InsertItem", wxLua_wxListCtrl_InsertItem, 1, 1, { &s_wxluatag_wxListItem, 0 } }, { LuaMethod, "InsertStringItem", wxLua_wxListCtrl_InsertStringItem, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, --- 3653,3658 ---- { LuaMethod, "GetSelectedItemCount", wxLua_wxListCtrl_GetSelectedItemCount, 0, 0, { 0 } }, { LuaMethod, "GetTopItem", wxLua_wxListCtrl_GetTopItem, 0, 0, { 0 } }, ! { LuaMethod, "InsertColumnItem", wxLua_wxListCtrl_InsertColumnItem, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxListItem, 0 } }, ! { LuaMethod, "InsertColumn", wxLua_wxListCtrl_InsertColumn, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "InsertItem", wxLua_wxListCtrl_InsertItem, 1, 1, { &s_wxluatag_wxListItem, 0 } }, { LuaMethod, "InsertStringItem", wxLua_wxListCtrl_InsertStringItem, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, *************** *** 3636,3639 **** --- 3670,3674 ---- { LuaMethod, "SetSingleStyle", wxLua_wxListCtrl_SetSingleStyle, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "SetWindowStyleFlag", wxLua_wxListCtrl_SetWindowStyleFlag, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "SortItems", wxLua_wxListCtrl_SortItems, 2, 2, { &s_wxluaarg_LuaFunction, &s_wxluaarg_Number, 0 } }, { LuaGetProp, "CountPerPage", wxLua_wxListCtrl_GetCountPerPage, 0, 0, {0} }, { LuaGetProp, "ItemCount", wxLua_wxListCtrl_GetItemCount, 0, 0, {0} }, *************** *** 5104,5109 **** #endif ! // void Enable(bool enable) ! static int LUACALL wxLua_wxRadioBox_Enable(lua_State *L) { wxLuaState wxlState(L); --- 5139,5144 ---- #endif ! // %overload void Enable(bool enable) ! static int LUACALL wxLua_wxRadioBox_Enable1(lua_State *L) { wxLuaState wxlState(L); *************** *** 5118,5122 **** } ! // %rename EnableItem void Enable(int n, bool enable) static int LUACALL wxLua_wxRadioBox_EnableItem(lua_State *L) { --- 5153,5157 ---- } ! // %overload %rename EnableItem void Enable(int n, bool enable) static int LUACALL wxLua_wxRadioBox_EnableItem(lua_State *L) { *************** *** 5257,5262 **** } ! // bool Show(bool show = true) ! static int LUACALL wxLua_wxRadioBox_Show(lua_State *L) { wxLuaState wxlState(L); --- 5292,5297 ---- } ! // %overload bool Show(bool show = true) ! static int LUACALL wxLua_wxRadioBox_Show1(lua_State *L) { wxLuaState wxlState(L); *************** *** 5276,5280 **** } ! // %rename ShowItem bool Show(int item, bool show = true) static int LUACALL wxLua_wxRadioBox_ShowItem(lua_State *L) { --- 5311,5315 ---- } ! // %overload %rename ShowItem bool Show(int item, bool show = true) static int LUACALL wxLua_wxRadioBox_ShowItem(lua_State *L) { *************** *** 5304,5307 **** --- 5339,5377 ---- + // Overloaded function bindings + + #if (wxLUA_USE_wxRadioBox) + // Overloaded functions for wxLua_wxRadioBox_Enable + static int LUACALL wxLua_wxRadioBox_Enable(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "Enable", wxLua_wxRadioBox_Enable1, 1, 1, { &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "EnableItem", wxLua_wxRadioBox_EnableItem, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + + + #if (wxLUA_USE_wxRadioBox) + // Overloaded functions for wxLua_wxRadioBox_Show + static int LUACALL wxLua_wxRadioBox_Show(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "Show", wxLua_wxRadioBox_Show1, 1, 0, { &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "ShowItem", wxLua_wxRadioBox_ShowItem, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + *************** *** 6557,6562 **** } ! // void SetValue(const wxString& text) ! static int LUACALL wxLua_wxSpinCtrl_SetValue(lua_State *L) { wxLuaState wxlState(L); --- 6627,6632 ---- } ! // %overload void SetValue(const wxString& text) ! static int LUACALL wxLua_wxSpinCtrl_SetValue1(lua_State *L) { wxLuaState wxlState(L); *************** *** 6571,6575 **** } ! // %rename SetValueInt void SetValue(int iValue) static int LUACALL wxLua_wxSpinCtrl_SetValueInt(lua_State *L) { --- 6641,6645 ---- } ! // %overload %rename SetValueInt void SetValue(int iValue) static int LUACALL wxLua_wxSpinCtrl_SetValueInt(lua_State *L) { *************** *** 6592,6595 **** --- 6662,6683 ---- + // Overloaded function bindings + + #if (wxLUA_USE_wxSpinCtrl) + // Overloaded functions for wxLua_wxSpinCtrl_SetValue + static int LUACALL wxLua_wxSpinCtrl_SetValue(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "SetValue", wxLua_wxSpinCtrl_SetValue1, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "SetValueInt", wxLua_wxSpinCtrl_SetValueInt, 1, 1, { &s_wxluaarg_Number, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + *************** *** 6727,6733 **** } ! // %override wxLua_wxTextCtrl_HitTestPosition ! // wxTextCtrlHitTestResult HitTestPosition(const wxPoint& pt, long *pos) const ! static int LUACALL wxLua_wxTextCtrl_HitTestPosition(lua_State *L) { wxLuaState wxlState(L); --- 6815,6821 ---- } ! // %override wxLua_wxTextCtrl_HitTestPos ! // wxTextCtrlHitTestResult HitTestPos(const wxPoint& pt, long *pos) const ! static int LUACALL wxLua_wxTextCtrl_HitTestPos(lua_State *L) { wxLuaState wxlState(L); *************** *** 7469,7474 **** #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxTextCtrl) ! { LuaMethod, "HitTest", wxLua_wxTextCtrl_HitTest, 3, 3, { &s_wxluatag_wxPoint, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "HitTestPosition", wxLua_wxTextCtrl_HitTestPosition, 2, 2, { &s_wxluatag_wxPoint, &s_wxluaarg_LightUserData, 0 } }, #endif --- 7557,7562 ---- #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxTextCtrl) ! { LuaMethod, "HitTest", wxLua_wxTextCtrl_HitTest, 1, 1, { &s_wxluatag_wxPoint, 0 } }, ! { LuaMethod, "HitTestPos", wxLua_wxTextCtrl_HitTestPos, 1, 1, { &s_wxluatag_wxPoint, 0 } }, #endif *************** *** 8969,8974 **** } ! // wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) ! static int LUACALL wxLua_wxTreeCtrl_InsertItem(lua_State *L) { wxLuaState wxlState(L); --- 9057,9062 ---- } ! // %overload wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) ! static int LUACALL wxLua_wxTreeCtrl_InsertItem1(lua_State *L) { wxLuaState wxlState(L); *************** *** 9001,9005 **** } ! // %rename InsertItemBefore wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) static int LUACALL wxLua_wxTreeCtrl_InsertItemBefore(lua_State *L) { --- 9089,9093 ---- } ! // %overload %rename InsertItemBefore wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) static int LUACALL wxLua_wxTreeCtrl_InsertItemBefore(lua_State *L) { *************** *** 9397,9400 **** --- 9485,9506 ---- + // Overloaded function bindings + + #if (wxLUA_USE_wxTreeCtrl) + // Overloaded functions for wxLua_wxTreeCtrl_InsertItem + static int LUACALL wxLua_wxTreeCtrl_InsertItem(lua_State *L) + { + // function overload table + static WXLUAMETHOD overloaded_methods[] = + { + { LuaMethod, "InsertItem", wxLua_wxTreeCtrl_InsertItem1, 6, 3, { &s_wxluatag_wxTreeItemId, &s_wxluatag_wxTreeItemId, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxTreeItemData, 0 } }, + { LuaMethod, "InsertItemBefore", wxLua_wxTreeCtrl_InsertItemBefore, 6, 3, { &s_wxluatag_wxTreeItemId, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxTreeItemData, 0 } }, + }; + static int overloaded_methodCount = sizeof(overloaded_methods)/sizeof(overloaded_methods[0]); + wxLuaState wxlState(L); + return wxlState.CallOverloadedFunction(overloaded_methods, overloaded_methodCount); + } + #endif + Index: clipdrag.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/clipdrag.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** clipdrag.cpp 4 May 2006 05:07:03 -0000 1.18 --- clipdrag.cpp 18 May 2006 05:47:39 -0000 1.19 *************** *** 39,59 **** - #if (wxLUA_USE_wxClipboard) && ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxClipboard)) - // %wxchkver25 %static wxClipboard *Get() - static int LUACALL wxLua_wxClipboard_Get(lua_State *L) - { - wxLuaState wxlState(L); - wxClipboard *returns; - // call Get - returns = wxClipboard::Get(); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxClipboard, returns); - - return 1; - } - - #endif - - #if (wxLUA_USE_wxDataObject) && (wxLUA_USE_wxClipboard) // bool AddData( wxDataObject *data ) --- 39,42 ---- *************** *** 224,232 **** static WXLUAMETHOD s_wxClipboard_methods[] = { - #if (wxLUA_USE_wxClipboard) && ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxClipboard)) - { LuaMethod, "Get", wxLua_wxClipboard_Get, 0, 0, { 0 } }, - #endif - - #if (wxLUA_USE_wxDataObject) && (wxLUA_USE_wxClipboard) { LuaMethod, "AddData", wxLua_wxClipboard_AddData, 1, 1, { &s_wxluatag_wxDataObject, 0 } }, --- 207,210 ---- *************** *** 259,263 **** int s_wxluatag_wxDataFormat = -1; ! // wxDataFormat(wxDataFormatId format = wxDF_INVALID) static int LUACALL wxLua_wxDataFormat_constructor(lua_State *L) { --- 237,241 ---- int s_wxluatag_wxDataFormat = -1; ! // %override wxDataFormat(wxDataFormatId format = wxDF_INVALID) static int LUACALL wxLua_wxDataFormat_constructor(lua_State *L) { *************** *** 278,282 **** } ! // %constructor wxDataFormatUser(const wxString &format) static int LUACALL wxLua_wxDataFormatUser_constructor(lua_State *L) { --- 256,260 ---- } ! // %override %constructor wxDataFormatUser(const wxString &format) static int LUACALL wxLua_wxDataFormatUser_constructor(lua_State *L) { *************** *** 370,390 **** } - // %operator bool operator!=(const wxDataFormat& format) const - static int LUACALL wxLua_wxDataFormat_op_ne(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // const wxDataFormat format - const wxDataFormat * format = (const wxDataFormat *)wxlState.GetUserDataType(2, s_wxluatag_wxDataFormat); - // get this - wxDataFormat * self = (wxDataFormat *)wxlState.GetUserDataType(1, s_wxluatag_wxDataFormat); - // call op_ne - returns = (*self)!=(*format); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - static int LUACALL wxLua_wxDataFormat_destructor(lua_State *L) { --- 348,351 ---- *************** *** 425,429 **** { LuaMethod, "SetType", wxLua_wxDataFormat_SetType, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "op_eq", wxLua_wxDataFormat_op_eq, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, - { LuaMethod, "op_ne", wxLua_wxDataFormat_op_ne, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaGetProp, "Id", wxLua_wxDataFormat_GetId, 0, 0, {0} }, { LuaSetProp, "Id", wxLua_wxDataFormat_SetId, 1, 1, {0} }, --- 386,389 ---- *************** *** 609,618 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxDataObject_methods[] = { ! { LuaMethod, "GetAllFormats", wxLua_wxDataObject_GetAllFormats, 2, 1, { &s_wxluatag_wxDataFormat, &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "GetDataHere", wxLua_wxDataObject_GetDataHere, 2, 2, { &s_wxluatag_wxDataFormat, &s_wxluaarg_LightUserData, 0 } }, { LuaMethod, "GetDataSize", wxLua_wxDataObject_GetDataSize, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaMethod, "GetFormatCount", wxLua_wxDataObject_GetFormatCount, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "GetPreferredFormat", wxLua_wxDataObject_GetPreferredFormat, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SetData", wxLua_wxDataObject_SetData, 3, 3, { &s_wxluatag_wxDataFormat, &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } }, { LuaDelete, "wxDataObject", wxLua_wxDataObject_destructor, 0, 0, {0} }, }; --- 569,578 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxDataObject_methods[] = { ! { LuaMethod, "GetAllFormats", wxLua_wxDataObject_GetAllFormats, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "GetDataHere", wxLua_wxDataObject_GetDataHere, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaMethod, "GetDataSize", wxLua_wxDataObject_GetDataSize, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaMethod, "GetFormatCount", wxLua_wxDataObject_GetFormatCount, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "GetPreferredFormat", wxLua_wxDataObject_GetPreferredFormat, 1, 0, { &s_wxluaarg_Enumeration, 0 } }, ! { LuaMethod, "SetData", wxLua_wxDataObject_SetData, 2, 2, { &s_wxluatag_wxDataFormat, &s_wxluaarg_String, 0 } }, { LuaDelete, "wxDataObject", wxLua_wxDataObject_destructor, 0, 0, {0} }, }; *************** *** 781,786 **** { LuaMethod, "SetFormat", wxLua_wxDataObjectSimple_SetFormat, 1, 1, { &s_wxluatag_wxDataFormat, 0 } }, { LuaMethod, "GetDataSize", wxLua_wxDataObjectSimple_GetDataSize, 0, 0, { 0 } }, ! { LuaMethod, "GetDataHere", wxLua_wxDataObjectSimple_GetDataHere, 1, 1, { &s_wxluaarg_LightU... [truncated message content] |
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8015/wxLua/bindings/wxwidgets Modified Files: clipdrag.i config.i controls.i data.i datetime.i event.i file.i gdi.i override.hpp wx_datatypes.lua Log Message: add binding tag for LuaFunction add %overload up to file.i, note static funcs don't work now add SortItems function for wxListCtrl, untested tabs -> spaces Index: config.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/config.i,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** config.i 17 May 2006 05:02:04 -0000 1.11 --- config.i 18 May 2006 05:47:39 -0000 1.12 *************** *** 58,68 **** wxConfigBase::EntryType GetEntryType(const wxString& name) const // %override [bool, string, index] wxConfigBase::GetFirstGroup() ! bool GetFirstGroup(wxString& str, long& index) const // %override [bool, string, index] wxConfigBase::GetFirstEntry() ! bool GetFirstEntry(wxString& str, long& index) const // %override [bool, string, index] wxConfigBase::GetNextGroup(index) ! bool GetNextGroup(wxString& str, long& index) const // %override [bool, string, index] wxConfigBase::GetNextEntry(index) ! bool GetNextEntry(wxString& str, long& index) const unsigned int GetNumberOfEntries(bool bRecursive = false) const unsigned int GetNumberOfGroups(bool bRecursive = false) const --- 58,74 ---- wxConfigBase::EntryType GetEntryType(const wxString& name) const // %override [bool, string, index] wxConfigBase::GetFirstGroup() ! //bool GetFirstGroup(wxString& str, long& index) const ! bool GetFirstGroup() const ! // %override [bool, string, index] wxConfigBase::GetFirstEntry() ! //bool GetFirstEntry(wxString& str, long& index) const ! bool GetFirstEntry() const // %override [bool, string, index] wxConfigBase::GetNextGroup(index) ! //bool GetNextGroup(wxString& str, long& index) const ! bool GetNextGroup() const // %override [bool, string, index] wxConfigBase::GetNextEntry(index) ! //bool GetNextEntry(wxString& str, long& index) const ! bool GetNextEntry(long index) const ! unsigned int GetNumberOfEntries(bool bRecursive = false) const unsigned int GetNumberOfGroups(bool bRecursive = false) const *************** *** 74,94 **** bool IsRecordingDefaults() const ! // Note: wxConfigBase_Read naming convention is same as wxPython, int is long, float is double // %override [string, bool] wxConfigBase::Read(const wxString& key, const wxString& defaultVal = "") ! bool Read(const wxString& key, wxString* str, const wxString& defaultVal = "") const // %override [int, bool] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0) ! %rename ReadInt bool Read(const wxString& key, long* l, long defaultVal = 0) const // %override [double, bool] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0) ! %rename ReadFloat bool Read(const wxString& key, double* d, double defaultVal = 0) const bool RenameEntry(const wxString& oldName, const wxString& newName) bool RenameGroup(const wxString& oldName, const wxString& newName) ! static wxConfigBase* Set(wxConfigBase *pConfig = NULL) ! void SetExpandEnvVars(bool bDoIt = true) void SetPath(const wxString& strPath) void SetRecordDefaults(bool bDoIt = true) ! // Note: wxConfigBase_Write naming convention is same as wxPython, int is long, float is double bool Write(const wxString& key, wxString &value) %rename WriteInt bool Write(const wxString &key, long value) --- 80,102 ---- bool IsRecordingDefaults() const ! // Note: wxConfigBase::Read naming convention is same as wxPython, int is long, float is double // %override [string, bool] wxConfigBase::Read(const wxString& key, const wxString& defaultVal = "") ! //bool Read(const wxString& key, wxString* str, const wxString& defaultVal = "") const ! bool Read(const wxString& key, const wxString& defaultVal = "") const // %override [int, bool] wxConfigBase::ReadInt(const wxString& key, long defaultVal = 0) ! //%rename ReadInt bool Read(const wxString& key, long* l, long defaultVal = 0) const ! %rename ReadInt bool Read(const wxString& key, long defaultVal = 0) const // %override [double, bool] wxConfigBase::ReadFloat(const wxString& key, double defaultVal = 0) ! //%rename ReadFloat bool Read(const wxString& key, double* d, double defaultVal = 0) const ! %rename ReadFloat bool Read(const wxString& key, double defaultVal = 0) const bool RenameEntry(const wxString& oldName, const wxString& newName) bool RenameGroup(const wxString& oldName, const wxString& newName) ! %static wxConfigBase* Set(wxConfigBase *pConfig = NULL) void SetExpandEnvVars(bool bDoIt = true) void SetPath(const wxString& strPath) void SetRecordDefaults(bool bDoIt = true) ! // Note: wxConfigBase::Write naming convention is same as wxPython, int is long, float is double bool Write(const wxString& key, wxString &value) %rename WriteInt bool Write(const wxString &key, long value) *************** *** 105,108 **** --- 113,117 ---- %class %noclassinfo wxConfig, wxConfigBase wxConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = 0) + %endclass *************** *** 112,115 **** --- 121,125 ---- %class %noclassinfo wxFileConfig, wxConfigBase wxFileConfig(const wxString& appName = "", const wxString& vendorName = "", const wxString& localFilename = "", const wxString& globalFilename = "", long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE) //, wxMBConv& conv = wxConvUTF8) + void SetUmask(int mode) %endclass Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wx_datatypes.lua 17 May 2006 22:47:09 -0000 1.30 --- wx_datatypes.lua 18 May 2006 05:47:39 -0000 1.31 *************** *** 63,66 **** --- 63,71 ---- Name = "LPVOID", }, + LuaFunction = { + DefType = "wxtypedef", + Intrinsic = true, + Name = "LuaFunction", + }, LuaTable = { DefType = "wxtypedef", Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** file.i 17 May 2006 05:02:04 -0000 1.11 --- file.i 18 May 2006 05:47:39 -0000 1.12 *************** *** 96,104 **** void AppendDir(const wxString& dir) ! void Assign(const wxFileName& filepath) ! %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) ! %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AssignCwd(const wxString& volume = "") void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE) --- 96,104 ---- void AppendDir(const wxString& dir) ! %overload void Assign(const wxFileName& filepath) ! %overload %rename AssignFullName void Assign(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignVolume void Assign(const wxString& volume, const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignPath void Assign(const wxString& path, const wxString& name, wxPathFormat format = wxPATH_NATIVE) ! %overload %rename AssignPathNameExt void Assign(const wxString& path, const wxString& name, const wxString& ext, wxPathFormat format = wxPATH_NATIVE) void AssignCwd(const wxString& volume = "") void AssignDir(const wxString& dir, wxPathFormat format = wxPATH_NATIVE) *************** *** 167,175 **** void SetVolume(const wxString& volume) // %override [wxString path, wxString name, wxString ext] wxFileName::SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! static void SplitPath(const wxString& fullpath, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path, wxString name, wxString ext] wxFileName::SplitPathVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! %rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxString* volume, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path] wxFileName::SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! static void SplitVolume(const wxString& fullpath, wxString* volume, wxString* path, wxPathFormat format = wxPATH_NATIVE) bool Touch() --- 167,178 ---- void SetVolume(const wxString& volume) // %override [wxString path, wxString name, wxString ext] wxFileName::SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! //static void SplitPath(const wxString& fullpath, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) ! static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path, wxString name, wxString ext] wxFileName::SplitPathVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! //%rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxString* volume, wxString* path, wxString* name, wxString* ext, wxPathFormat format = wxPATH_NATIVE) ! %rename SplitPathVolume static void SplitPath(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) // %override [wxString volume, wxString path] wxFileName::SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) ! //static void SplitVolume(const wxString& fullpath, wxString* volume, wxString* path, wxPathFormat format = wxPATH_NATIVE) ! static void SplitVolume(const wxString& fullpath, wxPathFormat format = wxPATH_NATIVE) bool Touch() *************** *** 188,196 **** %enum wxFile::OpenMode // FIXME! ! %rename wxFileRead read ! %rename wxFileWrite write ! %rename wxFileReadWrite read_write ! %rename wxFileWriteAppend write_append ! %rename wxFileWriteExcl write_excl %endenum --- 191,199 ---- %enum wxFile::OpenMode // FIXME! ! read ! write ! read_write ! write_append ! write_excl %endenum *************** *** 203,210 **** %enum wxFileKind ! wxFILE_KIND_UNKNOWN ! wxFILE_KIND_DISK ! wxFILE_KIND_TERMINAL ! wxFILE_KIND_PIPE %endenum --- 206,213 ---- %enum wxFileKind ! wxFILE_KIND_UNKNOWN ! wxFILE_KIND_DISK ! wxFILE_KIND_TERMINAL ! wxFILE_KIND_PIPE %endenum *************** *** 243,247 **** wxFileOffset Tell() const // %override size_t wxFile::Write(lua string, unsigned int count) ! size_t Write(const void* buffer, unsigned int count) %rename WriteString size_t Write(const wxString &str) %endclass --- 246,251 ---- wxFileOffset Tell() const // %override size_t wxFile::Write(lua string, unsigned int count) ! //size_t Write(const void* buffer, unsigned int count) ! size_t Write(const wxString& buffer, unsigned int count) %rename WriteString size_t Write(const wxString &str) %endclass *************** *** 330,339 **** char Peek() // %override [lua string] wxInputStream::Read(size_t size) ! wxInputStream& Read(void *buffer, size_t size) %rename ReadStream wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const // %override size_t wxInputStream::Unget(lua string, size_t size) ! %rename Unget size_t Ungetch(const char* buffer, size_t size) bool Ungetch(char c) %endclass --- 334,345 ---- char Peek() // %override [lua string] wxInputStream::Read(size_t size) ! //wxInputStream& Read(void *buffer, size_t size) ! wxInputStream& Read(size_t size) %rename ReadStream wxInputStream& Read(wxOutputStream& stream_in) wxFileOffset SeekI(wxFileOffset pos, wxSeekMode mode = wxFromStart) wxFileOffset TellI() const // %override size_t wxInputStream::Unget(lua string, size_t size) ! //%rename Unget size_t Ungetch(const char* buffer, size_t size) ! %rename Unget size_t Ungetch(const wxString& str, size_t size) bool Ungetch(char c) %endclass *************** *** 351,355 **** wxFileOffset TellO() const // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size) ! wxOutputStream& Write(const void *buffer, size_t size) %rename WriteStream wxOutputStream& Write(wxInputStream& stream_in) %endclass --- 357,362 ---- wxFileOffset TellO() const // %override wxOutputStream& wxOutputStream::Write(lua string, size_t size) ! //wxOutputStream& Write(const void *buffer, size_t size) ! wxOutputStream& Write(const wxString& buffer, size_t size) %rename WriteStream wxOutputStream& Write(wxInputStream& stream_in) %endclass Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** gdi.i 17 May 2006 05:02:04 -0000 1.23 --- gdi.i 18 May 2006 05:47:39 -0000 1.24 *************** *** 36,43 **** %overload %operator wxPoint& operator+=(const wxPoint& p) %overload %operator wxPoint& operator-=(const wxPoint& p) ! %overload %operator wxPoint& operator+=(const wxSize& s) ! %overload %operator wxPoint& operator-=(const wxSize& s) ! %overload %operator wxPoint operator+(const wxSize& s) const ! %overload %operator wxPoint operator-(const wxSize& s) const %endclass --- 36,43 ---- %overload %operator wxPoint& operator+=(const wxPoint& p) %overload %operator wxPoint& operator-=(const wxPoint& p) ! %overload %rename op_add_assign_Size %operator wxPoint& operator+=(const wxSize& s) ! %overload %rename op_sub_assign_Size %operator wxPoint& operator-=(const wxSize& s) ! %overload %rename op_add_Size %operator wxPoint operator+(const wxSize& s) const ! %overload %rename op_sub_Size %operator wxPoint operator-(const wxSize& s) const %endclass *************** *** 150,178 **** void Clear() ! wxRegionContain Contains(long x, long y) ! %rename ContainsPoint wxRegionContain Contains(const wxPoint& pt) ! %rename ContainsRect wxRegionContain Contains(const wxRect& rect) ! %rename ContainsRectDim wxRegionContain Contains(long x, long y, long w, long h) wxBitmap ConvertToBitmap() const wxRect GetBox() const // %override [int x, int y, int width, int height] wxRegion::GetBoxCoords() ! %rename GetBoxCoords void GetBox(int &x, int &y, int &width, int &height) ! bool Intersect(long x, long y, long width, long height) ! %rename IntersectRect bool Intersect(const wxRect& rect) ! %rename IntersectRegion bool Intersect(const wxRegion& region) bool IsEmpty() const //%gtk bool Ok() const ! bool Subtract(long x, long y, long width, long height) ! %rename SubtractRect bool Subtract(const wxRect& rect) ! %rename SubtractRegion bool Subtract(const wxRegion& region) bool Offset(wxCoord x, wxCoord y) ! bool Union(long x, long y, long width, long height) ! %rename UnionRect bool Union(const wxRect& rect) ! %rename UnionRegion bool Union(const wxRegion& region) ! %rename UnionBitmap bool Union(const wxBitmap& bmp) ! %rename UnionBitmapTransparent bool Union(const wxBitmap& bmp, const wxColour& transColour, int tolerance = 0) ! bool Xor(long x, long y, long width, long height) ! %rename XorRect bool Xor(const wxRect& rect) ! %rename XorRegion bool Xor(const wxRegion& region) %property=Box, read --- 150,179 ---- void Clear() ! %overload wxRegionContain Contains(long x, long y) ! %overload %rename ContainsPoint wxRegionContain Contains(const wxPoint& pt) ! %overload %rename ContainsRect wxRegionContain Contains(const wxRect& rect) ! %overload %rename ContainsRectDim wxRegionContain Contains(long x, long y, long w, long h) wxBitmap ConvertToBitmap() const wxRect GetBox() const // %override [int x, int y, int width, int height] wxRegion::GetBoxCoords() ! //%rename GetBoxCoords void GetBox(int &x, int &y, int &width, int &height) ! %rename GetBoxCoords void GetBox() ! %overload bool Intersect(long x, long y, long width, long height) ! %overload %rename IntersectRect bool Intersect(const wxRect& rect) ! %overload %rename IntersectRegion bool Intersect(const wxRegion& region) bool IsEmpty() const //%gtk bool Ok() const ! %overload bool Subtract(long x, long y, long width, long height) ! %overload %rename SubtractRect bool Subtract(const wxRect& rect) ! %overload %rename SubtractRegion bool Subtract(const wxRegion& region) bool Offset(wxCoord x, wxCoord y) ! %overload bool Union(long x, long y, long width, long height) ! %overload %rename UnionRect bool Union(const wxRect& rect) ! %overload %rename UnionRegion bool Union(const wxRegion& region) ! %overload %rename UnionBitmap bool Union(const wxBitmap& bmp) ! %overload %rename UnionBitmapTransparent bool Union(const wxBitmap& bmp, const wxColour& transColour, int tolerance = 0) ! %overload bool Xor(long x, long y, long width, long height) ! %overload %rename XorRect bool Xor(const wxRect& rect) ! %overload %rename XorRegion bool Xor(const wxRegion& region) %property=Box, read *************** *** 320,324 **** %define %object wxNullFont ! %rename wxNORMAL_FONT %define %pointer wxLua_wxNORMAL_FONT %rename wxSMALL_FONT %define %pointer wxLua_wxSMALL_FONT %rename wxITALIC_FONT %define %pointer wxLua_wxITALIC_FONT --- 321,325 ---- %define %object wxNullFont ! %rename wxNORMAL_FONT %define %pointer wxLua_wxNORMAL_FONT // hack for wxWidgets >2.7 %rename wxSMALL_FONT %define %pointer wxLua_wxSMALL_FONT %rename wxITALIC_FONT %define %pointer wxLua_wxITALIC_FONT *************** *** 372,375 **** --- 373,377 ---- %class %delete %noclassinfo %encapsulate wxFontEnumerator wxFontEnumerator() + virtual bool EnumerateFacenames( wxFontEncoding encoding = wxFONTENCODING_SYSTEM, bool fixedWidthOnly = false) virtual bool EnumerateEncodings( const wxString &font = "" ) *************** *** 448,452 **** wxColour(const unsigned char red, const unsigned char green, const unsigned char blue) ! %constructor wxNamedColour(const wxString& colourNname) // python compatibility %constructor wxColourCopy(const wxColour& colour) --- 450,454 ---- wxColour(const unsigned char red, const unsigned char green, const unsigned char blue) ! %constructor wxNamedColour(const wxString& colourName) // wxPython compatibility %constructor wxColourCopy(const wxColour& colour) *************** *** 582,588 **** bool IsHatch() const bool Ok() const ! void SetColour(wxColour& colour) ! %rename SetColourString void SetColour(const wxString& colourName) ! %rename SetColourRGB void SetColour(const unsigned char red, const unsigned char green, const unsigned char blue) void SetStipple(const wxBitmap& bitmap) void SetStyle(int style) --- 584,590 ---- bool IsHatch() const bool Ok() const ! %overload void SetColour(wxColour& colour) ! %overload %rename SetColourString void SetColour(const wxString& colourName) ! %overload %rename SetColourRGB void SetColour(const unsigned char red, const unsigned char green, const unsigned char blue) void SetStipple(const wxBitmap& bitmap) void SetStyle(int style) *************** *** 774,778 **** %class %delete wxCursor, wxBitmap // just wxObject in GTK %define %object wxNullCursor ! %rename wxSTANDARD_CURSOR %define %pointer wxLua_wxSTANDARD_CURSOR %rename wxHOURGLASS_CURSOR %define %pointer wxLua_wxHOURGLASS_CURSOR %rename wxCROSS_CURSOR %define %pointer wxLua_wxCROSS_CURSOR --- 776,780 ---- %class %delete wxCursor, wxBitmap // just wxObject in GTK %define %object wxNullCursor ! %rename wxSTANDARD_CURSOR %define %pointer wxLua_wxSTANDARD_CURSOR // hack for wxWidgets >2.7 %rename wxHOURGLASS_CURSOR %define %pointer wxLua_wxHOURGLASS_CURSOR %rename wxCROSS_CURSOR %define %pointer wxLua_wxCROSS_CURSOR *************** *** 813,819 **** %win %constructor wxMaskIndex(const wxBitmap& bitmap, int index) ! bool Create(const wxBitmap& bitmap) ! %rename CreateColour bool Create(const wxBitmap& bitmap, const wxColour& colour) ! %win %rename CreateIndex bool Create(const wxBitmap& bitmap, int index) %endclass --- 815,821 ---- %win %constructor wxMaskIndex(const wxBitmap& bitmap, int index) ! %overload bool Create(const wxBitmap& bitmap) ! %overload %rename CreateColour bool Create(const wxBitmap& bitmap, const wxColour& colour) ! %overload %win %rename CreateIndex bool Create(const wxBitmap& bitmap, int index) %endclass *************** *** 838,844 **** wxImageList(int width, int height, bool mask = true, int initialCount = 1) ! int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap) ! %rename AddWithColourMask int Add(const wxBitmap& bitmap, const wxColour& maskColour) ! %rename AddIcon int Add(const wxIcon& icon) bool Draw(int index, wxDC& dc, int x, int y, int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = false) wxBitmap GetBitmap(int index) const --- 840,846 ---- wxImageList(int width, int height, bool mask = true, int initialCount = 1) ! %overload int Add(const wxBitmap& bitmap, const wxBitmap& mask = wxNullBitmap) ! %overload %rename AddWithColourMask int Add(const wxBitmap& bitmap, const wxColour& maskColour) ! %overload %rename AddIcon int Add(const wxIcon& icon) bool Draw(int index, wxDC& dc, int x, int y, int flags = wxIMAGELIST_DRAW_NORMAL, bool solidBackground = false) wxBitmap GetBitmap(int index) const *************** *** 846,850 **** int GetImageCount() // %override [int width, int height] wxImageList::GetSize(int index) ! void GetSize(int index, int& width, int& height) bool Remove(int index) bool RemoveAll() --- 848,853 ---- int GetImageCount() // %override [int width, int height] wxImageList::GetSize(int index) ! //void GetSize(int index, int& width, int& height) ! void GetSize(int index) bool Remove(int index) bool RemoveAll() *************** *** 951,956 **** void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent) ! void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ! %rename DrawCheckMarkRect void DrawCheckMark(const wxRect &rect) void DrawCircle(wxCoord x, wxCoord y, wxCoord radius) //void DrawCircle(const wxPoint& pt, wxCoord radius) --- 954,959 ---- void DrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) void DrawBitmap(const wxBitmap& bitmap, wxCoord x, wxCoord y, bool transparent) ! %overload void DrawCheckMark(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ! %overload %rename DrawCheckMarkRect void DrawCheckMark(const wxRect &rect) void DrawCircle(wxCoord x, wxCoord y, wxCoord radius) //void DrawCircle(const wxPoint& pt, wxCoord radius) *************** *** 960,969 **** void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double start, double end) void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) ! %rename DrawLabelBitmap void DrawLabel(const wxString& text, const wxBitmap& image, const wxRect& rect, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1) //, wxRect *rectBounding = NULL) ! void DrawLabel(const wxString& text, const wxRect& rect, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1) void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ! //void DrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) %rename DrawLinesList void DrawLines(wxList *points, wxCoord xoffset = 0, wxCoord yoffset = 0) ! //void DrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) %rename DrawPolygonList void DrawPolygon(wxList *points, wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) //void DrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) --- 963,972 ---- void DrawEllipticArc(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double start, double end) void DrawIcon(const wxIcon& icon, wxCoord x, wxCoord y) ! %overload %rename DrawLabelBitmap void DrawLabel(const wxString& text, const wxBitmap& image, const wxRect& rect, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1) //, wxRect *rectBounding = NULL) ! %overload void DrawLabel(const wxString& text, const wxRect& rect, int alignment = wxALIGN_LEFT | wxALIGN_TOP, int indexAccel = -1) void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) ! //void DrawLines(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0) // FIXME add this %rename DrawLinesList void DrawLines(wxList *points, wxCoord xoffset = 0, wxCoord yoffset = 0) ! //void DrawPolygon(int n, wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) // FIXME add this %rename DrawPolygonList void DrawPolygon(wxList *points, wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) //void DrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, int fill_style = wxODDEVEN_RULE) *************** *** 1013,1020 **** void SetBackgroundMode(int mode) void SetBrush(const wxBrush& brush) ! %rename SetClippingRegionXY void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ! void SetClippingRegion(const wxRegion& region) ! //void SetClippingRegion(const wxPoint& pt, const wxSize& sz) ! //void SetClippingRegion(const wxRect& rect) void SetDeviceOrigin(wxCoord x, wxCoord y) void SetFont(const wxFont& font) --- 1016,1023 ---- void SetBackgroundMode(int mode) void SetBrush(const wxBrush& brush) ! %overload %rename SetClippingRegionXYWH void SetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) ! %overload void SetClippingRegion(const wxRegion& region) ! //%overload void SetClippingRegion(const wxPoint& pt, const wxSize& sz) ! //%overload void SetClippingRegion(const wxRect& rect) void SetDeviceOrigin(wxCoord x, wxCoord y) void SetFont(const wxFont& font) *************** *** 1083,1086 **** --- 1086,1090 ---- %class %delete wxScreenDC, wxDC wxScreenDC() + static bool StartDrawingOnTop(wxWindow* window) %rename StartDrawingOnTopRect static bool StartDrawingOnTop(wxRect* rect = NULL) *************** *** 1094,1103 **** %class %delete wxBufferedDC, wxMemoryDC ! wxBufferedDC() ! %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %constructor wxBufferedDCFromBitmap(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) ! void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %rename InitFromBitmap void Init(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass --- 1098,1107 ---- %class %delete wxBufferedDC, wxMemoryDC ! %overload wxBufferedDC() ! %overload %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %overload %constructor wxBufferedDCFromBitmap(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) ! %overload void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) ! %overload %rename InitFromBitmap void Init(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass *************** *** 1108,1113 **** %class %delete wxBufferedPaintDC, wxBufferedDC ! wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA) ! %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass --- 1112,1117 ---- %class %delete wxBufferedPaintDC, wxBufferedDC ! %overload wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA) ! %overload %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) %endclass *************** *** 1132,1144 **** %class %noclassinfo wxCaret wxCaret(wxWindow* window, const wxSize& size) ! %constructor wxDefaultCaret() ! %constructor wxCaretFromWidthHeight(wxWindow* window, int width, int height) ! bool Create(wxWindow* window, const wxSize& size) ! %rename CreateFromWidthHeight bool Create(wxWindow* window, int width, int height) static int GetBlinkTime() ! %rename GetPositionXY void GetPosition(int *x, int *y) wxPoint GetPosition() ! %rename GetSizeWH void GetSize(int *x, int *y) wxSize GetSize() wxWindow *GetWindow() --- 1136,1152 ---- %class %noclassinfo wxCaret wxCaret(wxWindow* window, const wxSize& size) ! %constructor wxCaretDefault() ! %constructor wxCaretFromWH(wxWindow* window, int width, int height) ! %overload bool Create(wxWindow* window, const wxSize& size) ! %overload %rename CreateFromWH bool Create(wxWindow* window, int width, int height) static int GetBlinkTime() ! // %override [int x, int y] wxCaret::GetPositionXY() ! //%rename GetPositionXY void GetPosition(int *x, int *y) ! %rename GetPositionXY void GetPosition() wxPoint GetPosition() ! // %override [int x, int y] wxCaret::GetSizeWH void GetSize() ! //%rename GetSizeWH void GetSize(int *x, int *y) ! %rename GetSizeWH void GetSize() wxSize GetSize() wxWindow *GetWindow() *************** *** 1146,1154 **** bool IsOk() bool IsVisible() ! %rename MoveXY void Move(int x, int y) ! void Move(const wxPoint& pt) static void SetBlinkTime(int ms) ! %rename SetSizeWH void SetSize(int width, int height) ! void SetSize(const wxSize& size) void Show(bool show = true) --- 1154,1162 ---- bool IsOk() bool IsVisible() ! %overload %rename MoveXY void Move(int x, int y) ! %overload void Move(const wxPoint& pt) static void SetBlinkTime(int ms) ! %overload %rename SetSizeWH void SetSize(int width, int height) ! %overload void SetSize(const wxSize& size) void Show(bool show = true) Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** override.hpp 17 May 2006 05:02:04 -0000 1.40 --- override.hpp 18 May 2006 05:47:39 -0000 1.41 *************** *** 681,684 **** --- 681,732 ---- %end + %override wxLua_wxListCtrl_SortItems + + static int wxLua_LCF_tag = -1; + static wxLuaState wxLua_LCF_wxlState; + + int wxCALLBACK wxLua_ListCompareFunction(long item1, long item2, long sortData) + { + lua_State *L = wxLua_LCF_wxlState.GetLuaState(); + lua_rawgeti(L, LUA_REGISTRYINDEX, wxLua_LCF_tag); + lua_pushnumber(L, item1); + lua_pushnumber(L, item2); + lua_pushnumber(L, sortData); + wxLua_LCF_wxlState.LuaCall(3, 1); + + int returns = (int)wxLua_LCF_wxlState.GetNumberType(1); + return returns; + } + + // bool SortItems(LuaFunction fnSortCallBack, long data) + static int LUACALL wxLua_wxListCtrl_SortItems(lua_State *L) + { + wxLuaState wxlState(L); + wxLua_LCF_wxlState = wxlState; + long returns; + // long data + long data = (long)wxlState.GetNumberType(3); + // get this + wxListCtrl *self = (wxListCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxListCtrl); + + lua_pop(L, 1); + // lua sort function, was index 2 is now index 1 + if (lua_isfunction (L, 1)) + wxLua_LCF_tag = luaL_ref(L, LUA_REGISTRYINDEX); // pops it from stack + else + wxlState.terror(wxString::Format(_("wxLua: Expected lua function for parameter %d, but got '%s'."), + 2, wxlState.lua_TypeNameIndex(1).c_str())); + + // call SortItems + returns = self->SortItems(wxLua_ListCompareFunction, data); + wxLua_LCF_wxlState.Destroy(); + wxLua_LCF_tag = -1; + // push the result number + lua_pushnumber(L, returns); + // return the number of parameters + return 1; + } + %end + %override wxLua_wxTextCtrl_GetSelection // virtual void GetSelection(long* from, long* to) *************** *** 724,730 **** %end ! %override wxLua_wxTextCtrl_HitTestPosition ! // wxTextCtrlHitTestResult HitTestPosition(const wxPoint& pt, long *pos) const ! static int LUACALL wxLua_wxTextCtrl_HitTestPosition(lua_State *L) { wxLuaState wxlState(L); --- 772,778 ---- %end ! %override wxLua_wxTextCtrl_HitTestPos ! // wxTextCtrlHitTestResult HitTestPos(const wxPoint& pt, long *pos) const ! static int LUACALL wxLua_wxTextCtrl_HitTestPos(lua_State *L) { wxLuaState wxlState(L); Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** datetime.i 17 May 2006 05:02:04 -0000 1.15 --- datetime.i 18 May 2006 05:47:39 -0000 1.16 *************** *** 131,135 **** %typedef wxDateTime::wxDateTime_t unsigned short ! %class %delete %noclassinfo %encapsulate wxDateTime // FIXME not updated %define %object wxDefaultDateTime --- 131,135 ---- %typedef wxDateTime::wxDateTime_t unsigned short ! %class %delete %noclassinfo %encapsulate wxDateTime %define %object wxDefaultDateTime *************** *** 189,196 **** wxDateTime& MakeGMT(bool noDST = false) int IsDST(wxDateTime::Country country = wxDateTime::Country_Default) const ! wxDateTime& Add(const wxTimeSpan& diff) ! wxDateTime& Subtract(const wxTimeSpan& diff) ! %rename AddDateSpan wxDateTime& Add(const wxDateSpan& diff) ! %rename SubtractDateSpan wxDateTime& Subtract(const wxDateSpan& diff) wxString ParseRfc822Date(wxString date) wxString ParseFormat(wxString date, wxString format = "%c", const wxDateTime& dateDef = wxDefaultDateTime) --- 189,196 ---- wxDateTime& MakeGMT(bool noDST = false) int IsDST(wxDateTime::Country country = wxDateTime::Country_Default) const ! %overload wxDateTime& Add(const wxTimeSpan& diff) ! %overload %rename AddDateSpan wxDateTime& Add(const wxDateSpan& diff) ! %overload wxDateTime& Subtract(const wxTimeSpan& diff) ! %overload %rename SubtractDateSpan wxDateTime& Subtract(const wxDateSpan& diff) wxString ParseRfc822Date(wxString date) wxString ParseFormat(wxString date, wxString format = "%c", const wxDateTime& dateDef = wxDefaultDateTime) Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** controls.i 17 May 2006 05:02:04 -0000 1.18 --- controls.i 18 May 2006 05:47:39 -0000 1.19 *************** *** 26,34 **** bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton") ! static wxSize GetDefaultSize() void SetDefault() ! //wxString GetLabel() const in wxWindow ! //void SetLabel(const wxString& label) in wxWindow %property=DefaultSize, read --- 26,34 ---- bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton") ! static wxSize GetDefaultSize() // static is ok, use on existing button void SetDefault() ! //wxString GetLabel() const // in wxWindow ! //void SetLabel(const wxString& label) // in wxWindow %property=DefaultSize, read *************** *** 45,57 **** wxBitmapButton( wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") ! bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") ! wxBitmap& GetBitmapDisabled() const ! wxBitmap& GetBitmapFocus() const ! wxBitmap& GetBitmapLabel() const ! wxBitmap& GetBitmapSelected() const ! void SetBitmapDisabled(const wxBitmap& bitmap) ! void SetBitmapFocus(const wxBitmap& bitmap) ! void SetBitmapLabel(const wxBitmap& bitmap) ! void SetBitmapSelected(const wxBitmap& bitmap) %property=BitmapDisabled, read, write --- 45,57 ---- wxBitmapButton( wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") ! bool Create(wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton") ! wxBitmap GetBitmapDisabled() const ! wxBitmap GetBitmapFocus() const ! wxBitmap GetBitmapLabel() const ! wxBitmap GetBitmapSelected() const ! void SetBitmapDisabled(const wxBitmap& bitmap) ! void SetBitmapFocus(const wxBitmap& bitmap) ! void SetBitmapLabel(const wxBitmap& bitmap) ! void SetBitmapSelected(const wxBitmap& bitmap) %property=BitmapDisabled, read, write *************** *** 78,83 **** bool GetValue() const ! //wxString GetLabel() const in wxWindow ! //void SetLabel(const wxString& label) in wxWindow %endclass --- 78,83 ---- bool GetValue() const ! //wxString GetLabel() const // in wxWindow ! //void SetLabel(const wxString& label) // in wxWindow %endclass *************** *** 104,115 **** wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") ! bool GetValue() const wxCheckBoxState Get3StateValue() const bool Is3rdStateAllowedForUser() const bool Is3State() const ! %wxchkver22&!%wxchkver23 %rename IsChecked bool GetValue() const ! %wxchkver23 bool IsChecked() const ! void SetValue(const bool state) void Set3StateValue(const wxCheckBoxState state) --- 104,114 ---- wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox") ! bool GetValue() const wxCheckBoxState Get3StateValue() const bool Is3rdStateAllowedForUser() const bool Is3State() const ! bool IsChecked() const ! void SetValue(const bool state) void Set3StateValue(const wxCheckBoxState state) *************** *** 142,151 **** wxString GetString(int n) const wxString GetStringSelection() const - %overload int Insert(const wxString& item, int pos) //int Insert(const wxString& item, int pos, void *clientData) ! %overload %rename InsertWithClientData int Insert(const wxString& item, int pos, wxClientData *clientData) bool IsEmpty() const ! // int Number() const obsolete use GetCount() void Select(int n) //void SetClientData(int n, void *data) --- 141,149 ---- wxString GetString(int n) const wxString GetStringSelection() const %overload int Insert(const wxString& item, int pos) //int Insert(const wxString& item, int pos, void *clientData) ! %overload %rename InsertWithClientData int Insert(const wxString& item, int pos, wxClientData *clientData) bool IsEmpty() const ! // int Number() const // obsolete since 2.2 use GetCount() void Select(int n) //void SetClientData(int n, void *data) *************** *** 172,179 **** wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! int GetCurrentSelection() const ! //int GetColumns() const // Motif only but returns 1 otherwise ! //void SetColumns(int n = 1) %endclass --- 170,177 ---- wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! int GetCurrentSelection() const ! //int GetColumns() const // Motif only but returns 1 otherwise ! //void SetColumns(int n = 1) %endclass *************** *** 212,216 **** void SetInsertionPoint(long pos) void SetInsertionPointEnd() ! %rename SetMark void SetSelection(long from, long to) void SetValue(const wxString& text) void Undo() --- 210,214 ---- void SetInsertionPoint(long pos) void SetInsertionPointEnd() ! %rename SetMark void SetSelection(long from, long to) // wxPython name void SetValue(const wxString& text) void Undo() *************** *** 278,282 **** void Deselect(int n) // %override [lua table of int selections] wxListBox::GetSelections() ! int GetSelections(wxArrayInt& selections) const //void InsertItems(int nItems, const wxString items[], int pos) void InsertItems(const wxArrayString_FromLuaTable& items, int pos) --- 276,281 ---- void Deselect(int n) // %override [lua table of int selections] wxListBox::GetSelections() ! //int GetSelections(wxArrayInt& selections) const ! int GetSelections() const //void InsertItems(int nItems, const wxString items[], int pos) void InsertItems(const wxArrayString_FromLuaTable& items, int pos) *************** *** 319,323 **** %define wxLC_AUTOARRANGE %define wxLC_EDIT_LABELS ! %wxchkver23 %define wxLC_HRULES %define wxLC_ICON %define wxLC_LIST --- 318,322 ---- %define wxLC_AUTOARRANGE %define wxLC_EDIT_LABELS ! %define wxLC_HRULES %define wxLC_ICON %define wxLC_LIST *************** *** 333,337 **** %define wxLC_SORT_DESCENDING %define wxLC_USER_TEXT ! %wxchkver23 %define wxLC_VRULES %define wxLIST_ALIGN_DEFAULT --- 332,336 ---- %define wxLC_SORT_DESCENDING %define wxLC_USER_TEXT ! %define wxLC_VRULES %define wxLIST_ALIGN_DEFAULT *************** *** 381,385 **** bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! %wxchkver22&!%wxchkver23 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) %wxchkver23 void AssignImageList(wxImageList *imageList, int which) void ClearAll() --- 380,384 ---- bool Arrange(int flag = wxLIST_ALIGN_DEFAULT) ! //%wxchkver22&!%wxchkver23 %rename AssignImageList void SetImageList(wxImageList *imageList, int which) %wxchkver23 void AssignImageList(wxImageList *imageList, int which) void ClearAll() *************** *** 390,396 **** void EditLabel(long item) bool EnsureVisible(long item) ! long FindItem(long start, const wxString& str, const bool partial = false) ! %rename FindItemData long FindItem(long start, long data) ! %rename FindItemAtPos long FindItem(long start, const wxPoint& pt, int direction) bool GetColumn(int col, wxListItem& item) const int GetColumnCount() const --- 389,395 ---- void EditLabel(long item) bool EnsureVisible(long item) ! %overload long FindItem(long start, const wxString& str, const bool partial = false) ! %overload %rename FindItemData long FindItem(long start, long data) ! %overload %rename FindItemAtPos long FindItem(long start, const wxPoint& pt, int direction) bool GetColumn(int col, wxListItem& item) const int GetColumnCount() const *************** *** 415,425 **** wxRect GetViewRect() const // %override [long, int flags] wxListCtrl::HitTest(const wxPoint& point) ! long HitTest(const wxPoint& point, int& flags) ! long InsertColumn(long col, wxListItem& info) ! %rename InsertColumnItem long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, int width = -1) long InsertItem(wxListItem& info) ! %rename InsertStringItem long InsertItem(long index, const wxString& label) ! %rename InsertImageItem long InsertItem(long index, int imageIndex) ! %rename InsertImageStringItem long InsertItem(long index, const wxString& label, int imageIndex) //virtual wxListItemAttr * OnGetItemAttr(long item) const //virtual int OnGetItemImage(long item) --- 414,425 ---- wxRect GetViewRect() const // %override [long, int flags] wxListCtrl::HitTest(const wxPoint& point) ! //long HitTest(const wxPoint& point, int& flags) ! long HitTest(const wxPoint& point) ! %overload %rename InsertColumnItem long InsertColumn(long col, wxListItem& info) // wxPython name ! %overload long InsertColumn(long col, const wxString& heading, int format = wxLIST_FORMAT_LEFT, int width = -1) long InsertItem(wxListItem& info) ! %rename InsertStringItem long InsertItem(long index, const wxString& label) // wxPython name ! %rename InsertImageItem long InsertItem(long index, int imageIndex) // wxPython name ! %rename InsertImageStringItem long InsertItem(long index, const wxString& label, int imageIndex) // wxPython name //virtual wxListItemAttr * OnGetItemAttr(long item) const //virtual int OnGetItemImage(long item) *************** *** 433,437 **** void SetImageList(wxImageList* imageList, int which) bool SetItem(wxListItem& info) ! %rename SetStringItem long SetItem(long index, int col, const wxString& label, int imageId = -1) void SetItemBackgroundColour(long item, const wxColour& col) //void SetItemCount(long count) --- 433,437 ---- void SetImageList(wxImageList* imageList, int which) bool SetItem(wxListItem& info) ! %rename SetStringItem long SetItem(long index, int col, const wxString& label, int imageId = -1) // wxPython name void SetItemBackgroundColour(long item, const wxColour& col) //void SetItemCount(long count) *************** *** 445,449 **** void SetTextColour(const wxColour& col) void SetWindowStyleFlag(long style) ! //bool SortItems(wxListCtrlCompare fnSortCallBack, long data) FIXME add %property=CountPerPage, read --- 445,451 ---- void SetTextColour(const wxColour& col) void SetWindowStyleFlag(long style) ! // %overload bool SortItems(lua function(long item1, long item2, long sortData) returning int, long data) ! //bool SortItems(wxListCtrlCompare fnSortCallBack, long data) ! bool SortItems(LuaFunction fnSortCallBack, long data) %property=CountPerPage, read *************** *** 624,628 **** wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! // these are marked deprecated in 2.6, use wxControl::Get/SetLabel //wxString GetLabel() const //void SetLabel(const wxString& label) --- 626,630 ---- wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! // these are marked deprecated in 2.6, use wxControl::Get/SetLabel/String //wxString GetLabel() const //void SetLabel(const wxString& label) *************** *** 631,636 **** bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! void Enable(bool enable) ! %rename EnableItem void Enable(int n, bool enable) int FindString(const wxString& string) const int GetCount() const --- 633,638 ---- bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") ! %overload void Enable(bool enable) ! %overload %rename EnableItem void Enable(int n, bool enable) int FindString(const wxString& string) const int GetCount() const *************** *** 641,646 **** void SetSelection(int n) void SetStringSelection(const wxString& string) ! bool Show(bool show = true) ! %rename ShowItem bool Show(int item, bool show = true) %property=Count, read --- 643,648 ---- void SetSelection(int n) void SetStringSelection(const wxString& string) ! %overload bool Show(bool show = true) ! %overload %rename ShowItem bool Show(int item, bool show = true) %property=Count, read *************** *** 824,829 **** void SetRange(int minVal, int maxVal) void SetSelection(long from, long to) ! void SetValue(const wxString& text) ! %rename SetValueInt void SetValue(int iValue) %property=Max, read --- 826,831 ---- void SetRange(int minVal, int maxVal) void SetSelection(long from, long to) ! %overload void SetValue(const wxString& text) ! %overload %rename SetValueInt void SetValue(int iValue) %property=Max, read *************** *** 902,908 **** wxString GetValue() const // %override [wxTextCtrlHitTestResult, int col, int row] wxTextCtrl::HitTest(const wxPoint& pt) ! wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const ! // %override [wxTextCtrlHitTestResult, int pos] wxTextCtrl::HitTestPosition(const wxPoint& pt) ! %rename HitTestPosition wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const bool IsEditable() const bool IsModified() const --- 904,912 ---- wxString GetValue() const // %override [wxTextCtrlHitTestResult, int col, int row] wxTextCtrl::HitTest(const wxPoint& pt) ! //wxTextCtrlHitTestResult HitTest(const wxPoint& pt, wxTextCoord *col, wxTextCoord *row) const ! wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const ! // %override [wxTextCtrlHitTestResult, int pos] wxTextCtrl::HitTestPos(const wxPoint& pt) ! //%rename HitTestPos wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const ! %rename HitTestPos wxTextCtrlHitTestResult HitTest(const wxPoint& pt) const bool IsEditable() const bool IsModified() const *************** *** 1091,1096 **** // %override [wxTreeItemId, int flags] wxTreeCtrl::HitTest(const wxPoint& point) wxTreeItemId HitTest(const wxPoint& point, int& flags) ! wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) ! %rename InsertItemBefore wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) bool IsBold(const wxTreeItemId& item) const bool IsExpanded(const wxTreeItemId& item) const --- 1095,1100 ---- // %override [wxTreeItemId, int flags] wxTreeCtrl::HitTest(const wxPoint& point) wxTreeItemId HitTest(const wxPoint& point, int& flags) ! %overload wxTreeItemId InsertItem(const wxTreeItemId& parent, const wxTreeItemId& previous, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) ! %overload %rename InsertItemBefore wxTreeItemId InsertItem(const wxTreeItemId& parent, size_t before, const wxString& text, int image = -1, int selImage = -1, wxTreeItemData* data = NULL) bool IsBold(const wxTreeItemId& item) const bool IsExpanded(const wxTreeItemId& item) const Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** clipdrag.i 17 May 2006 05:02:04 -0000 1.17 --- clipdrag.i 18 May 2006 05:47:39 -0000 1.18 *************** *** 19,23 **** %class wxClipboard, wxObject !%wxchkver25 %define %pointer wxTheClipboard ! %wxchkver25 %static wxClipboard *Get() // wxClipboard() use global clipboard only --- 19,23 ---- %class wxClipboard, wxObject !%wxchkver25 %define %pointer wxTheClipboard ! %wxchkver25 %staticonly wxClipboard *Get() // wxClipboard() use global clipboard only *************** *** 70,75 **** %define %object wxFormatInvalid ! wxDataFormat(wxDataFormatId format = wxDF_INVALID) ! %constructor wxDataFormatUser(const wxString &format) wxString GetId() const int GetType() const // returns wxDataFormatId, but it's just an int and msw differs --- 70,76 ---- %define %object wxFormatInvalid ! %override wxDataFormat(wxDataFormatId format = wxDF_INVALID) ! %override %constructor wxDataFormatUser(const wxString &format) ! wxString GetId() const int GetType() const // returns wxDataFormatId, but it's just an int and msw differs *************** *** 78,82 **** %operator bool operator==(const wxDataFormat& format) const - %operator bool operator!=(const wxDataFormat& format) const %property=Id, read, write --- 79,82 ---- *************** *** 96,108 **** // %override [lua table of wxDataFormat objects] wxDataObject::GetAllFormats(wxDataObject::Direction dir = wxDataObject) ! virtual void GetAllFormats(wxDataFormat *formats, wxDataObject::Direction dir = wxDataObject::Get) const ! // %override [bool, lua string] wxDataObject::GetDataHere(const wxDataFormat& format) ! virtual bool GetDataHere(const wxDataFormat& format, void *buf) const virtual int GetDataSize(const wxDataFormat& format) const virtual int GetFormatCount(wxDataObject::Direction dir = wxDataObject::Get) const virtual wxDataFormat GetPreferredFormat(wxDataObject::Direction dir = wxDataObject::Get) const // %override bool wxDataObject::SetData(const wxDataFormat& format, lua string) ! virtual bool SetData(const wxDataFormat& format, int len, const void *buf) %endclass --- 96,110 ---- // %override [lua table of wxDataFormat objects] wxDataObject::GetAllFormats(wxDataObject::Direction dir = wxDataObject) ! //virtual void GetAllFormats(wxDataFormat *formats, wxDataObject::Direction dir = wxDataObject::Get) const ! virtual void GetAllFormats(wxDataObject::Direction dir = wxDataObject::Get) const // %override [bool, lua string] wxDataObject::GetDataHere(const wxDataFormat& format) ! //virtual bool GetDataHere(const wxDataFormat& format, void *buf) const ! virtual bool GetDataHere(const wxDataFormat& format) const virtual int GetDataSize(const wxDataFormat& format) const virtual int GetFormatCount(wxDataObject::Direction dir = wxDataObject::Get) const virtual wxDataFormat GetPreferredFormat(wxDataObject::Direction dir = wxDataObject::Get) const // %override bool wxDataObject::SetData(const wxDataFormat& format, lua string) ! //virtual bool SetData(const wxDataFormat& format, int len, const void *buf) ! virtual bool SetData(const wxDataFormat& format, const wxString& str) %endclass *************** *** 117,123 **** virtual size_t GetDataSize() const // %override [bool, lua string] wxDataObjectSimple::GetDataHere() ! virtual bool GetDataHere(void *buf) const // %override bool wxDataObjectSimple::SetData(lua string) ! virtual bool SetData(size_t len, const void *buf) %property=DataSize, read --- 119,127 ---- virtual size_t GetDataSize() const // %override [bool, lua string] wxDataObjectSimple::GetDataHere() ! //virtual bool GetDataHere(void *buf) const ! virtual bool GetDataHere() const // %override bool wxDataObjectSimple::SetData(lua string) ! //virtual bool SetData(size_t len, const void *buf) ! virtual bool SetData(const wxString& str) %property=DataSize, read *************** *** 283,286 **** --- 287,291 ---- ... [truncated message content] |
|
From: John L. <jr...@us...> - 2006-05-18 05:47:50
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8015/wxLua/modules/wxlua/include Modified Files: wxlbind.h Log Message: add binding tag for LuaFunction add %overload up to file.i, note static funcs don't work now add SortItems function for wxListCtrl, untested tabs -> spaces Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxlbind.h 14 May 2006 17:45:05 -0000 1.17 --- wxlbind.h 18 May 2006 05:47:40 -0000 1.18 *************** *** 70,74 **** extern int s_wxluaarg_UserData; extern int s_wxluaarg_LuaTable; ! struct WXLUACLASS // defines a LUA class interface --- 70,74 ---- extern int s_wxluaarg_UserData; extern int s_wxluaarg_LuaTable; ! extern int s_wxluaarg_LuaFunction; struct WXLUACLASS // defines a LUA class interface |
|
From: John L. <jr...@us...> - 2006-05-18 05:47:44
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv8015/wxLua/bindings Modified Files: genwxbind.lua Log Message: add binding tag for LuaFunction add %overload up to file.i, note static funcs don't work now add SortItems function for wxListCtrl, untested tabs -> spaces Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** genwxbind.lua 17 May 2006 22:47:09 -0000 1.63 --- genwxbind.lua 18 May 2006 05:47:39 -0000 1.64 *************** *** 215,218 **** --- 215,219 ---- dataTypes["wxArrayInt_FromLuaTable"] = AllocDataType("wxArrayInt_FromLuaTable", "wxtypedef", true) dataTypes["LuaTable"] = AllocDataType("LuaTable", "wxtypedef", true) + dataTypes["LuaFunction"] = AllocDataType("LuaFunction", "wxtypedef", true) -- data type attributes that can precede a data type *************** *** 3134,3137 **** --- 3135,3144 ---- argItem = "YOU MUST OVERLOAD THIS FUNCTION " declare = "YOU MUST OVERLOAD THIS FUNCTION " + elseif argType == "LuaFunction" then + -- THIS MUST BE AN OVERLOAD AND HANDLED THERE, we just set overload_argList + -- the code genererated here is nonsense + overload_argList = overload_argList.."&s_wxluaarg_LuaFunction, " + argItem = "YOU MUST OVERLOAD THIS FUNCTION " + declare = "YOU MUST OVERLOAD THIS FUNCTION " elseif (indirectionCount == 1) and (argPtr == "[]") then argTypeWithAttrib = argTypeWithAttrib.." *" |
|
From: John L. <jr...@us...> - 2006-05-17 22:47:20
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27493/wxLua/build/msw Modified Files: wxLua.dsw Log Message: change enum wxClass::XXX to be accessed as wxClass_XXX added %staticonly keyword for classes that only have static members Index: wxLua.dsw =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/wxLua.dsw,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxLua.dsw 20 Apr 2006 01:10:58 -0000 1.10 --- wxLua.dsw 17 May 2006 22:47:09 -0000 1.11 *************** *** 55,61 **** End Project Dependency Begin Project Dependency - Project_Dep_Name mod_wxbindstc - End Project Dependency - Begin Project Dependency Project_Dep_Name mod_wxlua End Project Dependency --- 55,58 ---- *************** *** 151,155 **** ############################################################################### ! Project: "mod_lua_lib"=..\..\modules\build\msw\modules_mod_lua_lib.dsp - Package Owner=<4> Package=<5> --- 148,152 ---- ############################################################################### ! Project: "mod_wxluac"=..\..\modules\build\msw\modules_mod_wxluac.dsp - Package Owner=<4> Package=<5> *************** *** 163,167 **** ############################################################################### ! Project: "mod_wxbind"=..\..\modules\build\msw\modules_mod_wxbind.dsp - Package Owner=<4> Package=<5> --- 160,164 ---- ############################################################################### ! Project: "mod_lua_lib"=..\..\modules\build\msw\modules_mod_lua_lib.dsp - Package Owner=<4> Package=<5> *************** *** 175,179 **** ############################################################################### ! Project: "mod_wxbindstc"=..\..\modules\build\msw\modules_mod_wxbindstc.dsp - Package Owner=<4> Package=<5> --- 172,176 ---- ############################################################################### ! Project: "mod_wxbind"=..\..\modules\build\msw\modules_mod_wxbind.dsp - Package Owner=<4> Package=<5> *************** *** 187,191 **** ############################################################################### ! Project: "mod_wxlua"=..\..\modules\build\msw\modules_mod_wxlua.dsp - Package Owner=<4> Package=<5> --- 184,188 ---- ############################################################################### ! Project: "mod_wxbindstc"=..\..\modules\build\msw\modules_mod_wxbindstc.dsp - Package Owner=<4> Package=<5> *************** *** 199,203 **** ############################################################################### ! Project: "mod_wxluac"=..\..\modules\build\msw\modules_mod_wxluac.dsp - Package Owner=<4> Package=<5> --- 196,200 ---- ############################################################################### ! Project: "mod_wxlua"=..\..\modules\build\msw\modules_mod_wxlua.dsp - Package Owner=<4> Package=<5> |
|
From: John L. <jr...@us...> - 2006-05-17 22:47:20
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27493/wxLua/bindings/wxwidgets Modified Files: appframe.i wx_datatypes.lua Log Message: change enum wxClass::XXX to be accessed as wxClass_XXX added %staticonly keyword for classes that only have static members Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** appframe.i 17 May 2006 05:02:04 -0000 1.16 --- appframe.i 17 May 2006 22:47:09 -0000 1.17 *************** *** 24,28 **** %class wxApp, wxEvtHandler ! // wxApp() NO CONSTRUCTOR! the wxApp is created in C++ // These two are pushed into lua by C++ at startup as table arg = { argv } --- 24,28 ---- %class wxApp, wxEvtHandler ! // wxApp() NO CONSTRUCTOR! the wxApp is created in C++, use wxGetApp() // These two are pushed into lua by C++ at startup as table arg = { argv } *************** *** 35,39 **** // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent wxString GetAppName() const ! %wxchkver22&!%wxchkver25&%win bool GetAuto3D() const wxString GetClassName() const bool GetExitOnFrameDelete() const --- 35,39 ---- // virtual int FilterEvent(wxEvent& event) too dangerous, use ConnectEvent wxString GetAppName() const ! //%wxchkver22&!%wxchkver25&%win bool GetAuto3D() const wxString GetClassName() const bool GetExitOnFrameDelete() const *************** *** 53,57 **** %wxchkver25 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event) void SetAppName(const wxString& name) ! %wxchkver22&!%wxchkver24&(%win|%mac) void SetAuto3D(const bool auto3D) void SetClassName(const wxString& name) void SetExitOnFrameDelete(bool flag) --- 53,57 ---- %wxchkver25 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event) void SetAppName(const wxString& name) ! //%wxchkver22&!%wxchkver24&(%win|%mac) void SetAuto3D(const bool auto3D) void SetClassName(const wxString& name) void SetExitOnFrameDelete(bool flag) *************** *** 63,67 **** %property=AppName, read, write ! %wxchkver22&!%wxchkver24&(%win|%mac) %property=Auto3D, read, write %property=ClassName, read, write %property=ExitOnFrameDelete, read, write --- 63,67 ---- %property=AppName, read, write ! //%wxchkver22&!%wxchkver24&(%win|%mac) %property=Auto3D, read, write %property=ClassName, read, write %property=ExitOnFrameDelete, read, write *************** *** 95,99 **** %class wxTopLevelWindow, wxWindow ! // No constructors, use wxFrame or wxDialog wxIcon GetIcon() const --- 95,99 ---- %class wxTopLevelWindow, wxWindow ! // No constructors, virtual base class, use wxFrame or wxDialog wxIcon GetIcon() const *************** *** 162,166 **** %wxchkver24 void ProcessCommand(int id) ! %wxchkver22&!%wxchkver24 void Command(int id) void SendSizeEvent() --- 162,166 ---- %wxchkver24 void ProcessCommand(int id) ! //%wxchkver22&!%wxchkver24 void Command(int id) void SendSizeEvent() *************** *** 170,174 **** virtual void SetStatusText(const wxString& text, int number = 0) // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! virtual void SetStatusWidths(int n, int *widths) void SetToolBar(wxToolBar* toolBar) --- 170,175 ---- virtual void SetStatusText(const wxString& text, int number = 0) // %override void wxFrame::SetStatusWidths(lua table with number indexes and values) ! //virtual void SetStatusWidths(int n, int *widths) ! virtual void SetStatusWidths(LuaTable intTable) void SetToolBar(wxToolBar* toolBar) *************** *** 191,194 **** --- 192,196 ---- %overload %constructor wxMiniFrameDefault() %overload wxMiniFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "wxMiniFrame") + bool Create(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "wxMiniFrame") %endclass *************** *** 224,230 **** virtual void SetStatusText(const wxString& text, int i = 0) // %override void wxStatusBar::SetStatusWidths(lua table with number indexes and values) ! virtual void SetStatusWidths(int n, int *widths) // %override void wxStatusBar::SetStatusStyles(lua table with number indexes and values) ! virtual void SetStatusStyles(int n, int *styles) %property=FieldsCount, read --- 226,234 ---- virtual void SetStatusText(const wxString& text, int i = 0) // %override void wxStatusBar::SetStatusWidths(lua table with number indexes and values) ! //virtual void SetStatusWidths(int n, int *widths) ! virtual void SetStatusWidths(LuaTable intTable) // %override void wxStatusBar::SetStatusStyles(lua table with number indexes and values) ! //virtual void SetStatusStyles(int n, int *styles) ! virtual void SetStatusStyles(LuaTable intTable) %property=FieldsCount, read *************** *** 268,272 **** // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 }, // { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0, ID_0 } } ! wxAcceleratorTable(int n, wxAcceleratorEntry* entries) bool Ok() const --- 272,279 ---- // { { wx.wxACCEL_NORMAL, string.byte('0'), ID_0 }, // { wx.wxACCEL_NORMAL, wx.VXK_NUMPAD0, ID_0 } } ! //wxAcceleratorTable(int n, wxAcceleratorEntry* entries) ! wxAcceleratorTable(LuaTable accelTable) ! %constructor wxAcceleratorTableCopy(const wxAcceleratorTable& accel) ! bool Ok() const *************** *** 288,291 **** --- 295,300 ---- %class %delete %noclassinfo %encapsulate wxAcceleratorEntry wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0) + %constructor wxAcceleratorEntryCopy(const wxAcceleratorEntry& entry) + int GetCommand() const int GetFlags() const *************** *** 314,317 **** --- 323,327 ---- %class wxTaskBarIcon, wxEvtHandler wxTaskBarIcon() + // virtual wxMenu* CreatePopupMenu() bool IsIconInstalled() *************** *** 433,442 **** wxSYS_COLOUR_INFOBK wxSYS_COLOUR_LISTBOX ! %wxchkver23 wxSYS_COLOUR_HOTLIGHT ! %wxchkver23 wxSYS_COLOUR_GRADIENTACTIVECAPTION ! %wxchkver23 wxSYS_COLOUR_GRADIENTINACTIVECAPTION ! %wxchkver23 wxSYS_COLOUR_MENUHILIGHT ! %wxchkver23 wxSYS_COLOUR_MENUBAR ! %wxchkver23 wxSYS_COLOUR_MAX %endenum --- 443,452 ---- wxSYS_COLOUR_INFOBK wxSYS_COLOUR_LISTBOX ! wxSYS_COLOUR_HOTLIGHT ! wxSYS_COLOUR_GRADIENTACTIVECAPTION ! wxSYS_COLOUR_GRADIENTINACTIVECAPTION ! wxSYS_COLOUR_MENUHILIGHT ! wxSYS_COLOUR_MENUBAR ! wxSYS_COLOUR_MAX %endenum *************** *** 453,465 **** %class %noclassinfo wxSystemSettings ! wxSystemSettings() // all members static ! ! %wxchkver22&!%wxchkver23 static wxColour GetSystemColour(int index) ! %wxchkver22&!%wxchkver23 static wxFont GetSystemFont(int index) ! %wxchkver22&!%wxchkver23 static int GetSystemMetric(int index) ! %wxchkver23 %static wxColour GetColour(wxSystemColour index) ! %wxchkver23 %static wxFont GetFont(wxSystemFont index) ! %wxchkver23 %static int GetMetric(wxSystemMetric index, wxWindow* win = NULL) %endclass --- 463,471 ---- %class %noclassinfo wxSystemSettings ! //wxSystemSettings() // all members static ! %staticonly wxColour GetColour(wxSystemColour index) ! %staticonly wxFont GetFont(wxSystemFont index) ! %staticonly int GetMetric(wxSystemMetric index, wxWindow* win = NULL) %endclass *************** *** 469,481 **** %include "wx/sysopt.h" ! %class %delete %noclassinfo wxSystemOptions, wxObject ! // wxSystemOptions() all members static ! static wxString GetOption(const wxString& name) const ! static int GetOptionInt(const wxString& name) const ! static bool HasOption(const wxString& name) const ! static bool IsFalse(const wxString& name) const ! static void SetOption(const wxString& name, const wxString& value) ! %rename SetOptionInt static void SetOption(const wxString& name, int value) %endclass --- 475,487 ---- %include "wx/sysopt.h" ! %class %noclassinfo wxSystemOptions, wxObject ! //wxSystemOptions() // all members static ! %staticonly wxString GetOption(const wxString& name) const ! %staticonly int GetOptionInt(const wxString& name) const ! %staticonly bool HasOption(const wxString& name) const ! %staticonly bool IsFalse(const wxString& name) const ! %staticonly void SetOption(const wxString& name, const wxString& value) ! %rename SetOptionInt %staticonly void SetOption(const wxString& name, int value) %endclass Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** wx_datatypes.lua 17 May 2006 05:02:05 -0000 1.29 --- wx_datatypes.lua 17 May 2006 22:47:09 -0000 1.30 *************** *** 63,66 **** --- 63,71 ---- Name = "LPVOID", }, + LuaTable = { + DefType = "wxtypedef", + Intrinsic = true, + Name = "LuaTable", + }, PVOID = { DefType = "builtin", *************** *** 197,200 **** --- 202,210 ---- Name = "wxArrayInt", }, + wxArrayInt_FromLuaTable = { + DefType = "wxtypedef", + Intrinsic = true, + Name = "wxArrayInt_FromLuaTable", + }, wxArrayString = { Condition = "wxLUA_USE_wxArrayString", |
|
From: John L. <jr...@us...> - 2006-05-17 22:47:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27493/wxLua/modules/wxbind/src Modified Files: appframe.cpp controls.cpp data.cpp dialogs.cpp grid.cpp wx_bind.cpp Log Message: change enum wxClass::XXX to be accessed as wxClass_XXX added %staticonly keyword for classes that only have static members Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** controls.cpp 16 May 2006 04:55:33 -0000 1.24 --- controls.cpp 17 May 2006 22:47:10 -0000 1.25 *************** *** 1232,1236 **** long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); --- 1232,1236 ---- long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 1266,1270 **** long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 1266,1270 ---- long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 1315,1320 **** #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxChoice) ! { LuaConstructor, "wxChoice", wxLua_wxChoice_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxChoice_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 1315,1320 ---- #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxChoice) ! { LuaConstructor, "wxChoice", wxLua_wxChoice_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxChoice_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif *************** *** 1353,1357 **** long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 1353,1357 ---- long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 1389,1393 **** long style = (argCount >= 8 ? (long)wxlState.GetNumberType(8) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(7, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); --- 1389,1393 ---- long style = (argCount >= 8 ? (long)wxlState.GetNumberType(8) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(7, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 1695,1700 **** #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox) ! { LuaConstructor, "wxComboBox", wxLua_wxComboBox_constructor, 9, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxComboBox_Create, 9, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 1695,1700 ---- #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxComboBox) ! { LuaConstructor, "wxComboBox", wxLua_wxComboBox_constructor, 9, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxComboBox_Create, 9, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif *************** *** 2008,2012 **** long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); --- 2008,2012 ---- long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 2042,2046 **** long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 2042,2046 ---- long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 2108,2112 **** int pos = (int)wxlState.GetNumberType(3); // const wxArrayString_FromLuaTable items ! int dummy_count; wxArrayString items = wxArrayString(); dummy_count = wxlState.GetwxArrayString(2, items); // get this wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); --- 2108,2112 ---- int pos = (int)wxlState.GetNumberType(3); // const wxArrayString_FromLuaTable items ! wxArrayString items = wxArrayString(); wxlState.GetwxArrayString(2, items); // get this wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); *************** *** 2139,2143 **** wxLuaState wxlState(L); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(2, choices); // get this wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); --- 2139,2143 ---- wxLuaState wxlState(L); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(2, choices); // get this wxListBox * self = (wxListBox *)wxlState.GetUserDataType(1, s_wxluatag_wxListBox); *************** *** 2211,2216 **** #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxListBox)) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxListBox", wxLua_wxListBox_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxListBox_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 2211,2216 ---- #if ((wxLUA_USE_wxValidator) && (wxLUA_USE_wxListBox)) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxListBox", wxLua_wxListBox_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxListBox_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif *************** *** 2221,2227 **** { LuaMethod, "Deselect", wxLua_wxListBox_Deselect, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "InsertItems", wxLua_wxListBox_InsertItems, 2, 2, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "IsSelected", wxLua_wxListBox_IsSelected, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Set", wxLua_wxListBox_Set, 1, 1, { 0 } }, { LuaMethod, "SetFirstItem", wxLua_wxListBox_SetFirstItem, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetSelection", wxLua_wxListBox_SetSelection, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, --- 2221,2227 ---- { LuaMethod, "Deselect", wxLua_wxListBox_Deselect, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "InsertItems", wxLua_wxListBox_InsertItems, 2, 2, { &s_wxluaarg_LuaTable, &s_wxluaarg_Number, 0 } }, { LuaMethod, "IsSelected", wxLua_wxListBox_IsSelected, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "Set", wxLua_wxListBox_Set, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, { LuaMethod, "SetFirstItem", wxLua_wxListBox_SetFirstItem, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetSelection", wxLua_wxListBox_SetSelection, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, *************** *** 2260,2264 **** long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); --- 2260,2264 ---- long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(5, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 2294,2298 **** long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 2294,2298 ---- long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 2363,2368 **** #if ((wxLUA_USE_wxValidator) && ((wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox))) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxCheckListBox", wxLua_wxCheckListBox_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxCheckListBox_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 2363,2368 ---- #if ((wxLUA_USE_wxValidator) && ((wxLUA_USE_wxCheckListBox) && (wxLUA_USE_wxListBox))) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxCheckListBox", wxLua_wxCheckListBox_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxCheckListBox_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif *************** *** 5043,5047 **** int majorDimension = (argCount >= 7 ? (int)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); --- 5043,5047 ---- int majorDimension = (argCount >= 7 ? (int)wxlState.GetNumberType(7) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(6, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 5081,5085 **** int majorDimension = (argCount >= 8 ? (int)wxlState.GetNumberType(8) : 0); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(7, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); --- 5081,5085 ---- int majorDimension = (argCount >= 8 ? (int)wxlState.GetNumberType(8) : 0); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(7, choices); // const wxSize size = wxDefaultSize const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); *************** *** 5310,5315 **** #if ((wxLUA_USE_wxRadioBox) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxRadioBox", wxLua_wxRadioBox_constructor, 10, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxRadioBox_Create, 10, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif --- 5310,5315 ---- #if ((wxLUA_USE_wxRadioBox) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) ! { LuaConstructor, "wxRadioBox", wxLua_wxRadioBox_constructor, 10, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Create", wxLua_wxRadioBox_Create, 10, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, #endif Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** grid.cpp 16 May 2006 22:47:09 -0000 1.14 --- grid.cpp 17 May 2006 22:47:10 -0000 1.15 *************** *** 1050,1054 **** bool allowOthers = (argCount >= 2 ? wxlState.GetBooleanType(2) : false); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(1, choices); // call constructor returns = new wxGridCellChoiceEditor(choices, allowOthers); --- 1050,1054 ---- bool allowOthers = (argCount >= 2 ? wxlState.GetBooleanType(2) : false); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(1, choices); // call constructor returns = new wxGridCellChoiceEditor(choices, allowOthers); *************** *** 1070,1074 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxGridCellChoiceEditor_methods[] = { ! { LuaConstructor, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_constructor, 2, 1, { &s_wxluaarg_Boolean, 0 } }, { LuaDelete, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_destructor, 0, 0, {0} }, }; --- 1070,1074 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxGridCellChoiceEditor_methods[] = { ! { LuaConstructor, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_constructor, 2, 1, { &s_wxluaarg_LuaTable, &s_wxluaarg_Boolean, 0 } }, { LuaDelete, "wxGridCellChoiceEditor", wxLua_wxGridCellChoiceEditor_destructor, 0, 0, {0} }, }; Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** appframe.cpp 2 May 2006 05:25:01 -0000 1.16 --- appframe.cpp 17 May 2006 22:47:10 -0000 1.17 *************** *** 67,107 **** - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0) && (defined(__WXMSW__) || defined(__WXMAC__))) && (wxLUA_USE_wxApp) - // %wxchkver22&!%wxchkver24&(%win|%mac) void SetAuto3D(const bool auto3D) - static int LUACALL wxLua_wxApp_SetAuto3D(lua_State *L) - { - wxLuaState wxlState(L); - // const bool auto3D - const bool auto3D = wxlState.GetBooleanType(2); - // get this - wxApp * self = (wxApp *)wxlState.GetUserDataType(1, s_wxluatag_wxApp); - // call SetAuto3D - self->SetAuto3D(auto3D); - - return 0; - } - - #endif - - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxApp) - // %wxchkver22&!%wxchkver25&%win bool GetAuto3D() const - static int LUACALL wxLua_wxApp_GetAuto3D(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // get this - wxApp * self = (wxApp *)wxlState.GetUserDataType(1, s_wxluatag_wxApp); - // call GetAuto3D - returns = self->GetAuto3D(); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - - #endif - - #if (wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxApp) // %wxchkver25 bool SendIdleEvents(wxWindow* win, wxIdleEvent& event) --- 67,70 ---- *************** *** 381,396 **** static WXLUAMETHOD s_wxApp_methods[] = { - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0) && (defined(__WXMSW__) || defined(__WXMAC__))) && (wxLUA_USE_wxApp) - { LuaMethod, "SetAuto3D", wxLua_wxApp_SetAuto3D, 1, 1, { &s_wxluaarg_Boolean, 0 } }, - { LuaGetProp, "Auto3D", wxLua_wxApp_GetAuto3D, 0, 0, {0} }, - { LuaSetProp, "Auto3D", wxLua_wxApp_SetAuto3D, 1, 1, {0} }, - #endif - - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) && defined(__WXMSW__)) && (wxLUA_USE_wxApp) - { LuaMethod, "GetAuto3D", wxLua_wxApp_GetAuto3D, 0, 0, { 0 } }, - #endif - - #if (wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_wxApp) { LuaMethod, "SendIdleEvents", wxLua_wxApp_SendIdleEvents, 2, 2, { &s_wxluatag_wxWindow, &s_wxluatag_wxIdleEvent, 0 } }, --- 344,347 ---- *************** *** 714,735 **** - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0)) && (wxLUA_USE_wxFrame) - // %wxchkver22&!%wxchkver24 void Command(int id) - static int LUACALL wxLua_wxFrame_Command(lua_State *L) - { - wxLuaState wxlState(L); - // int id - int id = (int)wxlState.GetNumberType(2); - // get this - wxFrame * self = (wxFrame *)wxlState.GetUserDataType(1, s_wxluatag_wxFrame); - // call Command - self->Command(id); - - return 0; - } - - #endif - - #if (wxCHECK_VERSION(2,4,0)) && (wxLUA_USE_wxFrame) // %wxchkver24 void ProcessCommand(int id) --- 665,668 ---- *************** *** 1098,1106 **** static WXLUAMETHOD s_wxFrame_methods[] = { - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,4,0)) && (wxLUA_USE_wxFrame) - { LuaMethod, "Command", wxLua_wxFrame_Command, 1, 1, { &s_wxluaarg_Number, 0 } }, - #endif - - #if (wxCHECK_VERSION(2,4,0)) && (wxLUA_USE_wxFrame) { LuaMethod, "ProcessCommand", wxLua_wxFrame_ProcessCommand, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 1031,1034 ---- *************** *** 1146,1150 **** { LuaMethod, "SetStatusBarPane", wxLua_wxFrame_SetStatusBarPane, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetStatusText", wxLua_wxFrame_SetStatusText, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "SetStatusWidths", wxLua_wxFrame_SetStatusWidths, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } }, { LuaDelete, "wxFrame", wxLua_wxFrame_destructor, 0, 0, {0} }, }; --- 1074,1078 ---- { LuaMethod, "SetStatusBarPane", wxLua_wxFrame_SetStatusBarPane, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetStatusText", wxLua_wxFrame_SetStatusText, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "SetStatusWidths", wxLua_wxFrame_SetStatusWidths, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, { LuaDelete, "wxFrame", wxLua_wxFrame_destructor, 0, 0, {0} }, }; *************** *** 1589,1594 **** { LuaMethod, "SetMinHeight", wxLua_wxStatusBar_SetMinHeight, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetStatusText", wxLua_wxStatusBar_SetStatusText, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "SetStatusWidths", wxLua_wxStatusBar_SetStatusWidths, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } }, ! { LuaMethod, "SetStatusStyles", wxLua_wxStatusBar_SetStatusStyles, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } }, { LuaGetProp, "FieldsCount", wxLua_wxStatusBar_GetFieldsCount, 0, 0, {0} }, { LuaDelete, "wxStatusBar", wxLua_wxStatusBar_destructor, 0, 0, {0} }, --- 1517,1522 ---- { LuaMethod, "SetMinHeight", wxLua_wxStatusBar_SetMinHeight, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetStatusText", wxLua_wxStatusBar_SetStatusText, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "SetStatusWidths", wxLua_wxStatusBar_SetStatusWidths, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, ! { LuaMethod, "SetStatusStyles", wxLua_wxStatusBar_SetStatusStyles, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, { LuaGetProp, "FieldsCount", wxLua_wxStatusBar_GetFieldsCount, 0, 0, {0} }, { LuaDelete, "wxStatusBar", wxLua_wxStatusBar_destructor, 0, 0, {0} }, *************** *** 1823,1826 **** --- 1751,1771 ---- } + // %constructor wxAcceleratorTableCopy(const wxAcceleratorTable& accel) + static int LUACALL wxLua_wxAcceleratorTableCopy_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxAcceleratorTable *returns; + // const wxAcceleratorTable accel + const wxAcceleratorTable * accel = (const wxAcceleratorTable *)wxlState.GetUserDataType(1, s_wxluatag_wxAcceleratorTable); + // call constructor + returns = new wxAcceleratorTable(*accel); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxAcceleratorTable *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxAcceleratorTable, returns); + + return 1; + } + // bool Ok() const static int LUACALL wxLua_wxAcceleratorTable_Ok(lua_State *L) *************** *** 1869,1873 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxAcceleratorTable_methods[] = { ! { LuaConstructor, "wxAcceleratorTable", wxLua_wxAcceleratorTable_constructor, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxAcceleratorEntry, 0 } }, { LuaMethod, "Ok", wxLua_wxAcceleratorTable_Ok, 0, 0, { 0 } }, { LuaDelete, "wxAcceleratorTable", wxLua_wxAcceleratorTable_destructor, 0, 0, {0} }, --- 1814,1819 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxAcceleratorTable_methods[] = { ! { LuaConstructor, "wxAcceleratorTable", wxLua_wxAcceleratorTable_constructor, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, ! { LuaConstructor, "wxAcceleratorTableCopy", wxLua_wxAcceleratorTableCopy_constructor, 1, 1, { &s_wxluatag_wxAcceleratorTable, 0 } }, { LuaMethod, "Ok", wxLua_wxAcceleratorTable_Ok, 0, 0, { 0 } }, { LuaDelete, "wxAcceleratorTable", wxLua_wxAcceleratorTable_destructor, 0, 0, {0} }, *************** *** 1912,1915 **** --- 1858,1878 ---- } + // %constructor wxAcceleratorEntryCopy(const wxAcceleratorEntry& entry) + static int LUACALL wxLua_wxAcceleratorEntryCopy_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxAcceleratorEntry *returns; + // const wxAcceleratorEntry entry + const wxAcceleratorEntry * entry = (const wxAcceleratorEntry *)wxlState.GetUserDataType(1, s_wxluatag_wxAcceleratorEntry); + // call constructor + returns = new wxAcceleratorEntry(*entry); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxAcceleratorEntry *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxAcceleratorEntry, returns); + + return 1; + } + // int GetCommand() const static int LUACALL wxLua_wxAcceleratorEntry_GetCommand(lua_State *L) *************** *** 2007,2010 **** --- 1970,1974 ---- static WXLUAMETHOD s_wxAcceleratorEntry_methods[] = { { LuaConstructor, "wxAcceleratorEntry", wxLua_wxAcceleratorEntry_constructor, 3, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, + { LuaConstructor, "wxAcceleratorEntryCopy", wxLua_wxAcceleratorEntryCopy_constructor, 1, 1, { &s_wxluatag_wxAcceleratorEntry, 0 } }, { LuaMethod, "GetCommand", wxLua_wxAcceleratorEntry_GetCommand, 0, 0, { 0 } }, { LuaMethod, "GetFlags", wxLua_wxAcceleratorEntry_GetFlags, 0, 0, { 0 } }, *************** *** 2189,2335 **** int s_wxluatag_wxSystemSettings = -1; - - #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxSystemSettings) - // %wxchkver23 %static wxFont GetFont(wxSystemFont index) - static int LUACALL wxLua_wxSystemSettings_GetFont(lua_State *L) - { - wxLuaState wxlState(L); - wxFont *returns; - // wxSystemFont index - wxSystemFont index = (wxSystemFont)wxlState.GetEnumerationType(2); - // call GetFont - // allocate a new object using the copy constructor - returns = new wxFont(wxSystemSettings::GetFont(index)); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxFont *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxFont, returns); - - return 1; - } - - #endif - - - #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxColourPenBrush) - // %wxchkver22&!%wxchkver23 static wxColour GetSystemColour(int index) - static int LUACALL wxLua_wxSystemSettings_GetSystemColour(lua_State *L) - { - wxLuaState wxlState(L); - wxColour *returns; - // int index - int index = (int)wxlState.GetNumberType(2); - // call GetSystemColour - // allocate a new object using the copy constructor - returns = new wxColour(wxSystemSettings::GetSystemColour(index)); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxColour, returns); - - return 1; - } - - #endif - - - #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont) - // %wxchkver22&!%wxchkver23 static wxFont GetSystemFont(int index) - static int LUACALL wxLua_wxSystemSettings_GetSystemFont(lua_State *L) - { - wxLuaState wxlState(L); - wxFont *returns; - // int index - int index = (int)wxlState.GetNumberType(2); - // call GetSystemFont - // allocate a new object using the copy constructor - returns = new wxFont(wxSystemSettings::GetSystemFont(index)); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxFont *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxFont, returns); - - return 1; - } - - #endif - - - #if ((wxLUA_USE_wxColourPenBrush) && ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings))) && (wxLUA_USE_wxSystemSettings) - // %wxchkver23 %static wxColour GetColour(wxSystemColour index) - static int LUACALL wxLua_wxSystemSettings_GetColour(lua_State *L) - { - wxLuaState wxlState(L); - wxColour *returns; - // wxSystemColour index - wxSystemColour index = (wxSystemColour)wxlState.GetEnumerationType(2); - // call GetColour - // allocate a new object using the copy constructor - returns = new wxColour(wxSystemSettings::GetColour(index)); - // add the new object to the tracked memory list - wxLua_AddToTrackedMemoryList(wxlState, (wxColour *)returns); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxColour, returns); - - return 1; - } - - #endif - - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings) - // %wxchkver22&!%wxchkver23 static int GetSystemMetric(int index) - static int LUACALL wxLua_wxSystemSettings_GetSystemMetric(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // int index - int index = (int)wxlState.GetNumberType(2); - // call GetSystemMetric - returns = wxSystemSettings::GetSystemMetric(index); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - - #endif - - - #if (wxLUA_USE_wxSystemSettings) && ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) - // %wxchkver23 %static int GetMetric(wxSystemMetric index, wxWindow* win = NULL) - static int LUACALL wxLua_wxSystemSettings_GetMetric(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // get number of arguments - int argCount = lua_gettop(L); - // wxWindow win = NULL - wxWindow * win = (argCount >= 3 ? (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow) : NULL); - // wxSystemMetric index - wxSystemMetric index = (wxSystemMetric)wxlState.GetEnumerationType(2); - // call GetMetric - returns = wxSystemSettings::GetMetric(index, win); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - - #endif - - // wxSystemSettings() // all members static - static int LUACALL wxLua_wxSystemSettings_constructor(lua_State *L) - { - wxLuaState wxlState(L); - wxSystemSettings *returns; - // call constructor - returns = new wxSystemSettings(); - // push the constructed class pointer - wxlState.PushUserDataType(s_wxluatag_wxSystemSettings, returns); - - return 1; - } - static int LUACALL wxLua_wxSystemSettings_destructor(lua_State *) { --- 2153,2156 ---- *************** *** 2343,2377 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxSystemSettings_methods[] = { - - #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxSystemSettings) - { LuaMethod, "GetFont", wxLua_wxSystemSettings_GetFont, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, - #endif - - - #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxColourPenBrush) - { LuaMethod, "GetSystemColour", wxLua_wxSystemSettings_GetSystemColour, 1, 1, { &s_wxluaarg_Number, 0 } }, - #endif - - - #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont) - { LuaMethod, "GetSystemFont", wxLua_wxSystemSettings_GetSystemFont, 1, 1, { &s_wxluaarg_Number, 0 } }, - #endif - - - #if ((wxLUA_USE_wxColourPenBrush) && ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings))) && (wxLUA_USE_wxSystemSettings) - { LuaMethod, "GetColour", wxLua_wxSystemSettings_GetColour, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, - #endif - - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings) - { LuaMethod, "GetSystemMetric", wxLua_wxSystemSettings_GetSystemMetric, 1, 1, { &s_wxluaarg_Number, 0 } }, - #endif - - - #if (wxLUA_USE_wxSystemSettings) && ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) - { LuaMethod, "GetMetric", wxLua_wxSystemSettings_GetMetric, 2, 1, { &s_wxluaarg_Enumeration, &s_wxluatag_wxWindow, 0 } }, - #endif - - { LuaConstructor, "wxSystemSettings", wxLua_wxSystemSettings_constructor, 0, 0, { 0 } }, { LuaDelete, "wxSystemSettings", wxLua_wxSystemSettings_destructor, 0, 0, {0} }, }; --- 2164,2167 ---- *************** *** 2391,2504 **** int s_wxluatag_wxSystemOptions = -1; ! // static wxString GetOption(const wxString& name) const ! static int LUACALL wxLua_wxSystemOptions_GetOption(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxString returns; ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call GetOption ! returns = wxSystemOptions::GetOption(name); ! // push the result string ! lua_pushstring(L, wx2lua(returns) ); ! ! return 1; ! } ! ! // static int GetOptionInt(const wxString& name) const ! static int LUACALL wxLua_wxSystemOptions_GetOptionInt(lua_State *L) ! { ! wxLuaState wxlState(L); ! int returns; ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call GetOptionInt ! returns = wxSystemOptions::GetOptionInt(name); ! // push the result number ! lua_pushnumber(L, returns); ! ! return 1; ! } ! ! // static bool HasOption(const wxString& name) const ! static int LUACALL wxLua_wxSystemOptions_HasOption(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call HasOption ! returns = wxSystemOptions::HasOption(name); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! // static bool IsFalse(const wxString& name) const ! static int LUACALL wxLua_wxSystemOptions_IsFalse(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call IsFalse ! returns = wxSystemOptions::IsFalse(name); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! // static void SetOption(const wxString& name, const wxString& value) ! static int LUACALL wxLua_wxSystemOptions_SetOption(lua_State *L) ! { ! wxLuaState wxlState(L); ! // const wxString value ! const wxString value = lua2wx(wxlState.GetStringType(3)); ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call SetOption ! wxSystemOptions::SetOption(name, value); ! ! return 0; ! } ! ! // %rename SetOptionInt static void SetOption(const wxString& name, int value) ! static int LUACALL wxLua_wxSystemOptions_SetOptionInt(lua_State *L) ! { ! wxLuaState wxlState(L); ! // int value ! int value = (int)wxlState.GetNumberType(3); ! // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); ! // call SetOption ! wxSystemOptions::SetOption(name, value); ! ! return 0; ! } ! ! static int LUACALL wxLua_wxSystemOptions_destructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxSystemOptions * self = (wxSystemOptions *)wxlState.GetUserDataType(1, s_wxluatag_wxSystemOptions); ! ! // remove from tracked memory list ! if (self != 0) ! wxlState.RemoveTrackedMemory(self); ! return 0; ! } ! ! static int LUACALL wxLua_wxSystemOptions_Delete(lua_State *L) { - wxLuaState wxlState(L); - wxSystemOptions * self = (wxSystemOptions *)wxlState.GetUserDataType(1, s_wxluatag_wxSystemOptions); - // 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; } --- 2181,2186 ---- int s_wxluatag_wxSystemOptions = -1; ! static int LUACALL wxLua_wxSystemOptions_destructor(lua_State *) { return 0; } *************** *** 2510,2521 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxSystemOptions_methods[] = { - { LuaMethod, "GetOption", wxLua_wxSystemOptions_GetOption, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "GetOptionInt", wxLua_wxSystemOptions_GetOptionInt, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "HasOption", wxLua_wxSystemOptions_HasOption, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "IsFalse", wxLua_wxSystemOptions_IsFalse, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "SetOption", wxLua_wxSystemOptions_SetOption, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, - { LuaMethod, "SetOptionInt", wxLua_wxSystemOptions_SetOptionInt, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaDelete, "wxSystemOptions", wxLua_wxSystemOptions_destructor, 0, 0, {0} }, - { LuaMethod, "Delete", wxLua_wxSystemOptions_Delete, 0, 0, {0} }, }; --- 2192,2196 ---- Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** dialogs.cpp 15 May 2006 22:57:30 -0000 1.15 --- dialogs.cpp 17 May 2006 22:47:10 -0000 1.16 *************** *** 1214,1218 **** long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCHOICEDLG_STYLE); // const wxArrayString_FromLuaTable choices ! int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption const wxString caption = lua2wx(wxlState.GetStringType(3)); --- 1214,1218 ---- long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCHOICEDLG_STYLE); // const wxArrayString_FromLuaTable choices ! wxArrayString choices = wxArrayString(); wxlState.GetwxArrayString(4, choices); // const wxString caption const wxString caption = lua2wx(wxlState.GetStringType(3)); *************** *** 1249,1253 **** #if wxLUA_USE_wxPointSizeRect ! { LuaConstructor, "wxMultiChoiceDialog", wxLua_wxMultiChoiceDialog_constructor, 6, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif --- 1249,1253 ---- #if wxLUA_USE_wxPointSizeRect ! { LuaConstructor, "wxMultiChoiceDialog", wxLua_wxMultiChoiceDialog_constructor, 6, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif *************** *** 1359,1363 **** #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxSingleChoiceDialog) ! { LuaConstructor, "wxSingleChoiceDialog", wxLua_wxSingleChoiceDialog_constructor, 7, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif --- 1359,1363 ---- #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxSingleChoiceDialog) ! { LuaConstructor, "wxSingleChoiceDialog", wxLua_wxSingleChoiceDialog_constructor, 7, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** data.cpp 2 May 2006 05:25:01 -0000 1.19 --- data.cpp 17 May 2006 22:47:10 -0000 1.20 *************** *** 1802,1806 **** wxArrayString *returns; // const wxArrayString_FromLuaTable array ! int dummy_count; wxArrayString array = wxArrayString(); dummy_count = wxlState.GetwxArrayString(1, array); // call constructor returns = new wxArrayString(array); --- 1802,1806 ---- wxArrayString *returns; // const wxArrayString_FromLuaTable array ! wxArrayString array = wxArrayString(); wxlState.GetwxArrayString(1, array); // call constructor returns = new wxArrayString(array); *************** *** 2070,2074 **** { LuaConstructor, "wxArrayString", wxLua_wxArrayString_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxArrayStringCopy", wxLua_wxArrayStringCopy_constructor, 1, 1, { &s_wxluatag_wxArrayString, 0 } }, ! { LuaConstructor, "wxArrayStringFromTable", wxLua_wxArrayStringFromTable_constructor, 1, 1, { 0 } }, { LuaMethod, "Add", wxLua_wxArrayString_Add, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Alloc", wxLua_wxArrayString_Alloc, 1, 1, { &s_wxluaarg_Number, 0 } }, --- 2070,2074 ---- { LuaConstructor, "wxArrayString", wxLua_wxArrayString_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxArrayStringCopy", wxLua_wxArrayStringCopy_constructor, 1, 1, { &s_wxluatag_wxArrayString, 0 } }, ! { LuaConstructor, "wxArrayStringFromTable", wxLua_wxArrayStringFromTable_constructor, 1, 1, { &s_wxluaarg_LuaTable, 0 } }, { LuaMethod, "Add", wxLua_wxArrayString_Add, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Alloc", wxLua_wxArrayString_Alloc, 1, 1, { &s_wxluaarg_Number, 0 } }, Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** wx_bind.cpp 17 May 2006 05:02:05 -0000 1.40 --- wx_bind.cpp 17 May 2006 22:47:10 -0000 1.41 *************** *** 1505,1514 **** { "wxSYS_CAN_DRAW_FRAME_DECORATIONS", wxSYS_CAN_DRAW_FRAME_DECORATIONS }, { "wxSYS_CAN_ICONIZE_FRAME", wxSYS_CAN_ICONIZE_FRAME }, - { "wxSYS_COLOUR_GRADIENTACTIVECAPTION", wxSYS_COLOUR_GRADIENTACTIVECAPTION }, - { "wxSYS_COLOUR_GRADIENTINACTIVECAPTION", wxSYS_COLOUR_GRADIENTINACTIVECAPTION }, - { "wxSYS_COLOUR_HOTLIGHT", wxSYS_COLOUR_HOTLIGHT }, - { "wxSYS_COLOUR_MAX", wxSYS_COLOUR_MAX }, - { "wxSYS_COLOUR_MENUBAR", wxSYS_COLOUR_MENUBAR }, - { "wxSYS_COLOUR_MENUHILIGHT", wxSYS_COLOUR_MENUHILIGHT }, { "wxSYS_SCREEN_DESKTOP", wxSYS_SCREEN_DESKTOP }, { "wxSYS_SCREEN_NONE", wxSYS_SCREEN_NONE }, --- 1505,1508 ---- *************** *** 1903,1911 **** #if wxLUA_USE_wxConfig ! { "Type_Boolean", wxConfigBase::Type_Boolean }, ! { "Type_Float", wxConfigBase::Type_Float }, ! { "Type_Integer", wxConfigBase::Type_Integer }, ! { "Type_String", wxConfigBase::Type_String }, ! { "Type_Unknown", wxConfigBase::Type_Unknown }, { "wxCONFIG_USE_GLOBAL_FILE", wxCONFIG_USE_GLOBAL_FILE }, { "wxCONFIG_USE_LOCAL_FILE", wxCONFIG_USE_LOCAL_FILE }, --- 1897,1905 ---- #if wxLUA_USE_wxConfig ! { "wxConfigBase_Type_Boolean", wxConfigBase::Type_Boolean }, ! { "wxConfigBase_Type_Float", wxConfigBase::Type_Float }, ! { "wxConfigBase_Type_Integer", wxConfigBase::Type_Integer }, ! { "wxConfigBase_Type_String", wxConfigBase::Type_String }, ! { "wxConfigBase_Type_Unknown", wxConfigBase::Type_Unknown }, { "wxCONFIG_USE_GLOBAL_FILE", wxCONFIG_USE_GLOBAL_FILE }, { "wxCONFIG_USE_LOCAL_FILE", wxCONFIG_USE_LOCAL_FILE }, *************** *** 1963,1968 **** #if wxLUA_USE_wxDataObject ! { "Get", wxDataObject::Get }, ! { "Set", wxDataObject::Set }, { "wxDF_BITMAP", wxDF_BITMAP }, { "wxDF_DIB", wxDF_DIB }, --- 1957,1962 ---- #if wxLUA_USE_wxDataObject ! { "wxDataObject_Get", wxDataObject::Get }, ! { "wxDataObject_Set", wxDataObject::Set }, { "wxDF_BITMAP", wxDF_BITMAP }, { "wxDF_DIB", wxDF_DIB }, *************** *** 1987,2075 **** #if wxLUA_USE_wxDateTime ! { "ADT", wxDateTime::ADT }, ! { "AKDT", wxDateTime::AKDT }, ! { "AKST", wxDateTime::AKST }, ! { "AST", wxDateTime::AST }, ! { "A_CST", wxDateTime::A_CST }, ! { "A_ESST", wxDateTime::A_ESST }, ! { "A_EST", wxDateTime::A_EST }, ! { "A_WST", wxDateTime::A_WST }, ! { "Apr", wxDateTime::Apr }, ! { "Aug", wxDateTime::Aug }, ! { "CDT", wxDateTime::CDT }, ! { "CEST", wxDateTime::CEST }, ! { "CET", wxDateTime::CET }, ! { "CST", wxDateTime::CST }, ! { "Country_Default", wxDateTime::Country_Default }, ! { "Country_EEC", wxDateTime::Country_EEC }, ! { "Country_Unknown", wxDateTime::Country_Unknown }, ! { "Country_WesternEurope_End", wxDateTime::Country_WesternEurope_End }, ! { "Country_WesternEurope_Start", wxDateTime::Country_WesternEurope_Start }, ! { "Dec", wxDateTime::Dec }, ! { "EDT", wxDateTime::EDT }, ! { "EEST", wxDateTime::EEST }, ! { "EET", wxDateTime::EET }, ! { "EST", wxDateTime::EST }, ! { "Feb", wxDateTime::Feb }, ! { "France", wxDateTime::France }, ! { "Fri", wxDateTime::Fri }, ! { "GMT0", wxDateTime::GMT0 }, ! { "GMT1", wxDateTime::GMT1 }, ! { "GMT10", wxDateTime::GMT10 }, ! { "GMT11", wxDateTime::GMT11 }, ! { "GMT12", wxDateTime::GMT12 }, ! { "GMT2", wxDateTime::GMT2 }, ! { "GMT3", wxDateTime::GMT3 }, ! { "GMT4", wxDateTime::GMT4 }, ! { "GMT5", wxDateTime::GMT5 }, ! { "GMT6", wxDateTime::GMT6 }, ! { "GMT7", wxDateTime::GMT7 }, ! { "GMT8", wxDateTime::GMT8 }, ! { "GMT9", wxDateTime::GMT9 }, ! { "GMT_1", wxDateTime::GMT_1 }, ! { "GMT_10", wxDateTime::GMT_10 }, ! { "GMT_11", wxDateTime::GMT_11 }, ! { "GMT_12", wxDateTime::GMT_12 }, ! { "GMT_2", wxDateTime::GMT_2 }, ! { "GMT_3", wxDateTime::GMT_3 }, ! { "GMT_4", wxDateTime::GMT_4 }, ! { "GMT_5", wxDateTime::GMT_5 }, ! { "GMT_6", wxDateTime::GMT_6 }, ! { "GMT_7", wxDateTime::GMT_7 }, ! { "GMT_8", wxDateTime::GMT_8 }, ! { "GMT_9", wxDateTime::GMT_9 }, ! { "Germany", wxDateTime::Germany }, ! { "Gregorian", wxDateTime::Gregorian }, ! { "HST", wxDateTime::HST }, ! { "Inv_Month", wxDateTime::Inv_Month }, ! { "Inv_WeekDay", wxDateTime::Inv_WeekDay }, ! { "Jan", wxDateTime::Jan }, ! { "Jul", wxDateTime::Jul }, ! { "Julian", wxDateTime::Julian }, ! { "Jun", wxDateTime::Jun }, ! { "Local", wxDateTime::Local }, ! { "MDT", wxDateTime::MDT }, ! { "MSD", wxDateTime::MSD }, ! { "MSK", wxDateTime::MSK }, ! { "MST", wxDateTime::MST }, ! { "Mar", wxDateTime::Mar }, ! { "May", wxDateTime::May }, ! { "Mon", wxDateTime::Mon }, ! { "Nov", wxDateTime::Nov }, ! { "Oct", wxDateTime::Oct }, ! { "PDT", wxDateTime::PDT }, ! { "PST", wxDateTime::PST }, ! { "Russia", wxDateTime::Russia }, ! { "Sat", wxDateTime::Sat }, ! { "Sep", wxDateTime::Sep }, ! { "Sun", wxDateTime::Sun }, ! { "Thu", wxDateTime::Thu }, ! { "Tue", wxDateTime::Tue }, ! { "UK", wxDateTime::UK }, ! { "USA", wxDateTime::USA }, ! { "UTC", wxDateTime::UTC }, ! { "WEST", wxDateTime::WEST }, ! { "WET", wxDateTime::WET }, ! { "Wed", wxDateTime::Wed }, #endif --- 1981,2069 ---- #if wxLUA_USE_wxDateTime ! { "wxDateTime_ADT", wxDateTime::ADT }, ! { "wxDateTime_AKDT", wxDateTime::AKDT }, ! { "wxDateTime_AKST", wxDateTime::AKST }, ! { "wxDateTime_AST", wxDateTime::AST }, ! { "wxDateTime_A_CST", wxDateTime::A_CST }, ! { "wxDateTime_A_ESST", wxDateTime::A_ESST }, ! { "wxDateTime_A_EST", wxDateTime::A_EST }, ! { "wxDateTime_A_WST", wxDateTime::A_WST }, ! { "wxDateTime_Apr", wxDateTime::Apr }, ! { "wxDateTime_Aug", wxDateTime::Aug }, ! { "wxDateTime_CDT", wxDateTime::CDT }, ! { "wxDateTime_CEST", wxDateTime::CEST }, ! { "wxDateTime_CET", wxDateTime::CET }, ! { "wxDateTime_CST", wxDateTime::CST }, ! { "wxDateTime_Country_Default", wxDateTime::Country_Default }, ! { "wxDateTime_Country_EEC", wxDateTime::Country_EEC }, ! { "wxDateTime_Country_Unknown", wxDateTime::Country_Unknown }, ! { "wxDateTime_Country_WesternEurope_End", wxDateTime::Country_WesternEurope_End }, ! { "wxDateTime_Country_WesternEurope_Start", wxDateTime::Country_WesternEurope_Start }, ! { "wxDateTime_Dec", wxDateTime::Dec }, ! { "wxDateTime_EDT", wxDateTime::EDT }, ! { "wxDateTime_EEST", wxDateTime::EEST }, ! { "wxDateTime_EET", wxDateTime::EET }, ! { "wxDateTime_EST", wxDateTime::EST }, ! { "wxDateTime_Feb", wxDateTime::Feb }, ! { "wxDateTime_France", wxDateTime::France }, ! { "wxDateTime_Fri", wxDateTime::Fri }, ! { "wxDateTime_GMT0", wxDateTime::GMT0 }, ! { "wxDateTime_GMT1", wxDateTime::GMT1 }, ! { "wxDateTime_GMT10", wxDateTime::GMT10 }, ! { "wxDateTime_GMT11", wxDateTime::GMT11 }, ! { "wxDateTime_GMT12", wxDateTime::GMT12 }, ! { "wxDateTime_GMT2", wxDateTime::GMT2 }, ! { "wxDateTime_GMT3", wxDateTime::GMT3 }, ! { "wxDateTime_GMT4", wxDateTime::GMT4 }, ! { "wxDateTime_GMT5", wxDateTime::GMT5 }, ! { "wxDateTime_GMT6", wxDateTime::GMT6 }, ! { "wxDateTime_GMT7", wxDateTime::GMT7 }, ! { "wxDateTime_GMT8", wxDateTime::GMT8 }, ! { "wxDateTime_GMT9", wxDateTime::GMT9 }, ! { "wxDateTime_GMT_1", wxDateTime::GMT_1 }, ! { "wxDateTime_GMT_10", wxDateTime::GMT_10 }, ! { "wxDateTime_GMT_11", wxDateTime::GMT_11 }, ! { "wxDateTime_GMT_12", wxDateTime::GMT_12 }, ! { "wxDateTime_GMT_2", wxDateTime::GMT_2 }, ! { "wxDateTime_GMT_3", wxDateTime::GMT_3 }, ! { "wxDateTime_GMT_4", wxDateTime::GMT_4 }, ! { "wxDateTime_GMT_5", wxDateTime::GMT_5 }, ! { "wxDateTime_GMT_6", wxDateTime::GMT_6 }, ! { "wxDateTime_GMT_7", wxDateTime::GMT_7 }, ! { "wxDateTime_GMT_8", wxDateTime::GMT_8 }, ! { "wxDateTime_GMT_9", wxDateTime::GMT_9 }, ! { "wxDateTime_Germany", wxDateTime::Germany }, ! { "wxDateTime_Gregorian", wxDateTime::Gregorian }, ! { "wxDateTime_HST", wxDateTime::HST }, ! { "wxDateTime_Inv_Month", wxDateTime::Inv_Month }, ! { "wxDateTime_Inv_WeekDay", wxDateTime::Inv_WeekDay }, ! { "wxDateTime_Jan", wxDateTime::Jan }, ! { "wxDateTime_Jul", wxDateTime::Jul }, ! { "wxDateTime_Julian", wxDateTime::Julian }, ! { "wxDateTime_Jun", wxDateTime::Jun }, ! { "wxDateTime_Local", wxDateTime::Local }, ! { "wxDateTime_MDT", wxDateTime::MDT }, ! { "wxDateTime_MSD", wxDateTime::MSD }, ! { "wxDateTime_MSK", wxDateTime::MSK }, ! { "wxDateTime_MST", wxDateTime::MST }, ! { "wxDateTime_Mar", wxDateTime::Mar }, ! { "wxDateTime_May", wxDateTime::May }, ! { "wxDateTime_Mon", wxDateTime::Mon }, ! { "wxDateTime_Nov", wxDateTime::Nov }, ! { "wxDateTime_Oct", wxDateTime::Oct }, ! { "wxDateTime_PDT", wxDateTime::PDT }, ! { "wxDateTime_PST", wxDateTime::PST }, ! { "wxDateTime_Russia", wxDateTime::Russia }, ! { "wxDateTime_Sat", wxDateTime::Sat }, ! { "wxDateTime_Sep", wxDateTime::Sep }, ! { "wxDateTime_Sun", wxDateTime::Sun }, ! { "wxDateTime_Thu", wxDateTime::Thu }, ! { "wxDateTime_Tue", wxDateTime::Tue }, ! { "wxDateTime_UK", wxDateTime::UK }, ! { "wxDateTime_USA", wxDateTime::USA }, ! { "wxDateTime_UTC", wxDateTime::UTC }, ! { "wxDateTime_WEST", wxDateTime::WEST }, ! { "wxDateTime_WET", wxDateTime::WET }, ! { "wxDateTime_Wed", wxDateTime::Wed }, #endif *************** *** 2086,2094 **** #if wxLUA_USE_wxFile ! { "wxFileRead", wxFile::read }, ! { "wxFileReadWrite", wxFile::read_write }, ! { "wxFileWrite", wxFile::write }, ! { "wxFileWriteAppend", wxFile::write_append }, ! { "wxFileWriteExcl", wxFile::write_excl }, { "wxFILE_KIND_DISK", wxFILE_KIND_DISK }, { "wxFILE_KIND_PIPE", wxFILE_KIND_PIPE }, --- 2080,2088 ---- #if wxLUA_USE_wxFile ! { "wxFile_wxFileRead", wxFile::read }, ! { "wxFile_wxFileReadWrite", wxFile::read_write }, ! { "wxFile_wxFileWrite", wxFile::write }, ! { "wxFile_wxFileWriteAppend", wxFile::write_append }, ! { "wxFile_wxFileWriteExcl", wxFile::write_excl }, { "wxFILE_KIND_DISK", wxFILE_KIND_DISK }, { "wxFILE_KIND_PIPE", wxFILE_KIND_PIPE }, *************** *** 2249,2258 **** #if wxLUA_USE_wxGrid ! { "Any", wxGridCellAttr::Any }, ! { "Cell", wxGridCellAttr::Cell }, ! { "Col", wxGridCellAttr::Col }, ! { "Default", wxGridCellAttr::Default }, ! { "Merged", wxGridCellAttr::Merged }, ! { "Row", wxGridCellAttr::Row }, { "wxGRIDTABLE_NOTIFY_COLS_APPENDED", wxGRIDTABLE_NOTIFY_COLS_APPENDED }, { "wxGRIDTABLE_NOTIFY_COLS_DELETED", wxGRIDTABLE_NOTIFY_COLS_DELETED }, --- 2243,2252 ---- #if wxLUA_USE_wxGrid ! { "wxGridCellAttr_Any", wxGridCellAttr::Any }, ! { "wxGridCellAttr_Cell", wxGridCellAttr::Cell }, ! { "wxGridCellAttr_Col", wxGridCellAttr::Col }, ! { "wxGridCellAttr_Default", wxGridCellAttr::Default }, ! { "wxGridCellAttr_Merged", wxGridCellAttr::Merged }, ! { "wxGridCellAttr_Row", wxGridCellAttr::Row }, { "wxGRIDTABLE_NOTIFY_COLS_APPENDED", wxGRIDTABLE_NOTIFY_COLS_APPENDED }, { "wxGRIDTABLE_NOTIFY_COLS_DELETED", wxGRIDTABLE_NOTIFY_COLS_DELETED }, *************** *** 2263,2269 **** { "wxGRIDTABLE_REQUEST_VIEW_GET_VALUES", wxGRIDTABLE_REQUEST_VIEW_GET_VALUES }, { "wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES", wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES }, ! { "wxGridSelectCells", wxGrid::wxGridSelectCells }, ! { "wxGridSelectColumns", wxGrid::wxGridSelectColumns }, ! { "wxGridSelectRows", wxGrid::wxGridSelectRows }, #endif --- 2257,2263 ---- { "wxGRIDTABLE_REQUEST_VIEW_GET_VALUES", wxGRIDTABLE_REQUEST_VIEW_GET_VALUES }, { "wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES", wxGRIDTABLE_REQUEST_VIEW_SEND_VALUES }, ! { "wxGrid_wxGridSelectCells", wxGrid::wxGridSelectCells }, ! { "wxGrid_wxGridSelectColumns", wxGrid::wxGridSelectColumns }, ! { "wxGrid_wxGridSelectRows", wxGrid::wxGridSelectRows }, #endif *************** *** 2514,2520 **** #if wxLUA_USE_wxSocket ! { "ASCII", wxFTP::ASCII }, ! { "BINARY", wxFTP::BINARY }, ! { "NONE", wxFTP::NONE }, { "wxPROTO_ABRT", wxPROTO_ABRT }, { "wxPROTO_CONNERR", wxPROTO_CONNERR }, --- 2508,2514 ---- #if wxLUA_USE_wxSocket ! { "wxFTP_ASCII", wxFTP::ASCII }, ! { "wxFTP_BINARY", wxFTP::BINARY }, ! { "wxFTP_NONE", wxFTP::NONE }, { "wxPROTO_ABRT", wxPROTO_ABRT }, { "wxPROTO_CONNERR", wxPROTO_CONNERR }, *************** *** 2600,2606 **** --- 2594,2603 ---- { "wxSYS_COLOUR_CAPTIONTEXT", wxSYS_COLOUR_CAPTIONTEXT }, { "wxSYS_COLOUR_DESKTOP", wxSYS_COLOUR_DESKTOP }, + { "wxSYS_COLOUR_GRADIENTACTIVECAPTION", wxSYS_COLOUR_GRADIENTACTIVECAPTION }, + { "wxSYS_COLOUR_GRADIENTINACTIVECAPTION", wxSYS_COLOUR_GRADIENTINACTIVECAPTION }, { "wxSYS_COLOUR_GRAYTEXT", wxSYS_COLOUR_GRAYTEXT }, { "wxSYS_COLOUR_HIGHLIGHT", wxSYS_COLOUR_HIGHLIGHT }, { "wxSYS_COLOUR_HIGHLIGHTTEXT", wxSYS_COLOUR_HIGHLIGHTTEXT }, + { "wxSYS_COLOUR_HOTLIGHT", wxSYS_COLOUR_HOTLIGHT }, { "wxSYS_COLOUR_INACTIVEBORDER", wxSYS_COLOUR_INACTIVEBORDER }, { "wxSYS_COLOUR_INACTIVECAPTION", wxSYS_COLOUR_INACTIVECAPTION }, *************** *** 2609,2613 **** --- 2606,2613 ---- { "wxSYS_COLOUR_INFOTEXT", wxSYS_COLOUR_INFOTEXT }, { "wxSYS_COLOUR_LISTBOX", wxSYS_COLOUR_LISTBOX }, + { "wxSYS_COLOUR_MAX", wxSYS_COLOUR_MAX }, { "wxSYS_COLOUR_MENU", wxSYS_COLOUR_MENU }, + { "wxSYS_COLOUR_MENUBAR", wxSYS_COLOUR_MENUBAR }, + { "wxSYS_COLOUR_MENUHILIGHT", wxSYS_COLOUR_MENUHILIGHT }, { "wxSYS_COLOUR_MENUTEXT", wxSYS_COLOUR_MENUTEXT }, { "wxSYS_COLOUR_SCROLLBAR", wxSYS_COLOUR_SCROLLBAR }, *************** *** 3056,3084 **** - #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxSystemSettings)) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxSystemSettings) - - // %wxchkver23 %static wxFont GetFont(wxSystemFont index) - static int LUACALL wxLua_wxSystemSettings_GetFont(lua_State *L) - { - wxLuaState wxlState(L); - wxFont *returns; - // wxSystemFont index - wxSystemFont index = (wxSystemFont)wxlState.GetEnumerationType(1); - // call GetFont - // allocate a new object using... [truncated message content] |
|
From: John L. <jr...@us...> - 2006-05-17 22:47:19
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27493/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: change enum wxClass::XXX to be accessed as wxClass_XXX added %staticonly keyword for classes that only have static members Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxstc_datatypes.lua 17 May 2006 05:02:04 -0000 1.25 --- wxstc_datatypes.lua 17 May 2006 22:47:09 -0000 1.26 *************** *** 63,66 **** --- 63,71 ---- Name = "LPVOID", }, + LuaTable = { + DefType = "wxtypedef", + Intrinsic = true, + Name = "LuaTable", + }, PVOID = { DefType = "builtin", *************** *** 197,200 **** --- 202,210 ---- Name = "wxArrayInt", }, + wxArrayInt_FromLuaTable = { + DefType = "wxtypedef", + Intrinsic = true, + Name = "wxArrayInt_FromLuaTable", + }, wxArrayString = { Condition = "wxLUA_USE_wxArrayString", |
|
From: John L. <jr...@us...> - 2006-05-17 22:47:19
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27493/wxLua/docs Modified Files: binding.html Log Message: change enum wxClass::XXX to be accessed as wxClass_XXX added %staticonly keyword for classes that only have static members Index: binding.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/binding.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** binding.html 3 May 2006 22:52:17 -0000 1.9 --- binding.html 17 May 2006 22:47:09 -0000 1.10 *************** *** 20,24 **** <div style="text-align: justify;"> The bindings for wxLua provide information for lua code to interface ! with a C/C++ API. C/C++ objects can be created in lua as userdata and manipulated using the same functional semantics as you would in C/C++. <br> --- 20,24 ---- <div style="text-align: justify;"> The bindings for wxLua provide information for lua code to interface ! with a C/C++ API. The C/C++ objects are created in lua as userdata and manipulated using the same functional semantics as you would in C/C++. <br> *************** *** 61,65 **** </div> - <br> <h2><u>Binding File Descriptions</u></h2> --- 61,64 ---- *************** *** 100,104 **** Constructs" below.</li> ! <li style="text-align: justify;">In wxLua the structure tries to follow the wxWidgets documentation, typically alphabetical.</li> --- 99,103 ---- Constructs" below.</li> ! <li style="text-align: justify;">In wxLua, the structure tries to follow the wxWidgets documentation, typically alphabetical.</li> *************** *** 106,110 **** <li style="text-align: justify;">Class constructors ! first, class member functions, operators, %members, %properties.</li> --- 105,109 ---- <li style="text-align: justify;">Class constructors ! first, class member functions, %operators, %members, %properties.</li> *************** *** 175,178 **** --- 174,197 ---- </ul> + <li>In order for the %overload functionality to work and to get + the proper signatures; the function parameters in the .i file should + match the actual parameters that the %override code implements. In the + interface files for wxLua always have these three lines, where the + first line is for documentation purposes only, the second line is the + original function call for reference purposes to compare what wxWidgets + expects to to get, and the third line is correct calling semantics for + the %overridden function.</li> + + <ul> + + <li>// %override void wxFrame::SetStatusWidths(lua table with + number indexes and values)</li> + + <li>//virtual void SetStatusWidths(int n, int *widths)</li> + + <li>virtual void SetStatusWidths(LuaTable intTable)</li> + + </ul> + </ul> *************** *** 186,189 **** --- 205,209 ---- <li><i><b>const wxArrayString_FromLuaTable& + choices </b>or just</i><i><b>wxArrayString_FromLuaTable choices</b></i></li> *************** *** 197,200 **** --- 217,248 ---- </ul> + <li><i><b>const wxArrayInt_FromLuaTable& + choices </b>or just</i><i><b>wxArrayInt_FromLuaTable + choices</b></i></li> + + <ul> + + <li>The binding generator will read from lua a + table of ints for that parameter and convert them into a + wxArrayInt for the C++ + function.</li> + + </ul> + + <li><i><b>LuaTable tableName</b></i></li> + + <ul> + + <li>The "datatype" LuaTable does not actually exist, but is + used exclusively for %overridden functions in the .i interface files. + It directs the binding generator to expect a lua table for that + parameter. Note that you absolutely must have overrriden this function + as the code it generates will generate errors.</li> + + <li>This is useful for functions like + wxFrame::SetStatusWidths as shown above.</li> + + </ul> + </ul> *************** *** 208,212 **** <ul> ! <li>This tag is ignored since it's mostly for C++ member function calls inside other const member functions or when a variable is passed as const to a function which cannot be specified in --- 256,260 ---- <ul> ! <li>This tag is ignored since it's mostly for C++ member function calls inside other const member functions or when a variable is passed as const to a function which cannot be specified in *************** *** 229,234 **** <ul> ! <li>Example : In the %class wxFileName the function ! <i>"static wxFileName DirName(const wxString& dir)"</i></li> --- 277,282 ---- <ul> ! <li>Example : In the %class wxFileName the function <i>"static ! wxFileName DirName(const wxString& dir)"</i></li> *************** *** 240,243 **** --- 288,300 ---- </ul> + <li>For many classes it is not necessary to specify the full + %static capability, as it generates more binding code. + Oftentimes the user will probably have already created the + object for some other purpose or the object is small and creating a + dummy object just to run the static function would + not be a problem.<br> + + </li> + </ul> *************** *** 297,301 **** derived classes. <br> ! <i><b>%encapsulate</b></i> is for all classes that are not wxObject derived to aid in deleting them.<br> --- 354,359 ---- derived classes. <br> ! <i><b>%encapsulate</b></i> is for <b>all</b> ! classes that are not wxObject derived to aid in deleting them.<br> *************** *** 382,386 **** Note: Why not use wxString? You can't get the data from a wxString if you need to convert from Unicode ! and VC has problems having a wxString as a member of a struct.<br> <br> --- 440,444 ---- Note: Why not use wxString? You can't get the data from a wxString if you need to convert from Unicode ! and VC has problems having the class wxString as a member of a struct.<br> <br> *************** *** 431,440 **** </b><b><i>%include "headerfile.h"</i><br> ! </b>Include a header file by generating the C code <i>#include "headerfile.h"</i>. <br> <b><br> ! </b><b><i>%includefile interfacefile.i</i><br> </b>Includes another wrapper file --- 489,499 ---- </b><b><i>%include "headerfile.h"</i><br> ! </b>Include a C/C++ header file by generating the C code <i>#include "headerfile.h"</i>. <br> <b><br> ! </b><b><i>%includefile interfacefile.i - DEPRECATED ! and probably does not work</i><br> </b>Includes another wrapper file *************** *** 636,645 **** is a static function and moreover that a global function named <i>ClassName_ClassMemberFunction(...)</i> should be created as well. The function can be accessed as <i>wx.ClassName_ClassMemberFunction</i> ! and as <i>classInstance:ClassName_ClassMemberFunction</i>. Note that just using "static" without the % creates the latter function that requires an instance of the class to call. An example of when it doesn't make sense to create the two <i>%static</i> methods is for classes like wxFileName. wxFileName has a small ! memory footprint it's better to just create an instance of it temporarily to call the statiic functions rather than bloat the bindings with unnecessary global functions.<br> --- 695,704 ---- is a static function and moreover that a global function named <i>ClassName_ClassMemberFunction(...)</i> should be created as well. The function can be accessed as <i>wx.ClassName_ClassMemberFunction</i> ! and as <i>classInstance:ClassMemberFunction</i>. Note that just using "static" without the % creates the latter function that requires an instance of the class to call. An example of when it doesn't make sense to create the two <i>%static</i> methods is for classes like wxFileName. wxFileName has a small ! memory footprint so it's better to just create an instance of it temporarily to call the statiic functions rather than bloat the bindings with unnecessary global functions.<br> *************** *** 647,650 **** --- 706,721 ---- <br> + <i><b>%staticonly var_type ClassMemberFunction(...)</b></i><br> + + Declare to the binding generator that the <i>ClassMemberFunction</i> + is a static function and that ONLY a global function named <i>ClassName_ClassMemberFunction(...)</i> + should be created. This means that the you will be unable to access the + function as <i>classInstance:ClassMemberFunction</i>. + This is rarely useful, but some wxWidgets classes such as wxSystemInfo, + wxSystemSettings, and others only have static member functions + and so you never actually create an instance of the class, even in C++.<br> + + <br> + <i><b>%typedef UNKNOWN_CLASS KNOWN_CLASS</b></i><br> |
|
From: John L. <jr...@us...> - 2006-05-17 22:47:19
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27493/wxLua/bindings Modified Files: genwxbind.lua Log Message: change enum wxClass::XXX to be accessed as wxClass_XXX added %staticonly keyword for classes that only have static members Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** genwxbind.lua 16 May 2006 22:47:08 -0000 1.62 --- genwxbind.lua 17 May 2006 22:47:09 -0000 1.63 *************** *** 213,216 **** --- 213,218 ---- -- "fake" data types that we handle in some more complicated way dataTypes["wxArrayString_FromLuaTable"] = AllocDataType("wxArrayString_FromLuaTable", "wxtypedef", true) + dataTypes["wxArrayInt_FromLuaTable"] = AllocDataType("wxArrayInt_FromLuaTable", "wxtypedef", true) + dataTypes["LuaTable"] = AllocDataType("LuaTable", "wxtypedef", true) -- data type attributes that can precede a data type *************** *** 993,996 **** --- 995,999 ---- keywords["%constructor"] = true keywords["%static"] = true + keywords["%staticonly"] = true keywords["%member"] = true keywords["%operator"] = true *************** *** 1753,1757 **** -- ClassName::MemberFunction(...) lineState.IsStaticFunction = true ! lineState.CreateStaticFunction = true lineState.DefType = "method" lineState.Action = "method" --- 1756,1769 ---- -- ClassName::MemberFunction(...) lineState.IsStaticFunction = true ! lineState.CreateStaticFunction = 1 ! lineState.DefType = "method" ! lineState.Action = "method" ! lineState.ActionMandatory = true ! ! elseif tag == "%staticonly" then ! -- means that we will ONLY create function ClassName_MemberFunction(...) ! -- as opposed to "%static" where we also generate member function ! lineState.IsStaticFunction = true ! lineState.CreateStaticFunction = 2 lineState.DefType = "method" lineState.Action = "method" *************** *** 2451,2455 **** elseif lineState.DefType == "method" then ! table.insert(parseState.ObjectStack[1].Members, AllocMember(lineState, GetCondition(parseState.ConditionStack))) if lineState.CreateStaticFunction then --- 2463,2470 ---- elseif lineState.DefType == "method" then ! -- add member if not %staticonly ! if lineState.CreateStaticFunction ~= 2 then ! table.insert(parseState.ObjectStack[1].Members, AllocMember(lineState, GetCondition(parseState.ConditionStack))) ! end if lineState.CreateStaticFunction then *************** *** 2865,2869 **** if pos then namespace = string.sub(dataType, 0, pos - 1) ! -- luaname = namespace.."_"..luaname -- FIXME unrem this to put enums as wxFile::read -> wxFile_read namespace = namespace.."::" end --- 2880,2884 ---- if pos then namespace = string.sub(dataType, 0, pos - 1) ! luaname = namespace.."_"..luaname -- wxFile::read -> wxFile_read namespace = namespace.."::" end *************** *** 3104,3108 **** end ! if (indirectionCount == 1) and (argPtr == "[]") then argTypeWithAttrib = argTypeWithAttrib.." *" --- 3119,3138 ---- end ! -- our special notation to get wxStringArray from a lua table of strings ! if argType == "wxArrayString_FromLuaTable" then ! overload_argList = overload_argList.."&s_wxluaarg_LuaTable, " ! argItem = "wxArrayString(); wxlState.GetwxArrayString("..argNum..", "..argName..")" ! declare = "wxArrayString " ! elseif argType == "wxArrayInt_FromLuaTable" then ! overload_argList = overload_argList.."&s_wxluaarg_LuaTable, " ! argItem = "wxArrayInt(); wxlState.GetwxArrayInt("..argNum..", "..argName..")" ! declare = "wxArrayInt " ! elseif argType == "LuaTable" then ! -- THIS MUST BE AN OVERLOAD AND HANDLED THERE, we just set overload_argList ! -- the code genererated here is nonsense ! overload_argList = overload_argList.."&s_wxluaarg_LuaTable, " ! argItem = "YOU MUST OVERLOAD THIS FUNCTION " ! declare = "YOU MUST OVERLOAD THIS FUNCTION " ! elseif (indirectionCount == 1) and (argPtr == "[]") then argTypeWithAttrib = argTypeWithAttrib.." *" *************** *** 3187,3194 **** end end - -- our special notation to get wxStringArray from a lua table of strings - elseif argType == "wxArrayString_FromLuaTable" then - argItem = "wxArrayString(); dummy_count = wxlState.GetwxArrayString("..argNum..", "..argName..")" - declare = "int dummy_count; wxArrayString " else argTypeWithAttrib = argTypeWithAttrib.." *" --- 3217,3220 ---- |
|
From: John L. <jr...@us...> - 2006-05-17 05:31:15
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31277/wxLua/docs Modified Files: wxluaref.html Log Message: update ref manual Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxluaref.html 16 May 2006 04:55:32 -0000 1.2 --- wxluaref.html 17 May 2006 05:31:12 -0000 1.3 *************** *** 9,13 **** <h1>wxLua Class Reference for wxWidgets 2.6.3</h1> <h2>wxWidgets Classes</h2> ! <a href="#wxANIHandler">wxANIHandler</a><br> <a href="#wxAcceleratorEntry">wxAcceleratorEntry</a><br> <a href="#wxAcceleratorTable">wxAcceleratorTable</a><br> --- 9,13 ---- <h1>wxLua Class Reference for wxWidgets 2.6.3</h1> <h2>wxWidgets Classes</h2> ! <a href="#wxANIHandler">wxANIHandler</a> - NOT IN WX REF MANUAL<br> <a href="#wxAcceleratorEntry">wxAcceleratorEntry</a><br> [...17377 lines suppressed...] + <font color=#000077> <i>%property</i>=X, read, write</font><br> + int GetY() const<br> + <font color=#000077> <i>%property</i>=Y, read, write</font><br> + <a href="#wxString">wxString</a> GetDragText()<br> + <font color=#000077> <i>%property</i>=DragText, read, write</font><br> + bool GetDragAllowMove()<br> + <font color=#000077> <i>%property</i>=DragAllowMove, read, write</font><br> + <a href="#wxDragResult">wxDragResult</a> GetDragResult()<br> + <font color=#000077> <i>%property</i>=DragResult, read, write</font><br> + bool GetShift() const<br> + <font color=#000077> <i>%property</i>=Shift, read</font><br> + bool GetControl() const<br> + <font color=#000077> <i>%property</i>=Control, read</font><br> + bool GetAlt() const<br> + <font color=#000077> <i>%property</i>=Alt, read</font><br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + <i>%endif</i> wxLUA_USE_wxStyledTextCtrl<br> </body> </html> |
|
From: John L. <jr...@us...> - 2006-05-17 05:02:09
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20662/wxLua/modules/wxbind/src Modified Files: print.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: update .i files to use more HTML friendly comment markers update print.i and xml.i to 2.6.3 cleanup generate docs script to use nicer colours and whatnot Index: print.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/print.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** print.cpp 2 May 2006 05:25:02 -0000 1.13 --- print.cpp 17 May 2006 05:02:05 -0000 1.14 *************** *** 57,60 **** --- 57,81 ---- #endif + // %override wxLua_wxPrintout_GetPageInfo + // void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) + static int LUACALL wxLua_wxPrintout_GetPageInfo(lua_State *L) + { + wxLuaState wxlState(L); + int pageTo; + int pageFrom; [...3421 lines suppressed...] static int LUACALL wxLua_wxPrinterDC_constructor(lua_State *L) --- 3335,3339 ---- ! #if (wxLUA_USE_wxPrint) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint)) // wxPrinterDC(const wxPrintData& printData) static int LUACALL wxLua_wxPrinterDC_constructor(lua_State *L) *************** *** 3156,3160 **** { LuaMethod, "Delete", wxLua_wxPrinterDC_Delete, 0, 0, {0} }, ! #if (wxLUA_USE_wxPrint) && ((defined(__WXMSW__)) && (wxLUA_USE_wxPrint)) { LuaConstructor, "wxPrinterDC", wxLua_wxPrinterDC_constructor, 1, 1, { &s_wxluatag_wxPrintData, 0 } }, #endif --- 3364,3368 ---- { LuaMethod, "Delete", wxLua_wxPrinterDC_Delete, 0, 0, {0} }, ! #if (wxLUA_USE_wxPrint) && ((defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint)) { LuaConstructor, "wxPrinterDC", wxLua_wxPrinterDC_constructor, 1, 1, { &s_wxluatag_wxPrintData, 0 } }, #endif Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** xml.cpp 2 May 2006 05:25:06 -0000 1.11 --- xml.cpp 17 May 2006 05:02:05 -0000 1.12 *************** *** 38,56 **** int s_wxluatag_wxXmlNode = -1; ! // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString); ! static int LUACALL wxLua_wxXmlNode_constructor(lua_State *L) { wxLuaState wxlState(L); wxXmlNode *returns; - // get number of arguments - int argCount = lua_gettop(L); - // const wxString content = wxEmptyString - const wxString content = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); - // const wxString name - const wxString name = lua2wx(wxlState.GetStringType(2)); - // wxXmlNodeType type - wxXmlNodeType type = (wxXmlNodeType)wxlState.GetEnumerationType(1); // call constructor ! returns = new wxXmlNode(type, name, content); // add to tracked memory list wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); --- 38,48 ---- int s_wxluatag_wxXmlNode = -1; ! // %constructor wxXmlNodeDefault() ! static int LUACALL wxLua_wxXmlNodeDefault_constructor(lua_State *L) { wxLuaState wxlState(L); wxXmlNode *returns; // call constructor ! returns = new wxXmlNode(); // add to tracked memory list wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); *************** *** 61,71 **** } ! // %constructor wxXmlDefaultNode() ! static int LUACALL wxLua_wxXmlDefaultNode_constructor(lua_State *L) { wxLuaState wxlState(L); wxXmlNode *returns; // call constructor ! returns = new wxXmlNode(); // add to tracked memory list wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); --- 53,71 ---- } ! // wxXmlNode(wxXmlNodeType type, const wxString& name, const wxString& content = wxEmptyString); ! static int LUACALL wxLua_wxXmlNode_constructor(lua_State *L) { wxLuaState wxlState(L); wxXmlNode *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString content = wxEmptyString + const wxString content = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); + // const wxString name + const wxString name = lua2wx(wxlState.GetStringType(2)); + // wxXmlNodeType type + wxXmlNodeType type = (wxXmlNodeType)wxlState.GetEnumerationType(1); // call constructor ! returns = new wxXmlNode(type, name, content); // add to tracked memory list wxLua_AddToTrackedMemoryList(wxlState, (wxXmlNode *)returns); *************** *** 489,494 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxXmlNode_methods[] = { { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, { &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, - { LuaConstructor, "wxXmlDefaultNode", wxLua_wxXmlDefaultNode_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, &s_wxluatag_wxXmlNode, 0 } }, { LuaMethod, "AddChild", wxLua_wxXmlNode_AddChild, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, --- 489,494 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxXmlNode_methods[] = { + { LuaConstructor, "wxXmlNodeDefault", wxLua_wxXmlNodeDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlNode", wxLua_wxXmlNode_constructor, 3, 2, { &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaConstructor, "wxXmlNodeEntry", wxLua_wxXmlNodeEntry_constructor, 6, 6, { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, &s_wxluatag_wxXmlNode, 0 } }, { LuaMethod, "AddChild", wxLua_wxXmlNode_AddChild, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, *************** *** 508,532 **** { LuaMethod, "HasProp", wxLua_wxXmlNode_HasProp, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetType", wxLua_wxXmlNode_SetType, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, - { LuaGetProp, "Type", wxLua_wxXmlNode_GetType, 0, 0, {0} }, - { LuaSetProp, "Type", wxLua_wxXmlNode_SetType, 1, 1, {0} }, { LuaMethod, "SetName", wxLua_wxXmlNode_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaGetProp, "Name", wxLua_wxXmlNode_GetName, 0, 0, {0} }, - { LuaSetProp, "Name", wxLua_wxXmlNode_SetName, 1, 1, {0} }, { LuaMethod, "SetContent", wxLua_wxXmlNode_SetContent, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaGetProp, "Content", wxLua_wxXmlNode_GetContent, 0, 0, {0} }, - { LuaSetProp, "Content", wxLua_wxXmlNode_SetContent, 1, 1, {0} }, { LuaMethod, "SetParent", wxLua_wxXmlNode_SetParent, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, - { LuaGetProp, "Parent", wxLua_wxXmlNode_GetParent, 0, 0, {0} }, - { LuaSetProp, "Parent", wxLua_wxXmlNode_SetParent, 1, 1, {0} }, { LuaMethod, "SetNext", wxLua_wxXmlNode_SetNext, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, - { LuaGetProp, "Next", wxLua_wxXmlNode_GetNext, 0, 0, {0} }, - { LuaSetProp, "Next", wxLua_wxXmlNode_SetNext, 1, 1, {0} }, { LuaMethod, "SetChildren", wxLua_wxXmlNode_SetChildren, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, { LuaGetProp, "Children", wxLua_wxXmlNode_GetChildren, 0, 0, {0} }, { LuaSetProp, "Children", wxLua_wxXmlNode_SetChildren, 1, 1, {0} }, ! { LuaMethod, "SetProperties", wxLua_wxXmlNode_SetProperties, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, { LuaGetProp, "Properties", wxLua_wxXmlNode_GetProperties, 0, 0, {0} }, { LuaSetProp, "Properties", wxLua_wxXmlNode_SetProperties, 1, 1, {0} }, ! { LuaMethod, "AddPropertyEntry", wxLua_wxXmlNode_AddPropertyEntry, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, { LuaDelete, "wxXmlNode", wxLua_wxXmlNode_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlNode_Delete, 0, 0, {0} }, --- 508,532 ---- { LuaMethod, "HasProp", wxLua_wxXmlNode_HasProp, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetType", wxLua_wxXmlNode_SetType, 1, 1, { &s_wxluaarg_Enumeration, 0 } }, { LuaMethod, "SetName", wxLua_wxXmlNode_SetName, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetContent", wxLua_wxXmlNode_SetContent, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "SetParent", wxLua_wxXmlNode_SetParent, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, { LuaMethod, "SetNext", wxLua_wxXmlNode_SetNext, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, { LuaMethod, "SetChildren", wxLua_wxXmlNode_SetChildren, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, + { LuaMethod, "SetProperties", wxLua_wxXmlNode_SetProperties, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, + { LuaMethod, "AddPropertyEntry", wxLua_wxXmlNode_AddPropertyEntry, 1, 1, { &s_wxluatag_wxXmlProperty, 0 } }, { LuaGetProp, "Children", wxLua_wxXmlNode_GetChildren, 0, 0, {0} }, { LuaSetProp, "Children", wxLua_wxXmlNode_SetChildren, 1, 1, {0} }, ! { LuaGetProp, "Content", wxLua_wxXmlNode_GetContent, 0, 0, {0} }, ! { LuaSetProp, "Content", wxLua_wxXmlNode_SetContent, 1, 1, {0} }, ! { LuaGetProp, "Name", wxLua_wxXmlNode_GetName, 0, 0, {0} }, ! { LuaSetProp, "Name", wxLua_wxXmlNode_SetName, 1, 1, {0} }, ! { LuaGetProp, "Next", wxLua_wxXmlNode_GetNext, 0, 0, {0} }, ! { LuaSetProp, "Next", wxLua_wxXmlNode_SetNext, 1, 1, {0} }, ! { LuaGetProp, "Parent", wxLua_wxXmlNode_GetParent, 0, 0, {0} }, ! { LuaSetProp, "Parent", wxLua_wxXmlNode_SetParent, 1, 1, {0} }, { LuaGetProp, "Properties", wxLua_wxXmlNode_GetProperties, 0, 0, {0} }, { LuaSetProp, "Properties", wxLua_wxXmlNode_SetProperties, 1, 1, {0} }, ! { LuaGetProp, "Type", wxLua_wxXmlNode_GetType, 0, 0, {0} }, ! { LuaSetProp, "Type", wxLua_wxXmlNode_SetType, 1, 1, {0} }, { LuaDelete, "wxXmlNode", wxLua_wxXmlNode_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlNode_Delete, 0, 0, {0} }, *************** *** 547,551 **** int s_wxluatag_wxXmlProperty = -1; ! // wxXmlProperty(const wxString& name, const wxString& value, wxXmlProperty *next); static int LUACALL wxLua_wxXmlProperty_constructor(lua_State *L) { --- 547,551 ---- int s_wxluatag_wxXmlProperty = -1; ! // wxXmlProperty(const wxString& name, const wxString& value, wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_constructor(lua_State *L) { *************** *** 568,572 **** } ! // %constructor wxXmlPropertyDefault(); static int LUACALL wxLua_wxXmlPropertyDefault_constructor(lua_State *L) { --- 568,572 ---- } ! // %constructor wxXmlPropertyDefault() static int LUACALL wxLua_wxXmlPropertyDefault_constructor(lua_State *L) { *************** *** 583,587 **** } ! // wxString GetName(); static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L) { --- 583,587 ---- } ! // wxString GetName() static int LUACALL wxLua_wxXmlProperty_GetName(lua_State *L) { *************** *** 598,602 **** } ! // wxString GetValue(); static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L) { --- 598,602 ---- } ! // wxString GetValue() static int LUACALL wxLua_wxXmlProperty_GetValue(lua_State *L) { *************** *** 613,617 **** } ! // wxXmlProperty *GetNext(); static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L) { --- 613,617 ---- } ! // wxXmlProperty *GetNext() static int LUACALL wxLua_wxXmlProperty_GetNext(lua_State *L) { *************** *** 628,632 **** } ! // void SetName(const wxString& name); static int LUACALL wxLua_wxXmlProperty_SetName(lua_State *L) { --- 628,632 ---- } ! // void SetName(const wxString& name) static int LUACALL wxLua_wxXmlProperty_SetName(lua_State *L) { *************** *** 642,646 **** } ! // void SetValue(const wxString& value); static int LUACALL wxLua_wxXmlProperty_SetValue(lua_State *L) { --- 642,646 ---- } ! // void SetValue(const wxString& value) static int LUACALL wxLua_wxXmlProperty_SetValue(lua_State *L) { *************** *** 656,660 **** } ! // void SetNext(wxXmlProperty *next); static int LUACALL wxLua_wxXmlProperty_SetNext(lua_State *L) { --- 656,660 ---- } ! // void SetNext(wxXmlProperty *next) static int LUACALL wxLua_wxXmlProperty_SetNext(lua_State *L) { *************** *** 946,960 **** { LuaMethod, "IsOk", wxLua_wxXmlDocument_IsOk, 0, 0, { 0 } }, { LuaMethod, "GetRoot", wxLua_wxXmlDocument_GetRoot, 0, 0, { 0 } }, { LuaGetProp, "Root", wxLua_wxXmlDocument_GetRoot, 0, 0, {0} }, { LuaSetProp, "Root", wxLua_wxXmlDocument_SetRoot, 1, 1, {0} }, - { LuaMethod, "GetVersion", wxLua_wxXmlDocument_GetVersion, 0, 0, { 0 } }, { LuaGetProp, "Version", wxLua_wxXmlDocument_GetVersion, 0, 0, {0} }, { LuaSetProp, "Version", wxLua_wxXmlDocument_SetVersion, 1, 1, {0} }, - { LuaMethod, "GetFileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, { 0 } }, { LuaGetProp, "FileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, {0} }, { LuaSetProp, "FileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, {0} }, - { LuaMethod, "SetRoot", wxLua_wxXmlDocument_SetRoot, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, - { LuaMethod, "SetVersion", wxLua_wxXmlDocument_SetVersion, 1, 1, { &s_wxluaarg_String, 0 } }, - { LuaMethod, "SetFileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaDelete, "wxXmlDocument", wxLua_wxXmlDocument_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlDocument_Delete, 0, 0, {0} }, --- 946,960 ---- { LuaMethod, "IsOk", wxLua_wxXmlDocument_IsOk, 0, 0, { 0 } }, { LuaMethod, "GetRoot", wxLua_wxXmlDocument_GetRoot, 0, 0, { 0 } }, + { LuaMethod, "GetVersion", wxLua_wxXmlDocument_GetVersion, 0, 0, { 0 } }, + { LuaMethod, "GetFileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, { 0 } }, + { LuaMethod, "SetRoot", wxLua_wxXmlDocument_SetRoot, 1, 1, { &s_wxluatag_wxXmlNode, 0 } }, + { LuaMethod, "SetVersion", wxLua_wxXmlDocument_SetVersion, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "SetFileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaGetProp, "Root", wxLua_wxXmlDocument_GetRoot, 0, 0, {0} }, { LuaSetProp, "Root", wxLua_wxXmlDocument_SetRoot, 1, 1, {0} }, { LuaGetProp, "Version", wxLua_wxXmlDocument_GetVersion, 0, 0, {0} }, { LuaSetProp, "Version", wxLua_wxXmlDocument_SetVersion, 1, 1, {0} }, { LuaGetProp, "FileEncoding", wxLua_wxXmlDocument_GetFileEncoding, 0, 0, {0} }, { LuaSetProp, "FileEncoding", wxLua_wxXmlDocument_SetFileEncoding, 1, 1, {0} }, { LuaDelete, "wxXmlDocument", wxLua_wxXmlDocument_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlDocument_Delete, 0, 0, {0} }, *************** *** 1304,1321 **** } - // void AddHandler(wxXmlResourceHandler* handler); - static int LUACALL wxLua_wxXmlResource_AddHandler(lua_State *L) - { - wxLuaState wxlState(L); - // wxXmlResourceHandler handler - wxXmlResourceHandler * handler = (wxXmlResourceHandler *)wxlState.GetUserDataType(2, s_wxluatag_wxXmlResourceHandler); - // get this - wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); - // call AddHandler - self->AddHandler(handler); - - return 0; - } - // bool AttachUnknownControl(const wxString& name, wxWindow* control, wxWindow* parent = NULL); static int LUACALL wxLua_wxXmlResource_AttachUnknownControl(lua_State *L) --- 1304,1307 ---- *************** *** 1390,1393 **** --- 1376,1394 ---- } + // int GetFlags() + static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get this + wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); + // call GetFlags + returns = self->GetFlags(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + // long GetVersion() const; static int LUACALL wxLua_wxXmlResource_GetVersion(lua_State *L) *************** *** 1506,1524 **** } - // int GetFlags(); - static int LUACALL wxLua_wxXmlResource_GetFlags(lua_State *L) - { - wxLuaState wxlState(L); - int returns; - // get this - wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); - // call GetFlags - returns = self->GetFlags(); - // push the result number - lua_pushnumber(L, returns); - - return 1; - } - // void SetFlags(int flags); static int LUACALL wxLua_wxXmlResource_SetFlags(lua_State *L) --- 1507,1510 ---- *************** *** 1535,1538 **** --- 1521,1541 ---- } + // bool Unload(const wxString& filename) + static int LUACALL wxLua_wxXmlResource_Unload(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxString filename + const wxString filename = lua2wx(wxlState.GetStringType(2)); + // get this + wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); + // call Unload + returns = self->Unload(filename); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + static int LUACALL wxLua_wxXmlResource_destructor(lua_State *L) { *************** *** 1604,1614 **** { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlResourceDefault", wxLua_wxXmlResourceDefault_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, - { LuaMethod, "AddHandler", wxLua_wxXmlResource_AddHandler, 1, 1, { &s_wxluatag_wxXmlResourceHandler, 0 } }, { LuaMethod, "AttachUnknownControl", wxLua_wxXmlResource_AttachUnknownControl, 3, 2, { &s_wxluaarg_String, &s_wxluatag_wxWindow, &s_wxluatag_wxWindow, 0 } }, { LuaMethod, "ClearHandlers", wxLua_wxXmlResource_ClearHandlers, 0, 0, { 0 } }, { LuaMethod, "CompareVersion", wxLua_wxXmlResource_CompareVersion, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Get", wxLua_wxXmlResource_Get, 0, 0, { 0 } }, { LuaMethod, "GetVersion", wxLua_wxXmlResource_GetVersion, 0, 0, { 0 } }, - { LuaGetProp, "Version", wxLua_wxXmlResource_GetVersion, 0, 0, {0} }, { LuaMethod, "GetXRCID", wxLua_wxXmlResource_GetXRCID, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "InitAllHandlers", wxLua_wxXmlResource_InitAllHandlers, 0, 0, { 0 } }, --- 1607,1616 ---- { LuaConstructor, "wxXmlResourceGetDefault", wxLua_wxXmlResourceGetDefault_constructor, 0, 0, { 0 } }, { LuaConstructor, "wxXmlResourceDefault", wxLua_wxXmlResourceDefault_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "AttachUnknownControl", wxLua_wxXmlResource_AttachUnknownControl, 3, 2, { &s_wxluaarg_String, &s_wxluatag_wxWindow, &s_wxluatag_wxWindow, 0 } }, { LuaMethod, "ClearHandlers", wxLua_wxXmlResource_ClearHandlers, 0, 0, { 0 } }, { LuaMethod, "CompareVersion", wxLua_wxXmlResource_CompareVersion, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Get", wxLua_wxXmlResource_Get, 0, 0, { 0 } }, + { LuaMethod, "GetFlags", wxLua_wxXmlResource_GetFlags, 0, 0, { 0 } }, { LuaMethod, "GetVersion", wxLua_wxXmlResource_GetVersion, 0, 0, { 0 } }, { LuaMethod, "GetXRCID", wxLua_wxXmlResource_GetXRCID, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaMethod, "InitAllHandlers", wxLua_wxXmlResource_InitAllHandlers, 0, 0, { 0 } }, *************** *** 1617,1623 **** { LuaMethod, "LoadPanelCreate", wxLua_wxXmlResource_LoadPanelCreate, 3, 3, { &s_wxluatag_wxPanel, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "Set", wxLua_wxXmlResource_Set, 1, 1, { &s_wxluatag_wxXmlResource, 0 } }, - { LuaMethod, "GetFlags", wxLua_wxXmlResource_GetFlags, 0, 0, { 0 } }, { LuaMethod, "SetFlags", wxLua_wxXmlResource_SetFlags, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaGetProp, "Flags", wxLua_wxXmlResource_GetFlags, 0, 0, {0} }, { LuaDelete, "wxXmlResource", wxLua_wxXmlResource_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlResource_Delete, 0, 0, {0} }, --- 1619,1626 ---- { LuaMethod, "LoadPanelCreate", wxLua_wxXmlResource_LoadPanelCreate, 3, 3, { &s_wxluatag_wxPanel, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "Set", wxLua_wxXmlResource_Set, 1, 1, { &s_wxluatag_wxXmlResource, 0 } }, { LuaMethod, "SetFlags", wxLua_wxXmlResource_SetFlags, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "Unload", wxLua_wxXmlResource_Unload, 1, 1, { &s_wxluaarg_String, 0 } }, { LuaGetProp, "Flags", wxLua_wxXmlResource_GetFlags, 0, 0, {0} }, + { LuaGetProp, "Version", wxLua_wxXmlResource_GetVersion, 0, 0, {0} }, { LuaDelete, "wxXmlResource", wxLua_wxXmlResource_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxXmlResource_Delete, 0, 0, {0} }, Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wx_bind.cpp 16 May 2006 22:47:09 -0000 1.39 --- wx_bind.cpp 17 May 2006 05:02:05 -0000 1.40 *************** *** 894,907 **** { "wxFLOOD_SURFACE", wxFLOOD_SURFACE }, { "wxINVERT", wxINVERT }, - { "wxMM_ANISOTROPIC", wxMM_ANISOTROPIC }, - { "wxMM_HIENGLISH", wxMM_HIENGLISH }, - { "wxMM_HIMETRIC", wxMM_HIMETRIC }, - { "wxMM_ISOTROPIC", wxMM_ISOTROPIC }, - { "wxMM_LOENGLISH", wxMM_LOENGLISH }, - { "wxMM_LOMETRIC", wxMM_LOMETRIC }, - { "wxMM_METRIC", wxMM_METRIC }, - { "wxMM_POINTS", wxMM_POINTS }, - { "wxMM_TEXT", wxMM_TEXT }, - { "wxMM_TWIPS", wxMM_TWIPS }, { "wxNAND", wxNAND }, { "wxNOR", wxNOR }, --- 894,897 ---- *************** *** 1264,1269 **** --- 1254,1274 ---- #if wxLUA_USE_wxPrint + { "wxID_PREVIEW_CLOSE", wxID_PREVIEW_CLOSE }, + { "wxID_PREVIEW_FIRST", wxID_PREVIEW_FIRST }, + { "wxID_PREVIEW_GOTO", wxID_PREVIEW_GOTO }, + { "wxID_PREVIEW_LAST", wxID_PREVIEW_LAST }, + { "wxID_PREVIEW_NEXT", wxID_PREVIEW_NEXT }, + { "wxID_PREVIEW_PREVIOUS", wxID_PREVIEW_PREVIOUS }, + { "wxID_PREVIEW_PRINT", wxID_PREVIEW_PRINT }, + { "wxID_PREVIEW_ZOOM", wxID_PREVIEW_ZOOM }, { "wxLANDSCAPE", wxLANDSCAPE }, { "wxPORTRAIT", wxPORTRAIT }, + { "wxPREVIEW_FIRST", wxPREVIEW_FIRST }, + { "wxPREVIEW_GOTO", wxPREVIEW_GOTO }, + { "wxPREVIEW_LAST", wxPREVIEW_LAST }, + { "wxPREVIEW_NEXT", wxPREVIEW_NEXT }, + { "wxPREVIEW_PREVIOUS", wxPREVIEW_PREVIOUS }, + { "wxPREVIEW_PRINT", wxPREVIEW_PRINT }, + { "wxPREVIEW_ZOOM", wxPREVIEW_ZOOM }, #endif *************** *** 1943,1946 **** --- 1948,1965 ---- + #if wxLUA_USE_wxDC + { "wxMM_ANISOTROPIC", wxMM_ANISOTROPIC }, + { "wxMM_HIENGLISH", wxMM_HIENGLISH }, + { "wxMM_HIMETRIC", wxMM_HIMETRIC }, + { "wxMM_ISOTROPIC", wxMM_ISOTROPIC }, + { "wxMM_LOENGLISH", wxMM_LOENGLISH }, + { "wxMM_LOMETRIC", wxMM_LOMETRIC }, + { "wxMM_METRIC", wxMM_METRIC }, + { "wxMM_POINTS", wxMM_POINTS }, + { "wxMM_TEXT", wxMM_TEXT }, + { "wxMM_TWIPS", wxMM_TWIPS }, + #endif + + #if wxLUA_USE_wxDataObject { "Get", wxDataObject::Get }, *************** *** 2325,2328 **** --- 2344,2348 ---- { "wxPAPER_10X14", wxPAPER_10X14 }, { "wxPAPER_11X17", wxPAPER_11X17 }, + { "wxPAPER_12X11", wxPAPER_12X11 }, { "wxPAPER_15X11", wxPAPER_15X11 }, { "wxPAPER_9X11", wxPAPER_9X11 }, *************** *** 2331,2334 **** --- 2351,2355 ---- { "wxPAPER_A3_EXTRA", wxPAPER_A3_EXTRA }, { "wxPAPER_A3_EXTRA_TRANSVERSE", wxPAPER_A3_EXTRA_TRANSVERSE }, + { "wxPAPER_A3_ROTATED", wxPAPER_A3_ROTATED }, { "wxPAPER_A3_TRANSVERSE", wxPAPER_A3_TRANSVERSE }, { "wxPAPER_A4", wxPAPER_A4 }, *************** *** 2336,2350 **** --- 2357,2381 ---- { "wxPAPER_A4_EXTRA", wxPAPER_A4_EXTRA }, { "wxPAPER_A4_PLUS", wxPAPER_A4_PLUS }, + { "wxPAPER_A4_ROTATED", wxPAPER_A4_ROTATED }, { "wxPAPER_A4_TRANSVERSE", wxPAPER_A4_TRANSVERSE }, { "wxPAPER_A5", wxPAPER_A5 }, { "wxPAPER_A5_EXTRA", wxPAPER_A5_EXTRA }, + { "wxPAPER_A5_ROTATED", wxPAPER_A5_ROTATED }, { "wxPAPER_A5_TRANSVERSE", wxPAPER_A5_TRANSVERSE }, + { "wxPAPER_A6", wxPAPER_A6 }, + { "wxPAPER_A6_ROTATED", wxPAPER_A6_ROTATED }, { "wxPAPER_A_PLUS", wxPAPER_A_PLUS }, { "wxPAPER_B4", wxPAPER_B4 }, + { "wxPAPER_B4_JIS_ROTATED", wxPAPER_B4_JIS_ROTATED }, { "wxPAPER_B5", wxPAPER_B5 }, { "wxPAPER_B5_EXTRA", wxPAPER_B5_EXTRA }, + { "wxPAPER_B5_JIS_ROTATED", wxPAPER_B5_JIS_ROTATED }, { "wxPAPER_B5_TRANSVERSE", wxPAPER_B5_TRANSVERSE }, + { "wxPAPER_B6_JIS", wxPAPER_B6_JIS }, + { "wxPAPER_B6_JIS_ROTATED", wxPAPER_B6_JIS_ROTATED }, { "wxPAPER_B_PLUS", wxPAPER_B_PLUS }, { "wxPAPER_CSHEET", wxPAPER_CSHEET }, + { "wxPAPER_DBL_JAPANESE_POSTCARD", wxPAPER_DBL_JAPANESE_POSTCARD }, + { "wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED", wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED }, { "wxPAPER_DSHEET", wxPAPER_DSHEET }, { "wxPAPER_ENV_10", wxPAPER_ENV_10 }, *************** *** 2374,2377 **** --- 2405,2419 ---- { "wxPAPER_ISO_B4", wxPAPER_ISO_B4 }, { "wxPAPER_JAPANESE_POSTCARD", wxPAPER_JAPANESE_POSTCARD }, + { "wxPAPER_JAPANESE_POSTCARD_ROTATED", wxPAPER_JAPANESE_POSTCARD_ROTATED }, + { "wxPAPER_JENV_CHOU3", wxPAPER_JENV_CHOU3 }, + { "wxPAPER_JENV_CHOU3_ROTATED", wxPAPER_JENV_CHOU3_ROTATED }, + { "wxPAPER_JENV_CHOU4", wxPAPER_JENV_CHOU4 }, + { "wxPAPER_JENV_CHOU4_ROTATED", wxPAPER_JENV_CHOU4_ROTATED }, + { "wxPAPER_JENV_KAKU2", wxPAPER_JENV_KAKU2 }, + { "wxPAPER_JENV_KAKU2_ROTATED", wxPAPER_JENV_KAKU2_ROTATED }, + { "wxPAPER_JENV_KAKU3", wxPAPER_JENV_KAKU3 }, + { "wxPAPER_JENV_KAKU3_ROTATED", wxPAPER_JENV_KAKU3_ROTATED }, + { "wxPAPER_JENV_YOU4", wxPAPER_JENV_YOU4 }, + { "wxPAPER_JENV_YOU4_ROTATED", wxPAPER_JENV_YOU4_ROTATED }, { "wxPAPER_LEDGER", wxPAPER_LEDGER }, { "wxPAPER_LEGAL", wxPAPER_LEGAL }, *************** *** 2382,2388 **** --- 2424,2457 ---- { "wxPAPER_LETTER_EXTRA_TRANSVERSE", wxPAPER_LETTER_EXTRA_TRANSVERSE }, { "wxPAPER_LETTER_PLUS", wxPAPER_LETTER_PLUS }, + { "wxPAPER_LETTER_ROTATED", wxPAPER_LETTER_ROTATED }, { "wxPAPER_LETTER_TRANSVERSE", wxPAPER_LETTER_TRANSVERSE }, { "wxPAPER_NONE", wxPAPER_NONE }, { "wxPAPER_NOTE", wxPAPER_NOTE }, + { "wxPAPER_P16K", wxPAPER_P16K }, + { "wxPAPER_P16K_ROTATED", wxPAPER_P16K_ROTATED }, + { "wxPAPER_P32K", wxPAPER_P32K }, + { "wxPAPER_P32KBIG", wxPAPER_P32KBIG }, + { "wxPAPER_P32KBIG_ROTATED", wxPAPER_P32KBIG_ROTATED }, + { "wxPAPER_P32K_ROTATED", wxPAPER_P32K_ROTATED }, + { "wxPAPER_PENV_1", wxPAPER_PENV_1 }, + { "wxPAPER_PENV_10", wxPAPER_PENV_10 }, + { "wxPAPER_PENV_10_ROTATED", wxPAPER_PENV_10_ROTATED }, + { "wxPAPER_PENV_1_ROTATED", wxPAPER_PENV_1_ROTATED }, + { "wxPAPER_PENV_2", wxPAPER_PENV_2 }, + { "wxPAPER_PENV_2_ROTATED", wxPAPER_PENV_2_ROTATED }, + { "wxPAPER_PENV_3", wxPAPER_PENV_3 }, + { "wxPAPER_PENV_3_ROTATED", wxPAPER_PENV_3_ROTATED }, + { "wxPAPER_PENV_4", wxPAPER_PENV_4 }, + { "wxPAPER_PENV_4_ROTATED", wxPAPER_PENV_4_ROTATED }, + { "wxPAPER_PENV_5", wxPAPER_PENV_5 }, + { "wxPAPER_PENV_5_ROTATED", wxPAPER_PENV_5_ROTATED }, + { "wxPAPER_PENV_6", wxPAPER_PENV_6 }, + { "wxPAPER_PENV_6_ROTATED", wxPAPER_PENV_6_ROTATED }, + { "wxPAPER_PENV_7", wxPAPER_PENV_7 }, + { "wxPAPER_PENV_7_ROTATED", wxPAPER_PENV_7_ROTATED }, + { "wxPAPER_PENV_8", wxPAPER_PENV_8 }, + { "wxPAPER_PENV_8_ROTATED", wxPAPER_PENV_8_ROTATED }, + { "wxPAPER_PENV_9", wxPAPER_PENV_9 }, + { "wxPAPER_PENV_9_ROTATED", wxPAPER_PENV_9_ROTATED }, { "wxPAPER_QUARTO", wxPAPER_QUARTO }, { "wxPAPER_STATEMENT", wxPAPER_STATEMENT }, *************** *** 2634,2637 **** --- 2703,2707 ---- { "wxXML_PI_NODE", wxXML_PI_NODE }, { "wxXML_TEXT_NODE", wxXML_TEXT_NODE }, + { "wxXRC_NO_RELOADING", wxXRC_NO_RELOADING }, { "wxXRC_NO_SUBCLASSING", wxXRC_NO_SUBCLASSING }, { "wxXRC_USE_LOCALE", wxXRC_USE_LOCALE }, *************** *** 2639,2642 **** --- 2709,2721 ---- + #if wxUSE_HOTKEY + { "wxMOD_ALT", wxMOD_ALT }, + { "wxMOD_CONTROL", wxMOD_CONTROL }, + { "wxMOD_NONE", wxMOD_NONE }, + { "wxMOD_SHIFT", wxMOD_SHIFT }, + { "wxMOD_WIN", wxMOD_WIN }, + #endif + + #if wxUSE_STREAMS { "wxEOL_DOS", wxEOL_DOS }, *************** *** 5348,5351 **** --- 5427,5435 ---- + #if (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint) + { "wxPrinterDC", wxPrinterDC_methods, wxPrinterDC_methodCount, -1, CLASSINFO(wxPrinterDC), &s_wxluatag_wxPrinterDC, "wxDC" }, + #endif + + #if (defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) { "wxBitmapHandler", wxBitmapHandler_methods, wxBitmapHandler_methodCount, -1, NULL, &s_wxluatag_wxBitmapHandler, NULL }, *************** *** 5360,5368 **** - #if (defined(__WXMSW__)) && (wxLUA_USE_wxPrint) - { "wxPrinterDC", wxPrinterDC_methods, wxPrinterDC_methodCount, -1, CLASSINFO(wxPrinterDC), &s_wxluatag_wxPrinterDC, "wxDC" }, - #endif - - #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 }, --- 5444,5447 ---- *************** *** 5425,5429 **** { "wxPreviewFrame", wxPreviewFrame_methods, wxPreviewFrame_methodCount, -1, CLASSINFO(wxPreviewFrame), &s_wxluatag_wxPreviewFrame, "wxFrame" }, { "wxPrintPreview", wxPrintPreview_methods, wxPrintPreview_methodCount, -1, NULL, &s_wxluatag_wxPrintPreview, "wxObject" }, ! { "wxPrinter", wxPrinter_methods, wxPrinter_methodCount, -1, NULL, &s_wxluatag_wxPrinter, "wxObject" }, #endif --- 5504,5508 ---- { "wxPreviewFrame", wxPreviewFrame_methods, wxPreviewFrame_methodCount, -1, CLASSINFO(wxPreviewFrame), &s_wxluatag_wxPreviewFrame, "wxFrame" }, { "wxPrintPreview", wxPrintPreview_methods, wxPrintPreview_methodCount, -1, NULL, &s_wxluatag_wxPrintPreview, "wxObject" }, ! { "wxPrinter", wxPrinter_methods, wxPrinter_methodCount, -1, CLASSINFO(wxPrinter), &s_wxluatag_wxPrinter, "wxObject" }, #endif *************** *** 5492,5495 **** --- 5571,5579 ---- + #if (wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT) && (wxLUA_USE_wxPrint) + { "wxPostScriptDC", wxPostScriptDC_methods, wxPostScriptDC_methodCount, -1, CLASSINFO(wxPostScriptDC), &s_wxluatag_wxPostScriptDC, "wxDC" }, + #endif + + #if (wxUSE_SOUND) && (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxWave) { "wxSound", wxSound_methods, wxSound_methodCount, -1, NULL, &s_wxluatag_wxSound, "wxObject" }, *************** *** 5995,6001 **** #if wxLUA_USE_wxPrint ! { "wxPageSetupDialog", wxPageSetupDialog_methods, wxPageSetupDialog_methodCount, -1, CLASSINFO(wxPageSetupDialog), &s_wxluatag_wxPageSetupDialog, "wxDialog" }, { "wxPageSetupDialogData", wxPageSetupDialogData_methods, wxPageSetupDialogData_methodCount, -1, CLASSINFO(wxPageSetupDialogData), &s_wxluatag_wxPageSetupDialogData, "wxObject" }, { "wxPreviewCanvas", wxPreviewCanvas_methods, wxPreviewCanvas_methodCount, -1, NULL, &s_wxluatag_wxPreviewCanvas, "wxScrolledWindow" }, { "wxPrintData", wxPrintData_methods, wxPrintData_methodCount, -1, CLASSINFO(wxPrintData), &s_wxluatag_wxPrintData, "wxObject" }, { "wxPrintDialog", wxPrintDialog_methods, wxPrintDialog_methodCount, -1, CLASSINFO(wxPrintDialog), &s_wxluatag_wxPrintDialog, "wxObject" }, --- 6079,6086 ---- #if wxLUA_USE_wxPrint ! { "wxPageSetupDialog", wxPageSetupDialog_methods, wxPageSetupDialog_methodCount, -1, CLASSINFO(wxPageSetupDialog), &s_wxluatag_wxPageSetupDialog, "wxObject" }, { "wxPageSetupDialogData", wxPageSetupDialogData_methods, wxPageSetupDialogData_methodCount, -1, CLASSINFO(wxPageSetupDialogData), &s_wxluatag_wxPageSetupDialogData, "wxObject" }, { "wxPreviewCanvas", wxPreviewCanvas_methods, wxPreviewCanvas_methodCount, -1, NULL, &s_wxluatag_wxPreviewCanvas, "wxScrolledWindow" }, + { "wxPreviewControlBar", wxPreviewControlBar_methods, wxPreviewControlBar_methodCount, -1, CLASSINFO(wxPreviewControlBar), &s_wxluatag_wxPreviewControlBar, "wxPanel" }, { "wxPrintData", wxPrintData_methods, wxPrintData_methodCount, -1, CLASSINFO(wxPrintData), &s_wxluatag_wxPrintData, "wxObject" }, { "wxPrintDialog", wxPrintDialog_methods, wxPrintDialog_methodCount, -1, CLASSINFO(wxPrintDialog), &s_wxluatag_wxPrintDialog, "wxObject" }, Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxlua.cpp 2 May 2006 05:25:06 -0000 1.16 --- wxlua.cpp 17 May 2006 05:02:05 -0000 1.17 *************** *** 636,641 **** } ! static int LUACALL wxLua_wxLuaDebugEvent_destructor(lua_State *) { return 0; } --- 636,661 ---- } ! static int LUACALL wxLua_wxLuaDebugEvent_destructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); ! ! // remove from tracked memory list ! if (self != 0) ! wxlState.RemoveTrackedMemory(self); ! return 0; ! } ! ! static int LUACALL wxLua_wxLuaDebugEvent_Delete(lua_State *L) { + wxLuaState wxlState(L); + wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); + // 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; } *************** *** 653,656 **** --- 673,677 ---- { LuaMethod, "GetDebugData", wxLua_wxLuaDebugEvent_GetDebugData, 0, 0, { 0 } }, { LuaDelete, "wxLuaDebugEvent", wxLua_wxLuaDebugEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxLuaDebugEvent_Delete, 0, 0, {0} }, }; *************** *** 913,918 **** } ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_destructor(lua_State *) { return 0; } --- 934,959 ---- } ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_destructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); ! ! // remove from tracked memory list ! if (self != 0) ! wxlState.RemoveTrackedMemory(self); ! return 0; ! } ! ! static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L) { + wxLuaState wxlState(L); + wxLuaHtmlWinTagEvent * self = (wxLuaHtmlWinTagEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaHtmlWinTagEvent); + // 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; } *************** *** 927,932 **** #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, { 0 } }, - { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, {0} }, { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, { 0 } }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, {0} }, #endif --- 968,973 ---- #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) { LuaMethod, "GetHtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, { 0 } }, { LuaMethod, "GetHtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, { 0 } }, + { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, {0} }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, {0} }, #endif *************** *** 937,940 **** --- 978,982 ---- { LuaSetProp, "ParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 1, {0} }, { LuaDelete, "wxLuaHtmlWinTagEvent", wxLua_wxLuaHtmlWinTagEvent_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxLuaHtmlWinTagEvent_Delete, 0, 0, {0} }, }; |
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20662/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i config.i controls.i data.i datetime.i defsutil.i dialogs.i event.i file.i fl.i gdi.i geometry.i grid.i help.i html.i image.i mdi.i menutool.i override.hpp print.i regex.i sizer.i socket.i thread.i wave.i windows.i wx_datatypes.lua wxlua.i xml.i Log Message: update .i files to use more HTML friendly comment markers update print.i and xml.i to 2.6.3 cleanup generate docs script to use nicer colours and whatnot Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wave.i 16 May 2006 22:47:09 -0000 1.7 --- wave.i 17 May 2006 05:02:04 -0000 1.8 *************** *** 1,14 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxSound/wxWave ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// %if wxLUA_USE_wxWave ! /////////////////////////////////////////////////////////////////////////////// // wxSound --- 1,14 ---- ! // ============================================================================ // Purpose: wxSound/wxWave ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ %if wxLUA_USE_wxWave ! //----------------------------------------------------------------------------- // wxSound *************** *** 38,42 **** %endif // %wxchkver26 ! /////////////////////////////////////////////////////////////////////////////// // wxWave --- 38,42 ---- %endif // %wxchkver26 ! //----------------------------------------------------------------------------- // wxWave *************** *** 61,65 **** %endif // %msw&!%wxchkver25 ! /////////////////////////////////////////////////////////////////////////////// // wxMediaCtrl --- 61,65 ---- %endif // %msw&!%wxchkver25 ! //----------------------------------------------------------------------------- // wxMediaCtrl *************** *** 105,109 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMediaEvent --- 105,109 ---- %endclass ! //----------------------------------------------------------------------------- // wxMediaEvent Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** menutool.i 15 May 2006 21:55:35 -0000 1.9 --- menutool.i 17 May 2006 05:02:04 -0000 1.10 *************** *** 1,12 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxMenu and wxToolbar classes ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// ! /////////////////////////////////////////////////////////////////////////////// // wxMenu --- 1,12 ---- ! // ============================================================================ // Purpose: wxMenu and wxToolbar classes ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ ! //----------------------------------------------------------------------------- // wxMenu *************** *** 75,79 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMenuBar --- 75,79 ---- %endclass ! //----------------------------------------------------------------------------- // wxMenuBar *************** *** 107,111 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMenuItem --- 107,111 ---- %endclass ! //----------------------------------------------------------------------------- // wxMenuItem *************** *** 151,155 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMenuItemList --- 151,155 ---- %endclass ! //----------------------------------------------------------------------------- // wxMenuItemList *************** *** 163,167 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMenuEvent --- 163,167 ---- %endclass ! //----------------------------------------------------------------------------- // wxMenuEvent *************** *** 182,186 **** %endif wxLUA_USE_wxMenu ! /////////////////////////////////////////////////////////////////////////////// // wxToolBarBase --- 182,186 ---- %endif wxLUA_USE_wxMenu ! //----------------------------------------------------------------------------- // wxToolBarBase *************** *** 261,265 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxToolBar --- 261,265 ---- %endclass ! //----------------------------------------------------------------------------- // wxToolBar *************** *** 273,277 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxToolBarSimple --- 273,277 ---- %endclass ! //----------------------------------------------------------------------------- // wxToolBarSimple *************** *** 285,289 **** %wxchkver22&!%wxchkver25 %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxToolBarToolBase --- 285,289 ---- %wxchkver22&!%wxchkver25 %endclass ! //----------------------------------------------------------------------------- // wxToolBarToolBase *************** *** 341,345 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxToolBarTool --- 341,345 ---- %endclass ! //----------------------------------------------------------------------------- // wxToolBarTool Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** clipdrag.i 4 May 2006 05:07:03 -0000 1.16 --- clipdrag.i 17 May 2006 05:02:04 -0000 1.17 *************** *** 1,14 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxClipboard and drag & drop and their wxDataFormat ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// // TODO - Missing wxClipboardLocker ! /////////////////////////////////////////////////////////////////////////////// // wxClipboard --- 1,14 ---- ! // ============================================================================ // Purpose: wxClipboard and drag & drop and their wxDataFormat ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ // TODO - Missing wxClipboardLocker ! //----------------------------------------------------------------------------- // wxClipboard *************** *** 37,41 **** %endif wxLUA_USE_wxClipboard ! /////////////////////////////////////////////////////////////////////////////// // wxDataFormat --- 37,41 ---- %endif wxLUA_USE_wxClipboard ! //----------------------------------------------------------------------------- // wxDataFormat *************** *** 84,88 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDataObject --- 84,88 ---- %endclass ! //----------------------------------------------------------------------------- // wxDataObject *************** *** 107,111 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDataObjectSimple --- 107,111 ---- %endclass ! //----------------------------------------------------------------------------- // wxDataObjectSimple *************** *** 125,129 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDataObjectComposite --- 125,129 ---- %endclass ! //----------------------------------------------------------------------------- // wxDataObjectComposite *************** *** 134,138 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxFileDataObject --- 134,138 ---- %endclass ! //----------------------------------------------------------------------------- // wxFileDataObject *************** *** 144,148 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxTextDataObject --- 144,148 ---- %endclass ! //----------------------------------------------------------------------------- // wxTextDataObject *************** *** 155,159 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxBitmapDataObject --- 155,159 ---- %endclass ! //----------------------------------------------------------------------------- // wxBitmapDataObject *************** *** 165,169 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxCustomDataObject --- 165,169 ---- %endclass ! //----------------------------------------------------------------------------- // wxCustomDataObject *************** *** 181,185 **** %endif wxLUA_USE_wxDataObject ! /////////////////////////////////////////////////////////////////////////////// // wxDropTarget --- 181,185 ---- %endif wxLUA_USE_wxDataObject ! //----------------------------------------------------------------------------- // wxDropTarget *************** *** 219,223 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxFileDropTarget --- 219,223 ---- %endclass ! //----------------------------------------------------------------------------- // wxFileDropTarget *************** *** 228,232 **** //%endclass ! /////////////////////////////////////////////////////////////////////////////// // wxTextDropTarget --- 228,232 ---- //%endclass ! //----------------------------------------------------------------------------- // wxTextDropTarget *************** *** 236,240 **** //%endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDropSource --- 236,240 ---- //%endclass ! //----------------------------------------------------------------------------- // wxDropSource *************** *** 252,256 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxDropFilesEvent --- 252,256 ---- %endclass ! //----------------------------------------------------------------------------- // wxDropFilesEvent *************** *** 270,274 **** %endif wxLUA_USE_wxDragDrop ! /////////////////////////////////////////////////////////////////////////////// // wxMetafile --- 270,274 ---- %endif wxLUA_USE_wxDragDrop ! //----------------------------------------------------------------------------- // wxMetafile *************** *** 288,292 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxMetafileDC %class %delete %noclassinfo wxMetafileDC, wxDC --- 288,292 ---- %endclass ! //----------------------------------------------------------------------------- // wxMetafileDC %class %delete %noclassinfo wxMetafileDC, wxDC Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** data.i 1 May 2006 19:36:30 -0000 1.13 --- data.i 17 May 2006 05:02:04 -0000 1.14 *************** *** 1,12 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: data classes, wxObject, arrays, lists, hash ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// ! /////////////////////////////////////////////////////////////////////////////// // wxClientData --- 1,12 ---- ! // ============================================================================ // Purpose: data classes, wxObject, arrays, lists, hash ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ ! //----------------------------------------------------------------------------- // wxClientData *************** *** 22,26 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxStringClientData --- 22,26 ---- %endclass ! //----------------------------------------------------------------------------- // wxStringClientData *************** *** 32,36 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxObject --- 32,36 ---- %endclass ! //----------------------------------------------------------------------------- // wxObject *************** *** 61,65 **** %endif wxLUA_USE_wxObject ! /////////////////////////////////////////////////////////////////////////////// // wxClassInfo --- 61,65 ---- %endif wxLUA_USE_wxObject ! //----------------------------------------------------------------------------- // wxClassInfo *************** *** 88,92 **** %endif wxLUA_USE_wxClassInfo ! /////////////////////////////////////////////////////////////////////////////// // wxValidator --- 88,92 ---- %endif wxLUA_USE_wxClassInfo ! //----------------------------------------------------------------------------- // wxValidator *************** *** 110,114 **** %endif wxLUA_USE_wxValidator ! /////////////////////////////////////////////////////////////////////////////// // wxTextValidator --- 110,114 ---- %endif wxLUA_USE_wxValidator ! //----------------------------------------------------------------------------- // wxTextValidator *************** *** 152,156 **** %endif wxLUA_USE_wxTextValidator ! /////////////////////////////////////////////////////////////////////////////// // wxGenericValidator --- 152,156 ---- %endif wxLUA_USE_wxTextValidator ! //----------------------------------------------------------------------------- // wxGenericValidator *************** *** 172,176 **** %endif wxLUA_USE_wxGenericValidator ! /////////////////////////////////////////////////////////////////////////////// // wxList --- 172,176 ---- %endif wxLUA_USE_wxGenericValidator ! //----------------------------------------------------------------------------- // wxList *************** *** 214,218 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxNode - wxList --- 214,218 ---- %endclass ! //----------------------------------------------------------------------------- // wxNode - wxList *************** *** 233,237 **** %endif wxLUA_USE_wxList ! /////////////////////////////////////////////////////////////////////////////// // wxArray - can't implement, here's the list of generic functions --- 233,237 ---- %endif wxLUA_USE_wxList ! //----------------------------------------------------------------------------- // wxArray - can't implement, here's the list of generic functions *************** *** 248,252 **** //%endclass ! /////////////////////////////////////////////////////////////////////////////// // wxArrayInt --- 248,252 ---- //%endclass ! //----------------------------------------------------------------------------- // wxArrayInt *************** *** 274,278 **** %endif wxLUA_USE_wxArrayInt ! /////////////////////////////////////////////////////////////////////////////// // wxArrayString --- 274,278 ---- %endif wxLUA_USE_wxArrayInt ! //----------------------------------------------------------------------------- // wxArrayString *************** *** 304,308 **** %endif wxLUA_USE_wxArrayString ! /////////////////////////////////////////////////////////////////////////////// // wxStringList - is deprecated in wxWidgets since 2.2 --- 304,308 ---- %endif wxLUA_USE_wxArrayString ! //----------------------------------------------------------------------------- // wxStringList - is deprecated in wxWidgets since 2.2 *************** *** 319,323 **** //%endif wxLUA_USE_wxStringList ! /////////////////////////////////////////////////////////////////////////////// // wxHashTable - lua tables are hashtables --- 319,323 ---- //%endif wxLUA_USE_wxStringList ! //----------------------------------------------------------------------------- // wxHashTable - lua tables are hashtables *************** *** 351,355 **** //%endif wxLUA_USE_wxHashTable ! /////////////////////////////////////////////////////////////////////////////// // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong --- 351,355 ---- //%endif wxLUA_USE_wxHashTable ! //----------------------------------------------------------------------------- // wxLongLong - FIXME it's a typedef so %encapsulate fails on class wxLongLong Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wx_datatypes.lua 16 May 2006 22:47:09 -0000 1.28 --- wx_datatypes.lua 17 May 2006 05:02:05 -0000 1.29 *************** *** 1356,1359 **** --- 1356,1365 ---- Name = "wxHelpSearchMode", }, + wxHotkeyModifier = { + Condition = "wxUSE_HOTKEY", + DefType = "enum", + Intrinsic = true, + Name = "wxHotkeyModifier", + }, wxHtmlCell = { Condition = "wxLUA_USE_wxHTML", *************** *** 2013,2017 **** }, wxPageSetupDialog = { ! BaseClass = "wxDialog", Condition = "wxLUA_USE_wxPrint", DefType = "class", --- 2019,2023 ---- }, wxPageSetupDialog = { ! BaseClass = "wxObject", Condition = "wxLUA_USE_wxPrint", DefType = "class", *************** *** 2102,2105 **** --- 2108,2118 ---- Name = "wxPoint2DInt", }, + wxPostScriptDC = { + BaseClass = "wxDC", + Condition = "(wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT) && (wxLUA_USE_wxPrint)", + DefType = "class", + Intrinsic = false, + Name = "wxPostScriptDC", + }, wxPreviewCanvas = { BaseClass = "wxScrolledWindow", *************** *** 2109,2112 **** --- 2122,2132 ---- Name = "wxPreviewCanvas", }, + wxPreviewControlBar = { + BaseClass = "wxPanel", + Condition = "wxLUA_USE_wxPrint", + DefType = "class", + Intrinsic = false, + Name = "wxPreviewControlBar", + }, wxPreviewFrame = { BaseClass = "wxFrame", *************** *** 2171,2175 **** wxPrinterDC = { BaseClass = "wxDC", ! Condition = "(defined(__WXMSW__)) && (wxLUA_USE_wxPrint)", DefType = "class", Intrinsic = false, --- 2191,2195 ---- wxPrinterDC = { BaseClass = "wxDC", ! Condition = "(defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint)", DefType = "class", Intrinsic = false, Index: print.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/print.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** print.i 13 May 2006 17:20:51 -0000 1.9 --- print.i 17 May 2006 05:02:04 -0000 1.10 *************** *** 1,9 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: printing related classes ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ! ///////////////////////////////////////////////////////////////////////////// %if wxLUA_USE_wxPrint --- 1,10 ---- ! // ============================================================================ // Purpose: printing related classes ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ! // wxWidgets: Updated to 2.6.3 ! // ============================================================================ %if wxLUA_USE_wxPrint *************** *** 14,29 **** %include "wxbind/include/wxlprint.h" ! /////////////////////////////////////////////////////////////////////////////// // wxPrintout %class wxPrintout, wxObject wxDC * GetDC() void GetPageSizeMM(int *w, int *h) void GetPageSizePixels(int *w, int *h) void GetPPIPrinter(int *w, int *h) void GetPPIScreen(int *w, int *h) ! // a virtual function in wxLuaPrintout virtual void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) ! bool IsPreview() bool HasPage(int pageNum) bool OnBeginDocument(int startPage, int endPage) void OnEndDocument() --- 15,38 ---- %include "wxbind/include/wxlprint.h" ! //----------------------------------------------------------------------------- // wxPrintout %class wxPrintout, wxObject + // virtual class, use wxLuaPrintout + wxDC * GetDC() + // %override [int minPage, int maxPage, int pageFrom, int pageTo] wxPrintout::GetPageInfo() + void GetPageInfo(int *minPage, int *maxPage, int *pageFrom, int *pageTo) + // %override [int w, int h] wxPrintout::GetPageSizeMM() void GetPageSizeMM(int *w, int *h) + // %override [int w, int h] wxPrintout::GetPageSizePixels() void GetPageSizePixels(int *w, int *h) + // %override [int w, int h] wxPrintout::GetPPIPrinter() void GetPPIPrinter(int *w, int *h) + // %override [int w, int h] wxPrintout::GetPPIScreen() void GetPPIScreen(int *w, int *h) ! wxString GetTitle() bool HasPage(int pageNum) + bool IsPreview() bool OnBeginDocument(int startPage, int endPage) void OnEndDocument() *************** *** 36,40 **** %if wxLUA_USE_wxLuaPrintout ! /////////////////////////////////////////////////////////////////////////////// // wxPrinter --- 45,49 ---- %if wxLUA_USE_wxLuaPrintout ! //----------------------------------------------------------------------------- // wxPrinter *************** *** 45,52 **** %endenum ! %class %delete %noclassinfo wxPrinter, wxObject wxPrinter(wxPrintDialogData* data = NULL) //bool Abort() ! void CreateAbortWindow(wxWindow* parent, wxLuaPrintout* printout) static wxPrinterError GetLastError() wxPrintDialogData& GetPrintDialogData() --- 54,63 ---- %endenum ! %class %delete wxPrinter, wxObject wxPrinter(wxPrintDialogData* data = NULL) + //bool Abort() ! virtual void CreateAbortWindow(wxWindow* parent, wxLuaPrintout* printout) ! bool GetAbort() const static wxPrinterError GetLastError() wxPrintDialogData& GetPrintDialogData() *************** *** 59,63 **** %endif wxLUA_USE_wxLuaPrintout ! /////////////////////////////////////////////////////////////////////////////// // wxPrintData --- 70,74 ---- %endif wxLUA_USE_wxLuaPrintout ! //----------------------------------------------------------------------------- // wxPrintData *************** *** 72,145 **** %enum wxPaperSize ! wxPAPER_10X11 ! wxPAPER_10X14 ! wxPAPER_11X17 ! wxPAPER_15X11 ! wxPAPER_9X11 ! wxPAPER_A_PLUS ! wxPAPER_A2 ! wxPAPER_A3 ! wxPAPER_A3_EXTRA ! wxPAPER_A3_EXTRA_TRANSVERSE ! wxPAPER_A3_TRANSVERSE wxPAPER_A4 ! wxPAPER_A4_EXTRA ! wxPAPER_A4_PLUS ! wxPAPER_A4_TRANSVERSE wxPAPER_A4SMALL wxPAPER_A5 - wxPAPER_A5_EXTRA - wxPAPER_A5_TRANSVERSE - wxPAPER_B_PLUS wxPAPER_B4 wxPAPER_B5 ! wxPAPER_B5_EXTRA ! wxPAPER_B5_TRANSVERSE ! wxPAPER_CSHEET ! wxPAPER_DSHEET wxPAPER_ENV_10 wxPAPER_ENV_11 wxPAPER_ENV_12 wxPAPER_ENV_14 ! wxPAPER_ENV_9 ! wxPAPER_ENV_B4 ! wxPAPER_ENV_B5 ! wxPAPER_ENV_B6 wxPAPER_ENV_C3 wxPAPER_ENV_C4 - wxPAPER_ENV_C5 wxPAPER_ENV_C6 wxPAPER_ENV_C65 ! wxPAPER_ENV_DL ! wxPAPER_ENV_INVITE wxPAPER_ENV_ITALY wxPAPER_ENV_MONARCH wxPAPER_ENV_PERSONAL - wxPAPER_ESHEET - wxPAPER_EXECUTIVE - wxPAPER_FANFOLD_LGL_GERMAN - wxPAPER_FANFOLD_STD_GERMAN wxPAPER_FANFOLD_US ! wxPAPER_FOLIO wxPAPER_ISO_B4 wxPAPER_JAPANESE_POSTCARD ! wxPAPER_LEDGER ! wxPAPER_LEGAL ! wxPAPER_LEGAL_EXTRA ! wxPAPER_LETTER wxPAPER_LETTER_EXTRA wxPAPER_LETTER_EXTRA_TRANSVERSE wxPAPER_LETTER_PLUS ! wxPAPER_LETTER_TRANSVERSE ! wxPAPER_LETTERSMALL ! wxPAPER_NONE ! wxPAPER_NOTE ! wxPAPER_QUARTO ! wxPAPER_STATEMENT ! wxPAPER_TABLOID ! wxPAPER_TABLOID_EXTRA %endenum ! %enum wxPrintQuality wxPRINT_QUALITY_DRAFT wxPRINT_QUALITY_HIGH --- 83,208 ---- %enum wxPaperSize ! wxPAPER_NONE ! wxPAPER_LETTER ! wxPAPER_LEGAL wxPAPER_A4 ! wxPAPER_CSHEET ! wxPAPER_DSHEET ! wxPAPER_ESHEET ! wxPAPER_LETTERSMALL ! wxPAPER_TABLOID ! wxPAPER_LEDGER ! wxPAPER_STATEMENT ! wxPAPER_EXECUTIVE ! wxPAPER_A3 wxPAPER_A4SMALL wxPAPER_A5 wxPAPER_B4 wxPAPER_B5 ! wxPAPER_FOLIO ! wxPAPER_QUARTO ! wxPAPER_10X14 ! wxPAPER_11X17 ! wxPAPER_NOTE ! wxPAPER_ENV_9 wxPAPER_ENV_10 wxPAPER_ENV_11 wxPAPER_ENV_12 wxPAPER_ENV_14 ! wxPAPER_ENV_DL ! wxPAPER_ENV_C5 wxPAPER_ENV_C3 wxPAPER_ENV_C4 wxPAPER_ENV_C6 wxPAPER_ENV_C65 ! wxPAPER_ENV_B4 ! wxPAPER_ENV_B5 ! wxPAPER_ENV_B6 wxPAPER_ENV_ITALY wxPAPER_ENV_MONARCH wxPAPER_ENV_PERSONAL wxPAPER_FANFOLD_US ! wxPAPER_FANFOLD_STD_GERMAN ! wxPAPER_FANFOLD_LGL_GERMAN ! wxPAPER_ISO_B4 wxPAPER_JAPANESE_POSTCARD ! wxPAPER_9X11 ! wxPAPER_10X11 ! wxPAPER_15X11 ! wxPAPER_ENV_INVITE wxPAPER_LETTER_EXTRA + wxPAPER_LEGAL_EXTRA + wxPAPER_TABLOID_EXTRA + wxPAPER_A4_EXTRA + wxPAPER_LETTER_TRANSVERSE + wxPAPER_A4_TRANSVERSE wxPAPER_LETTER_EXTRA_TRANSVERSE + wxPAPER_A_PLUS + wxPAPER_B_PLUS wxPAPER_LETTER_PLUS ! wxPAPER_A4_PLUS ! wxPAPER_A5_TRANSVERSE ! wxPAPER_B5_TRANSVERSE ! wxPAPER_A3_EXTRA ! wxPAPER_A5_EXTRA ! wxPAPER_B5_EXTRA ! wxPAPER_A2 ! wxPAPER_A3_TRANSVERSE ! wxPAPER_A3_EXTRA_TRANSVERSE ! ! wxPAPER_DBL_JAPANESE_POSTCARD ! wxPAPER_A6 ! wxPAPER_JENV_KAKU2 ! wxPAPER_JENV_KAKU3 ! wxPAPER_JENV_CHOU3 ! wxPAPER_JENV_CHOU4 ! wxPAPER_LETTER_ROTATED ! wxPAPER_A3_ROTATED ! wxPAPER_A4_ROTATED ! wxPAPER_A5_ROTATED ! wxPAPER_B4_JIS_ROTATED ! wxPAPER_B5_JIS_ROTATED ! wxPAPER_JAPANESE_POSTCARD_ROTATED ! wxPAPER_DBL_JAPANESE_POSTCARD_ROTATED ! wxPAPER_A6_ROTATED ! wxPAPER_JENV_KAKU2_ROTATED ! wxPAPER_JENV_KAKU3_ROTATED ! wxPAPER_JENV_CHOU3_ROTATED ! wxPAPER_JENV_CHOU4_ROTATED ! wxPAPER_B6_JIS ! wxPAPER_B6_JIS_ROTATED ! wxPAPER_12X11 ! wxPAPER_JENV_YOU4 ! wxPAPER_JENV_YOU4_ROTATED ! wxPAPER_P16K ! wxPAPER_P32K ! wxPAPER_P32KBIG ! wxPAPER_PENV_1 ! wxPAPER_PENV_2 ! wxPAPER_PENV_3 ! wxPAPER_PENV_4 ! wxPAPER_PENV_5 ! wxPAPER_PENV_6 ! wxPAPER_PENV_7 ! wxPAPER_PENV_8 ! wxPAPER_PENV_9 ! wxPAPER_PENV_10 ! wxPAPER_P16K_ROTATED ! wxPAPER_P32K_ROTATED ! wxPAPER_P32KBIG_ROTATED ! wxPAPER_PENV_1_ROTATED ! wxPAPER_PENV_2_ROTATED ! wxPAPER_PENV_3_ROTATED ! wxPAPER_PENV_4_ROTATED ! wxPAPER_PENV_5_ROTATED ! wxPAPER_PENV_6_ROTATED ! wxPAPER_PENV_7_ROTATED ! wxPAPER_PENV_8_ROTATED ! wxPAPER_PENV_9_ROTATED ! wxPAPER_PENV_10_ROTATED %endenum ! %enum wxPrintQuality // actually not an enum, but a typedef int wxPRINT_QUALITY_DRAFT wxPRINT_QUALITY_HIGH *************** *** 177,297 **** %endif - // FIXME wxPrintData has changed fom 2.4 to 2.6 update it %class %delete wxPrintData, wxObject wxPrintData() wxPrintData *Copy() ! bool GetCollate() ! bool GetColour() ! wxDuplexMode GetDuplex() ! int GetNoCopies() ! int GetOrientation() ! wxPaperSize GetPaperId() ! wxString GetPrinterName() ! wxPrintQuality GetQuality() ! %wxchkver25 wxPrintBin GetBin() const ! wxSize GetPaperSize() ! !%wxchkver27 const wxString& GetPrinterCommand() ! !%wxchkver27 const wxString& GetPrinterOptions() ! !%wxchkver27 const wxString& GetPreviewCommand() ! wxString GetFilename() ! !%wxchkver27 const wxString& GetFontMetricPath() ! !%wxchkver27 double GetPrinterScaleX() ! !%wxchkver27 double GetPrinterScaleY() ! !%wxchkver27 long GetPrinterTranslateX() ! !%wxchkver27 long GetPrinterTranslateY() ! wxPrintMode GetPrintMode() void SetCollate(bool flag) %property=Collate, read, write - void SetColour(bool flag) %property=Colour, read, write - void SetDuplex(wxDuplexMode duplex) %property=Duplex, read, write ! void SetNoCopies(int v) %property=NoCopies, read, write - void SetOrientation(int orientation) %property=Orientation, read, write - void SetPaperId(wxPaperSize sizeId) %property=PaperId, read, write - void SetPrinterName(const wxString& printerName) - %property=PrinterName, read, write - void SetQuality(wxPrintQuality quality) - %property=Quality, read, write - void SetPaperSize(const wxSize& paperSize) %property=PaperSize, read, write ! !%wxchkver27 void SetPrinterCommand(const wxString& command) ! !%wxchkver27 %property=PrinterCommand, read, write ! !%wxchkver27 void SetPrinterOptions(const wxString& options) ! !%wxchkver27 %property=PrinterOptions, read, write ! !%wxchkver27 void SetPreviewCommand(const wxString& command) ! !%wxchkver27 %property=PreviewCommand, read, write ! void SetFilename(const wxString& filename) ! %property=Filename, read, write ! !%wxchkver27 void SetFontMetricPath(const wxString& path) ! !%wxchkver27 %property=FontMetricPath, read, write ! !%wxchkver27 void SetPrinterScaleX(double x) ! !%wxchkver27 %property=PrinterScaleX, read, write ! !%wxchkver27 void SetPrinterScaleY(double y) ! !%wxchkver27 %property=PrinterScaleY, read, write ! !%wxchkver27 void SetPrinterScaling(double x, double y) ! !%wxchkver27 void SetPrinterTranslateX(long x) ! !%wxchkver27 %property=PrinterTranslateX, read, write ! !%wxchkver27 void SetPrinterTranslateY(long y) ! !%wxchkver27 %property=PrinterTranslateY, read, write ! !%wxchkver27 void SetPrinterTranslation(long x, long y) %property=PrintMode, read, write ! void SetPrintMode(wxPrintMode printMode) %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPageSetupDialogData %class %delete wxPageSetupDialogData, wxObject wxPageSetupDialogData() ! void EnableHelp(bool flag) void EnableMargins(bool flag) void EnableOrientation(bool flag) void EnablePaper(bool flag) void EnablePrinter(bool flag) ! bool GetDefaultMinMargins() ! bool GetEnableMargins() ! %win %property=EnableMargins, read ! bool GetEnableOrientation() ! %win %property=EnableOrientation, read ! bool GetEnablePaper() ! %win %property=EnablePaper, read ! bool GetEnablePrinter() ! %win %property=EnablePrinter, read ! bool GetEnableHelp() ! %win %property=EnableHelp, read ! bool GetDefaultInfo() ! wxPoint GetMarginTopLeft() ! wxPoint GetMarginBottomRight() ! wxPoint GetMinMarginTopLeft() ! wxPoint GetMinMarginBottomRight() ! wxPaperSize GetPaperId() ! wxSize GetPaperSize() ! const wxPrintData& GetPrintData() ! void SetDefaultInfo(bool flag) %property=DefaultInfo, read, write - void SetDefaultMinMargins(bool flag) %property=DefaultMinMargins, read, write - void SetMarginTopLeft(const wxPoint& pt) - %property=MarginTopLeft, read, write - void SetMarginBottomRight(const wxPoint& pt) %property=MarginBottomRight, read, write ! void SetMinMarginTopLeft(const wxPoint& pt) ! %property=MinMarginTopLeft, read, write ! void SetMinMarginBottomRight(const wxPoint& pt) %property=MinMarginBottomRight, read, write ! void SetPaperId(wxPaperSize id) %property=PaperId, read, write - void SetPaperSize(const wxSize& size) %property=PaperSize, read, write - void SetPrintData(const wxPrintData& printData) %property=PrintData, read, write - wxPageSetupDialogData *Copy() %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPageSetupDialog --- 240,384 ---- %endif %class %delete wxPrintData, wxObject wxPrintData() + %constructor wxPrintDataCopy(const wxPrintData& data) + wxPrintData *Copy() ! ! // copied straight from cmndata.h not docs ! int GetNoCopies() const ! bool GetCollate() const ! int GetOrientation() const ! bool Ok() const ! wxString GetPrinterName() const ! bool GetColour() const ! wxDuplexMode GetDuplex() const ! wxPaperSize GetPaperId() const ! wxSize GetPaperSize() const ! wxPrintQuality GetQuality() const ! wxPrintBin GetBin() const ! wxPrintMode GetPrintMode() const ! void SetNoCopies(int v) void SetCollate(bool flag) + void SetOrientation(int orient) + void SetPrinterName(const wxString& name) + void SetColour(bool colour) + void SetDuplex(wxDuplexMode duplex) + void SetPaperId(wxPaperSize sizeId) + void SetPaperSize(const wxSize& sz) + void SetQuality(wxPrintQuality quality) + void SetBin(wxPrintBin bin) + void SetPrintMode(wxPrintMode printMode) + wxString GetFilename() const + void SetFilename( const wxString &filename ) + + %operator void operator=(const wxPrintData& data) + + // these are all WXWIN_COMPATIBILITY_2_4 and for postscript printing only + //!%wxchkver27 wxString GetPrinterCommand() + //!%wxchkver27 wxString GetPrinterOptions() + //!%wxchkver27 wxString GetPreviewCommand() + //!%wxchkver27 const wxString& GetFontMetricPath() + //!%wxchkver27 double GetPrinterScaleX() + //!%wxchkver27 double GetPrinterScaleY() + //!%wxchkver27 long GetPrinterTranslateX() + //!%wxchkver27 long GetPrinterTranslateY() + //!%wxchkver27 void SetPrinterCommand(const wxString& command) + //!%wxchkver27 void SetPrinterOptions(const wxString& options) + //!%wxchkver27 void SetPreviewCommand(const wxString& command) + //!%wxchkver27 void SetFontMetricPath(const wxString& path) + //!%wxchkver27 void SetPrinterScaleX(double x) + //!%wxchkver27 void SetPrinterScaleY(double y) + //!%wxchkver27 void SetPrinterScaling(double x, double y) + //!%wxchkver27 void SetPrinterTranslateX(long x) + //!%wxchkver27 void SetPrinterTranslateY(long y) + //!%wxchkver27 void SetPrinterTranslation(long x, long y) + %property=Collate, read, write %property=Colour, read, write %property=Duplex, read, write ! %property=Filename, read, write %property=NoCopies, read, write %property=Orientation, read, write %property=PaperId, read, write %property=PaperSize, read, write ! %property=PrinterName, read, write %property=PrintMode, read, write ! %property=Quality, read, write ! ! //!%wxchkver27 %property=FontMetricPath, read, write ! //!%wxchkver27 %property=PreviewCommand, read, write ! //!%wxchkver27 %property=PrinterCommand, read, write ! //!%wxchkver27 %property=PrinterOptions, read, write ! //!%wxchkver27 %property=PrinterScaleX, read, write ! //!%wxchkver27 %property=PrinterScaleY, read, write ! //!%wxchkver27 %property=PrinterTranslateX, read, write ! //!%wxchkver27 %property=PrinterTranslateY, read, write ! %endclass ! //----------------------------------------------------------------------------- // wxPageSetupDialogData %class %delete wxPageSetupDialogData, wxObject wxPageSetupDialogData() ! %constructor wxPageSetupDialogDataCopy(const wxPageSetupDialogData& data) ! ! wxPageSetupDialogData *Copy() ! ! // copied straight from cmndata.h not docs ! wxSize GetPaperSize() const ! wxPaperSize GetPaperId() const ! wxPoint GetMinMarginTopLeft() const ! wxPoint GetMinMarginBottomRight() const ! wxPoint GetMarginTopLeft() const ! wxPoint GetMarginBottomRight() const ! bool GetDefaultMinMargins() const ! bool GetEnableMargins() const ! bool GetEnableOrientation() const ! bool GetEnablePaper() const ! bool GetEnablePrinter() const ! bool GetDefaultInfo() const ! bool GetEnableHelp() const ! bool Ok() const ! void SetPaperSize(const wxSize& sz) ! void SetPaperId(wxPaperSize id) ! //%rename SetPaperSizeById void SetPaperSize(wxPaperSize id) ! void SetMinMarginTopLeft(const wxPoint& pt) ! void SetMinMarginBottomRight(const wxPoint& pt) ! void SetMarginTopLeft(const wxPoint& pt) ! void SetMarginBottomRight(const wxPoint& pt) ! void SetDefaultMinMargins(bool flag) ! void SetDefaultInfo(bool flag) void EnableMargins(bool flag) void EnableOrientation(bool flag) void EnablePaper(bool flag) void EnablePrinter(bool flag) ! void EnableHelp(bool flag) ! void CalculateIdFromPaperSize() ! void CalculatePaperSizeFromId() ! wxPrintData& GetPrintData() ! void SetPrintData(const wxPrintData& printData) ! ! //wxPageSetupDialogData& operator=(const wxPageSetupData& data) ! //wxPageSetupDialogData& operator=(const wxPrintData& data) ! ! %property=EnableHelp, read ! %property=EnableMargins, read ! %property=EnableOrientation, read ! %property=EnablePaper, read ! %property=EnablePrinter, read %property=DefaultInfo, read, write %property=DefaultMinMargins, read, write %property=MarginBottomRight, read, write ! %property=MarginTopLeft, read, write %property=MinMarginBottomRight, read, write ! %property=MinMarginTopLeft, read, write %property=PaperId, read, write %property=PaperSize, read, write %property=PrintData, read, write %endclass ! //----------------------------------------------------------------------------- // wxPageSetupDialog *************** *** 300,372 **** //%typedef wxPageSetupDialog wxPageSetupDialogBase ! %class wxPageSetupDialog, wxDialog wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL) ! wxPageSetupDialogData& GetPageSetupData() ! %property=PageSetupData, read int ShowModal() %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPrintDialog ! //!%wxchkver26 %class wxPrintDialog, wxDialog ! %class wxPrintDialog, wxObject // FIXME how to make this work wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL) wxPrintDialogData& GetPrintDialogData() ! %property=PrintDialogData, read wxDC* GetPrintDC() - %property=PrintDC, read int ShowModal() %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPrintDialogData %class %delete wxPrintDialogData, wxObject wxPrintDialogData() ! %constructor wxPrintDialogDataFromDialogData(wxPrintDialogData& dialogData) ! %constructor wxPrintDialogDataFromPrintData(wxPrintData& data) ! void EnableHelp(bool flag) ! void EnablePageNumbers(bool flag) void EnablePrintToFile(bool flag) void EnableSelection(bool flag) ! bool GetAllPages() ! %property=AllPages, read ! bool GetCollate() ! int GetFromPage() ! int GetMinPage() ! int GetMaxPage() ! int GetNoCopies() ! const wxPrintData& GetPrintData() ! bool GetPrintToFile() ! int GetToPage() ! void SetCollate(bool flag) %property=Collate, read, write - void SetFromPage(int page) %property=FromPage, read, write - void SetMinPage(int page) %property=MinPage, read, write - void SetMaxPage(int page) %property=MaxPage, read, write - void SetNoCopies(int n) %property=NoCopies, read, write - void SetPrintData(const wxPrintData& printData) %property=PrintData, read, write - void SetPrintToFile(bool flag) %property=PrintToFile, read, write - void SetSelection(bool flag) - !%wxchkver27 void SetSetupDialog(bool flag) - void SetToPage(int page) %property=ToPage, read, write %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPreviewCanvas %class %noclassinfo wxPreviewCanvas, wxScrolledWindow wxPreviewCanvas(wxPrintPreview *preview, wxWindow *parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxPreviewCanvas") %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPrintPreview %if wxLUA_USE_wxLuaPrintout --- 387,505 ---- //%typedef wxPageSetupDialog wxPageSetupDialogBase ! %class wxPageSetupDialog, wxObject // NOT a wxDialog in 2.6 wxPageSetupDialog(wxWindow* parent, wxPageSetupDialogData* data = NULL) ! ! wxPageSetupDialogData& GetPageSetupDialogData() int ShowModal() + + %property=PageSetupDialogData, read %endclass ! //----------------------------------------------------------------------------- // wxPrintDialog ! %class wxPrintDialog, wxObject // NOT a wxDialog in 2.6 wxPrintDialog(wxWindow* parent, wxPrintDialogData* data = NULL) + wxPrintDialogData& GetPrintDialogData() ! wxPrintData& GetPrintData(); wxDC* GetPrintDC() int ShowModal() + + %property=PrintDialogData, read + %property=PrintDC, read %endclass ! //----------------------------------------------------------------------------- // wxPrintDialogData %class %delete wxPrintDialogData, wxObject wxPrintDialogData() ! %constructor wxPrintDialogDataCopy(const wxPrintDialogData& dialogData) ! %constructor wxPrintDialogDataFromPrintData(const wxPrintData& data) ! ! // copied straight from cmndata.h not docs ! int GetFromPage() const ! int GetToPage() const ! int GetMinPage() const ! int GetMaxPage() const ! int GetNoCopies() const ! bool GetAllPages() const ! bool GetSelection() const ! bool GetCollate() const ! bool GetPrintToFile() const ! // WXWIN_COMPATIBILITY_2_4 //bool GetSetupDialog() const ! void SetFromPage(int v) ! void SetToPage(int v) ! void SetMinPage(int v) ! void SetMaxPage(int v) ! void SetNoCopies(int v) ! void SetAllPages(bool flag) ! void SetSelection(bool flag) ! void SetCollate(bool flag) ! void SetPrintToFile(bool flag) ! // WXWIN_COMPATIBILITY_2_4 //void SetSetupDialog(bool flag) { m_printSetupDialog = flag; }; void EnablePrintToFile(bool flag) void EnableSelection(bool flag) ! void EnablePageNumbers(bool flag) ! void EnableHelp(bool flag) ! bool GetEnablePrintToFile() const ! bool GetEnableSelection() const ! bool GetEnablePageNumbers() const ! bool GetEnableHelp() const ! bool Ok() const ! wxPrintData& GetPrintData() ! void SetPrintData(const wxPrintData& printData) ! ! %operator void operator=(const wxPrintDialogData& data) ! %property=Collate, read, write %property=FromPage, read, write %property=MinPage, read, write %property=MaxPage, read, write %property=NoCopies, read, write %property=PrintData, read, write %property=PrintToFile, read, write %property=ToPage, read, write %endclass ! //----------------------------------------------------------------------------- // wxPreviewCanvas %class %noclassinfo wxPreviewCanvas, wxScrolledWindow wxPreviewCanvas(wxPrintPreview *preview, wxWindow *parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxPreviewCanvas") + %endclass ! //----------------------------------------------------------------------------- ! // wxPreviewControlBar ! ! %define wxPREVIEW_PRINT ! %define wxPREVIEW_PREVIOUS ! %define wxPREVIEW_NEXT ! %define wxPREVIEW_ZOOM ! %define wxPREVIEW_FIRST ! %define wxPREVIEW_LAST ! %define wxPREVIEW_GOTO ! ! %define wxID_PREVIEW_CLOSE ! %define wxID_PREVIEW_NEXT ! %define wxID_PREVIEW_PREVIOUS ! %define wxID_PREVIEW_PRINT ! %define wxID_PREVIEW_ZOOM ! %define wxID_PREVIEW_FIRST ! %define wxID_PREVIEW_LAST ! %define wxID_PREVIEW_GOTO ! ! %class wxPreviewControlBar, wxPanel ! wxPreviewControlBar(wxPrintPreview* preview, long buttons, wxWindow* parent, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxString& name = "wxPreviewControlBar") ! ! //void CreateButtons() ! virtual void SetZoomControl(int zoom) ! virtual int GetZoomControl() ! //virtual wxPrintPreviewBase *GetPrintPreview() const ! %endclass ! ! //----------------------------------------------------------------------------- // wxPrintPreview %if wxLUA_USE_wxLuaPrintout *************** *** 374,386 **** %class %noclassinfo wxPrintPreview, wxObject wxPrintPreview(wxLuaPrintout* printout, wxLuaPrintout* printoutForPrinting, wxPrintData* data=NULL) bool DrawBlankPage(wxPreviewCanvas* window, wxDC& dc) ! wxWindow* GetCanvas() int GetCurrentPage() wxFrame * GetFrame() int GetMaxPage() int GetMinPage() ! //const wxPrintData& GetPrintData() ! wxPrintout * GetPrintout() ! wxPrintout * GetPrintoutForPrinting() bool Ok() bool PaintPage(wxPreviewCanvas* window, wxDC &dc) --- 507,519 ---- %class %noclassinfo wxPrintPreview, wxObject wxPrintPreview(wxLuaPrintout* printout, wxLuaPrintout* printoutForPrinting, wxPrintData* data=NULL) + bool DrawBlankPage(wxPreviewCanvas* window, wxDC& dc) ! wxPreviewCanvas* GetCanvas() int GetCurrentPage() wxFrame * GetFrame() int GetMaxPage() int GetMinPage() ! wxPrintout* GetPrintout() ! wxPrintout* GetPrintoutForPrinting() bool Ok() bool PaintPage(wxPreviewCanvas* window, wxDC &dc) *************** *** 388,431 **** bool RenderPage(int pageNum) void SetCanvas(wxPreviewCanvas* window) - %property=Canvas, read, write void SetCurrentPage(int pageNum) void SetFrame(wxFrame *frame) - %property=Frame, read, write void SetPrintout(wxLuaPrintout *printout) - %property=Printout, read, write void SetZoom(int percent) %endclass ! //////////////////////////////////////////////////////////////////////////////// // wxPreviewFrame %class wxPreviewFrame, wxFrame wxPreviewFrame(wxPrintPreview *preview, wxFrame *parent, const wxString &title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString &name = "wxPreviewFrame") void CreateControlBar() void CreateCanvas() void Initialize() %endclass %endif wxLUA_USE_wxLuaPrintout ! /////////////////////////////////////////////////////////////////////////////// // wxPostScriptDC ! //%class %delete wxPostScriptDC, wxDC ! // %include "wx/dcps.h" ! // wxPostScriptDC(const wxPrintData& printData) ! // static void SetResolution(int ppi) ! // static int GetResolution() ! //%endclass ! /////////////////////////////////////////////////////////////////////////////// // wxPrinterDC ! %if %msw %class %delete wxPrinterDC, wxDC - %include "wx/dcprint.h" wxPrinterDC(const wxPrintData& printData) %endclass ! %endif %endif wxLUA_USE_wxPrint --- 521,575 ---- bool RenderPage(int pageNum) void SetCanvas(wxPreviewCanvas* window) void SetCurrentPage(int pageNum) void SetFrame(wxFrame *frame) void SetPrintout(wxLuaPrintout *printout) void SetZoom(int percent) + + %property=Canvas, read, write + %property=Frame, read, write + %property=Printout, read, write %endclass ! //----------------------------------------------------------------------------- // wxPreviewFrame %class wxPreviewFrame, wxFrame wxPreviewFrame(wxPrintPreview *preview, wxFrame *parent, const wxString &title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString &name = "wxPreviewFrame") + void CreateControlBar() void CreateCanvas() void Initialize() + wxPreviewControlBar* GetControlBar() const %endclass %endif wxLUA_USE_wxLuaPrintout ! //----------------------------------------------------------------------------- // wxPostScriptDC ! %if wxUSE_PRINTING_ARCHITECTURE&wxUSE_POSTSCRIPT ! %include "wx/dcps.h" ! ! %class %delete wxPostScriptDC, wxDC ! wxPostScriptDC(const wxPrintData& printData) ! ! static void SetResolution(int ppi) ! static int GetResolution() ! %endclass ! ! %endif // wxUSE_PRINTING_ARCHITECTURE&wxUSE_POSTSCRIPT ! ! //----------------------------------------------------------------------------- // wxPrinterDC ! %if %msw|%mac ! %include "wx/dcprint.h" ! %class %delete wxPrinterDC, wxDC wxPrinterDC(const wxPrintData& printData) + %endclass ! %endif // %msw|%mac %endif wxLUA_USE_wxPrint Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** file.i 1 May 2006 19:36:30 -0000 1.10 --- file.i 17 May 2006 05:02:04 -0000 1.11 *************** *** 1,10 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxFile, wxDir, wxFileName and file functions ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// %include "wx/filefn.h" --- 1,10 ---- ! // ============================================================================ // Purpose: wxFile, wxDir, wxFileName and file functions ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ %include "wx/filefn.h" *************** *** 49,53 **** %function long wxFileSize(const wxString& fileName) ! /////////////////////////////////////////////////////////////////////////////// // wxFileName --- 49,53 ---- %function long wxFileSize(const wxString& fileName) ! //----------------------------------------------------------------------------- // wxFileName *************** *** 180,184 **** %endif wxLUA_USE_wxFileName ! /////////////////////////////////////////////////////////////////////////////// // wxFile --- 180,184 ---- %endif wxLUA_USE_wxFileName ! //----------------------------------------------------------------------------- // wxFile *************** *** 249,253 **** %endif wxLUA_USE_wxFile ! /////////////////////////////////////////////////////////////////////////////// // wxDir --- 249,253 ---- %endif wxLUA_USE_wxFile ! //----------------------------------------------------------------------------- // wxDir *************** *** 282,286 **** %endif wxLUA_USE_wxDir ! /////////////////////////////////////////////////////////////////////////////// // wxStreamBase --- 282,286 ---- %endif wxLUA_USE_wxDir ! //----------------------------------------------------------------------------- // wxStreamBase *************** *** 304,308 **** %endenum ! /////////////////////////////////////////////////////////////////////////////// // wxStreamBase --- 304,308 ---- %endenum ! //----------------------------------------------------------------------------- // wxStreamBase *************** *** 318,322 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxInputStream --- 318,322 ---- %endclass ! //----------------------------------------------------------------------------- // wxInputStream *************** *** 339,343 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxOutputStream --- 339,343 ---- %endclass ! //----------------------------------------------------------------------------- // wxOutputStream *************** *** 355,359 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxFileInputStream --- 355,359 ---- %endclass ! //----------------------------------------------------------------------------- // wxFileInputStream *************** *** 368,372 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxFileOutputStream --- 368,372 ---- %endclass ! //----------------------------------------------------------------------------- // wxFileOutputStream Index: regex.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/regex.i,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** regex.i 1 May 2006 19:36:30 -0000 1.3 --- regex.i 17 May 2006 05:02:04 -0000 1.4 *************** *** 1,12 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxRegEx ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! /////////////////////////////////////////////////////////////////////////////// ! /////////////////////////////////////////////////////////////////////////////// // wxRegEx - Regular expression support --- 1,12 ---- ! // ============================================================================ // Purpose: wxRegEx ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ ! //----------------------------------------------------------------------------- // wxRegEx - Regular expression support Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** dialogs.i 15 May 2006 22:57:29 -0000 1.17 --- dialogs.i 17 May 2006 05:02:04 -0000 1.18 *************** *** 1,10 **** ! ///////////////////////////////////////////////////////////////////////////// // Purpose: wxDialog and all dialog classes and functions ! // Author: J Winwood // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! ///////////////////////////////////////////////////////////////////////////// --- 1,10 ---- ! // ============================================================================ // Purpose: wxDialog and all dialog classes and functions ! // Author: J Winwood, John Labenski // Created: 14/11/2001 // Copyright: (c) 2001-2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence // wxWidgets: Updated to 2.6.3 ! // ============================================================================ *************** *** 29,33 **** %endenum ! /////////////////////////////////////////////////////////////////////////////// // Dialog functions from wxWidgets functions documentation --- 29,33 ---- %endenum ! //----------------------------------------------------------------------------- // Dialog functions from wxWidgets functions documentation *************** *** 56,60 **** // bool wxShowTip(wxWindow *parent, wxTipProvider *tipProvider, bool showAtStartup = true) ! /////////////////////////////////////////////////////////////////////////////// // wxDialog --- 56,60 ---- // bool wxShowTip(wxWindow *parent, wxTipProvider *tipProvider, bool showAtStartup = true) ! //----------------------------------------------------------------------------- // wxDialog *************** *** 99,103 **** %endif // wxLUA_USE_wxDialog ! /////////////////////////////////////////////////////////////////////////////// // wxColourDialog --- 99,103 ---- %endif // wxLUA_USE_wxDialog ! //----------------------------------------------------------------------------- // wxColourDialog *************** *** 116,120 **** %endclass ! /////////////////////////////////////////////////////////////////////////////// // wxColourData --- 116,120 ---- %endclass ! //----------------------------------------------------------------------------- // wxColourData *************** *** 138,142 **** %endif // wxLUA_USE_wxColourDialog ! /////////////////////////////////////////////////////////////////////////////// // wxFileDialog --- 138,142 ---- %endif // wxLUA_USE_wxColourDialog ! //----------------------------------------------------------------------------- // wxFileDialog *************** *** 179,183 **** %endif wxLUA_USE_wxFileDialog ! /////////////////////////////////////////////////////////////////////////////// // wxDirDialog --- 179,183 ---- %endif wxLUA_USE_wxFileDialog ! //----------------------------------------------------------------------------- // wxDirDialog *************** *** 205,... [truncated message content] |
|
From: John L. <jr...@us...> - 2006-05-17 05:02:08
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20662/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: update .i files to use more HTML friendly comment markers update print.i and xml.i to 2.6.3 cleanup generate docs script to use nicer colours and whatnot Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wxstc_datatypes.lua 16 May 2006 22:47:09 -0000 1.24 --- wxstc_datatypes.lua 17 May 2006 05:02:04 -0000 1.25 *************** *** 1356,1359 **** --- 1356,1365 ---- Name = "wxHelpSearchMode", }, + wxHotkeyModifier = { + Condition = "wxUSE_HOTKEY", + DefType = "enum", + Intrinsic = true, + Name = "wxHotkeyModifier", + }, wxHtmlCell = { Condition = "wxLUA_USE_wxHTML", *************** *** 2013,2017 **** }, wxPageSetupDialog = { ! BaseClass = "wxDialog", Condition = "wxLUA_USE_wxPrint", DefType = "class", --- 2019,2023 ---- }, wxPageSetupDialog = { ! BaseClass = "wxObject", Condition = "wxLUA_USE_wxPrint", DefType = "class", *************** *** 2102,2105 **** --- 2108,2118 ---- Name = "wxPoint2DInt", }, + wxPostScriptDC = { + BaseClass = "wxDC", + Condition = "(wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT) && (wxLUA_USE_wxPrint)", + DefType = "class", + Intrinsic = false, + Name = "wxPostScriptDC", + }, wxPreviewCanvas = { BaseClass = "wxScrolledWindow", *************** *** 2109,2112 **** --- 2122,2132 ---- Name = "wxPreviewCanvas", }, + wxPreviewControlBar = { + BaseClass = "wxPanel", + Condition = "wxLUA_USE_wxPrint", + DefType = "class", + Intrinsic = false, + Name = "wxPreviewControlBar", + }, wxPreviewFrame = { BaseClass = "wxFrame", *************** *** 2171,2175 **** wxPrinterDC = { BaseClass = "wxDC", ! Condition = "(defined(__WXMSW__)) && (wxLUA_USE_wxPrint)", DefType = "class", Intrinsic = false, --- 2191,2195 ---- wxPrinterDC = { BaseClass = "wxDC", ! Condition = "(defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint)", DefType = "class", Intrinsic = false, |
|
From: John L. <jr...@us...> - 2006-05-17 05:02:08
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20662/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: update .i files to use more HTML friendly comment markers update print.i and xml.i to 2.6.3 cleanup generate docs script to use nicer colours and whatnot Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxbind.h 16 May 2006 22:47:09 -0000 1.26 --- wxbind.h 17 May 2006 05:02:05 -0000 1.27 *************** *** 56,66 **** ! #if (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #include "wx/helpwin.h" #endif ! #if (defined(__WXMSW__)) && (wxLUA_USE_wxPrint) ! #include "wx/dcprint.h" #endif --- 56,66 ---- ! #if (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint) ! #include "wx/dcprint.h" #endif ! #if (defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) ! #include "wx/helpwin.h" #endif *************** *** 127,130 **** --- 127,135 ---- + #if (wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT) && (wxLUA_USE_wxPrint) + #include "wx/dcps.h" + #endif + + #if (wxUSE_SOUND) && (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxWave) #include "wx/sound.h" *************** *** 679,682 **** --- 684,692 ---- + #if (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint) + extern int s_wxluatag_wxPrinterDC; + #endif + + #if (defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) extern int s_wxluatag_wxBitmapHandler; *************** *** 691,699 **** - #if (defined(__WXMSW__)) && (wxLUA_USE_wxPrint) - extern int s_wxluatag_wxPrinterDC; - #endif - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) extern int s_wxluatag_wxLog; --- 701,704 ---- *************** *** 823,826 **** --- 828,836 ---- + #if (wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT) && (wxLUA_USE_wxPrint) + extern int s_wxluatag_wxPostScriptDC; + #endif + + #if (wxUSE_SOUND) && (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxWave) extern int s_wxluatag_wxSound; *************** *** 1329,1332 **** --- 1339,1343 ---- extern int s_wxluatag_wxPageSetupDialogData; extern int s_wxluatag_wxPreviewCanvas; + extern int s_wxluatag_wxPreviewControlBar; extern int s_wxluatag_wxPrintData; extern int s_wxluatag_wxPrintDialog; *************** *** 1585,1588 **** --- 1596,1605 ---- + #if (defined(__WXMSW__) || defined(__WXMAC__)) && (wxLUA_USE_wxPrint) + extern WXLUAMETHOD* wxPrinterDC_methods; + extern int wxPrinterDC_methodCount; + #endif + + #if (defined(__WXMSW__)) && (wxLUA_USE_wxBitmap) extern WXLUAMETHOD* wxBitmapHandler_methods; *************** *** 1601,1610 **** - #if (defined(__WXMSW__)) && (wxLUA_USE_wxPrint) - extern WXLUAMETHOD* wxPrinterDC_methods; - extern int wxPrinterDC_methodCount; - #endif - - #if (wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxLUA_USE_wxApp) extern WXLUAMETHOD* wxLog_methods; --- 1618,1621 ---- *************** *** 1765,1768 **** --- 1776,1785 ---- + #if (wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT) && (wxLUA_USE_wxPrint) + extern WXLUAMETHOD* wxPostScriptDC_methods; + extern int wxPostScriptDC_methodCount; + #endif + + #if (wxUSE_SOUND) && (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_wxWave) extern WXLUAMETHOD* wxSound_methods; *************** *** 2488,2491 **** --- 2505,2510 ---- extern WXLUAMETHOD* wxPreviewCanvas_methods; extern int wxPreviewCanvas_methodCount; + extern WXLUAMETHOD* wxPreviewControlBar_methods; + extern int wxPreviewControlBar_methodCount; extern WXLUAMETHOD* wxPrintData_methods; extern int wxPrintData_methodCount; |
|
From: John L. <jr...@us...> - 2006-05-17 05:02:08
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20662/wxLua/bindings Modified Files: genidocs.lua Log Message: update .i files to use more HTML friendly comment markers update print.i and xml.i to 2.6.3 cleanup generate docs script to use nicer colours and whatnot Index: genidocs.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** genidocs.lua 16 May 2006 03:32:28 -0000 1.1 --- genidocs.lua 17 May 2006 05:02:04 -0000 1.2 *************** *** 8,12 **** ------------------------------------------------------------------------------- ! wxClassRef = {} typeDefs = {} -- filled from the data cache files --- 8,12 ---- ------------------------------------------------------------------------------- ! wxWidgetsClassRefTable = {} -- a list of wx classes from the alphabetical class list typeDefs = {} -- filled from the data cache files *************** *** 15,25 **** classColour = "AA0000" ! enumColour = "008800" ! defineColour = "0000EE" ! eventColour = "AA00AA" ! propColour = "000088" ! memberColour = "008888" ! renameColour = "FF0000" ! overrideColour = "AA8800" --<a name="papers">Papers</a> --- 15,44 ---- classColour = "AA0000" ! propColour = "000077" ! memberColour = "005577" ! renameColour = "CC0033" ! overrideColour = "CC3300" ! overloadColour = "CC3333" ! operatorColour = "550077" ! ! enumColour = "007700" ! defineColour = "007755" ! eventColour = "557700" ! ! function GenerateTestColours(fileTable) ! table.insert(fileTable, "<h2>Colours used to denote types</h2>") ! ! table.insert(fileTable, MakeColour("Enums - %enum", enumColour).."<br>") ! table.insert(fileTable, MakeColour("Defines - %define [%string] [%object]", defineColour).."<br>") ! table.insert(fileTable, MakeColour("Events - %define %event", eventColour).."<br>") ! ! table.insert(fileTable, MakeColour("Classes - %class", classColour).."<br>") ! table.insert(fileTable, MakeColour("Class Properties - %property", propColour).."<br>") ! table.insert(fileTable, MakeColour("Class Members - %member", memberColour).."<br>") ! table.insert(fileTable, MakeColour("Renamed Functions - %rename", renameColour).."<br>") ! table.insert(fileTable, MakeColour("Overridden Functions - %override", overrideColour).."<br>") ! table.insert(fileTable, MakeColour("Overloaded Functions - %overload", overloadColour).."<br>") ! table.insert(fileTable, MakeColour("Operator Functions - %operator", operatorColour).."<br>") ! end --<a name="papers">Papers</a> *************** *** 71,80 **** local allClasses = {} ! for k, v in pairs(wxClassRef) do allClasses[k] = false -- wxWidgets classes end for k, v in pairs(dataTypes) do if v.DefType == "class" then ! allClasses[k] = true -- the ones we wrap end end --- 90,99 ---- local allClasses = {} ! for k, v in pairs(wxWidgetsClassRefTable) do allClasses[k] = false -- wxWidgets classes end for k, v in pairs(dataTypes) do if v.DefType == "class" then ! allClasses[k] = true -- the ones we wrap end end *************** *** 85,92 **** table.sort(names) for n = 1, #names do ! if allClasses[names[n]] then ! table.insert(fileTable, MakeLink(names[n]).."<br>") else ! table.insert(fileTable, names[n].." - NOT WRAPPED<br>") end end --- 104,117 ---- table.sort(names) for n = 1, #names do ! local cname = names[n] ! ! if allClasses[cname] then ! if wxWidgetsClassRefTable[cname] then ! 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 *************** *** 135,138 **** --- 160,172 ---- end + -- if the tag in the txt is before the ifbefore_pos then return true + function TagIsBefore(txt, tag, ifbefore_pos) + local pos = string.find(txt, tag, 1, 1) + if pos and ((ifbefore_pos == nil) or (pos < ifbefore_pos)) then + return true + end + return false + end + function ReadInterfaceFiles(fileTable) *************** *** 178,217 **** -- priortize the colouring so we don't have to check for every single case ! local endclass_pos = string.find(line, "%endclass", 1, 1) ! local endenum_pos = string.find(line, "%endenum", 1, 1) ! if (endclass_pos and endclass_pos < comment_pos) or (endenum_pos and endenum_pos < comment_pos) then ! if endclass_pos then out_line = MakeColour(out_line, classColour) end ! if endenum_pos then out_line = out_line.."</font>" end end_block = true ! else ! local prop_pos = string.find(line, "%property", 1, 1) ! if (prop_pos and prop_pos < comment_pos) then ! out_line = MakeColour(out_line, propColour) ! else ! local member_pos = string.find(line, "%member", 1, 1) ! if (member_pos and member_pos < comment_pos) then ! out_line = MakeColour(out_line, memberColour) ! else ! local rename_pos = string.find(line, "%rename", 1, 1) ! if (rename_pos and rename_pos < comment_pos) then ! out_line = MakeColour(out_line, renameColour) ! else ! local override_pos = string.find(line, "%override", 1, 1) ! if override_pos then -- always commented in the .i files ! out_line = MakeColour(out_line, overrideColour) ! else ! local event_pos = string.find(line, "%event", 1, 1) ! if (event_pos and event_pos < comment_pos) then ! out_line = MakeColour(out_line, eventColour) ! else ! local define_pos = string.find(line, "%define", 1, 1) ! if define_pos then ! out_line = MakeColour(out_line, defineColour) ! end ! end ! end ! end ! end ! end end end --- 212,235 ---- -- priortize the colouring so we don't have to check for every single case ! if TagIsBefore(line, "%endclass", comment_pos) then ! out_line = MakeColour(out_line, classColour) end_block = true ! elseif TagIsBefore(line, "%endenum", comment_pos) then ! out_line = out_line.."</font>" ! end_block = true ! elseif TagIsBefore(line, "%property", comment_pos) then ! out_line = MakeColour(out_line, propColour) ! elseif TagIsBefore(line, "%member", comment_pos) then ! out_line = MakeColour(out_line, memberColour) ! elseif TagIsBefore(line, "%overload", comment_pos) then ! out_line = MakeColour(out_line, overloadColour) ! elseif TagIsBefore(line, "%rename", comment_pos) then ! out_line = MakeColour(out_line, renameColour) ! elseif TagIsBefore(line, "%override", 1E6) then ! out_line = MakeColour(out_line, overrideColour) ! elseif TagIsBefore(line, "%event", comment_pos) then ! out_line = MakeColour(out_line, eventColour) ! elseif TagIsBefore(line, "%define", comment_pos) then ! out_line = MakeColour(out_line, defineColour) end end *************** *** 263,267 **** for line in io.lines(interface_filepath.."/".."wxclassref.txt") do for w in string.gmatch(line, "([%w_]+)") do ! wxClassRef[w] = true end end --- 281,285 ---- for line in io.lines(interface_filepath.."/".."wxclassref.txt") do for w in string.gmatch(line, "([%w_]+)") do ! wxWidgetsClassRefTable[w] = true end end *************** *** 281,284 **** --- 299,305 ---- end + -- FIXME - hack to add wxSTC + table.insert(interface_fileTable, "../wxstc/stc.i") + local datatypes_file = loadfile(interface_filepath.."/"..datatypes_cache_output_filename) if datatypes_file then *************** *** 305,309 **** --- 326,334 ---- GenerateHeader(fileTable) GenerateClassReference(fileTable) + table.insert(fileTable, "<HR>") GenerateEnumReference(fileTable) + table.insert(fileTable, "<HR>") + GenerateTestColours(fileTable) + table.insert(fileTable, "<HR>") ReadInterfaceFiles(fileTable) GenerateFooter(fileTable) |
|
From: John L. <jr...@us...> - 2006-05-16 22:47:14
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2550/wxLua/bindings Modified Files: genwxbind.lua Log Message: add more classes for 2.6.3, wxMediaCtrl, wxURL, wxURI, update grid.i Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** genwxbind.lua 14 May 2006 17:45:05 -0000 1.61 --- genwxbind.lua 16 May 2006 22:47:08 -0000 1.62 *************** *** 730,733 **** --- 730,734 ---- conditions["wxUSE_MDI"] = "wxUSE_MDI" conditions["wxUSE_MDI_ARCHITECTURE"] = "wxUSE_MDI_ARCHITECTURE" + conditions["wxUSE_MEDIACTRL"] = "wxUSE_MEDIACTRL" conditions["wxUSE_MEMORY_TRACING"] = "wxUSE_MEMORY_TRACING" conditions["wxUSE_MENUS"] = "wxUSE_MENUS" *************** *** 890,893 **** --- 891,895 ---- conditions["wxLUA_USE_wxLuaPrintout"] = "wxLUA_USE_wxLuaPrintout" conditions["wxLUA_USE_wxMask"] = "wxLUA_USE_wxMask" + conditions["wxLUA_USE_wxMediaCtrl"] = "wxLUA_USE_wxMediaCtrl" conditions["wxLUA_USE_wxMenu"] = "wxLUA_USE_wxMenu" conditions["wxLUA_USE_wxMessageDialog"] = "wxLUA_USE_wxMessageDialog" |
