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-05-31 17:19:19
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan.i wxluacan_bind.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** wxluacan.cpp 19 Mar 2007 03:47:17 -0000 1.25 --- wxluacan.cpp 31 May 2007 17:18:45 -0000 1.26 *************** *** 28,31 **** --- 28,34 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, 0 }; + static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }}; + // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L) *************** *** 42,45 **** --- 45,51 ---- } + static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None }}; + // double GetX() static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L) *************** *** 57,60 **** --- 63,69 ---- } + static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None }}; + // double GetY() static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L) *************** *** 75,78 **** --- 84,90 ---- #if wxLUA_USE_wxColourPenBrush static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxBrush, 0 }; + static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }}; + // void SetBrush( const wxBrush& brush ) static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L) *************** *** 90,93 **** --- 102,108 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxPen, 0 }; + static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen }}; + // void SetPen( const wxPen& pen ) static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L) *************** *** 107,110 **** --- 122,128 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluaarg_Boolean, 0 }; + static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, 0, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPending }}; + // void SetPending( bool pending = true ) static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L) *************** *** 114,118 **** int argCount = lua_gettop(L); // bool pending = true ! bool pending = (argCount >= 2 ? wxlState.GetBooleanType(2) : true); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); --- 132,136 ---- int argCount = lua_gettop(L); // bool pending = true ! bool pending = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); *************** *** 124,127 **** --- 142,148 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }}; + // void SetPos( double x, double y ) static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L) *************** *** 129,135 **** wxLuaState wxlState(L); // double y ! double y = (double)wxlState.GetNumberType(3); // double x ! double x = (double)wxlState.GetNumberType(2); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); --- 150,156 ---- wxLuaState wxlState(L); // double y ! double y = (double)wxlua_getnumbertype(L, 3); // double x ! double x = (double)wxlua_getnumbertype(L, 2); // get this wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj); *************** *** 141,147 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObj *returns; --- 162,172 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, 0, 2, s_wxluatagArray_wxLua_wxlCanObj_constructor }}; ! ! // wxlCanObj( double x = 0, double y = 0 ) static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObj *returns; *************** *** 149,155 **** int argCount = lua_gettop(L); // double y = 0 ! double y = (argCount >= 2 ? (double)wxlState.GetNumberType(2) : 0); // double x = 0 ! double x = (argCount >= 1 ? (double)wxlState.GetNumberType(1) : 0); // call constructor returns = new wxlCanObj(x, y); --- 174,180 ---- int argCount = lua_gettop(L); // double y = 0 ! double y = (argCount >= 2 ? (double)wxlua_getnumbertype(L, 2) : 0); // double x = 0 ! double x = (argCount >= 1 ? (double)wxlua_getnumbertype(L, 1) : 0); // call constructor returns = new wxlCanObj(x, y); *************** *** 164,184 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObj_methods[] = { ! { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }, ! { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxColourPenBrush ! { LuaMethod, "SetBrush", wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }, ! { LuaMethod, "SetPen", wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen }, #endif // wxLUA_USE_wxColourPenBrush ! { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending }, ! { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }, ! { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCanObjRect --- 189,216 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObj_methods[] = { ! { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCanObj_AddObject, 1 }, ! { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxlCanObj_GetX, 1 }, ! { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxlCanObj_GetY, 1 }, #if wxLUA_USE_wxColourPenBrush ! { WXLUAMETHOD_METHOD, "SetBrush", s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1 }, ! { WXLUAMETHOD_METHOD, "SetPen", s_wxluafunc_wxLua_wxlCanObj_SetPen, 1 }, #endif // wxLUA_USE_wxColourPenBrush ! { WXLUAMETHOD_METHOD, "SetPending", s_wxluafunc_wxLua_wxlCanObj_SetPending, 1 }, ! { WXLUAMETHOD_METHOD, "SetPos", s_wxluafunc_wxLua_wxlCanObj_SetPos, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObj", s_wxluafunc_wxLua_wxlCanObj_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]) - 1; + + WXLUADEFINE wxlCanObj_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObj_enumCount = sizeof(wxlCanObj_enums)/sizeof(wxlCanObj_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCanObjRect *************** *** 189,205 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjRect *returns; // double h ! double h = (double)wxlState.GetNumberType(4); // double w ! double w = (double)wxlState.GetNumberType(3); // double y ! double y = (double)wxlState.GetNumberType(2); // double x ! double x = (double)wxlState.GetNumberType(1); // call constructor returns = new wxlCanObjRect(x, y, w, h); --- 221,241 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }}; ! ! // wxlCanObjRect( double x, double y, double w, double h ) static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjRect *returns; // double h ! double h = (double)wxlua_getnumbertype(L, 4); // double w ! double w = (double)wxlua_getnumbertype(L, 3); // double y ! double y = (double)wxlua_getnumbertype(L, 2); // double x ! double x = (double)wxlua_getnumbertype(L, 1); // call constructor returns = new wxlCanObjRect(x, y, w, h); *************** *** 214,223 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjRect_methods[] = { ! { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCanObjCircle --- 250,266 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjRect_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjRect", s_wxluafunc_wxLua_wxlCanObjRect_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]) - 1; + + WXLUADEFINE wxlCanObjRect_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObjRect_enumCount = sizeof(wxlCanObjRect_enums)/sizeof(wxlCanObjRect_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCanObjCircle *************** *** 228,242 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjCircle *returns; // double r ! double r = (double)wxlState.GetNumberType(3); // double y ! double y = (double)wxlState.GetNumberType(2); // double x ! double x = (double)wxlState.GetNumberType(1); // call constructor returns = new wxlCanObjCircle(x, y, r); --- 271,289 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }}; ! ! // wxlCanObjCircle( double x, double y, double r ) static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjCircle *returns; // double r ! double r = (double)wxlua_getnumbertype(L, 3); // double y ! double y = (double)wxlua_getnumbertype(L, 2); // double x ! double x = (double)wxlua_getnumbertype(L, 1); // call constructor returns = new wxlCanObjCircle(x, y, r); *************** *** 251,260 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjCircle_methods[] = { ! { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCanObjScript --- 298,314 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjCircle_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjCircle", s_wxluafunc_wxLua_wxlCanObjCircle_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]) - 1; + + WXLUADEFINE wxlCanObjCircle_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObjCircle_enumCount = sizeof(wxlCanObjCircle_enums)/sizeof(wxlCanObjCircle_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCanObjScript *************** *** 265,271 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjScript *returns; --- 319,329 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }}; ! ! // wxlCanObjScript( double x, double y, const wxString& name ) static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjScript *returns; *************** *** 273,279 **** const wxString name = wxlState.GetwxStringType(3); // double y ! double y = (double)wxlState.GetNumberType(2); // double x ! double x = (double)wxlState.GetNumberType(1); // call constructor returns = new wxlCanObjScript(x, y, name); --- 331,337 ---- const wxString name = wxlState.GetwxStringType(3); // double y ! double y = (double)wxlua_getnumbertype(L, 2); // double x ! double x = (double)wxlua_getnumbertype(L, 1); // call constructor returns = new wxlCanObjScript(x, y, name); *************** *** 288,297 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjScript_methods[] = { ! { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCanObjAddScript --- 346,362 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjScript_methods[] = { ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjScript", s_wxluafunc_wxLua_wxlCanObjScript_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]) - 1; + + WXLUADEFINE wxlCanObjScript_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObjScript_enumCount = sizeof(wxlCanObjScript_enums)/sizeof(wxlCanObjScript_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCanObjAddScript *************** *** 302,305 **** --- 367,373 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluaarg_String, 0 }; + static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }}; + // void SetScript( const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L) *************** *** 317,323 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCanObjAddScript *returns; --- 385,395 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; ! static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }}; ! ! // wxlCanObjAddScript( double x, double y, const wxString& script ) static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCanObjAddScript *returns; *************** *** 325,331 **** const wxString script = wxlState.GetwxStringType(3); // double y ! double y = (double)wxlState.GetNumberType(2); // double x ! double x = (double)wxlState.GetNumberType(1); // call constructor returns = new wxlCanObjAddScript(x, y, script); --- 397,403 ---- const wxString script = wxlState.GetwxStringType(3); // double y ! double y = (double)wxlua_getnumbertype(L, 2); // double x ! double x = (double)wxlua_getnumbertype(L, 1); // call constructor returns = new wxlCanObjAddScript(x, y, script); *************** *** 340,350 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjAddScript_methods[] = { ! { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }, ! { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlCan --- 412,429 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCanObjAddScript_methods[] = { ! { WXLUAMETHOD_METHOD, "SetScript", s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjAddScript", s_wxluafunc_wxLua_wxlCanObjAddScript_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]) - 1; + + WXLUADEFINE wxlCanObjAddScript_enums[] = { + { NULL, 0, }, + }; + + int wxlCanObjAddScript_enumCount = sizeof(wxlCanObjAddScript_enums)/sizeof(wxlCanObjAddScript_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlCan *************** *** 355,358 **** --- 434,440 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_AddObject[] = { &s_wxluatag_wxlCanObj, 0 }; + static int LUACALL wxLua_wxlCan_AddObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }}; + // void AddObject( wxlCanObj *canobj ) static int LUACALL wxLua_wxlCan_AddObject(lua_State *L) *************** *** 369,372 **** --- 451,457 ---- } + static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None }}; + // wxlLuaCanCmd* GetCmdh() static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L) *************** *** 384,387 **** --- 469,475 ---- } + static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None }}; + // bool GetYaxis() static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L) *************** *** 402,408 **** #if wxLUA_USE_wxPointSizeRect static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, 0 }; ! // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) { wxLuaState wxlState(L); wxlCan *returns; --- 490,500 ---- #if wxLUA_USE_wxPointSizeRect static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, 0 }; ! static int LUACALL wxLua_wxlCan_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, 1, 4, s_wxluatagArray_wxLua_wxlCan_constructor }}; ! ! // wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) static int LUACALL wxLua_wxlCan_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlCan *returns; *************** *** 414,418 **** const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlState.GetNumberType(2) : -1); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); --- 506,510 ---- const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxlState.GetUserDataType(3, s_wxluatag_wxPoint) : &wxDefaultPosition); // wxWindowID id = -1 ! wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1); // wxWindow parent wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); *************** *** 431,447 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCan_methods[] = { ! { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }, ! { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None }, #if wxLUA_USE_wxPointSizeRect ! { LuaConstructor, "wxlCan", wxLua_wxlCan_constructor, 4, 1, s_wxluatagArray_wxLua_wxlCan_constructor }, #endif // wxLUA_USE_wxPointSizeRect ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxlLuaCanCmd --- 523,546 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlCan_methods[] = { ! { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCan_AddObject, 1 }, ! { WXLUAMETHOD_METHOD, "GetCmdh", s_wxluafunc_wxLua_wxlCan_GetCmdh, 1 }, ! { WXLUAMETHOD_METHOD, "GetYaxis", s_wxluafunc_wxLua_wxlCan_GetYaxis, 1 }, #if wxLUA_USE_wxPointSizeRect ! { WXLUAMETHOD_CONSTRUCTOR, "wxlCan", s_wxluafunc_wxLua_wxlCan_constructor, 1 }, #endif // wxLUA_USE_wxPointSizeRect ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]) - 1; + + WXLUADEFINE wxlCan_enums[] = { + { NULL, 0, }, + }; + + int wxlCan_enumCount = sizeof(wxlCan_enums)/sizeof(wxlCan_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxlLuaCanCmd *************** *** 452,455 **** --- 551,557 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }}; + // void MoveObject( int index, double x, double y ) static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L) *************** *** 457,465 **** wxLuaState wxlState(L); // double y ! double y = (double)wxlState.GetNumberType(4); // double x ! double x = (double)wxlState.GetNumberType(3); // int index ! int index = (int)wxlState.GetNumberType(2); // get this wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.GetUserDataType(1, s_wxluatag_wxlLuaCanCmd); --- 559,567 ---- wxLuaState wxlState(L); // double y ! double y = (double)wxlua_getnumbertype(L, 4); // double x ! double x = (double)wxlua_getnumbertype(L, 3); // int index ! int index = (int)wxlua_getnumbertype(L, 2); // get this wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.GetUserDataType(1, s_wxluatag_wxlLuaCanCmd); *************** *** 471,477 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 }; ! // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) { wxLuaState wxlState(L); wxlLuaCanCmd *returns; --- 573,583 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 }; ! static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L); ! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }}; ! ! // wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxlLuaCanCmd *returns; *************** *** 479,483 **** int argCount = lua_gettop(L); // int maxCommands = -1 ! int maxCommands = (argCount >= 2 ? (int)wxlState.GetNumberType(2) : -1); // wxlCan canvas wxlCan * canvas = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan); --- 585,589 ---- int argCount = lua_gettop(L); // int maxCommands = -1 ! int maxCommands = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1); // wxlCan canvas wxlCan * canvas = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan); *************** *** 494,502 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlLuaCanCmd_methods[] = { ! { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }, ! { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]) - 1; --- 600,615 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxlLuaCanCmd_methods[] = { ! { WXLUAMETHOD_METHOD, "MoveObject", s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxlLuaCanCmd", s_wxluafunc_wxLua_wxlLuaCanCmd_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]) - 1; + + WXLUADEFINE wxlLuaCanCmd_enums[] = { + { NULL, 0, }, + }; + + int wxlLuaCanCmd_enumCount = sizeof(wxlLuaCanCmd_enums)/sizeof(wxlLuaCanCmd_enums[0]) - 1; + Index: wxluacan.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.i,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluacan.i 28 Aug 2006 05:26:19 -0000 1.9 --- wxluacan.i 31 May 2007 17:18:45 -0000 1.10 *************** *** 6,10 **** %class %noclassinfo wxlCanObj, wxObject ! wxlCanObj( double x = 0, double y = 0 ) void SetPos( double x, double y ) double GetX() --- 6,10 ---- %class %noclassinfo wxlCanObj, wxObject ! wxlCanObj( double x = 0, double y = 0 ) void SetPos( double x, double y ) double GetX() *************** *** 17,38 **** %class %noclassinfo wxlCanObjRect, wxlCanObj ! wxlCanObjRect( double x, double y, double w, double h ) %endclass %class %noclassinfo wxlCanObjCircle, wxlCanObj ! wxlCanObjCircle( double x, double y, double r ) %endclass %class %noclassinfo wxlCanObjScript, wxlCanObj ! wxlCanObjScript( double x, double y, const wxString& name ) %endclass %class %noclassinfo wxlCanObjAddScript, wxlCanObj ! wxlCanObjAddScript( double x, double y, const wxString& script ) void SetScript( const wxString& script ) %endclass %class %noclassinfo wxlCan, wxScrolledWindow ! wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) void AddObject( wxlCanObj *canobj ) bool GetYaxis() --- 17,38 ---- %class %noclassinfo wxlCanObjRect, wxlCanObj ! wxlCanObjRect( double x, double y, double w, double h ) %endclass %class %noclassinfo wxlCanObjCircle, wxlCanObj ! wxlCanObjCircle( double x, double y, double r ) %endclass %class %noclassinfo wxlCanObjScript, wxlCanObj ! wxlCanObjScript( double x, double y, const wxString& name ) %endclass %class %noclassinfo wxlCanObjAddScript, wxlCanObj ! wxlCanObjAddScript( double x, double y, const wxString& script ) void SetScript( const wxString& script ) %endclass %class %noclassinfo wxlCan, wxScrolledWindow ! wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize ) void AddObject( wxlCanObj *canobj ) bool GetYaxis() *************** *** 45,49 **** %class %noclassinfo wxlLuaCanCmd, wxCommandProcessor ! wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) void MoveObject( int index, double x, double y ) %endclass --- 45,49 ---- %class %noclassinfo wxlLuaCanCmd, wxCommandProcessor ! wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 ) void MoveObject( int index, double x, double y ) %endclass Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxluacan_bind.cpp 19 Mar 2007 03:47:17 -0000 1.17 --- wxluacan_bind.cpp 31 May 2007 17:18:45 -0000 1.18 *************** *** 98,101 **** --- 98,103 ---- } + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, 0, 0, s_wxluaargArray_None }}; + // %function wxlLuaCanCmd* GetCmdhMain() static int LUACALL wxLua_function_GetCmdhMain(lua_State *L) *************** *** 111,114 **** --- 113,118 ---- } + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, 0, 0, s_wxluaargArray_None }}; + // --------------------------------------------------------------------------- // wxLuaGetFunctionList_wxluacan() is called to register global functions *************** *** 119,126 **** static WXLUAMETHOD functionList[] = { ! { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, s_wxluaargArray_None }, ! { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, s_wxluaargArray_None }, ! { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; --- 123,130 ---- static WXLUAMETHOD functionList[] = { ! { WXLUAMETHOD_CFUNCTION, "GetCan", s_wxluafunc_wxLua_function_GetCan, 1 }, ! { WXLUAMETHOD_CFUNCTION, "GetCmdhMain", s_wxluafunc_wxLua_function_GetCmdhMain, 1 }, ! { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; *************** *** 138,148 **** static WXLUACLASS classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL }, { 0, 0, 0, 0, 0, 0, 0 }, --- 142,152 ---- static WXLUACLASS classList[] = { ! { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,wxlCan_enums, wxlCan_enumCount, }, ! { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL ,wxlCanObj_enums, wxlCanObj_enumCount, }, ! { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL ,wxlCanObjAddScript_enums, wxlCanObjAddScript_enumCount, }, ! { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL ,wxlCanObjCircle_enums, wxlCanObjCircle_enumCount, }, ! { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL ,wxlCanObjRect_enums, wxlCanObjRect_enumCount, }, ! { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL ,wxlCanObjScript_enums, wxlCanObjScript_enumCount, }, ! { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL ,wxlLuaCanCmd_enums, wxlLuaCanCmd_enumCount, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxluacan.h 15 Mar 2007 23:24:49 -0000 1.22 --- wxluacan.h 31 May 2007 17:18:45 -0000 1.23 *************** *** 18,24 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 6 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 6 // --------------------------------------------------------------------------- --- 18,24 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 7 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 7 // --------------------------------------------------------------------------- *************** *** 60,81 **** --- 60,95 ---- extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCan_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObj_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjAddScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjAddScript_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjCircle_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjRect_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjRect_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjScript_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_enumCount; extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd; extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[]; extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount; + extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlLuaCanCmd_enums[]; + extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_enumCount; |
From: John L. <jr...@us...> - 2007-05-31 17:19:18
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/bindings Modified Files: genwxbind.lua Added Files: Makefile Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt --- NEW FILE: Makefile --- # Make all the bindings in linux using the other Makefiles # Note: run $make -B since for some reason make thinks wxwidgets, wxstc, # wxluasocket are all up to date. WXLUA_DIR = ../ LUA = $(WXLUA_DIR)/bin/lua all: wxwidgets wxstc wxluasocket wxluacan wxwidgets: @echo Building wxWidgets @($(LUA) -e"rulesFilename=\"wxwidgets/wx_rules.lua\"" genwxbind.lua > wxwidgets/error.txt) # @(cd $(WXLUA_DIR)/bindings/wxwidgets && make -B) wxstc: @echo Building wxStc @($(LUA) -e"rulesFilename=\"wxstc/wxstc_rules.lua\"" genwxbind.lua > wxstc/error.txt) wxluasocket: @echo Building wxLuaSocket @($(LUA) -e"rulesFilename=\"wxluasocket/wxluasocket_rules.lua\"" genwxbind.lua > wxluasocket/error.txt) wxluacan: @echo "Building wxLuaCan (ps. did you forget to run make -B)" @(cd $(WXLUA_DIR)/apps/wxluacan/src && make genwxbind) # do nothing to clean clean: Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** genwxbind.lua 19 Mar 2007 03:47:17 -0000 1.110 --- genwxbind.lua 31 May 2007 17:18:45 -0000 1.111 *************** *** 18,22 **** -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 6 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h --- 18,22 ---- -- --------------------------------------------------------------------------- ! WXLUA_BINDING_VERSION = 7 -- Used to verify that the bindings are updated -- This must match modules/wxlua/include/wxldefs.h [...1363 lines suppressed...] + + cfuncTable[s] = n + elseif string.find(fileData[n], "s_wxluafunc", 1, 1) then + for k, v in pairs(cfuncTable) do + if string.find(fileData[n], k..",", 1, 1) or string.find(fileData[n], k.." ", 1, 1) then + cfuncTable[k] = -1 -- found + end + end + end + end + + for k, v in pairs(cfuncTable) do + if v > 0 then + fileData[v] = "// "..fileData[v] + end + end + end + function SerializeDataTypes(filename) local fileData = {} |
From: John L. <jr...@us...> - 2007-05-31 17:19:18
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/apps/wxluaedit/src Modified Files: wxluaedit.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxluaedit.cpp 24 May 2007 00:59:44 -0000 1.31 --- wxluaedit.cpp 31 May 2007 17:18:45 -0000 1.32 *************** *** 517,521 **** wxString script; ! script += wxT("local msg = \"Welcome to wxLuaEditor using \"..wx.WXLUA_VERSION_STRING..\"\\n\""); script += wxT("msg = msg..\"and compiled with \"..wx.wxVERSION_STRING..\"\\n\""); script += wxT("msg = msg..\"Written by John Labenski\\n\\n\""); --- 517,521 ---- wxString script; ! script += wxT("local msg = \"Welcome to wxLuaEditor using \"..wx.wxLUA_VERSION_STRING..\"\\n\""); script += wxT("msg = msg..\"and compiled with \"..wx.wxVERSION_STRING..\"\\n\""); script += wxT("msg = msg..\"Written by John Labenski\\n\\n\""); |
From: John L. <jr...@us...> - 2007-05-31 17:19:18
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/apps/wxlua/src Modified Files: editor.h wxlua.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxlua.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** wxlua.cpp 27 Feb 2007 20:52:36 -0000 1.45 --- wxlua.cpp 31 May 2007 17:18:45 -0000 1.46 *************** *** 156,160 **** wxT("Note: specify the parameters in the order shown and -d, -o, -r are exclusive.\n") wxT("To stop this program from processing command line args use '--'.\n"), ! WXLUA_VERSION_STRING)); switch ( parser.Parse() ) --- 156,160 ---- wxT("Note: specify the parameters in the order shown and -d, -o, -r are exclusive.\n") wxT("To stop this program from processing command line args use '--'.\n"), ! wxLUA_VERSION_STRING)); switch ( parser.Parse() ) Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** editor.h 21 May 2007 01:07:58 -0000 1.35 --- editor.h 31 May 2007 17:18:45 -0000 1.36 *************** *** 10,15 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 90786; ! const unsigned char wxLuaEditor[90787] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, --- 10,15 ---- extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 90579; ! const unsigned char wxLuaEditor[90580] = { 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10, 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10, *************** *** 114,119 **** 10, 45, 45, 32, 65, 83, 67, 73, 73, 32,118, 97,108,117,101,115, 32,102,111,114, 32, 99,111,109,109,111,110, 32, 99,104, 97,114,115, 10, ! 108,111, 99, 97,108, 32, 99,104, 97,114, 95, 67, 82, 32, 32, 61, 32,115,116,114,105,110,103, 46, 98,121,116,101, 40, 34, 92,110, 34, 41, 10, ! 108,111, 99, 97,108, 32, 99,104, 97,114, 95, 76, 70, 32, 32, 61, 32,115,116,114,105,110,103, 46, 98,121,116,101, 40, 34, 92,114, 34, 41, 10, 108,111, 99, 97,108, 32, 99,104, 97,114, 95, 84, 97, 98, 32, 61, 32,115,116,114,105,110,103, 46, 98,121,116,101, 40, 34, 92,116, 34, 41, 10, 108,111, 99, 97,108, 32, 99,104, 97,114, 95, 83,112, 32, 32, 61, 32,115,116,114,105,110,103, 46, 98,121,116,101, 40, 34, 32, 34, 41, 10, --- 114,119 ---- 10, 45, 45, 32, 65, 83, 67, 73, 73, 32,118, 97,108,117,101,115, 32,102,111,114, 32, 99,111,109,109,111,110, 32, 99,104, 97,114,115, 10, ! 108,111, 99, 97,108, 32, 99,104, 97,114, 95, 67, 82, 32, 32, 61, 32,115,116,114,105,110,103, 46, 98,121,116,101, 40, 34, 92,114, 34, 41, 10, ! 108,111, 99, 97,108, 32, 99,104, 97,114, 95, 76, 70, 32, 32, 61, 32,115,116,114,105,110,103, 46, 98,121,116,101, 40, 34, 92,110, 34, 41, 10, 108,111, 99, 97,108, 32, 99,104, 97,114, 95, 84, 97, 98, 32, 61, 32,115,116,114,105,110,103, 46, 98,121,116,101, 40, 34, 92,116, 34, 41, 10, 108,111, 99, 97,108, 32, 99,104, 97,114, 95, 83,112, 32, 32, 61, 32,115,116,114,105,110,103, 46, 98,121,116,101, 40, 34, 32, 34, 41, 10, *************** *** 190,200 **** 101,100,105,116,111,114, 65,112,112, 58, 83,101,116, 65,112,112, 78, 97,109,101, 40, 34,119,120, 76,117, 97, 32, 73, 68, 69, 34, 41, 10, 10, ! 99,111,110,102,105,103, 32, 61, 32,119,120, 46,119,120, 67,111,110,102,105,103, 71,101,116, 40, 41, 10, ! 99,111,110,102,105,103, 58, 83,101,116, 82,101, 99,111,114,100, 68,101,102, 97,117,108,116,115, 40, 41, 10, 10, 45, 45, 32, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 10, 45, 45, 32, 67,114,101, 97,116,101, 32,116,104,101, 32,119,120, 70,114, 97,109,101, 10, 45, 45, 32, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 10, ! 102,114, 97,109,101, 32, 61, 32,119,120, 46,119,120, 70,114, 97,109,101, 40,119,120, 46,119,120, 78,117,108,108, 44, 32,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32, 34,119,120, 76,117, 97, 34, 41, 10, 10, 115,116, 97,116,117,115, 66, 97,114, 32, 61, 32,102,114, 97,109,101, 58, 67,114,101, 97,116,101, 83,116, 97,116,117,115, 66, 97,114, 40, 32, 52, 32, 41, 10, --- 190,202 ---- 101,100,105,116,111,114, 65,112,112, 58, 83,101,116, 65,112,112, 78, 97,109,101, 40, 34,119,120, 76,117, 97, 32, 73, 68, 69, 34, 41, 10, 10, ! 99,111,110,102,105,103, 32, 61, 32,119,120, 46,119,120, 67,111,110,102,105,103, 66, 97,115,101, 46, 71,101,116, 40, 41, 10, ! 105,102, 32, 99,111,110,102,105,103, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 99,111,110,102,105,103, 58, 83,101,116, 82,101, 99,111,114,100, 68,101,102, 97,117,108,116,115, 40, 41, 10, ! 101,110,100, 10, 10, 45, 45, 32, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 10, 45, 45, 32, 67,114,101, 97,116,101, 32,116,104,101, 32,119,120, 70,114, 97,109,101, 10, 45, 45, 32, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 10, ! 102,114, 97,109,101, 32, 61, 32,119,120, 46,119,120, 70,114, 97,109,101, 40,119,120, 46, 78, 85, 76, 76, 44, 32,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32, 34,119,120, 76,117, 97, 34, 41, 10, 10, 115,116, 97,116,117,115, 66, 97,114, 32, 61, 32,102,114, 97,109,101, 58, 67,114,101, 97,116,101, 83,116, 97,116,117,115, 66, 97,114, 40, 32, 52, 32, 41, 10, *************** *** 206,223 **** 45, 45, 32,110,111,116,101, 58, 32, 85,115,117,115, 97,108,108,121, 32,116,104,101, 32, 98,109,112, 32,115,105,122,101, 32,105,115,110, 39,116, 32,110,101, 99,101,115,115, 97,114,121, 44, 32, 98,117,116, 32,116,104,101, 32, 72, 69, 76, 80, 32,105, 99,111,110, 32,105,115, 32,110,111,116, 32,116,104,101, 32,114,105,103,104,116, 32,115,105,122,101, 32,105,110, 32, 77, 83, 87, 10, 108,111, 99, 97,108, 32,116,111,111,108, 66,109,112, 83,105,122,101, 32, 61, 32,116,111,111,108, 66, 97,114, 58, 71,101,116, 84,111,111,108, 66,105,116,109, 97,112, 83,105,122,101, 40, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 78, 69, 87, 44, 32, 32, 32, 32, 32, 34, 78,101,119, 34, 44, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 78, 79, 82, 77, 65, 76, 95, 70, 73, 76, 69, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 67,114,101, 97,116,101, 32, 97,110, 32,101,109,112,116,121, 32,100,111, 99,117,109,101,110,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 79, 80, 69, 78, 44, 32, 32, 32, 32, 34, 79,112,101,110, 34, 44, 32, 32, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 70, 73, 76, 69, 95, 79, 80, 69, 78, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 32, 34, 79,112,101,110, 32, 97,110, 32,101,120,105,115,116,105,110,103, 32,100,111, 99,117,109,101,110,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 83, 65, 86, 69, 44, 32, 32, 32, 32, 34, 83, 97,118,101, 34, 44, 32, 32, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 70, 73, 76, 69, 95, 83, 65, 86, 69, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 32, 34, 83, 97,118,101, 32,116,104,101, 32, 99,117,114,114,101,110,116, 32,100,111, 99,117,109,101,110,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 83, 65, 86, 69, 65, 76, 76, 44, 32, 34, 83, 97,118,101, 32, 65,108,108, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 78, 69, 87, 95, 68, 73, 82, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 32, 32, 32, 34, 83, 97,118,101, 32, 97,108,108, 32,100,111, 99,117,109,101,110,116,115, 34, 41, 10, 116,111,111,108, 66, 97,114, 58, 65,100,100, 83,101,112, 97,114, 97,116,111,114, 40, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 67, 85, 84, 44, 32, 32, 32, 34, 67,117,116, 34, 44, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 67, 85, 84, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 32, 34, 67,117,116, 32,116,104,101, 32,115,101,108,101, 99,116,105,111,110, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 67, 79, 80, 89, 44, 32, 32, 34, 67,111,112,121, 34, 44, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 67, 79, 80, 89, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 34, 67,111,112,121, 32,116,104,101, 32,115,101,108,101, 99,116,105,111,110, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 80, 65, 83, 84, 69, 44, 32, 34, 80, 97,115,116,101, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 80, 65, 83, 84, 69, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 80, 97,115,116,101, 32,116,101,120,116, 32,102,114,111,109, 32,116,104,101, 32, 99,108,105,112, 98,111, 97,114,100, 34, 41, 10, 116,111,111,108, 66, 97,114, 58, 65,100,100, 83,101,112, 97,114, 97,116,111,114, 40, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 85, 78, 68, 79, 44, 32, 34, 85,110,100,111, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 85, 78, 68, 79, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 85,110,100,111, 32,108, 97,115,116, 32,101,100,105,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 82, 69, 68, 79, 44, 32, 34, 82,101,100,111, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 82, 69, 68, 79, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 82,101,100,111, 32,108, 97,115,116, 32,117,110,100,111, 34, 41, 10, 116,111,111,108, 66, 97,114, 58, 65,100,100, 83,101,112, 97,114, 97,116,111,114, 40, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 70, 73, 78, 68, 44, 32, 32, 32, 32, 34, 70,105,110,100, 34, 44, 32, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 70, 73, 78, 68, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 70,105,110,100, 32,116,101,120,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 83,105,109,112,108,101, 40, 73, 68, 95, 82, 69, 80, 76, 65, 67, 69, 44, 32, 34, 82,101,112,108, 97, 99,101, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 95, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 70, 73, 78, 68, 95, 65, 78, 68, 95, 82, 69, 80, 76, 65, 67, 69, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 70,105,110,100, 32, 97,110,100, 32,114,101,112,108, 97, 99,101, 32,116,101,120,116, 34, 41, 10, 116,111,111,108, 66, 97,114, 58, 82,101, 97,108,105,122,101, 40, 41, 10, 10, --- 208,225 ---- 45, 45, 32,110,111,116,101, 58, 32, 85,115,117,115, 97,108,108,121, 32,116,104,101, 32, 98,109,112, 32,115,105,122,101, 32,105,115,110, 39,116, 32,110,101, 99,101,115,115, 97,114,121, 44, 32, 98,117,116, 32,116,104,101, 32, 72, 69, 76, 80, 32,105, 99,111,110, 32,105,115, 32,110,111,116, 32,116,104,101, 32,114,105,103,104,116, 32,115,105,122,101, 32,105,110, 32, 77, 83, 87, 10, 108,111, 99, 97,108, 32,116,111,111,108, 66,109,112, 83,105,122,101, 32, 61, 32,116,111,111,108, 66, 97,114, 58, 71,101,116, 84,111,111,108, 66,105,116,109, 97,112, 83,105,122,101, 40, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 78, 69, 87, 44, 32, 32, 32, 32, 32, 34, 78,101,119, 34, 44, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 78, 79, 82, 77, 65, 76, 95, 70, 73, 76, 69, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 67,114,101, 97,116,101, 32, 97,110, 32,101,109,112,116,121, 32,100,111, 99,117,109,101,110,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 79, 80, 69, 78, 44, 32, 32, 32, 32, 34, 79,112,101,110, 34, 44, 32, 32, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 70, 73, 76, 69, 95, 79, 80, 69, 78, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 32, 34, 79,112,101,110, 32, 97,110, 32,101,120,105,115,116,105,110,103, 32,100,111, 99,117,109,101,110,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 83, 65, 86, 69, 44, 32, 32, 32, 32, 34, 83, 97,118,101, 34, 44, 32, 32, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 70, 73, 76, 69, 95, 83, 65, 86, 69, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 32, 34, 83, 97,118,101, 32,116,104,101, 32, 99,117,114,114,101,110,116, 32,100,111, 99,117,109,101,110,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 83, 65, 86, 69, 65, 76, 76, 44, 32, 34, 83, 97,118,101, 32, 65,108,108, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 78, 69, 87, 95, 68, 73, 82, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 32, 32, 32, 34, 83, 97,118,101, 32, 97,108,108, 32,100,111, 99,117,109,101,110,116,115, 34, 41, 10, 116,111,111,108, 66, 97,114, 58, 65,100,100, 83,101,112, 97,114, 97,116,111,114, 40, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 67, 85, 84, 44, 32, 32, 32, 34, 67,117,116, 34, 44, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 67, 85, 84, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 32, 34, 67,117,116, 32,116,104,101, 32,115,101,108,101, 99,116,105,111,110, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 67, 79, 80, 89, 44, 32, 32, 34, 67,111,112,121, 34, 44, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 67, 79, 80, 89, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 32, 34, 67,111,112,121, 32,116,104,101, 32,115,101,108,101, 99,116,105,111,110, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 80, 65, 83, 84, 69, 44, 32, 34, 80, 97,115,116,101, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 80, 65, 83, 84, 69, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 80, 97,115,116,101, 32,116,101,120,116, 32,102,114,111,109, 32,116,104,101, 32, 99,108,105,112, 98,111, 97,114,100, 34, 41, 10, 116,111,111,108, 66, 97,114, 58, 65,100,100, 83,101,112, 97,114, 97,116,111,114, 40, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 85, 78, 68, 79, 44, 32, 34, 85,110,100,111, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 85, 78, 68, 79, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 85,110,100,111, 32,108, 97,115,116, 32,101,100,105,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 82, 69, 68, 79, 44, 32, 34, 82,101,100,111, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 82, 69, 68, 79, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 82,101,100,111, 32,108, 97,115,116, 32,117,110,100,111, 34, 41, 10, 116,111,111,108, 66, 97,114, 58, 65,100,100, 83,101,112, 97,114, 97,116,111,114, 40, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 70, 73, 78, 68, 44, 32, 32, 32, 32, 34, 70,105,110,100, 34, 44, 32, 32, 32, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 70, 73, 78, 68, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 70,105,110,100, 32,116,101,120,116, 34, 41, 10, ! 116,111,111,108, 66, 97,114, 58, 65,100,100, 84,111,111,108, 40, 73, 68, 95, 82, 69, 80, 76, 65, 67, 69, 44, 32, 34, 82,101,112,108, 97, 99,101, 34, 44, 32,119,120, 46,119,120, 65,114,116, 80,114,111,118,105,100,101,114, 46, 71,101,116, 66,105,116,109, 97,112, 40,119,120, 46,119,120, 65, 82, 84, 95, 70, 73, 78, 68, 95, 65, 78, 68, 95, 82, 69, 80, 76, 65, 67, 69, 44, 32,119,120, 46,119,120, 65, 82, 84, 95, 77, 69, 78, 85, 44, 32,116,111,111,108, 66,109,112, 83,105,122,101, 41, 44, 32, 34, 70,105,110,100, 32, 97,110,100, 32,114,101,112,108, 97, 99,101, 32,116,101,120,116, 34, 41, 10, 116,111,111,108, 66, 97,114, 58, 82,101, 97,108,105,122,101, 40, 41, 10, 10, *************** *** 274,278 **** 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,104, 32, 62, 32, 99,108,105,101,110,116, 72,101,105,103,104,116, 32,116,104,101,110, 32,104, 32, 61, 32, 99,108,105,101,110,116, 72,101,105,103,104,116, 32,101,110,100, 10, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,119,105,110,100,111,119, 58, 83,101,116, 83,105,122,101, 88, 89, 87, 72, 40,120, 44, 32,121, 44, 32,119, 44, 32,104, 41, 10, 32, 32, 32, 32,101,108,115,101,105,102, 32,115, 32, 61, 61, 32, 49, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32,119,105,110,100,111,119, 58, 77, 97,120,105,109,105,122,101, 40,116,114,117,101, 41, 10, --- 276,280 ---- 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,104, 32, 62, 32, 99,108,105,101,110,116, 72,101,105,103,104,116, 32,116,104,101,110, 32,104, 32, 61, 32, 99,108,105,101,110,116, 72,101,105,103,104,116, 32,101,110,100, 10, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,119,105,110,100,111,119, 58, 83,101,116, 83,105,122,101, 40,120, 44, 32,121, 44, 32,119, 44, 32,104, 41, 10, 32, 32, 32, 32,101,108,115,101,105,102, 32,115, 32, 61, 61, 32, 49, 32,116,104,101,110, 10, 32, 32, 32, 32, 32, 32, 32, 32,119,105,110,100,111,119, 58, 77, 97,120,105,109,105,122,101, 40,116,114,117,101, 41, 10, *************** *** 287,292 **** 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,115, 32, 32, 32, 32, 61, 32, 48, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,119, 44, 32,104, 32, 61, 32,119,105,110,100,111,119, 58, 71,101,116, 83,105,122,101, 40, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,120, 44, 32,121, 32, 61, 32,119,105,110,100,111,119, 58, 71,101,116, 80,111,115,105,116,105,111,110, 40, 41, 10, 10, 32, 32, 32, 32,105,102, 32,119,105,110,100,111,119, 58, 73,115, 77, 97,120,105,109,105,122,101,100, 40, 41, 32,116,104,101,110, 10, --- 289,294 ---- 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,115, 32, 32, 32, 32, 61, 32, 48, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,119, 44, 32,104, 32, 61, 32,119,105,110,100,111,119, 58, 71,101,116, 83,105,122,101, 87, 72, 40, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,120, 44, 32,121, 32, 61, 32,119,105,110,100,111,119, 58, 71,101,116, 80,111,115,105,116,105,111,110, 88, 89, 40, 41, 10, 10, 32, 32, 32, 32,105,102, 32,119,105,110,100,111,119, 58, 73,115, 77, 97,120,105,109,105,122,101,100, 40, 41, 32,116,104,101,110, 10, *************** *** 723,727 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 68,101,102, 97,117,108,116, 80,111,115,105,116,105,111,110, 44, 32,119,120, 46,119,120, 83,105,122,101, 40,119,105,100,116,104, 44, 32, 49, 54, 48, 41, 41, 10, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,119, 97,116, 99,104, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 67,114,101, 97,116,101, 77,101,110,117,123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 65, 68, 68, 87, 65, 84, 67, 72, 44, 32, 32, 32, 32, 32, 32, 34, 38, 65,100,100, 32, 87, 97,116, 99,104, 34, 32, 32, 32, 32, 32, 32, 32, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 69, 68, 73, 84, 87, 65, 84, 67, 72, 44, 32, 32, 32, 32, 32, 34, 38, 69,100,105,116, 32, 87, 97,116, 99,104, 92,116, 70, 50, 34, 32, 32, 32,125, 44, 10, --- 725,729 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 68,101,102, 97,117,108,116, 80,111,115,105,116,105,111,110, 44, 32,119,120, 46,119,120, 83,105,122,101, 40,119,105,100,116,104, 44, 32, 49, 54, 48, 41, 41, 10, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,119, 97,116, 99,104, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 77,101,110,117,123, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 65, 68, 68, 87, 65, 84, 67, 72, 44, 32, 32, 32, 32, 32, 32, 34, 38, 65,100,100, 32, 87, 97,116, 99,104, 34, 32, 32, 32, 32, 32, 32, 32, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 69, 68, 73, 84, 87, 65, 84, 67, 72, 44, 32, 32, 32, 32, 32, 34, 38, 69,100,105,116, 32, 87, 97,116, 99,104, 92,116, 70, 50, 34, 32, 32, 32,125, 44, 10, *************** *** 834,838 **** 10, 109,101,110,117, 66, 97,114, 32, 61, 32,119,120, 46,119,120, 77,101,110,117, 66, 97,114, 40, 41, 10, ! 102,105,108,101, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 67,114,101, 97,116,101, 77,101,110,117,123, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 78, 69, 87, 44, 32, 32, 32, 32, 32, 34, 38, 78,101,119, 92,116, 67,116,114,108, 45, 78, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 34, 67,114,101, 97,116,101, 32, 97,110, 32,101,109,112,116,121, 32,100,111, 99,117,109,101,110,116, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 79, 80, 69, 78, 44, 32, 32, 32, 32, 34, 38, 79,112,101,110, 46, 46, 46, 92,116, 67,116,114,108, 45, 79, 34, 44, 32, 32, 32, 32, 34, 79,112,101,110, 32, 97,110, 32,101,120,105,115,116,105,110,103, 32,100,111, 99,117,109,101,110,116, 34, 32,125, 44, 10, --- 836,840 ---- 10, 109,101,110,117, 66, 97,114, 32, 61, 32,119,120, 46,119,120, 77,101,110,117, 66, 97,114, 40, 41, 10, ! 102,105,108,101, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 77,101,110,117, 40,123, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 78, 69, 87, 44, 32, 32, 32, 32, 32, 34, 38, 78,101,119, 92,116, 67,116,114,108, 45, 78, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 34, 67,114,101, 97,116,101, 32, 97,110, 32,101,109,112,116,121, 32,100,111, 99,117,109,101,110,116, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 79, 80, 69, 78, 44, 32, 32, 32, 32, 34, 38, 79,112,101,110, 46, 46, 46, 92,116, 67,116,114,108, 45, 79, 34, 44, 32, 32, 32, 32, 34, 79,112,101,110, 32, 97,110, 32,101,120,105,115,116,105,110,103, 32,100,111, 99,117,109,101,110,116, 34, 32,125, 44, 10, *************** *** 843,847 **** 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 83, 65, 86, 69, 65, 76, 76, 44, 32, 34, 83, 97,118,101, 32, 65, 38,108,108, 46, 46, 46, 92,116, 67,116,114,108, 45, 83,104,105,102,116, 45, 83, 34, 44, 32, 34, 83, 97,118,101, 32, 97,108,108, 32,111,112,101,110, 32,100,111, 99,117,109,101,110,116,115, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32,125, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 69, 88, 73, 84, 44, 32, 32, 32, 32, 34, 69, 38,120,105,116, 92,116, 65,108,116, 45, 88, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 34, 69,120,105,116, 32, 80,114,111,103,114, 97,109, 34, 32,125,125, 10, 109,101,110,117, 66, 97,114, 58, 65,112,112,101,110,100, 40,102,105,108,101, 77,101,110,117, 44, 32, 34, 38, 70,105,108,101, 34, 41, 10, 10, --- 845,849 ---- 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 83, 65, 86, 69, 65, 76, 76, 44, 32, 34, 83, 97,118,101, 32, 65, 38,108,108, 46, 46, 46, 92,116, 67,116,114,108, 45, 83,104,105,102,116, 45, 83, 34, 44, 32, 34, 83, 97,118,101, 32, 97,108,108, 32,111,112,101,110, 32,100,111, 99,117,109,101,110,116,115, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32,125, 44, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 69, 88, 73, 84, 44, 32, 32, 32, 32, 34, 69, 38,120,105,116, 92,116, 65,108,116, 45, 88, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 34, 69,120,105,116, 32, 80,114,111,103,114, 97,109, 34, 32,125,125, 41, 10, 109,101,110,117, 66, 97,114, 58, 65,112,112,101,110,100, 40,102,105,108,101, 77,101,110,117, 44, 32, 34, 38, 70,105,108,101, 34, 41, 10, 10, *************** *** 1130,1134 **** 45, 45, 32, 67,114,101, 97,116,101, 32,116,104,101, 32, 69,100,105,116, 32,109,101,110,117, 32, 97,110,100, 32, 97,116,116, 97, 99,104, 32,116,104,101, 32, 99, 97,108,108, 98, 97, 99,107, 32,102,117,110, 99,116,105,111,110,115, 10, 10, ! 101,100,105,116, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 67,114,101, 97,116,101, 77,101,110,117,123, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 67, 85, 84, 44, 32, 32, 32, 32, 32, 32, 32, 34, 67,117, 38,116, 92,116, 67,116,114,108, 45, 88, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 34, 67,117,116, 32,115,101,108,101, 99,116,101,100, 32,116,101,120,116, 32,116,111, 32, 99,108,105,112, 98,111, 97,114,100, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 67, 79, 80, 89, 44, 32, 32, 32, 32, 32, 32, 34, 38, 67,111,112,121, 92,116, 67,116,114,108, 45, 67, 34, 44, 32, 32, 32, 32, 32, 32, 32, 34, 67,111,112,121, 32,115,101,108,101, 99,116,101,100, 32,116,101,120,116, 32,116,111, 32,116,104,101, 32, 99,108,105,112, 98,111, 97,114,100, 34, 32,125, 44, 10, --- 1132,1136 ---- 45, 45, 32, 67,114,101, 97,116,101, 32,116,104,101, 32, 69,100,105,116, 32,109,101,110,117, 32, 97,110,100, 32, 97,116,116, 97, 99,104, 32,116,104,101, 32, 99, 97,108,108, 98, 97, 99,107, 32,102,117,110, 99,116,105,111,110,115, 10, 10, ! 101,100,105,116, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 77,101,110,117,123, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 67, 85, 84, 44, 32, 32, 32, 32, 32, 32, 32, 34, 67,117, 38,116, 92,116, 67,116,114,108, 45, 88, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 34, 67,117,116, 32,115,101,108,101, 99,116,101,100, 32,116,101,120,116, 32,116,111, 32, 99,108,105,112, 98,111, 97,114,100, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 67, 79, 80, 89, 44, 32, 32, 32, 32, 32, 32, 34, 38, 67,111,112,121, 92,116, 67,116,114,108, 45, 67, 34, 44, 32, 32, 32, 32, 32, 32, 32, 34, 67,111,112,121, 32,115,101,108,101, 99,116,101,100, 32,116,101,120,116, 32,116,111, 32,116,104,101, 32, 99,108,105,112, 98,111, 97,114,100, 34, 32,125, 44, 10, *************** *** 1302,1306 **** 45, 45, 32, 67,114,101, 97,116,101, 32,116,104,101, 32, 83,101, 97,114, 99,104, 32,109,101,110,117, 32, 97,110,100, 32, 97,116,116, 97, 99,104, 32,116,104,101, 32, 99, 97,108,108, 98, 97, 99,107, 32,102,117,110, 99,116,105,111,110,115, 10, 10, ! 102,105,110,100, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 67,114,101, 97,116,101, 77,101,110,117,123, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 70, 73, 78, 68, 44, 32, 32, 32, 32, 32, 32, 32, 34, 38, 70,105,110,100, 92,116, 67,116,114,108, 45, 70, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 34, 70,105,110,100, 32,116,104,101, 32,115,112,101, 99,105,102,105,101,100, 32,116,101,120,116, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 70, 73, 78, 68, 78, 69, 88, 84, 44, 32, 32, 32, 34, 70,105,110,100, 32, 38, 78,101,120,116, 92,116, 70, 51, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 34, 70,105,110,100, 32,116,104,101, 32,110,101,120,116, 32,111, 99, 99,117,114,114,101,110, 99,101, 32,111,102, 32,116,104,101, 32,115,112,101, 99,105,102,105,101,100, 32,116,101,120,116, 34, 32,125, 44, 10, --- 1304,1308 ---- 45, 45, 32, 67,114,101, 97,116,101, 32,116,104,101, 32, 83,101, 97,114, 99,104, 32,109,101,110,117, 32, 97,110,100, 32, 97,116,116, 97, 99,104, 32,116,104,101, 32, 99, 97,108,108, 98, 97, 99,107, 32,102,117,110, 99,116,105,111,110,115, 10, 10, ! 102,105,110,100, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 77,101,110,117,123, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 70, 73, 78, 68, 44, 32, 32, 32, 32, 32, 32, 32, 34, 38, 70,105,110,100, 92,116, 67,116,114,108, 45, 70, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 34, 70,105,110,100, 32,116,104,101, 32,115,112,101, 99,105,102,105,101,100, 32,116,101,120,116, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 70, 73, 78, 68, 78, 69, 88, 84, 44, 32, 32, 32, 34, 70,105,110,100, 32, 38, 78,101,120,116, 92,116, 70, 51, 34, 44, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 34, 70,105,110,100, 32,116,104,101, 32,110,101,120,116, 32,111, 99, 99,117,114,114,101,110, 99,101, 32,111,102, 32,116,104,101, 32,115,112,101, 99,105,102,105,101,100, 32,116,101,120,116, 34, 32,125, 44, 10, *************** *** 1447,1456 **** 10, 32, 32, 32, 32,108,111, 99, 97,108, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 41, 10, ! 32, 32, 32, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,102,105,110,100, 66,117,116,116,111,110, 44, 32, 32, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,114,101,112,108, 97, 99,101, 66,117,116,116,111,110, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, 32, 32, 32, 32,105,102, 32,114,101,112,108, 97, 99,101, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,114,101,112,108, 97, 99,101, 65,108,108, 66,117,116,116,111,110, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40, 99, 97,110, 99,101,108, 66,117,116,116,111,110, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 32, 51, 41, 10, 10, 32, 32, 32, 32, 45, 45, 32, 67,114,101, 97,116,101, 32,102,105,110,100, 47,114,101,112,108, 97, 99,101, 32,116,101,120,116, 32,101,110,116,114,121, 32,115,105,122,101,114, 10, --- 1449,1458 ---- 10, 32, 32, 32, 32,108,111, 99, 97,108, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 41, 10, ! 32, 32, 32, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 58, 65,100,100, 40,102,105,110,100, 66,117,116,116,111,110, 44, 32, 32, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 58, 65,100,100, 40,114,101,112,108, 97, 99,101, 66,117,116,116,111,110, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, 32, 32, 32, 32,105,102, 32,114,101,112,108, 97, 99,101, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 58, 65,100,100, 40,114,101,112,108, 97, 99,101, 65,108,108, 66,117,116,116,111,110, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, 32, 32, 32, 32,101,110,100, 10, ! 32, 32, 32, 32, 98,117,116,116,111,110,115, 83,105,122,101,114, 58, 65,100,100, 40, 99, 97,110, 99,101,108, 66,117,116,116,111,110, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 32, 51, 41, 10, 10, 32, 32, 32, 32, 45, 45, 32, 67,114,101, 97,116,101, 32,102,105,110,100, 47,114,101,112,108, 97, 99,101, 32,116,101,120,116, 32,101,110,116,114,121, 32,115,105,122,101,114, 10, *************** *** 1467,1476 **** 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 70,108,101,120, 71,114,105,100, 83,105,122,101,114, 40, 50, 44, 32, 50, 44, 32, 48, 44, 32, 48, 41, 10, 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 71,114,111,119, 97, 98,108,101, 67,111,108, 40, 49, 41, 10, ! 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,102,105,110,100, 83,116, 97,116, 84,101,120,116, 44, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 65, 76, 73, 71, 78, 95, 76, 69, 70, 84, 44, 32, 48, 41, 10, ! 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,102,105,110,100, 84,101,120,116, 67,111,109, 98,111, 44, 32, 49, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 48, 41, 10, 10, 32, 32, 32, 32,105,102, 32, 40,114,101,112,108, 97, 99,101, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,114,101,112,108, 97, 99,101, 83,116, 97,116, 84,101,120,116, 44, 32, 32, 48, 44, 32,119,120, 46,119,120, 84, 79, 80, 32, 43, 32,119,120, 46,119,120, 65, 76, 73, 71, 78, 95, 67, 69, 78, 84, 69, 82, 44, 32, 53, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,114,101,112,108, 97, 99,101, 84,101,120,116, 67,111,109, 98,111, 44, 32, 49, 44, 32,119,120, 46,119,120, 84, 79, 80, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 53, 41, 10, 32, 32, 32, 32,101,110,100, 10, 10, --- 1469,1478 ---- 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 70,108,101,120, 71,114,105,100, 83,105,122,101,114, 40, 50, 44, 32, 50, 44, 32, 48, 44, 32, 48, 41, 10, 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 71,114,111,119, 97, 98,108,101, 67,111,108, 40, 49, 41, 10, ! 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 40,102,105,110,100, 83,116, 97,116, 84,101,120,116, 44, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 65, 76, 73, 71, 78, 95, 76, 69, 70, 84, 44, 32, 48, 41, 10, ! 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 40,102,105,110,100, 84,101,120,116, 67,111,109, 98,111, 44, 32, 49, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 48, 41, 10, 10, 32, 32, 32, 32,105,102, 32, 40,114,101,112,108, 97, 99,101, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 40,114,101,112,108, 97, 99,101, 83,116, 97,116, 84,101,120,116, 44, 32, 32, 48, 44, 32,119,120, 46,119,120, 84, 79, 80, 32, 43, 32,119,120, 46,119,120, 65, 76, 73, 71, 78, 95, 67, 69, 78, 84, 69, 82, 44, 32, 53, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 58, 65,100,100, 40,114,101,112,108, 97, 99,101, 84,101,120,116, 67,111,109, 98,111, 44, 32, 49, 44, 32,119,120, 46,119,120, 84, 79, 80, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 53, 41, 10, 32, 32, 32, 32,101,110,100, 10, 10, *************** *** 1486,1495 **** 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,111,112,116,105,111,110, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 44, 32,102,105,110,100, 68,105, 97,108,111,103, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,119,104,111,108,101, 87,111,114,100, 67,104,101, 99,107, 66,111,120, 44, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,109, 97,116, 99,104, 67, 97,115,101, 67,104,101, 99,107, 66,111,120, 44, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,119,114, 97,112, 65,114,111,117,110,100, 67,104,101, 99,107, 66,111,120, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,114,101,103,101,120, 67,104,101, 99,107, 66,111,120, 44, 32, 32, 32, 32, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,111,112,116,105,111,110,115, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 83,116, 97,116,105, 99, 66,111,120, 83,105,122,101,114, 67,114,101, 97,116,101, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 44, 32,102,105,110,100, 68,105, 97,108,111,103, 44, 32, 34, 79,112,116,105,111,110,115, 34, 32, 41, 59, 10, ! 32, 32, 32, 32,111,112,116,105,111,110,115, 83,105,122,101,114, 58, 65,100,100, 83,105,122,101,114, 40,111,112,116,105,111,110, 83,105,122,101,114, 44, 32, 48, 44, 32, 48, 44, 32, 53, 41, 10, 10, 32, 32, 32, 32, 45, 45, 32, 67,114,101, 97,116,101, 32,115, 99,111,112,101, 32,114, 97,100,105,111, 98,111,120, 10, --- 1488,1497 ---- 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,111,112,116,105,111,110, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 44, 32,102,105,110,100, 68,105, 97,108,111,103, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83,105,122,101,114, 58, 65,100,100, 40,119,104,111,108,101, 87,111,114,100, 67,104,101, 99,107, 66,111,120, 44, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83,105,122,101,114, 58, 65,100,100, 40,109, 97,116, 99,104, 67, 97,115,101, 67,104,101, 99,107, 66,111,120, 44, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83,105,122,101,114, 58, 65,100,100, 40,119,114, 97,112, 65,114,111,117,110,100, 67,104,101, 99,107, 66,111,120, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83,105,122,101,114, 58, 65,100,100, 40,114,101,103,101,120, 67,104,101, 99,107, 66,111,120, 44, 32, 32, 32, 32, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 51, 41, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,111,112,116,105,111,110,115, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 83,116, 97,116,105, 99, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 44, 32,102,105,110,100, 68,105, 97,108,111,103, 44, 32, 34, 79,112,116,105,111,110,115, 34, 32, 41, 59, 10, ! 32, 32, 32, 32,111,112,116,105,111,110,115, 83,105,122,101,114, 58, 65,100,100, 40,111,112,116,105,111,110, 83,105,122,101,114, 44, 32, 48, 44, 32, 48, 44, 32, 53, 41, 10, 10, 32, 32, 32, 32, 45, 45, 32, 67,114,101, 97,116,101, 32,115, 99,111,112,101, 32,114, 97,100,105,111, 98,111,120, 10, *************** *** 1497,1514 **** 32, 32, 32, 32,115, 99,111,112,101, 82, 97,100,105,111, 66,111,120, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40,105,102,102, 40,102,105,110,100, 82,101,112,108, 97, 99,101, 46,102, 68,111,119,110, 44, 32, 49, 44, 32, 48, 41, 41, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,115, 99,111,112,101, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 44, 32,102,105,110,100, 68,105, 97,108,111,103, 32, 41, 59, 10, ! 32, 32, 32, 32,115, 99,111,112,101, 83,105,122,101,114, 58, 65,100,100, 87,105,110,100,111,119, 40,115, 99,111,112,101, 82, 97,100,105,111, 66,111,120, 44, 32, 48, 44, 32, 48, 44, 32, 48, 41, 10, 10, 32, 32, 32, 32, 45, 45, 32, 65,100,100, 32, 97,108,108, 32,116,104,101, 32,115,105,122,101,114,115, 32,116,111, 32,116,104,101, 32,100,105, 97,108,111,103, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,111,112,116,105,111,110, 83, 99,111,112,101, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83, 99,111,112,101, 83,105,122,101,114, 58, 65,100,100, 83,105,122,101,114, 40,111,112,116,105,111,110,115, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 53, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83, 99,111,112,101, 83,105,122,101,114, 58, 65,100,100, 83,105,122,101,114, 40,115, 99,111,112,101, 83,105,122,101,114, 44, 32, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 53, 41, 10, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,108,101,102,116, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 41, 10, ! 32, 32, 32, 32,108,101,102,116, 83,105,122,101,114, 58, 65,100,100, 83,105,122,101,114, 40,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 48, 41, 10, ! 32, 32, 32, 32,108,101,102,116, 83,105,122,101,114, 58, 65,100,100, 83,105,122,101,114, 40,111,112,116,105,111,110, 83, 99,111,112,101, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 48, 41, 10, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,109, 97,105,110, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 41, 10, ! 32, 32, 32, 32,109, 97,105,110, 83,105,122,101,114, 58, 65,100,100, 83,105,122,101,114, 40,108,101,102,116, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 49, 48, 41, 10, ! 32, 32, 32, 32,109, 97,105,110, 83,105,122,101,114, 58, 65,100,100, 83,105,122,101,114, 40, 98,117,116,116,111,110,115, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 49, 48, 41, 10, 32, 32, 32, 32,109, 97,105,110, 83,105,122,101,114, 58, 83,101,116, 83,105,122,101, 72,105,110,116,115, 40, 32,102,105,110,100, 68,105, 97,108,111,103, 32, 41, 10, 32, 32, 32, 32,102,105,110,100, 68,105, 97,108,111,103, 58, 83,101,116, 83,105,122,101,114, 40,109, 97,105,110, 83,105,122,101,114, 41, 10, --- 1499,1516 ---- 32, 32, 32, 32,115, 99,111,112,101, 82, 97,100,105,111, 66,111,120, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40,105,102,102, 40,102,105,110,100, 82,101,112,108, 97, 99,101, 46,102, 68,111,119,110, 44, 32, 49, 44, 32, 48, 41, 41, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,115, 99,111,112,101, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 44, 32,102,105,110,100, 68,105, 97,108,111,103, 32, 41, 59, 10, ! 32, 32, 32, 32,115, 99,111,112,101, 83,105,122,101,114, 58, 65,100,100, 40,115, 99,111,112,101, 82, 97,100,105,111, 66,111,120, 44, 32, 48, 44, 32, 48, 44, 32, 48, 41, 10, 10, 32, 32, 32, 32, 45, 45, 32, 65,100,100, 32, 97,108,108, 32,116,104,101, 32,115,105,122,101,114,115, 32,116,111, 32,116,104,101, 32,100,105, 97,108,111,103, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,111,112,116,105,111,110, 83, 99,111,112,101, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83, 99,111,112,101, 83,105,122,101,114, 58, 65,100,100, 40,111,112,116,105,111,110,115, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 53, 41, 10, ! 32, 32, 32, 32,111,112,116,105,111,110, 83, 99,111,112,101, 83,105,122,101,114, 58, 65,100,100, 40,115, 99,111,112,101, 83,105,122,101,114, 44, 32, 32, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 53, 41, 10, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,108,101,102,116, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 86, 69, 82, 84, 73, 67, 65, 76, 41, 10, ! 32, 32, 32, 32,108,101,102,116, 83,105,122,101,114, 58, 65,100,100, 40,102,105,110,100, 82,101,112,108, 97, 99,101, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 48, 41, 10, ! 32, 32, 32, 32,108,101,102,116, 83,105,122,101,114, 58, 65,100,100, 40,111,112,116,105,111,110, 83, 99,111,112,101, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 48, 41, 10, 10, 32, 32, 32, 32,108,111, 99, 97,108, 32,109, 97,105,110, 83,105,122,101,114, 32, 61, 32,119,120, 46,119,120, 66,111,120, 83,105,122,101,114, 40,119,120, 46,119,120, 72, 79, 82, 73, 90, 79, 78, 84, 65, 76, 41, 10, ! 32, 32, 32, 32,109, 97,105,110, 83,105,122,101,114, 58, 65,100,100, 40,108,101,102,116, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 49, 48, 41, 10, ! 32, 32, 32, 32,109, 97,105,110, 83,105,122,101,114, 58, 65,100,100, 40, 98,117,116,116,111,110,115, 83,105,122,101,114, 44, 32, 48, 44, 32,119,120, 46,119,120, 65, 76, 76, 32, 43, 32,119,120, 46,119,120, 71, 82, 79, 87, 32, 43, 32,119,120, 46,119,120, 67, 69, 78, 84, 69, 82, 44, 32, 49, 48, 41, 10, 32, 32, 32, 32,109, 97,105,110, 83,105,122,101,114, 58, 83,101,116, 83,105,122,101, 72,105,110,116,115, 40, 32,102,105,110,100, 68,105, 97,108,111,103, 32, 41, 10, 32, 32, 32, 32,102,105,110,100, 68,105, 97,108,111,103, 58, 83,101,116, 83,105,122,101,114, 40,109, 97,105,110, 83,105,122,101,114, 41, 10, *************** *** 1641,1645 **** 45, 45, 32, 67,114,101, 97,116,101, 32,116,104,101, 32, 68,101, 98,117,103, 32,109,101,110,117, 32, 97,110,100, 32, 97,116,116, 97, 99,104, 32,116,104,101, 32, 99, 97,108,108, 98, 97, 99,107, 32,102,117,110, 99,116,105,111,110,115, 10, 10, ! 100,101, 98,117,103, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 67,114,101, 97,116,101, 77,101,110,117,123, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 84, 79, 71, 71, 76, 69, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 44, 32, 34, 84,111,103,103,108,101, 32, 38, 66,114,101, 97,107,112,111,105,110,116, 92,116, 70, 57, 34, 44, 32, 34, 84,111,103,103,108,101, 32, 66,114,101, 97,107,112,111,105,110,116, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32,125, 44, 10, --- 1643,1647 ---- 45, 45, 32, 67,114,101, 97,116,101, 32,116,104,101, 32, 68,101, 98,117,103, 32,109,101,110,117, 32, 97,110,100, 32, 97,116,116, 97, 99,104, 32,116,104,101, 32, 99, 97,108,108, 98, 97, 99,107, 32,102,117,110, 99,116,105,111,110,115, 10, 10, ! 100,101, 98,117,103, 77,101,110,117, 32, 61, 32,119,120, 46,119,120, 77,101,110,117,123, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32, 73, 68, 95, 84, 79, 71, 71, 76, 69, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 44, 32, 34, 84,111,103,103,108,101, 32, 38, 66,114,101, 97,107,112,111,105,110,116, 92,116, 70, 57, 34, 44, 32, 34, 84,111,103,103,108,101, 32, 66,114,101, 97,107,112,111,105,110,116, 34, 32,125, 44, 10, 32, 32, 32, 32, 32, 32, 32, 32,123, 32,125, 44, 10, *************** *** 1711,1716 **** 102,117,110, 99,116,105,111,110, 32, 68,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,109,101,115,115, 97,103,101, 44, 32,100,111,110,116, 95, 97,100,100, 95,109, 97,114,107,101,114, 41, 10, 32, 32, 32, 32,105,102, 32,115,112,108,105,116,116,101,114, 58, 73,115, 83,112,108,105,116, 40, 41, 32, 61, 61, 32,102, 97,108,115,101, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,120, 44, 32,121, 32, 61, 32,102,114, 97,109,101, 58, 71,101,116, 67,108,105,101,110,116, 83,105,122,101, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,115,112,108,105,116,116,101,114, 58, 83,112,108,105,116, 72,111,114,105,122,111,110,116, 97,108,108,121, 40,110,111,116,101, 98,111,111,107, 44, 32,101,114,114,111,114, 76,111,103, 44, 32, 40, 50, 32, 42, 32,121, 41, 32, 47, 32, 51, 41, 10, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32,105,102, 32,110,111,116, 32,100,111,110,116, 95, 97,100,100, 95,109, 97,114,107,101,114, 32,116,104,101,110, 10, --- 1713,1718 ---- 102,117,110, 99,116,105,111,110, 32, 68,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,109,101,115,115, 97,103,101, 44, 32,100,111,110,116, 95, 97,100,100, 95,109, 97,114,107,101,114, 41, 10, 32, 32, 32, 32,105,102, 32,115,112,108,105,116,116,101,114, 58, 73,115, 83,112,108,105,116, 40, 41, 32, 61, 61, 32,102, 97,108,115,101, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,119, 44, 32,104, 32, 61, 32,102,114, 97,109,101, 58, 71,101,116, 67,108,105,101,110,116, 83,105,122,101, 87, 72, 40, 41, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,115,112,108,105,116,116,101,114, 58, 83,112,108,105,116, 72,111,114,105,122,111,110,116, 97,108,108,121, 40,110,111,116,101, 98,111,111,107, 44, 32,101,114,114,111,114, 76,111,103, 44, 32, 40, 50, 32, 42, 32,104, 41, 32, 47, 32, 51, 41, 10, 32, 32, 32, 32,101,110,100, 10, 32, 32, 32, 32,105,102, 32,110,111,116, 32,100,111,110,116, 95, 97,100,100, 95,109, 97,114,107,101,114, 32,116,104,101,110, 10, *************** *** 1881,1885 **** 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,110,101,120,116, 76,105,110,101, 32, 61, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 78,101,120,116, 40, 48, 44, 32, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 95, 77, 65, 82, 75, 69, 82, 95, 86, 65, 76, 85, 69, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,104,105,108,101, 32,111,107, 32, 97,110,100, 32, 40,110,101,120,116, 76,105,110,101, 32,126, 61, 32, 45, 49, 41, 32,100,111, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,111,107, 32, 61, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 58, 65,100,100, 66,114,101, 97,107, 80,111,105,110,116, 40,102,105,108,101, 78, 97,109,101, 44, 32,110,101,120,116, 76,105,110,101, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,110,101,120,116, 76,105,110,101, 32, 61, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 78,101,120,116, 40,110,101,120,116, 76,105,110,101, 32, 43, 32, 49, 44, 32, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 95, 77, 65, 82, 75, 69, 82, 95, 86, 65, 76, 85, 69, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, --- 1883,1887 ---- 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,110,101,120,116, 76,105,110,101, 32, 61, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 78,101,120,116, 40, 48, 44, 32, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 95, 77, 65, 82, 75, 69, 82, 95, 86, 65, 76, 85, 69, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,104,105,108,101, 32,111,107, 32, 97,110,100, 32, 40,110,101,120,116, 76,105,110,101, 32,126, 61, 32, 45, 49, 41, 32,100,111, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,111,107, 32, 61, 32,100,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 58, 65,100,100, 66,114,101, 97,107, 80,111,105,110,116, 40,102,105,108,101, 80, 97,116,104, 44, 32,110,101,120,116, 76,105,110,101, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,110,101,120,116, 76,105,110,101, 32, 61, 32,101,100,105,116,111,114, 58, 77, 97,114,107,101,114, 78,101,120,116, 40,110,101,120,116, 76,105,110,101, 32, 43, 32, 49, 44, 32, 66, 82, 69, 65, 75, 80, 79, 73, 78, 84, 95, 77, 65, 82, 75, 69, 82, 95, 86, 65, 76, 85, 69, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 10, *************** *** 2056,2061 **** 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32, 40,100,101, 98,117,103,103,101,101, 95,112,105,100, 32, 62, 32, 48, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119,120, 46,119,120, 80,114,111, 99,101,115,115, 95, 69,120,105,115,116,115, 40,100,101, 98,117,103,103,101,101, 95,112,105,100, 41, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,114,101,116, 32, 61, 32,119,120, 46,119,120, 80,114,111, 99,101,115,115, 95, 75,105,108,108, 40,100,101, 98,117,103,103,101,101, 95,112,105,100, 44, 32,119,120, 46,119,120, 83, 73, 71, 75, 73, 76, 76, 44, 32,119,120, 46,119,120, 75, 73, 76, 76, 95, 67, 72, 73, 76, 68, 82, 69, 78, 41, 10, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, ... [truncated message content] |
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/samples Modified Files: calculator.wx.lua choices.wx.lua coroutine.wx.lua debug.wx.lua dialog.wx.lua editor.wx.lua fldemo.wx.lua grid.wx.lua htmlwin.wx.lua luamodule.wx.lua mdi.wx.lua minimal.wx.lua printing.wx.lua scribble.wx.lua sizer.wx.lua tree.wx.lua unittest.wx.lua veryminimal.wx.lua wxluasudoku.wx.lua Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: sizer.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/sizer.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** sizer.wx.lua 26 Sep 2006 22:22:00 -0000 1.6 --- sizer.wx.lua 31 May 2007 17:18:56 -0000 1.7 *************** *** 9,13 **** ----------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua sizer test frame") -- Create two controls (note that their parents are the _frame_ (not the sizer)) --- 9,13 ---- ----------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua sizer test frame") -- Create two controls (note that their parents are the _frame_ (not the sizer)) *************** *** 18,23 **** -- and padding of 6 pixels. sizerTop = wx.wxBoxSizer(wx.wxVERTICAL) ! sizerTop:AddWindow(textEntry, 3, wx.wxGROW + wx.wxALL, 6) ! sizerTop:AddWindow(button, 5, wx.wxGROW + wx.wxALL, 6) -- Set up the frame to use that sizer to move/resize its children controls --- 18,23 ---- -- and padding of 6 pixels. sizerTop = wx.wxBoxSizer(wx.wxVERTICAL) ! sizerTop:Add(textEntry, 3, wx.wxGROW + wx.wxALL, 6) ! sizerTop:Add(button, 5, wx.wxGROW + wx.wxALL, 6) -- Set up the frame to use that sizer to move/resize its children controls Index: debug.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/debug.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** debug.wx.lua 21 Dec 2006 20:14:20 -0000 1.9 --- debug.wx.lua 31 May 2007 17:18:55 -0000 1.10 *************** *** 62,66 **** app:SetAppName("Debug") ! local config = wx.wxConfigGet() config:SetRecordDefaults() --- 62,66 ---- app:SetAppName("Debug") ! local config = wx.wxConfigBase.Get() config:SetRecordDefaults() *************** *** 71,75 **** bitmapDC:SelectObject( bitmap ) ! frame = wx.wxFrame( wx.wxNull, -1, "Scribble Demo (with debugging support)", --- 71,75 ---- bitmapDC:SelectObject( bitmap ) ! frame = wx.wxFrame( wx.NULL, -1, "Scribble Demo (with debugging support)", Index: mdi.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/mdi.wx.lua,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** mdi.wx.lua 26 Sep 2006 22:22:00 -0000 1.11 --- mdi.wx.lua 31 May 2007 17:18:56 -0000 1.12 *************** *** 35,39 **** ! frame = wx.wxMDIParentFrame( wx.wxNull, wx.wxID_ANY, "wxLua MDI Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) --- 35,39 ---- ! frame = wx.wxMDIParentFrame( wx.NULL, wx.wxID_ANY, "wxLua MDI Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) *************** *** 65,69 **** function (event) wx.wxMessageBox('This is the "About" dialog of the MDI wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 65,69 ---- function (event) wx.wxMessageBox('This is the "About" dialog of the MDI wxLua sample.\n'.. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, Index: fldemo.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/fldemo.wx.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** fldemo.wx.lua 7 Dec 2006 06:32:44 -0000 1.7 --- fldemo.wx.lua 31 May 2007 17:18:55 -0000 1.8 *************** *** 79,83 **** -- create the frame window ! frame = wx.wxFrame( wx.wxNull, -1, "FL Demo", --- 79,83 ---- -- create the frame window ! frame = wx.wxFrame( wx.NULL, -1, "FL Demo", *************** *** 132,136 **** function (event) wx.wxMessageBox( 'This is the "About" dialog of the FL Demo wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 132,136 ---- function (event) wx.wxMessageBox( 'This is the "About" dialog of the FL Demo wxLua sample.\n'.. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, Index: choices.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/choices.wx.lua,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** choices.wx.lua 26 Sep 2006 22:22:00 -0000 1.10 --- choices.wx.lua 31 May 2007 17:18:55 -0000 1.11 *************** *** 21,25 **** function main() -- create the hierarchy: frame -> notebook ! frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua Choices", wx.wxDefaultPosition, wx.wxSize(550, 350)) frame:CreateStatusBar(1) --- 21,25 ---- function main() -- create the hierarchy: frame -> notebook ! frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua Choices", wx.wxDefaultPosition, wx.wxSize(550, 350)) frame:CreateStatusBar(1) *************** *** 43,50 **** local listBoxStaticBox = wx.wxStaticBox( panel1, wx.wxID_ANY, "wxListBox") local listBoxStaticBoxSizer = wx.wxStaticBoxSizer( listBoxStaticBox, wx.wxVERTICAL ); ! listBoxStaticBoxSizer:AddWindow(listBox, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer1:AddWindow(radioBox, 1, wx.wxALL + wx.wxGROW, 5) ! sizer1:AddSizer(listBoxStaticBoxSizer, 1, wx.wxALL + wx.wxGROW, 5) panel1:SetSizer(sizer1) sizer1:SetSizeHints(panel1) --- 43,50 ---- local listBoxStaticBox = wx.wxStaticBox( panel1, wx.wxID_ANY, "wxListBox") local listBoxStaticBoxSizer = wx.wxStaticBoxSizer( listBoxStaticBox, wx.wxVERTICAL ); ! listBoxStaticBoxSizer:Add(listBox, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer1:Add(radioBox, 1, wx.wxALL + wx.wxGROW, 5) ! sizer1:Add(listBoxStaticBoxSizer, 1, wx.wxALL + wx.wxGROW, 5) panel1:SetSizer(sizer1) sizer1:SetSizeHints(panel1) *************** *** 67,83 **** local comboBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxComboBox") local comboBoxStaticBoxSizer = wx.wxStaticBoxSizer( comboBoxStaticBox, wx.wxVERTICAL ); ! comboBoxStaticBoxSizer:AddWindow(comboBox, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) local choiceBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxChoice") local choiceBoxStaticBoxSizer = wx.wxStaticBoxSizer( choiceBoxStaticBox, wx.wxVERTICAL ); ! choiceBoxStaticBoxSizer:AddWindow(choice, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) local checkListBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxCheckListBox") local checkListBoxStaticBoxSizer = wx.wxStaticBoxSizer( checkListBoxStaticBox, wx.wxVERTICAL ); ! checkListBoxStaticBoxSizer:AddWindow(checkListBox, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:AddSizer(comboBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:AddSizer(choiceBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:AddSizer(checkListBoxStaticBoxSizer, 1, wx.wxALL + wx.wxGROW, 5) panel2:SetSizer(sizer2) sizer2:SetSizeHints(panel2) --- 67,83 ---- local comboBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxComboBox") local comboBoxStaticBoxSizer = wx.wxStaticBoxSizer( comboBoxStaticBox, wx.wxVERTICAL ); ! comboBoxStaticBoxSizer:Add(comboBox, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) local choiceBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxChoice") local choiceBoxStaticBoxSizer = wx.wxStaticBoxSizer( choiceBoxStaticBox, wx.wxVERTICAL ); ! choiceBoxStaticBoxSizer:Add(choice, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) local checkListBoxStaticBox = wx.wxStaticBox( panel2, wx.wxID_ANY, "wxCheckListBox") local checkListBoxStaticBoxSizer = wx.wxStaticBoxSizer( checkListBoxStaticBox, wx.wxVERTICAL ); ! checkListBoxStaticBoxSizer:Add(checkListBox, 1, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:Add(comboBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:Add(choiceBoxStaticBoxSizer, 0, wx.wxALL + wx.wxGROW + wx.wxCENTER, 5) ! sizer2:Add(checkListBoxStaticBoxSizer, 1, wx.wxALL + wx.wxGROW, 5) panel2:SetSizer(sizer2) sizer2:SetSizeHints(panel2) Index: veryminimal.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/veryminimal.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** veryminimal.wx.lua 27 Apr 2006 22:53:36 -0000 1.5 --- veryminimal.wx.lua 31 May 2007 17:18:56 -0000 1.6 *************** *** 15,19 **** -- create the frame window ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLua Very Minimal Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) --- 15,19 ---- -- create the frame window ! frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLua Very Minimal Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** wxluasudoku.wx.lua 9 Mar 2007 06:10:21 -0000 1.66 --- wxluasudoku.wx.lua 31 May 2007 17:18:56 -0000 1.67 *************** *** 2331,2335 **** if not sudokuGUI.block_refresh then local cell = win:GetId() ! local width, height = win:GetClientSize() sudokuGUI.PaintCell(dc, cell, width, height, sudokuGUI.valueFont, sudokuGUI.possibleFont) end --- 2331,2335 ---- if not sudokuGUI.block_refresh then local cell = win:GetId() ! local width, height = win:GetClientSizeWH() sudokuGUI.PaintCell(dc, cell, width, height, sudokuGUI.valueFont, sudokuGUI.possibleFont) end *************** *** 2410,2414 **** if (not key_table) or (#key_table < 1) then return end ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[colourID], 1, wx.wxSOLID) dc:SetPen(pen) --- 2410,2414 ---- if (not key_table) or (#key_table < 1) then return end ! local pen = wx.wxPen(sudokuGUI.Colours[colourID], 1, wx.wxSOLID) dc:SetPen(pen) *************** *** 2462,2466 **** if show_errors then ! dc:SetPen(wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID)) dc:DrawLine(0, 0, width, height) dc:DrawLine(width, 0, 0, height) --- 2462,2466 ---- if show_errors then ! dc:SetPen(wx.wxPen(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID)) dc:DrawLine(0, 0, width, height) dc:DrawLine(width, 0, 0, height) *************** *** 2469,2473 **** (sudoku.GetCellValue(cell, sudokuGUI.sudokuSolnTable) ~= sudoku.GetCellValue(cell, sudokuTable)) then ! local pen = wx.wxPenFromColour(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID) dc:SetPen(pen) pen:Delete() --- 2469,2473 ---- (sudoku.GetCellValue(cell, sudokuGUI.sudokuSolnTable) ~= sudoku.GetCellValue(cell, sudokuTable)) then ! local pen = wx.wxPen(sudokuGUI.Colours[sudokuGUI.INVALID_VALUE_COLOUR], 1, wx.wxSOLID) dc:SetPen(pen) pen:Delete() *************** *** 2605,2610 **** -- calculate font sizes for the printout, copy font since we'll recalc the size ! local valueFont = { wxfont = wx.wxFontCopy(sudokuGUI.valueFont.wxfont), size = 8, width = 0, height = 0 } ! local possibleFont = { wxfont = wx.wxFontCopy(sudokuGUI.possibleFont.wxfont), size = 6, width = 0, height = 0 } sudokuGUI.DoGetCellBestSize(dc, cell_width, cell_height, valueFont, possibleFont) --- 2605,2610 ---- -- calculate font sizes for the printout, copy font since we'll recalc the size ! local valueFont = { wxfont = wx.wxFont(sudokuGUI.valueFont.wxfont), size = 8, width = 0, height = 0 } ! local possibleFont = { wxfont = wx.wxFont(sudokuGUI.possibleFont.wxfont), size = 6, width = 0, height = 0 } sudokuGUI.DoGetCellBestSize(dc, cell_width, cell_height, valueFont, possibleFont) *************** *** 2634,2638 **** local borders = { [1]=true, [4]=true, [7]=true, [10]=true } for i = 1, 10 do ! local pen = wx.wxPenFromColour(wx.wxBLACK, iff(borders[i], 4, 2), wx.wxSOLID) dc:SetPen(pen) pen:Delete() --- 2634,2638 ---- local borders = { [1]=true, [4]=true, [7]=true, [10]=true } for i = 1, 10 do ! local pen = wx.wxPen(wx.wxBLACK, iff(borders[i], 4, 2), wx.wxSOLID) dc:SetPen(pen) pen:Delete() *************** *** 2670,2674 **** sudokuGUI.ConnectPrintEvents(luaPrintPrintout) ! local printDialogData = wx.wxPrintDialogDataFromPrintData(sudokuGUI.printData):GetPrintData() local preview = wx.wxPrintPreview(luaPrintout, luaPrintPrintout, printDialogData) --- 2670,2674 ---- sudokuGUI.ConnectPrintEvents(luaPrintPrintout) ! local printDialogData = wx.wxPrintDialogData(sudokuGUI.printData):GetPrintData() local preview = wx.wxPrintPreview(luaPrintout, luaPrintPrintout, printDialogData) *************** *** 3782,3789 **** local listBoxValues = {} for n = 1, sudokuGUI.COLOUR_MAX do ! table.insert(listBoxValues, {colour = wx.wxColourCopy(sudokuGUI.Colours[n])}) end ! listBoxValues[sudokuGUI.VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.valueFont.wxfont) ! listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.possibleFont.wxfont) local reset_fonts = true --- 3782,3789 ---- local listBoxValues = {} for n = 1, sudokuGUI.COLOUR_MAX do ! table.insert(listBoxValues, {colour = wx.wxColour(sudokuGUI.Colours[n])}) end ! listBoxValues[sudokuGUI.VALUE_COLOUR].font = wx.wxFont(sudokuGUI.valueFont.wxfont) ! listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font = wx.wxFont(sudokuGUI.possibleFont.wxfont) local reset_fonts = true *************** *** 3822,3826 **** local win = event:GetEventObject():DynamicCast("wxWindow") local sel = fcListBox:GetSelection() + 1 ! local width, height = win:GetClientSize() local dc = wx.wxPaintDC(win) --- 3822,3826 ---- local win = event:GetEventObject():DynamicCast("wxWindow") local sel = fcListBox:GetSelection() + 1 ! local width, height = win:GetClientSizeWH() local dc = wx.wxPaintDC(win) *************** *** 3873,3877 **** local function DrawPossible(idx, n, value, hidden) dc:DrawText(value, pos[n].x, pos[n].y) ! local pen = wx.wxPenFromColour(listBoxValues[idx].colour, 1, wx.wxSOLID) dc:SetPen(pen); pen:Delete() if hidden ~= true then --- 3873,3877 ---- local function DrawPossible(idx, n, value, hidden) dc:DrawText(value, pos[n].x, pos[n].y) ! local pen = wx.wxPen(listBoxValues[idx].colour, 1, wx.wxSOLID) dc:SetPen(pen); pen:Delete() if hidden ~= true then *************** *** 3890,3894 **** -- draw invalid marker ! local pen = wx.wxPenFromColour(listBoxValues[sudokuGUI.INVALID_VALUE_COLOUR].colour, 1, wx.wxSOLID) dc:SetPen(pen); pen:Delete() dc:DrawLine(0, 0, width, height) --- 3890,3894 ---- -- draw invalid marker ! local pen = wx.wxPen(listBoxValues[sudokuGUI.INVALID_VALUE_COLOUR].colour, 1, wx.wxSOLID) dc:SetPen(pen); pen:Delete() dc:DrawLine(0, 0, width, height) *************** *** 3961,3981 **** for n = 1, sudokuGUI.COLOUR_MAX do listBoxValues[n].colour:Delete() ! listBoxValues[n].colour = wx.wxColourCopy(sudokuGUI.Colours_[n]) end listBoxValues[sudokuGUI.VALUE_COLOUR].font:Delete() listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font:Delete() ! listBoxValues[sudokuGUI.VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.valueFont_wxfont_) ! listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font = wx.wxFontCopy(sudokuGUI.possibleFont_wxfont_) elseif ret == wx.wxNO then listBoxValues[sel].colour:Delete() ! listBoxValues[sel].colour = wx.wxColourCopy(sudokuGUI.Colours_[sel]) if (sel == sudokuGUI.VALUE_COLOUR) then listBoxValues[sel].font:Delete() ! listBoxValues[sel].font = wx.wxFontCopy(sudokuGUI.valueFont_wxfont_) elseif (sel == sudokuGUI.POSS_VALUE_COLOUR) then listBoxValues[sel].font:Delete() ! listBoxValues[sel].font = wx.wxFontCopy(sudokuGUI.possibleFont_wxfont_) end end --- 3961,3981 ---- for n = 1, sudokuGUI.COLOUR_MAX do listBoxValues[n].colour:Delete() ! listBoxValues[n].colour = wx.wxColour(sudokuGUI.Colours_[n]) end listBoxValues[sudokuGUI.VALUE_COLOUR].font:Delete() listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font:Delete() ! listBoxValues[sudokuGUI.VALUE_COLOUR].font = wx.wxFont(sudokuGUI.valueFont_wxfont_) ! listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font = wx.wxFont(sudokuGUI.possibleFont_wxfont_) elseif ret == wx.wxNO then listBoxValues[sel].colour:Delete() ! listBoxValues[sel].colour = wx.wxColour(sudokuGUI.Colours_[sel]) if (sel == sudokuGUI.VALUE_COLOUR) then listBoxValues[sel].font:Delete() ! listBoxValues[sel].font = wx.wxFont(sudokuGUI.valueFont_wxfont_) elseif (sel == sudokuGUI.POSS_VALUE_COLOUR) then listBoxValues[sel].font:Delete() ! listBoxValues[sel].font = wx.wxFont(sudokuGUI.possibleFont_wxfont_) end end *************** *** 3989,4000 **** for n = 1, sudokuGUI.COLOUR_MAX do sudokuGUI.Colours[n]:Delete() ! sudokuGUI.Colours[n] = wx.wxColourCopy(listBoxValues[n].colour) end -- copy the fonts since when applied their size will change sudokuGUI.valueFont.wxfont:Delete() ! sudokuGUI.valueFont.wxfont = wx.wxFontCopy(listBoxValues[sudokuGUI.VALUE_COLOUR].font) sudokuGUI.possibleFont.wxfont:Delete() ! sudokuGUI.possibleFont.wxfont = wx.wxFontCopy(listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font) sudokuGUI.valueFont_cache = {} -- clear cache so GetCellBestSize recreates it sudokuGUI.possibleFont_cache = {} --- 3989,4000 ---- for n = 1, sudokuGUI.COLOUR_MAX do sudokuGUI.Colours[n]:Delete() ! sudokuGUI.Colours[n] = wx.wxColour(listBoxValues[n].colour) end -- copy the fonts since when applied their size will change sudokuGUI.valueFont.wxfont:Delete() ! sudokuGUI.valueFont.wxfont = wx.wxFont(listBoxValues[sudokuGUI.VALUE_COLOUR].font) sudokuGUI.possibleFont.wxfont:Delete() ! sudokuGUI.possibleFont.wxfont = wx.wxFont(listBoxValues[sudokuGUI.POSS_VALUE_COLOUR].font) sudokuGUI.valueFont_cache = {} -- clear cache so GetCellBestSize recreates it sudokuGUI.possibleFont_cache = {} *************** *** 4008,4012 **** end ! local width, height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(width, height) sudokuGUI.Refresh() --- 4008,4012 ---- end ! local width, height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(width, height) sudokuGUI.Refresh() *************** *** 4247,4253 **** function sudokuGUI.ConfigSave(save_prefs) ! local config = wx.wxConfigGet(false) if not config then ! config = wx.wxConfigCreateFileConfig("wxLuaSudoku", "wxLua") end --- 4247,4253 ---- function sudokuGUI.ConfigSave(save_prefs) ! local config = wx.wxConfigBase.Get(false) if not config then ! config = wx.wxFileConfig("wxLuaSudoku", "wxLua") end *************** *** 4255,4260 **** -- write the frame position so we can restore it ! local x, y = sudokuGUI.frame:GetPosition() ! local w, h = sudokuGUI.frame:GetClientSize() local max = booltoint(sudokuGUI.frame:IsMaximized()) config:Write("wxLuaSudoku/Frame", string.format("x:%d y:%d w:%d h:%d maximized:%d", x, y, w, h, max)) --- 4255,4260 ---- -- write the frame position so we can restore it ! local x, y = sudokuGUI.frame:GetPositionXY() ! local w, h = sudokuGUI.frame:GetClientSizeWH() local max = booltoint(sudokuGUI.frame:IsMaximized()) config:Write("wxLuaSudoku/Frame", string.format("x:%d y:%d w:%d h:%d maximized:%d", x, y, w, h, max)) *************** *** 4285,4291 **** function sudokuGUI.ConfigLoad() ! local config = wx.wxConfigGet(false) if not config then ! config = wx.wxConfigCreateFileConfig("wxLuaSudoku", "wxLua") end --- 4285,4291 ---- function sudokuGUI.ConfigLoad() ! local config = wx.wxConfigBase.Get(false) if not config then ! config = wx.wxFileConfig("wxLuaSudoku", "wxLua") end *************** *** 4305,4310 **** if h > dispH then h = dispH end ! sudokuGUI.frame:MoveXY(x, y) ! sudokuGUI.frame:SetClientSizeWH(w, h) end end --- 4305,4310 ---- if h > dispH then h = dispH end ! sudokuGUI.frame:Move(x, y) ! sudokuGUI.frame:SetClientSize(w, h) end end *************** *** 4341,4345 **** -- update font size ! local width, height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(width, height) -- update for preferences --- 4341,4345 ---- -- update font size ! local width, height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(width, height) -- update for preferences *************** *** 4383,4387 **** if not ff:Ok() then return end ! local tempF = wx.wxFontCopy(f) f:SetFaceName(face) f:SetFamily(family) --- 4383,4387 ---- if not ff:Ok() then return end ! local tempF = wx.wxFont(f) f:SetFaceName(face) f:SetFamily(family) *************** *** 4502,4519 **** sudokuGUI.Colours_ = {} for n = 1, sudokuGUI.COLOUR_MAX do ! sudokuGUI.Colours_[n] = wx.wxColourCopy(sudokuGUI.Colours[n]) end -- just use defaults since some XP systems may not even have wxMODERN ! sudokuGUI.possibleFont_wxfont_ = wx.wxFontCopy(wx.wxNORMAL_FONT) ! sudokuGUI.valueFont_wxfont_ = wx.wxFontCopy(wx.wxNORMAL_FONT) sudokuGUI.valueFont_wxfont_:SetWeight(wx.wxFONTWEIGHT_BOLD) if not sudokuGUI.valueFont_wxfont_:Ok() then sudokuGUI.valueFont_wxfont_:Destroy() ! sudokuGUI.valueFont_wxfont_ = wx.wxFontCopy(wx.wxNORMAL_FONT) end ! sudokuGUI.possibleFont.wxfont = wx.wxFontCopy(sudokuGUI.possibleFont_wxfont_) ! sudokuGUI.valueFont.wxfont = wx.wxFontCopy(sudokuGUI.valueFont_wxfont_) end --- 4502,4519 ---- sudokuGUI.Colours_ = {} for n = 1, sudokuGUI.COLOUR_MAX do ! sudokuGUI.Colours_[n] = wx.wxColour(sudokuGUI.Colours[n]) end -- just use defaults since some XP systems may not even have wxMODERN ! sudokuGUI.possibleFont_wxfont_ = wx.wxFont(wx.wxNORMAL_FONT) ! sudokuGUI.valueFont_wxfont_ = wx.wxFont(wx.wxNORMAL_FONT) sudokuGUI.valueFont_wxfont_:SetWeight(wx.wxFONTWEIGHT_BOLD) if not sudokuGUI.valueFont_wxfont_:Ok() then sudokuGUI.valueFont_wxfont_:Destroy() ! sudokuGUI.valueFont_wxfont_ = wx.wxFont(wx.wxNORMAL_FONT) end ! sudokuGUI.possibleFont.wxfont = wx.wxFont(sudokuGUI.possibleFont_wxfont_) ! sudokuGUI.valueFont.wxfont = wx.wxFont(sudokuGUI.valueFont_wxfont_) end *************** *** 4606,4610 **** function (event) sudokuGUI.CheckMenuItem(sudokuGUI.ID_SHOW_POSSIBLE_LINE, event:IsChecked()) ! local width, height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(width-1, height-1) sudokuGUI.Refresh() --- 4606,4610 ---- function (event) sudokuGUI.CheckMenuItem(sudokuGUI.ID_SHOW_POSSIBLE_LINE, event:IsChecked()) ! local width, height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(width-1, height-1) sudokuGUI.Refresh() *************** *** 4756,4760 **** function (event) wx.wxMessageBox("Welcome to wxLuaSudoku!\nWritten by John Labenski\nCopyright 2006.\n".. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLuaSudoku", wx.wxOK + wx.wxICON_INFORMATION, --- 4756,4760 ---- function (event) wx.wxMessageBox("Welcome to wxLuaSudoku!\nWritten by John Labenski\nCopyright 2006.\n".. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLuaSudoku", wx.wxOK + wx.wxICON_INFORMATION, *************** *** 4816,4825 **** -- Create the main frame for the program ! sudokuGUI.frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLuaSudoku", wx.wxDefaultPosition, wx.wxSize(300,320)) sudokuGUI.frame:SetSizeHints(300, 300); ! local bitmap = wx.wxBitmapFromXPMData(sudokuGUIxpmdata) ! local icon = wx.wxDefaultIcon() icon:CopyFromBitmap(bitmap) sudokuGUI.frame:SetIcon(icon) --- 4816,4825 ---- -- Create the main frame for the program ! sudokuGUI.frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLuaSudoku", wx.wxDefaultPosition, wx.wxSize(300,320)) sudokuGUI.frame:SetSizeHints(300, 300); ! local bitmap = wx.wxBitmap(sudokuGUIxpmdata) ! local icon = wx.wxIcon() icon:CopyFromBitmap(bitmap) sudokuGUI.frame:SetIcon(icon) *************** *** 4833,4846 **** local fileMenu = wx.wxMenu("", 0) ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_NEW, "&New...\tCtrl-N", "Clear the current puzzle", wx.wxArtProvider_GetBitmap(wx.wxART_NEW, wx.wxART_TOOLBAR))) fileMenu:AppendCheckItem(sudokuGUI.ID_CREATE, "&Create...\tCtrl-T", "Enter the initial values for the puzzle") ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_GENERATE, "&Generate...\tCtrl-G", "Generate a new puzzle", wx.wxArtProvider_GetBitmap(wx.wxART_EXECUTABLE_FILE, wx.wxART_TOOLBAR))) ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_OPEN, "&Open...\tCtrl-O", "Open a puzzle file", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR))) ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_SAVEAS, "&Save as...\tCtrl-S", "Save the current puzzle", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_SAVE_AS, wx.wxART_TOOLBAR))) fileMenu:AppendSeparator() fileMenu:Append(sudokuGUI.ID_PAGESETUP, "Page S&etup...", "Setup the printout page") --fileMenu:Append(sudokuGUI.ID_PRINTSETUP, "Print Se&tup...", "Setup the printer") fileMenu:Append(sudokuGUI.ID_PRINTPREVIEW, "Print Pre&view...", "Preview the printout") ! fileMenu:AppendItem(MItem(fileMenu, sudokuGUI.ID_PRINT, "&Print...", "Print the puzzle", wx.wxArtProvider_GetBitmap(wx.wxART_PRINT, wx.wxART_TOOLBAR))) fileMenu:AppendSeparator() fileMenu:Append(sudokuGUI.ID_EXIT, "E&xit\tCtrl-X", "Quit the program") --- 4833,4846 ---- local fileMenu = wx.wxMenu("", 0) ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_NEW, "&New...\tCtrl-N", "Clear the current puzzle", wx.wxArtProvider.GetBitmap(wx.wxART_NEW, wx.wxART_TOOLBAR))) fileMenu:AppendCheckItem(sudokuGUI.ID_CREATE, "&Create...\tCtrl-T", "Enter the initial values for the puzzle") ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_GENERATE, "&Generate...\tCtrl-G", "Generate a new puzzle", wx.wxArtProvider.GetBitmap(wx.wxART_EXECUTABLE_FILE, wx.wxART_TOOLBAR))) ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_OPEN, "&Open...\tCtrl-O", "Open a puzzle file", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR))) ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_SAVEAS, "&Save as...\tCtrl-S", "Save the current puzzle", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_SAVE_AS, wx.wxART_TOOLBAR))) fileMenu:AppendSeparator() fileMenu:Append(sudokuGUI.ID_PAGESETUP, "Page S&etup...", "Setup the printout page") --fileMenu:Append(sudokuGUI.ID_PRINTSETUP, "Print Se&tup...", "Setup the printer") fileMenu:Append(sudokuGUI.ID_PRINTPREVIEW, "Print Pre&view...", "Preview the printout") ! fileMenu:Append(MItem(fileMenu, sudokuGUI.ID_PRINT, "&Print...", "Print the puzzle", wx.wxArtProvider.GetBitmap(wx.wxART_PRINT, wx.wxART_TOOLBAR))) fileMenu:AppendSeparator() fileMenu:Append(sudokuGUI.ID_EXIT, "E&xit\tCtrl-X", "Quit the program") *************** *** 4851,4856 **** editMenu:Append(sudokuGUI.ID_RESET, "Re&set...\tCtrl-R", "Reset the puzzle to the initial state") editMenu:AppendSeparator() ! editMenu:AppendItem(MItem(editMenu, sudokuGUI.ID_UNDO, "&Undo\tCtrl-Z", "Undo the last entry", wx.wxArtProvider_GetBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR))) ! editMenu:AppendItem(MItem(editMenu, sudokuGUI.ID_REDO, "&Redo\tCtrl-Y", "Redo the last entry", wx.wxArtProvider_GetBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR))) editMenu:AppendSeparator() editMenu:Append(sudokuGUI.ID_PREFERENCES, "P&references...", "Show the preferences dialog") --- 4851,4856 ---- editMenu:Append(sudokuGUI.ID_RESET, "Re&set...\tCtrl-R", "Reset the puzzle to the initial state") editMenu:AppendSeparator() ! editMenu:Append(MItem(editMenu, sudokuGUI.ID_UNDO, "&Undo\tCtrl-Z", "Undo the last entry", wx.wxArtProvider.GetBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR))) ! editMenu:Append(MItem(editMenu, sudokuGUI.ID_REDO, "&Redo\tCtrl-Y", "Redo the last entry", wx.wxArtProvider.GetBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR))) editMenu:AppendSeparator() editMenu:Append(sudokuGUI.ID_PREFERENCES, "P&references...", "Show the preferences dialog") *************** *** 4877,4881 **** userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_SETALL, "Set all...", "Set all pencil marks") userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_INIT, "Calculate...", "Initialize pencil marks to calculated possible") ! possibleMenu:AppendMenu(sudokuGUI.ID_USER_POSSIBLE_MENU, "Pencil marks", userPossMenu, "Setup user possible values") possibleMenu:AppendSeparator() --- 4877,4881 ---- userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_SETALL, "Set all...", "Set all pencil marks") userPossMenu:Append( sudokuGUI.ID_USER_POSSIBLE_INIT, "Calculate...", "Initialize pencil marks to calculated possible") ! possibleMenu:Append(sudokuGUI.ID_USER_POSSIBLE_MENU, "Pencil marks", userPossMenu, "Setup user possible values") possibleMenu:AppendSeparator() *************** *** 4890,4894 **** possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_NAKEDQUADS, "Mark naked quads", "Mark naked quads in possible values") possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_HIDDENQUADS, "Mark hidden quads", "Mark hidden quads in possible values") ! possibleMenu:AppendMenu(sudokuGUI.ID_SHOW_MENU, "Mark &groups", possViewMenu, "Mark naked/hidden groups") local solveMenu = wx.wxMenu("", 0) --- 4890,4894 ---- possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_NAKEDQUADS, "Mark naked quads", "Mark naked quads in possible values") possViewMenu:AppendCheckItem( sudokuGUI.ID_SHOW_HIDDENQUADS, "Mark hidden quads", "Mark hidden quads in possible values") ! possibleMenu:Append(sudokuGUI.ID_SHOW_MENU, "Mark &groups", possViewMenu, "Mark naked/hidden groups") local solveMenu = wx.wxMenu("", 0) *************** *** 4907,4911 **** elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_NAKEDQUADS, "Eliminate naked quads", "Eliminate naked quads from possible values") elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_HIDDENQUADS, "Eliminate hidden quads", "Eliminate hidden quads from possible values") ! solveMenu:AppendMenu(sudokuGUI.ID_ELIMINATE_MENU, "&Eliminate groups", elimSolveMenu, "Remove possible values using naked and hidden groups") solveMenu:AppendSeparator() solveMenu:Append(sudokuGUI.ID_SOLVE_SCANSINGLES, "Solve (scan singles)\tCtrl-1", "Solve all cells with only one possibility") --- 4907,4911 ---- elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_NAKEDQUADS, "Eliminate naked quads", "Eliminate naked quads from possible values") elimSolveMenu:AppendCheckItem(sudokuGUI.ID_ELIMINATE_HIDDENQUADS, "Eliminate hidden quads", "Eliminate hidden quads from possible values") ! solveMenu:Append(sudokuGUI.ID_ELIMINATE_MENU, "&Eliminate groups", elimSolveMenu, "Remove possible values using naked and hidden groups") solveMenu:AppendSeparator() solveMenu:Append(sudokuGUI.ID_SOLVE_SCANSINGLES, "Solve (scan singles)\tCtrl-1", "Solve all cells with only one possibility") *************** *** 4919,4923 **** local helpMenu = wx.wxMenu("", 0) helpMenu:Append(sudokuGUI.ID_ABOUT, "&About...", "About the wxLuaSudoku Application") ! helpMenu:AppendItem(MItem(helpMenu, sudokuGUI.ID_HELP, "&Help...", "Help using the wxLuaSudoku application", wx.wxArtProvider_GetBitmap(wx.wxART_QUESTION, wx.wxART_TOOLBAR))) local menuBar = wx.wxMenuBar() --- 4919,4923 ---- local helpMenu = wx.wxMenu("", 0) helpMenu:Append(sudokuGUI.ID_ABOUT, "&About...", "About the wxLuaSudoku Application") ! helpMenu:Append(MItem(helpMenu, sudokuGUI.ID_HELP, "&Help...", "Help using the wxLuaSudoku application", wx.wxArtProvider.GetBitmap(wx.wxART_QUESTION, wx.wxART_TOOLBAR))) local menuBar = wx.wxMenuBar() *************** *** 4932,4946 **** local toolBar = sudokuGUI.frame:CreateToolBar(wx.wxNO_BORDER) -- + wx.wxTB_FLAT + wx.wxTB_DOCKABLE) ! toolBar:AddTool(sudokuGUI.ID_NEW, "New", wx.wxArtProvider_GetBitmap(wx.wxART_NEW, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Clear the current puzzle", "Clear the current puzzle") ! toolBar:AddCheckTool(sudokuGUI.ID_CREATE, "Create", wx.wxArtProvider_GetBitmap(wx.wxART_ADD_BOOKMARK, wx.wxART_TOOLBAR), wx.wxNullBitmap, "Enter initial values for the puzzle", "Enter initial values for the puzzle") ! toolBar:AddTool(sudokuGUI.ID_GENERATE, "Generate", wx.wxArtProvider_GetBitmap(wx.wxART_EXECUTABLE_FILE, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Generate a new puzzle", "Generate a new puzzle") ! toolBar:AddTool(sudokuGUI.ID_OPEN, "Open", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Open a puzzle file", "Open a puzzle file") ! toolBar:AddTool(sudokuGUI.ID_SAVEAS, "Save", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_SAVE_AS, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Save the current puzzle", "Save the current puzzle") ! toolBar:AddTool(sudokuGUI.ID_PRINT, "Print", wx.wxArtProvider_GetBitmap(wx.wxART_PRINT, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Print the puzzle", "Print the puzzle") toolBar:AddSeparator() ! toolBar:AddTool(sudokuGUI.ID_UNDO, "Undo", wx.wxArtProvider_GetBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Undo the last entry", "Undo the last entry") ! toolBar:AddTool(sudokuGUI.ID_REDO, "Redo", wx.wxArtProvider_GetBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Redo the last entry", "Redo the last entry") toolBar:AddSeparator() ! toolBar:AddTool(sudokuGUI.ID_HELP, "Help", wx.wxArtProvider_GetBitmap(wx.wxART_QUESTION, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Help on wxLuaSudoku", "Help on wxLuaSudoku") toolBar:Realize() --- 4932,4946 ---- local toolBar = sudokuGUI.frame:CreateToolBar(wx.wxNO_BORDER) -- + wx.wxTB_FLAT + wx.wxTB_DOCKABLE) ! toolBar:AddTool(sudokuGUI.ID_NEW, "New", wx.wxArtProvider.GetBitmap(wx.wxART_NEW, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Clear the current puzzle", "Clear the current puzzle") ! toolBar:AddCheckTool(sudokuGUI.ID_CREATE, "Create", wx.wxArtProvider.GetBitmap(wx.wxART_ADD_BOOKMARK, wx.wxART_TOOLBAR), wx.wxNullBitmap, "Enter initial values for the puzzle", "Enter initial values for the puzzle") ! toolBar:AddTool(sudokuGUI.ID_GENERATE, "Generate", wx.wxArtProvider.GetBitmap(wx.wxART_EXECUTABLE_FILE, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Generate a new puzzle", "Generate a new puzzle") ! toolBar:AddTool(sudokuGUI.ID_OPEN, "Open", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Open a puzzle file", "Open a puzzle file") ! toolBar:AddTool(sudokuGUI.ID_SAVEAS, "Save", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_SAVE_AS, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Save the current puzzle", "Save the current puzzle") ! toolBar:AddTool(sudokuGUI.ID_PRINT, "Print", wx.wxArtProvider.GetBitmap(wx.wxART_PRINT, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Print the puzzle", "Print the puzzle") toolBar:AddSeparator() ! toolBar:AddTool(sudokuGUI.ID_UNDO, "Undo", wx.wxArtProvider.GetBitmap(wx.wxART_UNDO, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Undo the last entry", "Undo the last entry") ! toolBar:AddTool(sudokuGUI.ID_REDO, "Redo", wx.wxArtProvider.GetBitmap(wx.wxART_REDO, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Redo the last entry", "Redo the last entry") toolBar:AddSeparator() ! toolBar:AddTool(sudokuGUI.ID_HELP, "Help", wx.wxArtProvider.GetBitmap(wx.wxART_QUESTION, wx.wxART_TOOLBAR), wx.wxNullBitmap, wx.wxITEM_NORMAL, "Help on wxLuaSudoku", "Help on wxLuaSudoku") toolBar:Realize() *************** *** 5001,5010 **** for i = 1, 81 do local win = sudokuGUI.CreateCellWindow( sudokuGUI.panel, i, size ) ! gridsizer:AddWindow(win, 1, wx.wxALL+wx.wxGROW+ wx.wxALIGN_CENTER, 0) table.insert(sudokuGUI.cellWindows, win) end local topsizer = wx.wxBoxSizer(wx.wxVERTICAL) ! topsizer:AddSizer(gridsizer, 1, wx.wxALL+wx.wxGROW+wx.wxALIGN_CENTER, 0) sudokuGUI.panel:SetSizer( topsizer ) --topsizer:Fit(sudokuGUI.frame) --- 5001,5010 ---- for i = 1, 81 do local win = sudokuGUI.CreateCellWindow( sudokuGUI.panel, i, size ) ! gridsizer:Add(win, 1, wx.wxALL+wx.wxGROW+ wx.wxALIGN_CENTER, 0) table.insert(sudokuGUI.cellWindows, win) end local topsizer = wx.wxBoxSizer(wx.wxVERTICAL) ! topsizer:Add(gridsizer, 1, wx.wxALL+wx.wxGROW+wx.wxALIGN_CENTER, 0) sudokuGUI.panel:SetSizer( topsizer ) --topsizer:Fit(sudokuGUI.frame) *************** *** 5016,5020 **** sudokuGUI.cellWindows[1]:Connect(wx.wxEVT_SIZE, function (event) ! local width, height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(width, height) sudokuGUI.Refresh() --- 5016,5020 ---- sudokuGUI.cellWindows[1]:Connect(wx.wxEVT_SIZE, function (event) ! local width, height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(width, height) sudokuGUI.Refresh() *************** *** 5029,5033 **** end ) ! local cell_width, cell_height = sudokuGUI.cellWindows[1]:GetClientSize() sudokuGUI.GetCellBestSize(cell_width, cell_height) --sudokuGUI.UpdateTable() --- 5029,5033 ---- end ) ! local cell_width, cell_height = sudokuGUI.cellWindows[1]:GetClientSizeWH() sudokuGUI.GetCellBestSize(cell_width, cell_height) --sudokuGUI.UpdateTable() Index: tree.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/tree.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** tree.wx.lua 1 May 2007 14:23:35 -0000 1.9 --- tree.wx.lua 31 May 2007 17:18:56 -0000 1.10 *************** *** 19,23 **** function main() ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLua wxTreeCtrl Sample", wx.wxDefaultPosition, wx.wxSize(450, 400), wx.wxDEFAULT_FRAME_STYLE ) --- 19,23 ---- function main() ! frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLua wxTreeCtrl Sample", wx.wxDefaultPosition, wx.wxSize(450, 400), wx.wxDEFAULT_FRAME_STYLE ) *************** *** 46,50 **** function (event) wx.wxMessageBox('This is the "About" dialog of the wxLua wxTreeCtrl sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 46,50 ---- function (event) wx.wxMessageBox('This is the "About" dialog of the wxLua wxTreeCtrl sample.\n'.. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, *************** *** 65,70 **** rootSizer:AddGrowableCol(0) rootSizer:AddGrowableRow(0) ! rootSizer:AddWindow( tree, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL, 0 ) ! rootSizer:AddWindow( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL, 0 ) frame:SetSizer( rootSizer ) frame:Layout() -- help sizing the windows before being shown --- 65,70 ---- rootSizer:AddGrowableCol(0) rootSizer:AddGrowableRow(0) ! rootSizer:Add( tree, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL, 0 ) ! rootSizer:Add( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER_HORIZONTAL, 0 ) frame:SetSizer( rootSizer ) frame:Layout() -- help sizing the windows before being shown Index: luamodule.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/luamodule.wx.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** luamodule.wx.lua 25 May 2006 03:55:23 -0000 1.3 --- luamodule.wx.lua 31 May 2007 17:18:55 -0000 1.4 *************** *** 23,27 **** print("The point is", p:GetX(), p:GetY()) ! frame = wx.wxFrame(wx.wxNull, -1, "wxLua module sample") -- create a simple file menu so you can exit the program nicely --- 23,27 ---- print("The point is", p:GetX(), p:GetY()) ! frame = wx.wxFrame(wx.NULL, -1, "wxLua module sample") -- create a simple file menu so you can exit the program nicely Index: htmlwin.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/htmlwin.wx.lua,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** htmlwin.wx.lua 1 May 2007 14:23:35 -0000 1.12 --- htmlwin.wx.lua 31 May 2007 17:18:55 -0000 1.13 *************** *** 51,55 **** if event:GetHtmlParser() and event:GetHtmlParser():GetWindowInterface() and event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() then ! parent = event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() else --- 51,55 ---- if event:GetHtmlParser() and event:GetHtmlParser():GetWindowInterface() and event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() then ! parent = event:GetHtmlParser():GetWindowInterface():GetHTMLWindow() else *************** *** 82,86 **** -- create the frame window ! frame = wx.wxFrame( wx.wxNull, wx.wxID_ANY, "wxLuaHtmlWindow Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) --- 82,86 ---- -- create the frame window ! frame = wx.wxFrame( wx.NULL, wx.wxID_ANY, "wxLuaHtmlWindow Demo", wx.wxDefaultPosition, wx.wxSize(450, 450), wx.wxDEFAULT_FRAME_STYLE ) *************** *** 132,136 **** function (event) wx.wxMessageBox('This is the "About" dialog of the wxHtmlWindow wxLua sample.\n'.. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, --- 132,136 ---- function (event) wx.wxMessageBox('This is the "About" dialog of the wxHtmlWindow wxLua sample.\n'.. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua", wx.wxOK + wx.wxICON_INFORMATION, *************** *** 141,145 **** html = wx.wxLuaHtmlWindow(frame) ! -- Override the virtual function -- virtual void wxLuaHtmlWindow::OnSetTitle(const wxString& title) html.OnSetTitle = function(self, title) --- 141,145 ---- html = wx.wxLuaHtmlWindow(frame) ! -- Override the virtual function -- virtual void wxLuaHtmlWindow::OnSetTitle(const wxString& title) html.OnSetTitle = function(self, title) Index: dialog.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** dialog.wx.lua 1 May 2007 14:23:35 -0000 1.11 --- dialog.wx.lua 31 May 2007 17:18:55 -0000 1.12 *************** *** 22,26 **** -- Create the dialog ! dialog = wx.wxDialog(wx.wxNull, wx.wxID_ANY, "wxLua Temperature Converter", wx.wxDefaultPosition, wx.wxDefaultSize) --- 22,26 ---- -- Create the dialog ! dialog = wx.wxDialog(wx.NULL, wx.wxID_ANY, "wxLua Temperature Converter", wx.wxDefaultPosition, wx.wxDefaultSize) *************** *** 44,50 **** local textCtrl = wx.wxTextCtrl( panel, textCtrlID, "000000.00000", wx.wxDefaultPosition, wx.wxSize(-1,-1), wx.wxTE_PROCESS_ENTER ) local button = wx.wxButton( panel, buttonID, button_text) ! flexGridSizer:AddWindow( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! flexGridSizer:AddWindow( button, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) return textCtrl --- 44,50 ---- local textCtrl = wx.wxTextCtrl( panel, textCtrlID, "000000.00000", wx.wxDefaultPosition, wx.wxSize(-1,-1), wx.wxTE_PROCESS_ENTER ) local button = wx.wxButton( panel, buttonID, button_text) ! flexGridSizer:Add( staticText, 0, wx.wxALIGN_CENTER_VERTICAL+wx.wxALL, 5 ) ! flexGridSizer:Add( textCtrl, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! flexGridSizer:Add( button, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) return textCtrl *************** *** 68,80 **** ]] ! staticBoxSizer:AddSizer( flexGridSizer, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:AddSizer( staticBoxSizer, 1, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL ) local aboutButton = wx.wxButton( panel, ID_ABOUT_BUTTON, "&About") local closeButton = wx.wxButton( panel, ID_CLOSE_BUTTON, "E&xit") ! buttonSizer:AddWindow( aboutButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! buttonSizer:AddWindow( closeButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:AddSizer( buttonSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) --- 68,80 ---- ]] ! staticBoxSizer:Add( flexGridSizer, 0, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:Add( staticBoxSizer, 1, wx.wxGROW+wx.wxALIGN_CENTER+wx.wxALL, 5 ) local buttonSizer = wx.wxBoxSizer( wx.wxHORIZONTAL ) local aboutButton = wx.wxButton( panel, ID_ABOUT_BUTTON, "&About") local closeButton = wx.wxButton( panel, ID_CLOSE_BUTTON, "E&xit") ! buttonSizer:Add( aboutButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! buttonSizer:Add( closeButton, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) ! mainSizer:Add( buttonSizer, 0, wx.wxALIGN_CENTER+wx.wxALL, 5 ) panel:SetSizer( mainSizer ) *************** *** 113,117 **** -- called first and unless we call event:Skip() in their handlers the -- events will never reach this function. Therefore we don't need to ! -- check that the ids are only from temp conversion buttons. dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, --- 113,117 ---- -- called first and unless we call event:Skip() in their handlers the -- events will never reach this function. Therefore we don't need to ! -- check that the ids are only from temp conversion buttons. dialog:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_BUTTON_CLICKED, *************** *** 180,184 **** function(event) wx.wxMessageBox("Based on the C++ version by Marco Ghislanzoni.\n".. ! wx.WXLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua Temperature Converter", wx.wxOK + wx.wxICON_INFORMATION, --- 180,184 ---- function(event) wx.wxMessageBox("Based on the C++ version by Marco Ghislanzoni.\n".. ! wx.wxLUA_VERSION_STRING.." built with "..wx.wxVERSION_STRING, "About wxLua Temperature Converter", wx.wxOK + wx.wxICON_INFORMATION, Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** editor.wx.lua 21 May 2007 01:08:00 -0000 1.49 --- editor.wx.lua 31 May 2007 17:18:55 -0000 1.50 *************** *** 101,106 **** -- ASCII values for common chars ! local char_CR = string.byte("\n") ! local char_LF = string.byte("\r") local char_Tab = string.byte("\t") local char_Sp = string.byte(" ") --- 101,106 ---- -- ASCII values for common chars ! local char_CR = string.byte("\r") ! local char_LF = string.byte("\n") local char_Tab = string.byte("\t") local char_Sp = string.byte(" ") *************** *** 177,187 **** editorApp:SetAppName("wxLua IDE") ! config = wx.wxConfigGet() ! config:SetRecordDefaults() -- ---------------------------------------------------------------------------- -- Create the wxFrame -- ---------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.wxNull, wx.wxID_ANY, "wxLua") statusBar = frame:CreateStatusBar( 4 ) --- 177,189 ---- editorApp:SetAppName("wxLua IDE") ! config = wx.wxConfigBase.Get() ! if config then ! config:SetRecordDefaults() ! end -- ---------------------------------------------------------------------------- -- Create the wxFrame -- ---------------------------------------------------------------------------- ! frame = wx.wxFrame(wx.NULL, wx.wxID_ANY, "wxLua") statusBar = frame:CreateStatusBar( 4 ) *************** *** 193,210 **** -- note: Ususally the bmp size isn't necessary, but the HELP icon is not the right size in MSW local toolBmpSize = toolBar:GetToolBitmapSize() ! toolBar:AddToolSimple(ID_NEW, "New", wx.wxArtProvider_GetBitmap(wx.wxART_NORMAL_FILE, wx.wxART_MENU, toolBmpSize), "Create an empty document") ! toolBar:AddToolSimple(ID_OPEN, "Open", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_MENU, toolBmpSize), "Open an existing document") ! toolBar:AddToolSimple(ID_SAVE, "Save", wx.wxArtProvider_GetBitmap(wx.wxART_FILE_SAVE, wx.wxART_MENU, toolBmpSize), "Save the current document") ! toolBar:AddToolSimple(ID_SAVEALL, "Save All", wx.wxArtProvider_GetBitmap(wx.wxART_NEW_DIR, wx.wxART_MENU, toolBmpSize), "Save all documents") toolBar:AddSeparator() ! toolBar:AddToolSimple(ID_CUT, "Cut", wx.wxArtProvider_GetBitmap(wx.wxART_CUT, wx.wxART_MENU, toolBmpSize), "Cut the selection") ! toolBar:AddToolSimple(ID_COPY, "Copy", wx.wxArtProvider_GetBitmap(wx.wxART_COPY, wx.wxART_MENU, toolBmpSize), "Copy the selection") ! toolBar:AddToolSimple(ID_PASTE, "Paste", wx.wxArtProvider_GetBitmap(wx.wxART_PASTE, wx.wxART_MENU, toolBmpSize), "Paste text from the clipboard") toolBar:AddSeparator() ! toolBar:AddToolSimple(ID_UNDO, "Undo", wx.wxArtProvider_GetBitmap(wx.wxART_UNDO, wx.wxART_MENU, toolBmpSize), "Undo last edit") ! toolBar:AddToolSimple(ID_REDO, "Redo", wx.wxArtProvider_GetBitmap(wx.wxART_REDO, wx.wxART_MENU, toolBmpSize), "Redo last undo") toolBar:AddSeparator() ! toolBar:AddToolSimple(ID_FIND, "Find", wx.wxArtProvider_GetBitmap(wx.wxART_FIND, wx.wxART_MENU, toolBmpSize), "Find text") ! toolBar:AddToolSimple(ID_REPLACE, "Replace", wx.wxArtProvider_GetBitmap(wx.wxART_FIND_AND_REPLACE, wx.wxART_MENU, toolBmpSize), "Find and replace text") toolBar:Realize() --- 195,212 ---- -- note: Ususally the bmp size isn't necessary, but the HELP icon is not the right size in MSW local toolBmpSize = toolBar:GetToolBitmapSize() ! toolBar:AddTool(ID_NEW, "New", wx.wxArtProvider.GetBitmap(wx.wxART_NORMAL_FILE, wx.wxART_MENU, toolBmpSize), "Create an empty document") ! toolBar:AddTool(ID_OPEN, "Open", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_OPEN, wx.wxART_MENU, toolBmpSize), "Open an existing document") ! toolBar:AddTool(ID_SAVE, "Save", wx.wxArtProvider.GetBitmap(wx.wxART_FILE_SAVE, wx.wxART_MENU, toolBmpSize), "Save the current document") ! toolBar:AddTool(ID_SAVEALL, "Save All", wx.wxArtProvider.GetBitmap(wx.wxART_NEW_DIR, wx.wxART_MENU, toolBmpSize), "Save all documents") toolBar:AddSeparator() ! toolBar:AddTool(ID_CUT, "Cut", wx.wxArtProvider.GetBitmap(wx.wxART_CUT, wx.wxART_MENU, toolBmpSize), "Cut the selection") ! toolBar:AddTool(ID_COPY, "Copy", wx.wxArtProvider.GetBitmap(wx.wxART_COPY, wx.wxART_MENU, toolBmpSize), "Copy the selection") ! toolBar:AddTool(ID_PASTE, "Paste", wx.wxArtProvider.GetBitmap(wx.wxART_PASTE, wx.wxART_MENU, toolBmpSize), "Paste text from the clipboard") toolBar:AddSeparator() ! toolBar:AddTool(ID_UNDO, "Undo", wx.wxArtProvider.GetBitmap(wx.wxART_UNDO, wx.wxART_MENU, toolBmpSize), "Undo last edit") ! toolBar:AddTool(ID_REDO, "Redo", wx.wxArtProvider.GetBitmap(wx.wxART_REDO, wx.wxART_MENU, toolBmpSize), "Redo last undo") toolBar:AddSeparator() ! toolBar:AddTool(ID_FIND, "Find", wx.wxArtProvider.GetBitmap(wx.wxART_FIND, wx.wxART_MENU, toolBmpSize), "Find text") ! toolBar:AddTool(ID_REPLACE, "Replace", wx.wxArtProvider.GetBitmap(wx.wxART_FIND_AND_REPLACE, wx.wxART_MENU, toolBmpSize), "Find and replace text") toolBar:Realize() *************** *** 261,265 **** if h > clientHeight then h = clientHeight end ! window:SetSizeXYWH(x, y, w, h) elseif s == 1 then window:Maximize(true) --- 263,267 ---- if h > clientHeight then h = clientHeight end ! window:SetSize(x, y, w, h) elseif s == 1 then window:Maximize(true) *************** *** 274,279 **** local s = 0 ! local w, h = window:GetSize() ! local x, y = window:GetPosition() if window:IsMaximized() then --- 276,281 ---- local s = 0 ! local w, h = window:GetSizeWH() ! local x, y = window:GetPositionXY() if window:IsMaximized() then *************** *** 710,714 **** wx.wxDefaultPosition, wx.wxSize(width, 160)) ! local watchMenu = wx.wxCreateMenu{ { ID_ADDWATCH, "&Add Watch" }, { ID_EDITWATCH, "&Edit Watch\tF2" }, --- 712,716 ---- wx.wxDefaultPosition, wx.wxSize(width, 160)) ! local watchMenu = wx.wxMenu{ { ID_ADDWATCH, "&Add Watch" }, { ID_EDITWATCH, "&Edit Watch\tF2" }, *************** *** 821,825 **** menuBar = wx.wxMenuBar() ! fileMenu = wx.wxCreateMenu{ { ID_NEW, "&New\tCtrl-N", "Create an empty document" }, { ID_OPEN, "&Open...\tCtrl-O", "Open an existing document" }, --- 823,827 ---- menuBar = wx.wxMenuBar() ! fileMenu = wx.wxMenu({ { ID_NEW, "&New\tCtrl-N", "Create an empty document" }, { ID_OPEN, "&Open...\tCtrl-O", "Open an existing document" }, *************** *** 830,834 **** { ID_SAVEALL, "Save A&ll...\tCtrl-Shift-S", "Save all open documents" }, { }, ! { ID_EXIT, "E&xit\tAlt-X", "Exit Program" }} menuBar:Append(fileMenu, "&File") --- 832,836 ---- { ID_SAVEALL, "Save A&ll...\tCtrl-Shift-S", "Save all open documents" }, { }, ! { ID_EXIT, "E&xit\tAlt-X", "Exit Program" }}) menuBar:Append(fileMenu, "&File") *************** *** 1117,1121 **** -- Create the Edit menu and attach the callback functions ! editMenu = wx.wxCreateMenu{ { ID_CUT, "Cu&t\tCtrl-X", "Cut selected text to clipboard" }, { ID_COPY, "&Copy\tCtrl-C", "Copy selected text to the clipboard" }, --- 1119,1123 ---- -- Create the Edit menu and attach the callback functions ! editMenu = wx.wxMenu{ { ID_CUT, "Cu&t\tCtrl-X", "Cut selected text to... [truncated message content] |
From: John L. <jr...@us...> - 2007-05-31 17:18:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxluasocket/src Modified Files: wxldtarg.cpp wxlsock.cpp wxluasocket.cpp wxluasocket_bind.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxldtarg.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldtarg.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxldtarg.cpp 23 May 2007 02:48:31 -0000 1.36 --- wxldtarg.cpp 31 May 2007 17:18:55 -0000 1.37 *************** *** 215,218 **** --- 215,219 ---- ret = AddBreakPoint(fileName, lineNumber); } + break; } case wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT: Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxluasocket_bind.cpp 19 Mar 2007 03:47:21 -0000 1.15 --- wxluasocket_bind.cpp 31 May 2007 17:18:55 -0000 1.16 *************** *** 104,108 **** { ! { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; --- 104,108 ---- { ! { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; *************** *** 120,125 **** static WXLUACLASS classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL }, { 0, 0, 0, 0, 0, 0, 0 }, --- 120,125 ---- static WXLUACLASS classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL ,wxLuaDebuggerEvent_enums, wxLuaDebuggerEvent_enumCount, }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL ,wxLuaDebuggerServer_enums, wxLuaDebuggerServer_enumCount, }, { 0, 0, 0, 0, 0, 0, 0 }, Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wxluasocket.cpp 19 Mar 2007 03:47:21 -0000 1.20 --- wxluasocket.cpp 31 May 2007 17:18:55 -0000 1.21 *************** *** 28,31 **** --- 28,34 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }}; + // bool AddBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) *************** *** 34,38 **** bool returns; // int lineNumber ! int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName const wxString fileName = wxlState.GetwxStringType(2); --- 37,41 ---- bool returns; // int lineNumber ! int lineNumber = (int)wxlua_getnumbertype(L, 3); // const wxString fileName const wxString fileName = wxlState.GetwxStringType(2); *************** *** 47,50 **** --- 50,56 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }}; + // bool Break() static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) *************** *** 62,65 **** --- 68,74 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluaargArray_None }}; + // bool ClearAllBreakPoints() static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) *************** *** 77,80 **** --- 86,92 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }}; + // bool Continue() static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) *************** *** 92,95 **** --- 104,110 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete[1] = {{ wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) { *************** *** 106,109 **** --- 121,127 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }}; + // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) *************** *** 113,117 **** int argCount = lua_gettop(L); // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlState.GetNumberType(3) : wxID_ANY); // wxWindow pParent wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); --- 131,135 ---- int argCount = lua_gettop(L); // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxWindow pParent wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); *************** *** 125,128 **** --- 143,149 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }}; + // bool EvaluateExpr(int exprRef, const wxString &expr) static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) *************** *** 133,137 **** const wxString expr = wxlState.GetwxStringType(3); // int exprRef ! int exprRef = (int)wxlState.GetNumberType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); --- 154,158 ---- const wxString expr = wxlState.GetwxStringType(3); // int exprRef ! int exprRef = (int)wxlua_getnumbertype(L, 2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); *************** *** 144,147 **** --- 165,171 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluaargArray_None }}; + // long GetDebuggeeProcessId() const static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) *************** *** 159,162 **** --- 183,189 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName[1] = {{ wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }}; + // static wxString GetNetworkName() static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) *************** *** 172,175 **** --- 199,205 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName[1] = {{ wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }}; + // static wxString GetProgramName() static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) *************** *** 185,188 **** --- 215,221 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }}; + // bool KillDebuggee() static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) *************** *** 201,204 **** --- 234,240 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }}; + // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) *************** *** 207,211 **** bool returns; // int lineNumber ! int lineNumber = (int)wxlState.GetNumberType(3); // const wxString fileName const wxString fileName = wxlState.GetwxStringType(2); --- 243,247 ---- bool returns; // int lineNumber ! int lineNumber = (int)wxlua_getnumbertype(L, 3); // const wxString fileName const wxString fileName = wxlState.GetwxStringType(2); *************** *** 220,223 **** --- 256,262 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }}; + // bool Reset() static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) *************** *** 236,239 **** --- 275,281 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }}; + // bool Run(const wxString &file, const wxString &fileName) static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) *************** *** 255,258 **** --- 297,303 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }}; + // long StartClient() static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) *************** *** 270,273 **** --- 315,321 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluaargArray_None }}; + // bool StartServer() static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) *************** *** 285,288 **** --- 333,339 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }}; + // bool Step() static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) *************** *** 300,303 **** --- 351,357 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }}; + // bool StepOut() static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) *************** *** 315,318 **** --- 369,375 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }}; + // bool StepOver() static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) *************** *** 330,333 **** --- 387,393 ---- } + static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }}; + // bool StopServer() static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) *************** *** 346,356 **** static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerServer *returns; // int portNumber ! int portNumber = (int)wxlState.GetNumberType(1); // call constructor returns = new wxLuaDebuggerServer(portNumber); --- 406,420 ---- static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; + static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }}; + // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) { + wxlua_removetableforcall(L); wxLuaState wxlState(L); wxLuaDebuggerServer *returns; // int portNumber ! int portNumber = (int)wxlua_getnumbertype(L, 1); // call constructor returns = new wxLuaDebuggerServer(portNumber); *************** *** 367,396 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { ! { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }, ! { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }, ! { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]) - 1; // --------------------------------------------------------------------------- // Bind class wxLuaDebuggerEvent --- 431,467 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { ! { WXLUAMETHOD_METHOD, "AddBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint, 1 }, ! { WXLUAMETHOD_METHOD, "Break", s_wxluafunc_wxLua_wxLuaDebuggerServer_Break, 1 }, ! { WXLUAMETHOD_METHOD, "ClearAllBreakPoints", s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 1 }, ! { WXLUAMETHOD_METHOD, "Continue", s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue, 1 }, ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete }, ! { WXLUAMETHOD_METHOD, "DisplayStackDialog", s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1 }, ! { WXLUAMETHOD_METHOD, "EvaluateExpr", s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr, 1 }, ! { WXLUAMETHOD_METHOD, "GetDebuggeeProcessId", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetNetworkName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName, 1 }, ! { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetProgramName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName, 1 }, ! { WXLUAMETHOD_METHOD, "KillDebuggee", s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee, 1 }, ! { WXLUAMETHOD_METHOD, "RemoveBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 1 }, ! { WXLUAMETHOD_METHOD, "Reset", s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset, 1 }, ! { WXLUAMETHOD_METHOD, "Run", s_wxluafunc_wxLua_wxLuaDebuggerServer_Run, 1 }, ! { WXLUAMETHOD_METHOD, "StartClient", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient, 1 }, ! { WXLUAMETHOD_METHOD, "StartServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer, 1 }, ! { WXLUAMETHOD_METHOD, "Step", s_wxluafunc_wxLua_wxLuaDebuggerServer_Step, 1 }, ! { WXLUAMETHOD_METHOD, "StepOut", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut, 1 }, ! { WXLUAMETHOD_METHOD, "StepOver", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver, 1 }, ! { WXLUAMETHOD_METHOD, "StopServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer, 1 }, ! { WXLUAMETHOD_CONSTRUCTOR, "wxLuaDebuggerServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]) - 1; + + WXLUADEFINE wxLuaDebuggerServer_enums[] = { + { NULL, 0, }, + }; + + int wxLuaDebuggerServer_enumCount = sizeof(wxLuaDebuggerServer_enums)/sizeof(wxLuaDebuggerServer_enums[0]) - 1; + // --------------------------------------------------------------------------- // Bind class wxLuaDebuggerEvent *************** *** 400,403 **** --- 471,477 ---- int s_wxluatag_wxLuaDebuggerEvent = -1; + static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete[1] = {{ wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }}; + static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) { *************** *** 413,416 **** --- 487,493 ---- } + static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }}; + // wxString GetFileName() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) *************** *** 428,431 **** --- 505,511 ---- } + static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }}; + // int GetLineNumber() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) *************** *** 443,446 **** --- 523,529 ---- } + static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }}; + // wxString GetMessage() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) *************** *** 458,461 **** --- 541,547 ---- } + static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L); + static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }}; + // int GetReference() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) *************** *** 477,488 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, 0, 0, 0, 0 }, }; int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]) - 1; --- 563,581 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete }, ! { WXLUAMETHOD_METHOD, "GetFileName", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName, 1 }, ! { WXLUAMETHOD_METHOD, "GetLineNumber", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber, 1 }, ! { WXLUAMETHOD_METHOD, "GetMessage", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage, 1 }, ! { WXLUAMETHOD_METHOD, "GetReference", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference, 1 }, ! { WXLUAMETHOD_METHOD, 0, 0, 0 }, }; int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]) - 1; + + WXLUADEFINE wxLuaDebuggerEvent_enums[] = { + { NULL, 0, }, + }; + + int wxLuaDebuggerEvent_enumCount = sizeof(wxLuaDebuggerEvent_enums)/sizeof(wxLuaDebuggerEvent_enums[0]) - 1; + Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** wxlsock.cpp 23 May 2007 02:48:31 -0000 1.27 --- wxlsock.cpp 31 May 2007 17:18:55 -0000 1.28 *************** *** 181,185 **** pMemory += sizeof(wxInt32); ! bool fExpanded = (0 != (*(wxInt32 *) pMemory)); pMemory += sizeof(wxInt32); --- 181,185 ---- pMemory += sizeof(wxInt32); ! wxInt32 flag = *(wxInt32 *) pMemory; pMemory += sizeof(wxInt32); *************** *** 192,202 **** const char *pSourcePtr = pMemory; ! wxLuaDebugDataItem *pItem = new wxLuaDebugDataItem(lua2wx(pNamePtr), ! lua2wx(pTypePtr), ! lua2wx(pValuePtr), ! lua2wx(pSourcePtr), ! nReference, ! nIndex, ! fExpanded); debugData.Add(pItem); --- 192,202 ---- const char *pSourcePtr = pMemory; ! wxLuaDebugItem *pItem = new wxLuaDebugItem(lua2wx(pNamePtr), ! lua2wx(pTypePtr), ! lua2wx(pValuePtr), ! lua2wx(pSourcePtr), ! nReference, ! nIndex, ! flag); debugData.Add(pItem); *************** *** 245,249 **** // [wxInt32 debug data item count] then for each item // [wxInt32 item data length] ! // [{wxInt32 GetReference}{wxInt32 GetIndex}{wxInt32 GetExpanded} // {char GetName \0}{char GetType \0}{char GetValue \0}{char GetSource \0}] --- 245,249 ---- // [wxInt32 debug data item count] then for each item // [wxInt32 item data length] ! // [{wxInt32 GetReference}{wxInt32 GetIndex}{wxInt32 GetFlag} // {char GetName \0}{char GetType \0}{char GetValue \0}{char GetSource \0}] *************** *** 257,261 **** for (idx = 0; ok && (idx < idxMax); ++idx) { ! const wxLuaDebugDataItem *item = debugData.Item(idx); wxLuaCharBuffer nameBuffer(item->GetName()); --- 257,261 ---- for (idx = 0; ok && (idx < idxMax); ++idx) { ! const wxLuaDebugItem *item = debugData.Item(idx); wxLuaCharBuffer nameBuffer(item->GetName()); *************** *** 284,288 **** pMemory += sizeof(wxInt32); ! *(wxInt32 *) pMemory = (wxInt32)(item->GetExpanded() ? 1 : 0); pMemory += sizeof(wxInt32); --- 284,288 ---- pMemory += sizeof(wxInt32); ! *(wxInt32 *) pMemory = (wxInt32)item->GetFlag(); pMemory += sizeof(wxInt32); |
From: John L. <jr...@us...> - 2007-05-31 17:18:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxluadebug/include Modified Files: wxldebug.h wxlstack.h Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxldebug.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxldebug.h 23 May 2007 02:48:31 -0000 1.33 --- wxldebug.h 31 May 2007 17:18:54 -0000 1.34 *************** *** 19,36 **** // ---------------------------------------------------------------------------- ! // wxLuaDebugDataItem - // ---------------------------------------------------------------------------- ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugDataItem : public wxTreeItemData { public: ! wxLuaDebugDataItem(const wxLuaDebugDataItem &debugDataItem); ! wxLuaDebugDataItem(const wxString &itemName, ! const wxString &itemType, ! const wxString &itemValue, ! const wxString &itemSource, ! int lua_ref, ! int idx = 0, ! bool expanded = false); wxString GetName() const { return m_itemName; } --- 19,61 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebugItem - // ---------------------------------------------------------------------------- ! enum wxLuaDebugItem_Type ! { ! WXLUA_DEBUGITEM_T_SHIFT = 2, // items shifted +2 from LUA_TXXX ! // See wxLuaDebugData constructor for check ! ! // NOTE: These MUST be in the same order as the wxLuaStackDialog's IMG_XXX enums ! WXLUA_DEBUGITEM_TUNKNOWN = 0, // unset and invalid ! WXLUA_DEBUGITEM_TNONE = 1, // LUA_TNONE ! WXLUA_DEBUGITEM_TNIL = 2, // LUA_TNIL ! WXLUA_DEBUGITEM_TBOOLEAN = 3, // LUA_TBOOLEAN ! WXLUA_DEBUGITEM_TLIGHTUSERDATA = 4, // LUA_TLIGHTUSERDATA ! WXLUA_DEBUGITEM_TNUMBER = 5, // LUA_TNUMBER ! WXLUA_DEBUGITEM_TSTRING = 6, // LUA_TSTRING ! WXLUA_DEBUGITEM_TTABLE = 7, // LUA_TTABLE ! WXLUA_DEBUGITEM_TFUNCTION = 8, // LUA_TFUNCTION ! WXLUA_DEBUGITEM_TUSERDATA = 9, // LUA_TUSERDATA ! WXLUA_DEBUGITEM_TTHREAD = 10, // LUA_TTHREAD ! WXLUA_DEBUGITEM_TCFUNCTION = 11, // LUA_TFUNCTION & lua_iscfunction, not a LUA_TXXX ! ! WXLUA_DEBUGITEM_T_COUNT = 12, // # of T items ! WXLUA_DEBUGITEM_T_MASK = 0x00ff, ! ! WXLUA_DEBUGITEM_EXPANDED = 0x0200 ! }; ! ! class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugItem { public: ! wxLuaDebugItem(const wxLuaDebugItem &debugDataItem); ! wxLuaDebugItem(const wxString &itemName, ! const wxString &itemType, ! const wxString &itemValue, ! const wxString &itemSource, ! int lua_ref, ! int idx = 0, ! int flag = 0); wxString GetName() const { return m_itemName; } *************** *** 39,52 **** wxString GetSource() const { return m_itemSource; } int GetReference() const { return m_lua_ref; } // ttag reference ! int GetIndex() const { return m_index; } ! bool GetExpanded() const { return m_expanded; } // expanded in stack dialog ! void SetExpanded(bool expanded) { m_expanded = expanded; } // Get a human readable string for debugging wxString ToString() const { ! return wxString::Format(wxT("Name: '%s' Type: '%s' Value: '%s' Ref: %d Idx: %d Expanded: %d HasSrc: %d"), ! m_itemName.c_str(), m_itemType.c_str(), m_itemValue.c_str(), m_lua_ref, m_index, (int)m_expanded, (int)!m_itemSource.IsEmpty()); } --- 64,80 ---- wxString GetSource() const { return m_itemSource; } int GetReference() const { return m_lua_ref; } // ttag reference ! int GetIndex() const { return m_index; } // stack index or table level index ! int GetFlag() const { return m_flag; } // see wxLuaDebugItem_Type ! bool GetFlagBit(int mask) const { return WXLUA_HASBIT(m_flag, mask); } ! int GetTypeN() const { return m_flag & WXLUA_DEBUGITEM_T_MASK; } ! void SetFlag(int flag) { m_flag = flag; } ! void SetFlagBit(int bit, bool set) { m_flag = WXLUA_SETBIT(m_flag, bit, set); } // Get a human readable string for debugging wxString ToString() const { ! return wxString::Format(wxT("Name: '%s' Type: '%s' Value: '%s' Ref: %d Idx: %d Flag: %d HasSrc: %d"), ! m_itemName.c_str(), m_itemType.c_str(), m_itemValue.c_str(), m_lua_ref, m_index, m_flag, (int)!m_itemSource.IsEmpty()); } *************** *** 58,72 **** int m_lua_ref; int m_index; ! bool m_expanded; }; #if defined(WXMAKINGDLL_WXLUADEBUG) || defined(WXUSINGDLL) ! WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxLuaDebugDataItem *, wxLuaDebugDataItemArray, WXDLLIMPEXP_WXLUADEBUG); #else ! WX_DEFINE_SORTED_ARRAY(wxLuaDebugDataItem *, wxLuaDebugDataItemArray); #endif // ---------------------------------------------------------------------------- ! // wxLuaDebugData - a wxObject ref counted container for a wxLuaDebugDataItemArray // The Ref data is always expected to exist and the destructor deletes the array items // ---------------------------------------------------------------------------- --- 86,100 ---- int m_lua_ref; int m_index; ! int m_flag; }; #if defined(WXMAKINGDLL_WXLUADEBUG) || defined(WXUSINGDLL) ! WX_DEFINE_SORTED_USER_EXPORTED_ARRAY(wxLuaDebugItem *, wxLuaDebugItemArray, WXDLLIMPEXP_WXLUADEBUG); #else ! WX_DEFINE_SORTED_ARRAY(wxLuaDebugItem *, wxLuaDebugItemArray); #endif // ---------------------------------------------------------------------------- ! // wxLuaDebugData - a wxObject ref counted container for a wxLuaDebugItemArray // The Ref data is always expected to exist and the destructor deletes the array items // ---------------------------------------------------------------------------- *************** *** 81,93 **** // Get the data array, please use safe array access functions if possible ! wxLuaDebugDataItemArray* GetArray(); ! const wxLuaDebugDataItemArray* GetArray() const; // wxArray functions mapped to the internal array w/ error checking ! // The wxLuaDebugDataItem items added must be created with 'new' and // will be deleted when this class is destroyed. size_t GetCount() const; ! wxLuaDebugDataItem* Item(size_t index) const; ! void Add(wxLuaDebugDataItem* item); // fill this with the stack entries for the wxLuaState --- 109,121 ---- // Get the data array, please use safe array access functions if possible ! wxLuaDebugItemArray* GetArray(); ! const wxLuaDebugItemArray* GetArray() const; // wxArray functions mapped to the internal array w/ error checking ! // The wxLuaDebugItem items added must be created with 'new' and // will be deleted when this class is destroyed. size_t GetCount() const; ! wxLuaDebugItem* Item(size_t index) const; ! void Add(wxLuaDebugItem* item); // fill this with the stack entries for the wxLuaState *************** *** 104,110 **** // give a consistent feel to the display of lua values. ! // Get a human readable string name of the lua_type(L, index) and the ! // value at the index, returns the value of lua_type ! static int GetTypeValue(const wxLuaState& wxlState, int index, wxString& type, wxString& value); // Write the input number as either an int, uint, or as a double static wxString MakeNumber(double dnum); --- 132,139 ---- // give a consistent feel to the display of lua values. ! // Get a human readable string name of the lua_type(L, index), the ! // value at the index, and optionally the wxLuaDebugItem_Type flag type. ! // returns the value of lua_type ! static int GetTypeValue(const wxLuaState& wxlState, int index, wxString& type, wxString& value, int* type_flag = NULL); // Write the input number as either an int, uint, or as a double static wxString MakeNumber(double dnum); *************** *** 120,125 **** wxLuaDebugData Copy() const; ! // Sorting function for the wxLuaDebugDataItemArray, sorts by name ! static int SortFunction(wxLuaDebugDataItem *elem1, wxLuaDebugDataItem *elem2 ); //------------------------------------------------------------------------- --- 149,154 ---- wxLuaDebugData Copy() const; ! // Sorting function for the wxLuaDebugItemArray, sorts by name ! static int SortFunction(wxLuaDebugItem *elem1, wxLuaDebugItem *elem2 ); //------------------------------------------------------------------------- *************** *** 147,156 **** wxLuaCheckStack(lua_State* L, const wxString &msg); ~wxLuaCheckStack(); void TestStack(const wxString &msg); ! static void DumpGlobals(lua_State* L); ! static void DumpTable(lua_State* L, const wxString &tableName); ! static void DumpTable(lua_State* L, int index, const wxString& tablename, wxLuaStringToLongHashMap& dumpList, int indent); ! static void DumpStack(lua_State* L); private: --- 176,188 ---- wxLuaCheckStack(lua_State* L, const wxString &msg); ~wxLuaCheckStack(); + void TestStack(const wxString &msg); ! void DumpGlobals(); ! void DumpTable(const wxString &tableName); ! void DumpTable(int index, const wxString& tablename, wxLuaStringToLongHashMap& dumpList, int indent); ! void DumpStack(); ! ! void OutputMsg(const wxString& msg) const; private: Index: wxlstack.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxlstack.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlstack.h 24 May 2007 00:59:46 -0000 1.1 --- wxlstack.h 31 May 2007 17:18:54 -0000 1.2 *************** *** 25,30 **** enum { ! ID_WXLUA_STACKDIALOG_COMBO = 2000, ! ID_WXLUA_STACKDIALOG_LISTCTRL }; --- 25,35 ---- enum { ! ID_WXLUA_STACK_CHOICE = 2000, ! ID_WXLUA_STACK_EXPAND_BUTTON, ! ID_WXLUA_STACK_FIND_COMBO, ! ID_WXLUA_STACK_FINDNEXT_BUTTON, ! ID_WXLUA_STACK_FINDPREV_BUTTON, ! ID_WXLUA_STACK_FINDCASE_CHECKBOX, ! ID_WXLUA_STACK_LISTCTRL }; *************** *** 57,79 **** // Icon indexes for image list used in the listctrl enum { IMG_UNKNOWN, ! IMG_TABLE, ! IMG_TABLE_OPEN, IMG_NIL, ! IMG_BOOL, IMG_NUMBER, IMG_STRING, ! IMG_CFUNCTION, IMG_LUAFUNCTION, IMG_USERDATA, ! IMG_LIGHTUSERDATA, ! IMG_THREAD }; // Draw the string centered in the bitmap virtual wxBitmap CreateBmpString(const wxBitmap& bmp, const wxString& s); ! virtual int SetupListItem(const wxLuaDebugDataItem *dbgItem, wxListItem& lItem); // Override these functions if you need to provide an alternate way to get --- 62,89 ---- // Icon indexes for image list used in the listctrl + // NOTE: These MUST be in the same order as the wxLuaDebugItem_Type enums enum { IMG_UNKNOWN, ! IMG_NONE, IMG_NIL, ! IMG_BOOLEAN, ! IMG_LIGHTUSERDATA, IMG_NUMBER, IMG_STRING, ! IMG_TABLE, IMG_LUAFUNCTION, IMG_USERDATA, ! IMG_THREAD, ! IMG_CFUNCTION, ! ! IMG_TABLE_OPEN, ! IMG__COUNT }; // Draw the string centered in the bitmap virtual wxBitmap CreateBmpString(const wxBitmap& bmp, const wxString& s); ! // Set the image and color to use ! virtual int SetupListItem(const wxLuaDebugItem *dbgItem, wxListItem& lItem); // Override these functions if you need to provide an alternate way to get *************** *** 98,101 **** --- 108,114 ---- // implementation + void OnExpandButton(wxCommandEvent& event); + void OnFind(wxCommandEvent& event); + // Handle and set the stack from the stack combobox selection void OnSelectStack(wxCommandEvent &event); *************** *** 105,123 **** void OnAllItemsDeleted(wxListEvent &event); void OnItemActivated(wxListEvent &event); ! void ItemExpanding(long lc_item); protected: void DeleteAllListItemData(); ! wxListCtrl *m_listCtrl; ! wxComboBox *m_stackComboBox; // display stack entries ! int m_stack_sel; // current stack selection ! wxArrayInt m_stackEntries; // stack entry references ! wxLuaState m_wxlState; // lua_State to show stack for ! wxArrayInt m_luaReferences; // references from m_wxlState.tinsert ! wxImageList *m_imageList; // image list for listctrl private: --- 118,140 ---- void OnAllItemsDeleted(wxListEvent &event); void OnItemActivated(wxListEvent &event); ! bool ExpandItem(long lc_item, bool show_err_msg = true); protected: void DeleteAllListItemData(); ! wxListCtrl* m_listCtrl; ! wxChoice* m_stackChoice; // display stack entries ! int m_stack_sel; // current stack selection ! wxArrayInt m_stackEntries; // stack entry references ! wxComboBox* m_findComboBox; // Find string combobox ! wxCheckBox* m_findCaseCheckBox; // Find case sensitive ! wxLuaState m_wxlState; // lua_State to show stack for ! wxArrayInt m_luaReferences; // references from m_wxlState.tinsert ! ! wxImageList* m_imageList; // image list for listctrl ! wxColour m_typeColours[IMG__COUNT]; private: |
From: John L. <jr...@us...> - 2007-05-31 17:18:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlstate.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** wxlstate.cpp 21 May 2007 01:07:59 -0000 1.97 --- wxlstate.cpp 31 May 2007 17:18:54 -0000 1.98 *************** *** 2176,2180 **** { int stack_tag = ttag(stack_idx); ! if ((M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxLuaFunction == stack_tag) || IsDerivedClass(stack_tag, tag)) return true; --- 2176,2181 ---- { int stack_tag = ttag(stack_idx); ! if ((M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL == stack_tag) || // FIXME ! (M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_wxLuaFunction == stack_tag) || IsDerivedClass(stack_tag, tag)) return true; *************** *** 2391,2400 **** WXLUAMETHOD* wxLuaState::GetLuaMethod(const WXLUACLASS *pClass, const char *cpIndex) { ! int i_method, method_count = pClass->num_methods; // find a method in the class, recurse through classes from which this class is derived. for (i_method = 0; i_method < method_count; ++i_method) { WXLUAMETHOD *pMethod = pClass->methods + i_method; ! if (((pMethod->type == LuaMethod) || (pMethod->type == LuaGetProp)) && (strcmp(pMethod->name, cpIndex) == 0)) { --- 2392,2401 ---- WXLUAMETHOD* wxLuaState::GetLuaMethod(const WXLUACLASS *pClass, const char *cpIndex) { ! int i_method, method_count = pClass->methods_n; // find a method in the class, recurse through classes from which this class is derived. for (i_method = 0; i_method < method_count; ++i_method) { WXLUAMETHOD *pMethod = pClass->methods + i_method; ! if (WXLUA_HASBIT(pMethod->type, WXLUAMETHOD_METHOD | WXLUAMETHOD_GETPROP) && (strcmp(pMethod->name, cpIndex) == 0)) { *************** *** 2403,2412 **** } ! // Try Base Class ! wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState")); ! ! const WXLUACLASS* pBaseClass = GetBaseLuaClass(*pClass->class_tag); ! if (pBaseClass) ! return GetLuaMethod(pBaseClass, cpIndex); return NULL; --- 2404,2409 ---- } ! if (pClass->baseclass) ! return GetLuaMethod(pClass->baseclass, cpIndex); return NULL; *************** *** 2417,2421 **** wxCHECK_MSG(pClass, NULL, wxT("Invalid WXLUACLASS in wxLuaState::GetLuaProperty")); ! int i_method, method_count = pClass->num_methods; // find a method in the class, recurse through classes from which this class is derived. for (i_method = 0; i_method < method_count; ++i_method) --- 2414,2418 ---- wxCHECK_MSG(pClass, NULL, wxT("Invalid WXLUACLASS in wxLuaState::GetLuaProperty")); ! int i_method, method_count = pClass->methods_n; // find a method in the class, recurse through classes from which this class is derived. for (i_method = 0; i_method < method_count; ++i_method) *************** *** 2424,2443 **** if (isLuaSetProp) { ! if ((pMethod->type == LuaSetProp) && (strcmp(pMethod->name, cpIndex) == 0)) return pMethod; } else { ! if ((pMethod->type == LuaGetProp) && (strcmp(pMethod->name, cpIndex) == 0)) return pMethod; } } ! // Try Base Class ! wxCHECK_MSG(Ok(), NULL, wxT("Invalid wxLuaState")); ! ! const WXLUACLASS* pBaseClass = GetBaseLuaClass(*pClass->class_tag); ! if (pBaseClass) ! return GetLuaProperty(pBaseClass, cpIndex, isLuaSetProp); return NULL; --- 2421,2436 ---- if (isLuaSetProp) { ! if (WXLUA_HASBIT(pMethod->type, WXLUAMETHOD_SETPROP) && (strcmp(pMethod->name, cpIndex) == 0)) return pMethod; } else { ! if (WXLUA_HASBIT(pMethod->type, WXLUAMETHOD_GETPROP) && (strcmp(pMethod->name, cpIndex) == 0)) return pMethod; } } ! if (pClass->baseclass) ! return GetLuaProperty(pClass->baseclass, cpIndex, isLuaSetProp); return NULL; *************** *** 3220,3242 **** } // Redirect lua function call to 1 method from a list of overloaded functions ! int LUACALL wxLuaState::CallOverloadedFunction(struct WXLUAMETHOD* overloadedMethods, int overloadedMethodCount) { ! int i, j, arg; ! int bestMethod = -1; int invalidArg = -1; - int maxargs = -1; - int minargs = -1; // do nothing ! if (!overloadedMethods && (overloadedMethodCount == 0)) return 0; // get number of arguments called from lua int argCount = lua_GetTop(); int lua_argStart = 0; // for methods like pen:SetColour(0,0,0) first lua arg is the wxPen (eg. self) ! if (overloadedMethods[0].type == LuaMethod) { argCount--; --- 3213,3320 ---- } + + wxString wxLuaState::CreateMethodArgTagsMsg(struct WXLUAMETHOD* method) + { + wxCHECK_MSG(method, wxEmptyString, wxT("Invalid method table")); + + wxString fnOverloadList; + int i, arg, funcs_count = method->funcs_n; + WXLUAMETHOD_CFUNC* funcs = method->funcs; + + for (i = 0; i < funcs_count; i++) + { + wxString fnOverload = wxString::Format(wxT("%02d. %s("), (i+1), lua2wx(method->name).c_str()); + + for (arg = 0; arg < funcs[i].maxargs; arg++) + { + // optional args? + if ((funcs[i].minargs < funcs[i].maxargs) && (arg == funcs[i].minargs)) + { + fnOverload += wxT("["); + } + + if (arg > 0) + fnOverload += wxT(", "); + + int tag = (int)*(funcs[i].argtags[arg]); + + if (tag == s_wxluaarg_String) + { + fnOverload += wxT("string"); + } + else if (tag == s_wxluaarg_Boolean) + { + fnOverload += wxT("boolean"); + } + else if (tag == s_wxluaarg_Enumeration) + { + fnOverload += wxT("enum"); + } + else if (tag == s_wxluaarg_Number) + { + fnOverload += wxT("number"); + } + else if (tag == s_wxluaarg_LightUserData) + { + fnOverload += wxT("lightuserdata"); + } + else if (tag == s_wxluaarg_UserData) + { + fnOverload += wxT("userdata"); + } + else if (tag == s_wxluaarg_LuaTable) + { + fnOverload += wxT("luatable"); + } + else if (tag == s_wxluaarg_LuaFunction) + { + fnOverload += wxT("luafunction"); + } + else + { + fnOverload += GetLuaTagName(tag); + } + } + + // close optional args + if (funcs[i].minargs < funcs[i].maxargs) + { + fnOverload += wxT("]"); + } + + fnOverload += wxT(")"); + + fnOverloadList += fnOverload + wxT("\n"); + } + + return fnOverloadList; + } + // Redirect lua function call to 1 method from a list of overloaded functions ! int LUACALL wxLuaState::CallOverloadedFunction(struct WXLUAMETHOD* overloadedMethods) { ! wxCHECK_MSG(overloadedMethods, 0, wxT("Invalid overloaded method table")); ! ! int i, arg; int invalidArg = -1; // do nothing ! if (!overloadedMethods || (overloadedMethods->funcs_n < 1)) return 0; + bool remove_table = wxlua_removetableforcall(GetLuaState(), true); + // get number of arguments called from lua int argCount = lua_GetTop(); int lua_argStart = 0; + if (remove_table) + { + argCount--; + lua_argStart++; + } + // for methods like pen:SetColour(0,0,0) first lua arg is the wxPen (eg. self) ! if (WXLUA_HASBIT(overloadedMethods[0].type, WXLUAMETHOD_METHOD)) { argCount--; *************** *** 3244,3256 **** } // prepare overload function table WXLUAMETHOD** overloadFunctionTable = new WXLUAMETHOD*[overloadedMethodCount]; for (i = 0; i < overloadedMethodCount; i++) { ! if ((maxargs == -1) || (maxargs < overloadedMethods[i].maxargs)) ! maxargs = overloadedMethods[i].maxargs; ! if ((minargs == -1) || (minargs > overloadedMethods[i].minargs)) ! minargs = overloadedMethods[i].minargs; overloadFunctionTable[i] = (overloadedMethods+i); --- 3322,3335 ---- } + #if 0 // prepare overload function table WXLUAMETHOD** overloadFunctionTable = new WXLUAMETHOD*[overloadedMethodCount]; for (i = 0; i < overloadedMethodCount; i++) { ! if ((maxargs == -1) || (maxargs < *overloadedMethods[i].args[1])) ! maxargs = *overloadedMethods[i].args[1]; ! if ((minargs == -1) || (minargs > *overloadedMethods[i].args[0])) ! minargs = *overloadedMethods[i].args[0]; overloadFunctionTable[i] = (overloadedMethods+i); *************** *** 3264,3270 **** for (j = i + 1; j < overloadedMethodCount; j++) { ! if ((overloadFunctionTable[j]->minargs > overloadFunctionTable[i]->minargs) || ! (overloadFunctionTable[j]->minargs == overloadFunctionTable[i]->minargs) && ! (overloadFunctionTable[j]->maxargs > overloadFunctionTable[i]->maxargs)) { // swap order --- 3343,3349 ---- for (j = i + 1; j < overloadedMethodCount; j++) { ! if ((*overloadFunctionTable[j]->args[0] > *overloadFunctionTable[i]->args[0]) || ! (*overloadFunctionTable[j]->args[0] == *overloadFunctionTable[i]->args[0]) && ! (*overloadFunctionTable[j]->args[1] > *overloadFunctionTable[i]->args[1])) { // swap order *************** *** 3276,3389 **** } #endif ! for (i = 0; i < overloadedMethodCount; i++) { ! // does function version handle argCount Arguments? ! if (argCount >= overloadFunctionTable[i]->minargs) { ! bool match = true; ! for (arg = 0; arg < argCount; arg++) { ! // does this method have any more arguments? ! if (!overloadFunctionTable[i]->argtags || !overloadFunctionTable[i]->argtags[arg]) ! { ! match = false; ! break; ! } ! // get argument tag id ! int tag = (int)*(overloadFunctionTable[i]->argtags[arg]); ! int ltype = lua_Type(arg+1+lua_argStart); ! if (tag == s_wxluaarg_String) ! { ! if ((ltype != LUA_TNIL) && (ltype != LUA_TSTRING)) ! { ! match = false; ! break; ! } ! } ! else if (tag == s_wxluaarg_Boolean) ! { ! if ((ltype != LUA_TNIL) && (ltype != LUA_TBOOLEAN)) ! { ! match = false; ! break; ! } ! } ! else if (tag == s_wxluaarg_Enumeration) { ! if (ltype != LUA_TNUMBER) ! { ! match = false; ! break; ! } } ! else if (tag == s_wxluaarg_Number) { ! if ((ltype != LUA_TNIL) && (ltype != LUA_TNUMBER)) ! { ! match = false; ! break; ! } } ! else if (tag == s_wxluaarg_LightUserData) { ! if (!lua_IsLightUserData(arg+1+lua_argStart)) ! { ! match = false; ! break; ! } } ! else if (tag == s_wxluaarg_UserData) { ! if (!lua_IsUserData(arg+1+lua_argStart)) ! { ! match = false; ! break; ! } } ! else if (tag == s_wxluaarg_LuaTable) { ! if (!lua_IsTable(arg+1+lua_argStart)) ! { ! match = false; ! break; ! } } ! else if (tag == s_wxluaarg_LuaFunction) { ! if (!lua_IsFunction(arg+1+lua_argStart)) ! { ! match = false; ! break; ! } } ! else if (!IsUserDataType(arg+1+lua_argStart, tag)) { ! match = false; ! break; } } ! ! if (match) { ! lua_CFunction func = overloadFunctionTable[i]->func; ! ! // cleanup sorted overload function table ! delete []overloadFunctionTable; ! ! // successfully found overloaded function to handle wxLua call ! return (*func)(M_WXLSTATEDATA->m_lua_State); } ! ! if (invalidArg < arg) { ! bestMethod = i; ! invalidArg = arg; } } } lua_Debug ar; lua_GetStack(0, &ar); --- 3355,3488 ---- } #endif + #endif // 0 ! int overloadedMethodCount = overloadedMethods->funcs_n; ! WXLUAMETHOD_CFUNC* overloadFunctionTable = overloadedMethods->funcs; ! ! // only look at the methods that could possibly work ! wxArrayPtrVoid funcArray; ! for (i = 0; i < overloadedMethodCount; ++i) { ! if ((argCount >= overloadFunctionTable[i].minargs) && ! (argCount <= overloadFunctionTable[i].maxargs)) ! funcArray.Add(&overloadFunctionTable[i]); ! } ! ! WXLUAMETHOD_CFUNC* bestFunc = NULL; // store the last function that worked. ! ! // Look at the available functions in parallel, per arg ! for (arg = 0; arg < argCount; arg++) ! { ! if (funcArray.GetCount() == 0u) { ! arg--; ! break; ! } ! ! int ltype = lua_Type(arg+1+lua_argStart); ! ! for (i = 0; i < (int)funcArray.GetCount(); i++) ! { ! WXLUAMETHOD_CFUNC* func = (WXLUAMETHOD_CFUNC*)funcArray[i]; ! bestFunc = func; ! ! // does this method have any more arguments? ! if (!func->argtags || !func->argtags[arg]) { ! // this one won't work, try the next ! funcArray.RemoveAt(i); i--; ! continue; ! } ! // get argument tag id ! int tag = (int)*(func->argtags[arg]); ! //wxPrintf(wxT("ARG '%s' argCount %d arg %d ltype %d wxtype %d func_count %d, f# %d\n"), lua2wx(overloadedMethods->name).c_str(), argCount, arg, ltype, tag, funcArray.GetCount(), i); ! ! if (tag == s_wxluaarg_String) ! { ! if ((ltype != LUA_TNIL) && (ltype != LUA_TSTRING)) { ! funcArray.RemoveAt(i); i--; ! continue; } ! } ! else if (tag == s_wxluaarg_Boolean) ! { ! if ((ltype != LUA_TNIL) && (ltype != LUA_TBOOLEAN)) { ! funcArray.RemoveAt(i); i--; ! continue; } ! } ! else if (tag == s_wxluaarg_Enumeration) ! { ! if (ltype != LUA_TNUMBER) { ! funcArray.RemoveAt(i); i--; ! continue; } ! } ! else if (tag == s_wxluaarg_Number) ! { ! if ((ltype != LUA_TNIL) && (ltype != LUA_TNUMBER)) { ! funcArray.RemoveAt(i); i--; ! continue; } ! } ! else if (tag == s_wxluaarg_LightUserData) ! { ! if (!lua_IsLightUserData(arg+1+lua_argStart)) { ! funcArray.RemoveAt(i); i--; ! continue; } ! } ! else if (tag == s_wxluaarg_UserData) ! { ! if (!lua_IsUserData(arg+1+lua_argStart)) { ! funcArray.RemoveAt(i); i--; ! continue; } ! } ! else if (tag == s_wxluaarg_LuaTable) ! { ! if (!lua_IsTable(arg+1+lua_argStart)) { ! funcArray.RemoveAt(i); i--; ! continue; } } ! else if (tag == s_wxluaarg_LuaFunction) { ! if (!lua_IsFunction(arg+1+lua_argStart)) ! { ! funcArray.RemoveAt(i); i--; ! continue; ! } } ! else if (!IsUserDataType(arg+1+lua_argStart, tag) && ! (tag != M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL)) // FIXME! { ! funcArray.RemoveAt(i); i--; ! continue; } } } + if (funcArray.GetCount() != 0) + { + lua_CFunction func = ((WXLUAMETHOD_CFUNC*)funcArray[0])->func; + + // successfully found overloaded function to handle wxLua call + return (*func)(M_WXLSTATEDATA->m_lua_State); + } + + if (invalidArg < arg) + invalidArg = arg; + + lua_Debug ar; lua_GetStack(0, &ar); *************** *** 3442,3521 **** wxString fnOverloadList = wxT("wxLua Function Overload Table:\n"); ! for (i = 0; i < overloadedMethodCount; i++) ! { ! wxString fnOverload = wxString::Format(wxT("%02d. %s("), (i+1), name.c_str()); ! ! for (arg = 0; arg < overloadFunctionTable[i]->maxargs; arg++) ! { ! // optional args? ! if ((overloadFunctionTable[i]->minargs < overloadFunctionTable[i]->maxargs) && ! (arg == overloadFunctionTable[i]->minargs)) ! { ! fnOverload += wxT("["); ! } ! ! if (arg > 0) ! fnOverload += wxT(", "); ! ! int tag = (int)*(overloadFunctionTable[i]->argtags[arg]); ! ! if (tag == s_wxluaarg_String) ! { ! fnOverload += wxT("string"); ! } ! else if (tag == s_wxluaarg_Boolean) ! { ! fnOverload += wxT("boolean"); ! } ! else if (tag == s_wxluaarg_Enumeration) ! { ! fnOverload += wxT("enum"); ! } ! else if (tag == s_wxluaarg_Number) ! { ! fnOverload += wxT("number"); ! } ! else if (tag == s_wxluaarg_LightUserData) ! { ! fnOverload += wxT("lightuserdata"); ! } ! else if (tag == s_wxluaarg_UserData) ! { ! fnOverload += wxT("userdata"); ! } ! else if (tag == s_wxluaarg_LuaTable) ! { ! fnOverload += wxT("luatable"); ! } ! else if (tag == s_wxluaarg_LuaFunction) ! { ! fnOverload += wxT("luafunction"); ! } ! else ! { ! fnOverload += GetLuaTagName(tag); ! } ! } ! ! // close optional args ! if (overloadFunctionTable[i]->minargs < overloadFunctionTable[i]->maxargs) ! { ! fnOverload += wxT("]"); ! } ! ! fnOverload += wxT(")"); ! ! fnOverloadList += fnOverload + wxT("\n"); ! } ! ! // cleanup sorted overload function table ! delete [] overloadFunctionTable; wxString errmsg; ! if (bestMethod == -1) errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument\n%s"), fnCall.c_str(), fnOverloadList.c_str()); else ! errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument %d on method %02d\n%s"), fnCall.c_str(), (invalidArg+1), (bestMethod+1), fnOverloadList.c_str()); terror(errmsg); --- 3541,3559 ---- wxString fnOverloadList = wxT("wxLua Function Overload Table:\n"); ! fnOverloadList += CreateMethodArgTagsMsg(overloadedMethods); wxString errmsg; ! if (bestFunc == NULL) errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument\n%s"), fnCall.c_str(), fnOverloadList.c_str()); else ! { ! for (i = 0; i < overloadedMethodCount; i++) ! { ! if (&overloadFunctionTable[i] == bestFunc) ! break; ! } ! errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument %d on method %02d\n%s"), fnCall.c_str(), (invalidArg+1), (i+1), fnOverloadList.c_str()); ! } terror(errmsg); Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** wxlbind.cpp 21 May 2007 01:07:59 -0000 1.60 --- wxlbind.cpp 31 May 2007 17:18:54 -0000 1.61 *************** *** 20,23 **** --- 20,25 ---- #include "wxlua/include/wxlstate.h" + #include "wxluadebug/include/wxldebug.h" // for debugging only + #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxLuaBindingList); *************** *** 31,34 **** --- 33,37 ---- wxLuaArgTag s_wxluaargArray_None[1] = {0}; + WXLUADEFINE s_wxluadefineArray_None[1] = {{0, 0}}; int s_wxluaarg_None = 0; *************** *** 51,55 **** // otherwise the colon notation *must* be used. lua_remove(L, 1); // remove the wxLuaFunction userdata from the stack ! return (*m_pMethod->func)(L); } --- 54,58 ---- // otherwise the colon notation *must* be used. lua_remove(L, 1); // remove the wxLuaFunction userdata from the stack ! return (*m_wxlMethod->funcs[0].func)(L); } *************** *** 81,84 **** --- 84,92 ---- { wxLuaFunction *pFunction = (wxLuaFunction *)wxlState.ttouserdata(1, false); + + // remove the userdata *this from the stack + if (pFunction->m_wxlMethod && WXLUA_HASBIT(pFunction->m_wxlMethod->type, WXLUAMETHOD_STATIC)) + lua_remove(L, 1); + return pFunction->CallMethod(L); } *************** *** 251,261 **** int retVal = 0; ! WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); //bool tracked = false; long key = -1; ! if ((pClass != NULL) && lua_isuserdata(L, 1) && ! (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *pClass->class_tag)) { key = (long)wxlState.ttouserdata(1, true); --- 259,269 ---- int retVal = 0; ! WXLUACLASS *wxlClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); //bool tracked = false; long key = -1; ! if ((wxlClass != NULL) && lua_isuserdata(L, 1) && ! (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *wxlClass->class_tag)) { key = (long)wxlState.ttouserdata(1, true); *************** *** 301,305 **** //wxPrintf(wxT("wxlua_garbageCollect - '%s' tag %d lua %d key %ld tracked %d return value %d\n"), ! // lua2wx(pClass ? pClass->name : "").c_str(), pClass ? *pClass->class_tag : 0, (int)L, key, (int)tracked, retVal); return retVal; --- 309,313 ---- //wxPrintf(wxT("wxlua_garbageCollect - '%s' tag %d lua %d key %ld tracked %d return value %d\n"), ! // lua2wx(wxlClass ? wxlClass->name : "").c_str(), wxlClass ? *wxlClass->class_tag : 0, (int)L, key, (int)tracked, retVal); return retVal; *************** *** 324,327 **** --- 332,340 ---- wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + // This function is called for the __index metable of the wxLua userdata + // for class instances. The stack contains 1 = userdata, 2 = "FuncName" + // You cannot seem to get the calling convention (. or :) or if it was + // called as a function() or a .member? + // See below, if base_XXX is called then we set this flag so that // the called function knows to call the base class instead of recalling *************** *** 330,338 **** wxlState.SetCallBaseClassFunction(false); ! bool fCallbase = false; ! bool fFound = false; ! int result = 0; ! WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); ! const char *cpIndex = "{unknown}"; wxCharBuffer funcName; --- 343,351 ---- wxlState.SetCallBaseClassFunction(false); ! bool callbase = false; ! bool found = false; ! int result = 0; ! WXLUACLASS *wxlClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); ! const char *name = "{unknown}"; wxCharBuffer funcName; *************** *** 341,398 **** //int init_islightuserdata = lua_islightuserdata(L, 1); //int init_ttag = wxlState.ttag(1); ! //int init_class_tag = pClass ? *pClass->class_tag : -1; ! if ((pClass != NULL) && lua_isuserdata(L, 1) && ! (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *pClass->class_tag)) { void *pObject = wxlState.ttouserdata(1); funcName = lua_tostring(L, 2); // make a copy of the string ! cpIndex = funcName.data(); ! fCallbase = (memcmp(cpIndex, CALL_BASECLASS_FUNC, CALL_BASECLASS_FUNC_LEN) == 0); ! if (fCallbase) ! cpIndex += CALL_BASECLASS_FUNC_LEN; // skip past "base_" else { // if there's a derived method, push it onto the stack to be run ! if (wxlState.HasDerivedMethod(pObject, cpIndex, true)) { ! fFound = true; result = 1; } } ! if (!fFound) { ! WXLUAMETHOD *pMethod = wxlState.GetLuaMethod(pClass, cpIndex); ! if (pMethod != NULL) { ! if (pMethod->type == LuaGetProp) { lua_remove(L, 2); // remove the name of the function ! result = (*pMethod->func)(L); ! fFound = true; } else { ! wxLuaFunction *pFunction = new wxLuaFunction(pMethod, pClass, pObject); ! wxlState.tpushusertag(pFunction, wxlState.GetwxLuaFunctionTag()); result = 1; ! fFound = true; } } // This MUST be reset to false in the base class function ! if (fFound && fCallbase) wxlState.SetCallBaseClassFunction(true); } } //if (lua2wx(funcName).Find(wxT("OnBeginDocument")) != -1) ! // wxPrintf(wxT("wxlua_getTableFunc func '%s' pClass %d '%s', userdata %d, lightuserdata %d, ttag %d, class_tag %d lua_State %d wxLuaStateRefData %d call base %d\n"), ! // lua2wx(funcName).c_str(), (long)pClass, pClass ? lua2wx(pClass->name).c_str() : wxT(""), init_isuserdata, init_islightuserdata, init_ttag, init_class_tag, (long)L, (long)wxlState.GetRefData(), (int)wxlState.GetCallBaseClassFunction()); ! if (!fFound) ! wxlState.terror(wxString::Format(_("wxLua: Attempt to call an invalid method '%s'."), lua2wx(cpIndex).c_str())); return result; --- 354,431 ---- //int init_islightuserdata = lua_islightuserdata(L, 1); //int init_ttag = wxlState.ttag(1); ! //int init_class_tag = wxlClass ? *wxlClass->class_tag : -1; ! if ((wxlClass != NULL) && lua_isuserdata(L, 1) && ! (lua_islightuserdata(L, 1) == 0) && (wxlState.ttag(1) == *wxlClass->class_tag)) { void *pObject = wxlState.ttouserdata(1); funcName = lua_tostring(L, 2); // make a copy of the string ! name = funcName.data(); ! callbase = (memcmp(name, CALL_BASECLASS_FUNC, CALL_BASECLASS_FUNC_LEN) == 0); ! if (callbase) ! name += CALL_BASECLASS_FUNC_LEN; // skip past "base_" else { // if there's a derived method, push it onto the stack to be run ! if (wxlState.HasDerivedMethod(pObject, name, true)) { ! found = true; result = 1; } } ! if (!found) { ! WXLUAMETHOD* wxlMethod = wxlState.GetLuaMethod(wxlClass, name); ! if (wxlMethod != NULL) { ! if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_GETPROP)) { + found = true; lua_remove(L, 2); // remove the name of the function ! result = (*wxlMethod->funcs[0].func)(L); } else { ! found = true; result = 1; ! wxLuaFunction *pFunction = new wxLuaFunction(wxlMethod, wxlClass, pObject); ! wxlState.tpushusertag(pFunction, wxlState.GetwxLuaFunctionTag()); ! } ! } ! ! // Maybe this is an undeclared property? Prepend 'Get' and try again. ! if (!found) ! { ! int len = strlen(name); ! wxCharBuffer buf(len + 4); ! char* str = buf.data(); ! str[0] = 'G'; str[1] = 'e'; str[2] = 't'; ! memcpy(str+3, name, len+1); // include terminating NULL ! ! wxlMethod = wxlState.GetLuaMethod(wxlClass, str); ! if ((wxlMethod != NULL) && (wxlMethod->type == WXLUAMETHOD_METHOD)) ! //wxlMethod->funcs && (wxlMethod->funcs->minargs == 0) && ! //(wxlMethod->funcs->maxargs == 0)) ! { ! found = true; ! lua_remove(L, 2); // remove the name of the function ! result = (*wxlMethod->funcs[0].func)(L); } } // This MUST be reset to false in the base class function ! if (found && callbase) wxlState.SetCallBaseClassFunction(true); } } //if (lua2wx(funcName).Find(wxT("OnBeginDocument")) != -1) ! // wxPrintf(wxT("wxlua_getTableFunc func '%s' wxlClass %d '%s', userdata %d, lightuserdata %d, ttag %d, class_tag %d lua_State %d wxLuaStateRefData %d call base %d\n"), ! // lua2wx(funcName).c_str(), (long)wxlClass, wxlClass ? lua2wx(wxlClass->name).c_str() : wxT(""), init_isuserdata, init_islightuserdata, init_ttag, init_class_tag, (long)L, (long)wxlState.GetRefData(), (int)wxlState.GetCallBaseClassFunction()); ! if (!found) ! wxlState.terror(wxString::Format(_("wxLua: Attempt to call an invalid method '%s'."), lua2wx(name).c_str())); return result; *************** *** 412,432 **** wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! WXLUACLASS *pClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); ! const char *cpIndex = lua_tostring(L, 2); ! //wxPrintf(wxT("wxlua_setTableFunc '%s'\n"), lua2wx(cpIndex).c_str()); ! if ((pClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && ! (wxlState.ttag(1) == *pClass->class_tag)) { ! // See if there is a LuaSetProp in the WXLUACLASS's WXLUAMETHODs ! WXLUAMETHOD *pMethod = wxlState.GetLuaProperty(pClass, cpIndex, true); ! if (pMethod != NULL) { lua_remove(L, 2); ! (*pMethod->func)(L); } ! else { void *pObject = wxlState.ttouserdata(1); --- 445,490 ---- wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! WXLUACLASS *wxlClass = (WXLUACLASS *)lua_touserdata(L, lua_upvalueindex(1)); ! const char *name = lua_tostring(L, 2); ! bool found = false; ! //wxPrintf(wxT("wxlua_setTableFunc '%s'\n"), lua2wx(name).c_str()); ! if ((wxlClass != NULL) && lua_isuserdata(L, 1) && (lua_islightuserdata(L, 1) == 0) && ! (wxlState.ttag(1) == *wxlClass->class_tag)) { ! // See if there is a WXLUAMETHOD_SETPROP in the WXLUACLASS's WXLUAMETHODs ! WXLUAMETHOD *wxlMethod = wxlState.GetLuaProperty(wxlClass, name, true); ! if (wxlMethod != NULL) { + found = true; lua_remove(L, 2); ! (*wxlMethod->funcs[0].func)(L); } ! ! // Maybe this is an undeclared property? Prepend 'Set' and try again. ! if (!found) ! { ! int len = strlen(name); ! wxCharBuffer buf(len + 4); ! char* str = buf.data(); ! str[0] = 'S'; str[1] = 'e'; str[2] = 't'; ! memcpy(str+3, name, len+1); // include terminating NULL ! ! //wxPrintf(wxT("'%s' %d\n"), lua2wx(str).c_str(), lua_gettop(L)); ! //wxLuaCheckStack stk(L, wxT("wxlua_setTableFunc")); ! //stk.DumpStack(); ! ! wxlMethod = wxlState.GetLuaMethod(wxlClass, str); ! if ((wxlMethod != NULL) && (wxlMethod->type == WXLUAMETHOD_METHOD)) ! { ! found = true; ! lua_remove(L, 2); ! (*wxlMethod->funcs[0].func)(L); ! } ! } ! ! if (!found) { void *pObject = wxlState.ttouserdata(1); *************** *** 453,457 **** // see if there already is a method ! lua_pushstring( L, cpIndex ); lua_rawget(L, -2); --- 511,515 ---- // see if there already is a method ! lua_pushstring( L, name ); lua_rawget(L, -2); *************** *** 465,469 **** lua_pop(L, 1); // pop the deleted old object, or nil ! lua_pushstring( L, cpIndex ); lua_pushlightuserdata(L, (void*)wxlObj); lua_rawset(L, -3); --- 523,527 ---- lua_pop(L, 1); // pop the deleted old object, or nil ! lua_pushstring( L, name ); lua_pushlightuserdata(L, (void*)wxlObj); lua_rawset(L, -3); *************** *** 476,479 **** --- 534,549 ---- } + static int wxlua_checkremovetable = 0; + + int wxlua_removetableforcall(lua_State* L, bool only_check) + { + //void* p = (void *)lua_tocfunction(L, lua_upvalueindex(1)); + void* p = (void *)lua_touserdata(L, lua_upvalueindex(1)); + if (!only_check && (p == &wxlua_checkremovetable)) + lua_remove(L, 1); + + return p == &wxlua_checkremovetable; + } + // ---------------------------------------------------------------------------- // Function to compare to events by eventType *************** *** 532,535 **** --- 602,607 ---- lua_rawset(L, LUA_GLOBALSINDEX); } + else + lua_pop(L, 1); lua_pop(L, 1); *************** *** 632,636 **** for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! WXLUACLASS *pClass = m_classList + i_class; // Create a new tag if registering types, else use tag already set --- 704,708 ---- for (size_t i_class = 0; i_class < m_classCount; ++i_class) { ! WXLUACLASS *wxlClass = m_classList + i_class; // Create a new tag if registering types, else use tag already set *************** *** 638,650 **** { iTag = wxlState.tnewtag(); ! *pClass->class_tag = iTag; } else ! iTag = *pClass->class_tag; // store a lookup table for the class tags to WXLUACLASS structs ! wxlua_tget(L, *pClass->class_tag); lua_pushstring(L, "WXLUACLASS"); ! lua_pushlightuserdata(L, (void *)pClass); lua_rawset(L, -3); // t[name] = tag lua_remove(L, -1); // remove wxLua's registry wxLuaClasses table --- 710,722 ---- { iTag = wxlState.tnewtag(); ! *wxlClass->class_tag = iTag; } else ! iTag = *wxlClass->class_tag; // store a lookup table for the class tags to WXLUACLASS structs ! wxlua_tget(L, *wxlClass->class_tag); lua_pushstring(L, "WXLUACLASS"); ! lua_pushlightuserdata(L, (void *)wxlClass); lua_rawset(L, -3); // t[name] = tag lua_remove(L, -1); // remove wxLua's registry wxLuaClasses table *************** *** 654,659 **** lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the classes table) ! lua_pushstring(L, pClass->name); ! lua_pushlightuserdata(L, (void *)pClass); lua_rawset(L, -3); // t[name] = tag lua_remove(L, -1); // remove wxLua's registry wxLuaClasses table --- 726,731 ---- lua_rawget(L, LUA_REGISTRYINDEX); // pop key, push result (the classes table) ! lua_pushstring(L, wxlClass->name); ! lua_pushlightuserdata(L, (void *)wxlClass); lua_rawset(L, -3); // t[name] = tag lua_remove(L, -1); // remove wxLua's registry wxLuaClasses table *************** *** 662,696 **** for (size_t i_func = 0; i_func < s_funcCount; ++i_func) { ! wxlState.tsettagmethod(iTag, s_funcTable[i_func].name, s_funcTable[i_func].func, (void *)pClass); } ! // install public functions like constructors or global functions ! int i_method, method_count = pClass->num_methods; for (i_method = 0; i_method < method_count; ++i_method) { ! WXLUAMETHOD *pMethod = pClass->methods + i_method; ! if ((pMethod->type == LuaConstructor) || (pMethod->type == LuaGlobal)) { ! #if 0 // C++ class constructors are tables and use the __call metatable to make them "functions" ! // push name of nested table and create the table ! lua_pushstring(L, pMethod->name); ! lua_newtable(L); // add the items to the table as t[first pushed] = second pushed - lua_pushstring(L, "key"); - lua_pushstring(L, "value"); - lua_rawset(L, -3); // same as lua_setfield(L, -2, "key") - lua_pushstring(L, "new"); ! lua_pushcfunction(L, pMethod->func); ! lua_rawset(L, -3); ! // Create the metatable for this table ! //luaL_newmetatable(L, pMethod->func); // we don't need to register it lua_newtable(L); lua_pushstring(L, "__call"); ! lua_pushcfunction(L, pMethod->func); lua_rawset(L, -3); --- 734,794 ---- for (size_t i_func = 0; i_func < s_funcCount; ++i_func) { ! wxlState.tsettagmethod(iTag, s_funcTable[i_func].name, s_funcTable[i_func].func, (void *)wxlClass); } ! ! int i_method, method_count = wxlClass->methods_n; ! ! // install the table for the class ! lua_pushstring(L, wxlClass->name); ! lua_newtable(L); ! ! // Install the member enums for the classname table ! for (int i_enum = 0; i_enum < wxlClass->enums_n; ++i_enum) ! { ! lua_pushstring(L, wxlClass->enums[i_enum].name); ! lua_pushnumber(L, wxlClass->enums[i_enum].value); ! lua_rawset(L, -3); ! } ! ! // Install the static functions for the classname table ! for (int i_static_method = 0; i_static_method < method_count; ++i_static_method) ! { ! if (WXLUA_HASBIT(wxlClass->methods[i_static_method].type, WXLUAMETHOD_STATIC)) ! { ! lua_pushstring(L, wxlClass->methods[i_static_method].name); ! lua_pushcfunction(L, wxlClass->methods[i_static_method].funcs[0].func); ! lua_rawset(L, -3); ! } ! } ! lua_rawset(L, -3); // same as lua_settable(L, tableOffset); ! ! // Install public functions like constructors or global functions for (i_method = 0; i_method < method_count; ++i_method) { ! WXLUAMETHOD *wxlMethod = wxlClass->methods + i_method; ! if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_CONSTRUCTOR | WXLUAMETHOD_CFUNCTION)) { ! #if 1 // C++ class constructors are tables and use the __call metatable to make them "functions" ! // push name of nested table and create the table or use existing ! lua_pushstring(L, wxlMethod->name); ! if (strcmp(wxlMethod->name, wxlClass->name) != 0) ! lua_newtable(L); ! else ! lua_getfield(L, tableOffset, wxlMethod->name); // add the items to the table as t[first pushed] = second pushed lua_pushstring(L, "new"); ! lua_pushcfunction(L, wxlMethod->funcs[0].func); ! lua_rawset(L, -3); // same as lua_setfield(L, -2, "key") // Create the metatable for this table ! //luaL_newmetatable(L, wxlMethod->func); // we don't need to register it lua_newtable(L); lua_pushstring(L, "__call"); ! //lua_pushcfunction(L, wxlMethod->func); ! lua_pushlightuserdata(L, &wxlua_checkremovetable); // push the method userdata ! lua_pushcclosure(L, wxlMethod->funcs[0].func, 1); // push func with func as upvalue lua_rawset(L, -3); *************** *** 701,713 **** lua_setmetatable(L, -2); ! // add table to the binding table t[pMethod->name] = { this table } lua_rawset(L, -3); // same as lua_settable(L, tableOffset); #elif 0 // C++ constructors are cfunctions, use metatable for access to items. ! lua_pushstring(L, pMethod->name); ! lua_pushcfunction(L, pMethod->func); // Create the metatable for this cfunction ! //luaL_newmetatable(L, pMethod->func); // we don't need to register it lua_newtable(L); --- 799,811 ---- lua_setmetatable(L, -2); ! // add table to the binding table t[wxlMethod->name] = { this table } lua_rawset(L, -3); // same as lua_settable(L, tableOffset); #elif 0 // C++ constructors are cfunctions, use metatable for access to items. ! lua_pushstring(L, wxlMethod->name); ! lua_pushcfunction(L, wxlMethod->func); // Create the metatable for this cfunction ! //luaL_newmetatable(L, wxlMethod->func); // we don't need to register it lua_newtable(L); *************** *** 721,724 **** --- 819,850 ---- lua_rawset(L, -3); // same as lua_setfield(L, -2, "key") + + lua_pushstring(L, "key1"); + lua_pushstring(L, "value1"); + lua_rawset(L, -3); // same as lua_setfield(L, -2, "key") + + + //set the table + lua_rawset(L, -3); + + + // create the t[__call] = { table } + lua_pushstring(L, "__call"); + lua_newtable(L); + + for (size_t i = 0; i < m_functionCount; ++i) + { + if (strcmp(m_functionList[i].name, "wxGetCwd") == 0) + { + wxPrintf(wxT("Adding wxGetCwd '%s' %p\n"), lua2wx(m_functionList[i].name).c_str(), m_functionList[i].func); + + lua_pushstring(L, m_functionList[i].name); + lua_pushcfunction(L, m_functionList[i].func); + lua_rawset(L, -3); // same as lua_setfield(L, -2, "key") + + break; + } + } + //set the table lua_rawset(L, -3); *************** *** 734,740 **** #else // C++ class constructors are cfunctions only ! lua_pushstring(L, pMethod->name); ! lua_pushcfunction(L, pMethod->func); ! lua_rawset(L, tableOffset); #endif } --- 860,866 ---- #else // C++ class constructors are cfunctions only ! lua_pushstring(L, wxlMethod->name); ! lua_pushcfunction(L, wxlMethod->func); ! lua_rawset(L, -3); #endif } *************** *** 747,753 **** for (size_t i_func = 0; i_func < m_functionCount; ++i_func) { ! WXLUAMETHOD *pMethod = m_functionList + i_func; ! lua_pushstring(L, pMethod->name); ! lua_pushcfunction(L, pMethod->func); lua_rawset(L, tableOffset); } --- 873,879 ---- for (size_t i_func = 0; i_func < m_functionCount; ++i_func) { ! WXLUAMETHOD *wxlMethod = m_functionList + i_func; ! lua_pushstring(L, wxlMethod->name); ! lua_pushcfunction(L, wxlMethod->funcs[0].func); lua_rawset(L, tableOffset); } *************** *** 806,812 **** } ! bool wxLuaBinding::SetBaseClass(WXLUACLASS *pClass) { ! if (!pClass->baseclassName) // check if there is a baseclassName at all return false; --- 932,938 ---- } ! bool wxLuaBinding::SetBaseClass(WXLUACLASS *wxlClass) { ! if (!wxlClass->baseclassName) // check if there is a baseclassName at all return false; *************** *** 815,821 **** WXLUACLASS* baseClass = m_classList + n; // potential base class ! if (strcmp(baseClass->name, pClass->baseclassName) == 0) { ! pClass->baseclass = baseClass; return true; } --- 941,947 ---- WXLUACLASS* baseClass = m_classList + n; // potential base class ! if (strcmp(baseClass->name, wxlClass->baseclassName) == 0) { ! wxlClass->baseclass = baseClass; return true; } |
From: John L. <jr...@us...> - 2007-05-31 17:18:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxldefs.h wxlstate.h Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxldefs.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wxldefs.h 4 May 2007 19:04:41 -0000 1.16 --- wxldefs.h 31 May 2007 17:18:54 -0000 1.17 *************** *** 26,42 **** //----------------------------------------------------------------------------- ! #define WXLUA_MAJOR_VERSION 2 ! #define WXLUA_MINOR_VERSION 8 ! #define WXLUA_RELEASE_VERSION 4 ! #define WXLUA_SUBRELEASE_VERSION 0 ! #define WXLUA_VERSION_STRING wxT("wxLua 2.8.4.0") // For non-Unix systems (i.e. when building without a configure script), // users of this component can use the following macro to check if the // current version is at least major.minor.release ! #define wxCHECK_WXLUA_VERSION(major,minor,release) \ ! (WXLUA_MAJOR_VERSION > (major) || \ ! (WXLUA_MAJOR_VERSION == (major) && WXLUA_MINOR_VERSION > (minor)) || \ ! (WXLUA_MAJOR_VERSION == (major) && WXLUA_MINOR_VERSION == (minor) && WXLUA_RELEASE_VERSION >= (release))) //----------------------------------------------------------------------------- --- 26,50 ---- //----------------------------------------------------------------------------- ! #define wxLUA_MAJOR_VERSION 2 ! #define wxLUA_MINOR_VERSION 8 ! #define wxLUA_RELEASE_NUMBER 4 ! #define wxLUA_SUBRELEASE_NUMBER 0 ! #define wxLUA_VERSION_STRING wxT("wxLua 2.8.4.0") // For non-Unix systems (i.e. when building without a configure script), // users of this component can use the following macro to check if the // current version is at least major.minor.release ! #define wxLUA_CHECK_VERSION(major,minor,release) \ ! (wxLUA_MAJOR_VERSION > (major) || \ ! (wxLUA_MAJOR_VERSION == (major) && wxLUA_MINOR_VERSION > (minor)) || \ ! (wxLUA_MAJOR_VERSION == (major) && wxLUA_MINOR_VERSION == (minor) && wxLUA_RELEASE_NUMBER >= (release))) ! ! // the same but check the subrelease also ! #define wxLUA_CHECK_VERSION_FULL(major,minor,release,subrel) \ ! (wxLUA_CHECK_VERSION(major, minor, release) && \ ! ((major) != wxLUA_MAJOR_VERSION || \ ! (minor) != wxLUA_MINOR_VERSION || \ ! (release) != wxLUA_RELEASE_NUMBER || \ ! (subrel) <= wxLUA_SUBRELEASE_NUMBER)) //----------------------------------------------------------------------------- *************** *** 49,53 **** //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 6 // ---------------------------------------------------------------------------- --- 57,61 ---- //----------------------------------------------------------------------------- ! #define WXLUA_BINDING_VERSION 7 // ---------------------------------------------------------------------------- *************** *** 86,89 **** --- 94,101 ---- #endif // wxUSE_UNICODE + + #define WXLUA_HASBIT(value, bit) (((value) & (bit)) != 0) + #define WXLUA_SETBIT(value, bit, set) ((set) ? (value)|(bit) : (value)&(~(bit))) + // ---------------------------------------------------------------------------- // Lua defines for making the code more readable Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** wxlbind.h 23 Mar 2007 04:27:23 -0000 1.39 --- wxlbind.h 31 May 2007 17:18:54 -0000 1.40 *************** *** 35,38 **** --- 35,42 ---- // lua 'get table' tag method handler, lua's __index WXDLLIMPEXP_WXLUA int LUACALL wxlua_getTableFunc(lua_State *L); + // If there is a cfunction upvalue, remove 1 value if !only_check + // (hack to remove the table lua pushes onto the stack when calling the + // __call metatable function) + WXDLLIMPEXP_WXLUA int wxlua_removetableforcall(lua_State* L, bool only_check = false); // ---------------------------------------------------------------------------- *************** *** 42,50 **** enum wxLuaMethod_Type // The type of a Lua method { ! LuaConstructor = 1, // constructor ! LuaMethod = 2, // class method ! LuaGlobal = 4, // global method (not really related to the class) ! LuaGetProp = 8, // Get %property funcName, read ! LuaSetProp = 16 // Set %property funcName, write }; --- 46,56 ---- enum wxLuaMethod_Type // The type of a Lua method { ! WXLUAMETHOD_CONSTRUCTOR = 0x0001, // constructor ! WXLUAMETHOD_METHOD = 0x0002, // class member function ! WXLUAMETHOD_CFUNCTION = 0x0004, // global C function (not part of a class) ! WXLUAMETHOD_GETPROP = 0x0008, // Get %property funcName, read ! WXLUAMETHOD_SETPROP = 0x0010, // Set %property funcName, write ! ! WXLUAMETHOD_STATIC = 0x0020 // Class member function is static }; *************** *** 52,63 **** extern WXDLLIMPEXP_DATA_WXLUA(wxLuaArgTag) s_wxluaargArray_None[1]; // = {0} struct WXDLLIMPEXP_WXLUA WXLUAMETHOD // defines a LUA method or property { ! wxLuaMethod_Type type; // type (one of the above enumeration values) ! const char* name; // name of the method or property ! lua_CFunction func; // function that implements the method or property ! int maxargs; // max number of function arguments ! int minargs; // min number of function arguments ! wxLuaArgTag* argtags; // array of lua tags representing each argument, zero terminated }; --- 58,75 ---- extern WXDLLIMPEXP_DATA_WXLUA(wxLuaArgTag) s_wxluaargArray_None[1]; // = {0} + struct WXDLLIMPEXP_WXLUA WXLUAMETHOD_CFUNC // defines a single C func for a LUA method + { + lua_CFunction func; // function that implements the method or property + int minargs; // min number of required args + int maxargs; // total number of args allowed + wxLuaArgTag* argtags; // array of lua tags representing each argument, zero terminated + }; + struct WXDLLIMPEXP_WXLUA WXLUAMETHOD // defines a LUA method or property { ! int type; // type (one of the above enumeration values) ! const char* name; // name of the method or property ! WXLUAMETHOD_CFUNC* funcs; // array of functions for this method ! int funcs_n; // number of functions (overloaded > 1) for this method }; *************** *** 73,91 **** extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction; - struct WXDLLIMPEXP_WXLUA WXLUACLASS // defines a LUA C++ class interface - { - const char *name; // name of the class - WXLUAMETHOD *methods; // pointer to methods for this class - int num_methods; // number of methods - wxClassInfo *pClassInfo; // pointer to the wxClassInfo associated with this class - int *class_tag; // lua tag for user data allocated by ourselves - const char *baseclassName; // name of base class - WXLUACLASS *baseclass; // Pointer to the base class or NULL for none. - // This member is set after all the bindings are - // registered since the base class may be from - // a different module (a library perhaps). - // See wxLuaBinding::SetBaseClass - }; - struct WXDLLIMPEXP_WXLUA WXLUADEFINE // defines a wxWidgets define for wxLua { --- 85,88 ---- *************** *** 94,97 **** --- 91,96 ---- }; + extern WXDLLIMPEXP_DATA_WXLUA(WXLUADEFINE) s_wxluadefineArray_None[1]; // = {{0,0}} + struct WXDLLIMPEXP_WXLUA WXLUASTRING // defines a wxWidgets string for wxLua { *************** *** 115,118 **** --- 114,134 ---- }; + struct WXDLLIMPEXP_WXLUA WXLUACLASS // defines a LUA C++ class interface + { + const char *name; // name of the class + WXLUAMETHOD *methods; // pointer to methods for this class + int methods_n; // number of methods + wxClassInfo *pClassInfo; // pointer to the wxClassInfo associated with this class + int *class_tag; // lua tag for user data allocated by ourselves + const char *baseclassName; // name of base class + WXLUACLASS *baseclass; // Pointer to the base class or NULL for none. + // This member is set after all the bindings are + // registered since the base class may be from + // a different module (a library perhaps). + // See wxLuaBinding::SetBaseClass + WXLUADEFINE* enums; // Class member enums + int enums_n; // number of enums + }; + // ---------------------------------------------------------------------------- // wxLuaFunction - a proxy class to store a reference to a Lua function. *************** *** 122,127 **** { public: ! wxLuaFunction(WXLUAMETHOD *pMethod, WXLUACLASS *pClass, void *pObject) ! : m_pMethod(pMethod), m_pClass(pClass), m_pObject(pObject) {} ~wxLuaFunction() {} --- 138,143 ---- { public: ! wxLuaFunction(WXLUAMETHOD *wxlMethod, WXLUACLASS *wxlClass, void *pObject) ! : m_wxlMethod(wxlMethod), m_wxlClass(wxlClass), m_pObject(pObject) {} ~wxLuaFunction() {} *************** *** 130,136 **** void *GetObject() const { return m_pObject; } ! private: ! WXLUAMETHOD *m_pMethod; ! WXLUACLASS *m_pClass; void *m_pObject; }; --- 146,151 ---- void *GetObject() const { return m_pObject; } ! WXLUAMETHOD *m_wxlMethod; ! WXLUACLASS *m_wxlClass; void *m_pObject; }; Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** wxlstate.h 21 May 2007 01:07:59 -0000 1.67 --- wxlstate.h 31 May 2007 17:18:54 -0000 1.68 *************** *** 676,680 **** // Return a pointer to the WXLUAMETHOD that corresponds to the property name, // else return NULL; ! // Find 'Set' properties if isLuaSetProp else return 'LuaGetProp' property WXLUAMETHOD* GetLuaProperty(const WXLUACLASS *pClass, const char *cpIndex, bool isLuaSetProp); --- 676,680 ---- // Return a pointer to the WXLUAMETHOD that corresponds to the property name, // else return NULL; ! // Find 'Set' properties if isLuaSetProp else return 'WXLUAMETHOD_GETPROP' property WXLUAMETHOD* GetLuaProperty(const WXLUACLASS *pClass, const char *cpIndex, bool isLuaSetProp); *************** *** 901,906 **** void GetGlobals(); // overloaded function call helper ! int LUACALL CallOverloadedFunction(struct WXLUAMETHOD* overloadedMethods, int overloadedMethodCount); // ----------------------------------------------------------------------- --- 901,908 ---- void GetGlobals(); + // Return a human readable string of the args for the functions in the method + wxString CreateMethodArgTagsMsg(struct WXLUAMETHOD* method); // overloaded function call helper ! int LUACALL CallOverloadedFunction(struct WXLUAMETHOD* method); // ----------------------------------------------------------------------- |
From: John L. <jr...@us...> - 2007-05-31 17:18:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxluasocket/include Modified Files: wxluasocket_bind.h Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxluasocket_bind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxluasocket_bind.h 15 Mar 2007 23:24:58 -0000 1.14 --- wxluasocket_bind.h 31 May 2007 17:18:55 -0000 1.15 *************** *** 27,33 **** // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 6 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 6 // --------------------------------------------------------------------------- --- 27,33 ---- // the current version of the bindings. // See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h' ! #if WXLUA_BINDING_VERSION > 7 # error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings." ! #endif //WXLUA_BINDING_VERSION > 7 // --------------------------------------------------------------------------- *************** *** 70,76 **** --- 70,80 ---- extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerEvent_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount; + extern WXDLLIMPEXP_WXLUASOCKET WXLUADEFINE wxLuaDebuggerEvent_enums[]; + extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_enumCount; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerServer; extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerServer_methods[]; extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount; + extern WXDLLIMPEXP_WXLUASOCKET WXLUADEFINE wxLuaDebuggerServer_enums[]; + extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_enumCount; |
From: John L. <jr...@us...> - 2007-05-31 17:18:57
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv14219/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp wxlstack.cpp Log Message: Huge changes, overloaded functions by default replace wx.wxNull with wx.NULL change WXLUA_VERSION and others with wxLUA_VERSION class member enums are part of class table static class member functions are part of class table %properties are generated on the fly ... and more, see docs/changelog.txt Index: wxlstack.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxlstack.cpp 24 May 2007 00:59:47 -0000 1.1 --- wxlstack.cpp 31 May 2007 17:18:54 -0000 1.2 *************** *** 35,42 **** BEGIN_EVENT_TABLE(wxLuaStackDialog, wxDialog) ! EVT_COMBOBOX( ID_WXLUA_STACKDIALOG_COMBO, wxLuaStackDialog::OnSelectStack) ! EVT_LIST_ITEM_ACTIVATED( ID_WXLUA_STACKDIALOG_LISTCTRL, wxLuaStackDialog::OnItemActivated) ! EVT_LIST_DELETE_ITEM( ID_WXLUA_STACKDIALOG_LISTCTRL, wxLuaStackDialog::OnItemDeleted) ! EVT_LIST_DELETE_ALL_ITEMS( ID_WXLUA_STACKDIALOG_LISTCTRL, wxLuaStackDialog::OnAllItemsDeleted) END_EVENT_TABLE() --- 35,49 ---- BEGIN_EVENT_TABLE(wxLuaStackDialog, wxDialog) ! EVT_CHOICE( ID_WXLUA_STACK_CHOICE, wxLuaStackDialog::OnSelectStack) ! ! EVT_BUTTON( ID_WXLUA_STACK_EXPAND_BUTTON, wxLuaStackDialog::OnExpandButton) ! ! EVT_TEXT_ENTER( ID_WXLUA_STACK_FIND_COMBO, wxLuaStackDialog::OnFind) ! EVT_BUTTON( ID_WXLUA_STACK_FINDNEXT_BUTTON, wxLuaStackDialog::OnFind) ! EVT_BUTTON( ID_WXLUA_STACK_FINDPREV_BUTTON, wxLuaStackDialog::OnFind) ! ! EVT_LIST_ITEM_ACTIVATED( ID_WXLUA_STACK_LISTCTRL, wxLuaStackDialog::OnItemActivated) ! EVT_LIST_DELETE_ITEM( ID_WXLUA_STACK_LISTCTRL, wxLuaStackDialog::OnItemDeleted) ! EVT_LIST_DELETE_ALL_ITEMS( ID_WXLUA_STACK_LISTCTRL, wxLuaStackDialog::OnAllItemsDeleted) END_EVENT_TABLE() *************** *** 44,49 **** { m_listCtrl = NULL; ! m_stackComboBox = NULL; m_stack_sel = -1; m_imageList = NULL; --- 51,58 ---- { m_listCtrl = NULL; ! m_stackChoice = NULL; m_stack_sel = -1; + m_findComboBox = NULL; + m_findCaseCheckBox = NULL; m_imageList = NULL; *************** *** 61,109 **** return false; wxPanel* panel = new wxPanel(this, wxID_ANY); ! m_stackComboBox = new wxComboBox( panel, ID_WXLUA_STACKDIALOG_COMBO, wxEmptyString, wxDefaultPosition, wxDefaultSize, ! 0, NULL, ! wxCB_DROPDOWN | wxCB_READONLY); ! m_listCtrl = new wxListCtrl( panel, ID_WXLUA_STACKDIALOG_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_HRULES|wxLC_VRULES ); m_listCtrl->InsertColumn(0, wxT("Name"), wxLIST_FORMAT_LEFT, -1); ! m_listCtrl->InsertColumn(1, wxT("Type"), wxLIST_FORMAT_LEFT, -1); ! m_listCtrl->InsertColumn(2, wxT("Value"), wxLIST_FORMAT_LEFT, -1); ! m_listCtrl->SetColumnWidth(0, 250); ! m_listCtrl->SetColumnWidth(1, 100); ! m_listCtrl->SetColumnWidth(2, 100); ! m_imageList = new wxImageList(16, 16, true); ! m_imageList->Add(wxArtProvider::GetIcon(wxART_NORMAL_FILE, wxART_TOOLBAR, wxSize(16,16))); // unknown ! m_imageList->Add(wxArtProvider::GetIcon(wxART_FOLDER, wxART_TOOLBAR, wxSize(16,16))); // table ! m_imageList->Add(wxArtProvider::GetIcon(wxART_NEW_DIR, wxART_TOOLBAR, wxSize(16,16))); // open table wxBitmap bmp(wxArtProvider::GetIcon(wxART_NORMAL_FILE, wxART_TOOLBAR, wxSize(16,16))); ! m_imageList->Add(CreateBmpString(bmp, wxT("0"))); // nil ! m_imageList->Add(CreateBmpString(bmp, wxT("T"))); // bool ! m_imageList->Add(CreateBmpString(bmp, wxT("1"))); // number ! m_imageList->Add(CreateBmpString(bmp, wxT("a"))); // string ! m_imageList->Add(CreateBmpString(bmp, wxT("C"))); // C function ! m_imageList->Add(CreateBmpString(bmp, wxT("f"))); // Lua function ! m_imageList->Add(CreateBmpString(bmp, wxT("u"))); // user data ! m_imageList->Add(CreateBmpString(bmp, wxT("u"))); // light user data ! m_imageList->Add(CreateBmpString(bmp, wxT("t"))); // thread m_listCtrl->SetImageList(m_imageList, wxIMAGE_LIST_SMALL); ! // set the frame icon ! SetIcon(wxICON(LUA)); // use sizers to layout the windows in the panel of the dialog wxBoxSizer* rootSizer = new wxBoxSizer(wxVERTICAL); ! rootSizer->Add(m_stackComboBox, 0, wxEXPAND|wxBOTTOM, 4); rootSizer->Add(m_listCtrl, 1, wxEXPAND); rootSizer->SetMinSize(450, 400); --- 70,194 ---- return false; + SetIcon(wxICON(LUA)); // set the frame icon + wxPanel* panel = new wxPanel(this, wxID_ANY); ! // ----------------------------------------------------------------------- ! ! wxStaticText* stackText = new wxStaticText( panel, wxID_ANY, wxT("Stack : ")); ! ! m_stackChoice = new wxChoice( panel, ID_WXLUA_STACK_CHOICE, ! wxDefaultPosition, wxDefaultSize, ! 0, NULL ); ! m_stackChoice->SetToolTip(wxT("Select lua stack to display.")); ! ! wxButton* expandButton = new wxButton(panel, ID_WXLUA_STACK_EXPAND_BUTTON, ! wxT("Expand All")); ! expandButton->SetToolTip(wxT("Expand all tables.")); ! ! // ----------------------------------------------------------------------- ! ! wxStaticText* findText = new wxStaticText( panel, wxID_ANY, wxT("Find : ")); ! m_findComboBox = new wxComboBox( panel, ID_WXLUA_STACK_FIND_COMBO, wxEmptyString, wxDefaultPosition, wxDefaultSize, ! 0, NULL, wxCB_DROPDOWN | wxTE_PROCESS_ENTER); ! m_findComboBox->SetToolTip(wxT("Enter variable name or table key to find")); ! wxBitmapButton* findPrev = new wxBitmapButton( panel, ID_WXLUA_STACK_FINDPREV_BUTTON, ! wxArtProvider::GetBitmap(wxART_GO_BACK, wxART_BUTTON)); ! wxBitmapButton* findNext = new wxBitmapButton( panel, ID_WXLUA_STACK_FINDNEXT_BUTTON, ! wxArtProvider::GetBitmap(wxART_GO_FORWARD, wxART_BUTTON)); ! findPrev->SetToolTip(wxT("Find previous instance")); ! findNext->SetToolTip(wxT("Find next instance")); ! ! m_findCaseCheckBox = new wxCheckBox(panel, ID_WXLUA_STACK_FINDCASE_CHECKBOX, ! wxT("Case")); ! m_findCaseCheckBox->SetValue(true); ! m_findCaseCheckBox->SetToolTip(wxT("Match case when finding")); ! ! // ----------------------------------------------------------------------- ! ! wxFlexGridSizer* topSizer = new wxFlexGridSizer(2, 1); ! topSizer->AddGrowableCol(1); ! ! topSizer->Add(stackText, wxSizerFlags().Expand().Border().Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL)); ! ! wxFlexGridSizer* stackSizer = new wxFlexGridSizer(2, 1); ! stackSizer->AddGrowableCol(0); ! stackSizer->Add(m_stackChoice, wxSizerFlags().Expand().Border()); ! stackSizer->Add(expandButton, wxSizerFlags().Border()); ! topSizer->Add(stackSizer, wxSizerFlags().Expand()); ! ! topSizer->Add(findText, wxSizerFlags().Expand().Border().Align(wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL)); ! ! wxFlexGridSizer* findSizer = new wxFlexGridSizer(4, 1); ! findSizer->AddGrowableCol(0); ! findSizer->Add(m_findComboBox, wxSizerFlags().Expand().Border()); ! findSizer->Add(findPrev, wxSizerFlags().Expand().Border()); ! findSizer->Add(findNext, wxSizerFlags().Expand().Border()); ! findSizer->Add(m_findCaseCheckBox, wxSizerFlags().Expand().Border()); ! ! topSizer->Add(findSizer, wxSizerFlags().Expand()); ! ! // ----------------------------------------------------------------------- ! ! m_listCtrl = new wxListCtrl( panel, ID_WXLUA_STACK_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_HRULES|wxLC_VRULES ); m_listCtrl->InsertColumn(0, wxT("Name"), wxLIST_FORMAT_LEFT, -1); ! m_listCtrl->InsertColumn(1, wxT("Level"), wxLIST_FORMAT_LEFT, -1); ! m_listCtrl->InsertColumn(2, wxT("Type"), wxLIST_FORMAT_LEFT, -1); ! m_listCtrl->InsertColumn(3, wxT("Value"), wxLIST_FORMAT_LEFT, -1); ! int txt_width = 0, txt_height = 0; ! m_listCtrl->GetTextExtent(wxT("WWWWWWWWWWWWWWWWWWWW"), &txt_width, &txt_height); ! m_listCtrl->SetColumnWidth(0, txt_width); ! m_listCtrl->SetColumnWidth(3, txt_width); // make it wide since it's the last ! m_listCtrl->GetTextExtent(wxT("55:5555"), &txt_width, &txt_height); ! m_listCtrl->SetColumnWidth(1, txt_width); ! m_listCtrl->GetTextExtent(wxT("Light User DataX"), &txt_width, &txt_height); ! m_listCtrl->SetColumnWidth(2, txt_width); ! m_imageList = new wxImageList(16, 16, true); wxBitmap bmp(wxArtProvider::GetIcon(wxART_NORMAL_FILE, wxART_TOOLBAR, wxSize(16,16))); ! m_imageList->Add(bmp); // IMG_UNKNOWN ! m_imageList->Add(bmp); // IMG_NONE ! m_imageList->Add(CreateBmpString(bmp, wxT("0"))); // IMG_NIL ! m_imageList->Add(CreateBmpString(bmp, wxT("b"))); // IMG_BOOLEAN ! m_imageList->Add(CreateBmpString(bmp, wxT("u"))); // IMG_LIGHTUSERDATA ! m_imageList->Add(CreateBmpString(bmp, wxT("1"))); // IMG_NUMBER ! m_imageList->Add(CreateBmpString(bmp, wxT("s"))); // IMG_STRING ! m_imageList->Add(wxArtProvider::GetIcon(wxART_FOLDER, wxART_TOOLBAR, wxSize(16,16))); // IMG_TABLE ! m_imageList->Add(CreateBmpString(bmp, wxT("f"))); // IMG_LUAFUNCTION ! m_imageList->Add(CreateBmpString(bmp, wxT("u"))); // IMG_USERDATA ! m_imageList->Add(CreateBmpString(bmp, wxT("t"))); // IMG_THREAD ! m_imageList->Add(CreateBmpString(bmp, wxT("c"))); // IMG_CFUNCTION ! m_imageList->Add(wxArtProvider::GetIcon(wxART_NEW_DIR, wxART_TOOLBAR, wxSize(16,16))); // IMG_TABLE_OPEN m_listCtrl->SetImageList(m_imageList, wxIMAGE_LIST_SMALL); ! m_typeColours[IMG_UNKNOWN] = wxColour(wxT("TURQUOISE")); ! m_typeColours[IMG_NONE] = wxColour(wxT("TURQUOISE")); ! m_typeColours[IMG_NIL] = wxColour(wxT("BLACK")); ! m_typeColours[IMG_BOOLEAN] = wxColour(wxT("FIREBRICK")); ! m_typeColours[IMG_LIGHTUSERDATA]= wxColour(wxT("CORNFLOWER BLUE")); ! m_typeColours[IMG_NUMBER] = wxColour(wxT("DARK ORCHID")); ! m_typeColours[IMG_STRING] = wxColour(wxT("RED")); ! m_typeColours[IMG_TABLE] = wxColour(wxT("BLUE")); ! m_typeColours[IMG_LUAFUNCTION] = wxColour(wxT("MEDIUM FOREST GREEN")); ! m_typeColours[IMG_USERDATA] = wxColour(wxT("CORNFLOWER BLUE")); ! m_typeColours[IMG_THREAD] = wxColour(wxT("BLACK")); ! m_typeColours[IMG_CFUNCTION] = wxColour(wxT("FOREST GREEN")); ! m_typeColours[IMG_TABLE_OPEN] = wxColour(wxT("BLUE")); ! ! // ----------------------------------------------------------------------- // use sizers to layout the windows in the panel of the dialog wxBoxSizer* rootSizer = new wxBoxSizer(wxVERTICAL); ! rootSizer->Add(topSizer, 0, wxEXPAND|wxBOTTOM, 5); rootSizer->Add(m_listCtrl, 1, wxEXPAND); rootSizer->SetMinSize(450, 400); *************** *** 160,202 **** } ! int wxLuaStackDialog::SetupListItem(const wxLuaDebugDataItem *dbgItem, wxListItem& lItem) { ! wxCHECK_MSG(dbgItem, IMG_UNKNOWN, wxT("Invalid wxLuaDebugDataItem")); ! ! wxString t(dbgItem->GetType()); ! int n, img = IMG_UNKNOWN; ! ! wxChar* strTypes[IMG_THREAD+1] = { ! wxT(""), // unknown ! wxT("Table"), ! wxT(""), // table open ! wxT("Nil"), ! wxT("Boolean"), ! wxT("Number"), ! wxT("String"), ! wxT("C Function"), ! wxT("Lua Function"), ! wxT("User Data"), ! wxT("Light User Data"), ! wxT("Thread") ! }; ! for (n = 0; n < IMG_THREAD+1; n++) ! { ! if (t == strTypes[n]) ! { ! img = n; ! break; ! } ! } // now fix up the images for special cases ! if (dbgItem->GetExpanded()) img = IMG_TABLE_OPEN; ! else if (t == wxT("wxLuaData")) // our internal data structs img = IMG_TABLE; lItem.SetImage(img); // Adjust the fonts to highlight some types wxFont f(m_listCtrl->GetFont()); --- 245,264 ---- } ! int wxLuaStackDialog::SetupListItem(const wxLuaDebugItem *dbgItem, wxListItem& lItem) { ! wxCHECK_MSG(dbgItem, IMG_UNKNOWN, wxT("Invalid wxLuaDebugItem")); ! int img = dbgItem->GetTypeN(); // now fix up the images for special cases ! if (dbgItem->GetFlagBit(WXLUA_DEBUGITEM_EXPANDED)) img = IMG_TABLE_OPEN; ! else if (dbgItem->GetType() == wxT("wxLuaData")) // our internal data structs img = IMG_TABLE; lItem.SetImage(img); + lItem.SetTextColour(m_typeColours[img]); + /* // Adjust the fonts to highlight some types wxFont f(m_listCtrl->GetFont()); *************** *** 212,215 **** --- 274,278 ---- lItem.SetFont(f); } + */ return img; *************** *** 251,255 **** void wxLuaStackDialog::FillStackCombobox(const wxLuaDebugData& debugData) { ! m_stackComboBox->Clear(); m_stackEntries.Clear(); --- 314,318 ---- void wxLuaStackDialog::FillStackCombobox(const wxLuaDebugData& debugData) { ! m_stackChoice->Clear(); m_stackEntries.Clear(); *************** *** 257,268 **** for (n = 0; n < count; ++n) { ! const wxLuaDebugDataItem *item = debugData.Item(n); ! m_stackEntries.Add(item->GetReference()); ! m_stackComboBox->Append(item->GetName()); } if (debugData.GetCount() > 0) { ! m_stackComboBox->SetSelection(0); SelectStack(0); } --- 320,331 ---- for (n = 0; n < count; ++n) { ! const wxLuaDebugItem *item = debugData.Item(n); ! m_stackEntries.Add(item->GetIndex()); ! m_stackChoice->Append(item->GetName()); } if (debugData.GetCount() > 0) { ! m_stackChoice->SetSelection(0); SelectStack(0); } *************** *** 275,279 **** // Add the locals, fake a debug item to get it setup right ! wxLuaDebugDataItem* localItem = new wxLuaDebugDataItem(_("Locals"), wxT("Table"), wxString::Format(wxT("Count %d"), (int)debugData.GetCount()), wxT(""), 0, 0); wxLuaDebugData dataArr; // this deletes the items dataArr.Add(localItem); --- 338,344 ---- // Add the locals, fake a debug item to get it setup right ! wxLuaDebugItem* localItem = new wxLuaDebugItem(_("Locals"), wxT("Table"), ! wxString::Format(wxT("Count %d"), (int)debugData.GetCount()), ! wxT(""), LUA_NOREF, 0, WXLUA_DEBUGITEM_EXPANDED); wxLuaDebugData dataArr; // this deletes the items dataArr.Add(localItem); *************** *** 300,303 **** --- 365,369 ---- { wxString levelStr; + int level = 0; // If less than the count we're expanding a item, else adding a new root *************** *** 309,312 **** --- 375,380 ---- else levelStr = levelText + wxT("--> "); + + level = (levelStr.Length()-1)/3; } else *************** *** 317,321 **** for (n = 0; n < count; ++n) { ! const wxLuaDebugDataItem *item = debugData.Item(n); //wxPrintf(wxT("FillTableEntry %ld %ld n %d %ld '%s'\n"), lc_item_, lc_item, n, (long)item, item->GetName().c_str()); --- 385,389 ---- for (n = 0; n < count; ++n) { ! const wxLuaDebugItem *item = debugData.Item(n); //wxPrintf(wxT("FillTableEntry %ld %ld n %d %ld '%s'\n"), lc_item_, lc_item, n, (long)item, item->GetName().c_str()); *************** *** 323,327 **** info.SetId(lc_item+1); info.SetText(levelStr + item->GetName()); ! info.SetData(new wxLuaDebugDataItem(*item)); SetupListItem(item, info); --- 391,395 ---- info.SetId(lc_item+1); info.SetText(levelStr + item->GetName()); ! info.SetData(new wxLuaDebugItem(*item)); SetupListItem(item, info); *************** *** 329,334 **** info.SetId(lc_item); ! m_listCtrl->SetItem(lc_item, 1, item->GetType()); ! m_listCtrl->SetItem(lc_item, 2, item->GetValue()); } } --- 397,404 ---- info.SetId(lc_item); ! ! m_listCtrl->SetItem(lc_item, 1, wxString::Format(wxT("%d:%d"), level+1, n+1)); ! m_listCtrl->SetItem(lc_item, 2, item->GetType()); ! m_listCtrl->SetItem(lc_item, 3, item->GetValue()); } } *************** *** 346,353 **** // note: don't have spaces here since we use them to mark expanded levels ! wxLuaDebugDataItem* trackedItem = new wxLuaDebugDataItem(_("Tracked User Data"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), trackedCount), wxT(""), 1, 0); ! wxLuaDebugDataItem* callbackItem = new wxLuaDebugDataItem(_("wxEvent Callbacks"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), callbackCount), wxT(""), 1, 0); ! wxLuaDebugDataItem* windowItem = new wxLuaDebugDataItem(_("Top Level wxWindows"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), windowCount), wxT(""), 1, 0); ! wxLuaDebugDataItem* destroyItem = new wxLuaDebugDataItem(_("wxWindow Destroy List"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), destroyCount), wxT(""), 1, 0); wxLuaDebugData dataArr; // this deletes the items --- 416,423 ---- // note: don't have spaces here since we use them to mark expanded levels ! wxLuaDebugItem* trackedItem = new wxLuaDebugItem(_("Tracked User Data"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), trackedCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugItem* callbackItem = new wxLuaDebugItem(_("wxEvent Callbacks"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), callbackCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugItem* windowItem = new wxLuaDebugItem(_("Top Level wxWindows"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), windowCount), wxT(""), LUA_NOREF, 0); ! wxLuaDebugItem* destroyItem = new wxLuaDebugItem(_("wxWindow Destroy List"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), destroyCount), wxT(""), LUA_NOREF, 0); wxLuaDebugData dataArr; // this deletes the items *************** *** 362,366 **** void wxLuaStackDialog::OnItemDeleted(wxListEvent &event) { ! wxLuaDebugDataItem* wxlDItem = (wxLuaDebugDataItem*)event.GetData(); if (wxlDItem != NULL) delete wxlDItem; --- 432,436 ---- void wxLuaStackDialog::OnItemDeleted(wxListEvent &event) { ! wxLuaDebugItem* wxlDItem = (wxLuaDebugItem*)event.GetData(); if (wxlDItem != NULL) delete wxlDItem; *************** *** 372,375 **** --- 442,574 ---- } + void wxLuaStackDialog::OnExpandButton(wxCommandEvent &event) + { + wxBusyCursor wait; + + int level = 0; + int level_count = 1; + + while (level_count > 0) + { + level_count = 0; + + for (long i = 0; i < m_listCtrl->GetItemCount(); ++i) + { + wxString s(m_listCtrl->GetItemText(i)); + if (s.Find(wxT("--> _G")) == wxNOT_FOUND) + { + int cur_level = (s.BeforeLast(wxT('>')).Length() + 1) / 3; + if (cur_level == level) + { + level_count++; + ExpandItem(i, false); + } + } + } + + if (level_count > 0) + level++; + } + } + + // This code is copied from wxStEdit's function wxSTEPrependComboBoxString + void wxLuaPrependComboBoxString(const wxString &str, int max_strings, wxComboBox *combo) + { + wxCHECK_RET(combo, wxT("Invalid combobox in wxLuaPrependComboBoxString")); + + int pos = combo->FindString(str); + if (pos == 0) + return; + if (pos != wxNOT_FOUND) + combo->Delete(pos); + + #if wxCHECK_VERSION(2,5,0) + combo->Insert(str, 0); + #else + // note: can use SetString in MSW, but not in GTK + int n, count = combo->GetCount(); + wxArrayString strings; + strings.Alloc(count); + for (n = 0; n < count; n++) + strings.Add(combo->GetString(n)); + + combo->Clear(); + combo->Append(str); // put new string first + + for (n = 0; n < count; n++) + combo->Append(strings[n]); + #endif + + combo->SetSelection(0); + + if (max_strings > 0) + { + while ((int)combo->GetCount() > max_strings) + combo->Delete(combo->GetCount()-1); + } + } + + void wxLuaStackDialog::OnFind(wxCommandEvent &event) + { + wxString findStr = m_findComboBox->GetValue(); + if (findStr.IsEmpty()) + return; + + wxLuaPrependComboBoxString(findStr, 10, m_findComboBox); + + bool match_case = m_findCaseCheckBox->IsChecked(); + if (!match_case) findStr = findStr.Lower(); + + long direct = event.GetId() == ID_WXLUA_STACK_FINDPREV_BUTTON ? -1 : 1; + + long list_count = m_listCtrl->GetItemCount(); + long start_item = m_listCtrl->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); + + int loop_count = 0; + + while (loop_count < 2) + { + long i = 0; + bool found = false; + + if (loop_count == 0) + { + i = start_item + direct; + + // tweak up the starting item + if (start_item == -1) + { + i = direct > 0 ? 0 : list_count - 1; + loop_count++; // we're looking at all the elements + } + else if ((direct > 0) && (start_item == list_count - 1)) + { + i = 0; + loop_count++; // we're looking at all the elements + } + } + else + { + i = direct > 0 ? 0 : list_count - 1; + } + + for ( ; (i >= 0) && (i < list_count); i = i + direct) + { + if ((match_case && (m_listCtrl->GetItemText(i).Find(findStr) != wxNOT_FOUND)) || + (!match_case && (m_listCtrl->GetItemText(i).Lower().Find(findStr) != wxNOT_FOUND))) + { + m_listCtrl->SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); + m_listCtrl->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); + m_listCtrl->EnsureVisible(i); + found = true; + break; + } + } + + loop_count++; + if (found) break; + } + } + void wxLuaStackDialog::OnSelectStack(wxCommandEvent &event) { *************** *** 388,484 **** void wxLuaStackDialog::OnItemActivated(wxListEvent &event) { ! ItemExpanding(event.GetIndex()); //.GetIndex()); } ! void wxLuaStackDialog::ItemExpanding(long lc_item) { ! if (1) ! { ! wxLuaDebugDataItem *pDebugDataItem = (wxLuaDebugDataItem *)m_listCtrl->GetItemData(lc_item); ! // only expand items once ! if ((pDebugDataItem != NULL) && !pDebugDataItem->GetExpanded()) { ! // Check and block linked tables already shown ! if (pDebugDataItem->GetType() == wxT("Table")) ! { ! wxString val = pDebugDataItem->GetValue(); ! int n, count = m_listCtrl->GetItemCount(); ! for (n = 0; n < count; n++) { ! wxLuaDebugDataItem *itm = (wxLuaDebugDataItem *)m_listCtrl->GetItemData(n); ! if (itm && (itm != pDebugDataItem) && (itm->GetValue() == val) && itm->GetExpanded()) { wxMessageBox(wxT("Cannot expand linked tables,\nplease see the already expanded table."), ! wxT("wxLua Stack"), ! wxOK | wxCENTRE, this); m_listCtrl->SetItemState(n, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); m_listCtrl->SetItemState(n, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); m_listCtrl->EnsureVisible(n); - return; } } } ! int nRef = pDebugDataItem->GetReference(); ! if (m_wxlState.Ok() && ! ((pDebugDataItem->GetName() == _("Tracked User Data")) || ! (pDebugDataItem->GetName() == _("wxEvent Callbacks")) || ! (pDebugDataItem->GetName() == _("Top Level wxWindows")) || ! (pDebugDataItem->GetName() == _("wxWindow Destroy List")))) ! { ! wxLuaState wxlState(m_wxlState); ! wxArrayString names; ! wxArrayInt counts; ! if (pDebugDataItem->GetName() == _("Tracked User Data")) ! { ! wxLongToLongHashMap::iterator it; ! wxLongToLongHashMap* hashMap = wxlState.GetTrackedObjects(); ! for (it = hashMap->begin(); it != hashMap->end(); ++it) ! { ! wxString name(wxT("Unknown Tracked Item")); ! wxObject* obj = (wxObject*)it->second; ! if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) ! name = obj->GetClassInfo()->GetClassName(); ! //name = wxString::Format(wxT("%p "), obj) + name; ! int idx = names.Index(name); ! if (idx == wxNOT_FOUND) ! { ! names.Add(name); ! counts.Add(1); ! } ! else ! counts[idx]++; } } ! else if (pDebugDataItem->GetName() == _("wxEvent Callbacks")) { ! wxList::compatibility_iterator node = wxlState.GetTrackedCallbackList()->GetFirst(); ! while (node) ! { ! wxLuaCallback *pCallback = (wxLuaCallback *) node->GetData(); ! wxCHECK_RET(pCallback, wxT("Invalid wxLuaCallback")); ! wxString evtName; ! if (wxlState.GetLuaBindingList()) { ! wxLuaBindingList::compatibility_iterator bindNode = wxlState.GetLuaBindingList()->GetFirst(); ! for (; bindNode; bindNode = bindNode->GetNext()) ! { ! wxLuaBinding* binding = bindNode->GetData(); ! evtName = binding->GetEventTypeName(pCallback->GetEventType()); ! if (!evtName.IsEmpty()) break; ! } } ! wxString name = wxString::Format(wxT("%d %s"), (int)pCallback->GetEventType(), evtName.c_str()); int idx = names.Index(name); if (idx == wxNOT_FOUND) --- 587,715 ---- void wxLuaStackDialog::OnItemActivated(wxListEvent &event) { ! ExpandItem(event.GetIndex()); //.GetIndex()); } ! bool wxLuaStackDialog::ExpandItem(long lc_item, bool show_err_msg) { ! wxCHECK_MSG((lc_item >= 0) && (lc_item < m_listCtrl->GetItemCount()), false, ! wxT("Invalid list item to expand")); ! bool expanded = false; ! ! wxLuaDebugItem *pDebugDataItem = (wxLuaDebugItem *)m_listCtrl->GetItemData(lc_item); ! ! // only expand items once ! if ((pDebugDataItem != NULL) && !pDebugDataItem->GetFlagBit(WXLUA_DEBUGITEM_EXPANDED)) ! { ! // Check and block linked tables already shown ! if (pDebugDataItem->GetType() == wxT("Table")) { ! wxString val = pDebugDataItem->GetValue(); ! int n, count = m_listCtrl->GetItemCount(); ! for (n = 0; n < count; n++) ! { ! wxLuaDebugItem *itm = (wxLuaDebugItem *)m_listCtrl->GetItemData(n); ! if (itm && (itm != pDebugDataItem) && (itm->GetValue() == val) && ! itm->GetFlagBit(WXLUA_DEBUGITEM_EXPANDED)) { ! if (show_err_msg) { wxMessageBox(wxT("Cannot expand linked tables,\nplease see the already expanded table."), ! wxT("wxLua Stack"), ! wxOK | wxCENTRE, this); m_listCtrl->SetItemState(n, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); m_listCtrl->SetItemState(n, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); m_listCtrl->EnsureVisible(n); } + + return false; } } + } ! int nRef = pDebugDataItem->GetReference(); ! // Check our special variables for the wxLuaState data ! if (m_wxlState.Ok() && ! ((pDebugDataItem->GetName() == _("Tracked User Data")) || ! (pDebugDataItem->GetName() == _("wxEvent Callbacks")) || ! (pDebugDataItem->GetName() == _("Top Level wxWindows")) || ! (pDebugDataItem->GetName() == _("wxWindow Destroy List")))) ! { ! wxLuaState wxlState(m_wxlState); ! wxArrayString names; ! wxArrayInt counts; ! if (pDebugDataItem->GetName() == _("Tracked User Data")) ! { ! wxLongToLongHashMap::iterator it; ! wxLongToLongHashMap* hashMap = wxlState.GetTrackedObjects(); ! for (it = hashMap->begin(); it != hashMap->end(); ++it) ! { ! wxString name(wxT("Unknown Tracked Item")); ! wxObject* obj = (wxObject*)it->second; ! if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) ! name = obj->GetClassInfo()->GetClassName(); ! //name = wxString::Format(wxT("%p "), obj) + name; ! ! int idx = names.Index(name); ! if (idx == wxNOT_FOUND) ! { ! names.Add(name); ! counts.Add(1); } + else + counts[idx]++; } ! } ! else if (pDebugDataItem->GetName() == _("wxEvent Callbacks")) ! { ! wxList::compatibility_iterator node = wxlState.GetTrackedCallbackList()->GetFirst(); ! while (node) { ! wxLuaCallback *pCallback = (wxLuaCallback *) node->GetData(); ! wxCHECK_MSG(pCallback, false, wxT("Invalid wxLuaCallback")); ! wxString evtName; ! if (wxlState.GetLuaBindingList()) ! { ! wxLuaBindingList::compatibility_iterator bindNode = wxlState.GetLuaBindingList()->GetFirst(); ! for (; bindNode; bindNode = bindNode->GetNext()) { ! wxLuaBinding* binding = bindNode->GetData(); ! evtName = binding->GetEventTypeName(pCallback->GetEventType()); ! if (!evtName.IsEmpty()) break; } + } ! wxString name = wxString::Format(wxT("%d %s"), (int)pCallback->GetEventType(), evtName.c_str()); ! int idx = names.Index(name); ! if (idx == wxNOT_FOUND) ! { ! names.Add(name); ! counts.Add(1); ! } ! else ! counts[idx]++; ! ! node = node->GetNext(); ! } ! } ! else if (pDebugDataItem->GetName() == _("Top Level wxWindows")) ! { ! wxWindowList::compatibility_iterator node = wxlState.GetLuaStateData()->m_windowList.GetFirst(); ! while (node) ! { ! wxWindow *win= (wxWindow*)node->GetData(); ! wxCHECK_MSG(win, false, wxT("Invalid wxLuaCallback")); ! if (win && win->GetClassInfo() && win->GetClassInfo()->GetClassName()) ! { ! wxString name(win->GetClassInfo()->GetClassName()); int idx = names.Index(name); if (idx == wxNOT_FOUND) *************** *** 489,563 **** else counts[idx]++; - - node = node->GetNext(); } - } - else if (pDebugDataItem->GetName() == _("Top Level wxWindows")) - { - wxWindowList::compatibility_iterator node = wxlState.GetLuaStateData()->m_windowList.GetFirst(); - while (node) - { - wxWindow *win= (wxWindow*)node->GetData(); - wxCHECK_RET(win, wxT("Invalid wxLuaCallback")); - if (win && win->GetClassInfo() && win->GetClassInfo()->GetClassName()) - { - wxString name(win->GetClassInfo()->GetClassName()); - int idx = names.Index(name); - if (idx == wxNOT_FOUND) - { - names.Add(name); - counts.Add(1); - } - else - counts[idx]++; - } ! node = node->GetNext(); ! } } ! else if (pDebugDataItem->GetName() == _("wxWindow Destroy List")) { ! wxList::compatibility_iterator node = wxlState.GetTrackedWinDestroyCallbackList()->GetFirst(); ! while (node) ! { ! wxLuaWinDestroyCallback *pCallback = (wxLuaWinDestroyCallback *) node->GetData(); ! wxCHECK_RET(pCallback, wxT("Invalid wxLuaWinDestroyCallback")); ! wxString name(wxT("Unknown Tracked Window Type")); ! wxObject* obj = (wxObject*)pCallback->GetEvtHandler(); ! if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) ! name = obj->GetClassInfo()->GetClassName(); ! names.Add(name); ! counts.Add(1); ! node = node->GetNext(); ! } } ! pDebugDataItem->SetExpanded(true); ! m_listCtrl->SetItemImage(lc_item, IMG_TABLE_OPEN); ! ! wxLuaDebugData dataArr; ! size_t n, count = names.GetCount(); ! for (n = 0; n < count; n++) ! { ! wxLuaDebugDataItem *item = new wxLuaDebugDataItem(names[n], wxT(""), wxString::Format(wxT("Count %d"), counts[n]), wxT(""), LUA_NOREF, pDebugDataItem->GetIndex() + 1); ! dataArr.Add(item); ! } ! FillTableEntry(lc_item, dataArr); ! } ! else if (nRef != LUA_NOREF) { ! pDebugDataItem->SetExpanded(true); ! m_listCtrl->SetItemImage(lc_item, IMG_TABLE_OPEN); ! ! int nIndex = pDebugDataItem->GetIndex() + 1; ! EnumerateTable(nRef, nIndex, lc_item); } } } } --- 720,774 ---- else counts[idx]++; } ! node = node->GetNext(); } ! } ! else if (pDebugDataItem->GetName() == _("wxWindow Destroy List")) ! { ! wxList::compatibility_iterator node = wxlState.GetTrackedWinDestroyCallbackList()->GetFirst(); ! while (node) { ! wxLuaWinDestroyCallback *pCallback = (wxLuaWinDestroyCallback *) node->GetData(); ! wxCHECK_MSG(pCallback, false, wxT("Invalid wxLuaWinDestroyCallback")); ! wxString name(wxT("Unknown Tracked Window Type")); ! wxObject* obj = (wxObject*)pCallback->GetEvtHandler(); ! if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) ! name = obj->GetClassInfo()->GetClassName(); ! names.Add(name); ! counts.Add(1); ! node = node->GetNext(); } + } ! pDebugDataItem->SetFlagBit(WXLUA_DEBUGITEM_EXPANDED, true); ! m_listCtrl->SetItemImage(lc_item, IMG_TABLE_OPEN); ! wxLuaDebugData dataArr; ! size_t n, count = names.GetCount(); ! for (n = 0; n < count; n++) { ! wxLuaDebugItem *item = new wxLuaDebugItem(names[n], wxT(""), wxString::Format(wxT("Count %d"), counts[n]), wxT(""), LUA_NOREF, pDebugDataItem->GetIndex() + 1); ! dataArr.Add(item); } + + FillTableEntry(lc_item, dataArr); + expanded = true; + } + else if (nRef != LUA_NOREF) + { + pDebugDataItem->SetFlagBit(WXLUA_DEBUGITEM_EXPANDED, true); + m_listCtrl->SetItemImage(lc_item, IMG_TABLE_OPEN); + + int nIndex = pDebugDataItem->GetIndex() + 1; + EnumerateTable(nRef, nIndex, lc_item); } } + + return expanded; } *************** *** 567,571 **** for (i = 0; i < count; i++) { ! wxLuaDebugDataItem* wxlDItem = (wxLuaDebugDataItem*)m_listCtrl->GetItemData(i); m_listCtrl->SetItemData(i, 0); // null it so we won't try to delete it again if (wxlDItem != NULL) --- 778,782 ---- for (i = 0; i < count; i++) { ! wxLuaDebugItem* wxlDItem = (wxLuaDebugItem*)m_listCtrl->GetItemData(i); m_listCtrl->SetItemData(i, 0); // null it so we won't try to delete it again if (wxlDItem != NULL) Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxldebug.cpp 23 May 2007 02:48:31 -0000 1.30 --- wxldebug.cpp 31 May 2007 17:18:54 -0000 1.31 *************** *** 26,50 **** // ---------------------------------------------------------------------------- ! // wxLuaDebugDataItem // ---------------------------------------------------------------------------- ! wxLuaDebugDataItem::wxLuaDebugDataItem(const wxString &itemName, ! const wxString &itemType, ! const wxString &itemValue, ! const wxString &itemSource, ! int lua_ref, ! int idx, ! bool expanded) :m_itemName(itemName), m_itemType(itemType), m_itemValue(itemValue), m_itemSource(itemSource), m_lua_ref(lua_ref), m_index(idx), ! m_expanded(expanded) { } ! wxLuaDebugDataItem::wxLuaDebugDataItem(const wxLuaDebugDataItem &dataItem) ! :m_itemName(dataItem.m_itemName), m_itemType(dataItem.m_itemType), ! m_itemValue(dataItem.m_itemValue), m_itemSource(dataItem.m_itemSource), ! m_lua_ref(dataItem.m_lua_ref), m_index(dataItem.m_index), ! m_expanded(dataItem.m_expanded) { } --- 26,50 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebugItem // ---------------------------------------------------------------------------- ! wxLuaDebugItem::wxLuaDebugItem(const wxString &itemName, ! const wxString &itemType, ! const wxString &itemValue, ! const wxString &itemSource, ! int lua_ref, ! int idx, ! int flag) :m_itemName(itemName), m_itemType(itemType), m_itemValue(itemValue), m_itemSource(itemSource), m_lua_ref(lua_ref), m_index(idx), ! m_flag(flag) { } ! wxLuaDebugItem::wxLuaDebugItem(const wxLuaDebugItem &dataItem) ! :m_itemName(dataItem.m_itemName), m_itemType(dataItem.m_itemType), ! m_itemValue(dataItem.m_itemValue), m_itemSource(dataItem.m_itemSource), ! m_lua_ref(dataItem.m_lua_ref), m_index(dataItem.m_index), ! m_flag(dataItem.m_flag) { } *************** *** 63,72 **** for (idx = 0; idx < count; ++idx) { ! const wxLuaDebugDataItem *pData = m_dataArray.Item(idx); delete pData; } } ! wxLuaDebugDataItemArray m_dataArray; }; --- 63,72 ---- for (idx = 0; idx < count; ++idx) { ! const wxLuaDebugItem *pData = m_dataArray.Item(idx); delete pData; } } ! wxLuaDebugItemArray m_dataArray; }; *************** *** 76,87 **** { m_refData = new wxLuaDebugDataRefData; } ! wxLuaDebugDataItemArray* wxLuaDebugData::GetArray() { wxCHECK_MSG(M_DEBUGREFDATA != NULL, NULL, wxT("Invalid ref data")); return &(M_DEBUGREFDATA->m_dataArray); } ! const wxLuaDebugDataItemArray* wxLuaDebugData::GetArray() const { wxCHECK_MSG(M_DEBUGREFDATA != NULL, NULL, wxT("Invalid ref data")); --- 76,100 ---- { m_refData = new wxLuaDebugDataRefData; + + // Sanity check to make sure that lua hasn't changed the items on us + wxCHECK_RET((WXLUA_DEBUGITEM_TNONE == WXLUA_DEBUGITEM_T_SHIFT + LUA_TNONE) || + (WXLUA_DEBUGITEM_TNIL == WXLUA_DEBUGITEM_T_SHIFT + LUA_TNIL) || + (WXLUA_DEBUGITEM_TBOOLEAN == WXLUA_DEBUGITEM_T_SHIFT + LUA_TBOOLEAN) || + (WXLUA_DEBUGITEM_TLIGHTUSERDATA == WXLUA_DEBUGITEM_T_SHIFT + LUA_TLIGHTUSERDATA) || + (WXLUA_DEBUGITEM_TNUMBER == WXLUA_DEBUGITEM_T_SHIFT + LUA_TNUMBER) || + (WXLUA_DEBUGITEM_TSTRING == WXLUA_DEBUGITEM_T_SHIFT + LUA_TSTRING) || + (WXLUA_DEBUGITEM_TTABLE == WXLUA_DEBUGITEM_T_SHIFT + LUA_TTABLE) || + (WXLUA_DEBUGITEM_TFUNCTION == WXLUA_DEBUGITEM_T_SHIFT + LUA_TFUNCTION) || + (WXLUA_DEBUGITEM_TUSERDATA == WXLUA_DEBUGITEM_T_SHIFT + LUA_TUSERDATA) || + (WXLUA_DEBUGITEM_TTHREAD == WXLUA_DEBUGITEM_T_SHIFT + LUA_TTHREAD), + wxT("Lua has changed the order of their types.")); } ! wxLuaDebugItemArray* wxLuaDebugData::GetArray() { wxCHECK_MSG(M_DEBUGREFDATA != NULL, NULL, wxT("Invalid ref data")); return &(M_DEBUGREFDATA->m_dataArray); } ! const wxLuaDebugItemArray* wxLuaDebugData::GetArray() const { wxCHECK_MSG(M_DEBUGREFDATA != NULL, NULL, wxT("Invalid ref data")); *************** *** 94,106 **** return M_DEBUGREFDATA->m_dataArray.GetCount(); } ! wxLuaDebugDataItem* wxLuaDebugData::Item(size_t index) const { wxCHECK_MSG(M_DEBUGREFDATA != NULL, NULL, wxT("Invalid ref data")); return M_DEBUGREFDATA->m_dataArray.Item(index); } ! void wxLuaDebugData::Add(wxLuaDebugDataItem* item) { wxCHECK_RET(M_DEBUGREFDATA != NULL, wxT("Invalid ref data")); ! wxCHECK_RET(item != NULL, wxT("Invalid wxLuaDebugDataItem")); M_DEBUGREFDATA->m_dataArray.Add(item); } --- 107,119 ---- return M_DEBUGREFDATA->m_dataArray.GetCount(); } ! wxLuaDebugItem* wxLuaDebugData::Item(size_t index) const { wxCHECK_MSG(M_DEBUGREFDATA != NULL, NULL, wxT("Invalid ref data")); return M_DEBUGREFDATA->m_dataArray.Item(index); } ! void wxLuaDebugData::Add(wxLuaDebugItem* item) { wxCHECK_RET(M_DEBUGREFDATA != NULL, wxT("Invalid ref data")); ! wxCHECK_RET(item != NULL, wxT("Invalid wxLuaDebugItem")); M_DEBUGREFDATA->m_dataArray.Add(item); } *************** *** 114,120 **** for (idx = 0; idx < count; ++idx) { ! const wxLuaDebugDataItem *pOldData = M_DEBUGREFDATA->m_dataArray.Item(idx); if (pOldData != NULL) ! copyData.Add(new wxLuaDebugDataItem(*pOldData)); } --- 127,133 ---- for (idx = 0; idx < count; ++idx) { ! const wxLuaDebugItem *pOldData = M_DEBUGREFDATA->m_dataArray.Item(idx); if (pOldData != NULL) ! copyData.Add(new wxLuaDebugItem(*pOldData)); } *************** *** 122,126 **** } ! int wxLuaDebugData::SortFunction(wxLuaDebugDataItem *elem1, wxLuaDebugDataItem *elem2 ) { int ret = elem1->GetName().Cmp(elem2->GetName()); --- 135,139 ---- } ! int wxLuaDebugData::SortFunction(wxLuaDebugItem *elem1, wxLuaDebugItem *elem2 ) { int ret = elem1->GetName().Cmp(elem2->GetName()); *************** *** 167,172 **** name = wxString::Format(_("line %u"), currentLine); ! wxLuaDebugDataItem *item = new wxLuaDebugDataItem(name, wxT(""), wxT(""), source, nIndex, 0); ! Add(item); count++; } --- 180,184 ---- name = wxString::Format(_("line %u"), currentLine); ! Add(new wxLuaDebugItem(name, wxT(""), wxT(""), source, LUA_NOREF, nIndex, 0)); count++; } *************** *** 200,205 **** wxString value; wxString source(lua2wx(luaDebug.source)); ! GetTypeValue(wxlState, -1, type, value); int nRef = LUA_NOREF; --- 212,218 ---- wxString value; wxString source(lua2wx(luaDebug.source)); + int flag_type = WXLUA_DEBUGITEM_TUNKNOWN; ! GetTypeValue(wxlState, -1, type, value, &flag_type); int nRef = LUA_NOREF; *************** *** 213,217 **** lua_pop(L, 1); // remove variable value ! Add(new wxLuaDebugDataItem(name, type, value, source, nRef, 0)); count++; --- 226,230 ---- lua_pop(L, 1); // remove variable value ! Add(new wxLuaDebugItem(name, type, value, source, nRef, 0, flag_type)); count++; *************** *** 236,240 **** wxlState.GetGlobals(); int nRef = wxlState.tinsert(-1); ! Add(new wxLuaDebugDataItem(wxT("Globals"), wxT("Table"), wxT(""), wxT(""), nRef, 0)); references.Add(nRef); } --- 249,253 ---- wxlState.GetGlobals(); int nRef = wxlState.tinsert(-1); ! Add(new wxLuaDebugItem(wxT("Globals"), wxT("Table"), wxT(""), wxT(""), nRef, 0, WXLUA_DEBUGITEM_TTABLE)); references.Add(nRef); } *************** *** 243,246 **** --- 256,264 ---- if (wxlState.tget(tableRef)) { + wxString type; + wxString value; + wxString name; + int flag_type = WXLUA_DEBUGITEM_TUNKNOWN; + int nTop = lua_gettop(L); *************** *** 249,261 **** while (lua_next(L, nTop) != 0) { - wxString type; - wxString value; - wxString name; - wxString source; - // get the index, just want the name=value, type is dummy here GetTypeValue(wxlState, -2, type, name); // get the type and value ! GetTypeValue(wxlState, -1, type, value); int nRef = LUA_NOREF; --- 267,274 ---- while (lua_next(L, nTop) != 0) { // get the index, just want the name=value, type is dummy here GetTypeValue(wxlState, -2, type, name); // get the type and value ! GetTypeValue(wxlState, -1, type, value, &flag_type); int nRef = LUA_NOREF; *************** *** 268,277 **** lua_pop(L, 1); ! Add(new wxLuaDebugDataItem(name, type, value, source, nRef, nIndex)); count++; } ! // remove reference ! lua_pop(L, 1); } } --- 281,289 ---- lua_pop(L, 1); ! Add(new wxLuaDebugItem(name, type, value, wxT(""), nRef, nIndex, flag_type)); count++; } ! lua_pop(L, 1); // remove reference } } *************** *** 280,319 **** } ! int wxLuaDebugData::GetTypeValue(const wxLuaState& wxlState, int index, wxString& type, wxString& value) { wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); lua_State* L = wxlState.GetLuaState(); int l_type = lua_type(L, index); switch (l_type) { case LUA_TNONE: ! type = wxT("None"); value = wxEmptyString; break; case LUA_TNIL: ! type = wxT("Nil"); value = wxT("nil"); break; case LUA_TBOOLEAN: ! type = wxT("Boolean"); value = MakeBoolean(lua_toboolean(L, index)); break; case LUA_TNUMBER: ! type = wxT("Number"); value = MakeNumber(lua_tonumber(L, index)); break; case LUA_TSTRING: ! type = wxT("String"); value = lua2wx(lua_tostring(L, index)); break; case LUA_TTABLE: ! type = wxT("Table"); value = GetTableInfo(wxlState, index); break; --- 292,361 ---- } ! int wxLuaDebugData::GetTypeValue(const wxLuaState& wxlState, int index, wxString& type, wxString& value, int* flag_type_) { wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + + // try to use the wxString ref counting to reduce memory + static wxString s_typeStrings[WXLUA_DEBUGITEM_T_COUNT] = { + wxT("Unknown data type"), + wxT("None"), + wxT("Nil"), + wxT("Boolean"), + wxT("Light User Data"), + wxT("Number"), + wxT("String"), + wxT("Table"), + wxT("Lua Function"), + wxT("User Data"), + wxT("Thread"), + wxT("C Function") + }; + lua_State* L = wxlState.GetLuaState(); int l_type = lua_type(L, index); + int flag_type = WXLUA_DEBUGITEM_TUNKNOWN; switch (l_type) { case LUA_TNONE: ! type = s_typeStrings[WXLUA_DEBUGITEM_TNONE]; value = wxEmptyString; + flag_type = WXLUA_DEBUGITEM_TNONE; break; case LUA_TNIL: ! type = s_typeStrings[WXLUA_DEBUGITEM_TNIL]; value = wxT("nil"); + flag_type = WXLUA_DEBUGITEM_TNIL; break; case LUA_TBOOLEAN: ! type = s_typeStrings[WXLUA_DEBUGITEM_TBOOLEAN]; value = MakeBoolean(lua_toboolean(L, index)); + flag_type = WXLUA_DEBUGITEM_TBOOLEAN; + break; + + case LUA_TLIGHTUSERDATA: + type = s_typeStrings[WXLUA_DEBUGITEM_TLIGHTUSERDATA]; + value = GetUserDataInfo(wxlState, index, false); + flag_type = WXLUA_DEBUGITEM_TLIGHTUSERDATA; break; case LUA_TNUMBER: ! type = s_typeStrings[WXLUA_DEBUGITEM_TNUMBER]; value = MakeNumber(lua_tonumber(L, index)); + flag_type = WXLUA_DEBUGITEM_TNUMBER; break; case LUA_TSTRING: ! type = s_typeStrings[WXLUA_DEBUGITEM_TSTRING]; value = lua2wx(lua_tostring(L, index)); + flag_type = WXLUA_DEBUGITEM_TSTRING; break; case LUA_TTABLE: ! type = s_typeStrings[WXLUA_DEBUGITEM_TTABLE]; value = GetTableInfo(wxlState, index); + flag_type = WXLUA_DEBUGITEM_TTABLE; break; *************** *** 321,355 **** if (lua_iscfunction(L, index)) { ! type = wxT("C Function"); value.Printf(wxT("%p"), lua_tocfunction(L, index)); } else { ! type = wxT("Lua Function"); value.Printf(wxT("%p"), lua_topointer(L, index)); } break; case LUA_TUSERDATA: ! type = wxT("User Data"); value = GetUserDataInfo(wxlState, index, true); ! break; ! ! case LUA_TLIGHTUSERDATA: ! type = wxT("Light User Data"); ! value = GetUserDataInfo(wxlState, index, false); break; case LUA_TTHREAD: ! type = wxT("Thread"); value.Printf(wxT("%p"), lua_topointer(L, index)); break; default : ! type = wxT("Unknown data type"); value = wxEmptyString; break; } return l_type; } --- 363,399 ---- if (lua_iscfunction(L, index)) { ! type = s_typeStrings[WXLUA_DEBUGITEM_TCFUNCTION]; value.Printf(wxT("%p"), lua_tocfunction(L, index)); + flag_type = WXLUA_DEBUGITEM_TCFUNCTION; } else { ! type = s_typeStrings[WXLUA_DEBUGITEM_TFUNCTION]; value.Printf(wxT("%p"), lua_topointer(L, index)); + flag_type = WXLUA_DEBUGITEM_TFUNCTION; } break; case LUA_TUSERDATA: ! type = s_typeStrings[WXLUA_DEBUGITEM_TUSERDATA]; value = GetUserDataInfo(wxlState, index, true); ! flag_type = WXLUA_DEBUGITEM_TUSERDATA; break; case LUA_TTHREAD: ! type = s_typeStrings[WXLUA_DEBUGITEM_TTHREAD]; value.Printf(wxT("%p"), lua_topointer(L, index)); + flag_type = WXLUA_DEBUGITEM_TTHREAD; break; default : ! type = s_typeStrings[WXLUA_DEBUGITEM_TUNKNOWN]; value = wxEmptyString; + flag_type = WXLUA_DEBUGITEM_TUNKNOWN; break; } + if (flag_type_) *flag_type_ = flag_type; + return l_type; } *************** *** 359,368 **** long num = (long) dnum; if ((double) num == dnum) - { - if (num >= 0) - return wxString::Format(wxT("%lu (0x%lx)"), num, num); - return wxString::Format(wxT("%ld (0x%lx)"), num, num); - } return wxString::Format(wxT("%g"), dnum); --- 403,407 ---- *************** *** 438,471 **** { wxString message(!msg.IsEmpty() ? msg : m_msg); ! #if defined(__WXMSW__) ! wxString buf = wxString::Format(_("Stack state in '%s': in %u out %u\r\n"), message.c_str(), m_top, lua_gettop(m_luaState)); ! OutputDebugString(buf); ! #else //if defined(__WXGTK__) || defined(__WXMAC__) ! fprintf(stderr, "Stack state in '%s': in %u out %u\n", (const char *)wx2lua(msg), m_top, lua_gettop(m_luaState)); ! #endif } ! void wxLuaCheckStack::DumpGlobals(lua_State *L) { wxLuaStringToLongHashMap dumpList; lua_pushvalue(L, LUA_GLOBALSINDEX); ! DumpTable(L, lua_gettop(L), wxT("Globals"), dumpList, 0); lua_pop(L, 1); } ! void wxLuaCheckStack::DumpTable(lua_State *L, const wxString &name) { wxLuaStringToLongHashMap dumpList; lua_pushstring(L, wx2lua(name)); lua_gettable(L, LUA_GLOBALSINDEX); ! DumpTable(L, lua_gettop(L), name, dumpList, 0); lua_pop(L, 1); } ! void wxLuaCheckStack::DumpTable(lua_State *L, int index, const wxString& tablename, wxLuaStringToLongHashMap& dumpList, int indent) { wxLuaState wxlState(L); wxString indentStr; --- 477,516 ---- { wxString message(!msg.IsEmpty() ? msg : m_msg); + wxString s = wxString::Format(wxT("Stack state in '%s': starting top %d ending top %d\n"), + message.c_str(), m_top, lua_gettop(m_luaState)); ! OutputMsg(s); } ! void wxLuaCheckStack::DumpGlobals() { + wxCHECK_RET(m_luaState, wxT("Invalid lua_State")); + + lua_State* L = m_luaState; wxLuaStringToLongHashMap dumpList; lua_pushvalue(L, LUA_GLOBALSINDEX); ! DumpTable(lua_gettop(L), wxT("Globals"), dumpList, 0); lua_pop(L, 1); } ! void wxLuaCheckStack::DumpTable(const wxString &name) { + wxCHECK_RET(m_luaState, wxT("Invalid lua_State")); + + lua_State* L = m_luaState; wxLuaStringToLongHashMap dumpList; lua_pushstring(L, wx2lua(name)); lua_gettable(L, LUA_GLOBALSINDEX); ! DumpTable(lua_gettop(L), name, dumpList, 0); lua_pop(L, 1); } ! void wxLuaCheckStack::DumpTable(int index, const wxString& tablename, wxLuaStringToLongHashMap& dumpList, int indent) { + wxCHECK_RET(m_luaState, wxT("Invalid lua_State")); + + lua_State* L = m_luaState; wxLuaState wxlState(L); wxString indentStr; *************** *** 478,482 **** wxString title = wxString::Format(wxT("%sTable: %s"), indentStr.c_str(), tablename.c_str()); ! wxLogMessage(title); if (!indentStr.IsEmpty()) --- 523,527 ---- wxString title = wxString::Format(wxT("%sTable: %s"), indentStr.c_str(), tablename.c_str()); ! OutputMsg(title); if (!indentStr.IsEmpty()) *************** *** 498,502 **** valueType.c_str(), value.c_str()); ! wxLogMessage(info); if (dumpList.find(value) != dumpList.end()) --- 543,547 ---- valueType.c_str(), value.c_str()); ! OutputMsg(info); if (dumpList.find(value) != dumpList.end()) *************** *** 508,512 **** int tableIndex = lua_gettop(L); // lua_pushvalue(L, lua_gettop(L)); ! DumpTable(L, tableIndex, tname, dumpList, indent+1); } else --- 553,557 ---- int tableIndex = lua_gettop(L); // lua_pushvalue(L, lua_gettop(L)); ! DumpTable(tableIndex, tname, dumpList, indent+1); } else *************** *** 525,535 **** lua_pop(L, 1); ! wxLog::FlushActive(); } ! void wxLuaCheckStack::DumpStack(lua_State* L) { int i, count = lua_gettop(L); ! wxPrintf(wxT("wxLuaCheckStack::DumpStack(%ld) items %d\n"), (long)L, count); wxLuaState wxlState(L); --- 570,583 ---- lua_pop(L, 1); ! //wxLog::FlushActive(); } ! void wxLuaCheckStack::DumpStack() { + wxCHECK_RET(m_luaState, wxT("Invalid lua_State")); + + lua_State* L = m_luaState; int i, count = lua_gettop(L); ! OutputMsg(wxString... [truncated message content] |
From: John L. <jr...@us...> - 2007-05-24 01:00:20
|
Update of /cvsroot/wxlua/wxLua/apps/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/apps/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: makefile.vc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.vc,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.vc 6 May 2007 10:52:51 -0000 1.67 --- makefile.vc 24 May 2007 00:59:43 -0000 1.68 *************** *** 123,128 **** $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_54)$(____app_21) /DWIN32 \ --- 123,128 ---- $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.res APP_WXLUAEDIT_CXXFLAGS = /M$(__RUNTIME_LIBS_54)$(____app_21) /DWIN32 \ *************** *** 144,152 **** /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_82)$(____app_21) /DWIN32 \ --- 144,152 ---- /I..\..\..\modules\wxbind\setup /GR /EHsc $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ + vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.res APP_WXLUAFREEZE_CXXFLAGS = /M$(__RUNTIME_LIBS_82)$(____app_21) /DWIN32 \ *************** *** 541,548 **** $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** --- 541,548 ---- $(CC) /c /nologo /TC /Fo$@ $(APP_LUAC_CFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 559,569 **** rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp - $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** - vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 559,566 ---- rc /fo$@ /d WIN32 $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) /d __WXMSW__ /i $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) /i $(WX_DIR)\include $(______app_wxlua) /i ..\..\..\modules /i .\..\..\.. /i $(LUA_DIR)\include /d _WINDOWS /i $(WXSTEDIT_DIR)\include /i $(WX_DIR)\contrib\include $** vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** *************** *** 571,575 **** $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 568,575 ---- $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! vcmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) /c /nologo /TP /Fo$@ $(APP_WXLUACAN_CXXFLAGS) $** Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.bcc,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.bcc 6 May 2007 10:52:50 -0000 1.67 --- makefile.bcc 24 May 2007 00:59:43 -0000 1.68 *************** *** 169,174 **** -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 169,174 ---- -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj APP_WXLUAEDIT_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 187,195 **** $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 187,195 ---- $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj APP_WXLUAFREEZE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 557,564 **** $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** --- 557,564 ---- $(CC) -q -c -P- -o$@ $(APP_LUAC_CFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj: ..\..\wxlua\src\lconsole.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj: ..\..\wxlua\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUA_CXXFLAGS) $** *************** *** 575,585 **** brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp - $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 575,582 ---- brcc32 -32 -r -fo$@ -i$(BCCDIR)\include $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) -d__WXMSW__ -i$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i$(WX_DIR)\include -i..\..\..\modules -i.\..\..\.. -i$(LUA_DIR)\include -i$(WXSTEDIT_DIR)\include -i$(WX_DIR)\contrib\include $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj: ..\..\wxluacan\src\cancom.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** *************** *** 587,591 **** $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj: ..\..\wxluacan\src\canlua.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** --- 584,591 ---- $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj: ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj: ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -q -c -P -o$@ $(APP_WXLUACAN_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.wat,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** makefile.wat 6 May 2007 10:52:51 -0000 1.68 --- makefile.wat 24 May 2007 00:59:43 -0000 1.69 *************** *** 531,536 **** $(CXXFLAGS) APP_WXLUA_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj APP_WXLUAEDIT_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 531,536 ---- $(CXXFLAGS) APP_WXLUA_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj APP_WXLUAEDIT_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 550,558 **** -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj APP_WXLUAFREEZE_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 550,558 ---- -i=..\..\..\modules\wxbind\setup $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj APP_WXLUAFREEZE_CXXFLAGS = $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) & $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 713,720 **** $(CC) -bt=nt -zq -fo=$^@ $(APP_LUAC_CFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< --- 713,720 ---- $(CC) -bt=nt -zq -fo=$^@ $(APP_LUAC_CFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.obj : .AUTODEPEND ..\..\wxlua\src\lconsole.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.obj : .AUTODEPEND ..\..\wxlua\src\wxlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUA_CXXFLAGS) $< *************** *** 731,741 **** wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< --- 731,738 ---- wrc -q -ad -bt=nt -r -fo=$^@ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ -i=$(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) -i=$(WX_DIR)\include -i=..\..\..\modules -i=.\..\..\.. -i=$(LUA_DIR)\include -i=$(WXSTEDIT_DIR)\include -i=$(WX_DIR)\contrib\include $< watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.obj : .AUTODEPEND ..\..\wxluacan\src\cancom.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj : .AUTODEPEND ..\..\wxluacan\src\canlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< *************** *** 743,747 **** $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.obj : .AUTODEPEND ..\..\wxluacan\src\canlua.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< --- 740,747 ---- $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan.cpp ! $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< ! ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.obj : .AUTODEPEND ..\..\wxluacan\src\wxluacan_bind.cpp $(CXX) -bt=nt -zq -fo=$^@ $(APP_WXLUACAN_CXXFLAGS) $< Index: makefile.gcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/build/msw/makefile.gcc,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** makefile.gcc 6 May 2007 10:52:51 -0000 1.67 --- makefile.gcc 24 May 2007 00:59:43 -0000 1.68 *************** *** 109,114 **** -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ --- 109,114 ---- -I$(LUA_DIR)\include $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua_rc.o APP_WXLUAEDIT_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ *************** *** 129,137 **** $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o \ - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o APP_WXLUAFREEZE_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ --- 129,137 ---- $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o \ + gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o \ gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cansim_rc.o APP_WXLUAFREEZE_CXXFLAGS = -DHAVE_W32API_H $(____WX_SHARED) \ *************** *** 602,609 **** $(CC) -c -o $@ $(APP_LUAC_CFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< --- 602,609 ---- $(CC) -c -o $@ $(APP_LUAC_CFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_lconsole.o: ../../wxlua/src/lconsole.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxlua_wxlua.o: ../../wxlua/src/wxlua.cpp $(CXX) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(CPPDEPS) $< *************** *** 620,630 **** windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_DIR)/include --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp - $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< - gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o: ../../wxluacan/src/wxluacan_bind.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< --- 620,627 ---- windres --use-temp-file -i$< -o$@ --define HAVE_W32API_H $(____WX_SHARED_2) $(__WXUNICODE_DEFINE_p_1) $(__WXDEBUG_DEFINE_p_1) --define __WXMSW__ --include-dir $(WX_DIR)$(WXLIBPATH)\msw$(WXLIBPOSTFIX) --include-dir $(WX_DIR)/include --include-dir ../../../modules --include-dir ./../../.. --include-dir $(LUA_DIR)/include --include-dir $(WXSTEDIT_DIR)/include --include-dir $(WX_DIR)/contrib/include gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_cancom.o: ../../wxluacan/src/cancom.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< *************** *** 632,636 **** $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_canlua.o: ../../wxluacan/src/canlua.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< --- 629,636 ---- $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan.o: ../../wxluacan/src/wxluacan.cpp ! $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< ! ! gccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\app_wxluacan_wxluacan_bind.o: ../../wxluacan/src/wxluacan_bind.cpp $(CXX) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(CPPDEPS) $< |
From: John L. <jr...@us...> - 2007-05-24 01:00:19
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc8 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/modules/build/msvc8 Modified Files: modules_mod_wxluadebug.vcproj modules_mod_wxluasocket.vcproj Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: modules_mod_wxluadebug.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxluadebug.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxluadebug.vcproj 24 Apr 2007 14:40:02 -0000 1.3 --- modules_mod_wxluadebug.vcproj 24 May 2007 00:59:44 -0000 1.4 *************** *** 343,354 **** </FileConfiguration> </File> - <File RelativePath="..\..\wxluadebug\src\splttree.cpp"/> - <File RelativePath="..\..\wxluadebug\src\staktree.cpp"/> <File RelativePath="..\..\wxluadebug\src\wxldebug.cpp"/> </Filter> <Filter Name="WXLUADEBUG headers" UniqueIdentifier="{8EEB6A36-A302-5A71-AEFA-1522F5F4B96B}"> - <File RelativePath="..\..\wxluadebug\include\splttree.h"/> - <File RelativePath="..\..\wxluadebug\include\staktree.h"/> <File RelativePath="..\..\wxluadebug\include\wxldebug.h"/> <File RelativePath="..\..\wxluadebug\include\wxluadebugdefs.h"/> </Filter> --- 343,352 ---- </FileConfiguration> </File> <File RelativePath="..\..\wxluadebug\src\wxldebug.cpp"/> + <File RelativePath="..\..\wxluadebug\src\wxlstack.cpp"/> </Filter> <Filter Name="WXLUADEBUG headers" UniqueIdentifier="{8EEB6A36-A302-5A71-AEFA-1522F5F4B96B}"> <File RelativePath="..\..\wxluadebug\include\wxldebug.h"/> + <File RelativePath="..\..\wxluadebug\include\wxlstack.h"/> <File RelativePath="..\..\wxluadebug\include\wxluadebugdefs.h"/> </Filter> Index: modules_mod_wxluasocket.vcproj =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc8/modules_mod_wxluasocket.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxluasocket.vcproj 24 Apr 2007 14:40:02 -0000 1.3 --- modules_mod_wxluasocket.vcproj 24 May 2007 00:59:44 -0000 1.4 *************** *** 293,297 **** <Files> <Filter Name="WXLUASOCKET sources" UniqueIdentifier="{D18BA71A-B96F-52A4-8AE3-92379BA8D166}"> - <File RelativePath="..\..\wxluasocket\src\dservice.cpp"/> <File RelativePath="..\..\wxluasocket\src\dummy.cpp"> <FileConfiguration Name="Release Unicode DLL Monolithic|Win32"> --- 293,296 ---- *************** *** 351,355 **** </Filter> <Filter Name="WXLUASOCKET headers" UniqueIdentifier="{237C5D9E-4E6F-5C03-856E-045888352A91}"> - <File RelativePath="..\..\wxluasocket\include\dservice.h"/> <File RelativePath="..\..\wxluasocket\include\wxldserv.h"/> <File RelativePath="..\..\wxluasocket\include\wxldtarg.h"/> --- 350,353 ---- |
From: John L. <jr...@us...> - 2007-05-24 01:00:19
|
Update of /cvsroot/wxlua/wxLua/modules In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/modules Modified Files: Makefile.in Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/Makefile.in,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** Makefile.in 23 Apr 2007 22:44:29 -0000 1.55 --- Makefile.in 24 May 2007 00:59:44 -0000 1.56 *************** *** 125,132 **** $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! wxlua_lib_wxlcallb.o \ wxlua_lib_wxlbind.o \ ! wxlua_lib_wxlstate.o \ ! wxlua_lib_dummy.o WXLUA_LIB_ODEP = $(___pch_wxprec_wxlua_lib_wx_wxprec_h_gch___depname) WXLUA_DLL_CXXFLAGS = $(__wxlua_dll_PCH_INC) \ --- 125,132 ---- $(CXXFLAGS) [...1133 lines suppressed...] wxluasocket_dll_dummy.o: $(srcdir)/wxluasocket/src/dummy.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/dummy.cpp wxluasocket_dll_wxldserv.o: $(srcdir)/wxluasocket/src/wxldserv.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldserv.cpp wxluasocket_dll_wxluasocket.o: $(srcdir)/wxluasocket/src/wxluasocket.cpp $(WXLUASOCKET_DLL_ODEP) $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket.cpp + wxluasocket_dll_wxluasocket_bind.o: $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp $(WXLUASOCKET_DLL_ODEP) + $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxluasocket_bind.cpp + + wxluasocket_dll_wxldtarg.o: $(srcdir)/wxluasocket/src/wxldtarg.cpp $(WXLUASOCKET_DLL_ODEP) + $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxldtarg.cpp + + wxluasocket_dll_wxlsock.o: $(srcdir)/wxluasocket/src/wxlsock.cpp $(WXLUASOCKET_DLL_ODEP) + $(CXXC) -c -o $@ $(WXLUASOCKET_DLL_CXXFLAGS) $(srcdir)/wxluasocket/src/wxlsock.cpp + mod_luamodule_luamodule.o: $(srcdir)/luamodule/src/luamodule.cpp $(CXXC) -c -o $@ $(MOD_LUAMODULE_CXXFLAGS) $(srcdir)/luamodule/src/luamodule.cpp |
From: John L. <jr...@us...> - 2007-05-24 01:00:19
|
Update of /cvsroot/wxlua/wxLua/modules/build/msvc6 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/modules/build/msvc6 Modified Files: modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: modules_mod_wxluasocket.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxluasocket.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxluasocket.dsp 24 Apr 2007 14:39:57 -0000 1.3 --- modules_mod_wxluasocket.dsp 24 May 2007 00:59:44 -0000 1.4 *************** *** 453,460 **** # Begin Source File - SOURCE=..\..\wxluasocket\src\dservice.cpp - # End Source File - # Begin Source File - SOURCE=..\..\wxluasocket\src\dummy.cpp # ADD BASE CPP /Yc"wx/wxprec.h" --- 453,456 ---- *************** *** 487,494 **** # Begin Source File - SOURCE=..\..\wxluasocket\include\dservice.h - # End Source File - # Begin Source File - SOURCE=..\..\wxluasocket\include\wxldserv.h # End Source File --- 483,486 ---- Index: modules_mod_wxluadebug.dsp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msvc6/modules_mod_wxluadebug.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** modules_mod_wxluadebug.dsp 24 Apr 2007 14:39:56 -0000 1.3 --- modules_mod_wxluadebug.dsp 24 May 2007 00:59:44 -0000 1.4 *************** *** 459,471 **** # Begin Source File ! SOURCE=..\..\wxluadebug\src\splttree.cpp ! # End Source File ! # Begin Source File ! ! SOURCE=..\..\wxluadebug\src\staktree.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxluadebug\src\wxldebug.cpp # End Source File # End Group --- 459,467 ---- # Begin Source File ! SOURCE=..\..\wxluadebug\src\wxldebug.cpp # End Source File # Begin Source File ! SOURCE=..\..\wxluadebug\src\wxlstack.cpp # End Source File # End Group *************** *** 475,487 **** # Begin Source File ! SOURCE=..\..\wxluadebug\include\splttree.h ! # End Source File ! # Begin Source File ! ! SOURCE=..\..\wxluadebug\include\staktree.h # End Source File # Begin Source File ! SOURCE=..\..\wxluadebug\include\wxldebug.h # End Source File # Begin Source File --- 471,479 ---- # Begin Source File ! SOURCE=..\..\wxluadebug\include\wxldebug.h # End Source File # Begin Source File ! SOURCE=..\..\wxluadebug\include\wxlstack.h # End Source File # Begin Source File |
From: John L. <jr...@us...> - 2007-05-24 01:00:19
|
Update of /cvsroot/wxlua/wxLua/apps/wxluaedit/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/apps/wxluaedit/src Modified Files: wxledit.cpp wxluaedit.cpp Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: wxluaedit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxluaedit.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxluaedit.cpp 27 Feb 2007 20:52:37 -0000 1.30 --- wxluaedit.cpp 24 May 2007 00:59:44 -0000 1.31 *************** *** 33,37 **** #include "wxluasocket/include/wxldserv.h" #include "wxluasocket/include/wxldtarg.h" ! #include "wxluadebug/include/staktree.h" class wxLuaConsole; --- 33,37 ---- #include "wxluasocket/include/wxldserv.h" #include "wxluasocket/include/wxldtarg.h" ! #include "wxluadebug/include/wxlstack.h" class wxLuaConsole; *************** *** 465,469 **** shell->AppendText(wxT(" Enter lua code and press <enter> to run it.\n")); shell->AppendText(wxT(" Multiline code can be typed by pressing <shift>-<enter>.\n")); ! shell->AppendText(wxT(" The wxLua intrepreter can be restarted with the command 'reset'.\n")); shell->MarkerDeleteAll(wxSTEditorShell::markerPrompt); shell->CheckPrompt(true); --- 465,469 ---- shell->AppendText(wxT(" Enter lua code and press <enter> to run it.\n")); shell->AppendText(wxT(" Multiline code can be typed by pressing <shift>-<enter>.\n")); ! shell->AppendText(wxT(" The wxLua intrepreter can be restarted with the command 'reset'.\n")); shell->MarkerDeleteAll(wxSTEditorShell::markerPrompt); shell->CheckPrompt(true); Index: wxledit.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluaedit/src/wxledit.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxledit.cpp 8 May 2007 00:55:12 -0000 1.31 --- wxledit.cpp 24 May 2007 00:59:43 -0000 1.32 *************** *** 26,30 **** #include "wxledit.h" ! #include "wxluadebug/include/staktree.h" #include "wxluadebug/include/wxldebug.h" --- 26,30 ---- #include "wxledit.h" ! #include "wxluadebug/include/wxlstack.h" #include "wxluadebug/include/wxldebug.h" *************** *** 101,111 **** // ask if anyone else wants to create a new wxLuaState for us wxLuaEvent event(wxEVT_LUASHELL_wxLUA_CREATION, GetId(), m_wxlState); ! event.SetEventObject(this); event.SetInt(0); event.SetExtraLong(win_id); // return if handled, but not skipped. ! if (GetEventHandler()->ProcessEvent(event)) ! return false; // Did they set a valid interpreter for the event and is it new? --- 101,111 ---- // ask if anyone else wants to create a new wxLuaState for us wxLuaEvent event(wxEVT_LUASHELL_wxLUA_CREATION, GetId(), m_wxlState); ! event.SetEventObject(this); event.SetInt(0); event.SetExtraLong(win_id); // return if handled, but not skipped. ! if (GetEventHandler()->ProcessEvent(event)) ! return false; // Did they set a valid interpreter for the event and is it new? *************** *** 439,443 **** m_luaOutput->SetFileName(wxT("Output")); ! m_msgNotebook->InsertEditorSplitter(-1, steSplitter, false); --- 439,443 ---- m_luaOutput->SetFileName(wxT("Output")); ! m_msgNotebook->InsertEditorSplitter(-1, steSplitter, false); *************** *** 572,577 **** // return if handled, but not skipped. ! if (GetEventHandler()->ProcessEvent(event)) ! return false; // Did they set a valid interpreter for the event and is it new? --- 572,577 ---- // return if handled, but not skipped. ! if (GetEventHandler()->ProcessEvent(event)) ! return false; // Did they set a valid interpreter for the event and is it new? |
From: John L. <jr...@us...> - 2007-05-24 01:00:18
|
Update of /cvsroot/wxlua/wxLua/apps In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/apps Modified Files: Makefile.in Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/Makefile.in,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** Makefile.in 6 May 2007 10:52:44 -0000 1.60 --- Makefile.in 24 May 2007 00:59:43 -0000 1.61 *************** *** 59,64 **** -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ - app_wxlua_wxlua.o \ app_wxlua_lconsole.o \ $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ --- 59,64 ---- -I$(LUA_DIR)/include $(WX_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS) APP_WXLUA_OBJECTS = \ app_wxlua_lconsole.o \ + app_wxlua_wxlua.o \ $(__app_wxlua___win32rc) APP_WXLUAEDIT_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ *************** *** 72,80 **** $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ - app_wxluacan_wxluacan.o \ app_wxluacan_cancom.o \ - app_wxluacan_wxluacan_bind.o \ - app_wxluacan_cansim.o \ app_wxluacan_canlua.o \ $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ --- 72,80 ---- $(CPPFLAGS) $(CXXFLAGS) APP_WXLUACAN_OBJECTS = \ app_wxluacan_cancom.o \ app_wxluacan_canlua.o \ + app_wxluacan_cansim.o \ + app_wxluacan_wxluacan.o \ + app_wxluacan_wxluacan_bind.o \ $(__app_wxluacan___win32rc) APP_WXLUAFREEZE_CXXFLAGS = -I$(top_srcdir)/modules -I./$(top_srcdir) \ *************** *** 393,402 **** $(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/print.c - app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp - $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp - app_wxlua_lconsole.o: $(srcdir)/wxlua/src/lconsole.cpp $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/lconsole.cpp app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include --- 393,402 ---- $(CCC) -c -o $@ $(APP_LUAC_CFLAGS) $(srcdir)/../modules/lua/src/print.c app_wxlua_lconsole.o: $(srcdir)/wxlua/src/lconsole.cpp $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/lconsole.cpp + app_wxlua_wxlua.o: $(srcdir)/wxlua/src/wxlua.cpp + $(CXXC) -c -o $@ $(APP_WXLUA_CXXFLAGS) $(srcdir)/wxlua/src/wxlua.cpp + app_wxlua_wxlua_rc.o: $(srcdir)/wxlua/src/wxlua.rc $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include *************** *** 411,428 **** $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include - app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp - $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan.cpp - app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cancom.cpp ! app_wxluacan_wxluacan_bind.o: $(srcdir)/wxluacan/src/wxluacan_bind.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan_bind.cpp app_wxluacan_cansim.o: $(srcdir)/wxluacan/src/cansim.cpp $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cansim.cpp ! app_wxluacan_canlua.o: $(srcdir)/wxluacan/src/canlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/canlua.cpp app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc --- 411,428 ---- $(WX_RESCOMP) -i$< -o$@ --include-dir $(top_srcdir)/modules --include-dir ./$(top_srcdir) --include-dir $(LUA_DIR)/include app_wxluacan_cancom.o: $(srcdir)/wxluacan/src/cancom.cpp $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cancom.cpp ! app_wxluacan_canlua.o: $(srcdir)/wxluacan/src/canlua.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/canlua.cpp app_wxluacan_cansim.o: $(srcdir)/wxluacan/src/cansim.cpp $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/cansim.cpp ! app_wxluacan_wxluacan.o: $(srcdir)/wxluacan/src/wxluacan.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan.cpp ! ! app_wxluacan_wxluacan_bind.o: $(srcdir)/wxluacan/src/wxluacan_bind.cpp ! $(CXXC) -c -o $@ $(APP_WXLUACAN_CXXFLAGS) $(srcdir)/wxluacan/src/wxluacan_bind.cpp app_wxluacan_cansim_rc.o: $(srcdir)/wxluacan/src/cansim.rc |
From: John L. <jr...@us...> - 2007-05-24 01:00:17
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua Modified Files: Makefile.in Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: Makefile.in =================================================================== RCS file: /cvsroot/wxlua/wxLua/Makefile.in,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Makefile.in 24 Apr 2007 13:48:46 -0000 1.24 --- Makefile.in 24 May 2007 00:59:43 -0000 1.25 *************** *** 79,83 **** samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/grid.wx.lua samples/fldemo.wx.lua samples/htmlwin.wx.lua samples/dialog.wx.lua samples/luamodule.wx.lua samples/calculator.wx.lua samples/debug.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/editor.wx.lua samples/veryminimal.wx.lua samples/scribble.wx.lua samples/minimal.wx.lua samples/mdi.wx.lua samples/unittest.wx.lua samples/printing.wx.lua samples/tree.wx.lua samples/sizer.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ --- 79,83 ---- samples: @mkdir -p $(DESTDIR)$(datadir)/wxlua/samples ! @for f in samples/calculator.wx.lua samples/choices.wx.lua samples/coroutine.wx.lua samples/debug.wx.lua samples/dialog.wx.lua samples/editor.wx.lua samples/fldemo.wx.lua samples/grid.wx.lua samples/htmlwin.wx.lua samples/luamodule.wx.lua samples/mdi.wx.lua samples/minimal.wx.lua samples/printing.wx.lua samples/scribble.wx.lua samples/sizer.wx.lua samples/tree.wx.lua samples/unittest.wx.lua samples/veryminimal.wx.lua samples/wxluasudoku.wx.lua samples/calculator.xrc; do \ if test ! -f $(DESTDIR)$(datadir)/wxlua/samples/$$f -a ! -d $(DESTDIR)$(datadir)/wxlua/samples/$$f ; \ then x=yep ; \ |
From: John L. <jr...@us...> - 2007-05-24 00:59:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/modules/wxluadebug/include Added Files: wxlstack.h Removed Files: splttree.h staktree.h Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes --- staktree.h DELETED --- --- NEW FILE: wxlstack.h --- ///////////////////////////////////////////////////////////////////////////// // Name: wxLuaStackTree.h // Purpose: Interface to display the lua stack in wxLua // Author: J. Winwood // Created: April 2002 // Copyright: (c) 2002. Lomtick Software. All rights reserved. // Licence: wxWidgets license. ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_LUA_STACKTREE_H_ #define _WX_LUA_STACKTREE_H_ #include "wx/dialog.h" #include "wx/listctrl.h" #include "wxluadebug/include/wxluadebugdefs.h" #include "wxluadebug/include/wxldebug.h" class WXDLLIMPEXP_WXLUADEBUG wxLuaDebugData; // ---------------------------------------------------------------------------- // wxWindowIds for the wxLuaStackDialog // ---------------------------------------------------------------------------- enum { ID_WXLUA_STACKDIALOG_COMBO = 2000, ID_WXLUA_STACKDIALOG_LISTCTRL }; // ---------------------------------------------------------------------------- // wxLuaStackDialog // ---------------------------------------------------------------------------- class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog : public wxDialog { public: wxLuaStackDialog() : wxDialog() { Init(); } wxLuaStackDialog(const wxLuaState& wxlState, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("wxLua Stack"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(500, 300)) : wxDialog() { Init(); Create(wxlState, parent, id, title, pos, size); } virtual ~wxLuaStackDialog(); bool Create(const wxLuaState& wxlState, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT("wxLua Stack"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize); // Icon indexes for image list used in the listctrl enum { IMG_UNKNOWN, IMG_TABLE, IMG_TABLE_OPEN, IMG_NIL, IMG_BOOL, IMG_NUMBER, IMG_STRING, IMG_CFUNCTION, IMG_LUAFUNCTION, IMG_USERDATA, IMG_LIGHTUSERDATA, IMG_THREAD }; // Draw the string centered in the bitmap virtual wxBitmap CreateBmpString(const wxBitmap& bmp, const wxString& s); virtual int SetupListItem(const wxLuaDebugDataItem *dbgItem, wxListItem& lItem); // Override these functions if you need to provide an alternate way to get // the wxLuaDebugData. See wxluasocket lib and wxLuaDebuggerStackDialog virtual void EnumerateStack(); virtual void EnumerateStackEntry(int nEntry); virtual void EnumerateTable(int nRef, int nEntry, long lc_item); virtual void EnumerateGlobalData(long lc_item); // Fill the combobox with the stack entries in the debug data and select // the first stack item. void FillStackCombobox(const wxLuaDebugData& debugData); // Clear the listctrl and add debug data into tree root. If at the top of // the stack, enumerate the global stack data. void FillStackEntry(int nEntry, const wxLuaDebugData& debugData); // Fill a listctrl item with children from the debug data void FillTableEntry(long lc_item, const wxLuaDebugData& debugData); // Add info from the wxLuaState (must be valid) about items the wxLuaState tracks. void GetDerivedAndTrackedItems(); // implementation // Handle and set the stack from the stack combobox selection void OnSelectStack(wxCommandEvent &event); void SelectStack(int stack_sel); // Handle and expand a listctrl item void OnItemDeleted(wxListEvent &event); void OnAllItemsDeleted(wxListEvent &event); void OnItemActivated(wxListEvent &event); void ItemExpanding(long lc_item); protected: void DeleteAllListItemData(); wxListCtrl *m_listCtrl; wxComboBox *m_stackComboBox; // display stack entries int m_stack_sel; // current stack selection wxArrayInt m_stackEntries; // stack entry references wxLuaState m_wxlState; // lua_State to show stack for wxArrayInt m_luaReferences; // references from m_wxlState.tinsert wxImageList *m_imageList; // image list for listctrl private: void Init(); DECLARE_ABSTRACT_CLASS(wxLuaStackDialog) DECLARE_EVENT_TABLE() }; #endif //_WX_LUA_STACKTREE_H_ --- splttree.h DELETED --- |
Update of /cvsroot/wxlua/wxLua/modules/build/msw In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/modules/build/msw Modified Files: makefile.bcc makefile.gcc makefile.vc makefile.wat modules_mod_wxluadebug.dsp modules_mod_wxluasocket.dsp Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: makefile.bcc =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.bcc,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** makefile.bcc 4 May 2007 20:22:26 -0000 1.66 --- makefile.bcc 24 May 2007 00:59:44 -0000 1.67 *************** *** 210,217 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj WXLUA_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 210,217 ---- -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUA_LIB_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj WXLUA_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 223,230 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlbind.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlstate.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj WXBIND_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 223,230 ---- -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlbind.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlstate.obj WXBIND_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 236,270 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_geometry.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_data.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_grid.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_mdi.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_file.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_config.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_menutool.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_event.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_gdi.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_defsutil.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_image.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_sizer.obj \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wave.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_socket.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wx_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_windows.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlhtmlwin.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_appframe.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_regex.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_controls.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_datetime.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dialogs.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_clipdrag.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_print.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_thread.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_help.obj WXBIND_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 236,270 ---- -Hu $(CPPFLAGS) $(CXXFLAGS) WXBIND_LIB_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_appframe.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_clipdrag.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_config.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_controls.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_data.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_datetime.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_defsutil.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dialogs.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_event.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_file.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_gdi.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_geometry.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_grid.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_help.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_html.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_image.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_mdi.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_menutool.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_print.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_regex.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_socket.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_thread.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wave.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_windows.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wx_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlhtmlwin.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj WXBIND_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 276,310 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_geometry.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_data.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_html.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_grid.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_mdi.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_file.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_config.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_menutool.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_event.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_gdi.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_defsutil.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_image.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_sizer.obj \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wave.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_socket.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wx_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_windows.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlhtmlwin.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_regex.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_controls.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_datetime.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dialogs.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_clipdrag.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_print.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_thread.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_help.obj WXBINDSTC_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 276,310 ---- -Hu $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_clipdrag.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_config.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_controls.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_data.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_datetime.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_defsutil.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dialogs.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_event.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_file.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_gdi.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_geometry.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_grid.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_help.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_html.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_image.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_mdi.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_menutool.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_print.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_regex.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_sizer.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_socket.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_thread.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wave.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_windows.obj \ + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wx_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlhtmlwin.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj WXBINDSTC_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 316,322 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_LIB_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_wxstc_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.obj WXBINDSTC_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 316,322 ---- -Hu $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_LIB_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_stc.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_wxstc_bind.obj WXBINDSTC_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 328,334 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_dummy.obj WXLUADEBUG_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 328,334 ---- -Hu $(CPPFLAGS) $(CXXFLAGS) WXBINDSTC_DLL_OBJECTS = \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_stc.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.obj WXLUADEBUG_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 341,347 **** WXLUADEBUG_LIB_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_dummy.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_wxldebug.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_splttree.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_staktree.obj WXLUADEBUG_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 341,346 ---- WXLUADEBUG_LIB_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_dummy.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_wxlstack.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_wxldebug.obj WXLUADEBUG_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 354,360 **** WXLUADEBUG_DLL_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_dummy.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_wxldebug.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_splttree.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_staktree.obj WXLUASOCKET_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 353,358 ---- WXLUADEBUG_DLL_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_dummy.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_wxlstack.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_wxldebug.obj WXLUASOCKET_LIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 366,376 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxluasocket_bind.obj \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxlsock.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_dummy.obj \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxldserv.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_dservice.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj WXLUASOCKET_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ --- 364,373 ---- -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_LIB_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxldserv.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxluasocket_bind.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxlsock.obj WXLUASOCKET_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ -I..\..\..\modules\wxbind\setup $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) \ *************** *** 382,392 **** -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj \ - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dservice.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj MOD_LUAMODULE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ --- 379,388 ---- -Hu $(CPPFLAGS) $(CXXFLAGS) WXLUASOCKET_DLL_OBJECTS = \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj \ bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj \ ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj MOD_LUAMODULE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include \ $(____WX_SHARED) $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -D__WXMSW__ \ *************** *** 1043,1062 **** $(CC) -q -c -P- -o$@ $(LUA_DLL_CFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj: ..\..\wxlua\src\wxlbind.cpp $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj: ..\..\wxlua\src\wxlstate.cpp $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj: ..\..\wxlua\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) -H $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlbind.obj: ..\..\wxlua\src\wxlbind.cpp $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** --- 1039,1061 ---- $(CC) -q -c -P- -o$@ $(LUA_DLL_CFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj: ..\..\wxlua\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) -H $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj: ..\..\wxlua\src\wxlbind.cpp $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp + $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj: ..\..\wxlua\src\wxlstate.cpp $(CXX) -q -c -P -o$@ $(WXLUA_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj: ..\..\wxlua\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) -H $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlbind.obj: ..\..\wxlua\src\wxlbind.cpp $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj: ..\..\wxlua\src\wxlcallb.cpp $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** *************** *** 1064,1098 **** $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj: ..\..\wxlua\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) -H $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj: ..\..\wxbind\src\wxlua.cpp ! $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj: ..\..\wxbind\src\xml.cpp ! $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_geometry.obj: ..\..\wxbind\src\geometry.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_data.obj: ..\..\wxbind\src\data.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_mdi.obj: ..\..\wxbind\src\mdi.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_file.obj: ..\..\wxbind\src\file.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_config.obj: ..\..\wxbind\src\config.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_menutool.obj: ..\..\wxbind\src\menutool.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** --- 1063,1088 ---- $(CXX) -q -c -P -o$@ $(WXLUA_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_appframe.obj: ..\..\wxbind\src\appframe.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_config.obj: ..\..\wxbind\src\config.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_controls.obj: ..\..\wxbind\src\controls.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_data.obj: ..\..\wxbind\src\data.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_datetime.obj: ..\..\wxbind\src\datetime.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_defsutil.obj: ..\..\wxbind\src\defsutil.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dialogs.obj: ..\..\wxbind\src\dialogs.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** *************** *** 1103,1191 **** $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_gdi.obj: ..\..\wxbind\src\gdi.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_defsutil.obj: ..\..\wxbind\src\defsutil.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_image.obj: ..\..\wxbind\src\image.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_sizer.obj: ..\..\wxbind\src\sizer.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wave.obj: ..\..\wxbind\src\wave.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_socket.obj: ..\..\wxbind\src\socket.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wx_bind.obj: ..\..\wxbind\src\wx_bind.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_windows.obj: ..\..\wxbind\src\windows.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_appframe.obj: ..\..\wxbind\src\appframe.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_regex.obj: ..\..\wxbind\src\regex.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_controls.obj: ..\..\wxbind\src\controls.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_datetime.obj: ..\..\wxbind\src\datetime.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dialogs.obj: ..\..\wxbind\src\dialogs.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_print.obj: ..\..\wxbind\src\print.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_thread.obj: ..\..\wxbind\src\thread.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_help.obj: ..\..\wxbind\src\help.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj: ..\..\wxbind\src\wxlua.cpp ! $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj: ..\..\wxbind\src\xml.cpp ! $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_geometry.obj: ..\..\wxbind\src\geometry.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_data.obj: ..\..\wxbind\src\data.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_mdi.obj: ..\..\wxbind\src\mdi.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_file.obj: ..\..\wxbind\src\file.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_config.obj: ..\..\wxbind\src\config.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_menutool.obj: ..\..\wxbind\src\menutool.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** --- 1093,1181 ---- $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_file.obj: ..\..\wxbind\src\file.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_gdi.obj: ..\..\wxbind\src\gdi.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_geometry.obj: ..\..\wxbind\src\geometry.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_help.obj: ..\..\wxbind\src\help.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_html.obj: ..\..\wxbind\src\html.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_image.obj: ..\..\wxbind\src\image.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_mdi.obj: ..\..\wxbind\src\mdi.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_menutool.obj: ..\..\wxbind\src\menutool.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_print.obj: ..\..\wxbind\src\print.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_regex.obj: ..\..\wxbind\src\regex.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_sizer.obj: ..\..\wxbind\src\sizer.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_socket.obj: ..\..\wxbind\src\socket.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_thread.obj: ..\..\wxbind\src\thread.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wave.obj: ..\..\wxbind\src\wave.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_windows.obj: ..\..\wxbind\src\windows.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wx_bind.obj: ..\..\wxbind\src\wx_bind.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj: ..\..\wxbind\src\wxlua.cpp ! $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj: ..\..\wxbind\src\xml.cpp ! $(CXX) -q -c -P -o$@ $(WXBIND_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.obj: ..\..\wxbind\src\appframe.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_config.obj: ..\..\wxbind\src\config.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_controls.obj: ..\..\wxbind\src\controls.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_data.obj: ..\..\wxbind\src\data.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_datetime.obj: ..\..\wxbind\src\datetime.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_defsutil.obj: ..\..\wxbind\src\defsutil.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dialogs.obj: ..\..\wxbind\src\dialogs.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** *************** *** 1196,1284 **** $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_gdi.obj: ..\..\wxbind\src\gdi.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_defsutil.obj: ..\..\wxbind\src\defsutil.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_image.obj: ..\..\wxbind\src\image.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_sizer.obj: ..\..\wxbind\src\sizer.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wave.obj: ..\..\wxbind\src\wave.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_socket.obj: ..\..\wxbind\src\socket.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wx_bind.obj: ..\..\wxbind\src\wx_bind.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_windows.obj: ..\..\wxbind\src\windows.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.obj: ..\..\wxbind\src\appframe.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_regex.obj: ..\..\wxbind\src\regex.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_controls.obj: ..\..\wxbind\src\controls.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_datetime.obj: ..\..\wxbind\src\datetime.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dialogs.obj: ..\..\wxbind\src\dialogs.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_clipdrag.obj: ..\..\wxbind\src\clipdrag.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_print.obj: ..\..\wxbind\src\print.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_thread.obj: ..\..\wxbind\src\thread.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_help.obj: ..\..\wxbind\src\help.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_wxstc_bind.obj: ..\..\wxbindstc\src\wxstc_bind.cpp ! $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_stc.obj: ..\..\wxbindstc\src\stc.cpp $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.obj: ..\..\wxbindstc\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) -H $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.obj: ..\..\wxbindstc\src\wxstc_bind.cpp ! $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_stc.obj: ..\..\wxbindstc\src\stc.cpp $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_dummy.obj: ..\..\wxbindstc\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) -H $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_dummy.obj: ..\..\wxluadebug\src\dummy.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) -H $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp ! $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_splttree.obj: ..\..\wxluadebug\src\splttree.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_staktree.obj: ..\..\wxluadebug\src\staktree.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** --- 1186,1277 ---- $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_file.obj: ..\..\wxbind\src\file.cpp + $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** + bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_gdi.obj: ..\..\wxbind\src\gdi.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_geometry.obj: ..\..\wxbind\src\geometry.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_grid.obj: ..\..\wxbind\src\grid.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_help.obj: ..\..\wxbind\src\help.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_html.obj: ..\..\wxbind\src\html.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_image.obj: ..\..\wxbind\src\image.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_mdi.obj: ..\..\wxbind\src\mdi.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_menutool.obj: ..\..\wxbind\src\menutool.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_print.obj: ..\..\wxbind\src\print.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_regex.obj: ..\..\wxbind\src\regex.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_sizer.obj: ..\..\wxbind\src\sizer.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_socket.obj: ..\..\wxbind\src\socket.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_thread.obj: ..\..\wxbind\src\thread.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wave.obj: ..\..\wxbind\src\wave.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_windows.obj: ..\..\wxbind\src\windows.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wx_bind.obj: ..\..\wxbind\src\wx_bind.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlhtmlwin.obj: ..\..\wxbind\src\wxlhtmlwin.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj: ..\..\wxbind\src\wxlprint.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj: ..\..\wxbind\src\wxlua.cpp $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj: ..\..\wxbind\src\xml.cpp ! $(CXX) -q -c -P -o$@ $(WXBIND_DLL_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_dummy.obj: ..\..\wxbindstc\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) -H $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_stc.obj: ..\..\wxbindstc\src\stc.cpp $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_lib_wxstc_bind.obj: ..\..\wxbindstc\src\wxstc_bind.cpp ! $(CXX) -q -c -P -o$@ $(WXBINDSTC_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_dummy.obj: ..\..\wxbindstc\src\dummy.cpp ! $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) -H $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_stc.obj: ..\..\wxbindstc\src\stc.cpp $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbindstc_dll_wxstc_bind.obj: ..\..\wxbindstc\src\wxstc_bind.cpp ! $(CXX) -q -c -P -o$@ $(WXBINDSTC_DLL_CXXFLAGS) $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_dummy.obj: ..\..\wxluadebug\src\dummy.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) -H $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_wxlstack.obj: ..\..\wxluadebug\src\wxlstack.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_lib_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_LIB_CXXFLAGS) $** *************** *** 1286,1338 **** $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) -H $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp ! $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_splttree.obj: ..\..\wxluadebug\src\splttree.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_staktree.obj: ..\..\wxluadebug\src\staktree.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp - $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp - $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_dummy.obj: ..\..\wxluasocket\src\dummy.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) -H $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp - $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** - bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_dservice.obj: ..\..\wxluasocket\src\dservice.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj: ..\..\wxluasocket\src\dummy.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) -H $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dservice.obj: ..\..\wxluasocket\src\dservice.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** --- 1279,1322 ---- $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) -H $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_wxlstack.obj: ..\..\wxluadebug\src\wxlstack.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluadebug_dll_wxldebug.obj: ..\..\wxluadebug\src\wxldebug.cpp $(CXX) -q -c -P -o$@ $(WXLUADEBUG_DLL_CXXFLAGS) $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_dummy.obj: ..\..\wxluasocket\src\dummy.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) -H $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_lib_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_LIB_CXXFLAGS) $** bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_dummy.obj: ..\..\wxluasocket\src\dummy.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) -H $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldserv.obj: ..\..\wxluasocket\src\wxldserv.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket.obj: ..\..\wxluasocket\src\wxluasocket.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxluasocket_bind.obj: ..\..\wxluasocket\src\wxluasocket_bind.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxldtarg.obj: ..\..\wxluasocket\src\wxldtarg.cpp ! $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** ! ! bccmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxluasocket_dll_wxlsock.obj: ..\..\wxluasocket\src\wxlsock.cpp $(CXX) -q -c -P -o$@ $(WXLUASOCKET_DLL_CXXFLAGS) $** Index: makefile.wat =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/msw/makefile.wat,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** makefile.wat 4 May 2007 20:22:27 -0000 1.65 --- makefile.wat 24 May 2007 00:59:45 -0000 1.66 *************** *** 624,631 **** $(CXXFLAGS) WXLUA_LIB_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj WXLUA_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 624,631 ---- $(CXXFLAGS) WXLUA_LIB_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_dummy.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlbind.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlcallb.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_lib_wxlstate.obj WXLUA_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 635,642 **** $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlbind.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlstate.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj WXBIND_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 635,642 ---- $(CPPFLAGS) $(CXXFLAGS) WXLUA_DLL_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_dummy.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlbind.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlcallb.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxlua_dll_wxlstate.obj WXBIND_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 646,680 **** $(CXXFLAGS) WXBIND_LIB_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_geometry.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_data.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_grid.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_mdi.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_file.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_config.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_menutool.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dummy.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_event.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_gdi.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_defsutil.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_image.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_sizer.obj & - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wave.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_socket.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wx_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_windows.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlhtmlwin.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_appframe.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_regex.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_controls.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_datetime.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dialogs.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_clipdrag.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_print.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_thread.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_help.obj WXBIND_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 646,680 ---- $(CXXFLAGS) WXBIND_LIB_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_appframe.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_clipdrag.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_config.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_controls.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_data.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_datetime.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_defsutil.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dialogs.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_dummy.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_event.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_file.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_gdi.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_geometry.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_grid.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_help.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_html.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_image.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_mdi.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_menutool.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_print.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_regex.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_sizer.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_socket.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_thread.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wave.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_windows.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wx_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlhtmlwin.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlprint.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_lib_xml.obj WXBIND_DLL_CXXFLAGS = -bd -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & *************** *** 684,718 **** $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlua.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_xml.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_geometry.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_data.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_html.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_grid.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_mdi.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_file.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_config.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_menutool.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dummy.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_event.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_gdi.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlprint.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_defsutil.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_image.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_sizer.obj & - watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wave.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_socket.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wx_bind.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_windows.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_wxlhtmlwin.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_regex.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_controls.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_datetime.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dialogs.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_clipdrag.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_print.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_thread.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_help.obj WXBINDSTC_LIB_CXXFLAGS = -i=..\..\..\modules\wxbind\setup $(____WX_SHARED) & $(__WXUNICODE_DEFINE_p) $(__WXDEBUG_DEFINE_p) -d__WXMSW__ & --- 684,718 ---- $(CPPFLAGS) $(CXXFLAGS) WXBIND_DLL_OBJECTS = & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_appframe.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_clipdrag.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_config.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_controls.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_data.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_datetime.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_defsutil.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dialogs.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_dummy.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_event.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_file.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_gdi.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_geometry.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_grid.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_help.obj & ! watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_html.obj & watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFFIX)\wxbind_dll_image.obj & + watmsw$(WXLIBPOSTFIX)$(_BUILDDIR_SHARED_SUFF... [truncated message content] |
From: John L. <jr...@us...> - 2007-05-24 00:59:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/modules/wxluadebug/src Modified Files: Makefile Added Files: wxlstack.cpp Removed Files: splttree.cpp staktree.cpp Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes --- NEW FILE: wxlstack.cpp --- ///////////////////////////////////////////////////////////////////////////// // Name: StackTree.cpp // Purpose: Display the lua stack in a dialog. // Author: J. Winwood // Created: February 2002 // Copyright: (c) 2002 Lomtick Software. All rights reserved. // Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" #ifdef __BORLANDC__ #pragma hdrstop #endif #ifndef WX_PRECOMP #include "wx/wx.h" #endif #include "wx/imaglist.h" #include "wx/artprov.h" #include "wxluadebug/include/wxlstack.h" #include "wxlua/include/wxlua.h" #include "wxlua/include/wxlcallb.h" #include "wxluadebug/include/wxldebug.h" #if defined(__WXGTK__) || defined(__WXMAC__) || defined(__WXMOTIF__) #include "art/wxlua.xpm" #endif // ---------------------------------------------------------------------------- // wxLuaStackDialog // ---------------------------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxLuaStackDialog, wxDialog) BEGIN_EVENT_TABLE(wxLuaStackDialog, wxDialog) EVT_COMBOBOX( ID_WXLUA_STACKDIALOG_COMBO, wxLuaStackDialog::OnSelectStack) EVT_LIST_ITEM_ACTIVATED( ID_WXLUA_STACKDIALOG_LISTCTRL, wxLuaStackDialog::OnItemActivated) EVT_LIST_DELETE_ITEM( ID_WXLUA_STACKDIALOG_LISTCTRL, wxLuaStackDialog::OnItemDeleted) EVT_LIST_DELETE_ALL_ITEMS( ID_WXLUA_STACKDIALOG_LISTCTRL, wxLuaStackDialog::OnAllItemsDeleted) END_EVENT_TABLE() void wxLuaStackDialog::Init() { m_listCtrl = NULL; m_stackComboBox = NULL; m_stack_sel = -1; m_imageList = NULL; } bool wxLuaStackDialog::Create(const wxLuaState& wxlState, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size) { m_wxlState = wxlState; if (!wxDialog::Create(parent, id, title, pos, size, wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxMAXIMIZE_BOX | wxRESIZE_BORDER)) return false; wxPanel* panel = new wxPanel(this, wxID_ANY); m_stackComboBox = new wxComboBox( panel, ID_WXLUA_STACKDIALOG_COMBO, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN | wxCB_READONLY); m_listCtrl = new wxListCtrl( panel, ID_WXLUA_STACKDIALOG_LISTCTRL, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_HRULES|wxLC_VRULES ); m_listCtrl->InsertColumn(0, wxT("Name"), wxLIST_FORMAT_LEFT, -1); m_listCtrl->InsertColumn(1, wxT("Type"), wxLIST_FORMAT_LEFT, -1); m_listCtrl->InsertColumn(2, wxT("Value"), wxLIST_FORMAT_LEFT, -1); m_listCtrl->SetColumnWidth(0, 250); m_listCtrl->SetColumnWidth(1, 100); m_listCtrl->SetColumnWidth(2, 100); m_imageList = new wxImageList(16, 16, true); m_imageList->Add(wxArtProvider::GetIcon(wxART_NORMAL_FILE, wxART_TOOLBAR, wxSize(16,16))); // unknown m_imageList->Add(wxArtProvider::GetIcon(wxART_FOLDER, wxART_TOOLBAR, wxSize(16,16))); // table m_imageList->Add(wxArtProvider::GetIcon(wxART_NEW_DIR, wxART_TOOLBAR, wxSize(16,16))); // open table wxBitmap bmp(wxArtProvider::GetIcon(wxART_NORMAL_FILE, wxART_TOOLBAR, wxSize(16,16))); m_imageList->Add(CreateBmpString(bmp, wxT("0"))); // nil m_imageList->Add(CreateBmpString(bmp, wxT("T"))); // bool m_imageList->Add(CreateBmpString(bmp, wxT("1"))); // number m_imageList->Add(CreateBmpString(bmp, wxT("a"))); // string m_imageList->Add(CreateBmpString(bmp, wxT("C"))); // C function m_imageList->Add(CreateBmpString(bmp, wxT("f"))); // Lua function m_imageList->Add(CreateBmpString(bmp, wxT("u"))); // user data m_imageList->Add(CreateBmpString(bmp, wxT("u"))); // light user data m_imageList->Add(CreateBmpString(bmp, wxT("t"))); // thread m_listCtrl->SetImageList(m_imageList, wxIMAGE_LIST_SMALL); // set the frame icon SetIcon(wxICON(LUA)); // use sizers to layout the windows in the panel of the dialog wxBoxSizer* rootSizer = new wxBoxSizer(wxVERTICAL); rootSizer->Add(m_stackComboBox, 0, wxEXPAND|wxBOTTOM, 4); rootSizer->Add(m_listCtrl, 1, wxEXPAND); rootSizer->SetMinSize(450, 400); panel->SetSizer(rootSizer); rootSizer->SetSizeHints(this); EnumerateStack(); return true; } wxLuaStackDialog::~wxLuaStackDialog() { DeleteAllListItemData(); if (m_listCtrl) m_listCtrl->SetImageList(NULL, wxIMAGE_LIST_SMALL); delete m_imageList; size_t n, count = m_wxlState.Ok() ? m_luaReferences.GetCount() : 0; for (n = 0; n < count; ++n) { int ref_idx = m_luaReferences.Item(n); m_wxlState.tremove(ref_idx); } } wxBitmap wxLuaStackDialog::CreateBmpString(const wxBitmap& bmp_, const wxString& s) { wxBitmap bmp(bmp_); // unconst it int bmp_w = bmp.GetWidth(); int bmp_h = bmp.GetHeight(); wxMemoryDC dc; dc.SelectObject(bmp); wxCoord w = 0, h = 0; for (int n = 14; n > 3; n--) { wxFont f(n, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); dc.GetTextExtent(s, &w, &h, NULL, NULL, &f); if ((w < bmp_w) && (h < bmp_h)) { dc.SetFont(f); break; } } dc.DrawText(s, (bmp_w-w)/2, (bmp_h-h)/2); dc.SelectObject(wxNullBitmap); return bmp; } int wxLuaStackDialog::SetupListItem(const wxLuaDebugDataItem *dbgItem, wxListItem& lItem) { wxCHECK_MSG(dbgItem, IMG_UNKNOWN, wxT("Invalid wxLuaDebugDataItem")); wxString t(dbgItem->GetType()); int n, img = IMG_UNKNOWN; wxChar* strTypes[IMG_THREAD+1] = { wxT(""), // unknown wxT("Table"), wxT(""), // table open wxT("Nil"), wxT("Boolean"), wxT("Number"), wxT("String"), wxT("C Function"), wxT("Lua Function"), wxT("User Data"), wxT("Light User Data"), wxT("Thread") }; for (n = 0; n < IMG_THREAD+1; n++) { if (t == strTypes[n]) { img = n; break; } } // now fix up the images for special cases if (dbgItem->GetExpanded()) img = IMG_TABLE_OPEN; else if (t == wxT("wxLuaData")) // our internal data structs img = IMG_TABLE; lItem.SetImage(img); // Adjust the fonts to highlight some types wxFont f(m_listCtrl->GetFont()); if ((img == IMG_TABLE) || (img == IMG_TABLE_OPEN)) { f.SetWeight(wxFONTWEIGHT_BOLD); lItem.SetFont(f); } else if (img == IMG_STRING) { f.SetStyle(wxFONTSTYLE_ITALIC); lItem.SetFont(f); } return img; } void wxLuaStackDialog::EnumerateStack() { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); wxBusyCursor wait; wxLuaDebugData debugData; debugData.EnumerateStack(m_wxlState); FillStackCombobox(debugData); } void wxLuaStackDialog::EnumerateStackEntry(int nEntry) { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); wxBusyCursor wait; wxLuaDebugData debugData; debugData.EnumerateStackEntry(m_wxlState, nEntry, m_luaReferences); FillStackEntry(nEntry, debugData); } void wxLuaStackDialog::EnumerateTable(int nRef, int nEntry, long lc_item) { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); wxBusyCursor wait; wxLuaDebugData debugData; debugData.EnumerateTable(m_wxlState, nRef, nEntry, m_luaReferences); FillTableEntry(lc_item, debugData); } void wxLuaStackDialog::EnumerateGlobalData(long lc_item) { wxCHECK_RET(m_wxlState.Ok(), wxT("Invalid wxLuaState")); wxBusyCursor wait; wxLuaDebugData debugData; debugData.EnumerateTable(m_wxlState, -1, -1, m_luaReferences); // Get global table FillTableEntry(lc_item, debugData); } void wxLuaStackDialog::FillStackCombobox(const wxLuaDebugData& debugData) { m_stackComboBox->Clear(); m_stackEntries.Clear(); size_t n, count = debugData.GetCount(); for (n = 0; n < count; ++n) { const wxLuaDebugDataItem *item = debugData.Item(n); m_stackEntries.Add(item->GetReference()); m_stackComboBox->Append(item->GetName()); } if (debugData.GetCount() > 0) { m_stackComboBox->SetSelection(0); SelectStack(0); } } void wxLuaStackDialog::FillStackEntry(int WXUNUSED(nEntry), const wxLuaDebugData& debugData) { DeleteAllListItemData(); m_listCtrl->DeleteAllItems(); // Add the locals, fake a debug item to get it setup right wxLuaDebugDataItem* localItem = new wxLuaDebugDataItem(_("Locals"), wxT("Table"), wxString::Format(wxT("Count %d"), (int)debugData.GetCount()), wxT(""), 0, 0); wxLuaDebugData dataArr; // this deletes the items dataArr.Add(localItem); FillTableEntry(m_listCtrl->GetItemCount(), dataArr); if (debugData.GetCount() > 0u) FillTableEntry(m_listCtrl->GetItemCount()-1, debugData); // If at global scope, process globals if (m_stack_sel == (int)m_stackEntries.GetCount() - 1) EnumerateGlobalData(m_listCtrl->GetItemCount()); if (m_wxlState.Ok()) GetDerivedAndTrackedItems(); } void wxLuaStackDialog::FillTableEntry(long lc_item_, const wxLuaDebugData& debugData) { wxCHECK_RET(lc_item_ <= m_listCtrl->GetItemCount(), wxT("Attempting to add list item past end")); if (debugData.GetCount() == 0) return; //m_treeControl->SetItemHasChildren(treeId, false); else { wxString levelStr; // If less than the count we're expanding a item, else adding a new root if (lc_item_ < m_listCtrl->GetItemCount()) { wxString levelText(m_listCtrl->GetItemText(lc_item_).BeforeLast(wxT('>'))); if (levelText.Length() > 0) levelStr = levelText + wxT(">--> "); else levelStr = levelText + wxT("--> "); } else lc_item_--; size_t n, count = debugData.GetCount(); long lc_item = lc_item_; for (n = 0; n < count; ++n) { const wxLuaDebugDataItem *item = debugData.Item(n); //wxPrintf(wxT("FillTableEntry %ld %ld n %d %ld '%s'\n"), lc_item_, lc_item, n, (long)item, item->GetName().c_str()); wxListItem info; info.SetId(lc_item+1); info.SetText(levelStr + item->GetName()); info.SetData(new wxLuaDebugDataItem(*item)); SetupListItem(item, info); lc_item = m_listCtrl->InsertItem(info); info.SetId(lc_item); m_listCtrl->SetItem(lc_item, 1, item->GetType()); m_listCtrl->SetItem(lc_item, 2, item->GetValue()); } } } void wxLuaStackDialog::GetDerivedAndTrackedItems() { wxLuaState wxlState(m_wxlState); wxCHECK_RET(wxlState.Ok(), wxT("Invalid wxLuaState")); int trackedCount = wxlState.GetTrackedObjects()->size(); int callbackCount = wxlState.GetTrackedCallbackList()->GetCount(); int windowCount = wxlState.GetLuaStateData()->m_windowList.GetCount(); int destroyCount = wxlState.GetTrackedWinDestroyCallbackList()->GetCount(); // note: don't have spaces here since we use them to mark expanded levels wxLuaDebugDataItem* trackedItem = new wxLuaDebugDataItem(_("Tracked User Data"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), trackedCount), wxT(""), 1, 0); wxLuaDebugDataItem* callbackItem = new wxLuaDebugDataItem(_("wxEvent Callbacks"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), callbackCount), wxT(""), 1, 0); wxLuaDebugDataItem* windowItem = new wxLuaDebugDataItem(_("Top Level wxWindows"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), windowCount), wxT(""), 1, 0); wxLuaDebugDataItem* destroyItem = new wxLuaDebugDataItem(_("wxWindow Destroy List"), wxT("wxLuaData"), wxString::Format(wxT("Count %d"), destroyCount), wxT(""), 1, 0); wxLuaDebugData dataArr; // this deletes the items dataArr.Add(trackedItem); dataArr.Add(callbackItem); dataArr.Add(windowItem); dataArr.Add(destroyItem); FillTableEntry(m_listCtrl->GetItemCount(), dataArr); } void wxLuaStackDialog::OnItemDeleted(wxListEvent &event) { wxLuaDebugDataItem* wxlDItem = (wxLuaDebugDataItem*)event.GetData(); if (wxlDItem != NULL) delete wxlDItem; } void wxLuaStackDialog::OnAllItemsDeleted(wxListEvent &event) { DeleteAllListItemData(); event.Skip(); } void wxLuaStackDialog::OnSelectStack(wxCommandEvent &event) { if (event.GetSelection() >= 0) SelectStack(event.GetSelection()); } void wxLuaStackDialog::SelectStack(int stack_sel) { wxCHECK_RET((stack_sel >= 0) && (stack_sel < (int)m_stackEntries.GetCount()), wxT("Invalid stack index")); m_stack_sel = stack_sel; int n_entry = m_stackEntries[m_stack_sel]; EnumerateStackEntry(n_entry); } void wxLuaStackDialog::OnItemActivated(wxListEvent &event) { ItemExpanding(event.GetIndex()); //.GetIndex()); } void wxLuaStackDialog::ItemExpanding(long lc_item) { if (1) { wxLuaDebugDataItem *pDebugDataItem = (wxLuaDebugDataItem *)m_listCtrl->GetItemData(lc_item); // only expand items once if ((pDebugDataItem != NULL) && !pDebugDataItem->GetExpanded()) { // Check and block linked tables already shown if (pDebugDataItem->GetType() == wxT("Table")) { wxString val = pDebugDataItem->GetValue(); int n, count = m_listCtrl->GetItemCount(); for (n = 0; n < count; n++) { wxLuaDebugDataItem *itm = (wxLuaDebugDataItem *)m_listCtrl->GetItemData(n); if (itm && (itm != pDebugDataItem) && (itm->GetValue() == val) && itm->GetExpanded()) { wxMessageBox(wxT("Cannot expand linked tables,\nplease see the already expanded table."), wxT("wxLua Stack"), wxOK | wxCENTRE, this); m_listCtrl->SetItemState(n, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED); m_listCtrl->SetItemState(n, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED); m_listCtrl->EnsureVisible(n); return; } } } int nRef = pDebugDataItem->GetReference(); if (m_wxlState.Ok() && ((pDebugDataItem->GetName() == _("Tracked User Data")) || (pDebugDataItem->GetName() == _("wxEvent Callbacks")) || (pDebugDataItem->GetName() == _("Top Level wxWindows")) || (pDebugDataItem->GetName() == _("wxWindow Destroy List")))) { wxLuaState wxlState(m_wxlState); wxArrayString names; wxArrayInt counts; if (pDebugDataItem->GetName() == _("Tracked User Data")) { wxLongToLongHashMap::iterator it; wxLongToLongHashMap* hashMap = wxlState.GetTrackedObjects(); for (it = hashMap->begin(); it != hashMap->end(); ++it) { wxString name(wxT("Unknown Tracked Item")); wxObject* obj = (wxObject*)it->second; if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) name = obj->GetClassInfo()->GetClassName(); //name = wxString::Format(wxT("%p "), obj) + name; int idx = names.Index(name); if (idx == wxNOT_FOUND) { names.Add(name); counts.Add(1); } else counts[idx]++; } } else if (pDebugDataItem->GetName() == _("wxEvent Callbacks")) { wxList::compatibility_iterator node = wxlState.GetTrackedCallbackList()->GetFirst(); while (node) { wxLuaCallback *pCallback = (wxLuaCallback *) node->GetData(); wxCHECK_RET(pCallback, wxT("Invalid wxLuaCallback")); wxString evtName; if (wxlState.GetLuaBindingList()) { wxLuaBindingList::compatibility_iterator bindNode = wxlState.GetLuaBindingList()->GetFirst(); for (; bindNode; bindNode = bindNode->GetNext()) { wxLuaBinding* binding = bindNode->GetData(); evtName = binding->GetEventTypeName(pCallback->GetEventType()); if (!evtName.IsEmpty()) break; } } wxString name = wxString::Format(wxT("%d %s"), (int)pCallback->GetEventType(), evtName.c_str()); int idx = names.Index(name); if (idx == wxNOT_FOUND) { names.Add(name); counts.Add(1); } else counts[idx]++; node = node->GetNext(); } } else if (pDebugDataItem->GetName() == _("Top Level wxWindows")) { wxWindowList::compatibility_iterator node = wxlState.GetLuaStateData()->m_windowList.GetFirst(); while (node) { wxWindow *win= (wxWindow*)node->GetData(); wxCHECK_RET(win, wxT("Invalid wxLuaCallback")); if (win && win->GetClassInfo() && win->GetClassInfo()->GetClassName()) { wxString name(win->GetClassInfo()->GetClassName()); int idx = names.Index(name); if (idx == wxNOT_FOUND) { names.Add(name); counts.Add(1); } else counts[idx]++; } node = node->GetNext(); } } else if (pDebugDataItem->GetName() == _("wxWindow Destroy List")) { wxList::compatibility_iterator node = wxlState.GetTrackedWinDestroyCallbackList()->GetFirst(); while (node) { wxLuaWinDestroyCallback *pCallback = (wxLuaWinDestroyCallback *) node->GetData(); wxCHECK_RET(pCallback, wxT("Invalid wxLuaWinDestroyCallback")); wxString name(wxT("Unknown Tracked Window Type")); wxObject* obj = (wxObject*)pCallback->GetEvtHandler(); if (obj && obj->GetClassInfo() && obj->GetClassInfo()->GetClassName()) name = obj->GetClassInfo()->GetClassName(); names.Add(name); counts.Add(1); node = node->GetNext(); } } pDebugDataItem->SetExpanded(true); m_listCtrl->SetItemImage(lc_item, IMG_TABLE_OPEN); wxLuaDebugData dataArr; size_t n, count = names.GetCount(); for (n = 0; n < count; n++) { wxLuaDebugDataItem *item = new wxLuaDebugDataItem(names[n], wxT(""), wxString::Format(wxT("Count %d"), counts[n]), wxT(""), LUA_NOREF, pDebugDataItem->GetIndex() + 1); dataArr.Add(item); } FillTableEntry(lc_item, dataArr); } else if (nRef != LUA_NOREF) { pDebugDataItem->SetExpanded(true); m_listCtrl->SetItemImage(lc_item, IMG_TABLE_OPEN); int nIndex = pDebugDataItem->GetIndex() + 1; EnumerateTable(nRef, nIndex, lc_item); } } } } void wxLuaStackDialog::DeleteAllListItemData() { int i, count = m_listCtrl->GetItemCount(); for (i = 0; i < count; i++) { wxLuaDebugDataItem* wxlDItem = (wxLuaDebugDataItem*)m_listCtrl->GetItemData(i); m_listCtrl->SetItemData(i, 0); // null it so we won't try to delete it again if (wxlDItem != NULL) delete wxlDItem; } } --- splttree.cpp DELETED --- Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Makefile 24 May 2007 00:29:00 -0000 1.10 --- Makefile 24 May 2007 00:59:46 -0000 1.11 *************** *** 54,62 **** HEADERS = \ ../include/wxldebug.h \ ! ../include/staktree.h SOURCES = \ wxldebug.cpp \ ! staktree.cpp OBJECTS=$(SOURCES:.cpp=.o) --- 54,62 ---- HEADERS = \ ../include/wxldebug.h \ ! ../include/wxlstack.h SOURCES = \ wxldebug.cpp \ ! wxlstack.cpp OBJECTS=$(SOURCES:.cpp=.o) --- staktree.cpp DELETED --- |
From: John L. <jr...@us...> - 2007-05-24 00:59:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/modules/wxluasocket/include Modified Files: wxldserv.h Removed Files: dservice.h Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes Index: wxldserv.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxldserv.h 23 May 2007 02:48:31 -0000 1.34 --- wxldserv.h 24 May 2007 00:59:47 -0000 1.35 *************** *** 15,19 **** #include "wxluasocket/include/wxlsock.h" #include "wxluadebug/include/wxldebug.h" ! #include "wxluadebug/include/staktree.h" class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerBase; --- 15,19 ---- #include "wxluasocket/include/wxlsock.h" #include "wxluadebug/include/wxldebug.h" ! #include "wxluadebug/include/wxlstack.h" class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerBase; --- dservice.h DELETED --- |
From: John L. <jr...@us...> - 2007-05-24 00:59:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21191/wxLua/modules/wxluasocket/src Modified Files: wxldserv.cpp Removed Files: dservice.cpp Log Message: Removed dservice.h/cpp splttree.h/cpp, moved staktree.h/cpp to wxlstack.h/cpp Rebaked with the changes --- dservice.cpp DELETED --- Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** wxldserv.cpp 23 May 2007 02:48:31 -0000 1.41 --- wxldserv.cpp 24 May 2007 00:59:47 -0000 1.42 *************** *** 20,24 **** #include "wx/thread.h" #include "wxluasocket/include/wxldserv.h" ! #include "wxluadebug/include/staktree.h" #if !wxCHECK_VERSION(2, 6, 0) --- 20,24 ---- #include "wx/thread.h" #include "wxluasocket/include/wxldserv.h" ! #include "wxluadebug/include/wxlstack.h" #if !wxCHECK_VERSION(2, 6, 0) |
From: John L. <jr...@us...> - 2007-05-24 00:29:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11719/wxLua/modules/wxluadebug/src Modified Files: Makefile Log Message: remove dservice.h/cpp splttree.h/cpp, not used anymore Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/Makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Makefile 23 May 2007 20:17:24 -0000 1.9 --- Makefile 24 May 2007 00:29:00 -0000 1.10 *************** *** 54,63 **** HEADERS = \ ../include/wxldebug.h \ - ../include/splttree.h \ ../include/staktree.h SOURCES = \ wxldebug.cpp \ - splttree.cpp \ staktree.cpp --- 54,61 ---- |
From: John L. <jr...@us...> - 2007-05-24 00:29:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11719/wxLua/modules/wxluasocket/src Modified Files: Makefile Log Message: remove dservice.h/cpp splttree.h/cpp, not used anymore Index: Makefile =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/Makefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile 23 May 2007 20:17:25 -0000 1.13 --- Makefile 24 May 2007 00:29:01 -0000 1.14 *************** *** 56,61 **** ../include/wxldtarg.h \ ../include/wxlsock.h \ ! ../include/wxluasocket.h \ ! ../include/dservice.h SOURCES = \ --- 56,60 ---- ../include/wxldtarg.h \ ../include/wxlsock.h \ ! ../include/wxluasocket.h SOURCES = \ *************** *** 64,69 **** wxlsock.cpp \ wxluasocket.cpp \ ! wxluasocket_bind.cpp \ ! dservice.cpp OBJECTS=$(SOURCES:.cpp=.o) --- 63,67 ---- wxlsock.cpp \ wxluasocket.cpp \ ! wxluasocket_bind.cpp OBJECTS=$(SOURCES:.cpp=.o) |