Menu
▾
▴
wxlua-commit
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16561/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp Log Message: cleanup output fix use of wxUSE_FATAL_EXCEPTIONS Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** xml.cpp 8 Jun 2006 03:22:10 -0000 1.13 --- xml.cpp 9 Jun 2006 22:51:34 -0000 1.14 *************** *** 533,537 **** WXLUAMETHOD* wxXmlNode_methods = s_wxXmlNode_methods; int wxXmlNode_methodCount = sizeof(s_wxXmlNode_methods)/sizeof(s_wxXmlNode_methods[0]); ! #endif --- 533,537 ---- WXLUAMETHOD* wxXmlNode_methods = s_wxXmlNode_methods; int wxXmlNode_methodCount = sizeof(s_wxXmlNode_methods)/sizeof(s_wxXmlNode_methods[0]); ! #endif // wxLUA_USE_wxXMLResource *************** *** 719,723 **** WXLUAMETHOD* wxXmlProperty_methods = s_wxXmlProperty_methods; int wxXmlProperty_methodCount = sizeof(s_wxXmlProperty_methods)/sizeof(s_wxXmlProperty_methods[0]); ! #endif --- 719,723 ---- WXLUAMETHOD* wxXmlProperty_methods = s_wxXmlProperty_methods; int wxXmlProperty_methodCount = sizeof(s_wxXmlProperty_methods)/sizeof(s_wxXmlProperty_methods[0]); ! #endif // wxLUA_USE_wxXMLResource *************** *** 961,965 **** WXLUAMETHOD* wxXmlDocument_methods = s_wxXmlDocument_methods; int wxXmlDocument_methodCount = sizeof(s_wxXmlDocument_methods)/sizeof(s_wxXmlDocument_methods[0]); ! #endif --- 961,965 ---- WXLUAMETHOD* wxXmlDocument_methods = s_wxXmlDocument_methods; int wxXmlDocument_methodCount = sizeof(s_wxXmlDocument_methods)/sizeof(s_wxXmlDocument_methods[0]); ! #endif // wxLUA_USE_wxXMLResource *************** *** 989,993 **** WXLUAMETHOD* wxXmlResourceHandler_methods = s_wxXmlResourceHandler_methods; int wxXmlResourceHandler_methodCount = sizeof(s_wxXmlResourceHandler_methods)/sizeof(s_wxXmlResourceHandler_methods[0]); ! #endif --- 989,993 ---- WXLUAMETHOD* wxXmlResourceHandler_methods = s_wxXmlResourceHandler_methods; int wxXmlResourceHandler_methodCount = sizeof(s_wxXmlResourceHandler_methods)/sizeof(s_wxXmlResourceHandler_methods[0]); ! #endif // wxLUA_USE_wxXMLResource *************** *** 1022,1026 **** } ! #endif --- 1022,1026 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) *************** *** 1091,1095 **** } ! #endif --- 1091,1095 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) *************** *** 1141,1145 **** } ! #endif --- 1141,1145 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) *************** *** 1165,1169 **** } ! #endif --- 1165,1169 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) *************** *** 1222,1226 **** } ! #endif --- 1222,1226 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) *************** *** 1245,1249 **** } ! #endif // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE); --- 1245,1249 ---- } ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) // wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE); *************** *** 1569,1573 **** #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif --- 1569,1573 ---- #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) { LuaMethod, "LoadBitmap", wxLua_wxXmlResource_LoadBitmap, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxBitmap) *************** *** 1576,1580 **** { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, { &s_wxluatag_wxDialog, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif --- 1576,1580 ---- { LuaMethod, "LoadDialogCreate", wxLua_wxXmlResource_LoadDialogCreate, 3, 3, { &s_wxluatag_wxDialog, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "CreateDialog", wxLua_wxXmlResource_CreateDialog, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxDialog) *************** *** 1582,1591 **** { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif --- 1582,1591 ---- { LuaMethod, "LoadFrame", wxLua_wxXmlResource_LoadFrame, 3, 3, { &s_wxluatag_wxFrame, &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "CreateFrame", wxLua_wxXmlResource_CreateFrame, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxFrame) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) { LuaMethod, "LoadIcon", wxLua_wxXmlResource_LoadIcon, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxIcon) *************** *** 1594,1603 **** { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, --- 1594,1603 ---- { LuaMethod, "LoadMenuBarWindow", wxLua_wxXmlResource_LoadMenuBarWindow, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, { LuaMethod, "LoadMenuBar", wxLua_wxXmlResource_LoadMenuBar, 1, 1, { &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxMenu) #if (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) { LuaMethod, "LoadToolBar", wxLua_wxXmlResource_LoadToolBar, 2, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxXMLResource) && (wxLUA_USE_wxToolbar) { LuaConstructor, "wxXmlResource", wxLua_wxXmlResource_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, *************** *** 1627,1630 **** WXLUAMETHOD* wxXmlResource_methods = s_wxXmlResource_methods; int wxXmlResource_methodCount = sizeof(s_wxXmlResource_methods)/sizeof(s_wxXmlResource_methods[0]); ! #endif --- 1627,1630 ---- WXLUAMETHOD* wxXmlResource_methods = s_wxXmlResource_methods; int wxXmlResource_methodCount = sizeof(s_wxXmlResource_methods)/sizeof(s_wxXmlResource_methods[0]); ! #endif // wxLUA_USE_wxXMLResource Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** defsutil.cpp 8 Jun 2006 03:22:08 -0000 1.17 --- defsutil.cpp 9 Jun 2006 22:51:31 -0000 1.18 *************** *** 100,104 **** } ! #endif --- 100,104 ---- } ! #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) *************** *** 161,165 **** } ! #endif // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) --- 161,165 ---- } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) *************** *** 315,319 **** { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, { 0 } }, { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 } }, ! #endif --- 315,319 ---- { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, { 0 } }, { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 } }, ! #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) *************** *** 323,327 **** { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, { 0 } }, { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, { 0 } }, ! #endif { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } }, --- 323,327 ---- { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, { 0 } }, { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, { 0 } }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } }, *************** *** 339,343 **** WXLUAMETHOD* wxProcess_methods = s_wxProcess_methods; int wxProcess_methodCount = sizeof(s_wxProcess_methods)/sizeof(s_wxProcess_methods[0]); ! #endif --- 339,343 ---- WXLUAMETHOD* wxProcess_methods = s_wxProcess_methods; int wxProcess_methodCount = sizeof(s_wxProcess_methods)/sizeof(s_wxProcess_methods[0]); ! #endif // wxLUA_USE_wxProcess *************** *** 699,703 **** WXLUAMETHOD* wxMouseState_methods = s_wxMouseState_methods; int wxMouseState_methodCount = sizeof(s_wxMouseState_methods)/sizeof(s_wxMouseState_methods[0]); ! #endif --- 699,703 ---- WXLUAMETHOD* wxMouseState_methods = s_wxMouseState_methods; int wxMouseState_methodCount = sizeof(s_wxMouseState_methods)/sizeof(s_wxMouseState_methods[0]); ! #endif // wxCHECK_VERSION(2,7,0) *************** *** 734,738 **** } ! #endif static int LUACALL wxLua_wxBusyCursor_destructor(lua_State *L) --- 734,738 ---- } ! #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) static int LUACALL wxLua_wxBusyCursor_destructor(lua_State *L) *************** *** 770,774 **** #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) { LuaConstructor, "wxBusyCursor", wxLua_wxBusyCursor_constructor, 1, 0, { &s_wxluatag_wxCursor, 0 } }, ! #endif { LuaDelete, "wxBusyCursor", wxLua_wxBusyCursor_destructor, 0, 0, {0} }, --- 770,774 ---- #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) { LuaConstructor, "wxBusyCursor", wxLua_wxBusyCursor_constructor, 1, 0, { &s_wxluatag_wxCursor, 0 } }, ! #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) { LuaDelete, "wxBusyCursor", wxLua_wxBusyCursor_destructor, 0, 0, {0} }, *************** *** 779,783 **** WXLUAMETHOD* wxBusyCursor_methods = s_wxBusyCursor_methods; int wxBusyCursor_methodCount = sizeof(s_wxBusyCursor_methods)/sizeof(s_wxBusyCursor_methods[0]); ! #endif --- 779,783 ---- WXLUAMETHOD* wxBusyCursor_methods = s_wxBusyCursor_methods; int wxBusyCursor_methodCount = sizeof(s_wxBusyCursor_methods)/sizeof(s_wxBusyCursor_methods[0]); ! #endif // wxLUA_USE_wxBusyCursor *************** *** 850,853 **** WXLUAMETHOD* wxBusyInfo_methods = s_wxBusyInfo_methods; int wxBusyInfo_methodCount = sizeof(s_wxBusyInfo_methods)/sizeof(s_wxBusyInfo_methods[0]); ! #endif --- 850,853 ---- WXLUAMETHOD* wxBusyInfo_methods = s_wxBusyInfo_methods; int wxBusyInfo_methodCount = sizeof(s_wxBusyInfo_methods)/sizeof(s_wxBusyInfo_methods[0]); ! #endif // wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxlua.cpp 8 Jun 2006 03:22:10 -0000 1.19 --- wxlua.cpp 9 Jun 2006 22:51:34 -0000 1.20 *************** *** 306,310 **** WXLUAMETHOD* wxLuaPrintout_methods = s_wxLuaPrintout_methods; int wxLuaPrintout_methodCount = sizeof(s_wxLuaPrintout_methods)/sizeof(s_wxLuaPrintout_methods[0]); ! #endif --- 306,310 ---- WXLUAMETHOD* wxLuaPrintout_methods = s_wxLuaPrintout_methods; int wxLuaPrintout_methodCount = sizeof(s_wxLuaPrintout_methods)/sizeof(s_wxLuaPrintout_methods[0]); ! #endif // wxLUA_USE_wxLuaPrintout *************** *** 350,354 **** } ! #endif static int LUACALL wxLua_wxLuaHtmlWindow_destructor(lua_State *) --- 350,354 ---- } ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxLuaHtmlWindow_destructor(lua_State *) *************** *** 366,370 **** #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_constructor, 6, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif { LuaDelete, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_destructor, 0, 0, {0} }, --- 366,370 ---- #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_constructor, 6, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect) { LuaDelete, "wxLuaHtmlWindow", wxLua_wxLuaHtmlWindow_destructor, 0, 0, {0} }, *************** *** 374,378 **** WXLUAMETHOD* wxLuaHtmlWindow_methods = s_wxLuaHtmlWindow_methods; int wxLuaHtmlWindow_methodCount = sizeof(s_wxLuaHtmlWindow_methods)/sizeof(s_wxLuaHtmlWindow_methods[0]); ! #endif --- 374,378 ---- WXLUAMETHOD* wxLuaHtmlWindow_methods = s_wxLuaHtmlWindow_methods; int wxLuaHtmlWindow_methodCount = sizeof(s_wxLuaHtmlWindow_methods)/sizeof(s_wxLuaHtmlWindow_methods[0]); ! #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 417,421 **** } ! #endif // void SetParseInnerCalled(bool fParseInnerCalled = true) --- 417,421 ---- } ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) // void SetParseInnerCalled(bool fParseInnerCalled = true) *************** *** 487,491 **** { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, {0} }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, {0} }, ! #endif { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, { &s_wxluaarg_Boolean, 0 } }, --- 487,491 ---- { LuaGetProp, "HtmlTag", wxLua_wxLuaHtmlWinTagEvent_GetHtmlTag, 0, 0, {0} }, { LuaGetProp, "HtmlParser", wxLua_wxLuaHtmlWinTagEvent_GetHtmlParser, 0, 0, {0} }, ! #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxHTML) { LuaMethod, "SetParseInnerCalled", wxLua_wxLuaHtmlWinTagEvent_SetParseInnerCalled, 1, 0, { &s_wxluaarg_Boolean, 0 } }, *************** *** 500,504 **** WXLUAMETHOD* wxLuaHtmlWinTagEvent_methods = s_wxLuaHtmlWinTagEvent_methods; int wxLuaHtmlWinTagEvent_methodCount = sizeof(s_wxLuaHtmlWinTagEvent_methods)/sizeof(s_wxLuaHtmlWinTagEvent_methods[0]); ! #endif --- 500,504 ---- WXLUAMETHOD* wxLuaHtmlWinTagEvent_methods = s_wxLuaHtmlWinTagEvent_methods; int wxLuaHtmlWinTagEvent_methodCount = sizeof(s_wxLuaHtmlWinTagEvent_methods)/sizeof(s_wxLuaHtmlWinTagEvent_methods[0]); ! #endif // wxLUA_USE_wxLuaHtmlWindow *************** *** 579,582 **** WXLUAMETHOD* wxLuaTreeItemData_methods = s_wxLuaTreeItemData_methods; int wxLuaTreeItemData_methodCount = sizeof(s_wxLuaTreeItemData_methods)/sizeof(s_wxLuaTreeItemData_methods[0]); ! #endif --- 579,582 ---- WXLUAMETHOD* wxLuaTreeItemData_methods = s_wxLuaTreeItemData_methods; int wxLuaTreeItemData_methodCount = sizeof(s_wxLuaTreeItemData_methods)/sizeof(s_wxLuaTreeItemData_methods[0]); ! #endif // wxLUA_USE_wxTreeCtrl Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** image.cpp 8 Jun 2006 03:22:10 -0000 1.15 --- image.cpp 9 Jun 2006 22:51:32 -0000 1.16 *************** *** 55,59 **** } ! #endif --- 55,59 ---- } ! #endif // (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage) *************** *** 142,146 **** } ! #endif --- 142,146 ---- } ! #endif // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage) *************** *** 159,163 **** } ! #endif --- 159,163 ---- } ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) *************** *** 195,199 **** } ! #endif --- 195,199 ---- } ! #endif // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) *************** *** 324,328 **** } ! #endif --- 324,328 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage) *************** *** 370,374 **** } ! #endif // wxImage(const wxImage& image) --- 370,374 ---- } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) // wxImage(const wxImage& image) *************** *** 1449,1453 **** #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage) { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, { &s_wxluatag_wxBitmap, 0 } }, ! #endif --- 1449,1453 ---- #if (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage) { LuaConstructor, "wxImageFromBitmap", wxLua_wxImageFromBitmap_constructor, 1, 1, { &s_wxluatag_wxBitmap, 0 } }, ! #endif // (((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage)) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxImage) *************** *** 1458,1467 **** { LuaMethod, "SetOption", wxLua_wxImage_SetOption, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "SetOptionInt", wxLua_wxImage_SetOptionInt, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! #endif #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, { 0 } }, ! #endif --- 1458,1467 ---- { LuaMethod, "SetOption", wxLua_wxImage_SetOption, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, { LuaMethod, "SetOptionInt", wxLua_wxImage_SetOptionInt, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! #endif // (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxImage) #if (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) { LuaMethod, "GetHandlers", wxLua_wxImage_GetHandlers, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxImage) *************** *** 1469,1473 **** { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, { 0 } }, { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, { &s_wxluatag_wxPalette, 0 } }, ! #endif --- 1469,1473 ---- { LuaMethod, "GetPalette", wxLua_wxImage_GetPalette, 0, 0, { 0 } }, { LuaMethod, "SetPalette", wxLua_wxImage_SetPalette, 1, 1, { &s_wxluatag_wxPalette, 0 } }, ! #endif // (wxLUA_USE_wxPalette) && (wxLUA_USE_wxImage) *************** *** 1478,1482 **** { LuaMethod, "Size", wxLua_wxImage_Size, 5, 2, { &s_wxluatag_wxSize, &s_wxluatag_wxPoint, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetRGBRect", wxLua_wxImage_SetRGBRect, 4, 4, { &s_wxluatag_wxRect, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif --- 1478,1482 ---- { LuaMethod, "Size", wxLua_wxImage_Size, 5, 2, { &s_wxluatag_wxSize, &s_wxluatag_wxPoint, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SetRGBRect", wxLua_wxImage_SetRGBRect, 4, 4, { &s_wxluatag_wxRect, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxImage) *************** *** 1484,1488 **** { LuaMethod, "GetImageCountStream", wxLua_wxImage_GetImageCountStream, 2, 1, { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, 0 } }, { LuaMethod, "LoadFileStream", wxLua_wxImage_LoadFileStream, 3, 2, { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, { &s_wxluatag_wxImage, 0 } }, --- 1484,1488 ---- { LuaMethod, "GetImageCountStream", wxLua_wxImage_GetImageCountStream, 2, 1, { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, 0 } }, { LuaMethod, "LoadFileStream", wxLua_wxImage_LoadFileStream, 3, 2, { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) { LuaConstructor, "wxImage", wxLua_wxImage_constructor, 1, 1, { &s_wxluatag_wxImage, 0 } }, *************** *** 1551,1555 **** WXLUAMETHOD* wxImage_methods = s_wxImage_methods; int wxImage_methodCount = sizeof(s_wxImage_methods)/sizeof(s_wxImage_methods[0]); ! #endif --- 1551,1555 ---- WXLUAMETHOD* wxImage_methods = s_wxImage_methods; int wxImage_methodCount = sizeof(s_wxImage_methods)/sizeof(s_wxImage_methods[0]); ! #endif // wxLUA_USE_wxImage *************** *** 1625,1629 **** } ! #endif // wxString GetName() const --- 1625,1629 ---- } ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) // wxString GetName() const *************** *** 1779,1783 **** { LuaMethod, "LoadFile", wxLua_wxImageHandler_LoadFile, 4, 2, { &s_wxluatag_wxImage, &s_wxluatag_wxInputStream, &s_wxluaarg_Boolean, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SaveFile", wxLua_wxImageHandler_SaveFile, 2, 2, { &s_wxluatag_wxImage, &s_wxluatag_wxOutputStream, 0 } }, ! #endif { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, { 0 } }, --- 1779,1783 ---- { LuaMethod, "LoadFile", wxLua_wxImageHandler_LoadFile, 4, 2, { &s_wxluatag_wxImage, &s_wxluatag_wxInputStream, &s_wxluaarg_Boolean, &s_wxluaarg_Number, 0 } }, { LuaMethod, "SaveFile", wxLua_wxImageHandler_SaveFile, 2, 2, { &s_wxluatag_wxImage, &s_wxluatag_wxOutputStream, 0 } }, ! #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxImage) { LuaMethod, "GetName", wxLua_wxImageHandler_GetName, 0, 0, { 0 } }, *************** *** 1804,1808 **** WXLUAMETHOD* wxImageHandler_methods = s_wxImageHandler_methods; int wxImageHandler_methodCount = sizeof(s_wxImageHandler_methods)/sizeof(s_wxImageHandler_methods[0]); ! #endif --- 1804,1808 ---- WXLUAMETHOD* wxImageHandler_methods = s_wxImageHandler_methods; int wxImageHandler_methodCount = sizeof(s_wxImageHandler_methods)/sizeof(s_wxImageHandler_methods[0]); ! #endif // wxLUA_USE_wxImage *************** *** 1849,1853 **** WXLUAMETHOD* wxBMPHandler_methods = s_wxBMPHandler_methods; int wxBMPHandler_methodCount = sizeof(s_wxBMPHandler_methods)/sizeof(s_wxBMPHandler_methods[0]); ! #endif --- 1849,1853 ---- WXLUAMETHOD* wxBMPHandler_methods = s_wxBMPHandler_methods; int wxBMPHandler_methodCount = sizeof(s_wxBMPHandler_methods)/sizeof(s_wxBMPHandler_methods[0]); ! #endif // wxLUA_USE_wxImage *************** *** 1894,1898 **** WXLUAMETHOD* wxICOHandler_methods = s_wxICOHandler_methods; int wxICOHandler_methodCount = sizeof(s_wxICOHandler_methods)/sizeof(s_wxICOHandler_methods[0]); ! #endif --- 1894,1898 ---- WXLUAMETHOD* wxICOHandler_methods = s_wxICOHandler_methods; int wxICOHandler_methodCount = sizeof(s_wxICOHandler_methods)/sizeof(s_wxICOHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) *************** *** 1939,1943 **** WXLUAMETHOD* wxCURHandler_methods = s_wxCURHandler_methods; int wxCURHandler_methodCount = sizeof(s_wxCURHandler_methods)/sizeof(s_wxCURHandler_methods[0]); ! #endif --- 1939,1943 ---- WXLUAMETHOD* wxCURHandler_methods = s_wxCURHandler_methods; int wxCURHandler_methodCount = sizeof(s_wxCURHandler_methods)/sizeof(s_wxCURHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) *************** *** 1984,1988 **** WXLUAMETHOD* wxANIHandler_methods = s_wxANIHandler_methods; int wxANIHandler_methodCount = sizeof(s_wxANIHandler_methods)/sizeof(s_wxANIHandler_methods[0]); ! #endif --- 1984,1988 ---- WXLUAMETHOD* wxANIHandler_methods = s_wxANIHandler_methods; int wxANIHandler_methodCount = sizeof(s_wxANIHandler_methods)/sizeof(s_wxANIHandler_methods[0]); ! #endif // (wxUSE_ICO_CUR) && (wxLUA_USE_wxImage) *************** *** 2029,2033 **** WXLUAMETHOD* wxIFFHandler_methods = s_wxIFFHandler_methods; int wxIFFHandler_methodCount = sizeof(s_wxIFFHandler_methods)/sizeof(s_wxIFFHandler_methods[0]); ! #endif --- 2029,2033 ---- WXLUAMETHOD* wxIFFHandler_methods = s_wxIFFHandler_methods; int wxIFFHandler_methodCount = sizeof(s_wxIFFHandler_methods)/sizeof(s_wxIFFHandler_methods[0]); ! #endif // (wxUSE_IMAGE && wxUSE_IFF) && (wxLUA_USE_wxImage) *************** *** 2074,2078 **** WXLUAMETHOD* wxGIFHandler_methods = s_wxGIFHandler_methods; int wxGIFHandler_methodCount = sizeof(s_wxGIFHandler_methods)/sizeof(s_wxGIFHandler_methods[0]); ! #endif --- 2074,2078 ---- WXLUAMETHOD* wxGIFHandler_methods = s_wxGIFHandler_methods; int wxGIFHandler_methodCount = sizeof(s_wxGIFHandler_methods)/sizeof(s_wxGIFHandler_methods[0]); ! #endif // (wxUSE_GIF) && (wxLUA_USE_wxImage) *************** *** 2119,2123 **** WXLUAMETHOD* wxJPEGHandler_methods = s_wxJPEGHandler_methods; int wxJPEGHandler_methodCount = sizeof(s_wxJPEGHandler_methods)/sizeof(s_wxJPEGHandler_methods[0]); ! #endif --- 2119,2123 ---- WXLUAMETHOD* wxJPEGHandler_methods = s_wxJPEGHandler_methods; int wxJPEGHandler_methodCount = sizeof(s_wxJPEGHandler_methods)/sizeof(s_wxJPEGHandler_methods[0]); ! #endif // (wxUSE_LIBJPEG) && (wxLUA_USE_wxImage) *************** *** 2164,2168 **** WXLUAMETHOD* wxPCXHandler_methods = s_wxPCXHandler_methods; int wxPCXHandler_methodCount = sizeof(s_wxPCXHandler_methods)/sizeof(s_wxPCXHandler_methods[0]); ! #endif --- 2164,2168 ---- WXLUAMETHOD* wxPCXHandler_methods = s_wxPCXHandler_methods; int wxPCXHandler_methodCount = sizeof(s_wxPCXHandler_methods)/sizeof(s_wxPCXHandler_methods[0]); ! #endif // (wxUSE_PCX) && (wxLUA_USE_wxImage) *************** *** 2209,2213 **** WXLUAMETHOD* wxPNGHandler_methods = s_wxPNGHandler_methods; int wxPNGHandler_methodCount = sizeof(s_wxPNGHandler_methods)/sizeof(s_wxPNGHandler_methods[0]); ! #endif --- 2209,2213 ---- WXLUAMETHOD* wxPNGHandler_methods = s_wxPNGHandler_methods; int wxPNGHandler_methodCount = sizeof(s_wxPNGHandler_methods)/sizeof(s_wxPNGHandler_methods[0]); ! #endif // (wxUSE_LIBPNG) && (wxLUA_USE_wxImage) *************** *** 2254,2258 **** WXLUAMETHOD* wxPNMHandler_methods = s_wxPNMHandler_methods; int wxPNMHandler_methodCount = sizeof(s_wxPNMHandler_methods)/sizeof(s_wxPNMHandler_methods[0]); ! #endif --- 2254,2258 ---- WXLUAMETHOD* wxPNMHandler_methods = s_wxPNMHandler_methods; int wxPNMHandler_methodCount = sizeof(s_wxPNMHandler_methods)/sizeof(s_wxPNMHandler_methods[0]); ! #endif // (wxUSE_PNM) && (wxLUA_USE_wxImage) *************** *** 2299,2303 **** WXLUAMETHOD* wxTIFFHandler_methods = s_wxTIFFHandler_methods; int wxTIFFHandler_methodCount = sizeof(s_wxTIFFHandler_methods)/sizeof(s_wxTIFFHandler_methods[0]); ! #endif --- 2299,2303 ---- WXLUAMETHOD* wxTIFFHandler_methods = s_wxTIFFHandler_methods; int wxTIFFHandler_methodCount = sizeof(s_wxTIFFHandler_methods)/sizeof(s_wxTIFFHandler_methods[0]); ! #endif // (wxUSE_LIBTIFF) && (wxLUA_USE_wxImage) *************** *** 2344,2348 **** WXLUAMETHOD* wxXPMHandler_methods = s_wxXPMHandler_methods; int wxXPMHandler_methodCount = sizeof(s_wxXPMHandler_methods)/sizeof(s_wxXPMHandler_methods[0]); ! #endif --- 2344,2348 ---- WXLUAMETHOD* wxXPMHandler_methods = s_wxXPMHandler_methods; int wxXPMHandler_methodCount = sizeof(s_wxXPMHandler_methods)/sizeof(s_wxXPMHandler_methods[0]); ! #endif // wxLUA_USE_wxImage *************** *** 2381,2385 **** } ! #endif --- 2381,2385 ---- } ! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) *************** *** 2409,2413 **** } ! #endif --- 2409,2413 ---- } ! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) *************** *** 2435,2439 **** } ! #endif static int LUACALL wxLua_wxArtProvider_destructor(lua_State *) --- 2435,2439 ---- } ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) static int LUACALL wxLua_wxArtProvider_destructor(lua_State *) *************** *** 2451,2465 **** #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetBitmap", wxLua_wxArtProvider_GetBitmap, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, 0 } }, ! #endif #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetIcon", wxLua_wxArtProvider_GetIcon, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, 0 } }, ! #endif #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetSizeHint", wxLua_wxArtProvider_GetSizeHint, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 } }, ! #endif { LuaDelete, "wxArtProvider", wxLua_wxArtProvider_destructor, 0, 0, {0} }, --- 2451,2465 ---- #if ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetBitmap", wxLua_wxArtProvider_GetBitmap, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, 0 } }, ! #endif // ((wxLUA_USE_wxBitmap) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) #if ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetIcon", wxLua_wxArtProvider_GetIcon, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxSize, 0 } }, ! #endif // ((wxLUA_USE_wxIcon) && (wxLUA_USE_wxPointSizeRect)) && (wxLUA_USE_wxArtProvider) #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) { LuaMethod, "GetSizeHint", wxLua_wxArtProvider_GetSizeHint, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 } }, ! #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxArtProvider) { LuaDelete, "wxArtProvider", wxLua_wxArtProvider_destructor, 0, 0, {0} }, *************** *** 2469,2472 **** WXLUAMETHOD* wxArtProvider_methods = s_wxArtProvider_methods; int wxArtProvider_methodCount = sizeof(s_wxArtProvider_methods)/sizeof(s_wxArtProvider_methods[0]); ! #endif --- 2469,2472 ---- WXLUAMETHOD* wxArtProvider_methods = s_wxArtProvider_methods; int wxArtProvider_methodCount = sizeof(s_wxArtProvider_methods)/sizeof(s_wxArtProvider_methods[0]); ! #endif // wxLUA_USE_wxArtProvider Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** mdi.cpp 8 Jun 2006 03:22:10 -0000 1.15 --- mdi.cpp 9 Jun 2006 22:51:32 -0000 1.16 *************** *** 52,56 **** WXLUAMETHOD* wxMDIClientWindow_methods = s_wxMDIClientWindow_methods; int wxMDIClientWindow_methodCount = sizeof(s_wxMDIClientWindow_methods)/sizeof(s_wxMDIClientWindow_methods[0]); ! #endif --- 52,56 ---- WXLUAMETHOD* wxMDIClientWindow_methods = s_wxMDIClientWindow_methods; int wxMDIClientWindow_methodCount = sizeof(s_wxMDIClientWindow_methods)/sizeof(s_wxMDIClientWindow_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 128,132 **** } ! #endif --- 128,132 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) *************** *** 146,150 **** } ! #endif --- 146,150 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxToolbar) *************** *** 179,183 **** } ! #endif // %constructor wxMDIParentFrameDefault() --- 179,183 ---- } ! #endif // (wxLUA_USE_wxMenu) && ((defined(__WXMSW__)) && (wxLUA_USE_MDI)) // %constructor wxMDIParentFrameDefault() *************** *** 337,346 **** { LuaConstructor, "wxMDIParentFrame", wxLua_wxMDIParentFrame_constructor, 7, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxMDIParentFrame_Create, 7, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxToolbar) { LuaMethod, "SetToolBar", wxLua_wxMDIParentFrame_SetToolBar, 1, 1, { &s_wxluatag_wxToolBar, 0 } }, ! #endif --- 337,346 ---- { LuaConstructor, "wxMDIParentFrame", wxLua_wxMDIParentFrame_constructor, 7, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxMDIParentFrame_Create, 7, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxToolbar) { LuaMethod, "SetToolBar", wxLua_wxMDIParentFrame_SetToolBar, 1, 1, { &s_wxluatag_wxToolBar, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxToolbar) *************** *** 350,354 **** { LuaGetProp, "WindowMenu", wxLua_wxMDIParentFrame_GetWindowMenu, 0, 0, {0} }, { LuaSetProp, "WindowMenu", wxLua_wxMDIParentFrame_SetWindowMenu, 1, 1, {0} }, ! #endif { LuaConstructor, "wxMDIParentFrameDefault", wxLua_wxMDIParentFrameDefault_constructor, 0, 0, { 0 } }, --- 350,354 ---- { LuaGetProp, "WindowMenu", wxLua_wxMDIParentFrame_GetWindowMenu, 0, 0, {0} }, { LuaSetProp, "WindowMenu", wxLua_wxMDIParentFrame_SetWindowMenu, 1, 1, {0} }, ! #endif // (wxLUA_USE_wxMenu) && ((defined(__WXMSW__)) && (wxLUA_USE_MDI)) { LuaConstructor, "wxMDIParentFrameDefault", wxLua_wxMDIParentFrameDefault_constructor, 0, 0, { 0 } }, *************** *** 372,376 **** WXLUAMETHOD* wxMDIParentFrame_methods = s_wxMDIParentFrame_methods; int wxMDIParentFrame_methodCount = sizeof(s_wxMDIParentFrame_methods)/sizeof(s_wxMDIParentFrame_methods[0]); ! #endif --- 372,376 ---- WXLUAMETHOD* wxMDIParentFrame_methods = s_wxMDIParentFrame_methods; int wxMDIParentFrame_methodCount = sizeof(s_wxMDIParentFrame_methods)/sizeof(s_wxMDIParentFrame_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 397,401 **** } ! #endif --- 397,401 ---- } ! #endif // (defined(__WXMSW__)) && (wxLUA_USE_MDI) *************** *** 464,468 **** } ! #endif // %constructor wxMDIChildFrameDefault() --- 464,468 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) // %constructor wxMDIChildFrameDefault() *************** *** 520,524 **** #if (defined(__WXMSW__)) && (wxLUA_USE_MDI) { LuaMethod, "Maximize", wxLua_wxMDIChildFrame_Maximize, 0, 0, { 0 } }, ! #endif --- 520,524 ---- #if (defined(__WXMSW__)) && (wxLUA_USE_MDI) { LuaMethod, "Maximize", wxLua_wxMDIChildFrame_Maximize, 0, 0, { 0 } }, ! #endif // (defined(__WXMSW__)) && (wxLUA_USE_MDI) *************** *** 526,530 **** { LuaConstructor, "wxMDIChildFrame", wxLua_wxMDIChildFrame_constructor, 7, 3, { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxMDIChildFrame_Create, 7, 3, { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif { LuaConstructor, "wxMDIChildFrameDefault", wxLua_wxMDIChildFrameDefault_constructor, 0, 0, { 0 } }, --- 526,530 ---- { LuaConstructor, "wxMDIChildFrame", wxLua_wxMDIChildFrame_constructor, 7, 3, { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxMDIChildFrame_Create, 7, 3, { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxMDIChildFrameDefault", wxLua_wxMDIChildFrameDefault_constructor, 0, 0, { 0 } }, *************** *** 537,541 **** WXLUAMETHOD* wxMDIChildFrame_methods = s_wxMDIChildFrame_methods; int wxMDIChildFrame_methodCount = sizeof(s_wxMDIChildFrame_methods)/sizeof(s_wxMDIChildFrame_methods[0]); ! #endif --- 537,541 ---- WXLUAMETHOD* wxMDIChildFrame_methods = s_wxMDIChildFrame_methods; int wxMDIChildFrame_methodCount = sizeof(s_wxMDIChildFrame_methods)/sizeof(s_wxMDIChildFrame_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 586,590 **** } ! #endif // wxDocument* GetDocument() const --- 586,590 ---- } ! #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) // wxDocument* GetDocument() const *************** *** 660,664 **** #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxDocChildFrame", wxLua_wxDocChildFrame_constructor, 9, 5, { &s_wxluatag_wxDocument, &s_wxluatag_wxView, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif { LuaMethod, "GetDocument", wxLua_wxDocChildFrame_GetDocument, 0, 0, { 0 } }, --- 660,664 ---- #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxDocChildFrame", wxLua_wxDocChildFrame_constructor, 9, 5, { &s_wxluatag_wxDocument, &s_wxluatag_wxView, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetDocument", wxLua_wxDocChildFrame_GetDocument, 0, 0, { 0 } }, *************** *** 674,678 **** WXLUAMETHOD* wxDocChildFrame_methods = s_wxDocChildFrame_methods; int wxDocChildFrame_methodCount = sizeof(s_wxDocChildFrame_methods)/sizeof(s_wxDocChildFrame_methods[0]); ! #endif --- 674,678 ---- WXLUAMETHOD* wxDocChildFrame_methods = s_wxDocChildFrame_methods; int wxDocChildFrame_methodCount = sizeof(s_wxDocChildFrame_methods)/sizeof(s_wxDocChildFrame_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 702,706 **** } ! #endif --- 702,706 ---- } ! #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) *************** *** 724,728 **** } ! #endif --- 724,728 ---- } ! #endif // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) *************** *** 744,748 **** } ! #endif --- 744,748 ---- } ! #endif // ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) *************** *** 763,767 **** } ! #endif --- 763,767 ---- } ! #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) *************** *** 795,799 **** } ! #endif --- 795,799 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxConfig) *************** *** 829,833 **** } ! #endif --- 829,833 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxFileHistory) *************** *** 867,871 **** } ! #endif --- 867,871 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxList) *************** *** 913,917 **** } ! #endif // wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true) --- 913,917 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxMenu) // wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = true) *************** *** 1327,1346 **** #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) { LuaMethod, "GetNoHistoryFiles", wxLua_wxDocManager_GetNoHistoryFiles, 0, 0, { 0 } }, ! #endif #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 3, 3, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 } }, ! #endif #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 2, 2, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, 0 } }, ! #endif #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) { LuaMethod, "GetHistoryFilesCount", wxLua_wxDocManager_GetHistoryFilesCount, 0, 0, { 0 } }, ! #endif --- 1327,1346 ---- #if (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) { LuaMethod, "GetNoHistoryFiles", wxLua_wxDocManager_GetNoHistoryFiles, 0, 0, { 0 } }, ! #endif // (!wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) #if ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 3, 3, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 } }, ! #endif // ((wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) #if ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) { LuaMethod, "ActivateView", wxLua_wxDocManager_ActivateView, 2, 2, { &s_wxluatag_wxView, &s_wxluaarg_Boolean, 0 } }, ! #endif // ((wxCHECK_VERSION(2,5,0)) && (wxLUA_USE_MDI)) && (wxLUA_USE_MDI) #if (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) { LuaMethod, "GetHistoryFilesCount", wxLua_wxDocManager_GetHistoryFilesCount, 0, 0, { 0 } }, ! #endif // (wxCHECK_VERSION(2,6,0)) && (wxLUA_USE_MDI) *************** *** 1348,1352 **** { LuaMethod, "FileHistoryLoad", wxLua_wxDocManager_FileHistoryLoad, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, { LuaMethod, "FileHistorySave", wxLua_wxDocManager_FileHistorySave, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, ! #endif --- 1348,1352 ---- { LuaMethod, "FileHistoryLoad", wxLua_wxDocManager_FileHistoryLoad, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, { LuaMethod, "FileHistorySave", wxLua_wxDocManager_FileHistorySave, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxConfig) *************** *** 1354,1358 **** { LuaMethod, "GetFileHistory", wxLua_wxDocManager_GetFileHistory, 0, 0, { 0 } }, { LuaMethod, "OnCreateFileHistory", wxLua_wxDocManager_OnCreateFileHistory, 0, 0, { 0 } }, ! #endif --- 1354,1358 ---- { LuaMethod, "GetFileHistory", wxLua_wxDocManager_GetFileHistory, 0, 0, { 0 } }, { LuaMethod, "OnCreateFileHistory", wxLua_wxDocManager_OnCreateFileHistory, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxFileHistory) *************** *** 1360,1364 **** { LuaMethod, "GetDocuments", wxLua_wxDocManager_GetDocuments, 0, 0, { 0 } }, { LuaMethod, "GetTemplates", wxLua_wxDocManager_GetTemplates, 0, 0, { 0 } }, ! #endif --- 1360,1364 ---- { LuaMethod, "GetDocuments", wxLua_wxDocManager_GetDocuments, 0, 0, { 0 } }, { LuaMethod, "GetTemplates", wxLua_wxDocManager_GetTemplates, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxList) *************** *** 1367,1371 **** { LuaMethod, "FileHistoryRemoveMenu", wxLua_wxDocManager_FileHistoryRemoveMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, { LuaMethod, "FileHistoryUseMenu", wxLua_wxDocManager_FileHistoryUseMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif { LuaConstructor, "wxDocManager", wxLua_wxDocManager_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, --- 1367,1371 ---- { LuaMethod, "FileHistoryRemoveMenu", wxLua_wxDocManager_FileHistoryRemoveMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, { LuaMethod, "FileHistoryUseMenu", wxLua_wxDocManager_FileHistoryUseMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxMenu) { LuaConstructor, "wxDocManager", wxLua_wxDocManager_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Boolean, 0 } }, *************** *** 1405,1409 **** WXLUAMETHOD* wxDocManager_methods = s_wxDocManager_methods; int wxDocManager_methodCount = sizeof(s_wxDocManager_methods)/sizeof(s_wxDocManager_methods[0]); ! #endif --- 1405,1409 ---- WXLUAMETHOD* wxDocManager_methods = s_wxDocManager_methods; int wxDocManager_methodCount = sizeof(s_wxDocManager_methods)/sizeof(s_wxDocManager_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 1452,1456 **** } ! #endif static int LUACALL wxLua_wxDocParentFrame_destructor(lua_State *) --- 1452,1456 ---- } ! #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) static int LUACALL wxLua_wxDocParentFrame_destructor(lua_State *) *************** *** 1468,1472 **** #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxDocParentFrame", wxLua_wxDocParentFrame_constructor, 8, 4, { &s_wxluatag_wxDocManager, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif { LuaDelete, "wxDocParentFrame", wxLua_wxDocParentFrame_destructor, 0, 0, {0} }, --- 1468,1472 ---- #if ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxDocParentFrame", wxLua_wxDocParentFrame_constructor, 8, 4, { &s_wxluatag_wxDocManager, &s_wxluatag_wxFrame, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! #endif // ((wxLUA_USE_wxFrame) && (wxLUA_USE_MDI)) && (wxLUA_USE_wxPointSizeRect) { LuaDelete, "wxDocParentFrame", wxLua_wxDocParentFrame_destructor, 0, 0, {0} }, *************** *** 1476,1480 **** WXLUAMETHOD* wxDocParentFrame_methods = s_wxDocParentFrame_methods; int wxDocParentFrame_methodCount = sizeof(s_wxDocParentFrame_methods)/sizeof(s_wxDocParentFrame_methods[0]); ! #endif --- 1476,1480 ---- WXLUAMETHOD* wxDocParentFrame_methods = s_wxDocParentFrame_methods; int wxDocParentFrame_methodCount = sizeof(s_wxDocParentFrame_methods)/sizeof(s_wxDocParentFrame_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 1527,1531 **** } ! #endif // wxDocument * CreateDocument(const wxString& path, long flags = 0) --- 1527,1531 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) // wxDocument * CreateDocument(const wxString& path, long flags = 0) *************** *** 1827,1831 **** #if (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) { LuaConstructor, "wxDocTemplate", wxLua_wxDocTemplate_constructor, 10, 7, { &s_wxluatag_wxDocManager, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxClassInfo, &s_wxluatag_wxClassInfo, &s_wxluaarg_Number, 0 } }, ! #endif { LuaMethod, "CreateDocument", wxLua_wxDocTemplate_CreateDocument, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, --- 1827,1831 ---- #if (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) { LuaConstructor, "wxDocTemplate", wxLua_wxDocTemplate_constructor, 10, 7, { &s_wxluatag_wxDocManager, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxClassInfo, &s_wxluatag_wxClassInfo, &s_wxluaarg_Number, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxClassInfo) { LuaMethod, "CreateDocument", wxLua_wxDocTemplate_CreateDocument, 2, 1, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, *************** *** 1865,1869 **** WXLUAMETHOD* wxDocTemplate_methods = s_wxDocTemplate_methods; int wxDocTemplate_methodCount = sizeof(s_wxDocTemplate_methods)/sizeof(s_wxDocTemplate_methods[0]); ! #endif --- 1865,1869 ---- WXLUAMETHOD* wxDocTemplate_methods = s_wxDocTemplate_methods; int wxDocTemplate_methodCount = sizeof(s_wxDocTemplate_methods)/sizeof(s_wxDocTemplate_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 1922,1926 **** } ! #endif --- 1922,1926 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxCommandProcessor) *************** *** 1943,1947 **** } ! #endif --- 1943,1947 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxList) *************** *** 1965,1969 **** } ! #endif // wxDocument() --- 1965,1969 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) // wxDocument() *************** *** 2413,2427 **** { LuaMethod, "OnCreateCommandProcessor", wxLua_wxDocument_OnCreateCommandProcessor, 0, 0, { 0 } }, { LuaMethod, "SetCommandProcessor", wxLua_wxDocument_SetCommandProcessor, 1, 1, { &s_wxluatag_wxCommandProcessor, 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxList) { LuaMethod, "GetViews", wxLua_wxDocument_GetViews, 0, 0, { 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaMethod, "UpdateAllViews", wxLua_wxDocument_UpdateAllViews, 2, 0, { &s_wxluatag_wxView, &s_wxluatag_wxObject, 0 } }, ! #endif { LuaConstructor, "wxDocument", wxLua_wxDocument_constructor, 0, 0, { 0 } }, --- 2413,2427 ---- { LuaMethod, "OnCreateCommandProcessor", wxLua_wxDocument_OnCreateCommandProcessor, 0, 0, { 0 } }, { LuaMethod, "SetCommandProcessor", wxLua_wxDocument_SetCommandProcessor, 1, 1, { &s_wxluatag_wxCommandProcessor, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxCommandProcessor) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxList) { LuaMethod, "GetViews", wxLua_wxDocument_GetViews, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxList) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaMethod, "UpdateAllViews", wxLua_wxDocument_UpdateAllViews, 2, 0, { &s_wxluatag_wxView, &s_wxluatag_wxObject, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaConstructor, "wxDocument", wxLua_wxDocument_constructor, 0, 0, { 0 } }, *************** *** 2467,2471 **** WXLUAMETHOD* wxDocument_methods = s_wxDocument_methods; int wxDocument_methodCount = sizeof(s_wxDocument_methods)/sizeof(s_wxDocument_methods[0]); ! #endif --- 2467,2471 ---- WXLUAMETHOD* wxDocument_methods = s_wxDocument_methods; int wxDocument_methodCount = sizeof(s_wxDocument_methods)/sizeof(s_wxDocument_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 2494,2498 **** } ! #endif --- 2494,2498 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) *************** *** 2514,2518 **** } ! #endif --- 2514,2518 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) *************** *** 2533,2537 **** } ! #endif // virtual void Activate(bool activate) --- 2533,2537 ---- } ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPrint) // virtual void Activate(bool activate) *************** *** 2736,2750 **** #if (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) { LuaMethod, "SetFrame", wxLua_wxView_SetFrame, 1, 1, { &s_wxluatag_wxFrame, 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaMethod, "OnUpdate", wxLua_wxView_OnUpdate, 2, 2, { &s_wxluatag_wxView, &s_wxluatag_wxObject, 0 } }, ! #endif #if (wxLUA_USE_MDI) && (wxLUA_USE_wxPrint) { LuaMethod, "OnCreatePrintout", wxLua_wxView_OnCreatePrintout, 0, 0, { 0 } }, ! #endif { LuaMethod, "Activate", wxLua_wxView_Activate, 1, 1, { &s_wxluaarg_Boolean, 0 } }, --- 2736,2750 ---- #if (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) { LuaMethod, "SetFrame", wxLua_wxView_SetFrame, 1, 1, { &s_wxluatag_wxFrame, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxFrame) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) { LuaMethod, "OnUpdate", wxLua_wxView_OnUpdate, 2, 2, { &s_wxluatag_wxView, &s_wxluatag_wxObject, 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxObject) #if (wxLUA_USE_MDI) && (wxLUA_USE_wxPrint) { LuaMethod, "OnCreatePrintout", wxLua_wxView_OnCreatePrintout, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_MDI) && (wxLUA_USE_wxPrint) { LuaMethod, "Activate", wxLua_wxView_Activate, 1, 1, { &s_wxluaarg_Boolean, 0 } }, *************** *** 2772,2776 **** WXLUAMETHOD* wxView_methods = s_wxView_methods; int wxView_methodCount = sizeof(s_wxView_methods)/sizeof(s_wxView_methods[0]); ! #endif --- 2772,2776 ---- WXLUAMETHOD* wxView_methods = s_wxView_methods; int wxView_methodCount = sizeof(s_wxView_methods)/sizeof(s_wxView_methods[0]); ! #endif // wxLUA_USE_MDI *************** *** 2814,2818 **** } ! #endif --- 2814,2818 ---- } ! #endif // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)) && (wxLUA_USE_wxCommandProcessor) *************** *** 2835,2839 **** } ! #endif --- 2835,2839 ---- } ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) *************** *** 2868,2872 **** } ! #endif // wxCommandProcessor(int maxCommands = -1) --- 2868,2872 ---- } ! #endif // (wxLUA_USE_wxMenu) && (wxLUA_USE_wxCommandProcessor) // wxCommandProcessor(int maxCommands = -1) *************** *** 3152,3161 **** { LuaMethod, "Store", wxLua_wxCommandProcessor_Store, 1, 1, { &s_wxluatag_wxCommand, 0 } }, { LuaMethod, "GetCurrentCommand", wxLua_wxCommandProcessor_GetCurrentCommand, 0, 0, { 0 } }, ! #endif #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) { LuaMethod, "GetCommands", wxLua_wxCommandProcessor_GetCommands, 0, 0, { 0 } }, ! #endif --- 3152,3161 ---- { LuaMethod, "Store", wxLua_wxCommandProcessor_Store, 1, 1, { &s_wxluatag_wxCommand, 0 } }, { LuaMethod, "GetCurrentCommand", wxLua_wxCommandProcessor_GetCurrentCommand, 0, 0, { 0 } }, ! #endif // ((wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxCommandProcessor)) && (wxLUA_USE_wxCommandProcessor) #if (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) { LuaMethod, "GetCommands", wxLua_wxCommandProcessor_GetCommands, 0, 0, { 0 } }, ! #endif // (wxLUA_USE_wxList) && (wxLUA_USE_wxCommandProcessor) *************** *** 3163,3167 **** { LuaMethod, "GetEditMenu", wxLua_wxCommandProcessor_GetEditMenu, 0, 0, { 0 } }, { LuaMethod, "SetEditMenu", wxLua_wxCommandProcessor_SetEditMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif { LuaConstructor, "wxCommandProcessor", wxLua_wxCommandProcessor_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, --- 3163,3167 ---- { LuaMethod, "GetEditMenu", wxLua_wxCommandProcessor_GetEditMenu, 0, 0, { 0 } }, { LuaMethod, "SetEditMenu", wxLua_wxCommandProcessor_SetEditMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif // (wxLUA_USE_wxMenu) && (wxLUA_USE_wxCommandProcessor) { LuaConstructor, "wxCommandProcessor", wxLua_wxCommandProcessor_constructor, 1, 0, { &s_wxluaarg_Number, 0 } }, *************** *** 3189,3193 **** WXLUAMETHOD* wxCommandProcessor_methods = s_wxCommandProcessor_methods; int wxCommandProcessor_methodCount = sizeof(s_wxCommandProcessor_methods)/sizeof(s_wxCommandProcessor_methods[0]); ! #endif --- 3189,3193 ---- WXLUAMETHOD* wxCommandProcessor_methods = s_wxCommandProcessor_methods; int wxCommandProcessor_methodCount = sizeof(s_wxCommandProcessor_methods)/sizeof(s_wxCommandProcessor_methods[0]); ! #endif // wxLUA_USE_wxCommandProcessor *************** *** 3281,3285 **** WXLUAMETHOD* wxCommand_methods = s_wxCommand_methods; int wxCommand_methodCount = sizeof(s_wxCommand_methods)/sizeof(s_wxCommand_methods[0]); ! #endif --- 3281,3285 ---- WXLUAMETHOD* wxCommand_methods = s_wxCommand_methods; int wxCommand_methodCount = sizeof(s_wxCommand_methods)/sizeof(s_wxCommand_methods[0]); ! #endif // wxLUA_USE_wxCommandProcessor *************** *** 3322,3326 **** } ! #endif --- 3322,3326 ---- } ! #endif // (wxLUA_USE_wxConfig) && (wxLUA_USE_wxFileHistory) *************** *** 3368,3372 **** } ! #endif // wxFileHistory(int maxFiles = 9, wxWindowID idBase = wxID_FILE1) --- 3368,3372 ---- } ! #endif // (wxLUA_USE_wxMenu) && (wxLUA_USE_wxFileHistory) // wxFileHistory(int maxFiles = 9, wxWindowID idBase = wxID_FILE1) *************** *** 3494,3498 **** { LuaMethod, "Load", wxLua_wxFileHistory_Load, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, { LuaMethod, "Save", wxLua_wxFileHistory_Save, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, ! #endif --- 3494,3498 ---- { LuaMethod, "Load", wxLua_wxFileHistory_Load, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, { LuaMethod, "Save", wxLua_wxFileHistory_Save, 1, 1, { &s_wxluatag_wxConfigBase, 0 } }, ! #endif // (wxLUA_USE_wxConfig) && (wxLUA_USE_wxFileHistory) *************** *** 3501,3505 **** { LuaMethod, "RemoveMenu", wxLua_wxFileHistory_RemoveMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, { LuaMethod, "UseMenu", wxLua_wxFileHistory_UseMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif { LuaConstructor, "wxFileHistory", wxLua_wxFileHistory_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, --- 3501,3505 ---- { LuaMethod, "RemoveMenu", wxLua_wxFileHistory_RemoveMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, { LuaMethod, "UseMenu", wxLua_wxFileHistory_UseMenu, 1, 1, { &s_wxluatag_wxMenu, 0 } }, ! #endif // (wxLUA_USE_wxMenu) && (wxLUA_USE_wxFileHistory) { LuaConstructor, "wxFileHistory", wxLua_wxFileHistory_constructor, 2, 0, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, *************** *** 3516,3519 **** WXLUAMETHOD* wxFileHistory_methods = s_wxFileHistory_methods; int wxFileHistory_methodCount = sizeof(s_wxFileHistory_methods)/sizeof(s_wxFileHistory_methods[0]); ! #endif --- 3516,3519 ---- WXLUAMETHOD* wxFileHistory_methods = s_wxFileHistory_methods; int wxFileHistory_methodCount = sizeof(s_wxFileHistory_methods)/sizeof(s_wxFileHistory_methods[0]); ! #endif // wxLUA_USE_wxFileHistory Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** config.cpp 8 Jun 2006 03:22:07 -0000 1.19 --- config.cpp 9 Jun 2006 22:51:31 -0000 1.20 *************** *** 767,771 **** WXLUAMETHOD* wxConfigBase_methods = s_wxConfigBase_methods; int wxConfigBase_methodCount = sizeof(s_wxConfigBase_methods)/sizeof(s_wxConfigBase_methods[0]); ! #endif --- 767,771 ---- WXLUAMETHOD* wxConfigBase_methods = s_wxConfigBase_methods; int wxConfigBase_methodCount = sizeof(s_wxConfigBase_methods)/sizeof(s_wxConfigBase_methods[0]); ! #endif // wxLUA_USE_wxConfig *************** *** 821,825 **** WXLUAMETHOD* wxConfig_methods = s_wxConfig_methods; int wxConfig_methodCount = sizeof(s_wxConfig_methods)/sizeof(s_wxConfig_methods[0]); ! #endif --- 821,825 ---- WXLUAMETHOD* wxConfig_methods = s_wxConfig_methods; int wxConfig_methodCount = sizeof(s_wxConfig_methods)/sizeof(s_wxConfig_methods[0]); ! #endif // wxLUA_USE_wxConfig *************** *** 890,893 **** WXLUAMETHOD* wxFileConfig_methods = s_wxFileConfig_methods; int wxFileConfig_methodCount = sizeof(s_wxFileConf... [truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X