Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19412/wxLua/modules/wxbind/src
Modified Files:
help.cpp
Log Message:
Moved the bindings function for introspection in lua into the override.hpp
file for the wxlua bindings.
Add function wxlua.GetBindings() instead of install wxLuaBinding_XXX per binding.
Index: help.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/help.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** help.cpp 25 Jun 2007 03:19:44 -0000 1.44
--- help.cpp 28 Jun 2007 21:52:56 -0000 1.45
***************
*** 1438,1468 ****
- #if (wxLUA_USE_wxHelpController && wxUSE_HELP) && ((wxLUA_USE_wxHelpController && wxUSE_HELP) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP))
- static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlHelpController_KeywordSearch[] = { &s_wxluatag_wxHtmlHelpController, &s_wxluaarg_String, &s_wxluaarg_Integer, NULL };
- static int LUACALL wxLua_wxHtmlHelpController_KeywordSearch(lua_State *L);
- static wxLuaBindCFunc s_wxluafunc_wxLua_wxHtmlHelpController_KeywordSearch[1] = {{ wxLua_wxHtmlHelpController_KeywordSearch, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxHtmlHelpController_KeywordSearch }};
- // bool KeywordSearch(const wxString& keyword, wxHelpSearchMode mode = wxHELP_SEARCH_ALL)
- static int LUACALL wxLua_wxHtmlHelpController_KeywordSearch(lua_State *L)
- {
- wxLuaState wxlState(L);
- bool returns;
- // get number of arguments
- int argCount = lua_gettop(L);
- // wxHelpSearchMode mode = wxHELP_SEARCH_ALL
- wxHelpSearchMode mode = (argCount >= 3 ? (wxHelpSearchMode)wxlua_getintegertype(L, 3) : wxHELP_SEARCH_ALL);
- // const wxString keyword
- const wxString keyword = wxlState.GetwxStringType(2);
- // get this
- wxHtmlHelpController * self = (wxHtmlHelpController *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlHelpController);
- // call KeywordSearch
- returns = (self->KeywordSearch(keyword, mode));
- // push the result flag
- lua_pushboolean(L, returns);
-
- return 1;
- }
-
- #endif // (wxLUA_USE_wxHelpController && wxUSE_HELP) && ((wxLUA_USE_wxHelpController && wxUSE_HELP) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP))
-
#if (wxLUA_USE_wxConfig && wxUSE_CONFIG) && ((wxLUA_USE_wxHelpController && wxUSE_HELP) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP))
static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlHelpController_ReadCustomization[] = { &s_wxluatag_wxHtmlHelpController, &s_wxluatag_wxConfigBase, &s_wxluaarg_String, NULL };
--- 1438,1441 ----
***************
*** 1666,1673 ****
{ "DisplayIndex", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHtmlHelpController_DisplayIndex, 1, NULL },
- #if (wxLUA_USE_wxHelpController && wxUSE_HELP) && ((wxLUA_USE_wxHelpController && wxUSE_HELP) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP))
- { "KeywordSearch", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHtmlHelpController_KeywordSearch, 1, NULL },
- #endif // (wxLUA_USE_wxHelpController && wxUSE_HELP) && ((wxLUA_USE_wxHelpController && wxUSE_HELP) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP))
-
#if (wxLUA_USE_wxConfig && wxUSE_CONFIG) && ((wxLUA_USE_wxHelpController && wxUSE_HELP) && (wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP))
{ "ReadCustomization", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxHtmlHelpController_ReadCustomization, 1, NULL },
--- 1639,1642 ----
|
