[Wxlua-commit] wxLua/bindings/wxwidgets override.hpp,1.67,1.68

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

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

Modified Files:
	override.hpp 
Log Message:
Fix a number of bugs with the new bindings
  fix override wxConfig::Get
  fix looking up overloaded static and non static class member functions
  fix looking up class member functions overloaded from a base class


Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** override.hpp	31 May 2007 21:38:39 -0000	1.67
--- override.hpp	5 Jun 2007 21:07:20 -0000	1.68
***************
*** 472,476 ****
      wxString str   = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString));
      // get this
!     wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig);
      // call GetFirstGroup
      returns = self->GetFirstGroup(str, index);
--- 472,476 ----
      wxString str   = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString));
      // get this
!     wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase);
      // call GetFirstGroup
      returns = self->GetFirstGroup(str, index);
***************
*** 498,502 ****
      wxString str   = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString));
      // get this
!     wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig);
      // call GetFirstEntry
      returns = self->GetFirstEntry(str, index);
--- 498,502 ----
      wxString str   = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString));
      // get this
!     wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase);
      // call GetFirstEntry
      returns = self->GetFirstEntry(str, index);
***************
*** 522,526 ****
      wxString str;
      // get this
!     wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig);
      // call GetNextGroup
      returns = self->GetNextGroup(str, index);
--- 522,526 ----
      wxString str;
      // get this
!     wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase);
      // call GetNextGroup
      returns = self->GetNextGroup(str, index);
***************
*** 546,550 ****
      wxString str;
      // get this
!     wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfig);
      // call GetNextEntry
      returns = self->GetNextEntry(str, index);
--- 546,550 ----
      wxString str;
      // get this
!     wxConfig *self = (wxConfig *)wxlState.GetUserDataType(1, s_wxluatag_wxConfigBase);
      // call GetNextEntry
      returns = self->GetNextEntry(str, index);
***************
*** 2090,2100 ****
      int argCount = lua_gettop(L);
      // int flags = wxDIR_DEFAULT
!     int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(4) : wxDIR_DEFAULT);
      // const wxString& filespec = ""
!     wxString filespec = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxT("")));
      // wxArrayString *files
      wxArrayString files;
      // const wxString& dirname
!     wxString dirname = wxlState.GetwxStringType(2);
      // call GetAllFiles
      returns = wxDir::GetAllFiles(dirname, &files, filespec, flags);
--- 2090,2100 ----
      int argCount = lua_gettop(L);
      // int flags = wxDIR_DEFAULT
!     int flags = (argCount >= 4 ? (int)wxlState.GetNumberType(3) : wxDIR_DEFAULT);
      // const wxString& filespec = ""
!     wxString filespec = (argCount >= 3 ? wxlState.GetwxStringType(2) : wxString(wxT("")));
      // wxArrayString *files
      wxArrayString files;
      // const wxString& dirname
!     wxString dirname = wxlState.GetwxStringType(1);
      // call GetAllFiles
      returns = wxDir::GetAllFiles(dirname, &files, filespec, flags);