Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2007-02-22 20:33:48
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10499/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: change wxLUA_USE_wxJoystick | wxUSE_JOYSTICK to & Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** wxstc_datatypes.lua 9 Feb 2007 05:17:08 -0000 1.42 --- wxstc_datatypes.lua 22 Feb 2007 20:33:07 -0000 1.43 *************** *** 1697,1701 **** wxJoystick = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK", DefType = "class", IsNumber = false, --- 1697,1701 ---- wxJoystick = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxJoystick && wxUSE_JOYSTICK", DefType = "class", IsNumber = false, *************** *** 1704,1708 **** wxJoystickEvent = { BaseClass = "wxEvent", ! Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK", DefType = "class", IsNumber = false, --- 1704,1708 ---- wxJoystickEvent = { BaseClass = "wxEvent", ! Condition = "wxLUA_USE_wxJoystick && wxUSE_JOYSTICK", DefType = "class", IsNumber = false, |
|
From: John L. <jr...@us...> - 2007-02-22 20:33:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10499/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp Log Message: change wxLUA_USE_wxJoystick | wxUSE_JOYSTICK to & Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxluasocket.cpp 22 Feb 2007 00:01:36 -0000 1.15 --- wxluasocket.cpp 22 Feb 2007 20:33:10 -0000 1.16 *************** *** 332,336 **** returns = wxLuaDebuggerServer::GetProgramName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 332,336 ---- returns = wxLuaDebuggerServer::GetProgramName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 345,349 **** returns = wxLuaDebuggerServer::GetNetworkName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 345,349 ---- returns = wxLuaDebuggerServer::GetNetworkName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 452,456 **** returns = self->GetFileName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 452,456 ---- returns = self->GetFileName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 467,471 **** returns = self->GetMessage(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 467,471 ---- returns = self->GetMessage(); // push the result string ! wxlState.lua_PushString(returns); return 1; |
|
From: John L. <jr...@us...> - 2007-02-22 20:33:14
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10499/wxLua/modules/wxbindstc/src Modified Files: stc.cpp Log Message: change wxLUA_USE_wxJoystick | wxUSE_JOYSTICK to & Index: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** stc.cpp 22 Feb 2007 00:01:36 -0000 1.23 --- stc.cpp 22 Feb 2007 20:33:10 -0000 1.24 *************** *** 2285,2289 **** returns = self->GetLine(line); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2285,2289 ---- returns = self->GetLine(line); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2407,2411 **** returns = self->GetSelectedText(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2407,2411 ---- returns = self->GetSelectedText(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2427,2431 **** returns = self->GetTextRange(startPos, endPos); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2427,2431 ---- returns = self->GetTextRange(startPos, endPos); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2669,2673 **** returns = self->GetText(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2669,2673 ---- returns = self->GetText(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 5878,5882 **** returns = self->GetProperty(key); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 5878,5882 ---- returns = self->GetProperty(key); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 5896,5900 **** returns = self->GetPropertyExpanded(key); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 5896,5900 ---- returns = self->GetPropertyExpanded(key); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7798,7802 **** returns = self->GetText(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7798,7802 ---- returns = self->GetText(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7993,7997 **** returns = self->GetDragText(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7993,7997 ---- returns = self->GetDragText(); // push the result string ! wxlState.lua_PushString(returns); return 1; |
|
From: John L. <jr...@us...> - 2007-02-22 20:33:13
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10499/wxLua/modules/wxbind/src Modified Files: wave.cpp wx_bind.cpp Log Message: change wxLUA_USE_wxJoystick | wxUSE_JOYSTICK to & Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** wx_bind.cpp 22 Feb 2007 05:40:53 -0000 1.76 --- wx_bind.cpp 22 Feb 2007 20:33:09 -0000 1.77 *************** *** 229,238 **** #endif // wxLUA_USE_wxGrid ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK { &wxEVT_JOY_BUTTON_DOWN, "wxEVT_JOY_BUTTON_DOWN", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_BUTTON_UP, "wxEVT_JOY_BUTTON_UP", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_MOVE, "wxEVT_JOY_MOVE", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_ZMOVE, "wxEVT_JOY_ZMOVE", &s_wxluatag_wxJoystickEvent }, ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #if wxLUA_USE_wxLuaHtmlWindow --- 229,238 ---- #endif // wxLUA_USE_wxGrid ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK { &wxEVT_JOY_BUTTON_DOWN, "wxEVT_JOY_BUTTON_DOWN", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_BUTTON_UP, "wxEVT_JOY_BUTTON_UP", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_MOVE, "wxEVT_JOY_MOVE", &s_wxluatag_wxJoystickEvent }, { &wxEVT_JOY_ZMOVE, "wxEVT_JOY_ZMOVE", &s_wxluatag_wxJoystickEvent }, ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxLuaHtmlWindow *************** *** 2041,2045 **** #endif // wxLUA_USE_wxImage ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK { "wxJOYSTICK1", wxJOYSTICK1 }, { "wxJOYSTICK2", wxJOYSTICK2 }, --- 2041,2045 ---- #endif // wxLUA_USE_wxImage ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK { "wxJOYSTICK1", wxJOYSTICK1 }, { "wxJOYSTICK2", wxJOYSTICK2 }, *************** *** 2049,2053 **** { "wxJOY_BUTTON4", wxJOY_BUTTON4 }, { "wxJOY_BUTTON_ANY", wxJOY_BUTTON_ANY }, ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) --- 2049,2053 ---- { "wxJOY_BUTTON4", wxJOY_BUTTON4 }, { "wxJOY_BUTTON_ANY", wxJOY_BUTTON_ANY }, ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) *************** *** 4648,4652 **** #endif // wxLUA_USE_wxFrame ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK // %static int GetNumberJoysticks() const --- 4648,4652 ---- #endif // wxLUA_USE_wxFrame ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK // %static int GetNumberJoysticks() const *************** *** 4663,4667 **** } ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #if wxLUA_USE_wxObject --- 4663,4667 ---- } ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxObject *************** *** 5308,5314 **** ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK { LuaGlobal, "wxJoystick_GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, s_wxluaargArray_None }, ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK --- 5308,5314 ---- ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK { LuaGlobal, "wxJoystick_GetNumberJoysticks", wxLua_wxJoystick_GetNumberJoysticks, 0, 0, s_wxluaargArray_None }, ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK *************** *** 5926,5933 **** ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK { "wxJoystick", wxJoystick_methods, wxJoystick_methodCount, -1, CLASSINFO(wxJoystick), &s_wxluatag_wxJoystick, "wxObject" }, { "wxJoystickEvent", wxJoystickEvent_methods, wxJoystickEvent_methodCount, -1, CLASSINFO(wxJoystickEvent), &s_wxluatag_wxJoystickEvent, "wxEvent" }, ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK --- 5926,5933 ---- ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK { "wxJoystick", wxJoystick_methods, wxJoystick_methodCount, -1, CLASSINFO(wxJoystick), &s_wxluatag_wxJoystick, "wxObject" }, { "wxJoystickEvent", wxJoystickEvent_methods, wxJoystickEvent_methodCount, -1, CLASSINFO(wxJoystickEvent), &s_wxluatag_wxJoystickEvent, "wxEvent" }, ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK Index: wave.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wave.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** wave.cpp 22 Feb 2007 05:40:53 -0000 1.24 --- wave.cpp 22 Feb 2007 20:33:09 -0000 1.25 *************** *** 821,825 **** ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK // ------------------------------------------------------------------------------------------------- // Bind class wxJoystick --- 821,825 ---- ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK // ------------------------------------------------------------------------------------------------- // Bind class wxJoystick *************** *** 830,834 **** ! #if (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) // wxPoint GetPosition() const static int LUACALL wxLua_wxJoystick_GetPosition(lua_State *L) --- 830,834 ---- ! #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) // wxPoint GetPosition() const static int LUACALL wxLua_wxJoystick_GetPosition(lua_State *L) *************** *** 849,853 **** } ! #endif // (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxJoystick_constructor[] = { &s_wxluaarg_Number, 0 }; --- 849,853 ---- } ! #endif // (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxJoystick_constructor[] = { &s_wxluaarg_Number, 0 }; *************** *** 1491,1497 **** WXLUAMETHOD wxJoystick_methods[] = { ! #if (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetPosition", wxLua_wxJoystick_GetPosition, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxJoystick", wxLua_wxJoystick_constructor, 1, 0, s_wxluatagArray_wxLua_wxJoystick_constructor }, --- 1491,1497 ---- WXLUAMETHOD wxJoystick_methods[] = { ! #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetPosition", wxLua_wxJoystick_GetPosition, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxJoystick", wxLua_wxJoystick_constructor, 1, 0, s_wxluatagArray_wxLua_wxJoystick_constructor }, *************** *** 1540,1547 **** int wxJoystick_methodCount = sizeof(wxJoystick_methods)/sizeof(wxJoystick_methods[0]); ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK // ------------------------------------------------------------------------------------------------- // Bind class wxJoystickEvent --- 1540,1547 ---- int wxJoystick_methodCount = sizeof(wxJoystick_methods)/sizeof(wxJoystick_methods[0]); ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK // ------------------------------------------------------------------------------------------------- // Bind class wxJoystickEvent *************** *** 1552,1556 **** ! #if (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) // wxPoint GetPosition() const static int LUACALL wxLua_wxJoystickEvent_GetPosition(lua_State *L) --- 1552,1556 ---- ! #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) // wxPoint GetPosition() const static int LUACALL wxLua_wxJoystickEvent_GetPosition(lua_State *L) *************** *** 1571,1575 **** } ! #endif // (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxJoystickEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; --- 1571,1575 ---- } ! #endif // (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) static wxLuaArgTag s_wxluatagArray_wxLua_wxJoystickEvent_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; *************** *** 1794,1800 **** WXLUAMETHOD wxJoystickEvent_methods[] = { ! #if (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetPosition", wxLua_wxJoystickEvent_GetPosition, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxJoystick || wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxJoystickEvent", wxLua_wxJoystickEvent_constructor, 4, 0, s_wxluatagArray_wxLua_wxJoystickEvent_constructor }, --- 1794,1800 ---- WXLUAMETHOD wxJoystickEvent_methods[] = { ! #if (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaMethod, "GetPosition", wxLua_wxJoystickEvent_GetPosition, 0, 0, s_wxluaargArray_None }, ! #endif // (wxLUA_USE_wxJoystick && wxUSE_JOYSTICK) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxJoystickEvent", wxLua_wxJoystickEvent_constructor, 4, 0, s_wxluatagArray_wxLua_wxJoystickEvent_constructor }, *************** *** 1814,1817 **** int wxJoystickEvent_methodCount = sizeof(wxJoystickEvent_methods)/sizeof(wxJoystickEvent_methods[0]); ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK --- 1814,1817 ---- int wxJoystickEvent_methodCount = sizeof(wxJoystickEvent_methods)/sizeof(wxJoystickEvent_methods[0]); ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK |
|
From: John L. <jr...@us...> - 2007-02-22 20:33:13
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10499/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: change wxLUA_USE_wxJoystick | wxUSE_JOYSTICK to & Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** wxbind.h 18 Jan 2007 17:19:01 -0000 1.50 --- wxbind.h 22 Feb 2007 20:33:08 -0000 1.51 *************** *** 377,384 **** #endif // wxLUA_USE_wxImageList ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #include "wx/event.h" #include "wx/joystick.h" ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) --- 377,384 ---- #endif // wxLUA_USE_wxImageList ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #include "wx/event.h" #include "wx/joystick.h" ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) *************** *** 1084,1091 **** #endif // wxLUA_USE_wxImageList ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystick; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystickEvent; ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) --- 1084,1091 ---- #endif // wxLUA_USE_wxImageList ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystick; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystickEvent; ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) *************** *** 2110,2119 **** #endif // wxLUA_USE_wxImageList ! #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxJoystick_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystick_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxJoystickEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystickEvent_methodCount; ! #endif // wxLUA_USE_wxJoystick || wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) --- 2110,2119 ---- #endif // wxLUA_USE_wxImageList ! #if wxLUA_USE_wxJoystick && wxUSE_JOYSTICK extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxJoystick_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystick_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD wxJoystickEvent_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystickEvent_methodCount; ! #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) |
|
From: John L. <jr...@us...> - 2007-02-22 05:41:25
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28638/wxLua/bindings Modified Files: genwxbind.lua Log Message: use wxLuaState::GetwxStringType instead of lua2wx use wxLuaState::lua_PushString instead of wx2lua fix name == nil when adding notebook page to the wxLua editor Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** genwxbind.lua 22 Feb 2007 00:01:34 -0000 1.99 --- genwxbind.lua 22 Feb 2007 05:40:51 -0000 1.100 *************** *** 2755,2759 **** if memberType == "wxString" then CommentBindingTable(codeList, " // push the result string\n") ! table.insert(codeList, " lua_pushstring(L, wx2lua(self->"..member.Name..") );\n") elseif not numeric and (not memberPtr or (memberPtr == "&")) then CommentBindingTable(codeList, " // push the result datatype\n") --- 2755,2759 ---- if memberType == "wxString" then CommentBindingTable(codeList, " // push the result string\n") ! table.insert(codeList, " wxlState.lua_PushString(self->"..member.Name..");\n") elseif not numeric and (not memberPtr or (memberPtr == "&")) then CommentBindingTable(codeList, " // push the result datatype\n") *************** *** 3567,3571 **** if memberType == "wxString" then CommentBindingTable(codeList, " // push the result string\n") ! table.insert(codeList, " lua_pushstring(L, wx2lua("..returnPtr.."returns) );\n") elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") --- 3567,3571 ---- if memberType == "wxString" then CommentBindingTable(codeList, " // push the result string\n") ! table.insert(codeList, " wxlState.lua_PushString("..returnPtr.."returns);\n") elseif not numeric then CommentBindingTable(codeList, " // push the result datatype\n") |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28638/wxLua/modules/wxbind/src Modified Files: appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp datetime.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 socket.cpp wave.cpp windows.cpp wx_bind.cpp wxlhtmlwin.cpp wxlua.cpp xml.cpp Log Message: use wxLuaState::GetwxStringType instead of lua2wx use wxLuaState::lua_PushString instead of wx2lua fix name == nil when adding notebook page to the wxLua editor Index: xml.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** xml.cpp 22 Feb 2007 00:01:36 -0000 1.20 --- xml.cpp 22 Feb 2007 05:40:53 -0000 1.21 *************** *** 212,216 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 212,216 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 227,231 **** returns = self->GetContent(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 227,231 ---- returns = self->GetContent(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 302,306 **** wxString value; // const wxString& propName ! wxString propName = lua2wx(wxlState.GetStringType(2)); // get this wxXmlNode *self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); --- 302,306 ---- wxString value; // const wxString& propName ! wxString propName = wxlState.GetwxStringType(2); // get this wxXmlNode *self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); *************** *** 310,314 **** lua_pushboolean(L, returns); // push the result string ! lua_pushstring(L, wx2lua(value)); // return the number of parameters return 2; --- 310,314 ---- lua_pushboolean(L, returns); // push the result string ! wxlState.lua_PushString(value); // return the number of parameters return 2; *************** *** 330,334 **** returns = self->GetPropVal(propName, defaultVal); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 330,334 ---- returns = self->GetPropVal(propName, defaultVal); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 605,609 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 605,609 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 620,624 **** returns = self->GetValue(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 620,624 ---- returns = self->GetValue(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 861,865 **** returns = self->GetVersion(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 861,865 ---- returns = self->GetVersion(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 876,880 **** returns = self->GetFileEncoding(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 876,880 ---- returns = self->GetFileEncoding(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1091,1095 **** returns = new wxDialog; // const wxString& name ! wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 1091,1095 ---- returns = new wxDialog; // const wxString& name ! wxString name = wxlState.GetwxStringType(3); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 1143,1147 **** returns = new wxFrame; // const wxString& name ! wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 1143,1147 ---- returns = new wxFrame; // const wxString& name ! wxString name = wxlState.GetwxStringType(3); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 1438,1442 **** int returns; // const wxString &stringID ! wxString stringID = lua2wx(wxlState.GetStringType(2)); // call GetXRCID returns = wxXmlResource::GetXRCID(stringID); --- 1438,1442 ---- int returns; // const wxString &stringID ! wxString stringID = wxlState.GetwxStringType(2); // call GetXRCID returns = wxXmlResource::GetXRCID(stringID); Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** dialogs.cpp 22 Feb 2007 00:01:34 -0000 1.26 --- dialogs.cpp 22 Feb 2007 05:40:52 -0000 1.27 *************** *** 199,203 **** returns = self->GetTitle(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 199,203 ---- returns = self->GetTitle(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 463,467 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 463,467 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 508,512 **** returns = self->GetVersion(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 508,512 ---- returns = self->GetVersion(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 553,557 **** returns = self->GetDescription(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 553,557 ---- returns = self->GetDescription(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 598,602 **** returns = self->GetCopyright(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 598,602 ---- returns = self->GetCopyright(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 658,662 **** returns = self->GetLicence(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 658,662 ---- returns = self->GetLicence(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 722,726 **** returns = self->GetWebSiteURL(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 722,726 ---- returns = self->GetWebSiteURL(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 737,741 **** returns = self->GetWebSiteDescription(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 737,741 ---- returns = self->GetWebSiteDescription(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1395,1399 **** returns = self->GetDirectory(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1395,1399 ---- returns = self->GetDirectory(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1410,1414 **** returns = self->GetFilename(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1410,1414 ---- returns = self->GetFilename(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1440,1444 **** returns = self->GetMessage(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1440,1444 ---- returns = self->GetMessage(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1455,1459 **** returns = self->GetPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1455,1459 ---- returns = self->GetPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1470,1474 **** returns = self->GetWildcard(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1470,1474 ---- returns = self->GetWildcard(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1706,1710 **** returns = self->GetPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1706,1710 ---- returns = self->GetPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1721,1725 **** returns = self->GetMessage(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1721,1725 ---- returns = self->GetMessage(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1988,1994 **** int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption ! const wxString caption = lua2wx(wxlState.GetStringType(3)); // const wxString message ! const wxString message = lua2wx(wxlState.GetStringType(2)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); --- 1988,1994 ---- int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption ! const wxString caption = wxlState.GetwxStringType(3); // const wxString message ! const wxString message = wxlState.GetwxStringType(2); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); *************** *** 2031,2035 **** returns = self->GetStringSelection(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2031,2035 ---- returns = self->GetStringSelection(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2131,2135 **** returns = self->GetValue(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2131,2135 ---- returns = self->GetValue(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2802,2806 **** returns = self->GetFindString(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2802,2806 ---- returns = self->GetFindString(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2817,2821 **** returns = self->GetReplaceString(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2817,2821 ---- returns = self->GetReplaceString(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2985,2989 **** returns = self->GetFindString(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2985,2989 ---- returns = self->GetFindString(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3000,3004 **** returns = self->GetReplaceString(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3000,3004 ---- returns = self->GetReplaceString(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3176,3180 **** int argCount = lua_gettop(L); // const wxString newmsg = "" ! const wxString newmsg = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); // int value = -1 int value = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); --- 3176,3180 ---- int argCount = lua_gettop(L); // const wxString newmsg = "" ! const wxString newmsg = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // int value = -1 int value = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wxlua.cpp 7 Feb 2007 18:39:12 -0000 1.26 --- wxlua.cpp 22 Feb 2007 05:40:53 -0000 1.27 *************** *** 236,240 **** wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxlState.GetUserDataType(2, s_wxluatag_wxLuaObject) : NULL); // const wxString title = "Printout" ! const wxString title = (argCount >= 1 ? lua2wx(wxlState.GetStringType(1)) : wxString(wxT("Printout"))); // call constructor returns = new wxLuaPrintout(wxlState, title, pObject); --- 236,240 ---- wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxlState.GetUserDataType(2, s_wxluatag_wxLuaObject) : NULL); // const wxString title = "Printout" ! const wxString title = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxT("Printout"))); // call constructor returns = new wxLuaPrintout(wxlState, title, pObject); *************** *** 345,349 **** int argCount = lua_gettop(L); // const wxString name = "wxLuaHtmlWindow" ! const wxString name = (argCount >= 6 ? lua2wx(wxlState.GetStringType(6)) : wxString(wxT("wxLuaHtmlWindow"))); // long style = wxHW_SCROLLBAR_AUTO long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxHW_SCROLLBAR_AUTO); --- 345,349 ---- int argCount = lua_gettop(L); // const wxString name = "wxLuaHtmlWindow" ! const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("wxLuaHtmlWindow"))); // long style = wxHW_SCROLLBAR_AUTO long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxHW_SCROLLBAR_AUTO); Index: image.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/image.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** image.cpp 22 Feb 2007 00:01:35 -0000 1.24 --- image.cpp 22 Feb 2007 05:40:53 -0000 1.25 *************** *** 602,606 **** returns = wxImage::GetImageExtWildcard(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 602,606 ---- returns = wxImage::GetImageExtWildcard(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 894,898 **** returns = self->GetOption(name); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 894,898 ---- returns = self->GetOption(name); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1666,1670 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1666,1670 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1681,1685 **** returns = self->GetExtension(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1681,1685 ---- returns = self->GetExtension(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1711,1715 **** returns = self->GetMimeType(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1711,1715 ---- returns = self->GetMimeType(); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: mdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** mdi.cpp 22 Feb 2007 00:01:35 -0000 1.23 --- mdi.cpp 22 Feb 2007 05:40:53 -0000 1.24 *************** *** 1130,1134 **** returns = self->GetLastDirectory(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1130,1134 ---- returns = self->GetLastDirectory(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1173,1177 **** bool returns; // wxString buf ! wxString buf = lua2wx(wxlState.GetStringType(2)); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); --- 1173,1177 ---- bool returns; // wxString buf ! wxString buf = wxlState.GetwxStringType(2); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); *************** *** 1180,1184 **** // push the result flag lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(buf)); return 2; --- 1180,1184 ---- // push the result flag lua_pushboolean(L, returns); ! wxlState.lua_PushString(buf); return 2; *************** *** 1599,1603 **** returns = self->GetDefaultExtension(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1599,1603 ---- returns = self->GetDefaultExtension(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1614,1618 **** returns = self->GetDescription(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1614,1618 ---- returns = self->GetDescription(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1629,1633 **** returns = self->GetDirectory(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1629,1633 ---- returns = self->GetDirectory(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1659,1663 **** returns = self->GetDocumentName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1659,1663 ---- returns = self->GetDocumentName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1674,1678 **** returns = self->GetFileFilter(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1674,1678 ---- returns = self->GetFileFilter(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1704,1708 **** returns = self->GetViewName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1704,1708 ---- returns = self->GetViewName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2094,2098 **** returns = self->GetDocumentName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2094,2098 ---- returns = self->GetDocumentName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2124,2128 **** returns = self->GetFilename(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2124,2128 ---- returns = self->GetFilename(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2151,2160 **** wxLuaState wxlState(L); // wxString name ! wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetPrintableName self->GetPrintableName(name); ! lua_pushstring(L, wx2lua(name)); return 1; --- 2151,2160 ---- wxLuaState wxlState(L); // wxString name ! wxString name = wxlState.GetwxStringType(2); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetPrintableName self->GetPrintableName(name); ! wxlState.lua_PushString(name); return 1; *************** *** 2171,2175 **** returns = self->GetTitle(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2171,2175 ---- returns = self->GetTitle(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2657,2661 **** returns = self->GetViewName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2657,2661 ---- returns = self->GetViewName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2991,2995 **** returns = self->GetRedoAccelerator(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2991,2995 ---- returns = self->GetRedoAccelerator(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3006,3010 **** returns = self->GetRedoMenuLabel(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3006,3010 ---- returns = self->GetRedoMenuLabel(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3021,3025 **** returns = self->GetUndoAccelerator(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3021,3025 ---- returns = self->GetUndoAccelerator(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3036,3040 **** returns = self->GetUndoMenuLabel(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3036,3040 ---- returns = self->GetUndoMenuLabel(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3269,3273 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3269,3273 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3463,3467 **** returns = self->GetHistoryFile(index); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3463,3467 ---- returns = self->GetHistoryFile(index); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: config.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/config.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** config.cpp 22 Feb 2007 00:01:34 -0000 1.25 --- config.cpp 22 Feb 2007 05:40:52 -0000 1.26 *************** *** 80,90 **** long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE); // const wxString& globalFilename = "" ! wxString globalFilename = (argCount >= 4 ? lua2wx(lua_tostring(L, 4)) : wxString(wxEmptyString)); // const wxString& localFilename = "", ! wxString localFilename = (argCount >= 3 ? lua2wx(lua_tostring(L, 3)) : wxString(wxEmptyString)); // const wxString& vendorName = "" ! wxString vendorName = (argCount >= 2 ? lua2wx(lua_tostring(L, 2)) : wxString(wxEmptyString)); // const wxString& appName = "" ! wxString appName = (argCount >= 1 ? lua2wx(lua_tostring(L, 1)) : wxString(wxEmptyString)); // call constructor returns = (wxConfigBase*)new wxFileConfig(appName, vendorName, localFilename, globalFilename, style); --- 80,90 ---- long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE); // const wxString& globalFilename = "" ! wxString globalFilename = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString)); // const wxString& localFilename = "", ! wxString localFilename = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // const wxString& vendorName = "" ! wxString vendorName = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // const wxString& appName = "" ! wxString appName = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxEmptyString)); // call constructor returns = (wxConfigBase*)new wxFileConfig(appName, vendorName, localFilename, globalFilename, style); *************** *** 235,239 **** returns = self->GetAppName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 235,239 ---- returns = self->GetAppName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 268,272 **** // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); --- 268,272 ---- // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); *************** *** 276,280 **** lua_pushboolean(L, returns); // push the result string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 276,280 ---- lua_pushboolean(L, returns); // push the result string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 293,297 **** // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); --- 293,297 ---- // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); *************** *** 301,305 **** lua_pushboolean(L, returns); // push the next string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 301,305 ---- lua_pushboolean(L, returns); // push the next string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 324,328 **** lua_pushboolean(L, returns); // push the next result string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 324,328 ---- lua_pushboolean(L, returns); // push the next result string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 348,352 **** lua_pushboolean(L, returns); // push the result string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 348,352 ---- lua_pushboolean(L, returns); // push the result string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 405,409 **** returns = self->GetPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 405,409 ---- returns = self->GetPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 420,424 **** returns = self->GetVendorName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 420,424 ---- returns = self->GetVendorName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 501,507 **** int argCount = lua_gettop(L); // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); // const wxString& key ! wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 501,507 ---- int argCount = lua_gettop(L); // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // const wxString& key ! wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 509,513 **** bool ret = self->Read(key, &returns, defaultVal); // push the result number ! lua_pushstring(L, wx2lua(returns)); // push the result bool lua_pushboolean(L, ret); --- 509,513 ---- bool ret = self->Read(key, &returns, defaultVal); // push the result number ! wxlState.lua_PushString(returns); // push the result bool lua_pushboolean(L, ret); *************** *** 528,532 **** long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 528,532 ---- long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 553,557 **** double defaultVal = (argCount >= 3 ? (double)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 553,557 ---- double defaultVal = (argCount >= 3 ? (double)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); Index: grid.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/grid.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** grid.cpp 22 Feb 2007 00:01:34 -0000 1.24 --- grid.cpp 22 Feb 2007 05:40:52 -0000 1.25 *************** *** 2001,2005 **** returns = self->GetValue(row, col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2001,2005 ---- returns = self->GetValue(row, col); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2040,2044 **** returns = self->GetTypeName(row, col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2040,2044 ---- returns = self->GetTypeName(row, col); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2389,2393 **** returns = self->GetRowLabelValue(row); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2389,2393 ---- returns = self->GetRowLabelValue(row); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2407,2411 **** returns = self->GetColLabelValue(col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2407,2411 ---- returns = self->GetColLabelValue(col); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4632,4636 **** returns = self->GetRowLabelValue(row); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4632,4636 ---- returns = self->GetRowLabelValue(row); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4650,4654 **** returns = self->GetColLabelValue(col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4650,4654 ---- returns = self->GetColLabelValue(col); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 5854,5858 **** returns = self->GetCellValue(row, col); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 5854,5858 ---- returns = self->GetCellValue(row, col); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: file.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** file.cpp 22 Feb 2007 00:01:34 -0000 1.29 --- file.cpp 22 Feb 2007 05:40:52 -0000 1.30 *************** *** 163,167 **** returns = wxFileName::CreateTempFileName(prefix, fileTemp); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 163,167 ---- returns = wxFileName::CreateTempFileName(prefix, fileTemp); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 580,584 **** returns = wxFileName::GetCwd(volume); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 580,584 ---- returns = wxFileName::GetCwd(volume); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 610,614 **** returns = self->GetExt(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 610,614 ---- returns = self->GetExt(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 628,632 **** returns = wxFileName::GetForbiddenChars(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 628,632 ---- returns = wxFileName::GetForbiddenChars(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 661,665 **** returns = self->GetFullName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 661,665 ---- returns = self->GetFullName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 681,685 **** returns = self->GetFullPath(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 681,685 ---- returns = self->GetFullPath(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 694,698 **** returns = wxFileName::GetHomeDir(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 694,698 ---- returns = wxFileName::GetHomeDir(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 709,713 **** returns = self->GetLongPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 709,713 ---- returns = self->GetLongPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 724,728 **** returns = self->GetName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 724,728 ---- returns = self->GetName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 746,750 **** returns = self->GetPath(flags, format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 746,750 ---- returns = self->GetPath(flags, format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 782,786 **** returns = wxFileName::GetPathSeparators(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 782,786 ---- returns = wxFileName::GetPathSeparators(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 800,804 **** returns = wxFileName::GetPathTerminators(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 800,804 ---- returns = wxFileName::GetPathTerminators(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 815,819 **** returns = self->GetShortPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 815,819 ---- returns = self->GetShortPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 830,834 **** returns = self->GetVolume(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 830,834 ---- returns = self->GetVolume(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 848,852 **** returns = wxFileName::GetVolumeSeparator(format); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 848,852 ---- returns = wxFileName::GetVolumeSeparator(format); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1335,1345 **** wxString path; // const wxString& fullpath ! wxString fullpath = lua2wx(wxlState.GetStringType(2)); // call SplitPath wxFileName::SplitPath(fullpath, &path, &name, &ext, format); // push the result strings ! lua_pushstring(L, wx2lua(path)); ! lua_pushstring(L, wx2lua(name)); ! lua_pushstring(L, wx2lua(ext)); // return the number of parameters return 3; --- 1335,1345 ---- wxString path; // const wxString& fullpath ! wxString fullpath = wxlState.GetwxStringType(2); // call SplitPath wxFileName::SplitPath(fullpath, &path, &name, &ext, format); // push the result strings ! wxlState.lua_PushString(path); ! wxlState.lua_PushString(name); ! wxlState.lua_PushString(ext); // return the number of parameters return 3; *************** *** 1361,1372 **** wxString volume; // const wxString& fullpath ! wxString fullpath = lua2wx(wxlState.GetStringType(2)); // call SplitPath wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format); // push the result strings ! lua_pushstring(L, wx2lua(volume)); ! lua_pushstring(L, wx2lua(path)); ! lua_pushstring(L, wx2lua(name)); ! lua_pushstring(L, wx2lua(ext)); // return the number of parameters return 4; --- 1361,1372 ---- wxString volume; // const wxString& fullpath ! wxString fullpath = wxlState.GetwxStringType(2); // call SplitPath wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format); // push the result strings ! wxlState.lua_PushString(volume); ! wxlState.lua_PushString(path); ! wxlState.lua_PushString(name); ! wxlState.lua_PushString(ext); // return the number of parameters return 4; *************** *** 1384,1388 **** wxPathFormat format = (argCount >= 3 ? (wxPathFormat)wxlState.GetEnumerationType(3) : wxPATH_NATIVE); // const wxString fullpath ! const wxString fullpath = lua2wx(wxlState.GetStringType(2)); wxString volume; wxString path; --- 1384,1388 ---- wxPathFormat format = (argCount >= 3 ? (wxPathFormat)wxlState.GetEnumerationType(3) : wxPATH_NATIVE); // const wxString fullpath ! const wxString fullpath = wxlState.GetwxStringType(2); wxString volume; wxString path; *************** *** 1390,1395 **** wxFileName::SplitVolume(fullpath, &volume, &path, format); // push the result strings ! lua_pushstring(L, wx2lua(volume)); ! lua_pushstring(L, wx2lua(path)); return 2; } --- 1390,1395 ---- wxFileName::SplitVolume(fullpath, &volume, &path, format); // push the result strings ! wxlState.lua_PushString(volume); ! wxlState.lua_PushString(path); return 2; } *************** *** 2056,2064 **** int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT(""))); // wxArrayString *files wxArrayString files; // const wxString& dirname ! wxString dirname = lua2wx(wxlState.GetStringType(2)); // call GetAllFiles returns = wxDir::GetAllFiles(dirname, &files, filespec, flags); --- 2056,2064 ---- int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxT(""))); // wxArrayString *files wxArrayString files; // const wxString& dirname ! wxString dirname = wxlState.GetwxStringType(2); // call GetAllFiles returns = wxDir::GetAllFiles(dirname, &files, filespec, flags); *************** *** 2133,2137 **** int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT(""))); // wxString * filename wxString filename; --- 2133,2137 ---- int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxT(""))); // wxString * filename wxString filename; *************** *** 2142,2146 **** lua_pushboolean(L, returns); // push the result number ! lua_pushstring(L, wx2lua(filename)); // return the number of parameters return 2; --- 2142,2146 ---- lua_pushboolean(L, returns); // push the result number ! wxlState.lua_PushString(filename); // return the number of parameters return 2; *************** *** 2162,2166 **** lua_pushboolean(L, returns); // push the result number ! lua_pushstring(L, wx2lua(filename)); // return the number of parameters return 2; --- 2162,2166 ---- lua_pushboolean(L, returns); // push the result number ! wxlState.lua_PushString(filename); // return the number of parameters return 2; Index: data.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/data.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** data.cpp 22 Feb 2007 00:01:34 -0000 1.31 --- data.cpp 22 Feb 2007 05:40:52 -0000 1.32 *************** *** 43,47 **** int argCount = lua_gettop(L); // const wxString str = "" ! const wxString str = (argCount >= 1 ? lua2wx(wxlState.GetStringType(1)) : wxString(wxEmptyString)); // call constructor returns = new wxString(str); --- 43,47 ---- int argCount = lua_gettop(L); // const wxString str = "" ! const wxString str = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxEmptyString)); // call constructor returns = new wxString(str); *************** *** 64,68 **** returns = self->GetData(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 64,68 ---- returns = self->GetData(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 141,145 **** returns = self->GetData(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 141,145 ---- returns = self->GetData(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 461,465 **** wxClassInfo *returns; // const wxString &name ! wxString name = lua2wx(wxlState.GetStringType(1)); // call constructor returns = wxClassInfo::FindClass((wxChar *)name.c_str()); --- 461,465 ---- wxClassInfo *returns; // const wxString &name ! wxString name = wxlState.GetwxStringType(1); // call constructor returns = wxClassInfo::FindClass((wxChar *)name.c_str()); *************** *** 496,500 **** returns = self->GetBaseClassName1(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 496,500 ---- returns = self->GetBaseClassName1(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 511,515 **** returns = self->GetBaseClassName2(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 511,515 ---- returns = self->GetBaseClassName2(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 526,530 **** returns = self->GetClassName(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 526,530 ---- returns = self->GetClassName(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 823,827 **** // call constructor if (argCount >= 2) ! returns = new wxLuaTextValidator(style, lua2wx(wxlState.GetStringType(2))); else returns = new wxLuaTextValidator(style); --- 823,827 ---- // call constructor if (argCount >= 2) ! returns = new wxLuaTextValidator(style, wxlState.GetwxStringType(2)); else returns = new wxLuaTextValidator(style); *************** *** 2181,2185 **** returns = self->Item(nIndex); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2181,2185 ---- returns = self->Item(nIndex); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 2196,2200 **** returns = self->Last(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 2196,2200 ---- returns = self->Last(); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** controls.cpp 22 Feb 2007 00:01:34 -0000 1.40 --- controls.cpp 22 Feb 2007 05:40:52 -0000 1.41 *************** *** 1038,1042 **** returns = self->GetString(n); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1038,1042 ---- returns = self->GetString(n); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1053,1057 **** returns = self->GetStringSelection(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1053,1057 ---- returns = self->GetStringSelection(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1659,1663 **** returns = self->GetValue(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1659,1663 ---- returns = self->GetValue(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 3304,3308 **** returns = self->GetItemText(item); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 3304,3308 ---- returns = self->GetItemText(item); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4464,4468 **** returns = self->GetText(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4464,4468 ---- returns = self->GetText(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4876,4880 **** returns = self->GetLabel(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4876,4880 ---- returns = self->GetLabel(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 4891,4895 **** returns = self->GetText(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 4891,4895 ---- returns = self->GetText(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 5485,5489 **** returns = self->GetStringSelection(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 5485,5489 ---- returns = self->GetStringSelection(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 5503,5507 **** returns = self->GetString(n); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 5503,5507 ---- returns = self->GetString(n); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7446,7450 **** returns = self->GetLineText(lineNo); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7446,7450 ---- returns = self->GetLineText(lineNo); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7481,7485 **** returns = self->GetRange(from, to); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7481,7485 ---- returns = self->GetRange(from, to); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7514,7518 **** returns = self->GetStringSelection(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7514,7518 ---- returns = self->GetStringSelection(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 7549,7553 **** returns = self->GetValue(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 7549,7553 ---- returns = self->GetValue(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 9301,9305 **** returns = self->GetItemText(*item); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 9301,9305 ---- returns = self->GetItemText(*item); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 10987,10991 **** returns = self->GetLabel(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 10987,10991 ---- returns = self->GetLabel(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 11273,11277 **** returns = self->GetDefaultPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 11273,11277 ---- returns = self->GetDefaultPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 11288,11292 **** returns = self->GetPath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 11288,11292 ---- returns = self->GetPath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 11303,11307 **** returns = self->GetFilePath(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 11303,11307 ---- returns = self->GetFilePath(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 11318,11322 **** returns = self->GetFilter(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 11318,11322 ---- returns = self->GetFilter(); // push the result string ! wxlState.lua_PushString(returns); return 1; Index: regex.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/regex.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** regex.cpp 22 Feb 2007 00:01:35 -0000 1.19 --- regex.cpp 22 Feb 2007 05:40:53 -0000 1.20 *************** *** 126,130 **** returns = self->GetMatch(text, index); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 126,130 ---- returns = self->GetMatch(text, index); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 208,214 **** size_t maxMatches = (argCount >= 4 ? (size_t)wxlState.GetNumberType(4) : 0); // const wxString& replacement ! wxString replacement = lua2wx(wxlState.GetStringType(3)); // wxString* text ! wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); --- 208,214 ---- size_t maxMatches = (argCount >= 4 ? (size_t)wxlState.GetNumberType(4) : 0); // const wxString& replacement ! wxString replacement = wxlState.GetwxStringType(3); // wxString* text ! wxString text = wxlState.GetwxStringType(2); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); *************** *** 218,222 **** lua_pushnumber(L, returns); // push the result text ! lua_pushstring(L, wx2lua(text)); // return the number of parameters return 2; --- 218,222 ---- lua_pushnumber(L, returns); // push the result text ! wxlState.lua_PushString(text); // return the number of parameters return 2; *************** *** 231,237 **** int returns; // const wxString& replacement ! wxString replacement = lua2wx(wxlState.GetStringType(3)); // wxString* text ! wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); --- 231,237 ---- int returns; // const wxString& replacement ! wxString replacement = wxlState.GetwxStringType(3); // wxString* text ! wxString text = wxlState.GetwxStringType(2); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); *************** *** 241,245 **** lua_pushnumber(L, returns); // push the result text ! lua_pushstring(L, wx2lua(text)); // return the number of parameters return 2; --- 241,245 ---- lua_pushnumber(L, returns); // push the result text ! wxlState.lua_PushString(text); // return the number of parameters return 2; *************** *** 254,260 **** int returns; // const wxString& replacement ! wxString replacement = lua2wx(wxlState.GetStringType(3)); // wxString* text ! wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); --- 254,260 ---- int returns; // const wxString& replacement ! wxString replacement = wxlState.GetwxStringType(3); // wxString* text ! wxString text = wxlState.GetwxStringType(2); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); *************** *** 264,268 **** lua_pushnumber(L, returns); // push the result text ! lua_pushstring(L, wx2lua(text)); // return the number of parameters return 2; --- 264,268 ---- lua_pushnumber(L, returns); // push the result text ! wxlState.lua_PushString(text); // return the number of parameters return 2; Index: socket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** socket.cpp 22 Feb 2007 00:01:35 -0000 1.25 --- socket.cpp 22 Feb 2007 05:40:53 -0000 1.26 *************** *** 1080,1084 **** returns = self->Hostname(); // push the result string ! lua_pushstring(L, wx2lua(returns) ); return 1; --- 1080,1084 ---- returns = self->Hostname(); // push the result string ! wxlState.lua_PushString(returns); return 1; *************** *** 1095,1099 **** returns = ... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-02-22 05:40:58
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28638/wxLua/samples Modified Files: editor.wx.lua Log Message: use wxLuaState::GetwxStringType instead of lua2wx use wxLuaState::lua_PushString instead of wx2lua fix name == nil when adding notebook page to the wxLua editor Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** editor.wx.lua 8 Jan 2007 04:41:33 -0000 1.43 --- editor.wx.lua 22 Feb 2007 05:40:54 -0000 1.44 *************** *** 863,867 **** end if not editor then ! editor = CreateEditor(wx.wxFileName(filePath):GetFullName()) end --- 863,867 ---- end if not editor then ! editor = CreateEditor(wx.wxFileName(filePath):GetFullName() or "untitled.lua") end |
|
From: John L. <jr...@us...> - 2007-02-22 05:40:56
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28638/wxLua/bindings/wxwidgets Modified Files: override.hpp Log Message: use wxLuaState::GetwxStringType instead of lua2wx use wxLuaState::lua_PushString instead of wx2lua fix name == nil when adding notebook page to the wxLua editor Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** override.hpp 21 Jan 2007 23:13:06 -0000 1.59 --- override.hpp 22 Feb 2007 05:40:52 -0000 1.60 *************** *** 369,373 **** for (idx = 0; idx < numFiles; ++idx) { ! lua_pushstring(L, wx2lua(files[idx])); lua_rawseti(L, -2, idx + 1); } --- 369,373 ---- for (idx = 0; idx < numFiles; ++idx) { ! wxlState.lua_PushString(files[idx]); lua_rawseti(L, -2, idx + 1); } *************** *** 427,437 **** long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE); // const wxString& globalFilename = "" ! wxString globalFilename = (argCount >= 4 ? lua2wx(lua_tostring(L, 4)) : wxString(wxEmptyString)); // const wxString& localFilename = "", ! wxString localFilename = (argCount >= 3 ? lua2wx(lua_tostring(L, 3)) : wxString(wxEmptyString)); // const wxString& vendorName = "" ! wxString vendorName = (argCount >= 2 ? lua2wx(lua_tostring(L, 2)) : wxString(wxEmptyString)); // const wxString& appName = "" ! wxString appName = (argCount >= 1 ? lua2wx(lua_tostring(L, 1)) : wxString(wxEmptyString)); // call constructor returns = (wxConfigBase*)new wxFileConfig(appName, vendorName, localFilename, globalFilename, style); --- 427,437 ---- long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE); // const wxString& globalFilename = "" ! wxString globalFilename = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString)); // const wxString& localFilename = "", ! wxString localFilename = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // const wxString& vendorName = "" ! wxString vendorName = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // const wxString& appName = "" ! wxString appName = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxEmptyString)); // call constructor returns = (wxConfigBase*)new wxFileConfig(appName, vendorName, localFilename, globalFilename, style); *************** *** 467,473 **** int argCount = lua_gettop(L); // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); // const wxString& key ! wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 467,473 ---- int argCount = lua_gettop(L); // wxString defaultVal ! wxString defaultVal = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // const wxString& key ! wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 475,479 **** bool ret = self->Read(key, &returns, defaultVal); // push the result number ! lua_pushstring(L, wx2lua(returns)); // push the result bool lua_pushboolean(L, ret); --- 475,479 ---- bool ret = self->Read(key, &returns, defaultVal); // push the result number ! wxlState.lua_PushString(returns); // push the result bool lua_pushboolean(L, ret); *************** *** 494,498 **** long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 494,498 ---- long defaultVal = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 519,523 **** double defaultVal = (argCount >= 3 ? (double)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); --- 519,523 ---- double defaultVal = (argCount >= 3 ? (double)wxlState.GetNumberType(3) : 0); // const wxString& key ! wxString key = wxlState.GetwxStringType(2); // get this wxConfigBase *self = (wxConfigBase *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase); *************** *** 543,547 **** // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); --- 543,547 ---- // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); *************** *** 551,555 **** lua_pushboolean(L, returns); // push the result string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 551,555 ---- lua_pushboolean(L, returns); // push the result string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 569,573 **** // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); --- 569,573 ---- // these are optional and are not used anyway long index = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); ! wxString str = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // get this wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig); *************** *** 577,581 **** lua_pushboolean(L, returns); // push the next string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 577,581 ---- lua_pushboolean(L, returns); // push the next string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 601,605 **** lua_pushboolean(L, returns); // push the next result string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 601,605 ---- lua_pushboolean(L, returns); // push the next result string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 625,629 **** lua_pushboolean(L, returns); // push the result string ! lua_pushstring(L, wx2lua(str)); // push the next index lua_pushnumber(L, index); --- 625,629 ---- lua_pushboolean(L, returns); // push the result string ! wxlState.lua_PushString(str); // push the next index lua_pushnumber(L, index); *************** *** 987,991 **** int argCount = lua_gettop(L); // const wxString str = "" ! const wxString str = (argCount >= 1 ? lua2wx(wxlState.GetStringType(1)) : wxString(wxEmptyString)); // call constructor returns = new wxString(str); --- 987,991 ---- int argCount = lua_gettop(L); // const wxString str = "" ! const wxString str = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxEmptyString)); // call constructor returns = new wxString(str); *************** *** 1006,1010 **** wxClassInfo *returns; // const wxString &name ! wxString name = lua2wx(wxlState.GetStringType(1)); // call constructor returns = wxClassInfo::FindClass((wxChar *)name.c_str()); --- 1006,1010 ---- wxClassInfo *returns; // const wxString &name ! wxString name = wxlState.GetwxStringType(1); // call constructor returns = wxClassInfo::FindClass((wxChar *)name.c_str()); *************** *** 1086,1090 **** // call constructor if (argCount >= 2) ! returns = new wxLuaTextValidator(style, lua2wx(wxlState.GetStringType(2))); else returns = new wxLuaTextValidator(style); --- 1086,1090 ---- // call constructor if (argCount >= 2) ! returns = new wxLuaTextValidator(style, wxlState.GetwxStringType(2)); else returns = new wxLuaTextValidator(style); *************** *** 1283,1287 **** { for (idx = 1; idx < argCount; ++idx) ! returns->Add(lua2wx(lua_tostring(L, idx))); } } --- 1283,1287 ---- { for (idx = 1; idx < argCount; ++idx) ! returns->Add(wxlState.GetwxStringType(idx)); } } *************** *** 1359,1363 **** int flags = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : 0); // const wxString command ! const wxString command = lua2wx(wxlState.GetStringType(1)); // call wxExecute wxArrayString output; --- 1359,1363 ---- int flags = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : 0); // const wxString command ! const wxString command = wxlState.GetwxStringType(1); // call wxExecute wxArrayString output; *************** *** 1382,1386 **** int flags = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : 0); // const wxString command ! const wxString command = lua2wx(wxlState.GetStringType(1)); // call wxExecute wxArrayString output; --- 1382,1386 ---- int flags = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : 0); // const wxString command ! const wxString command = wxlState.GetwxStringType(1); // call wxExecute wxArrayString output; *************** *** 1466,1470 **** wxLuaState wxlState(L); bool returns; ! wxString var = lua2wx(wxlState.GetStringType(1)); wxString value; // call wxGetEnv --- 1466,1470 ---- wxLuaState wxlState(L); bool returns; ! wxString var = wxlState.GetwxStringType(1); wxString value; // call wxGetEnv *************** *** 1472,1476 **** // push the result number lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(value)); // return the number of parameters return 2; --- 1472,1476 ---- // push the result number lua_pushboolean(L, returns); ! wxlState.lua_PushString(value); // return the number of parameters return 2; *************** *** 1528,1534 **** int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = wxlState.GetStringArray(4, count); // const wxString& caption ! wxString caption = lua2wx(wxlState.GetStringType(3)); // const wxString& message ! wxString message = lua2wx(wxlState.GetStringType(2)); // wxArrayInt& selections wxArrayInt selections; --- 1528,1534 ---- int count = 0; wxLuaSmartStringArray ptr; wxString *choices; ptr = choices = wxlState.GetStringArray(4, count); // const wxString& caption ! wxString caption = wxlState.GetwxStringType(3); // const wxString& message ! wxString message = wxlState.GetwxStringType(2); // wxArrayInt& selections wxArrayInt selections; *************** *** 1594,1600 **** int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption ! const wxString caption = lua2wx(wxlState.GetStringType(3)); // const wxString message ! const wxString message = lua2wx(wxlState.GetStringType(2)); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); --- 1594,1600 ---- int dummy_count; wxArrayString choices = wxArrayString(); dummy_count = wxlState.GetwxArrayString(4, choices); // const wxString caption ! const wxString caption = wxlState.GetwxStringType(3); // const wxString message ! const wxString message = wxlState.GetwxStringType(2); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); *************** *** 1620,1624 **** int argCount = lua_gettop(L); // const wxString newmsg = "" ! const wxString newmsg = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); // int value = -1 int value = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); --- 1620,1624 ---- int argCount = lua_gettop(L); // const wxString newmsg = "" ! const wxString newmsg = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // int value = -1 int value = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); *************** *** 2053,2063 **** wxString path; // const wxString& fullpath ! wxString fullpath = lua2wx(wxlState.GetStringType(2)); // call SplitPath wxFileName::SplitPath(fullpath, &path, &name, &ext, format); // push the result strings ! lua_pushstring(L, wx2lua(path)); ! lua_pushstring(L, wx2lua(name)); ! lua_pushstring(L, wx2lua(ext)); // return the number of parameters return 3; --- 2053,2063 ---- wxString path; // const wxString& fullpath ! wxString fullpath = wxlState.GetwxStringType(2); // call SplitPath wxFileName::SplitPath(fullpath, &path, &name, &ext, format); // push the result strings ! wxlState.lua_PushString(path); ! wxlState.lua_PushString(name); ! wxlState.lua_PushString(ext); // return the number of parameters return 3; *************** *** 2079,2090 **** wxString volume; // const wxString& fullpath ! wxString fullpath = lua2wx(wxlState.GetStringType(2)); // call SplitPath wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format); // push the result strings ! lua_pushstring(L, wx2lua(volume)); ! lua_pushstring(L, wx2lua(path)); ! lua_pushstring(L, wx2lua(name)); ! lua_pushstring(L, wx2lua(ext)); // return the number of parameters return 4; --- 2079,2090 ---- wxString volume; // const wxString& fullpath ! wxString fullpath = wxlState.GetwxStringType(2); // call SplitPath wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format); // push the result strings ! wxlState.lua_PushString(volume); ! wxlState.lua_PushString(path); ! wxlState.lua_PushString(name); ! wxlState.lua_PushString(ext); // return the number of parameters return 4; *************** *** 2102,2106 **** wxPathFormat format = (argCount >= 3 ? (wxPathFormat)wxlState.GetEnumerationType(3) : wxPATH_NATIVE); // const wxString fullpath ! const wxString fullpath = lua2wx(wxlState.GetStringType(2)); wxString volume; wxString path; --- 2102,2106 ---- wxPathFormat format = (argCount >= 3 ? (wxPathFormat)wxlState.GetEnumerationType(3) : wxPATH_NATIVE); // const wxString fullpath ! const wxString fullpath = wxlState.GetwxStringType(2); wxString volume; wxString path; *************** *** 2108,2113 **** wxFileName::SplitVolume(fullpath, &volume, &path, format); // push the result strings ! lua_pushstring(L, wx2lua(volume)); ! lua_pushstring(L, wx2lua(path)); return 2; } --- 2108,2113 ---- wxFileName::SplitVolume(fullpath, &volume, &path, format); // push the result strings ! wxlState.lua_PushString(volume); ! wxlState.lua_PushString(path); return 2; } *************** *** 2125,2129 **** int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT(""))); // wxString * filename wxString filename; --- 2125,2129 ---- int flags = (argCount >= 3 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxT(""))); // wxString * filename wxString filename; *************** *** 2134,2138 **** lua_pushboolean(L, returns); // push the result number ! lua_pushstring(L, wx2lua(filename)); // return the number of parameters return 2; --- 2134,2138 ---- lua_pushboolean(L, returns); // push the result number ! wxlState.lua_PushString(filename); // return the number of parameters return 2; *************** *** 2154,2158 **** lua_pushboolean(L, returns); // push the result number ! lua_pushstring(L, wx2lua(filename)); // return the number of parameters return 2; --- 2154,2158 ---- lua_pushboolean(L, returns); // push the result number ! wxlState.lua_PushString(filename); // return the number of parameters return 2; *************** *** 2171,2179 **** int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT(""))); // wxArrayString *files wxArrayString files; // const wxString& dirname ! wxString dirname = lua2wx(wxlState.GetStringType(2)); // call GetAllFiles returns = wxDir::GetAllFiles(dirname, &files, filespec, flags); --- 2171,2179 ---- int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT); // const wxString& filespec = "" ! wxString filespec = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxT(""))); // wxArrayString *files wxArrayString files; // const wxString& dirname ! wxString dirname = wxlState.GetwxStringType(2); // call GetAllFiles returns = wxDir::GetAllFiles(dirname, &files, filespec, flags); *************** *** 2391,2395 **** bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true); // const wxString &faceName = wxEmptyString ! wxString faceName = (argCount >= 4 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxT(""))); // wxFontEncoding *altEncoding wxFontEncoding altEncoding; --- 2391,2395 ---- bool interactive = (argCount >= 5 ? wxlState.GetBooleanType(4) : true); // const wxString &faceName = wxEmptyString ! wxString faceName = (argCount >= 4 ? wxlState.GetwxStringType(3) : wxString(wxT(""))); // wxFontEncoding *altEncoding wxFontEncoding altEncoding; *************** *** 2632,2636 **** wxCoord w; ! wxString string = lua2wx(lua_tostring(L, 2)); // get this wxDC *self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC); --- 2632,2636 ---- wxCoord w; ! wxString string = wxlState.GetwxStringType(2); // get this wxDC *self = (wxDC *)wxlState.GetUserDataType(1, s_wxluatag_wxDC); *************** *** 2938,2942 **** case LUA_TSTRING: { ! wxString param = lua2wx(wxlState.GetStringType(3)); returns = self->Find(condition, ¶m); } --- 2938,2942 ---- case LUA_TSTRING: { ! wxString param = wxlState.GetwxStringType(3); returns = self->Find(condition, ¶m); } *************** *** 2970,2974 **** wxColour *retColour = new wxColour; // const wxString& par ! wxString par = lua2wx(wxlState.GetStringType(2)); // get this wxHtmlTag *self = (wxHtmlTag *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlTag); --- 2970,2974 ---- wxColour *retColour = new wxColour; // const wxString& par ! wxString par = wxlState.GetwxStringType(2); // get this wxHtmlTag *self = (wxHtmlTag *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlTag); *************** *** 2992,2996 **** int value; // const wxString& par ! wxString par = lua2wx(wxlState.GetStringType(2)); // get this wxHtmlTag *self = (wxHtmlTag *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlTag); --- 2992,2996 ---- int value; // const wxString& par ! wxString par = wxlState.GetwxStringType(2); // get this wxHtmlTag *self = (wxHtmlTag *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlTag); *************** *** 3050,3056 **** // wxString fixed_face ! wxString fixed_face = lua2wx(wxlState.GetStringType(3)); // wxString normal_face ! wxString normal_face = lua2wx(wxlState.GetStringType(2)); // get this wxHtmlWinParser *self = (wxHtmlWinParser *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWinParser); --- 3050,3056 ---- // wxString fixed_face ! wxString fixed_face = wxlState.GetwxStringType(3); // wxString normal_face ! wxString normal_face = wxlState.GetwxStringType(2); // get this wxHtmlWinParser *self = (wxHtmlWinParser *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWinParser); *************** *** 3106,3112 **** // wxString fixed_face ! wxString fixed_face = lua2wx(wxlState.GetStringType(3)); // wxString normal_face ! wxString normal_face = lua2wx(wxlState.GetStringType(2)); // get this wxHtmlWindow *self = (wxHtmlWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindow); --- 3106,3112 ---- // wxString fixed_face ! wxString fixed_face = wxlState.GetwxStringType(3); // wxString normal_face ! wxString normal_face = wxlState.GetwxStringType(2); // get this wxHtmlWindow *self = (wxHtmlWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindow); *************** *** 3376,3380 **** bool returns; // wxString buf ! wxString buf = lua2wx(wxlState.GetStringType(2)); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); --- 3376,3380 ---- bool returns; // wxString buf ! wxString buf = wxlState.GetwxStringType(2); // get this wxDocManager * self = (wxDocManager *)wxlState.GetUserDataType(1, s_wxluatag_wxDocManager); *************** *** 3383,3387 **** // push the result flag lua_pushboolean(L, returns); ! lua_pushstring(L, wx2lua(buf)); return 2; --- 3383,3387 ---- // push the result flag lua_pushboolean(L, returns); ! wxlState.lua_PushString(buf); return 2; *************** *** 3395,3404 **** wxLuaState wxlState(L); // wxString name ! wxString name = lua2wx(wxlState.GetStringType(2)); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetPrintableName self->GetPrintableName(name); ! lua_pushstring(L, wx2lua(name)); return 1; --- 3395,3404 ---- wxLuaState wxlState(L); // wxString name ! wxString name = wxlState.GetwxStringType(2); // get this wxDocument * self = (wxDocument *)wxlState.GetUserDataType(1, s_wxluatag_wxDocument); // call GetPrintableName self->GetPrintableName(name); ! wxlState.lua_PushString(name); return 1; *************** *** 3457,3461 **** long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& title = "" ! wxString title = (argCount >= 2 ? lua2wx(wxlState.GetStringType(2)) : wxString(wxT(""))); // int table if (lua_istable(L, 1)) --- 3457,3461 ---- long style = (argCount >= 3 ? (long)wxlState.GetNumberType(3) : 0); // const wxString& title = "" ! wxString title = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxT(""))); // int table if (lua_istable(L, 1)) *************** *** 3491,3495 **** lua_pushnumber(L, 2); lua_gettable(L, -2); ! menuText = lua2wx(lua_tostring(L, -1)); lua_pop(L, 1); --- 3491,3495 ---- lua_pushnumber(L, 2); lua_gettable(L, -2); ! menuText = wxlState.GetwxStringType(-1); lua_pop(L, 1); *************** *** 3497,3501 **** lua_gettable(L, -2); if (lua_isstring(L, -1)) ! helpText = lua2wx(lua_tostring(L, -1)); lua_pop(L, 1); --- 3497,3501 ---- lua_gettable(L, -2); if (lua_isstring(L, -1)) ! helpText = wxlState.GetwxStringType(-1); lua_pop(L, 1); *************** *** 3585,3591 **** wxItemKind itemkind = (wxItemKind)(argCount >= 5 ? wxlState.GetEnumerationType(5) : wxITEM_NORMAL); // const wxString& help = wxEmptyString ! wxString help = (argCount >= 4 ? lua2wx(wxlState.GetStringType(4)) : wxString(wxEmptyString)); // const wxString& text = wxEmptyString ! wxString text = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxEmptyString)); // int id = wxID_SEPARATOR int id = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : wxID_SEPARATOR); --- 3585,3591 ---- wxItemKind itemkind = (wxItemKind)(argCount >= 5 ? wxlState.GetEnumerationType(5) : wxITEM_NORMAL); // const wxString& help = wxEmptyString ! wxString help = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString)); // const wxString& text = wxEmptyString ! wxString text = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); // int id = wxID_SEPARATOR int id = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : wxID_SEPARATOR); *************** *** 3809,3815 **** size_t maxMatches = (argCount >= 4 ? (size_t)wxlState.GetNumberType(4) : 0); // const wxString& replacement ! wxString replacement = lua2wx(wxlState.GetStringType(3)); // wxString* text ! wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); --- 3809,3815 ---- size_t maxMatches = (argCount >= 4 ? (size_t)wxlState.GetNumberType(4) : 0); // const wxString& replacement ! wxString replacement = wxlState.GetwxStringType(3); // wxString* text ! wxString text = wxlState.GetwxStringType(2); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); *************** *** 3819,3823 **** lua_pushnumber(L, returns); // push the result text ! lua_pushstring(L, wx2lua(text)); // return the number of parameters return 2; --- 3819,3823 ---- lua_pushnumber(L, returns); // push the result text ! wxlState.lua_PushString(text); // return the number of parameters return 2; *************** *** 3832,3838 **** int returns; // const wxString& replacement ! wxString replacement = lua2wx(wxlState.GetStringType(3)); // wxString* text ! wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); --- 3832,3838 ---- int returns; // const wxString& replacement ! wxString replacement = wxlState.GetwxStringType(3); // wxString* text ! wxString text = wxlState.GetwxStringType(2); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); *************** *** 3842,3846 **** lua_pushnumber(L, returns); // push the result text ! lua_pushstring(L, wx2lua(text)); // return the number of parameters return 2; --- 3842,3846 ---- lua_pushnumber(L, returns); // push the result text ! wxlState.lua_PushString(text); // return the number of parameters return 2; *************** *** 3855,3861 **** int returns; // const wxString& replacement ! wxString replacement = lua2wx(wxlState.GetStringType(3)); // wxString* text ! wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); --- 3855,3861 ---- int returns; // const wxString& replacement ! wxString replacement = wxlState.GetwxStringType(3); // wxString* text ! wxString text = wxlState.GetwxStringType(2); // get this wxRegEx *self = (wxRegEx *)wxlState.GetUserDataType(1, s_wxluatag_wxRegEx); *************** *** 3865,3869 **** lua_pushnumber(L, returns); // push the result text ! lua_pushstring(L, wx2lua(text)); // return the number of parameters return 2; --- 3865,3869 ---- lua_pushnumber(L, returns); // push the result text ! wxlState.lua_PushString(text); // return the number of parameters return 2; *************** *** 4138,4142 **** int h; // const wxString& string ! wxString string = lua2wx(wxlState.GetStringType(2)); // get this wxWindow *self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); --- 4138,4142 ---- int h; // const wxString& string ! wxString string = wxlState.GetwxStringType(2); // get this wxWindow *self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); *************** *** 4379,4385 **** int returns; // const wxString fileName ! const wxString fileName = lua2wx(wxlState.GetStringType(2)); // const wxString luaScript ! const wxString luaScript = lua2wx(wxlState.GetStringType(1)); wxString errMsg; int line_num = -1; --- 4379,4385 ---- int returns; // const wxString fileName ! const wxString fileName = wxlState.GetwxStringType(2); // const wxString luaScript ! const wxString luaScript = wxlState.GetwxStringType(1); wxString errMsg; int line_num = -1; *************** *** 4388,4392 **** // push the result number lua_pushnumber(L, returns); ! lua_pushstring(L, wx2lua(errMsg)); lua_pushnumber(L, line_num); return 3; --- 4388,4392 ---- // push the result number lua_pushnumber(L, returns); ! wxlState.lua_PushString(errMsg); lua_pushnumber(L, line_num); return 3; *************** *** 4450,4454 **** wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxlState.GetUserDataType(2, s_wxluatag_wxLuaObject) : NULL); // const wxString title = "Printout" ! const wxString title = (argCount >= 1 ? lua2wx(wxlState.GetStringType(1)) : wxString(wxT("Printout"))); // call constructor returns = new wxLuaPrintout(wxlState, title, pObject); --- 4450,4454 ---- wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxlState.GetUserDataType(2, s_wxluatag_wxLuaObject) : NULL); // const wxString title = "Printout" ! const wxString title = (argCount >= 1 ? wxlState.GetwxStringType(1) : wxString(wxT("Printout"))); // call constructor returns = new wxLuaPrintout(wxlState, title, pObject); *************** *** 4471,4475 **** int argCount = lua_gettop(L); // const wxString name = "wxLuaHtmlWindow" ! const wxString name = (argCount >= 6 ? lua2wx(wxlState.GetStringType(6)) : wxString(wxT("wxLuaHtmlWindow"))); // long style = wxHW_SCROLLBAR_AUTO long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxHW_SCROLLBAR_AUTO); --- 4471,4475 ---- int argCount = lua_gettop(L); // const wxString name = "wxLuaHtmlWindow" ! const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("wxLuaHtmlWindow"))); // long style = wxHW_SCROLLBAR_AUTO long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxHW_SCROLLBAR_AUTO); *************** *** 4507,4511 **** wxString value; // const wxString& propName ! wxString propName = lua2wx(wxlState.GetStringType(2)); // get this wxXmlNode *self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); --- 4507,4511 ---- wxString value; // const wxString& propName ! wxString propName = wxlState.GetwxStringType(2); // get this wxXmlNode *self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode); *************** *** 4515,4519 **** lua_pushboolean(L, returns); // push the result string ! lua_pushstring(L, wx2lua(value)); // return the number of parameters return 2; --- 4515,4519 ---- lua_pushboolean(L, returns); // push the result string ! wxlState.lua_PushString(value); // return the number of parameters return 2; *************** *** 4545,4549 **** returns = new wxFrame; // const wxString& name ! wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 4545,4549 ---- returns = new wxFrame; // const wxString& name ! wxString name = wxlState.GetwxStringType(3); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 4571,4575 **** returns = new wxDialog; // const wxString& name ! wxString name = lua2wx(wxlState.GetStringType(3)); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 4571,4575 ---- returns = new wxDialog; // const wxString& name ! wxString name = wxlState.GetwxStringType(3); // wxWindow* parent wxWindow *parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 4610,4614 **** int returns; // const wxString &stringID ! wxString stringID = lua2wx(wxlState.GetStringType(2)); // call GetXRCID returns = wxXmlResource::GetXRCID(stringID); --- 4610,4614 ---- int returns; // const wxString &stringID ! wxString stringID = wxlState.GetwxStringType(2); // call GetXRCID returns = wxXmlResource::GetXRCID(stringID); |
|
From: John L. <jr...@us...> - 2007-02-22 00:02:08
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16385/wxLua/bindings/wxwidgets Modified Files: data.i 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: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** data.i 9 Feb 2007 05:17:08 -0000 1.20 --- data.i 22 Feb 2007 00:01:34 -0000 1.21 *************** *** 234,238 **** wxNode *GetPrevious() void SetData(wxObject *data) ! int IndexOf() %property=Data, read, write --- 234,238 ---- wxNode *GetPrevious() void SetData(wxObject *data) ! //int IndexOf() - unfortunately a protected member of wxNodeBase %property=Data, read, write |
|
From: John L. <jr...@us...> - 2007-02-22 00:02:08
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16385/wxLua/bindings Modified Files: genwxbind.lua 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: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** genwxbind.lua 15 Feb 2007 02:51:35 -0000 1.98 --- genwxbind.lua 22 Feb 2007 00:01:34 -0000 1.99 *************** *** 2808,2812 **** if memberType == "wxString" then CommentBindingTable(codeList, " // get the string value\n") ! table.insert(codeList, " wxString val = lua2wx(wxlState.GetStringType(2));\n") elseif not numeric and (not memberPtr or (memberPtr == "&")) then CommentBindingTable(codeList, " // get the data type value\n") --- 2808,2812 ---- if memberType == "wxString" then CommentBindingTable(codeList, " // get the string value\n") ! table.insert(codeList, " wxString val = wxlState.GetwxStringType(2);\n") elseif not numeric and (not memberPtr or (memberPtr == "&")) then CommentBindingTable(codeList, " // get the data type value\n") *************** *** 3142,3146 **** if argType == "wxString" then overload_argList = overload_argList.."&s_wxluaarg_String, " ! argItem = "lua2wx(wxlState.GetStringType("..argNum.."))" -- Default String Value --- 3142,3146 ---- if argType == "wxString" then overload_argList = overload_argList.."&s_wxluaarg_String, " ! argItem = "wxlState.GetwxStringType("..argNum..")" -- Default String Value *************** *** 3188,3192 **** if argType == "wxString" then overload_argList = overload_argList.."&s_wxluaarg_String, " ! argItem = "lua2wx(wxlState.GetStringType("..argNum.."))" -- Default String Value --- 3188,3192 ---- if argType == "wxString" then overload_argList = overload_argList.."&s_wxluaarg_String, " ! argItem = "wxlState.GetwxStringType("..argNum..")" -- Default String Value *************** *** 3218,3222 **** if argType == "wxString" then overload_argList = overload_argList.."&s_wxluaarg_String, " ! argItem = "lua2wx(wxlState.GetStringType("..argNum.."))" -- Default String Value --- 3218,3222 ---- if argType == "wxString" then overload_argList = overload_argList.."&s_wxluaarg_String, " ! argItem = "wxlState.GetwxStringType("..argNum..")" -- Default String Value |
|
From: John L. <jr...@us...> - 2007-02-22 00:02:08
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16385/wxLua/apps/wxluacan/src Modified Files: wxluacan.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: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxluacan.cpp 7 Feb 2007 18:39:06 -0000 1.19 --- wxluacan.cpp 22 Feb 2007 00:01:33 -0000 1.20 *************** *** 286,290 **** wxlCanObjScript *returns; // const wxString name ! const wxString name = lua2wx(wxlState.GetStringType(3)); // double y double y = (double)wxlState.GetNumberType(2); --- 286,290 ---- wxlCanObjScript *returns; // const wxString name ! const wxString name = wxlState.GetwxStringType(3); // double y double y = (double)wxlState.GetNumberType(2); *************** *** 328,332 **** wxlCanObjAddScript *returns; // const wxString script ! const wxString script = lua2wx(wxlState.GetStringType(3)); // double y double y = (double)wxlState.GetNumberType(2); --- 328,332 ---- wxlCanObjAddScript *returns; // const wxString script ! const wxString script = wxlState.GetwxStringType(3); // double y double y = (double)wxlState.GetNumberType(2); *************** *** 347,351 **** wxLuaState wxlState(L); // const wxString script ! const wxString script = lua2wx(wxlState.GetStringType(2)); // get this wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObjAddScript); --- 347,351 ---- wxLuaState wxlState(L); // const wxString script ! const wxString script = wxlState.GetwxStringType(2); // get this wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObjAddScript); |
|
From: John L. <jr...@us...> - 2007-02-22 00:01:43
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16385/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.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: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxluasocket.cpp 7 Feb 2007 18:39:12 -0000 1.14 --- wxluasocket.cpp 22 Feb 2007 00:01:36 -0000 1.15 *************** *** 99,103 **** int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName ! const wxString fileName = lua2wx(wxlState.GetStringType(2)); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); --- 99,103 ---- int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName ! const wxString fileName = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); *************** *** 119,123 **** int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName ! const wxString fileName = lua2wx(wxlState.GetStringType(2)); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); --- 119,123 ---- int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName ! const wxString fileName = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); *************** *** 152,158 **** bool returns; // const wxString fileName ! const wxString fileName = lua2wx(wxlState.GetStringType(3)); // const wxString file ! const wxString file = lua2wx(wxlState.GetStringType(2)); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); --- 152,158 ---- bool returns; // const wxString fileName ! const wxString fileName = wxlState.GetwxStringType(3); // const wxString file ! const wxString file = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); *************** *** 262,266 **** bool returns; // const wxString expr ! const wxString expr = lua2wx(wxlState.GetStringType(3)); // int exprRef int exprRef = (int)wxlState.GetNumberType(2); --- 262,266 ---- bool returns; // const wxString expr ! const wxString expr = wxlState.GetwxStringType(3); // int exprRef int exprRef = (int)wxlState.GetNumberType(2); |
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] |
|
From: John L. <jr...@us...> - 2007-02-22 00:01:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxbindstc/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16385/wxLua/modules/wxbindstc/src Modified Files: stc.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: stc.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** stc.cpp 7 Feb 2007 18:39:12 -0000 1.22 --- stc.cpp 22 Feb 2007 00:01:36 -0000 1.23 *************** *** 141,145 **** wxLuaState wxlState(L); // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 141,145 ---- wxLuaState wxlState(L); // const wxString text ! const wxString text = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 156,160 **** wxLuaState wxlState(L); // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(3)); // int pos int pos = (int)wxlState.GetNumberType(2); --- 156,160 ---- wxLuaState wxlState(L); // const wxString text ! const wxString text = wxlState.GetwxStringType(3); // int pos int pos = (int)wxlState.GetNumberType(2); *************** *** 1005,1009 **** wxLuaState wxlState(L); // const wxString fontName ! const wxString fontName = lua2wx(wxlState.GetStringType(3)); // int style int style = (int)wxlState.GetNumberType(2); --- 1005,1009 ---- wxLuaState wxlState(L); // const wxString fontName ! const wxString fontName = wxlState.GetwxStringType(3); // int style int style = (int)wxlState.GetNumberType(2); *************** *** 1144,1148 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetStyleBytes[] = { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 }; // %override wxLua_wxStyledTextCtrl_SetStyleBytes // void SetStyleBytes(int length, const wxString &styleBytes) --- 1144,1148 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_SetStyleBytes[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; // %override wxLua_wxStyledTextCtrl_SetStyleBytes // void SetStyleBytes(int length, const wxString &styleBytes) *************** *** 1217,1221 **** wxLuaState wxlState(L); // const wxString characters ! const wxString characters = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 1217,1221 ---- wxLuaState wxlState(L); // const wxString characters ! const wxString characters = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 1418,1422 **** wxLuaState wxlState(L); // const wxString itemList ! const wxString itemList = lua2wx(wxlState.GetStringType(3)); // int lenEntered int lenEntered = (int)wxlState.GetNumberType(2); --- 1418,1422 ---- wxLuaState wxlState(L); // const wxString itemList ! const wxString itemList = wxlState.GetwxStringType(3); // int lenEntered int lenEntered = (int)wxlState.GetNumberType(2); *************** *** 1489,1493 **** wxLuaState wxlState(L); // const wxString characterSet ! const wxString characterSet = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 1489,1493 ---- wxLuaState wxlState(L); // const wxString characterSet ! const wxString characterSet = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 1534,1538 **** wxLuaState wxlState(L); // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 1534,1538 ---- wxLuaState wxlState(L); // const wxString text ! const wxString text = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 1579,1583 **** wxLuaState wxlState(L); // const wxString characterSet ! const wxString characterSet = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 1579,1583 ---- wxLuaState wxlState(L); // const wxString characterSet ! const wxString characterSet = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 1654,1658 **** wxLuaState wxlState(L); // const wxString itemList ! const wxString itemList = lua2wx(wxlState.GetStringType(3)); // int listType int listType = (int)wxlState.GetNumberType(2); --- 1654,1658 ---- wxLuaState wxlState(L); // const wxString itemList ! const wxString itemList = wxlState.GetwxStringType(3); // int listType int listType = (int)wxlState.GetNumberType(2); *************** *** 2242,2246 **** int flags = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : 0); // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(4)); // int maxPos int maxPos = (int)wxlState.GetNumberType(3); --- 2242,2246 ---- int flags = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : 0); // const wxString text ! const wxString text = wxlState.GetwxStringType(4); // int maxPos int maxPos = (int)wxlState.GetNumberType(3); *************** *** 2518,2522 **** wxLuaState wxlState(L); // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 2518,2522 ---- wxLuaState wxlState(L); // const wxString text ! const wxString text = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 2650,2654 **** wxLuaState wxlState(L); // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 2650,2654 ---- wxLuaState wxlState(L); // const wxString text ! const wxString text = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 2816,2820 **** int returns; // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 2816,2820 ---- int returns; // const wxString text ! const wxString text = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 2834,2838 **** int returns; // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 2834,2838 ---- int returns; // const wxString text ! const wxString text = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 2852,2856 **** int returns; // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 2852,2856 ---- int returns; // const wxString text ! const wxString text = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 2899,2903 **** wxLuaState wxlState(L); // const wxString definition ! const wxString definition = lua2wx(wxlState.GetStringType(3)); // int pos int pos = (int)wxlState.GetNumberType(2); --- 2899,2903 ---- wxLuaState wxlState(L); // const wxString definition ! const wxString definition = wxlState.GetwxStringType(3); // int pos int pos = (int)wxlState.GetNumberType(2); *************** *** 3560,3564 **** int returns; // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(3)); // int style int style = (int)wxlState.GetNumberType(2); --- 3560,3564 ---- int returns; // const wxString text ! const wxString text = wxlState.GetwxStringType(3); // int style int style = (int)wxlState.GetNumberType(2); *************** *** 3657,3661 **** wxLuaState wxlState(L); // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 3657,3661 ---- wxLuaState wxlState(L); // const wxString text ! const wxString text = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 4653,4657 **** int returns; // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(3)); // int flags int flags = (int)wxlState.GetNumberType(2); --- 4653,4657 ---- int returns; // const wxString text ! const wxString text = wxlState.GetwxStringType(3); // int flags int flags = (int)wxlState.GetNumberType(2); *************** *** 4673,4677 **** int returns; // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(3)); // int flags int flags = (int)wxlState.GetNumberType(2); --- 4673,4677 ---- int returns; // const wxString text ! const wxString text = wxlState.GetwxStringType(3); // int flags int flags = (int)wxlState.GetNumberType(2); *************** *** 5303,5307 **** wxLuaState wxlState(L); // const wxString text ! const wxString text = lua2wx(wxlState.GetStringType(3)); // int length int length = (int)wxlState.GetNumberType(2); --- 5303,5307 ---- wxLuaState wxlState(L); // const wxString text ! const wxString text = wxlState.GetwxStringType(3); // int length int length = (int)wxlState.GetNumberType(2); *************** *** 5590,5594 **** wxLuaState wxlState(L); // const wxString characters ! const wxString characters = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 5590,5594 ---- wxLuaState wxlState(L); // const wxString characters ! const wxString characters = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 5822,5828 **** wxLuaState wxlState(L); // const wxString value ! const wxString value = lua2wx(wxlState.GetStringType(3)); // const wxString key ! const wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 5822,5828 ---- wxLuaState wxlState(L); // const wxString value ! const wxString value = wxlState.GetwxStringType(3); // const wxString key ! const wxString key = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 5839,5843 **** wxLuaState wxlState(L); // const wxString keyWords ! const wxString keyWords = lua2wx(wxlState.GetStringType(3)); // int keywordSet int keywordSet = (int)wxlState.GetNumberType(2); --- 5839,5843 ---- wxLuaState wxlState(L); // const wxString keyWords ! const wxString keyWords = wxlState.GetwxStringType(3); // int keywordSet int keywordSet = (int)wxlState.GetNumberType(2); *************** *** 5856,5860 **** wxLuaState wxlState(L); // const wxString language ! const wxString language = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 5856,5860 ---- wxLuaState wxlState(L); // const wxString language ! const wxString language = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 5872,5876 **** wxString returns; // const wxString key ! const wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 5872,5876 ---- wxString returns; // const wxString key ! const wxString key = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 5890,5894 **** wxString returns; // const wxString key ! const wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 5890,5894 ---- wxString returns; // const wxString key ! const wxString key = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 5908,5912 **** int returns; // const wxString key ! const wxString key = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 5908,5912 ---- int returns; // const wxString key ! const wxString key = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 5955,5959 **** wxLuaState wxlState(L); // const wxString spec ! const wxString spec = lua2wx(wxlState.GetStringType(3)); // int styleNum int styleNum = (int)wxlState.GetNumberType(2); --- 5955,5959 ---- wxLuaState wxlState(L); // const wxString spec ! const wxString spec = wxlState.GetwxStringType(3); // int styleNum int styleNum = (int)wxlState.GetNumberType(2); *************** *** 6125,6129 **** bool returns; // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 6125,6129 ---- bool returns; // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 6143,6147 **** bool returns; // const wxString filename ! const wxString filename = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 6143,6147 ---- bool returns; // const wxString filename ! const wxString filename = wxlState.GetwxStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 6184,6188 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_AddTextRaw[] = { &s_wxluaarg_LightUserData, 0 }; // void AddTextRaw(const char* text); static int LUACALL wxLua_wxStyledTextCtrl_AddTextRaw(lua_State *L) --- 6184,6188 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_AddTextRaw[] = { &s_wxluaarg_String, 0 }; // void AddTextRaw(const char* text); static int LUACALL wxLua_wxStyledTextCtrl_AddTextRaw(lua_State *L) *************** *** 6190,6194 **** wxLuaState wxlState(L); // const char text ! const char * text = (const char *)wxlState.ttouserdata(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); --- 6190,6194 ---- wxLuaState wxlState(L); // const char text ! wxCharBuffer text = wxlState.GetStringType(2); // get this wxStyledTextCtrl * self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl); *************** *** 6199,6203 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_InsertTextRaw[] = { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 }; // void InsertTextRaw(int pos, const char* text); static int LUACALL wxLua_wxStyledTextCtrl_InsertTextRaw(lua_State *L) --- 6199,6203 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_InsertTextRaw[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; // void InsertTextRaw(int pos, const char* text); static int LUACALL wxLua_wxStyledTextCtrl_InsertTextRaw(lua_State *L) *************** *** 6205,6209 **** wxLuaState wxlState(L); // const char text ! const char * text = (const char *)wxlState.ttouserdata(3); // int pos int pos = (int)wxlState.GetNumberType(2); --- 6205,6209 ---- wxLuaState wxlState(L); // const char text ! wxCharBuffer text = wxlState.GetStringType(3); // int pos int pos = (int)wxlState.GetNumberType(2); *************** *** 6674,6678 **** bool bold = wxlState.GetBooleanType(5); // const wxString faceName ! const wxString faceName = lua2wx(wxlState.GetStringType(4)); // int size int size = (int)wxlState.GetNumberType(3); --- 6674,6678 ---- bool bold = wxlState.GetBooleanType(5); // const wxString faceName ! const wxString faceName = wxlState.GetwxStringType(4); // int size int size = (int)wxlState.GetNumberType(3); *************** *** 6717,6721 **** int argCount = lua_gettop(L); // const wxString name = "wxStyledTextCtrl" ! const wxString name = (argCount >= 6 ? lua2wx(wxlState.GetStringType(6)) : wxString(wxT("wxStyledTextCtrl"))); // long style = 0 long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : 0); --- 6717,6721 ---- int argCount = lua_gettop(L); // const wxString name = "wxStyledTextCtrl" ! const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("wxStyledTextCtrl"))); // long style = 0 long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : 0); *************** *** 7509,7513 **** wxLuaState wxlState(L); // const wxString t ! const wxString t = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent); --- 7509,7513 ---- wxLuaState wxlState(L); // const wxString t ! const wxString t = wxlState.GetwxStringType(2); // get this wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent); *************** *** 7704,7708 **** wxLuaState wxlState(L); // const wxString val ! const wxString val = lua2wx(wxlState.GetStringType(2)); // get this wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent); --- 7704,7708 ---- wxLuaState wxlState(L); // const wxString val ! const wxString val = wxlState.GetwxStringType(2); // get this wxStyledTextEvent * self = (wxStyledTextEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextEvent); |
|
From: John L. <jr...@us...> - 2007-02-22 00:01:41
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16385/wxLua/modules/wxlua/src Modified Files: wxlstate.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: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** wxlstate.cpp 21 Jan 2007 23:13:07 -0000 1.86 --- wxlstate.cpp 22 Feb 2007 00:01:36 -0000 1.87 *************** *** 853,856 **** --- 853,857 ---- m_wxluatag_wxEvent(0), m_wxluatag_wxWindow(0), + m_wxluatag_wxString(0), m_callbase_func(false), m_inEventType(wxEVT_NULL), *************** *** 1871,1874 **** --- 1872,1889 ---- return M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxWindow; } + int wxLuaState::GetwxStringTag() const + { + wxCHECK_MSG(Ok(), 0, wxT("Invalid wxLuaState")); + + // Find the wxWindow tag once and store it for later use + if (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxString == 0) + { + const WXLUACLASS* luaClass = GetLuaClass("wxString"); + wxCHECK_MSG(luaClass, 0, wxT("wxString lua tag is missing in wxLuaState, forgot to add wxWidgets binding?")); + M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxString = *luaClass->class_tag; + } + + return M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxString; + } void wxLuaState::SetCallBaseClassFunction(bool call_base) *************** *** 2313,2316 **** --- 2328,2356 ---- return wxLua_lua_getstringtype(M_WXLSTATEDATA->m_lua_State, stack_idx); } + wxString wxLuaState::GetwxStringType(int stack_idx) + { + wxCHECK_MSG(Ok(), wxEmptyString, wxT("Invalid wxLuaState")); + + lua_State* L = M_WXLSTATEDATA->m_lua_State; + + if (wxLua_lua_isstringtype(L, stack_idx)) + return lua2wx(lua_tostring(L, stack_idx)); + else if (lua_isuserdata(L, stack_idx) && !lua_islightuserdata(L, stack_idx)) + { + int stack_tag = wxLua_lua_ttag(L, stack_idx); + + if (IsDerivedClass(stack_tag, GetwxStringTag())) + { + wxString* wxstr = (wxString*)wxLua_lua_ttouserdata(L, stack_idx, false); + return *wxstr; + } + } + + wxString msg(wxString::Format(_("wxLua: Expected a string or wxString for parameter %d, but got '%s'."), + stack_idx, lua2wx(lua_typename(L, lua_type(L, stack_idx))).c_str())); + wxLua_lua_terror(L, wx2lua(msg)); + + return wxEmptyString; + } bool wxLuaState::GetBooleanType(int stack_idx) { |
|
From: John L. <jr...@us...> - 2007-02-22 00:01:40
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv16385/wxLua/modules/wxlua/include Modified Files: wxlstate.h 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: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** wxlstate.h 21 Jan 2007 23:13:07 -0000 1.59 --- wxlstate.h 22 Feb 2007 00:01:36 -0000 1.60 *************** *** 62,72 **** if (luastr == NULL) return wxEmptyString; // check for NULL #if wxUSE_UNICODE ! return wxString(luastr, wxConvUTF8); #else ! return wxString(wxConvUTF8.cMB2WC(luastr), *wxConvCurrent); #endif // wxUSE_UNICODE ! //return wxConvertMB2WX(luastr); // old way that mostly works } --- 62,77 ---- if (luastr == NULL) return wxEmptyString; // check for NULL + wxString str; + #if wxUSE_UNICODE ! str = wxString(luastr, wxConvUTF8); #else ! str = wxString(wxConvUTF8.cMB2WC(luastr), *wxConvCurrent); #endif // wxUSE_UNICODE ! if (str.IsEmpty()) ! str = wxConvertMB2WX(luastr); // old way that mostly works ! ! return str; } *************** *** 74,79 **** inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr) { - //wxCharBuffer buffer(wxConvertWX2MB(wxstr.c_str())); // old way that mostly works wxCharBuffer buffer(wxConvUTF8.cWC2MB(wxstr.wc_str(*wxConvCurrent))); // skieu return buffer; } --- 79,87 ---- inline const WXDLLIMPEXP_WXLUA wxCharBuffer wx2lua(const wxString& wxstr) { wxCharBuffer buffer(wxConvUTF8.cWC2MB(wxstr.wc_str(*wxConvCurrent))); // skieu + + if ((buffer.data() == NULL) && !wxstr.IsEmpty()) + buffer = wxConvertWX2MB(wxstr.c_str()); // old way that mostly works + return buffer; } *************** *** 83,91 **** { public: ! wxLuaCharBuffer(const wxString &wxstr) : m_buffer((const char *)NULL) ! { ! //wxCharBuffer charBuffer = wxConvertWX2MB(wxstr.c_str()); ! m_buffer = wxCharBuffer(wxConvUTF8.cWC2MB(wxstr.wc_str(*wxConvCurrent))); // skieu ! } size_t Length() const { return strlen((const char*)m_buffer); } --- 91,95 ---- { public: ! wxLuaCharBuffer(const wxString &wxstr) : m_buffer(wx2lua(wxstr)) {} size_t Length() const { return strlen((const char*)m_buffer); } *************** *** 209,212 **** --- 213,217 ---- int m_wxluatag_wxEvent; // The lua tag for wxEvents int m_wxluatag_wxWindow; // The lua tag for wxWindows + int m_wxluatag_wxString; // The lua tag for wxStrings bool m_callbase_func; // call the base class function instead of derived func *************** *** 490,493 **** --- 495,499 ---- int GetwxEventTag() const; // The lua tag for wxEvents int GetwxWindowTag() const; // The lua tag for wxWindows + int GetwxStringTag() const; // The lua tag for wxStrings // When looking up a function to call, should the base class function *************** *** 589,592 **** --- 595,601 ---- // calls terror if the value is not of the right type. const char* GetStringType(int stack_idx); + // Same as GetStringType(), but returns a wxString and the item at the stack_idx can be + // either a lua string or a wxString userdata. + wxString GetwxStringType(int stack_idx); // Validate that the object at the stack index specified is a boolean object // or that the object can be converted to a boolean and return the boolean. |
|
From: John L. <jr...@us...> - 2007-02-15 02:51:38
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv2121/bindings Modified Files: genwxbind.lua Log Message: fix handling "const char*" for the members Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** genwxbind.lua 7 Feb 2007 20:57:49 -0000 1.97 --- genwxbind.lua 15 Feb 2007 02:51:35 -0000 1.98 *************** *** 3154,3157 **** --- 3154,3162 ---- end end + elseif argType == "char" then + overload_argList = overload_argList.."&s_wxluaarg_String, " + argItem = "wxlState.GetStringType("..argNum..")" + + argTypeWithAttrib = "wxCharBuffer" else if isTranslated and (origIndirectionCount == 0) then |
|
From: Francesco M. <fr...@us...> - 2007-02-13 18:43:22
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27490/modules Modified Files: Makefile.in Log Message: rebaked after THREADING option addition Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** Makefile.in 19 Dec 2006 21:12:00 -0000 1.52 --- Makefile.in 13 Feb 2007 18:43:11 -0000 1.53 *************** *** 801,805 **** @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_SHARED_0_USE_SYSTEM_LUA_0@ fi; \ ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_DATA) $(srcdir)/lua/include/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_SYSTEM_LUA_0@ done --- 801,805 ---- @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_SHARED_0_USE_SYSTEM_LUA_0@ fi; \ ! @COND_SHARED_0_USE_SYSTEM_LUA_0@ $(INSTALL_DATA) $(srcdir)//$$f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_0_USE_SYSTEM_LUA_0@ done *************** *** 831,835 **** @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_SHARED_1_USE_SYSTEM_LUA_0@ fi; \ ! @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_DATA) $(srcdir)/lua/include/$$f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_SYSTEM_LUA_0@ done --- 831,835 ---- @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_DIR) $(DESTDIR)$(includedir)/`dirname $$f`; \ @COND_SHARED_1_USE_SYSTEM_LUA_0@ fi; \ ! @COND_SHARED_1_USE_SYSTEM_LUA_0@ $(INSTALL_DATA) $(srcdir)//$$f $(DESTDIR)$(includedir)/$$f; \ @COND_SHARED_1_USE_SYSTEM_LUA_0@ done |
|
From: Francesco M. <fr...@us...> - 2007-02-13 18:43:21
|
Update of /cvsroot/wxlua/wxLua/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27490/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked after THREADING option addition Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.vc,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** makefile.vc 3 Feb 2007 19:47:41 -0000 1.42 --- makefile.vc 13 Feb 2007 18:43:11 -0000 1.43 *************** *** 113,121 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! RUNTIME_LIBS="$(RUNTIME_LIBS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 113,121 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.bcc,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** makefile.bcc 3 Feb 2007 19:12:22 -0000 1.38 --- makefile.bcc 13 Feb 2007 18:43:11 -0000 1.39 *************** *** 108,111 **** --- 108,118 ---- !endif + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + !ifndef THREADING + THREADING = multi + !endif + # Does the wxLua bindings for STC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC *************** *** 168,172 **** -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ -DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \ ! -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ --- 175,180 ---- -DUSE_APPS="$(USE_APPS)" -DUSE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" \ -DLUA_DIR="$(LUA_DIR)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \ ! -DTHREADING="$(THREADING)" -DUSE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! -DUSE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ -DUSE_WXLUASOCKET="$(USE_WXLUASOCKET)" -DUSE_LUAMODULE="$(USE_LUAMODULE)" \ -DUSE_WXLUAAPP="$(USE_WXLUAAPP)" -DUSE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.wat,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** makefile.wat 3 Feb 2007 19:47:41 -0000 1.41 --- makefile.wat 13 Feb 2007 18:43:11 -0000 1.42 *************** *** 165,173 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & ! RUNTIME_LIBS="$(RUNTIME_LIBS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" & ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" & ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" & ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" & ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 165,173 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" & USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" & ! RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" & ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" & ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" & ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" & ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" & USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/msw/makefile.gcc,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** makefile.gcc 3 Feb 2007 19:47:41 -0000 1.40 --- makefile.gcc 13 Feb 2007 18:43:11 -0000 1.41 *************** *** 12,61 **** # C compiler ! CC = gcc # C++ compiler ! CXX = g++ # Standard flags for CC ! CFLAGS = # Standard flags for C++ ! CXXFLAGS = # Standard preprocessor flags (common for CC and CXX) ! CPPFLAGS = # Standard linker flags ! LDFLAGS = # Builds in debug mode [debug,release] ! BUILD = debug # Builds in Unicode mode [0,1] ! UNICODE = 0 # Builds in shared mode [0,1] ! SHARED = 0 # The directory where wxWidgets library is installed ! WX_DIR = $(WXWIN) # Use DLL build of wx library to use? [0,1] ! WX_SHARED = 0 # Version of the wx library to build against. ! WX_VERSION = 28 # Use monolithic build of wxWidgets? [0,1] ! WX_MONOLITHIC = 0 # Should the wxLua applications be compiled ? [0,1] ! USE_APPS = 1 # Should wxLua use the system-wide Lua library ? [0,1] ! USE_SYSTEM_LUA = 0 # The path to the Lua library ! LUA_DIR = ..\..\..\modules\lua # This is an advanced option. Handle with care. --- 12,61 ---- # C compiler ! CC := gcc # C++ compiler ! CXX := g++ # Standard flags for CC ! CFLAGS := # Standard flags for C++ ! CXXFLAGS := # Standard preprocessor flags (common for CC and CXX) ! CPPFLAGS := # Standard linker flags ! LDFLAGS := # Builds in debug mode [debug,release] ! BUILD := debug # Builds in Unicode mode [0,1] ! UNICODE := 0 # Builds in shared mode [0,1] ! SHARED := 0 # The directory where wxWidgets library is installed ! WX_DIR := $(WXWIN) # Use DLL build of wx library to use? [0,1] ! WX_SHARED := 0 # Version of the wx library to build against. ! WX_VERSION := 28 # Use monolithic build of wxWidgets? [0,1] ! WX_MONOLITHIC := 0 # Should the wxLua applications be compiled ? [0,1] ! USE_APPS := 1 # Should wxLua use the system-wide Lua library ? [0,1] ! USE_SYSTEM_LUA := 0 # The path to the Lua library ! LUA_DIR := ..\..\..\modules\lua # This is an advanced option. Handle with care. *************** *** 63,94 **** # static if SHARED=0, but it is highly recommended to not do # it if SHARED=1 unless you know what you are doing. [dynamic,static] ! RUNTIME_LIBS = dynamic # Does the wxLua bindings for STC need to be compiled ? [0,1] ! USE_WXBINDSTC = 1 # Does the wxLua debug support need to be compiled ? [0,1] ! USE_WXLUADEBUG = 1 # Does the wxLua socket support need to be compiled ? [0,1] ! USE_WXLUASOCKET = 1 # Compile the lua module ? [0,1] ! USE_LUAMODULE = 1 # Compile the wxLua app ? [0,1] ! USE_WXLUAAPP = 1 # Compile the wxLuaCan app ? [0,1] ! USE_WXLUACANAPP = 1 # The path to the wxStEdit component (meaningful only when USE_WXLUAEDITAPP==1) ! WXSTEDIT_DIR = $(WXSTEDIT) # Compile the wxLuaEditor app ? [0,1] ! USE_WXLUAEDITAPP = 0 # Compile the wxLuaFreeze app ? [0,1] ! USE_WXLUAFREEZEAPP = 1 --- 63,94 ---- # static if SHARED=0, but it is highly recommended to not do # it if SHARED=1 unless you know what you are doing. [dynamic,static] ! RUNTIME_LIBS := dynamic # Does the wxLua bindings for STC need to be compiled ? [0,1] ! USE_WXBINDSTC := 1 # Does the wxLua debug support need to be compiled ? [0,1] ! USE_WXLUADEBUG := 1 # Does the wxLua socket support need to be compiled ? [0,1] ! USE_WXLUASOCKET := 1 # Compile the lua module ? [0,1] ! USE_LUAMODULE := 1 # Compile the wxLua app ? [0,1] ! USE_WXLUAAPP := 1 # Compile the wxLuaCan app ? [0,1] ! USE_WXLUACANAPP := 1 # The path to the wxStEdit component (meaningful only when USE_WXLUAEDITAPP==1) ! WXSTEDIT_DIR := $(WXSTEDIT) # Compile the wxLuaEditor app ? [0,1] ! USE_WXLUAEDITAPP := 0 # Compile the wxLuaFreeze app ? [0,1] ! USE_WXLUAFREEZEAPP := 1 *************** *** 106,114 **** WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! RUNTIME_LIBS="$(RUNTIME_LIBS)" USE_WXBINDSTC="$(USE_WXBINDSTC)" \ ! USE_WXLUADEBUG="$(USE_WXLUADEBUG)" USE_WXLUASOCKET="$(USE_WXLUASOCKET)" \ ! USE_LUAMODULE="$(USE_LUAMODULE)" USE_WXLUAAPP="$(USE_WXLUAAPP)" \ ! USE_WXLUACANAPP="$(USE_WXLUACANAPP)" WXSTEDIT_DIR="$(WXSTEDIT_DIR)" \ ! USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" --- 106,114 ---- WX_MONOLITHIC="$(WX_MONOLITHIC)" USE_APPS="$(USE_APPS)" \ USE_SYSTEM_LUA="$(USE_SYSTEM_LUA)" LUA_DIR="$(LUA_DIR)" \ ! RUNTIME_LIBS="$(RUNTIME_LIBS)" THREADING="$(THREADING)" \ ! USE_WXBINDSTC="$(USE_WXBINDSTC)" USE_WXLUADEBUG="$(USE_WXLUADEBUG)" \ ! USE_WXLUASOCKET="$(USE_WXLUASOCKET)" USE_LUAMODULE="$(USE_LUAMODULE)" \ ! USE_WXLUAAPP="$(USE_WXLUAAPP)" USE_WXLUACANAPP="$(USE_WXLUACANAPP)" \ ! WXSTEDIT_DIR="$(WXSTEDIT_DIR)" USE_WXLUAEDITAPP="$(USE_WXLUAEDITAPP)" \ USE_WXLUAFREEZEAPP="$(USE_WXLUAFREEZEAPP)" |
|
From: Francesco M. <fr...@us...> - 2007-02-13 18:43:19
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27490/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked after THREADING option addition Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** makefile.vc 3 Feb 2007 19:12:21 -0000 1.59 --- makefile.vc 13 Feb 2007 18:43:09 -0000 1.60 *************** *** 66,69 **** --- 66,74 ---- RUNTIME_LIBS = dynamic + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + THREADING = multi + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 95,103 **** ### Variables: ### ! APP_LUA_CFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_CONSOLE \ --- 100,108 ---- ### Variables: ### ! APP_LUA_CFLAGS = /M$(__RUNTIME_LIBS_15)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_CONSOLE \ *************** *** 105,113 **** APP_LUA_OBJECTS = \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ --- 110,118 ---- APP_LUA_OBJECTS = \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj ! APP_WXLUA_CXXFLAGS = /M$(__RUNTIME_LIBS_33)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ *************** *** 117,125 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ --- 122,130 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_51)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ *************** *** 130,138 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ --- 135,143 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! APP_WXLUACAN_CXXFLAGS = /M$(__RUNTIME_LIBS_69)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS \ *************** *** 145,153 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_13) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_10) \ ! $(____BUILD_11) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ --- 150,158 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_87)$(____BUILD_14) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_11) \ ! $(____BUILD_12) $(______BUILD) \ /Fd..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include /D_WINDOWS /GR /EHsc \ *************** *** 168,171 **** --- 173,182 ---- SHARED_SUFFIX = dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_15 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_15 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 178,181 **** --- 189,198 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_33 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_33 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES_1 = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 188,191 **** --- 205,214 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_51 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_51 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES_2 = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 198,201 **** --- 221,230 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_69 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_69 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES_3 = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 208,211 **** --- 237,246 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_87 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_87 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\vc$(WXLIBPOSTFIX)_lib *************** *** 233,240 **** !endif !if "$(SHARED)" == "0" ! ____SHARED_2 = !endif !if "$(SHARED)" == "1" ! ____SHARED_2 = /d WXUSINGDLL !endif !if "$(BUILD)" == "debug" --- 268,275 ---- !endif !if "$(SHARED)" == "0" ! ____SHARED_3 = !endif !if "$(SHARED)" == "1" ! ____SHARED_3 = /d WXUSINGDLL !endif !if "$(BUILD)" == "debug" *************** *** 245,264 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_10 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_10 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_11 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_11 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_12 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_12 = !endif !if "$(BUILD)" == "debug" --- 280,299 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_11 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_11 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_12 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_12 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_13 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_13 = !endif !if "$(BUILD)" == "debug" *************** *** 275,288 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_13 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_13 = !endif ! !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS = D !endif ! !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS = L !endif !if "$(SHARED)" == "0" --- 310,323 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_14 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_14 = !endif ! !if "$(THREADING)" == "multi" ! __THREADING = T !endif ! !if "$(THREADING)" == "single" ! __THREADING = L !endif !if "$(SHARED)" == "0" *************** *** 434,438 **** ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUA_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib lua5.1.lib << --- 469,473 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:CONSOLE @<< $(APP_LUA_OBJECTS) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib lua5.1.lib << *************** *** 440,444 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 475,479 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUA_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 447,451 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 482,486 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS /LIBPATH:$(WXSTEDIT_DIR)\lib @<< $(APP_WXLUAEDIT_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 454,458 **** !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 489,493 ---- !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUACAN_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 461,465 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_12) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 496,500 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_13) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib /SUBSYSTEM:WINDOWS @<< $(APP_WXLUAFREEZE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << *************** *** 476,480 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp --- 511,515 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res: ..\..\wxlua\src\wxlua.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_3) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxledit.obj: ..\..\wxluaedit\src\wxledit.cpp *************** *** 485,489 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp --- 520,524 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res: ..\..\wxluaedit\src\wxluaedit.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_3) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp *************** *** 503,507 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp --- 538,542 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res: ..\..\wxluacan\src\cansim.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_3) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i ..\..\..\modules\wxbind\setup $** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj: ..\..\wxluafreeze\src\wxluafreeze.cpp *************** *** 509,512 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_2) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** --- 544,547 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res: ..\..\wxluafreeze\src\wxluafreeze.rc ! rc /fo$@ /d WIN32 $(__WXUNICODE_DEFINE_p_10) $(__WXDEBUG_DEFINE_p_10) /d __WXMSW__ /i $(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(____SHARED_3) $(______BUILD_2) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** makefile.bcc 3 Feb 2007 19:12:21 -0000 1.59 --- makefile.bcc 13 Feb 2007 18:43:09 -0000 1.60 *************** *** 98,101 **** --- 98,108 ---- !endif + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + !ifndef THREADING + THREADING = multi + !endif + # Compile the wxLua app ? [0,1] !ifndef USE_WXLUAAPP *************** *** 144,149 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ --- 151,156 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = \ *************** *** 152,157 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj \ --- 159,165 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj \ *************** *** 160,165 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) --- 168,173 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WXSTEDIT_DIR)\include -I$(WX_DIR)\contrib\include $(CPPFLAGS) \ $(CXXFLAGS) *************** *** 170,175 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ --- 178,183 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ *************** *** 182,187 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_7) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj --- 190,196 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_6) \ ! $(__THREADING_3) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = \ bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 286,289 **** --- 295,310 ---- __RUNTIME_LIBS_3 = !endif + !if "$(THREADING)" == "multi" + __THREADING = mt + !endif + !if "$(THREADING)" == "single" + __THREADING = + !endif + !if "$(THREADING)" == "multi" + __THREADING_3 = -tWM + !endif + !if "$(THREADING)" == "single" + __THREADING_3 = + !endif !if "$(SHARED)" == "0" __WXLUA_OUTPUT_FOLDER_FILENAMES = lib\bcc_lib *************** *** 395,402 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_7 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_7 = -v- !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" --- 416,423 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_6 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_6 = -v- !endif !if "$(BUILD)" == "debug" && "$(UNICODE)" == "0" *************** *** 455,466 **** ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, | !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif --- 476,487 ---- ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES)\lua.exe: $(APP_LUA_OBJECTS) ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -ap @&&| ! c0x32.obj $(APP_LUA_OBJECTS),$@,, wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib lua5.1.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, | !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAAPP)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_1)\wxlua.exe: $(APP_WXLUA_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUA_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.res | !endif *************** *** 468,473 **** !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif --- 489,494 ---- !if "$(USE_WXBINDSTC)" == "1" && "$(USE_WXLUAEDITAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_2)\wxluaedit.exe: $(APP_WXLUAEDIT_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa -L$(WXSTEDIT_DIR)\lib @&&| ! c0w32.obj $(APP_WXLUAEDIT_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit_wxluaedit.res | !endif *************** *** 475,480 **** !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif --- 496,501 ---- !if "$(USE_WXLUACANAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_3)\wxluacan.exe: $(APP_WXLUACAN_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUACAN_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_cansim.res | !endif *************** *** 482,487 **** !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_7) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif --- 503,508 ---- !if "$(USE_WXLUAFREEZEAPP)" == "1" ..\..\..\$(__WXLUA_BINOUTPUT_FOLDER_FILENAMES_4)\wxluafreeze.exe: $(APP_WXLUAFREEZE_OBJECTS) bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res ! ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_6) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib -aa @&&| ! c0w32.obj $(APP_WXLUAFREEZE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING)$(__RUNTIME_LIBS_3).lib,, bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.res | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** makefile.wat 3 Feb 2007 19:12:21 -0000 1.60 --- makefile.wat 13 Feb 2007 18:43:09 -0000 1.61 *************** *** 66,69 **** --- 66,74 ---- RUNTIME_LIBS = dynamic + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + THREADING = multi + # Compile the wxLua app ? [0,1] USE_WXLUAAPP = 1 *************** *** 182,191 **** __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\wat$(WXLIBPOSTFIX)_dll !endif ! ____BUILD_7 = !ifeq BUILD debug ! ____BUILD_7 = -wx !endif !ifeq BUILD release ! ____BUILD_7 = !endif ____BUILD = --- 187,196 ---- __WXLUA_BINOUTPUT_FOLDER_FILENAMES_4 = bin\wat$(WXLIBPOSTFIX)_dll !endif ! ____BUILD_8 = !ifeq BUILD debug ! ____BUILD_8 = -wx !endif !ifeq BUILD release ! ____BUILD_8 = !endif ____BUILD = *************** *** 196,212 **** ____BUILD = -ot -ox !endif ! ____BUILD_8 = !ifeq BUILD debug ! ____BUILD_8 = -d2 !endif !ifeq BUILD release ! ____BUILD_8 = -d0 !endif ! ____BUILD_9 = !ifeq BUILD debug ! ____BUILD_9 = debug all !endif !ifeq BUILD release ! ____BUILD_9 = !endif __RUNTIME_LIBS = --- 201,217 ---- ____BUILD = -ot -ox !endif ! ____BUILD_9 = !ifeq BUILD debug ! ____BUILD_9 = -d2 !endif !ifeq BUILD release ! ____BUILD_9 = -d0 !endif ! ____BUILD_10 = !ifeq BUILD debug ! ____BUILD_10 = debug all !endif !ifeq BUILD release ! ____BUILD_10 = !endif __RUNTIME_LIBS = *************** *** 217,220 **** --- 222,232 ---- __RUNTIME_LIBS = !endif + __THREADING = + !ifeq THREADING multi + __THREADING = -bm + !endif + !ifeq THREADING single + __THREADING = + !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = !ifeq SHARED 0 *************** *** 498,511 **** APP_LUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=..\..\..\modules\lua\include $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj & --- 510,524 ---- APP_LUA_CFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=..\..\..\modules\lua\include & ! $(CPPFLAGS) $(CFLAGS) APP_LUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua_lua.obj APP_WXLUA_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua_wxlua.obj & *************** *** 513,519 **** APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & --- 526,532 ---- APP_WXLUAEDIT_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include & -i=$(WX_DIR)\contrib\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAEDIT_OBJECTS = & *************** *** 522,529 **** APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) & ! $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & --- 535,542 ---- APP_WXLUACAN_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=..\..\..\modules\wxbind\setup & ! $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & *************** *** 534,540 **** APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_7) $(____BUILD) & ! $(____BUILD_8) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj --- 547,553 ---- APP_WXLUAFREEZE_CXXFLAGS = $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) & -d__WXMSW__ -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD_8) $(____BUILD) & ! $(____BUILD_9) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUAFREEZE_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze_wxluafreeze.obj *************** *** 566,570 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt ref 'main_' @for %i in ($(APP_LUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc file %i @for %i in ( wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc library %i --- 579,583 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt ref 'main_' @for %i in ($(APP_LUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc file %i @for %i in ( wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib lua5.1.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_lua.lbc library %i *************** *** 581,585 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc library %i --- 594,598 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUA_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxlua.lbc library %i *************** *** 598,602 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc library %i --- 611,615 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' libpath $(WXSTEDIT_DIR)\lib @for %i in ($(APP_WXLUAEDIT_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stedit.lib wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluaedit.lbc library %i *************** *** 613,617 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc library %i --- 626,630 ---- @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_10) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUACAN_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluacan.lbc library %i *************** *** 627,631 **** @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc name $^@ @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc option caseexact ! @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc $(LDFLAGS) libpath $(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_9) libpath ..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) libpath $(LUA_DIR)\lib system nt_win ref '_WinMain@16' @for %i in ($(APP_WXLUAFREEZE_OBJECTS)) do @%append watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\app_wxluafreeze.lbc file %i @for %i in ( wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPART... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2007-02-13 18:43:19
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27490/build/bakefiles Modified Files: options.bkl wxluabase.bkl Log Message: rebaked after THREADING option addition Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** options.bkl 9 Feb 2007 17:34:21 -0000 1.6 --- options.bkl 13 Feb 2007 18:43:11 -0000 1.7 *************** *** 69,76 **** </description> </option> - <option - - - Enable threading in compiled code. </if> </if> --- 69,72 ---- Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxluabase.bkl 9 Feb 2007 17:34:21 -0000 1.34 --- wxluabase.bkl 13 Feb 2007 18:43:11 -0000 1.35 *************** *** 237,241 **** <if cond="FORMAT!='autoconf' and TARGETING_IDE=='0'"> <runtime-libs>$(RUNTIME_LIBS)</runtime-libs> ! <threading>$(USE_THREADS)</threading> </if> --- 237,241 ---- <if cond="FORMAT!='autoconf' and TARGETING_IDE=='0'"> <runtime-libs>$(RUNTIME_LIBS)</runtime-libs> ! <threading>$(THREADING)</threading> </if> |
|
From: Francesco M. <fr...@us...> - 2007-02-13 18:43:17
|
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27490/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: rebaked after THREADING option addition Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.vc,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** makefile.vc 3 Feb 2007 19:12:22 -0000 1.60 --- makefile.vc 13 Feb 2007 18:43:12 -0000 1.61 *************** *** 69,72 **** --- 69,77 ---- RUNTIME_LIBS = dynamic + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + THREADING = multi + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 151,160 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 156,165 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_loadlib.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\lua_dll_linit.obj ! WXLUA_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_23)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 167,176 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 172,181 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_dummy.obj ! WXLUA_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_41)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 183,192 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 188,197 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj ! WXBIND_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_58)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 226,235 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 231,240 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_lib_help.obj ! WXBIND_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_76)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 269,278 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 274,283 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_thread.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_help.obj ! WXBINDSTC_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_93)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 284,293 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 289,298 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_lib_dummy.obj ! WXBINDSTC_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_111)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 300,309 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 305,314 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj ! WXLUADEBUG_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_128)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 316,325 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 321,330 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_lib_staktree.obj ! WXLUADEBUG_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_146)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 333,342 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 338,347 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_staktree.obj ! WXLUASOCKET_LIB_CXXFLAGS = /M$(__RUNTIME_LIBS_163)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 352,361 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ --- 357,366 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj ! WXLUASOCKET_DLL_CXXFLAGS = /M$(__RUNTIME_LIBS_181)$(____BUILD_1_18) /DWIN32 \ /I..\..\..\modules\wxbind\setup $(__WXUNICODE_DEFINE_p) \ $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) \ /Fd..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ *************** *** 372,380 **** vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = /M$(__RUNTIME_LIBS)$(____BUILD_1_16) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_13) \ ! $(____BUILD_1_14) $(______BUILD) /Fd..\..\..\lib\vc_dll\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) --- 377,385 ---- vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj ! MOD_LUAMODULE_CXXFLAGS = /M$(__RUNTIME_LIBS_199)$(____BUILD_1_18) /DWIN32 \ $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) /D__WXMSW__ \ /I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! /I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_15) \ ! $(____BUILD_1_16) $(______BUILD) /Fd..\..\..\lib\vc_dll\wx.pdb \ /I..\..\..\modules /I.\..\..\.. /I$(LUA_DIR)\include \ /DWXMAKINGDLL_LUAMODULE /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) *************** *** 403,445 **** --- 408,516 ---- ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_23 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_23 = $(__THREADING) + !endif !if "$(SHARED)" == "1" __wxlua_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_41 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_41 = $(__THREADING) + !endif !if "$(SHARED)" == "0" __wxbind_lib___depname = \ ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_58 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_58 = $(__THREADING) + !endif !if "$(SHARED)" == "1" __wxbind_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_76 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_76 = $(__THREADING) + !endif !if "$(SHARED)" == "0" && "$(USE_WXBINDSTC)" == "1" __wxbindstc_lib___depname = \ ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_93 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_93 = $(__THREADING) + !endif !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" __wxbindstc_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_111 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_111 = $(__THREADING) + !endif !if "$(SHARED)" == "0" && "$(USE_WXLUADEBUG)" == "1" __wxluadebug_lib___depname = \ ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_128 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_128 = $(__THREADING) + !endif !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" __wxluadebug_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_146 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_146 = $(__THREADING) + !endif !if "$(SHARED)" == "0" && "$(USE_WXLUASOCKET)" == "1" __wxluasocket_lib___depname = \ ..\..\..\lib\vc_lib\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_163 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_163 = $(__THREADING) + !endif !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" __wxluasocket_dll___depname = \ ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_181 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_181 = $(__THREADING) + !endif !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" __mod_luamodule___depname = ..\..\..\lib\vc_dll\wx.dll !endif + !if "$(RUNTIME_LIBS)" == "dynamic" + __RUNTIME_LIBS_199 = D + !endif + !if "$(RUNTIME_LIBS)" == "static" + __RUNTIME_LIBS_199 = $(__THREADING) + !endif !if "$(BUILD)" == "debug" && "$(WX_MONOLITHIC)" == "0" && "$(UNICODE)" == "0" __WXLIB_MEDIA_NAME_p = wxmsw$(WX_VERSION)d_media.lib *************** *** 482,501 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_13 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_1_13 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_14 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_1_14 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_15 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_1_15 = !endif !if "$(BUILD)" == "debug" --- 553,572 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_15 = /Od !endif !if "$(BUILD)" == "release" ! ____BUILD_1_15 = /O2 !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_16 = /Zi !endif !if "$(BUILD)" == "release" ! ____BUILD_1_16 = !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_17 = /DEBUG !endif !if "$(BUILD)" == "release" ! ____BUILD_1_17 = !endif !if "$(BUILD)" == "debug" *************** *** 506,519 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_16 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_1_16 = !endif ! !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS = D !endif ! !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS = L !endif !if "$(SHARED)" == "0" --- 577,590 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_18 = d !endif !if "$(BUILD)" == "release" ! ____BUILD_1_18 = !endif ! !if "$(THREADING)" == "multi" ! __THREADING = T !endif ! !if "$(THREADING)" == "single" ! __THREADING = L !endif !if "$(SHARED)" == "0" *************** *** 698,702 **** !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUA_DLL_OBJECTS) lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib << --- 769,773 ---- !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUA_DLL_OBJECTS) lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib << *************** *** 713,717 **** !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBIND_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib << --- 784,788 ---- !if "$(SHARED)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBIND_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib << *************** *** 728,732 **** !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << --- 799,803 ---- !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXBINDSTC_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.lib << *************** *** 743,747 **** !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUADEBUG_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib << --- 814,818 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUADEBUG_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib << *************** *** 758,762 **** !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUASOCKET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << --- 829,833 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: vcmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(WXLUASOCKET_DLL_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib /IMPLIB:..\..\..\lib\vc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib << *************** *** 765,769 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\vc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_15) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << --- 836,840 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\vc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! link /DLL /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_17) /LIBPATH:..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) /LIBPATH:$(LUA_DIR)\lib @<< $(MOD_LUAMODULE_OBJECTS) wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib oleacc.lib << Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** makefile.bcc 3 Feb 2007 19:12:22 -0000 1.61 --- makefile.bcc 13 Feb 2007 18:43:11 -0000 1.62 *************** *** 103,106 **** --- 103,113 ---- !endif + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + !ifndef THREADING + THREADING = multi + !endif + # Does the wxLua bindings for STC need to be compiled ? [0,1] !ifndef USE_WXBINDSTC *************** *** 197,202 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxlua_lib.csm -Hu \ --- 204,209 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxlua_lib.csm -Hu \ *************** *** 211,216 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxlua_dll.csm -Hu \ --- 218,223 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUA \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxlua_dll.csm -Hu \ *************** *** 225,230 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbind_lib.csm -Hu \ --- 232,237 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbind_lib.csm -Hu \ *************** *** 266,271 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbind_dll.csm -Hu \ --- 273,278 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBIND \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbind_dll.csm -Hu \ *************** *** 307,312 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbindstc_lib.csm -Hu \ --- 314,319 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbindstc_lib.csm -Hu \ *************** *** 320,325 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm -Hu \ --- 327,332 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXBINDSTC \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxbindstc_dll.csm -Hu \ *************** *** 333,338 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluadebug_lib.csm -Hu \ --- 340,345 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluadebug_lib.csm -Hu \ *************** *** 347,352 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm -Hu \ --- 354,359 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUADEBUG \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluadebug_dll.csm -Hu \ *************** *** 361,366 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluasocket_lib.csm -Hu \ --- 368,373 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluasocket_lib.csm -Hu \ *************** *** 378,383 **** $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm -Hu \ --- 385,390 ---- $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -I$(WX_DIR)\contrib\include -DWXMAKINGDLL_WXLUASOCKET \ -H=bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxprec_wxluasocket_dll.csm -Hu \ *************** *** 394,399 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_3) \ ! -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ --- 401,406 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ -I$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) \ ! -I$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) \ ! $(__THREADING) -I..\..\..\modules -I.\..\..\.. -I$(LUA_DIR)\include \ -DWXMAKINGDLL_LUAMODULE $(CPPFLAGS) $(CXXFLAGS) MOD_LUAMODULE_OBJECTS = \ *************** *** 506,513 **** !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_4 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_4 = !endif !if "$(SHARED)" == "0" --- 513,532 ---- !endif !if "$(RUNTIME_LIBS)" == "dynamic" ! __RUNTIME_LIBS_1 = i !endif !if "$(RUNTIME_LIBS)" == "static" ! __RUNTIME_LIBS_1 = ! !endif ! !if "$(THREADING)" == "multi" ! __THREADING_1 = mt ! !endif ! !if "$(THREADING)" == "single" ! __THREADING_1 = ! !endif ! !if "$(THREADING)" == "multi" ! __THREADING = -tWM ! !endif ! !if "$(THREADING)" == "single" ! __THREADING = !endif !if "$(SHARED)" == "0" *************** *** 620,627 **** !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_3 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_1_3 = -v- !endif --- 639,646 ---- !endif !if "$(BUILD)" == "debug" ! ____BUILD_1_4 = -v !endif !if "$(BUILD)" == "release" ! ____BUILD_1_4 = -v- !endif *************** *** 720,725 **** !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ --- 739,744 ---- !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_dummy.obj $(WXLUA_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUA_DLL_OBJECTS),$@,, lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua $@ *************** *** 736,741 **** !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ --- 755,760 ---- !if "$(SHARED)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbind_dll_dummy.obj $(WXBIND_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBIND_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind $@ *************** *** 752,757 **** !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ --- 771,776 ---- !if "$(SHARED)" == "1" && "$(USE_WXBINDSTC)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxbindstc_dll_dummy.obj $(WXBINDSTC_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXBINDSTC_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxmsw$(WX_VERSION)$(WXLIBPOSTFIX)_stc.lib wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbindstc $@ *************** *** 768,773 **** !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ --- 787,792 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUADEBUG)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluadebug_dll_dummy.obj $(WXLUADEBUG_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUADEBUG_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug $@ *************** *** 784,789 **** !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ --- 803,808 ---- !if "$(SHARED)" == "1" && "$(USE_WXLUASOCKET)" == "1" ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.dll: bccmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxluasocket_dll_dummy.obj $(WXLUASOCKET_DLL_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(WXLUASOCKET_DLL_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib lua5.1.lib $(__WXLIB_BASE_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_MEDIA_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_XRC_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_1)$(__RUNTIME_LIBS_1).lib,, | implib -f ..\..\..\lib\bcc_dll\wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket $@ *************** *** 792,797 **** !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\bcc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_3) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__RUNTIME_LIBS_4).lib,, | !endif --- 811,816 ---- !if "$(SHARED)" == "1" && "$(USE_LUAMODULE)" == "1" ..\..\..\lib\bcc_dll\wx.dll: $(MOD_LUAMODULE_OBJECTS) ! ilink32 -Tpd -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk -L$(WX_DIR)$(__WXLIBPATH_FILENAMES) $(____BUILD_1_4) -L..\..\..\$(__WXLUA_OUTPUT_FOLDER_FILENAMES) -L$(LUA_DIR)\lib @&&| ! c0d32.obj $(MOD_LUAMODULE_OBJECTS),$@,, wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxlua.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxbind.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluasocket.lib wxlua_msw$(WX_VERSION)$(WXLIBPOSTFIX)_wxluadebug.lib lua5.1.lib $(__WXLIB_XRC_NAME_p) $(__WXLIB_HTML_NAME_p) $(__WXLIB_ADV_NAME_p) $(__WXLIB_NET_NAME_p) $(__WXLIB_XML_NAME_p) $(__WXLIB_CORE_NAME_p) $(__WXLIB_BASE_NAME_p) wxtiff$(WX3RDPARTYLIBPOSTFIX).lib wxjpeg$(WX3RDPARTYLIBPOSTFIX).lib wxpng$(WX3RDPARTYLIBPOSTFIX).lib wxzlib$(WX3RDPARTYLIBPOSTFIX).lib wxregex$(WXLIBPOSTFIX).lib wxexpat$(WX3RDPARTYLIBPOSTFIX).lib ole2w32.lib odbc32.lib oleacc.lib import32.lib cw32$(__THREADING_1)$(__RUNTIME_LIBS_1).lib,, | !endif Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** makefile.wat 3 Feb 2007 19:12:22 -0000 1.60 --- makefile.wat 13 Feb 2007 18:43:12 -0000 1.61 *************** *** 69,72 **** --- 69,77 ---- RUNTIME_LIBS = dynamic + # This is an advanced option. Handle with care. + # The thread model to use: use 'multi' default to allow + # multi-threading. [multi,single] + THREADING = multi + # Does the wxLua bindings for STC need to be compiled ? [0,1] USE_WXBINDSTC = 1 *************** *** 262,285 **** ____BUILD = !endif ! ____BUILD_1_0 = !ifeq BUILD debug ! ____BUILD_1_0 = -od !endif !ifeq BUILD release ! ____BUILD_1_0 = -ot -ox !endif ! ____BUILD_21 = !ifeq BUILD debug ! ____BUILD_21 = -d2 !endif !ifeq BUILD release ! ____BUILD_21 = -d0 !endif ! ____BUILD_1_1 = !ifeq BUILD debug ! ____BUILD_1_1 = debug all !endif !ifeq BUILD release ! ____BUILD_1_1 = !endif __RUNTIME_LIBS = --- 267,290 ---- ____BUILD = !endif ! ____BUILD_1_4 = !ifeq BUILD debug ! ____BUILD_1_4 = -od !endif !ifeq BUILD release ! ____BUILD_1_4 = -ot -ox !endif ! ____BUILD_1_5 = !ifeq BUILD debug ! ____BUILD_1_5 = -d2 !endif !ifeq BUILD release ! ____BUILD_1_5 = -d0 !endif ! ____BUILD_1_6 = !ifeq BUILD debug ! ____BUILD_1_6 = debug all !endif !ifeq BUILD release ! ____BUILD_1_6 = !endif __RUNTIME_LIBS = *************** *** 290,293 **** --- 295,305 ---- __RUNTIME_LIBS = !endif + __THREADING = + !ifeq THREADING multi + __THREADING = -bm + !endif + !ifeq THREADING single + __THREADING = + !endif __WXLUA_OUTPUT_FOLDER_FILENAMES = !ifeq SHARED 0 *************** *** 603,610 **** $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_0) & ! $(____BUILD_21) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include /fh $(CPPFLAGS) & ! $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & --- 615,622 ---- $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) & ! $(____BUILD_1_5) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include /fh & ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & *************** *** 615,622 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_0) & ! $(____BUILD_21) $(__RUNTIME_LIBS) -i=..\..\..\modules -i=.\..\..\.. & ! -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include -dWXMAKINGDLL_WXLUA /fh & ! $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj & --- 627,634 ---- $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_4) & ! $(____BUILD_1_5) $(__RUNTIME_LIBS) $(__THREADING) -i=..\..\..\modules & ! -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WX_DIR)\contrib\include & ! -dWXMAKINGDLL_WXLUA /fh $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & watmsw_$(WXLIBPOSTFIX)$(SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj & *************** *** 627,634 **** $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & -i=$(WX_DIR)$(__WXLIBPATH_FILENAMES)\msw$(WXLIBPOSTFIX) & ! -i=$(WX_DIR)\include $(____SHARED) $(____BUILD) $(____BUILD_1_0) & ! $(____BUILD_21) $(__RUN... [truncated message content] |
|
From: Francesco M. <fr...@us...> - 2007-02-09 17:34:28
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18667/docs Modified Files: changelog.txt Log Message: added the THREADING option to fix the problem occurring when using RUNTIME_LIBS=static as reported by Ryan Pusztai Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** changelog.txt 24 Dec 2006 09:56:23 -0000 1.22 --- changelog.txt 9 Feb 2007 17:34:21 -0000 1.23 *************** *** 1,6 **** ! wxLua ChangeLog =============== version 2.8.0.0 (released 24/12/2006) -------------------------------------------------------------------- --- 1,13 ---- !  wxLua ChangeLog =============== + version 2.8.0.1 + -------------------------------------------------------------------- + + - added RUNTIME_LIBS and THREADING options to the build system to allow + to statically compile against the C runtime (only for some win compilers) + + version 2.8.0.0 (released 24/12/2006) -------------------------------------------------------------------- |
|
From: Francesco M. <fr...@us...> - 2007-02-09 17:34:28
|
Update of /cvsroot/wxlua/wxLua/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18667/build/bakefiles Modified Files: options.bkl wxluabase.bkl Log Message: added the THREADING option to fix the problem occurring when using RUNTIME_LIBS=static as reported by Ryan Pusztai Index: options.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/options.bkl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** options.bkl 3 Feb 2007 19:12:22 -0000 1.5 --- options.bkl 9 Feb 2007 17:34:21 -0000 1.6 *************** *** 48,51 **** --- 48,52 ---- </option> + <!-- Some advanced options: --> <if cond="FORMAT!='autoconf'"> <option name="RUNTIME_LIBS"> *************** *** 59,62 **** --- 60,76 ---- </description> </option> + <option name="THREADING"> + <values>multi,single</values> + <default-value>multi</default-value> + <description> + This is an advanced option. Handle with care. + The thread model to use: use 'multi' default to allow + multi-threading. + </description> + </option> + <option + + + Enable threading in compiled code. </if> </if> Index: wxluabase.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/build/bakefiles/wxluabase.bkl,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxluabase.bkl 3 Feb 2007 19:12:22 -0000 1.33 --- wxluabase.bkl 9 Feb 2007 17:34:21 -0000 1.34 *************** *** 237,240 **** --- 237,241 ---- <if cond="FORMAT!='autoconf' and TARGETING_IDE=='0'"> <runtime-libs>$(RUNTIME_LIBS)</runtime-libs> + <threading>$(USE_THREADS)</threading> </if> |
