Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16385/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 grid.cpp help.cpp html.cpp image.cpp mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp wave.cpp windows.cpp wx_bind.cpp xml.cpp Log Message: Added wxLuaState::GetwxStringType who's input is either a lua string or a wxString userdata Use it in bindings instead of GetStringType wxNode::IndexOf is now protected in wxWidgets 2.8 so remove it Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** xml.cpp 7 Feb 2007 18:39:12 -0000 1.19 --- xml.cpp 22 Feb 2007 00:01:36 -0000 1.20 *************** *** 59,65 **** 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); --- 59,65 ---- int argCount = lua_gettop(L); // const wxString content = wxEmptyString ! const wxString content = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // wxXmlNodeType type wxXmlNodeType type = (wxXmlNodeType)wxlState.GetEnumerationType(1); *************** *** 85,91 **** wxXmlProperty * props = (wxXmlProperty *)wxlState.GetUserDataType(5, s_wxluatag_wxXmlProperty); // const wxString content ! const wxString content = lua2wx(wxlState.GetStringType(4)); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(3)); // wxXmlNodeType type wxXmlNodeType type = (wxXmlNodeType)wxlState.GetEnumerationType(2); --- 85,91 ---- wxXmlProperty * props = (wxXmlProperty *)wxlState.GetUserDataType(5, s_wxluatag_wxXmlProperty); // const wxString content ! const wxString content = wxlState.GetwxStringType(4); // const wxString name ! const wxString name = wxlState.GetwxStringType(3); // wxXmlNodeType type wxXmlNodeType type = (wxXmlNodeType)wxlState.GetEnumerationType(2); *************** *** 158,164 **** wxLuaState wxlState(L); // const wxString value ! const wxString value = lua2wx(wxlState.GetStringType(3)); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); --- 158,164 ---- wxLuaState wxlState(L); // const wxString value ! const wxString value = wxlState.GetwxStringType(3); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); *************** *** 176,180 **** bool returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); --- 176,180 ---- bool returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); *************** *** 322,328 **** wxString returns; // const wxString defaultVal ! const wxString defaultVal = lua2wx(wxlState.GetStringType(3)); // const wxString propName ! const wxString propName = lua2wx(wxlState.GetStringType(2)); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); --- 322,328 ---- wxString returns; // const wxString defaultVal ! const wxString defaultVal = wxlState.GetwxStringType(3); // const wxString propName ! const wxString propName = wxlState.GetwxStringType(2); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); *************** *** 342,346 **** bool returns; // const wxString propName ! const wxString propName = lua2wx(wxlState.GetStringType(2)); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); --- 342,346 ---- bool returns; // const wxString propName ! const wxString propName = wxlState.GetwxStringType(2); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); *************** *** 374,378 **** wxLuaState wxlState(L); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); --- 374,378 ---- wxLuaState wxlState(L); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); *************** *** 389,393 **** wxLuaState wxlState(L); // const wxString con ! const wxString con = lua2wx(wxlState.GetStringType(2)); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); --- 389,393 ---- wxLuaState wxlState(L); // const wxString con ! const wxString con = wxlState.GetwxStringType(2); // get this wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); *************** *** 567,573 **** wxXmlProperty * next = (wxXmlProperty *)wxlState.GetUserDataType(3, s_wxluatag_wxXmlProperty); // const wxString value ! const wxString value = lua2wx(wxlState.GetStringType(2)); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(1)); // call constructor returns = new wxXmlProperty(name, value, next); --- 567,573 ---- wxXmlProperty * next = (wxXmlProperty *)wxlState.GetUserDataType(3, s_wxluatag_wxXmlProperty); // const wxString value ! const wxString value = wxlState.GetwxStringType(2); // const wxString name ! const wxString name = wxlState.GetwxStringType(1); // call constructor returns = new wxXmlProperty(name, value, next); *************** *** 646,650 **** wxLuaState wxlState(L); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxXmlProperty * self = (wxXmlProperty *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlProperty); --- 646,650 ---- wxLuaState wxlState(L); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxXmlProperty * self = (wxXmlProperty *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlProperty); *************** *** 661,665 **** wxLuaState wxlState(L); // const wxString value ! const wxString value = lua2wx(wxlState.GetStringType(2)); // get this wxXmlProperty * self = (wxXmlProperty *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlProperty); --- 661,665 ---- wxLuaState wxlState(L); // const wxString value ! const wxString value = wxlState.GetwxStringType(2); // get this wxXmlProperty * self = (wxXmlProperty *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlProperty); *************** *** 768,774 **** int argCount = lua_gettop(L); // const wxString encoding = "UTF-8" ! const wxString encoding = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT("UTF-8"))); // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(1)); // call constructor returns = new wxXmlDocument(filename, encoding); --- 768,774 ---- int argCount = lua_gettop(L); // const wxString encoding = "UTF-8" ! const wxString encoding = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxT("UTF-8"))); // const wxString filename ! const wxString filename = wxlState.GetwxStringType(1); // call constructor returns = new wxXmlDocument(filename, encoding); *************** *** 790,796 **** int argCount = lua_gettop(L); // const wxString encoding = "UTF-8" ! const wxString encoding = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT("UTF-8"))); // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); --- 790,796 ---- int argCount = lua_gettop(L); // const wxString encoding = "UTF-8" ! const wxString encoding = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxT("UTF-8"))); // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); *************** *** 810,814 **** bool returns; // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); --- 810,814 ---- bool returns; // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); *************** *** 902,906 **** wxLuaState wxlState(L); // const wxString version ! const wxString version = lua2wx(wxlState.GetStringType(2)); // get this wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); --- 902,906 ---- wxLuaState wxlState(L); // const wxString version ! const wxString version = wxlState.GetwxStringType(2); // get this wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); *************** *** 917,921 **** wxLuaState wxlState(L); // const wxString encoding ! const wxString encoding = lua2wx(wxlState.GetStringType(2)); // get this wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); --- 917,921 ---- wxLuaState wxlState(L); // const wxString encoding ! const wxString encoding = wxlState.GetwxStringType(2); // get this wxXmlDocument * self = (wxXmlDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlDocument); *************** *** 1021,1025 **** wxBitmap *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); --- 1021,1025 ---- wxBitmap *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); *************** *** 1046,1050 **** wxDialog *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 1046,1050 ---- wxDialog *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(3); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 1066,1070 **** bool returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(4)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); --- 1066,1070 ---- bool returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(4); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); *************** *** 1118,1122 **** bool returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(4)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); --- 1118,1122 ---- bool returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(4); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); *************** *** 1170,1174 **** wxIcon *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); --- 1170,1174 ---- wxIcon *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); *************** *** 1195,1199 **** wxMenu *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); --- 1195,1199 ---- wxMenu *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); *************** *** 1213,1217 **** wxMenuBar *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 1213,1217 ---- wxMenuBar *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(3); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 1233,1237 **** wxMenuBar *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); --- 1233,1237 ---- wxMenuBar *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); *************** *** 1255,1259 **** wxToolBar *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 1255,1259 ---- wxToolBar *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(3); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 1281,1285 **** int flags = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : wxXRC_USE_LOCALE); // const wxString filemask ! const wxString filemask = lua2wx(wxlState.GetStringType(1)); // call constructor returns = new wxXmlResource(filemask, flags); --- 1281,1285 ---- int flags = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : wxXRC_USE_LOCALE); // const wxString filemask ! const wxString filemask = wxlState.GetwxStringType(1); // call constructor returns = new wxXmlResource(filemask, flags); *************** *** 1339,1343 **** wxWindow * control = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); --- 1339,1343 ---- wxWindow * control = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); *************** *** 1466,1470 **** bool returns; // const wxString filemask ! const wxString filemask = lua2wx(wxlState.GetStringType(2)); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); --- 1466,1470 ---- bool returns; // const wxString filemask ! const wxString filemask = wxlState.GetwxStringType(2); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); *************** *** 1484,1488 **** wxPanel *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 1484,1488 ---- wxPanel *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(3); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 1504,1508 **** bool returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(4)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); --- 1504,1508 ---- bool returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(4); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(3, s_wxluatag_wxWindow); *************** *** 1558,1562 **** bool returns; // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); --- 1558,1562 ---- bool returns; // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxXmlResource * self = (wxXmlResource *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlResource); Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** defsutil.cpp 7 Feb 2007 18:39:08 -0000 1.23 --- defsutil.cpp 22 Feb 2007 00:01:34 -0000 1.24 *************** *** 247,251 **** int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxEXEC_ASYNC); // const wxString cmd ! const wxString cmd = lua2wx(wxlState.GetStringType(2)); // call Open returns = wxProcess::Open(cmd, flags); --- 247,251 ---- int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxEXEC_ASYNC); // const wxString cmd ! const wxString cmd = wxlState.GetwxStringType(2); // call Open returns = wxProcess::Open(cmd, flags); *************** *** 804,808 **** wxWindow * parent = (argCount >= 2 ? (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow) : NULL); // const wxString message ! const wxString message = lua2wx(wxlState.GetStringType(1)); // call constructor returns = new wxBusyInfo(message, parent); --- 804,808 ---- wxWindow * parent = (argCount >= 2 ? (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow) : NULL); // const wxString message ! const wxString message = wxlState.GetwxStringType(1); // call constructor returns = new wxBusyInfo(message, parent); Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** image.cpp 7 Feb 2007 18:39:10 -0000 1.23 --- image.cpp 22 Feb 2007 00:01:35 -0000 1.24 *************** *** 351,355 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageFromData_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_LightUserData, &s_wxluaarg_Boolean, 0 }; // %override wxLua_wxImageFromData_constructor // %constructor wxImageFromData(int width, int height, unsigned char* data, bool static_data = false) --- 351,355 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImageFromData_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 }; // %override wxLua_wxImageFromData_constructor // %constructor wxImageFromData(int width, int height, unsigned char* data, bool static_data = false) *************** *** 389,393 **** long type = (argCount >= 2 ? (long)wxlState.GetNumberType(2) : wxBITMAP_TYPE_ANY); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(1)); // call constructor returns = new wxImage(name, type); --- 389,393 ---- long type = (argCount >= 2 ? (long)wxlState.GetNumberType(2) : wxBITMAP_TYPE_ANY); // const wxString name ! const wxString name = wxlState.GetwxStringType(1); // call constructor returns = new wxImage(name, type); *************** *** 499,503 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_FindFirstUnusedColour[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; // %override wxLua_wxImage_FindFirstUnusedColour // bool FindFirstUnusedColour(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) --- 499,503 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_FindFirstUnusedColour[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; // %override wxLua_wxImage_FindFirstUnusedColour // bool FindFirstUnusedColour(unsigned char* r, unsigned char* g, unsigned char* b, unsigned char startR = 1, unsigned char startG = 0, unsigned char startB = 0) *************** *** 535,539 **** wxImageHandler *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // call FindHandler returns = wxImage::FindHandler(name); --- 535,539 ---- wxImageHandler *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // call FindHandler returns = wxImage::FindHandler(name); *************** *** 553,557 **** long imageType = (long)wxlState.GetNumberType(3); // const wxString extension ! const wxString extension = lua2wx(wxlState.GetStringType(2)); // call FindHandler returns = wxImage::FindHandler(extension, imageType); --- 553,557 ---- long imageType = (long)wxlState.GetNumberType(3); // const wxString extension ! const wxString extension = wxlState.GetwxStringType(2); // call FindHandler returns = wxImage::FindHandler(extension, imageType); *************** *** 585,589 **** wxImageHandler *returns; // const wxString mimetype ! const wxString mimetype = lua2wx(wxlState.GetStringType(2)); // call FindHandlerMime returns = wxImage::FindHandlerMime(mimetype); --- 585,589 ---- wxImageHandler *returns; // const wxString mimetype ! const wxString mimetype = wxlState.GetwxStringType(2); // call FindHandlerMime returns = wxImage::FindHandlerMime(mimetype); *************** *** 678,682 **** long type = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : wxBITMAP_TYPE_ANY); // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // call GetImageCount returns = wxImage::GetImageCount(filename, type); --- 678,682 ---- long type = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : wxBITMAP_TYPE_ANY); // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // call GetImageCount returns = wxImage::GetImageCount(filename, type); *************** *** 747,751 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetOrFindMaskColour[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, &s_wxluaarg_LightUserData, 0 }; // %override wxLua_wxImage_GetOrFindMaskColour // bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const --- 747,751 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_GetOrFindMaskColour[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, 0 }; // %override wxLua_wxImage_GetOrFindMaskColour // bool GetOrFindMaskColour(unsigned char *r, unsigned char *g, unsigned char *b) const *************** *** 888,892 **** wxString returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 888,892 ---- wxString returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 906,910 **** int returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 906,910 ---- int returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 924,928 **** int returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 924,928 ---- int returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 1005,1009 **** long type = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : wxBITMAP_TYPE_ANY); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 1005,1009 ---- long type = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : wxBITMAP_TYPE_ANY); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 1023,1029 **** bool returns; // const wxString mimetype ! const wxString mimetype = lua2wx(wxlState.GetStringType(3)); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 1023,1029 ---- bool returns; // const wxString mimetype ! const wxString mimetype = wxlState.GetwxStringType(3); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 1058,1062 **** bool returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // call RemoveHandler returns = wxImage::RemoveHandler(name); --- 1058,1062 ---- bool returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // call RemoveHandler returns = wxImage::RemoveHandler(name); *************** *** 1180,1184 **** bool returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 1180,1184 ---- bool returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 1198,1202 **** bool returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 1198,1202 ---- bool returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 1216,1222 **** bool returns; // const wxString mimetype ! const wxString mimetype = lua2wx(wxlState.GetStringType(3)); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 1216,1222 ---- bool returns; // const wxString mimetype ! const wxString mimetype = wxlState.GetwxStringType(3); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 1271,1275 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_SetAlphaData[] = { &s_wxluaarg_LightUserData, &s_wxluaarg_Boolean, 0 }; // %override wxLua_wxImage_SetAlphaData // void SetAlpha(unsigned char *alpha = NULL,bool static_data = false) --- 1271,1275 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_SetAlphaData[] = { &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 }; // %override wxLua_wxImage_SetAlphaData // void SetAlpha(unsigned char *alpha = NULL,bool static_data = false) *************** *** 1293,1297 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_SetData[] = { &s_wxluaarg_LightUserData, 0 }; // %override wxLua_wxImage_SetData // void SetData(unsigned char *data) --- 1293,1297 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxImage_SetData[] = { &s_wxluaarg_String, 0 }; // %override wxLua_wxImage_SetData // void SetData(unsigned char *data) *************** *** 1380,1386 **** wxLuaState wxlState(L); // const wxString value ! const wxString value = lua2wx(wxlState.GetStringType(3)); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 1380,1386 ---- wxLuaState wxlState(L); // const wxString value ! const wxString value = wxlState.GetwxStringType(3); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 1399,1403 **** int value = (int)wxlState.GetNumberType(3); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); --- 1399,1403 ---- int value = (int)wxlState.GetNumberType(3); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImage * self = (wxImage *)wxlState.GetUserDataType(1, s_wxluatag_wxImage); *************** *** 1722,1726 **** wxLuaState wxlState(L); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxImageHandler * self = (wxImageHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxImageHandler); --- 1722,1726 ---- wxLuaState wxlState(L); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxImageHandler * self = (wxImageHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxImageHandler); *************** *** 1737,1741 **** wxLuaState wxlState(L); // const wxString extension ! const wxString extension = lua2wx(wxlState.GetStringType(2)); // get this wxImageHandler * self = (wxImageHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxImageHandler); --- 1737,1741 ---- wxLuaState wxlState(L); // const wxString extension ! const wxString extension = wxlState.GetwxStringType(2); // get this wxImageHandler * self = (wxImageHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxImageHandler); *************** *** 1752,1756 **** wxLuaState wxlState(L); // const wxString mimetype ! const wxString mimetype = lua2wx(wxlState.GetStringType(2)); // get this wxImageHandler * self = (wxImageHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxImageHandler); --- 1752,1756 ---- wxLuaState wxlState(L); // const wxString mimetype ! const wxString mimetype = wxlState.GetwxStringType(2); // get this wxImageHandler * self = (wxImageHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxImageHandler); *************** *** 2349,2355 **** const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); // const wxString client = wxART_OTHER ! const wxString client = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxART_OTHER)); // const wxString id ! const wxString id = lua2wx(wxlState.GetStringType(2)); // call GetBitmap // allocate a new object using the copy constructor --- 2349,2355 ---- const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); // const wxString client = wxART_OTHER ! const wxString client = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxART_OTHER)); // const wxString id ! const wxString id = wxlState.GetwxStringType(2); // call GetBitmap // allocate a new object using the copy constructor *************** *** 2378,2384 **** const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); // const wxString client = wxART_OTHER ! const wxString client = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxART_OTHER)); // const wxString id ! const wxString id = lua2wx(wxlState.GetStringType(2)); // call GetIcon // allocate a new object using the copy constructor --- 2378,2384 ---- const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize); // const wxString client = wxART_OTHER ! const wxString client = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxART_OTHER)); // const wxString id ! const wxString id = wxlState.GetwxStringType(2); // call GetIcon // allocate a new object using the copy constructor *************** *** 2407,2411 **** bool platform_dependent = (argCount >= 3 ? wxlState.GetBooleanType(3) : false); // const wxString client ! const wxString client = lua2wx(wxlState.GetStringType(2)); // call GetSizeHint // allocate a new object using the copy constructor --- 2407,2411 ---- bool platform_dependent = (argCount >= 3 ? wxlState.GetBooleanType(3) : false); // const wxString client ! const wxString client = wxlState.GetwxStringType(2); // call GetSizeHint // allocate a new object using the copy constructor Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** mdi.cpp 7 Feb 2007 18:39:10 -0000 1.22 --- mdi.cpp 22 Feb 2007 00:01:35 -0000 1.23 *************** *** 70,74 **** int argCount = lua_gettop(L); // const wxString name = "wxMDIParentFrame" ! const wxString name = (argCount >= 7 ? lua2wx(wxlState.GetStringType(7)) : wxString(wxT("wxMDIParentFrame"))); // long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL); --- 70,74 ---- int argCount = lua_gettop(L); // const wxString name = "wxMDIParentFrame" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("wxMDIParentFrame"))); // long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL); *************** *** 78,82 **** const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = lua2wx(wxlState.GetStringType(3)); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(2); --- 78,82 ---- const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = wxlState.GetwxStringType(3); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(2); *************** *** 103,107 **** int argCount = lua_gettop(L); // const wxString name = "wxMDIParentFrame" ! const wxString name = (argCount >= 8 ? lua2wx(wxlState.GetStringType(8)) : wxString(wxT("wxMDIParentFrame"))); // long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL); --- 103,107 ---- int argCount = lua_gettop(L); // const wxString name = "wxMDIParentFrame" ! const wxString name = (argCount >= 8 ? wxlState.GetwxStringType(8) : wxString(wxT("wxMDIParentFrame"))); // long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL); *************** *** 111,115 **** const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = lua2wx(wxlState.GetStringType(4)); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(3); --- 111,115 ---- const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = wxlState.GetwxStringType(4); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(3); *************** *** 408,412 **** int argCount = lua_gettop(L); // const wxString name = "wxMDIChildFrame" ! const wxString name = (argCount >= 7 ? lua2wx(wxlState.GetStringType(7)) : wxString(wxT("wxMDIChildFrame"))); // long style = wxDEFAULT_FRAME_STYLE long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxDEFAULT_FRAME_STYLE); --- 408,412 ---- int argCount = lua_gettop(L); // const wxString name = "wxMDIChildFrame" ! const wxString name = (argCount >= 7 ? wxlState.GetwxStringType(7) : wxString(wxT("wxMDIChildFrame"))); // long style = wxDEFAULT_FRAME_STYLE long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxDEFAULT_FRAME_STYLE); *************** *** 416,420 **** const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = lua2wx(wxlState.GetStringType(3)); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(2); --- 416,420 ---- const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = wxlState.GetwxStringType(3); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(2); *************** *** 441,445 **** int argCount = lua_gettop(L); // const wxString name = "wxMDIChildFrame" ! const wxString name = (argCount >= 8 ? lua2wx(wxlState.GetStringType(8)) : wxString(wxT("wxMDIChildFrame"))); // long style = wxDEFAULT_FRAME_STYLE long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDEFAULT_FRAME_STYLE); --- 441,445 ---- int argCount = lua_gettop(L); // const wxString name = "wxMDIChildFrame" ! const wxString name = (argCount >= 8 ? wxlState.GetwxStringType(8) : wxString(wxT("wxMDIChildFrame"))); // long style = wxDEFAULT_FRAME_STYLE long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDEFAULT_FRAME_STYLE); *************** *** 449,453 **** const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = lua2wx(wxlState.GetStringType(4)); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(3); --- 449,453 ---- const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = wxlState.GetwxStringType(4); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(3); *************** *** 555,559 **** int argCount = lua_gettop(L); // const wxString name = "wxDocChildFrame" ! const wxString name = (argCount >= 9 ? lua2wx(wxlState.GetStringType(9)) : wxString(wxT("wxDocChildFrame"))); // long style = wxDEFAULT_FRAME_STYLE long style = (argCount >= 8 ? (long)wxlState.GetNumberType(8) : wxDEFAULT_FRAME_STYLE); --- 555,559 ---- int argCount = lua_gettop(L); // const wxString name = "wxDocChildFrame" ! const wxString name = (argCount >= 9 ? wxlState.GetwxStringType(9) : wxString(wxT("wxDocChildFrame"))); // long style = wxDEFAULT_FRAME_STYLE long style = (argCount >= 8 ? (long)wxlState.GetNumberType(8) : wxDEFAULT_FRAME_STYLE); *************** *** 563,567 **** const wxPoint * pos = (argCount >= 6 ? (const wxPoint *)wxlState.GetUserDataType(6, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = lua2wx(wxlState.GetStringType(5)); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(4); --- 563,567 ---- const wxPoint * pos = (argCount >= 6 ? (const wxPoint *)wxlState.GetUserDataType(6, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = wxlState.GetwxStringType(5); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(4); *************** *** 961,965 **** wxLuaState wxlState(L); // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); --- 961,965 ---- wxLuaState wxlState(L); // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); *************** *** 1014,1018 **** long flags = (long)wxlState.GetNumberType(3); // const wxString path ! const wxString path = lua2wx(wxlState.GetStringType(2)); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); --- 1014,1018 ---- long flags = (long)wxlState.GetNumberType(3); // const wxString path ! const wxString path = wxlState.GetwxStringType(2); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); *************** *** 1079,1083 **** wxDocTemplate *returns; // const wxString path ! const wxString path = lua2wx(wxlState.GetStringType(2)); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); --- 1079,1083 ---- wxDocTemplate *returns; // const wxString path ! const wxString path = wxlState.GetwxStringType(2); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); *************** *** 1311,1315 **** wxLuaState wxlState(L); // const wxString dir ! const wxString dir = lua2wx(wxlState.GetStringType(2)); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); --- 1311,1315 ---- wxLuaState wxlState(L); // const wxString dir ! const wxString dir = wxlState.GetwxStringType(2); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); *************** *** 1445,1449 **** int argCount = lua_gettop(L); // const wxString name = "wxDocParentFrame" ! const wxString name = (argCount >= 8 ? lua2wx(wxlState.GetStringType(8)) : wxString(wxT("wxDocParentFrame"))); // long style = wxDEFAULT_FRAME_STYLE long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDEFAULT_FRAME_STYLE); --- 1445,1449 ---- int argCount = lua_gettop(L); // const wxString name = "wxDocParentFrame" ! const wxString name = (argCount >= 8 ? wxlState.GetwxStringType(8) : wxString(wxT("wxDocParentFrame"))); // long style = wxDEFAULT_FRAME_STYLE long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDEFAULT_FRAME_STYLE); *************** *** 1453,1457 **** const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = lua2wx(wxlState.GetStringType(4)); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(3); --- 1453,1457 ---- const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); // const wxString title ! const wxString title = wxlState.GetwxStringType(4); // wxWindowID id wxWindowID id = (wxWindowID)wxlState.GetNumberType(3); *************** *** 1519,1533 **** wxClassInfo * docClassInfo = (argCount >= 8 ? (wxClassInfo *)wxlState.GetUserDataType(8, s_wxluatag_wxClassInfo) : NULL); // const wxString viewTypeName ! const wxString viewTypeName = lua2wx(wxlState.GetStringType(7)); // const wxString docTypeName ! const wxString docTypeName = lua2wx(wxlState.GetStringType(6)); // const wxString ext ! const wxString ext = lua2wx(wxlState.GetStringType(5)); // const wxString dir ! const wxString dir = lua2wx(wxlState.GetStringType(4)); // const wxString filter ! const wxString filter = lua2wx(wxlState.GetStringType(3)); // const wxString descr ! const wxString descr = lua2wx(wxlState.GetStringType(2)); // wxDocManager manager wxDocManager * manager = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); --- 1519,1533 ---- wxClassInfo * docClassInfo = (argCount >= 8 ? (wxClassInfo *)wxlState.GetUserDataType(8, s_wxluatag_wxClassInfo) : NULL); // const wxString viewTypeName ! const wxString viewTypeName = wxlState.GetwxStringType(7); // const wxString docTypeName ! const wxString docTypeName = wxlState.GetwxStringType(6); // const wxString ext ! const wxString ext = wxlState.GetwxStringType(5); // const wxString dir ! const wxString dir = wxlState.GetwxStringType(4); // const wxString filter ! const wxString filter = wxlState.GetwxStringType(3); // const wxString descr ! const wxString descr = wxlState.GetwxStringType(2); // wxDocManager manager wxDocManager * manager = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); *************** *** 1556,1560 **** long flags = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString path ! const wxString path = lua2wx(wxlState.GetStringType(2)); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); --- 1556,1560 ---- long flags = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString path ! const wxString path = wxlState.GetwxStringType(2); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); *************** *** 1720,1724 **** long flags = (argCount >= 4 ? (long)wxlState.GetNumberType(4) : 0); // const wxString path ! const wxString path = lua2wx(wxlState.GetStringType(3)); // wxDocument doc wxDocument * doc = (wxDocument *)wxlState.GetUserDataType(2, s_wxluatag_wxDocument); --- 1720,1724 ---- long flags = (argCount >= 4 ? (long)wxlState.GetNumberType(4) : 0); // const wxString path ! const wxString path = wxlState.GetwxStringType(3); // wxDocument doc wxDocument * doc = (wxDocument *)wxlState.GetUserDataType(2, s_wxluatag_wxDocument); *************** *** 1754,1758 **** wxLuaState wxlState(L); // const wxString ext ! const wxString ext = lua2wx(wxlState.GetStringType(2)); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); --- 1754,1758 ---- wxLuaState wxlState(L); // const wxString ext ! const wxString ext = wxlState.GetwxStringType(2); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); *************** *** 1769,1773 **** wxLuaState wxlState(L); // const wxString descr ! const wxString descr = lua2wx(wxlState.GetStringType(2)); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); --- 1769,1773 ---- wxLuaState wxlState(L); // const wxString descr ! const wxString descr = wxlState.GetwxStringType(2); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); *************** *** 1784,1788 **** wxLuaState wxlState(L); // const wxString dir ! const wxString dir = lua2wx(wxlState.GetStringType(2)); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); --- 1784,1788 ---- wxLuaState wxlState(L); // const wxString dir ! const wxString dir = wxlState.GetwxStringType(2); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); *************** *** 1814,1818 **** wxLuaState wxlState(L); // const wxString filter ! const wxString filter = lua2wx(wxlState.GetStringType(2)); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); --- 1814,1818 ---- wxLuaState wxlState(L); // const wxString filter ! const wxString filter = wxlState.GetwxStringType(2); // get this wxDocTemplate * self = (wxDocTemplate *)wxlState.GetUserDataType(1, s_wxluatag_wxDocTemplate); *************** *** 2242,2246 **** long flags = (long)wxlState.GetNumberType(3); // const wxString path ! const wxString path = lua2wx(wxlState.GetStringType(2)); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); --- 2242,2246 ---- long flags = (long)wxlState.GetNumberType(3); // const wxString path ! const wxString path = wxlState.GetwxStringType(2); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); *************** *** 2275,2279 **** bool returns; // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); --- 2275,2279 ---- bool returns; // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); *************** *** 2293,2297 **** bool returns; // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); --- 2293,2297 ---- bool returns; // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); *************** *** 2373,2377 **** wxLuaState wxlState(L); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); --- 2373,2377 ---- wxLuaState wxlState(L); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); *************** *** 2407,2411 **** bool notifyViews = (argCount >= 3 ? wxlState.GetBooleanType(3) : false); // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); --- 2407,2411 ---- bool notifyViews = (argCount >= 3 ? wxlState.GetBooleanType(3) : false); // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); *************** *** 2422,2426 **** wxLuaState wxlState(L); // const wxString title ! const wxString title = lua2wx(wxlState.GetStringType(2)); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); --- 2422,2426 ---- wxLuaState wxlState(L); // const wxString title ! const wxString title = wxlState.GetwxStringType(2); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); *************** *** 2752,2756 **** wxLuaState wxlState(L); // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); --- 2752,2756 ---- wxLuaState wxlState(L); // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxView * self = (wxView *)wxlState.GetUserDataType(1, s_wxluatag_wxView); *************** *** 3098,3102 **** wxLuaState wxlState(L); // const wxString accel ! const wxString accel = lua2wx(wxlState.GetStringType(2)); // get this wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor); --- 3098,3102 ---- wxLuaState wxlState(L); // const wxString accel ! const wxString accel = wxlState.GetwxStringType(2); // get this wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor); *************** *** 3113,3117 **** wxLuaState wxlState(L); // const wxString accel ! const wxString accel = lua2wx(wxlState.GetStringType(2)); // get this wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor); --- 3113,3117 ---- wxLuaState wxlState(L); // const wxString accel ! const wxString accel = wxlState.GetwxStringType(2); // get this wxCommandProcessor * self = (wxCommandProcessor *)wxlState.GetUserDataType(1, s_wxluatag_wxCommandProcessor); *************** *** 3429,3433 **** wxLuaState wxlState(L); // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxFileHistory * self = (wxFileHistory *)wxlState.GetUserDataType(1, s_wxluatag_wxFileHistory); --- 3429,3433 ---- wxLuaState wxlState(L); // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxFileHistory * self = (wxFileHistory *)wxlState.GetUserDataType(1, s_wxluatag_wxFileHistory); Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** config.cpp 7 Feb 2007 18:39:07 -0000 1.24 --- config.cpp 22 Feb 2007 00:01:34 -0000 1.25 *************** *** 158,162 **** bool bDeleteGroupIfEmpty = (argCount >= 3 ? wxlState.GetBooleanType(3) : true); // const wxString key ! const wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 158,162 ---- bool bDeleteGroupIfEmpty = (argCount >= 3 ? wxlState.GetBooleanType(3) : true); // const wxString key ! const wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 176,180 **** bool returns; // const wxString key ! const wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 176,180 ---- bool returns; // const wxString key ! const wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 194,198 **** bool returns; // wxString strName ! wxString strName = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 194,198 ---- bool returns; // wxString strName ! wxString strName = wxlState.GetwxStringType(2); // get this wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 247,251 **** wxConfigBase::EntryType returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 247,251 ---- wxConfigBase::EntryType returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(2); // get this wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 432,436 **** bool returns; // wxString strName ! wxString strName = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase * self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 432,436 ---- bool returns; // wxString strName ! w... [truncated message content] |