Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv17631/wxLua/bindings/wxwidgets
Modified Files:
gdi.i wx_datatypes.lua
Log Message:
use defined(WXCOMAP_XXX) && WX_COMPAT_XXX not just #if WX_COMPAT
better colours for wxluasudoku
Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** wx_datatypes.lua 6 Nov 2006 06:11:43 -0000 1.39
--- wx_datatypes.lua 22 Nov 2006 06:08:32 -0000 1.40
***************
*** 1797,1801 ****
},
wxLog = {
! Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || WXWIN_COMPATIBILITY_2_4) && (wxUSE_LOG) && (wxLUA_USE_wxApp)",
DefType = "class",
Intrinsic = false,
--- 1797,1801 ----
},
wxLog = {
! Condition = "(wxCHECK_VERSION(2,2,0) && !wxCHECK_VERSION(2,5,0) || (defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)) && (wxUSE_LOG) && (wxLUA_USE_wxApp)",
DefType = "class",
Intrinsic = false,
***************
*** 3293,3307 ****
["%wxchkver_2_2"] = "wxCHECK_VERSION(2,2,0)",
["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)",
! ["%wxcompat20"] = "WXWIN_COMPATIBILITY_2",
! ["%wxcompat22"] = "WXWIN_COMPATIBILITY_2_2",
! ["%wxcompat24"] = "WXWIN_COMPATIBILITY_2_4",
! ["%wxcompat26"] = "WXWIN_COMPATIBILITY_2_6",
! ["%wxcompat28"] = "WXWIN_COMPATIBILITY_2_8",
["%x11"] = "defined(__WXX11__)",
! WXWIN_COMPATIBILITY_2 = "WXWIN_COMPATIBILITY_2",
! WXWIN_COMPATIBILITY_2_2 = "WXWIN_COMPATIBILITY_2_2",
! WXWIN_COMPATIBILITY_2_4 = "WXWIN_COMPATIBILITY_2_4",
! WXWIN_COMPATIBILITY_2_6 = "WXWIN_COMPATIBILITY_2_6",
! WXWIN_COMPATIBILITY_2_8 = "WXWIN_COMPATIBILITY_2_8",
wxLUA_USE_FL = "wxLUA_USE_FL",
wxLUA_USE_Geometry = "wxLUA_USE_Geometry",
--- 3293,3307 ----
["%wxchkver_2_2"] = "wxCHECK_VERSION(2,2,0)",
["%wxchkver_2_5"] = "wxCHECK_VERSION(2,5,0)",
! ["%wxcompat20"] = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
! ["%wxcompat22"] = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)",
! ["%wxcompat24"] = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)",
! ["%wxcompat26"] = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",
! ["%wxcompat28"] = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)",
["%x11"] = "defined(__WXX11__)",
! WXWIN_COMPATIBILITY_2 = "(defined(WXWIN_COMPATIBILITY_2) && WXWIN_COMPATIBILITY_2)",
! WXWIN_COMPATIBILITY_2_2 = "(defined(WXWIN_COMPATIBILITY_2_2) && WXWIN_COMPATIBILITY_2_2)",
! WXWIN_COMPATIBILITY_2_4 = "(defined(WXWIN_COMPATIBILITY_2_4) && WXWIN_COMPATIBILITY_2_4)",
! WXWIN_COMPATIBILITY_2_6 = "(defined(WXWIN_COMPATIBILITY_2_6) && WXWIN_COMPATIBILITY_2_6)",
! WXWIN_COMPATIBILITY_2_8 = "(defined(WXWIN_COMPATIBILITY_2_8) && WXWIN_COMPATIBILITY_2_8)",
wxLUA_USE_FL = "wxLUA_USE_FL",
wxLUA_USE_Geometry = "wxLUA_USE_Geometry",
Index: gdi.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** gdi.i 9 Nov 2006 05:13:01 -0000 1.29
--- gdi.i 22 Nov 2006 06:08:32 -0000 1.30
***************
*** 92,96 ****
int GetY()
wxRect Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy)
! !%wxchkver27 bool Inside(wxCoord cx, wxCoord cy)
bool Intersects(const wxRect& rect) const
bool IsEmpty() const
--- 92,96 ----
int GetY()
wxRect Inflate(wxCoord dx, wxCoord dy) const //wxRect& Inflate(wxCoord dx, wxCoord dy)
! %wxcompat26 bool Inside(wxCoord cx, wxCoord cy)
bool Intersects(const wxRect& rect) const
bool IsEmpty() const
|
