Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1750/wxLua/apps/wxluacan/src
Modified Files:
wxluacan.cpp
Log Message:
Fix compilation in MSW, add includes, etc
Change genwxbind.lua to preserve the order of conditions, fifo instead of filo
not sure why it reversed the order before, but it doesn't seem right.
Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wxluacan.cpp 14 Jun 2007 23:59:40 -0000 1.31
--- wxluacan.cpp 18 Jun 2007 14:54:58 -0000 1.32
***************
*** 81,85 ****
! #if wxLUA_USE_wxColourPenBrush
static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, NULL };
static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L);
--- 81,85 ----
! #if wxLUA_USE_wxPenList
static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, NULL };
static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L);
***************
*** 99,102 ****
--- 99,105 ----
}
+ #endif // wxLUA_USE_wxPenList
+
+ #if wxCHECK_VERSION(2,8,0)
static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxPen, NULL };
static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L);
***************
*** 116,120 ****
}
! #endif // wxLUA_USE_wxColourPenBrush
static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, NULL };
--- 119,123 ----
}
! #endif // wxCHECK_VERSION(2,8,0)
static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, NULL };
***************
*** 187,194 ****
{ "GetY", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_GetY, 1, NULL },
! #if wxLUA_USE_wxColourPenBrush
{ "SetBrush", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, NULL },
{ "SetPen", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, NULL },
! #endif // wxLUA_USE_wxColourPenBrush
{ "SetPending", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, NULL },
--- 190,200 ----
{ "GetY", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_GetY, 1, NULL },
! #if wxLUA_USE_wxPenList
{ "SetBrush", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, NULL },
+ #endif // wxLUA_USE_wxPenList
+
+ #if wxCHECK_VERSION(2,8,0)
{ "SetPen", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, NULL },
! #endif // wxCHECK_VERSION(2,8,0)
{ "SetPending", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, NULL },
|
