[Wxlua-commit] wxLua/bindings/wxwidgets wxbase_override.hpp, 1.7, 1.8 wxcore_override.hpp, 1.7, 1.8 wxhtml_override.hpp, 1.3, 1.4 wxxml_override.hpp, 1.3, 1.4

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

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

Modified Files:
	wxbase_override.hpp wxcore_override.hpp wxhtml_override.hpp 
	wxxml_override.hpp 
Log Message:
Rename wxlua_getwxstringtype wxlua_getwxStringtype to match other funcs.
Fix bug (from w/ last commit) of using wrong key/value indexes in lua_next() loop


Index: wxhtml_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxhtml_override.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxhtml_override.hpp	7 Dec 2007 02:13:10 -0000	1.3
--- wxhtml_override.hpp	7 Dec 2007 06:44:41 -0000	1.4
***************
*** 71,75 ****
          case LUA_TSTRING:
              {
!                 wxString param = wxlua_getwxstringtype(L, 3);
                  returns = self->Find(condition, &param);
              }
--- 71,75 ----
          case LUA_TSTRING:
              {
!                 wxString param = wxlua_getwxStringtype(L, 3);
                  returns = self->Find(condition, &param);
              }
***************
*** 102,106 ****
      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);
--- 102,106 ----
      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);
***************
*** 123,127 ****
      int value;
      // const wxString& par
!     wxString par = wxlua_getwxstringtype(L, 2);
      // get this
      wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag);
--- 123,127 ----
      int value;
      // const wxString& par
!     wxString par = wxlua_getwxStringtype(L, 2);
      // get this
      wxHtmlTag *self = (wxHtmlTag *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxHtmlTag);
***************
*** 180,186 ****
  
      // 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);
--- 180,186 ----
  
      // 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);
***************
*** 235,241 ****
  
      // 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);
--- 235,241 ----
  
      // 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);
***************
*** 258,262 ****
      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);
--- 258,262 ----
      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);

Index: wxbase_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_override.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxbase_override.hpp	7 Dec 2007 02:13:09 -0000	1.7
--- wxbase_override.hpp	7 Dec 2007 06:44:41 -0000	1.8
***************
*** 35,39 ****
  {
      bool returns;
!     wxString var = wxlua_getwxstringtype(L, 1);
      wxString value;
      // call wxGetEnv
--- 35,39 ----
  {
      bool returns;
!     wxString var = wxlua_getwxStringtype(L, 1);
      wxString value;
      // call wxGetEnv
***************
*** 98,104 ****
      size_t maxMatches = (argCount >= 4 ? (size_t)wxlua_getintegertype(L, 4) : 0);
      // const wxString& replacement
!     wxString replacement = wxlua_getwxstringtype(L, 3);
      // wxString* text
!     wxString text = wxlua_getwxstringtype(L, 2);
      // get this
      wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx);
--- 98,104 ----
      size_t maxMatches = (argCount >= 4 ? (size_t)wxlua_getintegertype(L, 4) : 0);
      // const wxString& replacement
!     wxString replacement = wxlua_getwxStringtype(L, 3);
      // wxString* text
!     wxString text = wxlua_getwxStringtype(L, 2);
      // get this
      wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx);
***************
*** 120,126 ****
      int returns;
      // const wxString& replacement
!     wxString replacement = wxlua_getwxstringtype(L, 3);
      // wxString* text
!     wxString text = wxlua_getwxstringtype(L, 2);
      // get this
      wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx);
--- 120,126 ----
      int returns;
      // const wxString& replacement
!     wxString replacement = wxlua_getwxStringtype(L, 3);
      // wxString* text
!     wxString text = wxlua_getwxStringtype(L, 2);
      // get this
      wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx);
***************
*** 142,148 ****
      int returns;
      // const wxString& replacement
!     wxString replacement = wxlua_getwxstringtype(L, 3);
      // wxString* text
!     wxString text = wxlua_getwxstringtype(L, 2);
      // get this
      wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx);
--- 142,148 ----
      int returns;
      // const wxString& replacement
!     wxString replacement = wxlua_getwxStringtype(L, 3);
      // wxString* text
!     wxString text = wxlua_getwxStringtype(L, 2);
      // get this
      wxRegEx *self = (wxRegEx *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxRegEx);
***************
*** 189,195 ****
      int argCount = lua_gettop(L);
      // wxString defaultVal
!     wxString defaultVal = (argCount >= 3 ? wxlua_getwxstringtype(L, 3) : wxString(wxEmptyString));
      // const wxString& key
!     wxString key = wxlua_getwxstringtype(L, 2);
      // get this
      wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
--- 189,195 ----
      int argCount = lua_gettop(L);
      // wxString defaultVal
!     wxString defaultVal = (argCount >= 3 ? wxlua_getwxStringtype(L, 3) : wxString(wxEmptyString));
      // const wxString& key
!     wxString key = wxlua_getwxStringtype(L, 2);
      // get this
      wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
***************
*** 215,219 ****
      long defaultVal = (argCount >= 3 ? (long)wxlua_getnumbertype(L, 3) : 0);
      // const wxString& key
!     wxString key = wxlua_getwxstringtype(L, 2);
      // get this
      wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
--- 215,219 ----
      long defaultVal = (argCount >= 3 ? (long)wxlua_getnumbertype(L, 3) : 0);
      // const wxString& key
!     wxString key = wxlua_getwxStringtype(L, 2);
      // get this
      wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
***************
*** 239,243 ****
      double defaultVal = (argCount >= 3 ? (double)wxlua_getnumbertype(L, 3) : 0);
      // const wxString& key
!     wxString key = wxlua_getwxstringtype(L, 2);
      // get this
      wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
--- 239,243 ----
      double defaultVal = (argCount >= 3 ? (double)wxlua_getnumbertype(L, 3) : 0);
      // const wxString& key
!     wxString key = wxlua_getwxStringtype(L, 2);
      // get this
      wxConfigBase *self = (wxConfigBase *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
***************
*** 262,266 ****
      // these are optional and are not used anyway
      long     index = (argCount >= 3 ? (long)wxlua_getintegertype(L, 3) : 0);
!     wxString str   = (argCount >= 2 ? wxlua_getwxstringtype(L, 2) : wxString(wxEmptyString));
      // get this
      wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
--- 262,266 ----
      // these are optional and are not used anyway
      long     index = (argCount >= 3 ? (long)wxlua_getintegertype(L, 3) : 0);
!     wxString str   = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString));
      // get this
      wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
***************
*** 287,291 ****
      // these are optional and are not used anyway
      long     index = (argCount >= 3 ? (long)wxlua_getintegertype(L, 3) : 0);
!     wxString str   = (argCount >= 2 ? wxlua_getwxstringtype(L, 2) : wxString(wxEmptyString));
      // get this
      wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
--- 287,291 ----
      // these are optional and are not used anyway
      long     index = (argCount >= 3 ? (long)wxlua_getintegertype(L, 3) : 0);
!     wxString str   = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxEmptyString));
      // get this
      wxConfig *self = (wxConfig *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxConfigBase);
***************
*** 363,367 ****
      int argCount = lua_gettop(L);
      // const wxString str = ""
!     const wxString str = (argCount >= 1 ? wxlua_getwxstringtype(L, 1) : wxString(wxEmptyString));
      // call constructor
      returns = new wxString(str);
--- 363,367 ----
      int argCount = lua_gettop(L);
      // const wxString str = ""
!     const wxString str = (argCount >= 1 ? wxlua_getwxStringtype(L, 1) : wxString(wxEmptyString));
      // call constructor
      returns = new wxString(str);
***************
*** 383,387 ****
      wxClassInfo *returns;
      // const wxString &name
!     wxString name = wxlua_getwxstringtype(L, 1);
      // call constructor
      returns = wxClassInfo::FindClass((wxChar *)name.c_str());
--- 383,387 ----
      wxClassInfo *returns;
      // const wxString &name
!     wxString name = wxlua_getwxStringtype(L, 1);
      // call constructor
      returns = wxClassInfo::FindClass((wxChar *)name.c_str());
***************
*** 474,478 ****
          {
              for (idx = 1; idx < argCount; ++idx)
!                 returns->Add(wxlua_getwxstringtype(L, idx));
          }
      }
--- 474,478 ----
          {
              for (idx = 1; idx < argCount; ++idx)
!                 returns->Add(wxlua_getwxStringtype(L, idx));
          }
      }
***************
*** 615,619 ****
      wxString path;
      // const wxString& fullpath
!     wxString fullpath = wxlua_getwxstringtype(L, 2);
      // call SplitPath
      wxFileName::SplitPath(fullpath, &path, &name, &ext, format);
--- 615,619 ----
      wxString path;
      // const wxString& fullpath
!     wxString fullpath = wxlua_getwxStringtype(L, 2);
      // call SplitPath
      wxFileName::SplitPath(fullpath, &path, &name, &ext, format);
***************
*** 640,644 ****
      wxString volume;
      // const wxString& fullpath
!     wxString fullpath = wxlua_getwxstringtype(L, 2);
      // call SplitPath
      wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format);
--- 640,644 ----
      wxString volume;
      // const wxString& fullpath
!     wxString fullpath = wxlua_getwxStringtype(L, 2);
      // call SplitPath
      wxFileName::SplitPath(fullpath, &volume, &path, &name, &ext, format);
***************
*** 662,666 ****
      wxPathFormat format = (argCount >= 3 ? (wxPathFormat)wxlua_getintegertype(L, 3) : wxPATH_NATIVE);
      // const wxString fullpath
!     const wxString fullpath = wxlua_getwxstringtype(L, 2);
      wxString volume;
      wxString path;
--- 662,666 ----
      wxPathFormat format = (argCount >= 3 ? (wxPathFormat)wxlua_getintegertype(L, 3) : wxPATH_NATIVE);
      // const wxString fullpath
!     const wxString fullpath = wxlua_getwxStringtype(L, 2);
      wxString volume;
      wxString path;
***************
*** 684,688 ****
      int flags = (argCount >= 3 ? (int)wxlua_getintegertype(L, 3) : wxDIR_DEFAULT);
      // const wxString& filespec = ""
!     wxString filespec = (argCount >= 2 ? wxlua_getwxstringtype(L, 2) : wxString(wxT("")));
      // wxString * filename
      wxString filename;
--- 684,688 ----
      int flags = (argCount >= 3 ? (int)wxlua_getintegertype(L, 3) : wxDIR_DEFAULT);
      // const wxString& filespec = ""
!     wxString filespec = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxT("")));
      // wxString * filename
      wxString filename;
***************
*** 728,736 ****
      int flags = (argCount >= 4 ? (int)wxlua_getintegertype(L, 3) : wxDIR_DEFAULT);
      // const wxString& filespec = ""
!     wxString filespec = (argCount >= 3 ? wxlua_getwxstringtype(L, 2) : wxString(wxT("")));
      // wxArrayString *files
      wxArrayString files;
      // const wxString& dirname
!     wxString dirname = wxlua_getwxstringtype(L, 1);
      // call GetAllFiles
      returns = wxDir::GetAllFiles(dirname, &files, filespec, flags);
--- 728,736 ----
      int flags = (argCount >= 4 ? (int)wxlua_getintegertype(L, 3) : wxDIR_DEFAULT);
      // const wxString& filespec = ""
!     wxString filespec = (argCount >= 3 ? wxlua_getwxStringtype(L, 2) : wxString(wxT("")));
      // wxArrayString *files
      wxArrayString files;
      // const wxString& dirname
!     wxString dirname = wxlua_getwxStringtype(L, 1);
      // call GetAllFiles
      returns = wxDir::GetAllFiles(dirname, &files, filespec, flags);
***************
*** 797,801 ****
      bool returns;
      // wxString desc
!     wxString desc; // = wxlua_getwxstringtype(L, 2);
      // get this
      wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType);
--- 797,801 ----
      bool returns;
      // wxString desc
!     wxString desc; // = wxlua_getwxStringtype(L, 2);
      // get this
      wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType);
***************
*** 818,822 ****
      const wxFileType::MessageParameters * params = (const wxFileType::MessageParameters *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxFileType_MessageParameters);
      // wxString printCmd
!     wxString printCmd; // = wxlua_getwxstringtype(L, 2);
      // get this
      wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType);
--- 818,822 ----
      const wxFileType::MessageParameters * params = (const wxFileType::MessageParameters *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxFileType_MessageParameters);
      // wxString printCmd
!     wxString printCmd; // = wxlua_getwxStringtype(L, 2);
      // get this
      wxFileType * self = (wxFileType *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxFileType);

Index: wxcore_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxcore_override.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** wxcore_override.hpp	7 Dec 2007 02:13:10 -0000	1.7
--- wxcore_override.hpp	7 Dec 2007 06:44:41 -0000	1.8
***************
*** 810,814 ****
      int flags = (argCount >= 2 ? (int)wxlua_getintegertype(L, 2) : 0);
      // const wxString command
!     const wxString command = wxlua_getwxstringtype(L, 1);
      // call wxExecute
      wxArrayString output;
--- 810,814 ----
      int flags = (argCount >= 2 ? (int)wxlua_getintegertype(L, 2) : 0);
      // const wxString command
!     const wxString command = wxlua_getwxStringtype(L, 1);
      // call wxExecute
      wxArrayString output;
***************
*** 832,836 ****
      int flags = (argCount >= 2 ? (int)wxlua_getintegertype(L, 2) : 0);
      // const wxString command
!     const wxString command = wxlua_getwxstringtype(L, 1);
      // call wxExecute
      wxArrayString output;
--- 832,836 ----
      int flags = (argCount >= 2 ? (int)wxlua_getintegertype(L, 2) : 0);
      // const wxString command
!     const wxString command = wxlua_getwxStringtype(L, 1);
      // call wxExecute
      wxArrayString output;
***************
*** 940,946 ****
      int count = 0; wxLuaSmartStringArray choices = wxlua_getwxStringarray(L, 4, count);
      // const wxString& caption
!     wxString caption = wxlua_getwxstringtype(L, 3);
      // const wxString& message
!     wxString message = wxlua_getwxstringtype(L, 2);
      // wxArrayInt& selections
      wxLuaSmartwxArrayInt selections = wxlua_getwxArrayInt(L, 1);
--- 940,946 ----
      int count = 0; wxLuaSmartStringArray choices = wxlua_getwxStringarray(L, 4, count);
      // const wxString& caption
!     wxString caption = wxlua_getwxStringtype(L, 3);
      // const wxString& message
!     wxString message = wxlua_getwxStringtype(L, 2);
      // wxArrayInt& selections
      wxLuaSmartwxArrayInt selections = wxlua_getwxArrayInt(L, 1);
***************
*** 1004,1010 ****
      wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 4);
      // const wxString caption
!     const wxString caption = wxlua_getwxstringtype(L, 3);
      // const wxString message
!     const wxString message = wxlua_getwxstringtype(L, 2);
      // wxWindow parent
      wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow);
--- 1004,1010 ----
      wxLuaSmartwxArrayString choices = wxlua_getwxArrayString(L, 4);
      // const wxString caption
!     const wxString caption = wxlua_getwxStringtype(L, 3);
      // const wxString message
!     const wxString message = wxlua_getwxStringtype(L, 2);
      // wxWindow parent
      wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow);
***************
*** 1029,1033 ****
      int argCount = lua_gettop(L);
      // const wxString newmsg = ""
!     const wxString newmsg = (argCount >= 3 ? wxlua_getwxstringtype(L, 3) : wxString(wxEmptyString));
      // int value = -1
      int value = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1);
--- 1029,1033 ----
      int argCount = lua_gettop(L);
      // const wxString newmsg = ""
!     const wxString newmsg = (argCount >= 3 ? wxlua_getwxStringtype(L, 3) : wxString(wxEmptyString));
      // int value = -1
      int value = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1);
***************
*** 1380,1384 ****
      bool interactive = (argCount >= 5 ? wxlua_getbooleantype(L, 4) : true);
      // const wxString &faceName = wxEmptyString
!     wxString faceName = (argCount >= 4 ? wxlua_getwxstringtype(L, 3) : wxString(wxT("")));
      // wxFontEncoding *altEncoding
      wxFontEncoding altEncoding;
--- 1380,1384 ----
      bool interactive = (argCount >= 5 ? wxlua_getbooleantype(L, 4) : true);
      // const wxString &faceName = wxEmptyString
!     wxString faceName = (argCount >= 4 ? wxlua_getwxStringtype(L, 3) : wxString(wxT("")));
      // wxFontEncoding *altEncoding
      wxFontEncoding altEncoding;
***************
*** 1615,1619 ****
      wxCoord w;
  
!     wxString string = wxlua_getwxstringtype(L, 2);
      // get this
      wxDC *self = (wxDC *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDC);
--- 1615,1619 ----
      wxCoord w;
  
!     wxString string = wxlua_getwxStringtype(L, 2);
      // get this
      wxDC *self = (wxDC *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDC);
***************
*** 1642,1646 ****
      wxCoord w;
  
!     wxString string = wxlua_getwxstringtype(L, 2);
      // get this
      wxDC *self = (wxDC *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDC);
--- 1642,1646 ----
      wxCoord w;
  
!     wxString string = wxlua_getwxStringtype(L, 2);
      // get this
      wxDC *self = (wxDC *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDC);
***************
*** 2023,2027 ****
      bool returns;
      // wxString buf
!     wxString buf = wxlua_getwxstringtype(L, 2);
      // get this
      wxDocManager * self = (wxDocManager *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDocManager);
--- 2023,2027 ----
      bool returns;
      // wxString buf
!     wxString buf = wxlua_getwxStringtype(L, 2);
      // get this
      wxDocManager * self = (wxDocManager *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDocManager);
***************
*** 2041,2045 ****
  {
      // wxString name
!     wxString name = wxlua_getwxstringtype(L, 2);
      // get this
      wxDocument * self = (wxDocument *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDocument);
--- 2041,2045 ----
  {
      // wxString name
!     wxString name = wxlua_getwxStringtype(L, 2);
      // get this
      wxDocument * self = (wxDocument *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxDocument);
***************
*** 2102,2106 ****
      long style = (argCount >= 3 ? (long)wxlua_getintegertype(L, 3) : 0);
      // const wxString& title = ""
!     wxString title = (argCount >= 2 ? wxlua_getwxstringtype(L, 2) : wxString(wxT("")));
      // int table
      if (lua_istable(L, 1))
--- 2102,2106 ----
      long style = (argCount >= 3 ? (long)wxlua_getintegertype(L, 3) : 0);
      // const wxString& title = ""
!     wxString title = (argCount >= 2 ? wxlua_getwxStringtype(L, 2) : wxString(wxT("")));
      // int table
      if (lua_istable(L, 1))
***************
*** 2136,2140 ****
                      lua_pushnumber(L, 2);
                      lua_gettable(L, -2);
!                     menuText = wxlua_getwxstringtype(L, -1);
                      lua_pop(L, 1);
  
--- 2136,2140 ----
                      lua_pushnumber(L, 2);
                      lua_gettable(L, -2);
!                     menuText = wxlua_getwxStringtype(L, -1);
                      lua_pop(L, 1);
  
***************
*** 2142,2146 ****
                      lua_gettable(L, -2);
                      if (lua_isstring(L, -1))
!                         helpText = wxlua_getwxstringtype(L, -1);
                      lua_pop(L, 1);
  
--- 2142,2146 ----
                      lua_gettable(L, -2);
                      if (lua_isstring(L, -1))
!                         helpText = wxlua_getwxStringtype(L, -1);
                      lua_pop(L, 1);
  
***************
*** 2229,2235 ****
      wxItemKind itemkind = (wxItemKind)(argCount >= 5 ? wxlua_getintegertype(L, 5) : wxITEM_NORMAL);
      // const wxString& help = wxEmptyString
!     wxString help = (argCount >= 4 ? wxlua_getwxstringtype(L, 4) : wxString(wxEmptyString));
      // const wxString& text = wxEmptyString
!     wxString text = (argCount >= 3 ? wxlua_getwxstringtype(L, 3) : wxString(wxEmptyString));
      // int id = wxID_SEPARATOR
      int id = (argCount >= 2 ? (int)wxlua_getintegertype(L, 2) : wxID_SEPARATOR);
--- 2229,2235 ----
      wxItemKind itemkind = (wxItemKind)(argCount >= 5 ? wxlua_getintegertype(L, 5) : wxITEM_NORMAL);
      // const wxString& help = wxEmptyString
!     wxString help = (argCount >= 4 ? wxlua_getwxStringtype(L, 4) : wxString(wxEmptyString));
      // const wxString& text = wxEmptyString
!     wxString text = (argCount >= 3 ? wxlua_getwxStringtype(L, 3) : wxString(wxEmptyString));
      // int id = wxID_SEPARATOR
      int id = (argCount >= 2 ? (int)wxlua_getintegertype(L, 2) : wxID_SEPARATOR);
***************
*** 2530,2534 ****
      int h;
      // const wxString& string
!     wxString string = wxlua_getwxstringtype(L, 2);
      // get this
      wxWindow *self = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow);
--- 2530,2534 ----
      int h;
      // const wxString& string
!     wxString string = wxlua_getwxStringtype(L, 2);
      // get this
      wxWindow *self = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow);
***************
*** 2765,2769 ****
      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);
--- 2765,2769 ----
      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);

Index: wxxml_override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxxml_override.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxxml_override.hpp	7 Dec 2007 02:13:10 -0000	1.3
--- wxxml_override.hpp	7 Dec 2007 06:44:41 -0000	1.4
***************
*** 22,28 ****
      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);
--- 22,28 ----
      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);
***************
*** 71,75 ****
      wxString value;
      // const wxString& propName
!     wxString propName = wxlua_getwxstringtype(L, 2);
      // get this
      wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode);
--- 71,75 ----
      wxString value;
      // const wxString& propName
!     wxString propName = wxlua_getwxStringtype(L, 2);
      // get this
      wxXmlNode *self = (wxXmlNode *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxXmlNode);