From: John L. <jr...@us...> - 2007-11-25 21:34:08
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23733/wxLua/modules/wxbind/src Modified Files: wxaui_aui.cpp wxaui_bind.cpp Log Message: Updated wxAUI to 2.8.6 and added a sample for it Index: wxaui_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_bind.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxaui_bind.cpp 17 Nov 2007 00:14:57 -0000 1.2 --- wxaui_bind.cpp 25 Nov 2007 21:34:05 -0000 1.3 *************** *** 37,41 **** --- 37,55 ---- { "wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND", &wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND, &s_wxluatag_wxAuiNotebookEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG", &wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG, &s_wxluatag_wxAuiNotebookEvent }, + #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + { "wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK", &wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK, &s_wxluatag_wxAuiNotebookEvent }, + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + + #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { "wxEVT_COMMAND_AUINOTEBOOK_BUTTON", &wxEVT_COMMAND_AUINOTEBOOK_BUTTON, &s_wxluatag_wxAuiNotebookEvent }, + #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + { "wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE", &wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE, &s_wxluatag_wxAuiNotebookEvent }, + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + + #if wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI { "wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION", &wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION, &s_wxluatag_wxAuiNotebookEvent }, { "wxEVT_COMMAND_AUINOTEBOOK_END_DRAG", &wxEVT_COMMAND_AUINOTEBOOK_END_DRAG, &s_wxluatag_wxAuiNotebookEvent }, *************** *** 45,48 **** --- 59,70 ---- #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + { "wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED", &wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED, &s_wxluatag_wxAuiNotebookEvent }, + { "wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN", &wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN, &s_wxluatag_wxAuiNotebookEvent }, + { "wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP", &wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP, &s_wxluatag_wxAuiNotebookEvent }, + { "wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN", &wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN, &s_wxluatag_wxAuiNotebookEvent }, + { "wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP", &wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP, &s_wxluatag_wxAuiNotebookEvent }, + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) && (wxCHECK_VERSION(2,8,5)) + { 0, 0, 0 }, *************** *** 125,128 **** --- 147,151 ---- { "wxAUI_NB_DEFAULT_STYLE", wxAUI_NB_DEFAULT_STYLE }, { "wxAUI_NB_LEFT", wxAUI_NB_LEFT }, + { "wxAUI_NB_MIDDLE_CLICK_CLOSE", wxAUI_NB_MIDDLE_CLICK_CLOSE }, { "wxAUI_NB_RIGHT", wxAUI_NB_RIGHT }, { "wxAUI_NB_SCROLL_BUTTONS", wxAUI_NB_SCROLL_BUTTONS }, *************** *** 214,217 **** --- 237,243 ---- { "wxAuiDockUIPart", wxAuiDockUIPart_methods, wxAuiDockUIPart_methodCount, NULL, &s_wxluatag_wxAuiDockUIPart, NULL, NULL ,wxAuiDockUIPart_enums, wxAuiDockUIPart_enumCount, }, { "wxAuiFloatingFrame", wxAuiFloatingFrame_methods, wxAuiFloatingFrame_methodCount, CLASSINFO(wxAuiFloatingFrame), &s_wxluatag_wxAuiFloatingFrame, "wxFrame", NULL ,s_wxluadefineArray_None, 0, }, + { "wxAuiMDIChildFrame", wxAuiMDIChildFrame_methods, wxAuiMDIChildFrame_methodCount, CLASSINFO(wxAuiMDIChildFrame), &s_wxluatag_wxAuiMDIChildFrame, "wxPanel", NULL ,s_wxluadefineArray_None, 0, }, + { "wxAuiMDIClientWindow", wxAuiMDIClientWindow_methods, wxAuiMDIClientWindow_methodCount, CLASSINFO(wxAuiMDIClientWindow), &s_wxluatag_wxAuiMDIClientWindow, "wxAuiNotebook", NULL ,s_wxluadefineArray_None, 0, }, + { "wxAuiMDIParentFrame", wxAuiMDIParentFrame_methods, wxAuiMDIParentFrame_methodCount, CLASSINFO(wxAuiMDIParentFrame), &s_wxluatag_wxAuiMDIParentFrame, "wxFrame", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiManager", wxAuiManager_methods, wxAuiManager_methodCount, CLASSINFO(wxAuiManager), &s_wxluatag_wxAuiManager, "wxEvtHandler", NULL ,s_wxluadefineArray_None, 0, }, { "wxAuiManagerEvent", wxAuiManagerEvent_methods, wxAuiManagerEvent_methodCount, CLASSINFO(wxAuiManagerEvent), &s_wxluatag_wxAuiManagerEvent, "wxEvent", NULL ,s_wxluadefineArray_None, 0, }, Index: wxaui_aui.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxaui_aui.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxaui_aui.cpp 17 Nov 2007 00:14:57 -0000 1.5 --- wxaui_aui.cpp 25 Nov 2007 21:34:04 -0000 1.6 *************** *** 1853,1856 **** --- 1853,1923 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxAuiTabCtrl_IsDragging[] = { &s_wxluatag_wxAuiTabCtrl, NULL }; + static int LUACALL wxLua_wxAuiTabCtrl_IsDragging(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxAuiTabCtrl_IsDragging[1] = {{ wxLua_wxAuiTabCtrl_IsDragging, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxAuiTabCtrl_IsDragging }}; + // bool IsDragging() const + static int LUACALL wxLua_wxAuiTabCtrl_IsDragging(lua_State *L) + { + wxLuaState wxlState(L); [...2340 lines suppressed...] + return wxlState.CallOverloadedFunction(&overload_method); + } + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxAuiMDIClientWindow_methods[] = { + { "CreateClient", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiMDIClientWindow_CreateClient, 1, NULL }, + { "SetSelection", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxAuiMDIClientWindow_SetSelection, 1, NULL }, + + #if (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + { "wxAuiMDIClientWindow", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxAuiMDIClientWindow_constructor_overload, s_wxluafunc_wxLua_wxAuiMDIClientWindow_constructor_overload_count, 0 }, + #endif // (wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI) + + { 0, 0, 0, 0 }, + }; + + int wxAuiMDIClientWindow_methodCount = sizeof(wxAuiMDIClientWindow_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // wxLUA_USE_wxAUI && wxCHECK_VERSION(2,8,0) && wxUSE_AUI + |