[Wxlua-commit] wxLua/modules/wxbind/src gdi.cpp,1.42,1.43

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7567/wxLua/modules/wxbind/src

Modified Files:
	gdi.cpp 
Log Message:
wxDisplay::GetClientSize not in 2.6
a little speedup in wxluasudoku.wx.lua


Index: gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** gdi.cpp	23 Dec 2006 06:16:20 -0000	1.42
--- gdi.cpp	4 Jan 2007 23:28:04 -0000	1.43
***************
*** 11230,11233 ****
--- 11230,11256 ----
  
  
+ #if (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY))
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_GetClientArea[] = { 0 };
+ //     %wxchkver_2_8 wxRect GetClientArea() const
+ static int LUACALL wxLua_wxDisplay_GetClientArea(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxRect *returns;
+     // get this
+     wxDisplay * self = (wxDisplay *)wxlState.GetUserDataType(1, s_wxluatag_wxDisplay);
+     // call GetClientArea
+     // allocate a new object using the copy constructor
+     returns = new wxRect(self->GetClientArea());
+     // add the new object to the tracked memory list
+     wxLua_AddTrackedObject(wxlState, (wxRect *)returns);
+     // push the result datatype
+     wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY))
+ 
+ 
  #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_GetFromPoint[] = { &s_wxluatag_wxPoint, 0 };
***************
*** 11266,11288 ****
  }
  
- static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_GetClientArea[] = { 0 };
- //     wxRect GetClientArea() const
- static int LUACALL wxLua_wxDisplay_GetClientArea(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     wxRect *returns;
-     // get this
-     wxDisplay * self = (wxDisplay *)wxlState.GetUserDataType(1, s_wxluatag_wxDisplay);
-     // call GetClientArea
-     // allocate a new object using the copy constructor
-     returns = new wxRect(self->GetClientArea());
-     // add the new object to the tracked memory list
-     wxLua_AddTrackedObject(wxlState, (wxRect *)returns);
-     // push the result datatype
-     wxlState.PushUserDataType(s_wxluatag_wxRect, returns);
- 
-     return 1;
- }
- 
  #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)
  
--- 11289,11292 ----
***************
*** 11414,11418 ****
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_IsOk[] = { 0 };
! //     bool IsOk() const
  static int LUACALL wxLua_wxDisplay_IsOk(lua_State *L)
  {
--- 11418,11422 ----
  
  static wxLuaArgTag s_wxluatagArray_wxLua_wxDisplay_IsOk[] = { 0 };
! //     bool  IsOk() const
  static int LUACALL wxLua_wxDisplay_IsOk(lua_State *L)
  {
***************
*** 11457,11464 ****
  WXLUAMETHOD wxDisplay_methods[] = {
  
  #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)
      { LuaMethod, "GetFromPoint", wxLua_wxDisplay_GetFromPoint, 1, 1, s_wxluatagArray_wxLua_wxDisplay_GetFromPoint },
      { LuaMethod, "GetGeometry", wxLua_wxDisplay_GetGeometry, 0, 0, s_wxluatagArray_wxLua_wxDisplay_GetGeometry },
-     { LuaMethod, "GetClientArea", wxLua_wxDisplay_GetClientArea, 0, 0, s_wxluatagArray_wxLua_wxDisplay_GetClientArea },
  #endif  // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)
  
--- 11461,11472 ----
  WXLUAMETHOD wxDisplay_methods[] = {
  
+ #if (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY))
+     { LuaMethod, "GetClientArea", wxLua_wxDisplay_GetClientArea, 0, 0, s_wxluatagArray_wxLua_wxDisplay_GetClientArea },
+ #endif  // (wxLUA_USE_wxPointSizeRect) && ((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY))
+ 
+ 
  #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)
      { LuaMethod, "GetFromPoint", wxLua_wxDisplay_GetFromPoint, 1, 1, s_wxluatagArray_wxLua_wxDisplay_GetFromPoint },
      { LuaMethod, "GetGeometry", wxLua_wxDisplay_GetGeometry, 0, 0, s_wxluatagArray_wxLua_wxDisplay_GetGeometry },
  #endif  // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDisplay && wxUSE_DISPLAY)