[Wxlua-commit] wxLua/modules/wxbind/src gdi.cpp, 1.29, 1.30 html.cpp, 1.16, 1.17

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

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

Modified Files:
	gdi.cpp html.cpp 
Log Message:
update lua to 5.1.1
update wxLua bindings to changes in wxWidgets CVS HEAD 2.7.0


Index: html.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/html.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** html.cpp	9 Jun 2006 22:51:32 -0000	1.16
--- html.cpp	12 Jun 2006 03:50:38 -0000	1.17
***************
*** 36,39 ****
--- 36,135 ----
  
  
+ #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)
+ // %override wxLua_wxHtmlCell_AdjustPagebreak
+ // virtual bool AdjustPagebreak(int * pagebreak)
+ 
+ #if !wxCHECK_VERSION(2, 7, 0)
+ static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // int * pagebreak
+     int pagebreak  = (int)wxlState.GetNumberType(2);
+     // get this
+     wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell);
+     // call AdjustPagebreak
+     returns = self->AdjustPagebreak(&pagebreak);
+     // push the result number
+     lua_pushboolean(L, returns);
+     //
+     lua_pushnumber(L, pagebreak);
+     // return the number of parameters
+     return 2;
+ }
+ #else
+ // virtual bool AdjustPagebreak(int * pagebreak, wxArrayInt& known_pagebreaks)
+ static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // int * pagebreak
+     int pagebreak  = (int)wxlState.GetNumberType(3);
+     // wxArrayInt& known_pagebreaks
+     wxArrayInt* known_pagebreaks  = (wxArrayInt *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayInt);
+     // get this
+     wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell);
+     // call AdjustPagebreak
+     returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks);
+     // push the result number
+     lua_pushboolean(L, returns);
+     //
+     lua_pushnumber(L, pagebreak);
+     // return the number of parameters
+     return 2;
+ }
+ #endif
+ 
+ #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)
+ 
+ 
+ #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt)
+ // %override wxLua_wxHtmlCell_AdjustPagebreak
+ // virtual bool AdjustPagebreak(int * pagebreak)
+ 
+ #if !wxCHECK_VERSION(2, 7, 0)
+ static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // int * pagebreak
+     int pagebreak  = (int)wxlState.GetNumberType(2);
+     // get this
+     wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell);
+     // call AdjustPagebreak
+     returns = self->AdjustPagebreak(&pagebreak);
+     // push the result number
+     lua_pushboolean(L, returns);
+     //
+     lua_pushnumber(L, pagebreak);
+     // return the number of parameters
+     return 2;
+ }
+ #else
+ // virtual bool AdjustPagebreak(int * pagebreak, wxArrayInt& known_pagebreaks)
+ static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     bool returns;
+     // int * pagebreak
+     int pagebreak  = (int)wxlState.GetNumberType(3);
+     // wxArrayInt& known_pagebreaks
+     wxArrayInt* known_pagebreaks  = (wxArrayInt *)wxlState.GetUserDataType(2, s_wxluatag_wxArrayInt);
+     // get this
+     wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell);
+     // call AdjustPagebreak
+     returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks);
+     // push the result number
+     lua_pushboolean(L, returns);
+     //
+     lua_pushnumber(L, pagebreak);
+     // return the number of parameters
+     return 2;
+ }
+ #endif
+ 
+ #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt)
+ 
+ 
  #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxHTML)
  //     %wxchkver23 virtual wxString GetId() const
***************
*** 84,107 ****
  }
  
- // %override wxLua_wxHtmlCell_AdjustPagebreak
- // virtual bool AdjustPagebreak(int * pagebreak)
- static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     bool returns;
-     // int * pagebreak
-     int pagebreak  = (int)wxlState.GetNumberType(2);
-     // get this
-     wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell);
-     // call AdjustPagebreak
-     returns = self->AdjustPagebreak(&pagebreak);
-     // push the result number
-     lua_pushboolean(L, returns);
-     //
-     lua_pushnumber(L, pagebreak);
-     // return the number of parameters
-     return 2;
- }
- 
  // %override wxLua_wxHtmlCell_Find
  // virtual const wxHtmlCell* Find(int condition, void *param = 0)
--- 180,183 ----
***************
*** 371,374 ****
--- 447,460 ----
  static WXLUAMETHOD s_wxHtmlCell_methods[] = {
  
+ #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)
+     { LuaMethod, "AdjustPagebreak", wxLua_wxHtmlCell_AdjustPagebreak, 1, 1, { &s_wxluaarg_Number, 0 } },
+ #endif  // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)
+ 
+ 
+ #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt)
+     { LuaMethod, "AdjustPagebreak", wxLua_wxHtmlCell_AdjustPagebreak, 2, 2, { &s_wxluaarg_Number, &s_wxluatag_wxArrayInt, 0 } },
+ #endif  // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt)
+ 
+ 
  #if (wxCHECK_VERSION(2,3,0)) && (wxLUA_USE_wxHTML)
      { LuaMethod, "GetId", wxLua_wxHtmlCell_GetId, 0, 0, { 0 } },
***************
*** 379,383 ****
  
      { LuaConstructor, "wxHtmlCell", wxLua_wxHtmlCell_constructor, 0, 0, { 0 } },
-     { LuaMethod, "AdjustPagebreak", wxLua_wxHtmlCell_AdjustPagebreak, 1, 1, { &s_wxluaarg_Number, 0 } },
      { LuaMethod, "Find", wxLua_wxHtmlCell_Find, 2, 1, { &s_wxluaarg_Number, &s_wxluaarg_LightUserData, 0 } },
      { LuaMethod, "GetDescent", wxLua_wxHtmlCell_GetDescent, 0, 0, { 0 } },
--- 465,468 ----
***************
*** 2438,2441 ****
--- 2523,2588 ----
  
  
+ #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)
+ //     !%wxchkver27 int Render(int x, int y, int from = 0, int dont_render = false) //, int *known_pagebreaks = NULL, int number_of_pages = 0)
+ static int LUACALL wxLua_wxHtmlDCRenderer_Render(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     int returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // int dont_render = false
+     int dont_render = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : false);
+     // int from = 0
+     int from = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : 0);
+     // int y
+     int y = (int)wxlState.GetNumberType(3);
+     // int x
+     int x = (int)wxlState.GetNumberType(2);
+     // get this
+     wxHtmlDCRenderer * self = (wxHtmlDCRenderer *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlDCRenderer);
+     // call Render
+     returns = self->Render(x, y, from, dont_render);
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)
+ 
+ 
+ #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt)
+ //     %wxchkver27 int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0, int dont_render = false, int to = INT_MAX);
+ static int LUACALL wxLua_wxHtmlDCRenderer_Render(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     int returns;
+     // get number of arguments
+     int argCount = lua_gettop(L);
+     // int to = INT_MAX
+     int to = (argCount >= 7 ? (int)wxlState.GetNumberType(7) : INT_MAX);
+     // int dont_render = false
+     int dont_render = (argCount >= 6 ? (int)wxlState.GetNumberType(6) : false);
+     // int from = 0
+     int from = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : 0);
+     // wxArrayInt known_pagebreaks
+     wxArrayInt * known_pagebreaks = (wxArrayInt *)wxlState.GetUserDataType(4, s_wxluatag_wxArrayInt);
+     // int y
+     int y = (int)wxlState.GetNumberType(3);
+     // int x
+     int x = (int)wxlState.GetNumberType(2);
+     // get this
+     wxHtmlDCRenderer * self = (wxHtmlDCRenderer *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlDCRenderer);
+     // call Render
+     returns = self->Render(x, y, *known_pagebreaks, from, dont_render, to);
+     // push the result number
+     lua_pushnumber(L, returns);
+ 
+     return 1;
+ }
+ 
+ #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt)
+ 
+ 
  #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxHTML)
  //     void SetDC(wxDC* dc, double pixel_scale = 1.0)
***************
*** 2510,2538 ****
  }
  
- //     int Render(int x, int y, int from = 0, int dont_render = false)
- static int LUACALL wxLua_wxHtmlDCRenderer_Render(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     int returns;
-     // get number of arguments
-     int argCount = lua_gettop(L);
-     // int dont_render = false
-     int dont_render = (argCount >= 5 ? (int)wxlState.GetNumberType(5) : false);
-     // int from = 0
-     int from = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : 0);
-     // int y
-     int y = (int)wxlState.GetNumberType(3);
-     // int x
-     int x = (int)wxlState.GetNumberType(2);
-     // get this
-     wxHtmlDCRenderer * self = (wxHtmlDCRenderer *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlDCRenderer);
-     // call Render
-     returns = self->Render(x, y, from, dont_render);
-     // push the result number
-     lua_pushnumber(L, returns);
- 
-     return 1;
- }
- 
  //     int GetTotalHeight()
  static int LUACALL wxLua_wxHtmlDCRenderer_GetTotalHeight(lua_State *L)
--- 2657,2660 ----
***************
*** 2582,2585 ****
--- 2704,2717 ----
  static WXLUAMETHOD s_wxHtmlDCRenderer_methods[] = {
  
+ #if (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)
+     { LuaMethod, "Render", wxLua_wxHtmlDCRenderer_Render, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
+ #endif  // (!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)
+ 
+ 
+ #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt)
+     { LuaMethod, "Render", wxLua_wxHtmlDCRenderer_Render, 6, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxArrayInt, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
+ #endif  // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxHTML)) && (wxLUA_USE_wxArrayInt)
+ 
+ 
  #if (wxLUA_USE_wxDC) && (wxLUA_USE_wxHTML)
      { LuaMethod, "SetDC", wxLua_wxHtmlDCRenderer_SetDC, 2, 1, { &s_wxluatag_wxDC, &s_wxluaarg_Number, 0 } },
***************
*** 2589,2593 ****
      { LuaMethod, "SetSize", wxLua_wxHtmlDCRenderer_SetSize, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "SetHtmlText", wxLua_wxHtmlDCRenderer_SetHtmlText, 3, 1, { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Boolean, 0 } },
-     { LuaMethod, "Render", wxLua_wxHtmlDCRenderer_Render, 4, 2, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } },
      { LuaMethod, "GetTotalHeight", wxLua_wxHtmlDCRenderer_GetTotalHeight, 0, 0, { 0 } },
      { LuaGetProp, "TotalHeight", wxLua_wxHtmlDCRenderer_GetTotalHeight, 0, 0, {0} },
--- 2721,2724 ----

Index: gdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** gdi.cpp	9 Jun 2006 22:51:32 -0000	1.29
--- gdi.cpp	12 Jun 2006 03:50:38 -0000	1.30
***************
*** 2992,3001 ****
  
  
! #if (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator))
! #endif // (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator))
  
  
! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFontEnumerator)
! //     wxArrayString* GetEncodings()
  static int LUACALL wxLua_wxFontEnumerator_GetEncodings(lua_State *L)
  {
--- 2992,3033 ----
  
  
! #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) && (wxLUA_USE_wxArrayString)
! //     %wxchkver27 static wxArrayString GetEncodings()
! static int LUACALL wxLua_wxFontEnumerator_GetEncodings(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     wxArrayString *returns;
!     // call GetEncodings
!     // allocate a new object using the copy constructor
!     returns = new wxArrayString(wxFontEnumerator::GetEncodings());
!     // add the new object to the tracked memory list
!     wxLua_AddToTrackedMemoryList(wxlState, (wxArrayString *)returns);
!     // push the result datatype
!     wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns);
  
+     return 1;
+ }
  
! //     %wxchkver27 static wxArrayString GetFacenames()
! static int LUACALL wxLua_wxFontEnumerator_GetFacenames(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     wxArrayString *returns;
!     // call GetFacenames
!     // allocate a new object using the copy constructor
!     returns = new wxArrayString(wxFontEnumerator::GetFacenames());
!     // add the new object to the tracked memory list
!     wxLua_AddToTrackedMemoryList(wxlState, (wxArrayString *)returns);
!     // push the result datatype
!     wxlState.PushUserDataType(s_wxluatag_wxArrayString, returns);
! 
!     return 1;
! }
! 
! #endif // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) && (wxLUA_USE_wxArrayString)
! 
! 
! #if (wxLUA_USE_wxArrayString) && ((!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator))
! //     !%wxchkver27 wxArrayString* GetEncodings()
  static int LUACALL wxLua_wxFontEnumerator_GetEncodings(lua_State *L)
  {
***************
*** 3012,3016 ****
  }
  
! //     wxArrayString* GetFacenames()
  static int LUACALL wxLua_wxFontEnumerator_GetFacenames(lua_State *L)
  {
--- 3044,3048 ----
  }
  
! //     !%wxchkver27 wxArrayString* GetFacenames()
  static int LUACALL wxLua_wxFontEnumerator_GetFacenames(lua_State *L)
  {
***************
*** 3027,3031 ****
  }
  
! #endif // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFontEnumerator)
  
  
--- 3059,3067 ----
  }
  
! #endif // (wxLUA_USE_wxArrayString) && ((!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator))
! 
! 
! #if (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator))
! #endif // (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator))
  
  
***************
*** 3120,3133 ****
  static WXLUAMETHOD s_wxFontEnumerator_methods[] = {
  
! #if (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator))
!     { LuaGetProp, "Encodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, {0} },
!     { LuaGetProp, "Facenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, {0} },
! #endif  // (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator))
  
  
! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFontEnumerator)
      { LuaMethod, "GetEncodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, { 0 } },
      { LuaMethod, "GetFacenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, { 0 } },
! #endif  // (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxFontEnumerator)
  
  
--- 3156,3175 ----
  static WXLUAMETHOD s_wxFontEnumerator_methods[] = {
  
! #if ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) && (wxLUA_USE_wxArrayString)
!     { LuaMethod, "GetEncodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, { 0 } },
!     { LuaMethod, "GetFacenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, { 0 } },
! #endif  // ((wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator)) && (wxLUA_USE_wxArrayString)
  
  
! #if (wxLUA_USE_wxArrayString) && ((!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator))
      { LuaMethod, "GetEncodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, { 0 } },
      { LuaMethod, "GetFacenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, { 0 } },
! #endif  // (wxLUA_USE_wxArrayString) && ((!wxCHECK_VERSION(2,7,0)) && (wxLUA_USE_wxFontEnumerator))
! 
! 
! #if (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator))
!     { LuaGetProp, "Encodings", wxLua_wxFontEnumerator_GetEncodings, 0, 0, {0} },
!     { LuaGetProp, "Facenames", wxLua_wxFontEnumerator_GetFacenames, 0, 0, {0} },
! #endif  // (wxLUA_USE_wxArrayString) && ((defined(__WXMSW__)) && (wxLUA_USE_wxFontEnumerator))