[Wxlua-commit] wxLua/modules/wxlua/src wxlstate.cpp,1.100,1.101

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

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

Modified Files:
	wxlstate.cpp 
Log Message:
Allow multiple overload functions, but pick the first one which should be the best.
Remove duplicate wxWindow::SetSize
Static functions are always called using '.' and never ':'


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** wxlstate.cpp	6 Jun 2007 03:53:40 -0000	1.100
--- wxlstate.cpp	6 Jun 2007 15:20:16 -0000	1.101
***************
*** 3480,3484 ****
  
      // If there was a function that matched run it, if > 1 ??? 
!     if (funcArray.GetCount() == 1)
      {
          lua_CFunction func = ((WXLUAMETHOD_CFUNC*)funcArray[0])->func;
--- 3480,3484 ----
  
      // If there was a function that matched run it, if > 1 ??? 
!     if (funcArray.GetCount() > 0)
      {
          lua_CFunction func = ((WXLUAMETHOD_CFUNC*)funcArray[0])->func;
***************
*** 3561,3565 ****
  
      if (bestFunc == NULL) 
!         errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument\n%s"), fnCall.c_str(), fnOverloadList.c_str());
      else
      {
--- 3561,3565 ----
  
      if (bestFunc == NULL) 
!         errmsg += wxString::Format(wxT("wxLua overloaded function %s has invalid argument\n%s"), fnCall.c_str(), fnOverloadList.c_str());
      else
      {
***************
*** 3578,3582 ****
          }
  
!         errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument %d on method %02d\n%s"), fnCall.c_str(), (invalidArg), i_func, fnOverloadList.c_str());
      }
  
--- 3578,3582 ----
          }
  
!         errmsg += wxString::Format(wxT("wxLua overloaded function %s has invalid argument %d on method %02d\n%s"), fnCall.c_str(), (invalidArg), i_func, fnOverloadList.c_str());
      }