[Wxlua-commit] wxLua/bindings/wxwidgets wxadv_override.hpp, 1.1, 1.2 wxbase_override.hpp, 1.6, 1.7 wxcore_override.hpp, 1.6, 1.7 wxhtml_override.hpp, 1.2, 1.3 wxnet_override.hpp, 1.1, 1.2 wxstc_override.hpp, 1.1, 1.2 wxxml_override.hpp, 1.2, 1.3

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12976/wxLua/bindings/wxwidgets

Modified Files:
	wxadv_override.hpp wxbase_override.hpp wxcore_override.hpp 
	wxhtml_override.hpp wxnet_override.hpp wxstc_override.hpp 
	wxxml_override.hpp 
Log Message:
Too many changes to list...

   A large portion of the internal workings of the wxLuaState have been
   rewritten. All of the data that was stored in wxLuaStateData that might
   be needed by a function taking a lua_State* is now in the
   LUA_REGISTRYINDEX. C functions have been added to access these values.
   The generated bindings no longer need to have "wxLuaState wxlState(L);"
   since everything can be done with the C functions.
   The result is that wxLua should be faster.


Index: wxbase_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxbase_override.hpp	5 Dec 2007 05:54:11 -0000	1.6
--- wxbase_override.hpp	7 Dec 2007 02:13:09 -0000	1.7
***************
*** 34,40 ****
  static int LUACALL wxLua_function_wxGetEnv(lua_State *L)
  {
-     wxLuaState wxlState(L);
      bool returns;
!     wxString var = wxlState.GetwxStringType(1);
      wxString value;
      // call wxGetEnv
--- 34,39 ----
  static int LUACALL wxLua_function_wxGetEnv(lua_State *L)
  {
[...1192 lines suppressed...]
      // push the result datatype
!     wxlState.PushUserDataType(s_wxluatag_wxOutputStream, returns);
      // return the number of parameters
      return 1;
--- 880,894 ----
  static int LUACALL wxLua_wxOutputStream_Write(lua_State *L)
  {
      wxOutputStream *returns;
      // size_t size
!     size_t size = (size_t)wxlua_getintegertype(L, 3);
      // const void *buffer
      const void *buffer = (void *)lua_tostring(L, 2);
      // get this
!     wxOutputStream *self = (wxOutputStream *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxOutputStream);
      // call Write
      returns = &self->Write(buffer, size);
      // push the result datatype
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxOutputStream, returns);
      // return the number of parameters
      return 1;

Index: wxnet_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxnet_override.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxnet_override.hpp	16 Jul 2007 19:34:26 -0000	1.1
--- wxnet_override.hpp	7 Dec 2007 02:13:10 -0000	1.2
***************
*** 14,20 ****
  static int LUACALL wxLua_wxSocketBase_Peek(lua_State *L)
  {
-     wxLuaState wxlState(L);
      // unsigned long nbytes
!     unsigned long nbytes = (unsigned long)wxlState.GetNumberType(2);
      // void * buffer
      void *buffer = malloc(nbytes);
--- 14,19 ----
  static int LUACALL wxLua_wxSocketBase_Peek(lua_State *L)
  {
      // unsigned long nbytes
!     unsigned long nbytes = (unsigned long)wxlua_getintegertype(L, 2);
      // void * buffer
      void *buffer = malloc(nbytes);
***************
*** 22,26 ****
      {
          // get this
!         wxSocketBase *self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
          // call Peek
          self->Peek(buffer, nbytes);
--- 21,25 ----
      {
          // get this
!         wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase);
          // call Peek
          self->Peek(buffer, nbytes);
***************
*** 38,44 ****
  static int LUACALL wxLua_wxSocketBase_Read(lua_State *L)
  {
-     wxLuaState wxlState(L);
      // unsigned long nbytes
!     unsigned long nbytes = (unsigned long)wxlState.GetNumberType(2);
      // void * buffer
      void *buffer = malloc(nbytes);
--- 37,42 ----
  static int LUACALL wxLua_wxSocketBase_Read(lua_State *L)
  {
      // unsigned long nbytes
!     unsigned long nbytes = (unsigned long)wxlua_getintegertype(L, 2);
      // void * buffer
      void *buffer = malloc(nbytes);
***************
*** 46,50 ****
      {
          // get this
!         wxSocketBase *self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
          // call Peek
          self->Read(buffer, nbytes);
--- 44,48 ----
      {
          // get this
!         wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase);
          // call Peek
          self->Read(buffer, nbytes);
***************
*** 62,68 ****
  static int LUACALL wxLua_wxSocketBase_ReadMsg(lua_State *L)
  {
-     wxLuaState wxlState(L);
      // unsigned long nbytes
!     unsigned long nbytes = (unsigned long)wxlState.GetNumberType(2);
      // void * buffer
      void *buffer = malloc(nbytes);
--- 60,65 ----
  static int LUACALL wxLua_wxSocketBase_ReadMsg(lua_State *L)
  {
      // unsigned long nbytes
!     unsigned long nbytes = (unsigned long)wxlua_getintegertype(L, 2);
      // void * buffer
      void *buffer = malloc(nbytes);
***************
*** 70,74 ****
      {
          // get this
!         wxSocketBase *self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
          // call Peek
          self->ReadMsg(buffer, nbytes);
--- 67,71 ----
      {
          // get this
!         wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase);
          // call Peek
          self->ReadMsg(buffer, nbytes);
***************
*** 86,90 ****
  static int LUACALL wxLua_wxSocketBase_Unread(lua_State *L)
  {
-     wxLuaState wxlState(L);
      // get number of arguments
      int argCount = lua_gettop(L);
--- 83,86 ----
***************
*** 92,98 ****
      const char *buffer = lua_tostring(L, 2);
      // unsigned long nbytes
!     unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlState.GetNumberType(3) : lua_strlen(L, 2));
      // get this
!     wxSocketBase *self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
      // call Unread
      self->Unread(buffer, nbytes);
--- 88,94 ----
      const char *buffer = lua_tostring(L, 2);
      // unsigned long nbytes
!     unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2));
      // get this
!     wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase);
      // call Unread
      self->Unread(buffer, nbytes);
***************
*** 106,110 ****
  static int LUACALL wxLua_wxSocketBase_Write(lua_State *L)
  {
-     wxLuaState wxlState(L);
      // get number of arguments
      int argCount = lua_gettop(L);
--- 102,105 ----
***************
*** 112,118 ****
      const char *buffer = lua_tostring(L, 2);
      // unsigned long nbytes
!     unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlState.GetNumberType(3) : lua_strlen(L, 2));
      // get this
!     wxSocketBase *self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
      // call Write
      self->Write(buffer, nbytes);
--- 107,113 ----
      const char *buffer = lua_tostring(L, 2);
      // unsigned long nbytes
!     unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2));
      // get this
!     wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase);
      // call Write
      self->Write(buffer, nbytes);
***************
*** 126,130 ****
  static int LUACALL wxLua_wxSocketBase_WriteMsg(lua_State *L)
  {
-     wxLuaState wxlState(L);
      // get number of arguments
      int argCount = lua_gettop(L);
--- 121,124 ----
***************
*** 132,138 ****
      const char *buffer = lua_tostring(L, 2);
      // unsigned long nbytes
!     unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlState.GetNumberType(3) : lua_strlen(L, 2));
      // get this
!     wxSocketBase *self = (wxSocketBase *)wxlState.GetUserDataType(1, s_wxluatag_wxSocketBase);
      // call WriteMsg
      self->WriteMsg(buffer, nbytes);
--- 126,132 ----
      const char *buffer = lua_tostring(L, 2);
      // unsigned long nbytes
!     unsigned long nbytes = (argCount >= 3 ? (unsigned long)wxlua_getintegertype(L, 3) : lua_strlen(L, 2));
      // get this
!     wxSocketBase *self = (wxSocketBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxSocketBase);
      // call WriteMsg
      self->WriteMsg(buffer, nbytes);

Index: wxstc_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxstc_override.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxstc_override.hpp	16 Jul 2007 19:34:26 -0000	1.1
--- wxstc_override.hpp	7 Dec 2007 02:13:10 -0000	1.2
***************
*** 14,22 ****
  static int LUACALL wxLua_wxStyledTextCtrl_GetCurLine(lua_State *L)
  {
-     wxLuaState wxlState(L);
      wxString returns;
      int linePos;
      // get this
!     wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl);
      // call GetCurLine
      returns = self->GetCurLine(&linePos);
--- 14,21 ----
  static int LUACALL wxLua_wxStyledTextCtrl_GetCurLine(lua_State *L)
  {
      wxString returns;
      int linePos;
      // get this
!     wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl);
      // call GetCurLine
      returns = self->GetCurLine(&linePos);
***************
*** 33,41 ****
  static int LUACALL wxLua_wxStyledTextCtrl_GetSelection(lua_State *L)
  {
-     wxLuaState wxlState(L);
      int endPos;
      int startPos;
      // get this
!     wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl);
      // call GetSelection
      self->GetSelection(&startPos, &endPos);
--- 32,39 ----
  static int LUACALL wxLua_wxStyledTextCtrl_GetSelection(lua_State *L)
  {
      int endPos;
      int startPos;
      // get this
!     wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl);
      // call GetSelection
      self->GetSelection(&startPos, &endPos);
***************
*** 52,56 ****
  static int LUACALL wxLua_wxStyledTextCtrl_SetStyleBytes(lua_State *L)
  {
-     wxLuaState wxlState(L);
      // const wxString &styleBytes
      wxCharBuffer styleBytes(lua_tostring(L, 3));
--- 50,53 ----
***************
*** 58,62 ****
      int length = (int)lua_tonumber(L, 2);
      // get this
!     wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxStyledTextCtrl);
      // call SetStyleBytes
      self->SetStyleBytes(length, styleBytes.data());
--- 55,59 ----
      int length = (int)lua_tonumber(L, 2);
      // get this
!     wxStyledTextCtrl *self = (wxStyledTextCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxStyledTextCtrl);
      // call SetStyleBytes
      self->SetStyleBytes(length, styleBytes.data());

Index: wxhtml_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_override.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxhtml_override.hpp	17 Nov 2007 00:14:55 -0000	1.2
--- wxhtml_override.hpp	7 Dec 2007 02:13:10 -0000	1.3
***************
*** 16,25 ****
  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);
--- 16,24 ----
  static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L)
  {
      bool returns;
      // int * pagebreak
!     int pagebreak  = (int)wxlua_getintegertype(L, 2);
      // get this
!     wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell);
      // call AdjustPagebreak
      returns = self->AdjustPagebreak(&pagebreak);
***************
*** 35,46 ****
  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);
--- 34,44 ----
  static int LUACALL wxLua_wxHtmlCell_AdjustPagebreak(lua_State *L)
  {
      bool returns;
      // int * pagebreak
!     int pagebreak  = (int)wxlua_getintegertype(L, 3);
      // wxArrayInt& known_pagebreaks
!     wxArrayInt* known_pagebreaks  = (wxArrayInt *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxArrayInt);
      // get this
!     wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell);
      // call AdjustPagebreak
      returns = self->AdjustPagebreak(&pagebreak, *known_pagebreaks);
***************
*** 59,68 ****
  static int LUACALL wxLua_wxHtmlCell_Find(lua_State *L)
  {
-     wxLuaState wxlState(L);
      const wxHtmlCell *returns = NULL;
      // int condition
!     int condition = (int)wxlState.GetNumberType(2);
      // get this
!     wxHtmlCell *self = (wxHtmlCell *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlCell);
      // call Find
      switch(lua_type(L, 3))
--- 57,65 ----
  static int LUACALL wxLua_wxHtmlCell_Find(lua_State *L)
  {
      const wxHtmlCell *returns = NULL;
      // int condition
!     int condition = (int)wxlua_getintegertype(L, 2);
      // get this
!     wxHtmlCell *self = (wxHtmlCell *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlCell);
      // call Find
      switch(lua_type(L, 3))
***************
*** 74,78 ****
          case LUA_TSTRING:
              {
!                 wxString param = wxlState.GetwxStringType(3);
                  returns = self->Find(condition, &param);
              }
--- 71,75 ----
          case LUA_TSTRING:
              {
!                 wxString param = wxlua_getwxstringtype(L, 3);
                  returns = self->Find(condition, &param);
              }
***************
*** 81,85 ****
          case LUA_TNUMBER:
              {
!                 int param = (int)wxlState.GetNumberType(3);
                  returns = self->Find(condition, &param);
              }
--- 78,82 ----
          case LUA_TNUMBER:
              {
!                 int param = (int)wxlua_getnumbertype(L, 3);
                  returns = self->Find(condition, &param);
              }
***************
*** 87,96 ****
  
          default:
!             wxlState.wxlua_Error("wxLua: Expected simple type for parameter 3.");
              break;
      }
  
      // push the result datatype
!     wxlState.PushUserDataType(s_wxluatag_wxHtmlCell, returns);
      // return the number of parameters
      return 1;
--- 84,93 ----
  
          default:
!             wxlua_error(L, "wxLua: Expected simple type for parameter 3.");
              break;
      }
  
      // push the result datatype
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxHtmlCell, returns);
      // return the number of parameters
      return 1;
***************
*** 102,112 ****
  static int LUACALL wxLua_wxHtmlTag_GetParamAsColour(lua_State *L)
  {
-     wxLuaState wxlState(L);
      bool returns;
      wxColour *retColour = new wxColour;
      // const wxString& par
!     wxString par = wxlState.GetwxStringType(2);
      // get this
!     wxHtmlTag *self = (wxHtmlTag *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlTag);
      // call GetParamAsColour
      returns = self->GetParamAsColour(par, retColour);
--- 99,108 ----
  static int LUACALL wxLua_wxHtmlTag_GetParamAsColour(lua_State *L)
  {
      bool returns;
      wxColour *retColour = new wxColour;
      // const wxString& par
!     wxString par = wxlua_getwxstringtype(L, 2);
      // get this
!     wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag);
      // call GetParamAsColour
      returns = self->GetParamAsColour(par, retColour);
***************
*** 114,118 ****
      // push the result number
      lua_pushboolean(L, returns);
!     wxlState.PushUserDataType(s_wxluatag_wxColour, retColour);
      // return the number of parameters
      return 2;
--- 110,114 ----
      // push the result number
      lua_pushboolean(L, returns);
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxColour, retColour);
      // return the number of parameters
      return 2;
***************
*** 124,134 ****
  static int LUACALL wxLua_wxHtmlTag_GetParamAsInt(lua_State *L)
  {
-     wxLuaState wxlState(L);
      bool returns;
      int value;
      // const wxString& par
!     wxString par = wxlState.GetwxStringType(2);
      // get this
!     wxHtmlTag *self = (wxHtmlTag *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlTag);
      // call GetParamAsInt
      returns = self->GetParamAsInt(par, &value);
--- 120,129 ----
  static int LUACALL wxLua_wxHtmlTag_GetParamAsInt(lua_State *L)
  {
      bool returns;
      int value;
      // const wxString& par
!     wxString par = wxlua_getwxstringtype(L, 2);
      // get this
!     wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag);
      // call GetParamAsInt
      returns = self->GetParamAsInt(par, &value);
***************
*** 146,150 ****
  static int LUACALL wxLua_wxHtmlWinParser_SetFonts(lua_State *L)
  {
-     wxLuaState wxlState(L);
      // const int *sizes
  #ifdef __WXMSW__
--- 141,144 ----
***************
*** 164,168 ****
              int count = 0;
  
!             int *sizeArray = wxlState.GetIntArray(4, count);
  
              if (count > arraySize)
--- 158,162 ----
              int count = 0;
  
!             int *sizeArray = wxlua_getintarray(L, 4, count);
  
              if (count > arraySize)
***************
*** 186,194 ****
  
      // wxString fixed_face
!     wxString fixed_face = wxlState.GetwxStringType(3);
      // wxString normal_face
!     wxString normal_face = wxlState.GetwxStringType(2);
      // get this
!     wxHtmlWinParser *self = (wxHtmlWinParser *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWinParser);
      // call SetFonts
      self->SetFonts(normal_face, fixed_face, sizes);
--- 180,188 ----
  
      // wxString fixed_face
!     wxString fixed_face = wxlua_getwxstringtype(L, 3);
      // wxString normal_face
!     wxString normal_face = wxlua_getwxstringtype(L, 2);
      // get this
!     wxHtmlWinParser *self = (wxHtmlWinParser *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlWinParser);
      // call SetFonts
      self->SetFonts(normal_face, fixed_face, sizes);
***************
*** 202,206 ****
  static int LUACALL wxLua_wxHtmlWindow_SetFonts(lua_State *L)
  {
-     wxLuaState wxlState(L);
      // const int *sizes
  #ifdef __WXMSW__
--- 196,199 ----
***************
*** 220,224 ****
              int count = 0;
  
!             int *sizeArray = wxlState.GetIntArray(4, count);
  
              if (count > arraySize)
--- 213,217 ----
              int count = 0;
  
!             int *sizeArray = wxlua_getintarray(L, 4, count);
  
              if (count > arraySize)
***************
*** 242,250 ****
  
      // wxString fixed_face
!     wxString fixed_face = wxlState.GetwxStringType(3);
      // wxString normal_face
!     wxString normal_face = wxlState.GetwxStringType(2);
      // get this
!     wxHtmlWindow *self = (wxHtmlWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxHtmlWindow);
      // call SetFonts
      self->SetFonts(normal_face, fixed_face, sizes);
--- 235,243 ----
  
      // wxString fixed_face
!     wxString fixed_face = wxlua_getwxstringtype(L, 3);
      // wxString normal_face
!     wxString normal_face = wxlua_getwxstringtype(L, 2);
      // get this
!     wxHtmlWindow *self = (wxHtmlWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlWindow);
      // call SetFonts
      self->SetFonts(normal_face, fixed_face, sizes);
***************
*** 265,286 ****
      int argCount = lua_gettop(L);
      // const wxString name = "wxLuaHtmlWindow"
!     const wxString name = (argCount >= 6 ? wxlState.GetwxStringType(6) : wxString(wxT("wxLuaHtmlWindow")));
      // long style = wxHW_SCROLLBAR_AUTO
!     long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxHW_SCROLLBAR_AUTO);
      // const wxSize size = wxDefaultSize
!     const wxSize * size = (argCount >= 4 ? (const wxSize *)wxlState.GetUserDataType(4, s_wxluatag_wxSize) : &wxDefaultSize);
      // const wxPoint pos = wxDefaultPosition
!     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);
      // call constructor
      returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name);
      // add to tracked window list
      if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
!         wxlState.AddTrackedWindow((wxWindow*)returns);
      // push the constructed class pointer
!     wxlState.PushUserDataType(s_wxluatag_wxLuaHtmlWindow, returns);
  
      return 1;
--- 258,279 ----
      int argCount = lua_gettop(L);
      // const wxString name = "wxLuaHtmlWindow"
!     const wxString name = (argCount >= 6 ? wxlua_getwxstringtype(L, 6) : wxString(wxT("wxLuaHtmlWindow")));
      // long style = wxHW_SCROLLBAR_AUTO
!     long style = (argCount >= 5 ? (long)wxlua_getintegertype(L, 5) : wxHW_SCROLLBAR_AUTO);
      // const wxSize size = wxDefaultSize
!     const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, s_wxluatag_wxSize) : &wxDefaultSize);
      // const wxPoint pos = wxDefaultPosition
!     const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxPoint) : &wxDefaultPosition);
      // wxWindowID id = -1
!     wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getintegertype(L, 2) : -1);
      // wxWindow parent
!     wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow);
      // call constructor
      returns = new wxLuaHtmlWindow(wxlState, parent, id, *pos, *size, style, name);
      // add to tracked window list
      if (returns && returns->IsKindOf(CLASSINFO(wxWindow)))
!         wxluaW_addtrackedwindow(L, (wxWindow*)returns);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaHtmlWindow, returns);
  
      return 1;

Index: wxcore_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wxcore_override.hpp	4 Dec 2007 05:20:27 -0000	1.6
--- wxcore_override.hpp	7 Dec 2007 02:13:10 -0000	1.7
***************
*** 14,23 ****
  static int LUACALL wxLua_function_wxGetApp(lua_State *L)
  {
-     wxLuaState wxlState(L);
      wxApp *returns;
      // call wxGetApp(), actually not since you have to have IMPLEMENT_APP
      returns = wxTheApp;
      // push the result datatype
!     wxlState.PushUserDataType(s_wxluatag_wxApp, returns);
      // return the number of parameters
      return 1;
[...3244 lines suppressed...]
      // add to tracked memory list
!     wxlState.AddTrackedObject((wxLuaPrintout *)returns);
      // push the constructed class pointer
!     wxlState.PushUserDataType(s_wxluatag_wxLuaPrintout, returns);
  
      return 1;
--- 2763,2775 ----
      int argCount = lua_gettop(L);
      // wxLuaObject pObject = NULL
!     wxLuaObject * pObject = (argCount >= 2 ? (wxLuaObject *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxLuaObject) : NULL);
      // const wxString title = "Printout"
!     const wxString title = (argCount >= 1 ? wxlua_getwxstringtype(L, 1) : wxString(wxT("Printout")));
      // call constructor
      returns = new wxLuaPrintout(wxlState, title, pObject);
      // add to tracked memory list
!     wxluaO_addtrackedobject(L, (wxLuaPrintout *)returns);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaPrintout, returns);
  
      return 1;

Index: wxadv_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_override.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** wxadv_override.hpp	16 Jul 2007 19:34:23 -0000	1.1
--- wxadv_override.hpp	7 Dec 2007 02:13:09 -0000	1.2
***************
*** 14,23 ****
  static int LUACALL wxLua_wxCalendarCtrl_HitTest(lua_State *L)
  {
-     wxLuaState wxlState(L);
      wxCalendarHitTestResult returns;
      // const wxPoint pos
!     const wxPoint * pos = (const wxPoint *)wxlState.GetUserDataType(2, s_wxluatag_wxPoint);
      // get this
!     wxCalendarCtrl * self = (wxCalendarCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxCalendarCtrl);
      // call HitTest
      wxDateTime* date = new wxDateTime();
--- 14,22 ----
  static int LUACALL wxLua_wxCalendarCtrl_HitTest(lua_State *L)
  {
      wxCalendarHitTestResult returns;
      // const wxPoint pos
!     const wxPoint * pos = (const wxPoint *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxPoint);
      // get this
!     wxCalendarCtrl * self = (wxCalendarCtrl *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxCalendarCtrl);
      // call HitTest
      wxDateTime* date = new wxDateTime();
***************
*** 27,31 ****
      // push the result number
      lua_pushnumber(L, returns);
!     wxlState.PushUserDataType(s_wxluatag_wxDateTime, date);
      lua_pushnumber(L, wd);
  
--- 26,30 ----
      // push the result number
      lua_pushnumber(L, returns);
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxDateTime, date);
      lua_pushnumber(L, wd);
  
***************
*** 42,51 ****
  static int LUACALL wxLua_wxGridCellAttr_GetAlignment(lua_State *L)
  {
-     wxLuaState wxlState(L);
      int horz;
      int vert;
  
      // get this
!     wxGridCellAttr *self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr);
      // call GetAlignment
      self->GetAlignment(&horz, &vert);
--- 41,49 ----
  static int LUACALL wxLua_wxGridCellAttr_GetAlignment(lua_State *L)
  {
      int horz;
      int vert;
  
      // get this
!     wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGridCellAttr);
      // call GetAlignment
      self->GetAlignment(&horz, &vert);
***************
*** 62,71 ****
  static int LUACALL wxLua_wxGridCellAttr_GetSize(lua_State *L)
  {
-     wxLuaState wxlState(L);
      int num_rows;
      int num_cols;
  
      // get this
!     wxGridCellAttr *self = (wxGridCellAttr *)wxlState.GetUserDataType(1, s_wxluatag_wxGridCellAttr);
      // call GetAlignment
      self->GetSize(&num_rows, &num_cols);
--- 60,68 ----
  static int LUACALL wxLua_wxGridCellAttr_GetSize(lua_State *L)
  {
      int num_rows;
      int num_cols;
  
      // get this
!     wxGridCellAttr *self = (wxGridCellAttr *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGridCellAttr);
      // call GetAlignment
      self->GetSize(&num_rows, &num_cols);
***************
*** 82,90 ****
  static int LUACALL wxLua_wxGrid_GetRowLabelAlignment(lua_State *L)
  {
-     wxLuaState wxlState(L);
      int vert;
      int horz;
      // get this
!     wxGrid *self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetRowLabelAlignment
      self->GetRowLabelAlignment(&horz, &vert);
--- 79,86 ----
  static int LUACALL wxLua_wxGrid_GetRowLabelAlignment(lua_State *L)
  {
      int vert;
      int horz;
      // get this
!     wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid);
      // call GetRowLabelAlignment
      self->GetRowLabelAlignment(&horz, &vert);
***************
*** 101,109 ****
  static int LUACALL wxLua_wxGrid_GetColLabelAlignment(lua_State *L)
  {
-     wxLuaState wxlState(L);
      int vert;
      int horz;
      // get this
!     wxGrid *self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetColLabelAlignment
      self->GetColLabelAlignment(&horz, &vert);
--- 97,104 ----
  static int LUACALL wxLua_wxGrid_GetColLabelAlignment(lua_State *L)
  {
      int vert;
      int horz;
      // get this
!     wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid);
      // call GetColLabelAlignment
      self->GetColLabelAlignment(&horz, &vert);
***************
*** 120,128 ****
  static int LUACALL wxLua_wxGrid_GetDefaultCellAlignment(lua_State *L)
  {
-     wxLuaState wxlState(L);
      int vert;
      int horiz;
      // get this
!     wxGrid *self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetDefaultCellAlignment
      self->GetDefaultCellAlignment(&horiz, &vert);
--- 115,122 ----
  static int LUACALL wxLua_wxGrid_GetDefaultCellAlignment(lua_State *L)
  {
      int vert;
      int horiz;
      // get this
!     wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid);
      // call GetDefaultCellAlignment
      self->GetDefaultCellAlignment(&horiz, &vert);
***************
*** 139,143 ****
  static int LUACALL wxLua_wxGrid_GetCellAlignment(lua_State *L)
  {
-     wxLuaState wxlState(L);
      int vert;
      int horiz;
--- 133,136 ----
***************
*** 147,151 ****
      int row = (int)lua_tonumber(L, 2);
      // get this
!     wxGrid *self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetCellAlignment
      self->GetCellAlignment(row, col, &horiz, &vert);
--- 140,144 ----
      int row = (int)lua_tonumber(L, 2);
      // get this
!     wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid);
      // call GetCellAlignment
      self->GetCellAlignment(row, col, &horiz, &vert);
***************
*** 162,166 ****
  static int LUACALL wxLua_wxGrid_GetCellSize(lua_State *L)
  {
-     wxLuaState wxlState(L);
      int num_rows;
      int num_cols;
--- 155,158 ----
***************
*** 170,174 ****
      int row = (int)lua_tonumber(L, 2);
      // get this
!     wxGrid *self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetCellAlignment
      self->GetCellAlignment(row, col, &num_rows, &num_cols);
--- 162,166 ----
      int row = (int)lua_tonumber(L, 2);
      // get this
!     wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid);
      // call GetCellAlignment
      self->GetCellAlignment(row, col, &num_rows, &num_cols);
***************
*** 185,197 ****
  static int LUACALL wxLua_wxGrid_GetTextBoxSize(lua_State *L)
  {
-     wxLuaState wxlState(L);
      long height;
      long width;
      // wxArrayString& lines
!     wxArrayString *lines = (wxArrayString *)wxlState.GetUserDataType(3, s_wxluatag_wxArrayString);
      // wxDC& dc
!     wxDC *dc = (wxDC *)wxlState.GetUserDataType(2, s_wxluatag_wxDC);
      // get this
!     wxGrid *self = (wxGrid *)wxlState.GetUserDataType(1, s_wxluatag_wxGrid);
      // call GetTextBoxSize
      self->GetTextBoxSize(*dc, *lines, &width, &height);
--- 177,188 ----
  static int LUACALL wxLua_wxGrid_GetTextBoxSize(lua_State *L)
  {
      long height;
      long width;
      // wxArrayString& lines
!     wxArrayString *lines = (wxArrayString *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxArrayString);
      // wxDC& dc
!     wxDC *dc = (wxDC *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxDC);
      // get this
!     wxGrid *self = (wxGrid *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxGrid);
      // call GetTextBoxSize
      self->GetTextBoxSize(*dc, *lines, &width, &height);

Index: wxxml_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_override.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wxxml_override.hpp	22 Aug 2007 20:17:09 -0000	1.2
--- wxxml_override.hpp	7 Dec 2007 02:13:10 -0000	1.3
***************
*** 15,39 ****
  {
      wxluabind_removetableforcall(L);
!     wxLuaState wxlState(L);
      wxXmlNode *returns;
      // wxXmlNode next
!     wxXmlNode * next = (wxXmlNode *)wxlState.GetUserDataType(6, s_wxluatag_wxXmlNode);
      // wxXmlProperty props
!     wxXmlProperty * props = (wxXmlProperty *)wxlState.GetUserDataType(5, s_wxluatag_wxXmlProperty);
      // const wxString content
!     const wxString content = wxlState.GetwxStringType(4);
      // const wxString name
!     const wxString name = wxlState.GetwxStringType(3);
      // wxXmlNodeType type
      wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2);
      // wxXmlNode parent
!     wxXmlNode * parent = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call constructor
      returns = new wxXmlNode(parent, type, name, content, props, next);
      // add to tracked memory list
      if (parent == NULL)
!         wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns));
      // push the constructed class pointer
!     wxlState.PushUserDataType(s_wxluatag_wxXmlNode, returns);
  
      return 1;
--- 15,39 ----
  {
      wxluabind_removetableforcall(L);
! 
      wxXmlNode *returns;
      // wxXmlNode next
!     wxXmlNode * next = (wxXmlNode *)wxluaT_getuserdatatype(L, 6, s_wxluatag_wxXmlNode);
      // wxXmlProperty props
!     wxXmlProperty * props = (wxXmlProperty *)wxluaT_getuserdatatype(L, 5, s_wxluatag_wxXmlProperty);
      // const wxString content
!     const wxString content = wxlua_getwxstringtype(L, 4);
      // const wxString name
!     const wxString name = wxlua_getwxstringtype(L, 3);
      // wxXmlNodeType type
      wxXmlNodeType type = (wxXmlNodeType)wxlua_getintegertype(L, 2);
      // wxXmlNode parent
!     wxXmlNode * parent = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode);
      // call constructor
      returns = new wxXmlNode(parent, type, name, content, props, next);
      // add to tracked memory list
      if (parent == NULL)
!         wxluaO_addtrackedobject(L, (void*)returns, new wxLua_wxObject_wxXmlNode((wxXmlNode *)returns));
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxXmlNode, returns);
  
      return 1;
***************
*** 45,59 ****
  static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L)
  {
-     wxLuaState wxlState(L);
      bool returns;
      // wxXmlNode child
!     wxXmlNode * child = (wxXmlNode *)wxlState.GetUserDataType(2, s_wxluatag_wxXmlNode);
      // get this
!     wxXmlNode * self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call RemoveChild
      returns = (self->RemoveChild(child));
  
!     if (returns && !wxlState.IsTrackedObject(child))
!         wxlState.AddTrackedObject((long)child, new wxLua_wxObject_wxXmlNode(child));
  
      // push the result flag
--- 45,58 ----
  static int LUACALL wxLua_wxXmlNode_RemoveChild(lua_State *L)
  {
      bool returns;
      // wxXmlNode child
!     wxXmlNode * child = (wxXmlNode *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxXmlNode);
      // get this
!     wxXmlNode * self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode);
      // call RemoveChild
      returns = (self->RemoveChild(child));
  
!     if (returns && !wxluaO_istrackedobject(L, child))
!         wxluaO_addtrackedobject(L, (void*)child, new wxLua_wxObject_wxXmlNode(child));
  
      // push the result flag
***************
*** 68,79 ****
  static int LUACALL wxLua_wxXmlNode_GetPropValPtr(lua_State *L)
  {
-     wxLuaState wxlState(L);
      bool returns;
      // wxString *value
      wxString value;
      // const wxString& propName
!     wxString propName = wxlState.GetwxStringType(2);
      // get this
!     wxXmlNode *self = (wxXmlNode *)wxlState.GetUserDataType(1, s_wxluatag_wxXmlNode);
      // call GetPropVal
      returns = self->GetPropVal(propName, &value);
--- 67,77 ----
  static int LUACALL wxLua_wxXmlNode_GetPropValPtr(lua_State *L)
  {
      bool returns;
      // wxString *value
      wxString value;
      // const wxString& propName
!     wxString propName = wxlua_getwxstringtype(L, 2);
      // get this
!     wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode);
      // call GetPropVal
      returns = self->GetPropVal(propName, &value);
***************
*** 81,85 ****
      lua_pushboolean(L, returns);
      // push the result string
!     wxlState.lua_PushString(value);
      // return the number of parameters
      return 2;
--- 79,83 ----
      lua_pushboolean(L, returns);
      // push the result string
!     wxlua_pushwxString(L, value);
      // return the number of parameters
      return 2;