wxlua-commit — CVS commits of wxLua

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.42, 1.43 wxldefs.h, 1.18, 1.19 wxlstate.h, 1.71, 1.72

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

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

Modified Files:
	wxlbind.h wxldefs.h wxlstate.h 
Log Message:
Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT
  to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent
Fix %renamed listCtrl:SetItemString to now use overload SetItem
Fix recursion in traversing the base class methods
Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table
Use NULL in bindings for items that are *pointers for clarity
Use sizeof(struct name) instead of sizeof(array[0]) in bindings
Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array


Index: wxldefs.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxldefs.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxldefs.h	5 Jun 2007 21:07:25 -0000	1.18
--- wxldefs.h	6 Jun 2007 23:43:16 -0000	1.19
***************
*** 57,61 ****
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 8
  
  // ----------------------------------------------------------------------------
--- 57,61 ----
  //-----------------------------------------------------------------------------
  
! #define WXLUA_BINDING_VERSION 9
  
  // ----------------------------------------------------------------------------

Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** wxlbind.h	6 Jun 2007 03:53:40 -0000	1.42
--- wxlbind.h	6 Jun 2007 23:43:16 -0000	1.43
***************
*** 30,42 ****
  
  // memory deallocation function, lua's __gc
! WXDLLIMPEXP_WXLUA int LUACALL wxlua_garbageCollect(lua_State *L);
  // lua 'set table' tag method handler, lua's __newindex
! WXDLLIMPEXP_WXLUA int LUACALL wxlua_setTableFunc(lua_State *L);
  // lua 'get table' tag method handler, lua's __index
! WXDLLIMPEXP_WXLUA int LUACALL wxlua_getTableFunc(lua_State *L);
! // If there is a cfunction upvalue, remove 1 value if !only_check
  //   (hack to remove the table lua pushes onto the stack when calling the
! //    __call metatable function)
! WXDLLIMPEXP_WXLUA int wxlua_removetableforcall(lua_State* L, bool only_check = false);
  
  // ----------------------------------------------------------------------------
--- 30,42 ----
  
  // memory deallocation function, lua's __gc
! WXDLLIMPEXP_WXLUA int LUACALL wxluabind_garbageCollect(lua_State *L);
  // lua 'set table' tag method handler, lua's __newindex
! WXDLLIMPEXP_WXLUA int LUACALL wxluabind_setTableFunc(lua_State *L);
  // lua 'get table' tag method handler, lua's __index
! WXDLLIMPEXP_WXLUA int LUACALL wxluabind_getTableFunc(lua_State *L);
! // If there is a special userdata upvalue, remove 1 value if !only_check
  //   (hack to remove the table lua pushes onto the stack when calling the
! //    __call metatable function for class constructors)
! WXDLLIMPEXP_WXLUA int wxluabind_removetableforcall(lua_State* L, bool only_check = false);
  
  // ----------------------------------------------------------------------------
***************
*** 66,70 ****
  extern WXDLLIMPEXP_DATA_WXLUA(wxLuaArgTag) s_wxluaargArray_None[1]; // = {0}
  
! struct WXDLLIMPEXP_WXLUA WXLUAMETHOD_CFUNC // defines a single C func for a LUA method
  {
      lua_CFunction func;    // function that implements the method or property
--- 66,70 ----
  extern WXDLLIMPEXP_DATA_WXLUA(wxLuaArgTag) s_wxluaargArray_None[1]; // = {0}
  
! struct WXDLLIMPEXP_WXLUA wxLuaBindCFunc // defines a single C func for a LUA method
  {
      lua_CFunction func;    // function that implements the method or property
***************
*** 75,86 ****
  };
  
! struct WXDLLIMPEXP_WXLUA WXLUAMETHOD  // defines a LUA method or property
  {
!     int                type;    // wxLuaMethod_Type flags for this method
!                                 //   note each func has own type, this is ored values of them
!     const char        *name;    // name of the method or property
!     WXLUAMETHOD_CFUNC *funcs;   // array of functions for this method
!     int                funcs_n; // number of functions (overloaded > 1) for this method
!     WXLUAMETHOD       *basemethod; // overloaded methods from base class, else NULL
  };
  
--- 75,86 ----
  };
  
! struct WXDLLIMPEXP_WXLUA wxLuaBindMethod  // defines a LUA method or property
  {
!     int             type;        // wxLuaMethod_Type flags for this method
!                                  //   note each func has own type, this is ored values of them
!     const char      *name;       // name of the method or property
!     wxLuaBindCFunc  *funcs;      // array of functions for this method
!     int              funcs_n;    // number of functions (overloaded > 1) for this method
!     wxLuaBindMethod *basemethod; // overloaded methods from base class, else NULL
  };
  
***************
*** 111,115 ****
  
  
! struct WXDLLIMPEXP_WXLUA WXLUADEFINE // defines a wxWidgets define for wxLua
  {
      const char *name;          // name
--- 111,115 ----
  
  
! struct WXDLLIMPEXP_WXLUA wxLuaBindDefine // defines a numeric define for wxLua
  {
      const char *name;          // name
***************
*** 117,123 ****
  };
  
! extern WXDLLIMPEXP_DATA_WXLUA(WXLUADEFINE) s_wxluadefineArray_None[1]; // = {{0,0}}
  
! struct WXDLLIMPEXP_WXLUA WXLUASTRING // defines a wxWidgets string for wxLua
  {
      const char   *name;        // name
--- 117,123 ----
  };
  
! extern WXDLLIMPEXP_DATA_WXLUA(wxLuaBindDefine) s_wxluadefineArray_None[1]; // = {{0,0}}
  
! struct WXDLLIMPEXP_WXLUA wxLuaBindString // defines a wxWidgets string for wxLua
  {
      const char   *name;        // name
***************
*** 125,129 ****
  };
  
! struct WXDLLIMPEXP_WXLUA WXLUAEVENT // defines a wxWidgets Event for wxLua
  {
      const int  *eventType;  // wxWidgets event type, e.g. &wxEVT_COMMAND_MENU_SELECTED
--- 125,129 ----
  };
  
! struct WXDLLIMPEXP_WXLUA wxLuaBindEvent // defines a wxWidgets Event for wxLua
  {
      const int  *eventType;  // wxWidgets event type, e.g. &wxEVT_COMMAND_MENU_SELECTED
***************
*** 132,136 ****
  };
  
! struct WXDLLIMPEXP_WXLUA WXLUAOBJECT // Defines a wxWidgets object or pointer for wxLua
  {
      const char  *name;      // the name of the object or pointer
--- 132,136 ----
  };
  
! struct WXDLLIMPEXP_WXLUA wxLuaBindObject // Defines an object or pointer for wxLua
  {
      const char  *name;      // the name of the object or pointer
***************
*** 140,158 ****
  };
  
! struct WXDLLIMPEXP_WXLUA WXLUACLASS // defines a LUA C++ class interface
  {
!     const char  *name;          // name of the class
!     WXLUAMETHOD *methods;       // pointer to methods for this class
!     int          methods_n;     // number of methods
!     wxClassInfo *pClassInfo;    // pointer to the wxClassInfo associated with this class
!     int         *class_tag;     // lua tag for user data allocated by ourselves
!     const char  *baseclassName; // name of base class
!     WXLUACLASS  *baseclass;     // Pointer to the base class or NULL for none.
!                                 // This member is set after all the bindings are
!                                 // registered since the base class may be from
!                                 // a different module (a library perhaps).
!                                 // See wxLuaBinding::SetBaseClass
!     WXLUADEFINE* enums;         // Class member enums
!     int          enums_n;       // number of enums
  };
  
--- 140,159 ----
  };
  
! struct WXDLLIMPEXP_WXLUA wxLuaBindClass // defines a LUA C++ class interface
  {
!     const char      *name;          // name of the class
!     wxLuaBindMethod *methods;       // pointer to methods for this class
!     int              methods_n;     // number of methods
!     wxClassInfo     *pClassInfo;    // pointer to the wxClassInfo associated with this class
!     int             *class_tag;     // lua tag for user data allocated by ourselves
!     const char      *baseclassName; // name of base class
!     wxLuaBindClass  *baseclass;     // Pointer to the base class or NULL for none.
!                                     // This member is set after all the bindings are
!                                     // registered since the base class may be from
!                                     // a different module (a library perhaps).
!                                     // See wxLuaBinding::SetBaseClass
! 
!     wxLuaBindDefine* enums;         // Class member enums
!     int              enums_n;       // number of enums
  };
  
***************
*** 164,168 ****
  {
  public:
!     wxLuaFunction(WXLUAMETHOD *wxlMethod, WXLUACLASS *wxlClass, void *pObject)
          : m_wxlMethod(wxlMethod), m_wxlClass(wxlClass), m_pObject(pObject) {}
  
--- 165,169 ----
  {
  public:
!     wxLuaFunction(wxLuaBindMethod *wxlMethod, wxLuaBindClass *wxlClass, void *pObject)
          : m_wxlMethod(wxlMethod), m_wxlClass(wxlClass), m_pObject(pObject) {}
  
***************
*** 172,178 ****
      void *GetObject() const { return m_pObject; }
  
!     WXLUAMETHOD *m_wxlMethod;
!     WXLUACLASS  *m_wxlClass;
!     void        *m_pObject;
  };
  
--- 173,179 ----
      void *GetObject() const { return m_pObject; }
  
!     wxLuaBindMethod *m_wxlMethod;
!     wxLuaBindClass  *m_wxlClass;
!     void            *m_pObject;
  };
  
***************
*** 338,375 ****
      void SetLuaNamespace(const wxString& nameSpace) { m_nameSpace = nameSpace; }
  
!     size_t GetLuaClassCount() const { return m_classCount; }
!     WXLUACLASS* GetLuaClassList() { return m_classList; }
  
!     size_t GetLuaDefineCount() const { return m_defineCount; }
!     WXLUADEFINE* GetLuaDefineList() { return m_defineList; }
  
!     size_t GetLuaStringCount() const { return m_stringCount; }
!     WXLUASTRING* GetLuaStringList() { return m_stringList; }
  
!     size_t GetLuaEventCount() { return m_eventCount; }
!     WXLUAEVENT* GetLuaEventList() { return m_eventList; }
  
!     size_t GetLuaObjectCount() { return m_objectCount; }
!     WXLUAOBJECT* GetLuaObjectList() { return m_objectList; }
  
!     size_t GetLuaFunctionCount() { return m_functionCount; }
!     WXLUAMETHOD* GetLuaFunctionList() { return m_functionList; }
  
      bool IsTag(int tag) { return (tag >= m_startTag) && (tag <= m_lastTag); }
  
!     // Look for the base class of the input WXLUACLASS in this binding using the
!     //   baseclassName of the input and if found, set the WXLUACLASS::baseclass
      //   member of the input.
!     bool SetBaseClass(WXLUACLASS *pClass);
  
!     // Find the WXLUAEVENT with the wxEventType, returns NULL if not found.
!     const WXLUAEVENT* GetEvent(wxEventType eventType) const;
      // Look up the event type name as a string, from the wxEventType number
!     //  in the WXLUAEVENT* struct list of this binding.
      wxString GetEventTypeName(wxEventType eventType) const;
!     // Get the first WXLUACLASS that has this WXLUAMETHOD
!     const WXLUACLASS* GetLuaClass(const WXLUAMETHOD* wxlMethod) const;
!     // Get the first WXLUACLASS that has this WXLAMETHOD_CFUNC
!     const WXLUACLASS* GetLuaClass(const WXLUAMETHOD_CFUNC* wxlMethod_cfunc) const;
      // Get all the bindings that were initialized using the generated binding
      //   function wxLuaBinding_[binding name]_init().
--- 339,376 ----
      void SetLuaNamespace(const wxString& nameSpace) { m_nameSpace = nameSpace; }
  
!     size_t GetClassCount() const { return m_classCount; }
!     wxLuaBindClass* GetClassArray() { return m_classArray; }
  
!     size_t GetDefineCount() const { return m_defineCount; }
!     wxLuaBindDefine* GetDefineArray() { return m_defineArray; }
  
!     size_t GetStringCount() const { return m_stringCount; }
!     wxLuaBindString* GetStringArray() { return m_stringArray; }
  
!     size_t GetEventCount() { return m_eventCount; }
!     wxLuaBindEvent* GetEventArray() { return m_eventArray; }
  
!     size_t GetObjectCount() { return m_objectCount; }
!     wxLuaBindObject* GetObjectArray() { return m_objectArray; }
  
!     size_t GetFunctionCount() { return m_functionCount; }
!     wxLuaBindMethod* GetFunctionArray() { return m_functionArray; }
  
      bool IsTag(int tag) { return (tag >= m_startTag) && (tag <= m_lastTag); }
  
!     // Look for the base class of the input wxLuaBindClass in this binding using the
!     //   baseclassName of the input and if found, set the wxLuaBindClass::baseclass
      //   member of the input.
!     bool SetBaseClass(wxLuaBindClass *pClass);
  
!     // Find the wxLuaBindEvent with the wxEventType, returns NULL if not found.
!     const wxLuaBindEvent* GetEvent(wxEventType eventType) const;
      // Look up the event type name as a string, from the wxEventType number
!     //  in the wxLuaBindEvent* struct list of this binding.
      wxString GetEventTypeName(wxEventType eventType) const;
!     // Get the first wxLuaBindClass that has this wxLuaBindMethod
!     const wxLuaBindClass* GetLuaClass(const wxLuaBindMethod* wxlMethod) const;
!     // Get the first wxLuaBindClass that has this wxLuaBindCFunc
!     const wxLuaBindClass* GetLuaClass(const wxLuaBindCFunc* wxlMethod_cfunc) const;
      // Get all the bindings that were initialized using the generated binding
      //   function wxLuaBinding_[binding name]_init().
***************
*** 389,404 ****
  
      // binding objects
!     size_t       m_classCount;
!     WXLUACLASS*  m_classList;
!     size_t       m_defineCount;
!     WXLUADEFINE* m_defineList;
!     size_t       m_stringCount;
!     WXLUASTRING* m_stringList;
!     size_t       m_eventCount;
!     WXLUAEVENT*  m_eventList;
!     size_t       m_objectCount;
!     WXLUAOBJECT* m_objectList;
!     size_t       m_functionCount;
!     WXLUAMETHOD* m_functionList;
  
      wxString m_bindingName;     // A unique name of the binding
--- 390,405 ----
  
      // binding objects
!     size_t           m_classCount;
!     wxLuaBindClass*  m_classArray;
!     size_t           m_defineCount;
!     wxLuaBindDefine* m_defineArray;
!     size_t           m_stringCount;
!     wxLuaBindString* m_stringArray;
!     size_t           m_eventCount;
!     wxLuaBindEvent*  m_eventArray;
!     size_t           m_objectCount;
!     wxLuaBindObject* m_objectArray;
!     size_t           m_functionCount;
!     wxLuaBindMethod* m_functionArray;
  
      wxString m_bindingName;     // A unique name of the binding

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** wxlstate.h	6 Jun 2007 18:03:48 -0000	1.71
--- wxlstate.h	6 Jun 2007 23:43:16 -0000	1.72
***************
*** 150,165 ****
  
  // Push the "wxLuaClasses" string onto the stack. This is the name of a
! // table in the LUA_REGISTRYINDEX that is t[WXLUACLASS.name] = WXLUACLASS
! // where the WXLUACLASS is a lightuserdata.
  #define wxlua_pushstring_wxLuaClasses(L) lua_pushlstring(L, "wxLuaClasses", 12)
  
  
  // Verify if the luatype = lua_type(L, stack_idx) is valid for the 
! // wxluaarg_type which is one of the predefined WXLUAARG_XXX or s_wxluaarg_XXX types.
! // Returns 1 if it matches, 0 if it doesn't, -1 if the wxluaarg_type is not known.
! WXDLLIMPEXP_WXLUA int LUACALL wxlua_iswxluatype(int luatype, int wxluaarg_type);
! // Get a human readable name for the predefined WXLUAARG_XXX or s_wxluaarg_XXX types.
  //  returns empty string if the tag was not one of the predefined types.
! WXDLLIMPEXP_WXLUA wxString wxlua_getwxluatypename(int wxluaarg_type);
  
  // Helper functions to get numbers, booleans and strings safer.
--- 150,165 ----
  
  // Push the "wxLuaClasses" string onto the stack. This is the name of a
! // table in the LUA_REGISTRYINDEX that is t[wxLuaBindClass.name] = wxLuaBindClass
! // where the wxLuaBindClass is a lightuserdata.
  #define wxlua_pushstring_wxLuaClasses(L) lua_pushlstring(L, "wxLuaClasses", 12)
  
  
  // Verify if the luatype = lua_type(L, stack_idx) is valid for the 
! // wxluaarg_tag which is one of the predefined WXLUAARG_XXX or s_wxluaarg_XXX types.
! // Returns 1 if it matches, 0 if it doesn't, -1 if the wxluaarg_tag is not known.
! WXDLLIMPEXP_WXLUA int LUACALL wxlua_iswxluatype(int luatype, int wxluaarg_tag);
! // Get a human readable name for the predefined WXLUAARG_XXX or s_wxluaarg_XXX tags.
  //  returns empty string if the tag was not one of the predefined types.
! WXDLLIMPEXP_WXLUA wxString wxlua_getwxluatypename(int wxluaarg_tag);
  
  // Helper functions to get numbers, booleans and strings safer.
***************
*** 486,506 ****
      wxLuaBinding* GetLuaBinding(const wxString& bindingName) const;
  
!     // Get WXLUACLASS for given lua Tag using WXLUACLASS::class_tag,
      //   returns NULL on failure.
!     const WXLUACLASS* GetLuaClass(int iClassTag) const;
!     // Get WXLUACLASS for given class name using WXLUACLASS::name,
      //   returns NULL on failure.
!     const WXLUACLASS* GetLuaClass(const char* className) const;
!     // Get the first WXLUACLASS that has this particular WXLUAMETHOD
!     const WXLUACLASS* GetLuaClass(const WXLUAMETHOD* method) const;
!     // Get the first WXLUACLASS that has this particular WXLUAMETHOD_CFUNC in it's methods
!     const WXLUACLASS* GetLuaClass(const WXLUAMETHOD_CFUNC* method_cfunc) const;
      // returns true if iClassTag is derived or equal to iBaseClassTag by using
!     //   WXLUACLASS::class_tag and WXLUACLASS::baseclass_tag.
      //   returns NULL on failure.
      bool IsDerivedClass(int iClassTag, int iBaseClassTag) const;
!     // Get WXLUAEVENT for given wxEventType (wxEvent::GetEventType()) by finding
!     //   the matching WXLUAEVENT::eventType.
!     const WXLUAEVENT* GetLuaEvent(wxEventType eventType) const;
  
      // Get the binding list used to initialize this class
--- 486,506 ----
      wxLuaBinding* GetLuaBinding(const wxString& bindingName) const;
  
!     // Get wxLuaBindClass for given lua Tag using wxLuaBindClass::class_tag,
      //   returns NULL on failure.
!     const wxLuaBindClass* GetLuaClass(int iClassTag) const;
!     // Get wxLuaBindClass for given class name using wxLuaBindClass::name,
      //   returns NULL on failure.
!     const wxLuaBindClass* GetLuaClass(const char* className) const;
!     // Get the first wxLuaBindClass that has this particular wxLuaBindMethod
!     const wxLuaBindClass* GetLuaClass(const wxLuaBindMethod* method) const;
!     // Get the first wxLuaBindClass that has this particular wxLuaBindCFunc in it's methods
!     const wxLuaBindClass* GetLuaClass(const wxLuaBindCFunc* method_cfunc) const;
      // returns true if iClassTag is derived or equal to iBaseClassTag by using
!     //   wxLuaBindClass::class_tag and wxLuaBindClass::baseclass_tag.
      //   returns NULL on failure.
      bool IsDerivedClass(int iClassTag, int iBaseClassTag) const;
!     // Get wxLuaBindEvent for given wxEventType (wxEvent::GetEventType()) by finding
!     //   the matching wxLuaBindEvent::eventType.
!     const wxLuaBindEvent* GetLuaEvent(wxEventType eventType) const;
  
      // Get the binding list used to initialize this class
***************
*** 673,690 ****
      wxString GetLuaTagName(int tag) const;
  
!     // Lookup a lua method or get property called cpIndex in the WXLUACLASS array pClass
      // Ensure that the lookup is of the required type. If the lua method
      // can not be found on the current class recurse through base classes
!     // Return a pointer to the WXLUAMETHOD that corresponds to the method name,
      // else return NULL;
!     // Set isProperty to true if a property is found else it is a method.
!     WXLUAMETHOD* GetLuaMethod(const WXLUACLASS *wxlClass, const char *methodName);
!     // Lookup a lua property function named cpIndex in the WXLUACLASS pClass
      // Ensure that the lookup is of the required type. If the lua property
      // can not be found on the current class recurse through base classes
!     // Return a pointer to the WXLUAMETHOD that corresponds to the property name,
      // else return NULL;
      // Find 'Set' properties if isLuaSetProp else return 'WXLUAMETHOD_GETPROP' property
!     WXLUAMETHOD* GetLuaProperty(const WXLUACLASS *wxlClass, const char *propName, bool isLuaSetProp);
  
      // Is there a derived method given an object and and a method name.
--- 673,689 ----
      wxString GetLuaTagName(int tag) const;
  
!     // Lookup a lua method or get property called cpIndex in the wxLuaBindClass array pClass
      // Ensure that the lookup is of the required type. If the lua method
      // can not be found on the current class recurse through base classes
!     // Return a pointer to the wxLuaBindMethod that corresponds to the method name,
      // else return NULL;
!     wxLuaBindMethod* GetLuaMethod(const wxLuaBindClass *wxlClass, const char *methodName, bool search_baseclasses = true);
!     // Lookup a lua property function named cpIndex in the wxLuaBindClass pClass
      // Ensure that the lookup is of the required type. If the lua property
      // can not be found on the current class recurse through base classes
!     // Return a pointer to the wxLuaBindMethod that corresponds to the property name,
      // else return NULL;
      // Find 'Set' properties if isLuaSetProp else return 'WXLUAMETHOD_GETPROP' property
!     wxLuaBindMethod* GetLuaProperty(const wxLuaBindClass *wxlClass, const char *propName, bool isLuaSetProp);
  
      // Is there a derived method given an object and and a method name.
***************
*** 911,917 ****
  
      // Return a human readable string of the args for the functions in the method
!     wxArrayString CreateMethodArgTagsMsg(struct WXLUAMETHOD* method);
      // overloaded function call helper
! 	int LUACALL CallOverloadedFunction(struct WXLUAMETHOD* method);
  
      // -----------------------------------------------------------------------
--- 910,916 ----
  
      // Return a human readable string of the args for the functions in the method
!     wxArrayString CreateMethodArgTagsMsg(struct wxLuaBindMethod* method);
      // overloaded function call helper
! 	int LUACALL CallOverloadedFunction(struct wxLuaBindMethod* method);
  
      // -----------------------------------------------------------------------

[Wxlua-commit] wxLua/modules/wxluasocket/include wxluasocket_bind.h, 1.16, 1.17

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

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv4156/wxLua/modules/wxluasocket/include

Modified Files:
	wxluasocket_bind.h 
Log Message:
Rename structs WXLUACLASS, WXLUAMETHOD, WXLUADEFINE, WXLUASTRING, WXLUAEVENT
  to wxLuaBindClass, wxLuaBindMethod, wxLuaBindDefine, wxLuaBindString, wxLuaBindEvent
Fix %renamed listCtrl:SetItemString to now use overload SetItem
Fix recursion in traversing the base class methods
Add IntArray_FromLuaTable for binding generator to do (int n, int* items) from a table
Use NULL in bindings for items that are *pointers for clarity
Use sizeof(struct name) instead of sizeof(array[0]) in bindings
Rename wxLuaBinding GetLuaClassList to just GetClassArray since it's a C array


Index: wxluasocket_bind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxluasocket_bind.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** wxluasocket_bind.h	5 Jun 2007 21:07:25 -0000	1.16
--- wxluasocket_bind.h	6 Jun 2007 23:43:17 -0000	1.17
***************
*** 27,33 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 8
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 8
  // ---------------------------------------------------------------------------
  
--- 27,33 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 9
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 9
  // ---------------------------------------------------------------------------
  
***************
*** 68,79 ****
  
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerEvent;
! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount;
! extern WXDLLIMPEXP_WXLUASOCKET WXLUADEFINE wxLuaDebuggerEvent_enums[];
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_enumCount;
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerServer;
! extern WXDLLIMPEXP_WXLUASOCKET WXLUAMETHOD wxLuaDebuggerServer_methods[];
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount;
! extern WXDLLIMPEXP_WXLUASOCKET WXLUADEFINE wxLuaDebuggerServer_enums[];
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_enumCount;
  
--- 68,79 ----
  
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerEvent;
! extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerEvent_methods[];
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_methodCount;
! extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindDefine wxLuaDebuggerEvent_enums[];
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerEvent_enumCount;
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) s_wxluatag_wxLuaDebuggerServer;
! extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindMethod wxLuaDebuggerServer_methods[];
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_methodCount;
! extern WXDLLIMPEXP_WXLUASOCKET wxLuaBindDefine wxLuaDebuggerServer_enums[];
  extern WXDLLIMPEXP_DATA_WXLUASOCKET(int) wxLuaDebuggerServer_enumCount;
  

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.63, 1.64 wxlstate.cpp, 1.101, 1.102

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp 
Log Message:
Fix %property generation on the fly
Remove remaining extra code in wxLuaState::CallOverloadedFunction


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** wxlstate.cpp	6 Jun 2007 15:20:16 -0000	1.101
--- wxlstate.cpp	6 Jun 2007 18:03:48 -0000	1.102
***************
*** 50,70 ****
  wxLuaState wxNullLuaState(false);
  
- wxString wxLua_getSourceLine(lua_State *L)
- {
-     wxString msg;
-     lua_Debug luaDebug = INIT_LUA_DEBUG;
- 
-     if (lua_getinfo(L, "Sln", &luaDebug))
-     {
-         wxString name = lua2wx(luaDebug.name);
-         wxString source = lua2wx(luaDebug.source);
-         int line = luaDebug.currentline;
- 
-         msg = wxString::Format(wxT("%s %s: (%d)"), name.c_str(), source.c_str(), line);
-     }
- 
-     return msg;
- }
- 
  // ----------------------------------------------------------------------------
  // C functions for lua used in wxLuaState
--- 50,53 ----
***************
*** 553,557 ****
      }    
  
!     return wxT("unknown");
  }
  
--- 536,540 ----
      }    
  
!     return wxEmptyString;
  }
  
***************
*** 2407,2410 ****
--- 2390,2396 ----
      wxCHECK_MSG(Ok(), wxEmptyString, wxT("Invalid wxLuaState"));
  
+     if (tag <= 0)
+         return wxlua_getwxluatypename(tag);
+ 
      if (tag == M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL)
          return wxT("NULL");
***************
*** 3274,3280 ****
      wxCHECK_MSG(wxlMethod, overloadMethodArray, wxT("Invalid method table"));
  
      WXLUAMETHOD* method = wxlMethod;
-     int i_func = 0;
  
      while (method)
      {
--- 3260,3267 ----
      wxCHECK_MSG(wxlMethod, overloadMethodArray, wxT("Invalid method table"));
  
+     int i_func = 0; // count total number of overloads
      WXLUAMETHOD* method = wxlMethod;
  
+     // traverse the methods down the baseclass methods if any
      while (method)
      {
***************
*** 3289,3293 ****
          for (i = 0; i < funcs_count; i++)
          {
!             i_func++; // only count the non overload functions
  
              wxString fnOverload = wxString::Format(wxT("%02d. %s%s("), i_func, className.c_str(), lua2wx(method->name).c_str());
--- 3276,3280 ----
          for (i = 0; i < funcs_count; i++)
          {
!             i_func++;
  
              wxString fnOverload = wxString::Format(wxT("%02d. %s%s("), i_func, className.c_str(), lua2wx(method->name).c_str());
***************
*** 3296,3300 ****
              if (WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_OVERLOAD))
              {
!                 // we do print that there is an overload so that in CallOverloadedFunction
                  // we can find what function we were closest too.
                  fnOverload += wxT(" ... ) - overloaded function");
--- 3283,3287 ----
              if (WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_OVERLOAD))
              {
!                 // However, we do print that there is an overload so that in CallOverloadedFunction
                  // we can find what function we were closest too.
                  fnOverload += wxT(" ... ) - overloaded function");
***************
*** 3313,3329 ****
                      int tag = (int)*(funcs[i].argtags[arg]);
  
!                     if (tag < 0)
!                     {
!                         fnOverload += wxlua_getwxluatypename(tag);
!                     }
!                     else
!                     {
!                         fnOverload += GetLuaTagName(tag);
!                         if ((arg == 0) && 
!                             !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_STATIC) &&
!                             !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_CONSTRUCTOR) &&
!                             !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_CFUNCTION))
!                             fnOverload += wxT("(self)");
!                     }
                  }
  
--- 3300,3310 ----
                      int tag = (int)*(funcs[i].argtags[arg]);
  
!                     fnOverload += GetLuaTagName(tag);
!                         
!                     if ((arg == 0) && 
!                         !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_STATIC) &&
!                         !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_CONSTRUCTOR) &&
!                         !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_CFUNCTION))
!                         fnOverload += wxT("(self)");
                  }
  
***************
*** 3352,3364 ****
      wxCHECK_MSG(wxlMethod, 0, wxT("Invalid overloaded method table"));
  
!     int i, arg;
!     int invalidArg = -1;
! 
!     // do nothing
!     if (!wxlMethod || (wxlMethod->funcs_n < 1))
!         return 0;
! 
      bool remove_table = wxlua_removetableforcall(GetLuaState(), true);
  
      // get number of arguments called from lua
      int argCount = lua_GetTop();
--- 3333,3342 ----
      wxCHECK_MSG(wxlMethod, 0, wxT("Invalid overloaded method table"));
  
!     // don't remove the table, but do skip past it when counting args
      bool remove_table = wxlua_removetableforcall(GetLuaState(), true);
  
+     int i, arg;
+     int invalidArg = 0;
+ 
      // get number of arguments called from lua
      int argCount = lua_GetTop();
***************
*** 3371,3410 ****
      }
  
! /*
!     // prepare overload function table
!     WXLUAMETHOD** overloadFunctionTable = new WXLUAMETHOD*[overloadedMethodCount];
!     for (i = 0; i < overloadedMethodCount; i++)
!     {
!         if ((maxargs == -1) || (maxargs < *overloadedMethods[i].args[1]))
!             maxargs = *overloadedMethods[i].args[1];
! 
!         if ((minargs == -1) || (minargs > *overloadedMethods[i].args[0]))
!             minargs = *overloadedMethods[i].args[0];
! 
!         overloadFunctionTable[i] = (overloadedMethods+i);
!     }
! 
! #if !defined(WXLUA_OVERLOAD_SORTED)
!     // sort overload on the fly to get proper function selection
!     // order by minargs DESC, maxargs DESC
!     for (i = 0; i < overloadedMethodCount; i++)
!     {
!         for (j = i + 1; j < overloadedMethodCount; j++)
!         {
!             if ((*overloadFunctionTable[j]->args[0] >  *overloadFunctionTable[i]->args[0]) ||
!                 (*overloadFunctionTable[j]->args[0] == *overloadFunctionTable[i]->args[0]) &&
!                 (*overloadFunctionTable[j]->args[1] >  *overloadFunctionTable[i]->args[1]))
!             {
!                 // swap order
!                 WXLUAMETHOD* swap = overloadFunctionTable[i];
!                 overloadFunctionTable[i] = overloadFunctionTable[j];
!                 overloadFunctionTable[j] = swap;
!             }
!         }
!     }
! #endif
! */
! 
!     // only look at the methods that could possibly work
      wxArrayPtrVoid funcArray;
      WXLUAMETHOD* method = wxlMethod;
--- 3349,3353 ----
      }
  
!     // only look at the methods that could possibly work and traverse base classes
      wxArrayPtrVoid funcArray;
      WXLUAMETHOD* method = wxlMethod;
***************
*** 3428,3439 ****
  
      // Look at the available functions in parallel, per arg
!     for (arg = 0; arg < argCount; arg++)
      {
-         if (funcArray.GetCount() == 0u)
-         {
-             arg--;
-             break;
-         }
- 
          int arg_lua = arg+1+lua_argStart; // arg N in lua
          int ltype = lua_Type(arg_lua);
--- 3371,3376 ----
  
      // Look at the available functions in parallel, per arg
!     for (arg = 0; (arg < argCount) && (funcArray.GetCount() != 0); arg++)
      {
          int arg_lua = arg+1+lua_argStart; // arg N in lua
          int ltype = lua_Type(arg_lua);
***************
*** 3443,3446 ****
--- 3380,3384 ----
              WXLUAMETHOD_CFUNC* func = (WXLUAMETHOD_CFUNC*)funcArray[i];
              bestFunc = func;
+             invalidArg = arg;
  
              int arg_wxlua = arg;              // arg N in wxLuaArgTag
***************
*** 3449,3453 ****
              if (!func->argtags[arg_wxlua])
              {
-                 // this one won't work, try the next
                  funcArray.RemoveAt(i); 
                  i--;
--- 3387,3390 ----
***************
*** 3462,3465 ****
--- 3399,3403 ----
              // Does the lua type match the wxlua arg tag type 
              int is_ok = wxlua_iswxluatype(ltype, tag);
+ 
              // unknown standard wxlua arg type, check binding tag
              if (is_ok == -1)
***************
*** 3480,3483 ****
--- 3418,3423 ----
  
      // If there was a function that matched run it, if > 1 ??? 
+     // Note that the top function is the one that is highest in the
+     // derived functions from any baseclasses and should be the best choice.
      if (funcArray.GetCount() > 0)
      {
***************
*** 3488,3504 ****
      }
  
-     if (invalidArg < arg)
-         invalidArg = arg;
- 
- 
      lua_Debug ar;
      lua_GetStack(0, &ar);
      lua_GetInfo("n", &ar);
- 
      wxString name = lua2wx(ar.name);
  
-     //
      // Build an error message
-     //
      wxString fnCall = name + wxT("(");
      for (arg = 0; arg < argCount; arg++)
--- 3428,3437 ----
***************
*** 3509,3544 ****
          int ltype = lua_Type(arg+1+lua_argStart);
  
!         if (ltype == LUA_TBOOLEAN)
!         {
!             fnCall += wxT("boolean");
!         }
!         else if (ltype == LUA_TNUMBER)
!         {
!             fnCall += wxT("number");
!         }
!         else if (ltype == LUA_TSTRING)
!         {
!             fnCall += wxT("string");
!         }
!         else if (ltype == LUA_TNIL)
!         {
!             fnCall += wxT("nil");
!         }
!         else if (ltype == LUA_TNONE)
!         {
!             fnCall += wxT("none");
!         }
!         else if (lua_IsTable(arg+1+lua_argStart))
!         {
!             fnCall += wxT("luatable");
!         }
!         else if (lua_IsLightUserData(arg+1+lua_argStart))
          {
!             fnCall += wxT("lightuserdata");
!         }
          else
          {
              int tag = ttag(arg+1+lua_argStart);
- 
              fnCall += GetLuaTagName(tag);
          }
--- 3442,3452 ----
          int ltype = lua_Type(arg+1+lua_argStart);
  
!         if (ltype != LUA_TUSERDATA)
          {
!             fnCall += lua_TypeName(ltype);
!         }        
          else
          {
              int tag = ttag(arg+1+lua_argStart);
              fnCall += GetLuaTagName(tag);
          }
***************
*** 3552,3556 ****
          fnOverloadList += overloadMethodArray[i] + wxT("\n");
  
- 
      wxString errmsg;
  
--- 3460,3463 ----
***************
*** 3564,3570 ****
      else
      {
          method = wxlMethod;
          int i_func = 0;
!         while (method)
          {
              for (i = 0; i < method->funcs_n; ++i)
--- 3471,3479 ----
      else
      {
+         // we have to count the methods that are displayed to find the one that failed
          method = wxlMethod;
          int i_func = 0;
!         bool found = false;
!         while (method && !found)
          {
              for (i = 0; i < method->funcs_n; ++i)
***************
*** 3572,3576 ****
--- 3481,3488 ----
                  i_func++;
                  if (&method->funcs[i] == bestFunc)
+                 {
+                     found = true;
                      break;
+                 }
              }
          

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** wxlbind.cpp	6 Jun 2007 03:53:40 -0000	1.63
--- wxlbind.cpp	6 Jun 2007 18:03:48 -0000	1.64
***************
*** 415,419 ****
  
                  wxlMethod = wxlState.GetLuaMethod(wxlClass, str);
!                 if ((wxlMethod != NULL) && (wxlMethod->type == WXLUAMETHOD_METHOD))
                      //wxlMethod->funcs && (wxlMethod->funcs->minargs == 0) &&
                      //(wxlMethod->funcs->maxargs == 0))
--- 415,420 ----
  
                  wxlMethod = wxlState.GetLuaMethod(wxlClass, str);
! 
!                 if ((wxlMethod != NULL) && WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_METHOD))
                      //wxlMethod->funcs && (wxlMethod->funcs->minargs == 0) &&
                      //(wxlMethod->funcs->maxargs == 0))
***************
*** 486,490 ****
  
              wxlMethod = wxlState.GetLuaMethod(wxlClass, str);
!             if ((wxlMethod != NULL) && (wxlMethod->type == WXLUAMETHOD_METHOD))
              {
                  found = true;
--- 487,491 ----
  
              wxlMethod = wxlState.GetLuaMethod(wxlClass, str);
!             if ((wxlMethod != NULL) && WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_METHOD))
              {
                  found = true;

[Wxlua-commit] wxLua/modules/wxlua/include wxlstate.h,1.70,1.71

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

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

Modified Files:
	wxlstate.h 
Log Message:
Fix %property generation on the fly
Remove remaining extra code in wxLuaState::CallOverloadedFunction


Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** wxlstate.h	6 Jun 2007 03:53:40 -0000	1.70
--- wxlstate.h	6 Jun 2007 18:03:48 -0000	1.71
***************
*** 160,164 ****
  WXDLLIMPEXP_WXLUA int LUACALL wxlua_iswxluatype(int luatype, int wxluaarg_type);
  // Get a human readable name for the predefined WXLUAARG_XXX or s_wxluaarg_XXX types.
! //  returns "unknown" if the tag was not one of the predefined types.
  WXDLLIMPEXP_WXLUA wxString wxlua_getwxluatypename(int wxluaarg_type);
  
--- 160,164 ----
  WXDLLIMPEXP_WXLUA int LUACALL wxlua_iswxluatype(int luatype, int wxluaarg_type);
  // Get a human readable name for the predefined WXLUAARG_XXX or s_wxluaarg_XXX types.
! //  returns empty string if the tag was not one of the predefined types.
  WXDLLIMPEXP_WXLUA wxString wxlua_getwxluatypename(int wxluaarg_type);
  
***************
*** 669,672 ****
--- 669,673 ----
  
      // Returns the 'name' of a lua userdata object from its tag.
+     // Also handles predefined wxLua arg tags, see wxlua_getwxluatypename
      //   returns wxEmptyString on failure.
      wxString GetLuaTagName(int tag) const;

[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());
      }
  

[Wxlua-commit] wxLua/docs wxlua.html,1.19,1.20

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

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

Modified Files:
	wxlua.html 
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: wxlua.html
===================================================================
RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxlua.html	31 May 2007 17:18:47 -0000	1.19
--- wxlua.html	6 Jun 2007 15:20:15 -0000	1.20
***************
*** 1,14 ****
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html>
! <head>
  
    <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
!   <title>wxLua Documentation</title>
! 
  
-   <meta content="John Labenski" name="author">
- 
- </head>
  
  
  <body>
--- 1,10 ----
  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html><head>
  
    <meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
!   
  
  
+   <title>wxLua Documentation</title><meta content="John Labenski" name="author"></head>
  
  <body>
***************
*** 1126,1130 ****
  
          <li>Example : <i>f = wx.wxFileName('dummy');
! f:GetCwd() == wx.wxFileName.GetCwd()</i></li>
  
        </ul>
--- 1122,1126 ----
  
          <li>Example : <i>f = wx.wxFileName('dummy');
! f.GetCwd() == wx.wxFileName.GetCwd()</i></li>
  
        </ul>
***************
*** 2418,2421 ****
  </ul>
  
! </body>
! </html>
--- 2414,2416 ----
  </ul>
  
! </body></html>
\ No newline at end of file

[Wxlua-commit] wxLua/modules/wxbind/src windows.cpp,1.50,1.51

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

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

Modified Files:
	windows.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: windows.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** windows.cpp	6 Jun 2007 03:53:38 -0000	1.50
--- windows.cpp	6 Jun 2007 15:20:15 -0000	1.51
***************
*** 3373,3382 ****
  
  #if wxLUA_USE_wxPointSizeRect
! static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSize4[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxRect, 0 };
! static int LUACALL wxLua_wxWindow_SetSize4(lua_State *L);
! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxWindow_SetSize4[1] = {{ wxLua_wxWindow_SetSize4, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetSize4 }};
  
  //     virtual void SetSize(const wxRect& rect)
! static int LUACALL wxLua_wxWindow_SetSize4(lua_State *L)
  {
      wxLuaState wxlState(L);
--- 3373,3382 ----
  
  #if wxLUA_USE_wxPointSizeRect
! static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSize3[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxRect, 0 };
! static int LUACALL wxLua_wxWindow_SetSize3(lua_State *L);
! // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxWindow_SetSize3[1] = {{ wxLua_wxWindow_SetSize3, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetSize3 }};
  
  //     virtual void SetSize(const wxRect& rect)
! static int LUACALL wxLua_wxWindow_SetSize3(lua_State *L)
  {
      wxLuaState wxlState(L);
***************
*** 3459,3490 ****
  }
  
- static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSize3[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
- static int LUACALL wxLua_wxWindow_SetSize3(lua_State *L);
- // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxWindow_SetSize3[1] = {{ wxLua_wxWindow_SetSize3, WXLUAMETHOD_METHOD, 5, 6, s_wxluatagArray_wxLua_wxWindow_SetSize3 }};
- 
- //     virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO)
- static int LUACALL wxLua_wxWindow_SetSize3(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     // get number of arguments
-     int argCount = lua_gettop(L);
-     // int sizeFlags = wxSIZE_AUTO
-     int sizeFlags = (argCount >= 6 ? (int)wxlua_getnumbertype(L, 6) : wxSIZE_AUTO);
-     // int height
-     int height = (int)wxlua_getnumbertype(L, 5);
-     // int width
-     int width = (int)wxlua_getnumbertype(L, 4);
-     // int y
-     int y = (int)wxlua_getnumbertype(L, 3);
-     // int x
-     int x = (int)wxlua_getnumbertype(L, 2);
-     // get this
-     wxWindow * self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow);
-     // call SetSize
-     self->SetSize(x, y, width, height, sizeFlags);
- 
-     return 0;
- }
- 
  
  #if wxLUA_USE_wxPointSizeRect
--- 3459,3462 ----
***************
*** 4282,4286 ****
  
  #if wxLUA_USE_wxPointSizeRect
!     { wxLua_wxWindow_SetSize4, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetSize4 },
  #endif // wxLUA_USE_wxPointSizeRect
  
--- 4254,4258 ----
  
  #if wxLUA_USE_wxPointSizeRect
!     { wxLua_wxWindow_SetSize3, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxWindow_SetSize3 },
  #endif // wxLUA_USE_wxPointSizeRect
  
***************
*** 4290,4294 ****
      { wxLua_wxWindow_SetSize, WXLUAMETHOD_METHOD, 5, 6, s_wxluatagArray_wxLua_wxWindow_SetSize },
      { wxLua_wxWindow_SetSize1, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxWindow_SetSize1 },
-     { wxLua_wxWindow_SetSize3, WXLUAMETHOD_METHOD, 5, 6, s_wxluatagArray_wxLua_wxWindow_SetSize3 },
  };
  static int s_wxluafunc_wxLua_wxWindow_SetSize_overload_count = sizeof(s_wxluafunc_wxLua_wxWindow_SetSize_overload)/sizeof(s_wxluafunc_wxLua_wxWindow_SetSize_overload[0]);
--- 4262,4265 ----
***************
*** 6047,6069 ****
  }
  
- static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBaseEvent_GetSelection[] = { &s_wxluatag_wxBookCtrlBaseEvent, 0 };
- static int LUACALL wxLua_wxBookCtrlBaseEvent_GetSelection(lua_State *L);
- static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBookCtrlBaseEvent_GetSelection[1] = {{ wxLua_wxBookCtrlBaseEvent_GetSelection, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxBookCtrlBaseEvent_GetSelection }};
- 
- //     int GetSelection() const
- static int LUACALL wxLua_wxBookCtrlBaseEvent_GetSelection(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     int returns;
-     // get this
-     wxBookCtrlBaseEvent * self = (wxBookCtrlBaseEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxBookCtrlBaseEvent);
-     // call GetSelection
-     returns = self->GetSelection();
-     // push the result number
-     lua_pushnumber(L, returns);
- 
-     return 1;
- }
- 
  static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBaseEvent_SetOldSelection[] = { &s_wxluatag_wxBookCtrlBaseEvent, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxBookCtrlBaseEvent_SetOldSelection(lua_State *L);
--- 6018,6021 ----
***************
*** 6139,6143 ****
      { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_Delete, 1, 0 },
      { WXLUAMETHOD_METHOD, "GetOldSelection", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_GetOldSelection, 1, 0 },
-     { WXLUAMETHOD_METHOD, "GetSelection", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_GetSelection, 1, 0 },
      { WXLUAMETHOD_METHOD, "SetOldSelection", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_SetOldSelection, 1, 0 },
      { WXLUAMETHOD_METHOD, "SetSelection", s_wxluafunc_wxLua_wxBookCtrlBaseEvent_SetSelection, 1, 0 },
--- 6091,6094 ----

[Wxlua-commit] wxLua/bindings/wxwidgets windows.i,1.36,1.37

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

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

Modified Files:
	windows.i 
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: windows.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** windows.i	1 Jun 2007 18:19:46 -0000	1.36
--- windows.i	6 Jun 2007 15:20:15 -0000	1.37
***************
*** 267,271 ****
      virtual void SetSize(int width, int height)
      void SetSize(const wxSize& size)
-     virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO)
      virtual void SetSize(const wxRect& rect)
      virtual void SetSizeHints(int minW, int minH, int maxW=-1, int maxH=-1, int incW=-1, int incH=-1)
--- 267,270 ----
***************
*** 424,428 ****
  
      int GetOldSelection() const
!     int GetSelection() const
      void SetOldSelection(int page)
      void SetSelection(int page)
--- 423,427 ----
  
      int GetOldSelection() const
!     //int GetSelection() const : see wxCommandEvent
      void SetOldSelection(int page)
      void SetSelection(int page)

[Wxlua-commit] wxLua/apps/wxlua/src Makefile,1.21,1.22

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

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

Modified Files:
	Makefile 
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: Makefile
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Makefile	23 May 2007 20:17:23 -0000	1.21
--- Makefile	6 Jun 2007 15:20:14 -0000	1.22
***************
*** 17,20 ****
--- 17,29 ----
  
  LUA = $(WXLUA_DIR)/bin/lua
+ 
+ # If we're using cygwin, lua maybe somewhere else, try some common places
+ # note some other variables cygwin sets don't seem to be exported
+ ifeq (Cygwin, $(findstring Cygwin, $(XTERM_VERSION)))
+ 	LUA=$(WXLUA_DIR)/bin/vc_lib/lua.exe
+ else
+ 	LUA=$(WXLUA_DIR)/bin/lua
+ endif
+ 
  # ----------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.62, 1.63 wxlstate.cpp, 1.99, 1.100

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp 
Log Message:
Switch s_wxluaarg_Enumeration to s_wxluaarg_Enum
Add the rest of the LUA_TXXX types as s_wxluaarg_XXX and create #defines 
  as well as functions to verify them with the result of lua_type()
Unify all of the wxlua_isXXXtype functions to all call the same function
Get rid of wxLuaStringToLongHashMap in wxlstate.h and don't use it anymore
  in wxLuaCheckStack since we can just use a wxSortedArrayString 
Remove wxLuaState::GetBaseLuaClass since it wasn't used anywhere
Cleanup wxLuaState::CallOverloadedFunction to use new check function


Index: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** wxlstate.cpp	5 Jun 2007 21:07:25 -0000	1.99
--- wxlstate.cpp	6 Jun 2007 03:53:40 -0000	1.100
***************
*** 283,287 ****
      }
  
!     lua_pushvalue(L, stack_idx);           // push a copy of value to store to top
      int nTop = lua_gettop(L);               // this is where the value is
  
--- 283,287 ----
      }
  
!     lua_pushvalue(L, stack_idx);            // push a copy of value to store to top
      int nTop = lua_gettop(L);               // this is where the value is
  
***************
*** 370,389 ****
  int LUACALL wxlua_ttag(lua_State *L, int stack_idx)
  {
-     //wxPrintf(wxT("wxlua_ttag %d"), stack_idx);
- 
      int tag = TLUA_NOTAG;
      if (lua_getmetatable(L, stack_idx) != 0) // see tnewtag
      {
!         //wxPrintf(wxT(" has metatable"));
!         lua_pushliteral(L, "tag");              // get t["tag"]
          lua_rawget(L, -2);
!         if (lua_isnumber(L, -1)) // FIXME this is really an error is this ever happens
          {
              tag = (int)lua_tonumber(L, -1);
-             //wxPrintf(wxT(" and is number %d"), tag);
          }
!         lua_pop(L, 2);
      }
-     //wxPrintf(wxT("\n"));
      return tag;
  }
--- 370,384 ----
  int LUACALL wxlua_ttag(lua_State *L, int stack_idx)
  {
      int tag = TLUA_NOTAG;
      if (lua_getmetatable(L, stack_idx) != 0) // see tnewtag
      {
!         lua_pushliteral(L, "tag");           // get t["tag"]
          lua_rawget(L, -2);
!         if (lua_isnumber(L, -1)) // FIXME this is really an error if this isn't true
          {
              tag = (int)lua_tonumber(L, -1);
          }
!         lua_pop(L, 2);                       // pop metatable and tag number
      }
      return tag;
  }
***************
*** 489,555 ****
  }
  
! bool LUACALL wxlua_isstringtype(lua_State* L, int stack_idx)
  {
!     int ltype = lua_type(L, stack_idx);
  
!     switch (ltype)
      {
!         //case LUA_TNIL:  too easy to have a variable typo, use (str or "")
!         case LUA_TSTRING:
!         case LUA_TNUMBER: // can convert easily, always works
!             return true;
!         default:
              break;
!     }
! 
!     return false;
! }
! bool LUACALL wxlua_isbooleantype(lua_State* L, int stack_idx)
! {
!     int ltype = lua_type(L, stack_idx);
! 
!     switch (ltype)
!     {
!         case LUA_TNIL:     // evaluates to false
!         case LUA_TNUMBER:  // as in C 0 == false
!         case LUA_TBOOLEAN:
!             return true;
!         default:
              break;
!     }
! 
!     return false;
! }
! bool LUACALL wxlua_isenumerationtype(lua_State* L, int stack_idx)
! {
!     int ltype = lua_type(L, stack_idx);
! 
!     switch (ltype)
!     {
!         //case LUA_TNIL:     // evaluates to 0 so wx.ENUM_typo = 0
!         case LUA_TNUMBER:  // make sure it's only a number for an enum
!             return true;
!         default:
              break;
      }
  
!     return false;
  }
- bool LUACALL wxlua_isnumbertype(lua_State* L, int stack_idx)
- {
-     int ltype = lua_type(L, stack_idx);
  
!     switch (ltype)
      {
!         //case LUA_TNIL:    evaluates to 0, too easy to have a typo
!         //case LUA_TSTRING: will be 0 unless really a number "2"
!         case LUA_TNUMBER:
!         case LUA_TBOOLEAN:  // can't do (bool_val or 1)
!             return true;
!         default:
!             break;
!     }
  
!     return false;
  }
  
--- 484,557 ----
  }
  
! int LUACALL wxlua_iswxluatype(int luatype, int wxluaarg_type)
  {
!     int ret = -1; // unknown wxlua arg type
  
!     switch (wxluaarg_type)
      {
!         case WXLUAARG_None :
!             ret = (luatype == LUA_TNONE) ? 1 : 0;
              break;
!         case WXLUAARG_Nil :
!             ret = (luatype == LUA_TNIL) ? 1 : 0;
              break;
!         case WXLUAARG_Boolean :
!             // LUA_TNIL:    nil == false
!             // LUA_TNUMBER: 0 == false as in C
!             ret = ((luatype == LUA_TBOOLEAN) || (luatype == LUA_TNUMBER) || (luatype == LUA_TNIL)) ? 1 : 0;
!             break;
!         case WXLUAARG_LightUserData :
!             ret = (luatype == LUA_TLIGHTUSERDATA) ? 1 : 0;
!             break;
!         case WXLUAARG_Number :
!             // LUA_TNIL:     evaluates to 0, too easy to have a typo
!             // LUA_TSTRING:  will be 0 unless really a number "2"
!             // LUA_TBOOLEAN: can't do (bool_val or 1)
!             ret = ((luatype == LUA_TNUMBER) || (luatype == LUA_TBOOLEAN)) ? 1 : 0;
!             break;
!         case WXLUAARG_String :
!             // LUA_TNIL:    too easy to have a variable typo, use (str or "")
!             // LUA_TNUMBER: can convert easily, always works, but breaks overload bindings
!             ret = (luatype == LUA_TSTRING) ? 1 : 0;
!             break;
!         case WXLUAARG_LuaTable :
!             ret = (luatype == LUA_TTABLE) ? 1 : 0;
!             break;
!         case WXLUAARG_LuaFunction :
!             ret = (luatype == LUA_TFUNCTION) ? 1 : 0;
!             break;
!         case WXLUAARG_UserData :
!             ret = (luatype == LUA_TUSERDATA) ? 1 : 0;
!             break;
!         case WXLUAARG_LuaThread :
!             ret = (luatype == LUA_TTHREAD) ? 1 : 0;
!             break;
!         case WXLUAARG_Enum :
!             // LUA_TNIL: evaluates to 0 so wx.ENUM_typo = 0
!             ret = (luatype == LUA_TNUMBER) ? 1 : 0;
              break;
      }
  
!     return ret;
  }
  
! wxString wxlua_getwxluatypename(int wxluaarg_type)
! {
!     switch (wxluaarg_type)
      {
!         case WXLUAARG_None :          return wxT("none");
!         case WXLUAARG_Nil :           return wxT("nil");
!         case WXLUAARG_Boolean :       return wxT("boolean");
!         case WXLUAARG_LightUserData : return wxT("lightuserdata");
!         case WXLUAARG_Number :        return wxT("number");
!         case WXLUAARG_String :        return wxT("string");
!         case WXLUAARG_LuaTable :      return wxT("table");
!         case WXLUAARG_LuaFunction :   return wxT("function");
!         case WXLUAARG_UserData :      return wxT("userdata");
!         case WXLUAARG_LuaThread :     return wxT("thread");
!         case WXLUAARG_Enum :          return wxT("enum");
!     }    
  
!     return wxT("unknown");
  }
  
***************
*** 593,597 ****
      }
  
!     return (long)lua_tonumber(L, stack_idx);
  }
  double LUACALL wxlua_getnumbertype(lua_State *L, int stack_idx)
--- 595,608 ----
      }
  
!     double value = lua_tonumber(L, stack_idx);
! 
!     if (value != (long)value)
!     {
!         wxString msg(wxString::Format(_("wxLua: Expected an enumeration for parameter %d, but got a floating point number '%lf'."),
!                                        stack_idx, value));
!         wxlua_terror(L, wx2lua(msg));
!     }
! 
!     return (long)value;
  }
  double LUACALL wxlua_getnumbertype(lua_State *L, int stack_idx)
***************
*** 1878,1892 ****
  }
  
- const WXLUACLASS* wxLuaState::GetBaseLuaClass(int iClassTag) const
- {
-     wxCHECK_MSG(GetRefData() != NULL, NULL, wxT("Invalid wxLuaState"));
- 
-     const WXLUACLASS *pLuaClass = GetLuaClass(iClassTag);
-     if (pLuaClass)
-         return pLuaClass->baseclass;
- 
-     return NULL;
- }
- 
  bool wxLuaState::IsDerivedClass(int iClassTag, int iBaseClassTag) const
  {
--- 1889,1892 ----
***************
*** 3269,3278 ****
  
  
! wxString wxLuaState::CreateMethodArgTagsMsg(struct WXLUAMETHOD* wxlMethod)
  {
!     wxCHECK_MSG(wxlMethod, wxEmptyString, wxT("Invalid method table"));
  
-     wxString fnOverloadList;   
      WXLUAMETHOD* method = wxlMethod;
  
      while (method)
--- 3269,3279 ----
  
  
! wxArrayString wxLuaState::CreateMethodArgTagsMsg(struct WXLUAMETHOD* wxlMethod)
  {
!     wxArrayString overloadMethodArray;   
!     wxCHECK_MSG(wxlMethod, overloadMethodArray, wxT("Invalid method table"));
  
      WXLUAMETHOD* method = wxlMethod;
+     int i_func = 0;
  
      while (method)
***************
*** 3280,3360 ****
          WXLUAMETHOD_CFUNC* funcs = method->funcs;
          int i, arg, funcs_count = wxlMethod->funcs_n;
!         int i_func = 0;
  
          for (i = 0; i < funcs_count; i++)
          {
-             // skip over the overload function
-             if (WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_OVERLOAD))
-                 continue;
- 
              i_func++; // only count the non overload functions
  
!             wxString fnOverload = wxString::Format(wxT("%02d. %s("), i_func, lua2wx(method->name).c_str());
  
!             for (arg = 0; arg < funcs[i].maxargs; arg++)
              {
!                 // optional args?
!                 if ((funcs[i].minargs < funcs[i].maxargs) && (arg == funcs[i].minargs))
                  {
!                     fnOverload += wxT("[");
!                 }
  
!                 if (arg > 0)
!                     fnOverload += wxT(", ");
  
!                 int tag = (int)*(funcs[i].argtags[arg]);
  
!                 if (tag == s_wxluaarg_String)
!                 {
!                     fnOverload += wxT("string");
!                 }
!                 else if (tag == s_wxluaarg_Boolean)
!                 {
!                     fnOverload += wxT("boolean");
!                 }
!                 else if (tag == s_wxluaarg_Enumeration)
!                 {
!                     fnOverload += wxT("enum");
!                 }
!                 else if (tag == s_wxluaarg_Number)
!                 {
!                     fnOverload += wxT("number");
!                 }
!                 else if (tag == s_wxluaarg_LightUserData)
!                 {
!                     fnOverload += wxT("lightuserdata");
!                 }
!                 else if (tag == s_wxluaarg_UserData)
!                 {
!                     fnOverload += wxT("userdata");
!                 }
!                 else if (tag == s_wxluaarg_LuaTable)
!                 {
!                     fnOverload += wxT("luatable");
!                 }
!                 else if (tag == s_wxluaarg_LuaFunction)
!                 {
!                     fnOverload += wxT("luafunction");
!                 }
!                 else
!                 {
!                     fnOverload += GetLuaTagName(tag);
!                     if ((arg == 0) && !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_STATIC))
!                         fnOverload += wxT("(self)");
                  }
-             }
  
!             // close optional args
!             if (funcs[i].minargs < funcs[i].maxargs)
!             {
!                 fnOverload += wxT("]");
!             }
  
!             fnOverload += wxT(")");
  
!             if (WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_STATIC))
!                 fnOverload += wxT(" - static");
  
!             fnOverloadList += fnOverload + wxT("\n");
          }
  
--- 3281,3342 ----
          WXLUAMETHOD_CFUNC* funcs = method->funcs;
          int i, arg, funcs_count = wxlMethod->funcs_n;
!         wxString className;
! 
!         const WXLUACLASS* wxlClass = GetLuaClass(method);
!         if (wxlClass)
!             className = lua2wx(wxlClass->name) + wxT("::");
  
          for (i = 0; i < funcs_count; i++)
          {
              i_func++; // only count the non overload functions
  
!             wxString fnOverload = wxString::Format(wxT("%02d. %s%s("), i_func, className.c_str(), lua2wx(method->name).c_str());
  
!             // overloaded function has invalid tags
!             if (WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_OVERLOAD))
              {
!                 // we do print that there is an overload so that in CallOverloadedFunction
!                 // we can find what function we were closest too.
!                 fnOverload += wxT(" ... ) - overloaded function");
!             }
!             else
!             {
!                 for (arg = 0; arg < funcs[i].maxargs; arg++)
                  {
!                     // optional args?
!                     if ((funcs[i].minargs < funcs[i].maxargs) && (arg == funcs[i].minargs))
!                         fnOverload += wxT("[");
  
!                     if (arg > 0)
!                         fnOverload += wxT(", ");
  
!                     int tag = (int)*(funcs[i].argtags[arg]);
  
!                     if (tag < 0)
!                     {
!                         fnOverload += wxlua_getwxluatypename(tag);
!                     }
!                     else
!                     {
!                         fnOverload += GetLuaTagName(tag);
!                         if ((arg == 0) && 
!                             !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_STATIC) &&
!                             !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_CONSTRUCTOR) &&
!                             !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_CFUNCTION))
!                             fnOverload += wxT("(self)");
!                     }
                  }
  
!                 // close optional args
!                 if (funcs[i].minargs < funcs[i].maxargs)
!                     fnOverload += wxT("]");
  
!                 fnOverload += wxT(")");
  
!                 if (WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_STATIC))
!                     fnOverload += wxT(" - static");
!             }
  
!             overloadMethodArray.Add(fnOverload);
          }
  
***************
*** 3362,3366 ****
      }
  
!     return fnOverloadList;
  }
  
--- 3344,3348 ----
      }
  
!     return overloadMethodArray;
  }
  
***************
*** 3468,3472 ****
              {
                  // this one won't work, try the next
!                 funcArray.RemoveAt(i); i--;
                  continue;
              }
--- 3450,3455 ----
              {
                  // this one won't work, try the next
!                 funcArray.RemoveAt(i); 
!                 i--;
                  continue;
              }
***************
*** 3477,3548 ****
              //wxPrintf(wxT("ARG '%s' type %d argCount %d arg %d arg_lua %d arg_wxlua %d ltype %d wxtype %d func_count %d/%d\n"), lua2wx(wxlMethod->name).c_str(), func->type, argCount, arg, arg_lua, arg_wxlua, ltype, tag, i, funcArray.GetCount());
  
!             if (tag == s_wxluaarg_String)
!             {
!                 if ((ltype != LUA_TNIL) && (ltype != LUA_TSTRING))
!                 {
!                     funcArray.RemoveAt(i); i--;
!                     continue;
!                 }
!             }
!             else if (tag == s_wxluaarg_Boolean)
!             {
!                 if ((ltype != LUA_TNIL) && (ltype != LUA_TBOOLEAN))
!                 {
!                     funcArray.RemoveAt(i); i--;
!                     continue;
!                 }
!             }
!             else if (tag == s_wxluaarg_Enumeration)
!             {
!                 if (ltype != LUA_TNUMBER)
!                 {
!                     funcArray.RemoveAt(i); i--;
!                     continue;
!                 }
!             }
!             else if (tag == s_wxluaarg_Number)
!             {
!                 if ((ltype != LUA_TNIL) && (ltype != LUA_TNUMBER))
!                 {
!                     funcArray.RemoveAt(i); i--;
!                     continue;
!                 }
!             }
!             else if (tag == s_wxluaarg_LightUserData)
!             {
!                 if (!lua_IsLightUserData(arg_lua))
!                 {
!                     funcArray.RemoveAt(i); i--;
!                     continue;
!                 }
!             }
!             else if (tag == s_wxluaarg_UserData)
!             {
!                 if (!lua_IsUserData(arg_lua))
!                 {
!                     funcArray.RemoveAt(i); i--;
!                     continue;
!                 }
!             }
!             else if (tag == s_wxluaarg_LuaTable)
!             {
!                 if (!lua_IsTable(arg_lua))
!                 {
!                     funcArray.RemoveAt(i); i--;
!                     continue;
!                 }
!             }
!             else if (tag == s_wxluaarg_LuaFunction)
              {
!                 if (!lua_IsFunction(arg_lua))
!                 {
!                     funcArray.RemoveAt(i); i--;
!                     continue;
!                 }
              }
!             else if (!IsUserDataType(arg_lua, tag) &&
!                 (tag != M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL)) // FIXME!
              {
!                 funcArray.RemoveAt(i); i--;
                  continue;
              }
--- 3460,3477 ----
              //wxPrintf(wxT("ARG '%s' type %d argCount %d arg %d arg_lua %d arg_wxlua %d ltype %d wxtype %d func_count %d/%d\n"), lua2wx(wxlMethod->name).c_str(), func->type, argCount, arg, arg_lua, arg_wxlua, ltype, tag, i, funcArray.GetCount());
  
!             // Does the lua type match the wxlua arg tag type 
!             int is_ok = wxlua_iswxluatype(ltype, tag);
!             // unknown standard wxlua arg type, check binding tag
!             if (is_ok == -1)
              {
!                 is_ok = (IsUserDataType(arg_lua, tag) || 
!                     (tag == M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL)) ? 1 : 0;
              }
! 
!             // this arg is not a match, remove this function as a possibility
!             if (is_ok == 0)
              {
!                 funcArray.RemoveAt(i); 
!                 i--;
                  continue;
              }
***************
*** 3550,3554 ****
      }
  
!     if (funcArray.GetCount() != 0)
      {
          lua_CFunction func = ((WXLUAMETHOD_CFUNC*)funcArray[0])->func;
--- 3479,3484 ----
      }
  
!     // If there was a function that matched run it, if > 1 ??? 
!     if (funcArray.GetCount() == 1)
      {
          lua_CFunction func = ((WXLUAMETHOD_CFUNC*)funcArray[0])->func;
***************
*** 3618,3634 ****
  
      wxString fnOverloadList = wxT("wxLua Function Overload Table:\n");
!     fnOverloadList += CreateMethodArgTagsMsg(wxlMethod);
  
      wxString errmsg;
  
!     if (1) //bestFunc == NULL) FIXME
          errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument\n%s"), fnCall.c_str(), fnOverloadList.c_str());
      else
      {
          method = wxlMethod;
          while (method)
          {
              for (i = 0; i < method->funcs_n; ++i)
              {
                  if (&method->funcs[i] == bestFunc)
                      break;
--- 3548,3574 ----
  
      wxString fnOverloadList = wxT("wxLua Function Overload Table:\n");
!     wxArrayString overloadMethodArray = CreateMethodArgTagsMsg(wxlMethod);
!     for (i = 0; i < (int)overloadMethodArray.GetCount(); i++)
!         fnOverloadList += overloadMethodArray[i] + wxT("\n");
! 
  
      wxString errmsg;
  
!     if (funcArray.GetCount() > 1)
!     {
!         errmsg = wxT("wxLua Overloaded function call is ambiguous.\nTry coercing values to proper types using tostring/number as appropriate.\n");
!     }
! 
!     if (bestFunc == NULL) 
          errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument\n%s"), fnCall.c_str(), fnOverloadList.c_str());
      else
      {
          method = wxlMethod;
+         int i_func = 0;
          while (method)
          {
              for (i = 0; i < method->funcs_n; ++i)
              {
+                 i_func++;
                  if (&method->funcs[i] == bestFunc)
                      break;
***************
*** 3638,3642 ****
          }
  
!         errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument %d on method %02d\n%s"), fnCall.c_str(), (invalidArg), (i+1), 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());
      }
  

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** wxlbind.cpp	5 Jun 2007 21:07:25 -0000	1.62
--- wxlbind.cpp	6 Jun 2007 03:53:40 -0000	1.63
***************
*** 35,47 ****
  WXLUADEFINE s_wxluadefineArray_None[1] = {{0, 0}};
  
! int s_wxluaarg_None          =  0;
! int s_wxluaarg_String        = -2;
! int s_wxluaarg_Boolean       = -3;
! int s_wxluaarg_Enumeration   = -4;
! int s_wxluaarg_Number        = -5;
! int s_wxluaarg_LightUserData = -6;    // raw data
! int s_wxluaarg_UserData      = -7;    // raw data
! int s_wxluaarg_LuaTable      = -8;
! int s_wxluaarg_LuaFunction   = -9;
  
  //-----------------------------------------------------------------------------
--- 35,49 ----
  WXLUADEFINE s_wxluadefineArray_None[1] = {{0, 0}};
  
! int s_wxluaarg_None          = WXLUAARG_None;
! int s_wxluaarg_Nil           = WXLUAARG_Nil;
! int s_wxluaarg_Boolean       = WXLUAARG_Boolean;
! int s_wxluaarg_LightUserData = WXLUAARG_LightUserData; // raw data
! int s_wxluaarg_Number        = WXLUAARG_Number;
! int s_wxluaarg_String        = WXLUAARG_String;
! int s_wxluaarg_LuaTable      = WXLUAARG_LuaTable;
! int s_wxluaarg_LuaFunction   = WXLUAARG_LuaFunction;
! int s_wxluaarg_UserData      = WXLUAARG_UserData;      // raw data
! int s_wxluaarg_LuaThread     = WXLUAARG_LuaThread;
! int s_wxluaarg_Enum          = WXLUAARG_Enum;
  
  //-----------------------------------------------------------------------------
***************
*** 985,991 ****
          for (i_method = 0; i_method < method_count; ++i_method)
          {
!             for (int i = 0; i < wxlClass[i_method].methods_n; ++i)
              {
!                 if (&wxlClass[i_method].methods[i] == wxlMethod)
                      return wxlClass;
              }
--- 987,993 ----
          for (i_method = 0; i_method < method_count; ++i_method)
          {
!             for (int i = 0; i < wxlClass->methods_n; ++i)
              {
!                 if (&wxlClass->methods[i] == wxlMethod)
                      return wxlClass;
              }
***************
*** 1006,1014 ****
          for (i_method = 0; i_method < method_count; ++i_method)
          {
!             for (int i = 0; i < wxlClass[i_method].methods_n; ++i)
              {
!                 for (int j = 0; j < wxlClass[i_method].methods[i].funcs_n; ++j)
                  {
!                     if (&wxlClass[i_method].methods[i].funcs[j] == wxlMethod_cfunc)
                          return wxlClass;
                  }
--- 1008,1016 ----
          for (i_method = 0; i_method < method_count; ++i_method)
          {
!             for (int i = 0; i < wxlClass->methods_n; ++i)
              {
!                 for (int j = 0; j < wxlClass->methods[i].funcs_n; ++j)
                  {
!                     if (&wxlClass->methods[i].funcs[j] == wxlMethod_cfunc)
                          return wxlClass;
                  }

[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.43, 1.44 clipdrag.cpp, 1.38, 1.39 controls.cpp, 1.55, 1.56 datetime.cpp, 1.37, 1.38 defsutil.cpp, 1.33, 1.34 event.cpp, 1.42, 1.43 file.cpp, 1.43, 1.44 gdi.cpp, 1.60, 1.61 grid.cpp, 1.34, 1.35 help.cpp, 1.32, 1.33 html.cpp, 1.37, 1.38 mdi.cpp, 1.33, 1.34 menutool.cpp, 1.35, 1.36 print.cpp, 1.36, 1.37 sizer.cpp, 1.30, 1.31 socket.cpp, 1.35, 1.36 wave.cpp, 1.34, 1.35 windows.cpp, 1.49, 1.50 wx_bind.cpp, 1.94, 1.95 wxlua.cpp, 1.35, 1.36 xml.cpp, 1.31, 1.32

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

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

Modified Files:
	appframe.cpp clipdrag.cpp controls.cpp datetime.cpp 
	defsutil.cpp event.cpp file.cpp gdi.cpp grid.cpp help.cpp 
	html.cpp mdi.cpp menutool.cpp print.cpp sizer.cpp socket.cpp 
	wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp 
Log Message:
Switch s_wxluaarg_Enumeration to s_wxluaarg_Enum
Add the rest of the LUA_TXXX types as s_wxluaarg_XXX and create #defines 
  as well as functions to verify them with the result of lua_type()
Unify all of the wxlua_isXXXtype functions to all call the same function
Get rid of wxLuaStringToLongHashMap in wxlstate.h and don't use it anymore
  in wxLuaCheckStack since we can just use a wxSortedArrayString 
Remove wxLuaState::GetBaseLuaClass since it wasn't used anywhere
Cleanup wxLuaState::CallOverloadedFunction to use new check function


Index: xml.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** xml.cpp	5 Jun 2007 21:07:24 -0000	1.31
--- xml.cpp	6 Jun 2007 03:53:39 -0000	1.32
***************
*** 482,486 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_SetType[] = { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetType[1] = {{ wxLua_wxXmlNode_SetType, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetType }};
--- 482,486 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_SetType[] = { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxXmlNode_SetType(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_SetType[1] = {{ wxLua_wxXmlNode_SetType, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxXmlNode_SetType }};
***************
*** 500,504 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_constructor2[] = { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, &s_wxluatag_wxXmlNode, 0 };
  static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor2[1] = {{ wxLua_wxXmlNode_constructor2, WXLUAMETHOD_CONSTRUCTOR, 6, 6, s_wxluatagArray_wxLua_wxXmlNode_constructor2 }};
--- 500,504 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_constructor2[] = { &s_wxluatag_wxXmlNode, &s_wxluaarg_Enum, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluatag_wxXmlProperty, &s_wxluatag_wxXmlNode, 0 };
  static int LUACALL wxLua_wxXmlNode_constructor2(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor2[1] = {{ wxLua_wxXmlNode_constructor2, WXLUAMETHOD_CONSTRUCTOR, 6, 6, s_wxluatagArray_wxLua_wxXmlNode_constructor2 }};
***************
*** 532,536 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_constructor1[] = { &s_wxluaarg_Enumeration, &s_wxluaarg_String, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor1[1] = {{ wxLua_wxXmlNode_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 3, s_wxluatagArray_wxLua_wxXmlNode_constructor1 }};
--- 532,536 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_constructor1[] = { &s_wxluaarg_Enum, &s_wxluaarg_String, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxXmlNode_constructor1(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_constructor1[1] = {{ wxLua_wxXmlNode_constructor1, WXLUAMETHOD_CONSTRUCTOR, 2, 3, s_wxluatagArray_wxLua_wxXmlNode_constructor1 }};

Index: controls.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** controls.cpp	5 Jun 2007 21:07:21 -0000	1.55
--- controls.cpp	6 Jun 2007 03:53:36 -0000	1.56
***************
*** 976,980 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxCheckBox_Set3StateValue[] = { &s_wxluatag_wxCheckBox, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxCheckBox_Set3StateValue(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxCheckBox_Set3StateValue[1] = {{ wxLua_wxCheckBox_Set3StateValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxCheckBox_Set3StateValue }};
--- 976,980 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxCheckBox_Set3StateValue[] = { &s_wxluatag_wxCheckBox, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxCheckBox_Set3StateValue(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxCheckBox_Set3StateValue[1] = {{ wxLua_wxCheckBox_Set3StateValue, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxCheckBox_Set3StateValue }};
***************
*** 5703,5707 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxListItem_SetAlign[] = { &s_wxluatag_wxListItem, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxListItem_SetAlign(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxListItem_SetAlign[1] = {{ wxLua_wxListItem_SetAlign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxListItem_SetAlign }};
--- 5703,5707 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxListItem_SetAlign[] = { &s_wxluatag_wxListItem, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxListItem_SetAlign(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxListItem_SetAlign[1] = {{ wxLua_wxListItem_SetAlign, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxListItem_SetAlign }};
***************
*** 10461,10465 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTextAttr_SetAlignment[] = { &s_wxluatag_wxTextAttr, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxTextAttr_SetAlignment(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTextAttr_SetAlignment[1] = {{ wxLua_wxTextAttr_SetAlignment, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTextAttr_SetAlignment }};
--- 10461,10465 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTextAttr_SetAlignment[] = { &s_wxluatag_wxTextAttr, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxTextAttr_SetAlignment(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTextAttr_SetAlignment[1] = {{ wxLua_wxTextAttr_SetAlignment, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxTextAttr_SetAlignment }};
***************
*** 10629,10633 ****
  
  #if ((wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTextAttr_constructor[] = { &s_wxluatag_wxColour, &s_wxluatag_wxColour, &s_wxluatag_wxFont, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxTextAttr_constructor(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTextAttr_constructor[1] = {{ wxLua_wxTextAttr_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 4, s_wxluatagArray_wxLua_wxTextAttr_constructor }};
--- 10629,10633 ----
  
  #if ((wxLUA_USE_wxColourPenBrush) && (wxLUA_USE_wxFont)) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTextAttr_constructor[] = { &s_wxluatag_wxColour, &s_wxluatag_wxColour, &s_wxluatag_wxFont, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxTextAttr_constructor(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTextAttr_constructor[1] = {{ wxLua_wxTextAttr_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 4, s_wxluatagArray_wxLua_wxTextAttr_constructor }};
***************
*** 11314,11318 ****
  #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxFont)
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetItemImage[] = { &s_wxluatag_wxTreeCtrl, &s_wxluatag_wxTreeItemId, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxTreeCtrl_GetItemImage(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetItemImage[1] = {{ wxLua_wxTreeCtrl_GetItemImage, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxTreeCtrl_GetItemImage }};
--- 11314,11318 ----
  #endif // (wxLUA_USE_wxTreeCtrl && wxUSE_TREECTRL) && (wxLUA_USE_wxFont)
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_GetItemImage[] = { &s_wxluatag_wxTreeCtrl, &s_wxluatag_wxTreeItemId, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxTreeCtrl_GetItemImage(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_GetItemImage[1] = {{ wxLua_wxTreeCtrl_GetItemImage, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxTreeCtrl_GetItemImage }};
***************
*** 12123,12127 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_SetItemImage[] = { &s_wxluatag_wxTreeCtrl, &s_wxluatag_wxTreeItemId, &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxTreeCtrl_SetItemImage(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_SetItemImage[1] = {{ wxLua_wxTreeCtrl_SetItemImage, WXLUAMETHOD_METHOD, 3, 4, s_wxluatagArray_wxLua_wxTreeCtrl_SetItemImage }};
--- 12123,12127 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTreeCtrl_SetItemImage[] = { &s_wxluatag_wxTreeCtrl, &s_wxluatag_wxTreeItemId, &s_wxluaarg_Number, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxTreeCtrl_SetItemImage(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTreeCtrl_SetItemImage[1] = {{ wxLua_wxTreeCtrl_SetItemImage, WXLUAMETHOD_METHOD, 3, 4, s_wxluatagArray_wxLua_wxTreeCtrl_SetItemImage }};
***************
*** 13186,13190 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxArrayTreeItemIds_Index[] = { &s_wxluatag_wxArrayTreeItemIds, &s_wxluaarg_Enumeration, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxArrayTreeItemIds_Index(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxArrayTreeItemIds_Index[1] = {{ wxLua_wxArrayTreeItemIds_Index, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxArrayTreeItemIds_Index }};
--- 13186,13190 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxArrayTreeItemIds_Index[] = { &s_wxluatag_wxArrayTreeItemIds, &s_wxluaarg_Enum, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxArrayTreeItemIds_Index(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxArrayTreeItemIds_Index[1] = {{ wxLua_wxArrayTreeItemIds_Index, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxArrayTreeItemIds_Index }};
***************
*** 13276,13280 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxArrayTreeItemIds_Remove[] = { &s_wxluatag_wxArrayTreeItemIds, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxArrayTreeItemIds_Remove(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxArrayTreeItemIds_Remove[1] = {{ wxLua_wxArrayTreeItemIds_Remove, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxArrayTreeItemIds_Remove }};
--- 13276,13280 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxArrayTreeItemIds_Remove[] = { &s_wxluatag_wxArrayTreeItemIds, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxArrayTreeItemIds_Remove(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxArrayTreeItemIds_Remove[1] = {{ wxLua_wxArrayTreeItemIds_Remove, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxArrayTreeItemIds_Remove }};

Index: mdi.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/mdi.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** mdi.cpp	5 Jun 2007 21:07:23 -0000	1.33
--- mdi.cpp	6 Jun 2007 03:53:38 -0000	1.34
***************
*** 286,290 ****
  #endif // ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS)
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMDIParentFrame_Tile[] = { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxMDIParentFrame_Tile(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMDIParentFrame_Tile[1] = {{ wxLua_wxMDIParentFrame_Tile, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxMDIParentFrame_Tile }};
--- 286,290 ----
  #endif // ((defined(__WXMSW__)) && (wxLUA_USE_MDI && wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE)) && (wxLUA_USE_wxMenu && wxUSE_MENUS)
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMDIParentFrame_Tile[] = { &s_wxluatag_wxMDIParentFrame, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxMDIParentFrame_Tile(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMDIParentFrame_Tile[1] = {{ wxLua_wxMDIParentFrame_Tile, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxMDIParentFrame_Tile }};

Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** wxlua.cpp	5 Jun 2007 21:07:24 -0000	1.35
--- wxlua.cpp	6 Jun 2007 03:53:39 -0000	1.36
***************
*** 127,131 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }};
--- 127,131 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }};
***************
*** 148,152 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enumeration, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag[1] = {{ wxLua_wxLuaObject_SetAllocationFlag, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }};
--- 148,152 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enum, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag[1] = {{ wxLua_wxLuaObject_SetAllocationFlag, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }};

Index: help.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/help.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** help.cpp	5 Jun 2007 21:07:23 -0000	1.32
--- help.cpp	6 Jun 2007 03:53:37 -0000	1.33
***************
*** 316,320 ****
  
  #if (((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxPointSizeRect)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpProvider_ShowHelpAtPoint[] = { &s_wxluatag_wxHelpProvider, &s_wxluatag_wxWindow, &s_wxluatag_wxPoint, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxHelpProvider_ShowHelpAtPoint(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxHelpProvider_ShowHelpAtPoint[1] = {{ wxLua_wxHelpProvider_ShowHelpAtPoint, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxHelpProvider_ShowHelpAtPoint }};
--- 316,320 ----
  
  #if (((wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxHelpController && wxUSE_HELP)) && (wxCHECK_VERSION(2,8,0))) && (wxLUA_USE_wxPointSizeRect)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpProvider_ShowHelpAtPoint[] = { &s_wxluatag_wxHelpProvider, &s_wxluatag_wxWindow, &s_wxluatag_wxPoint, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxHelpProvider_ShowHelpAtPoint(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxHelpProvider_ShowHelpAtPoint[1] = {{ wxLua_wxHelpProvider_ShowHelpAtPoint, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxHelpProvider_ShowHelpAtPoint }};
***************
*** 734,738 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpController_KeywordSearch[] = { &s_wxluatag_wxHelpController, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxHelpController_KeywordSearch(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxHelpController_KeywordSearch[1] = {{ wxLua_wxHelpController_KeywordSearch, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxHelpController_KeywordSearch }};
--- 734,738 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHelpController_KeywordSearch[] = { &s_wxluatag_wxHelpController, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxHelpController_KeywordSearch(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxHelpController_KeywordSearch[1] = {{ wxLua_wxHelpController_KeywordSearch, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxHelpController_KeywordSearch }};
***************
*** 1420,1424 ****
  
  #if (wxLUA_USE_wxHelpController && wxUSE_HELP) && ((wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) && (wxLUA_USE_wxHelpController && wxUSE_HELP))
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlHelpController_KeywordSearch[] = { &s_wxluatag_wxHtmlHelpController, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxHtmlHelpController_KeywordSearch(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxHtmlHelpController_KeywordSearch[1] = {{ wxLua_wxHtmlHelpController_KeywordSearch, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxHtmlHelpController_KeywordSearch }};
--- 1420,1424 ----
  
  #if (wxLUA_USE_wxHelpController && wxUSE_HELP) && ((wxLUA_USE_wxHtmlHelpController && wxUSE_WXHTML_HELP) && (wxLUA_USE_wxHelpController && wxUSE_HELP))
! static wxLuaArgTag s_wxluatagArray_wxLua_wxHtmlHelpController_KeywordSearch[] = { &s_wxluatag_wxHtmlHelpController, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxHtmlHelpController_KeywordSearch(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxHtmlHelpController_KeywordSearch[1] = {{ wxLua_wxHtmlHelpController_KeywordSearch, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxHtmlHelpController_KeywordSearch }};

Index: clipdrag.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/clipdrag.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** clipdrag.cpp	5 Jun 2007 21:07:21 -0000	1.38
--- clipdrag.cpp	6 Jun 2007 03:53:36 -0000	1.39
***************
*** 465,469 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataFormat_SetType[] = { &s_wxluatag_wxDataFormat, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxDataFormat_SetType(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataFormat_SetType[1] = {{ wxLua_wxDataFormat_SetType, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxDataFormat_SetType }};
--- 465,469 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataFormat_SetType[] = { &s_wxluatag_wxDataFormat, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxDataFormat_SetType(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataFormat_SetType[1] = {{ wxLua_wxDataFormat_SetType, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxDataFormat_SetType }};
***************
*** 526,530 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataFormat_constructor[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxDataFormat_constructor(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataFormat_constructor[1] = {{ wxLua_wxDataFormat_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxDataFormat_constructor }};
--- 526,530 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataFormat_constructor[] = { &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxDataFormat_constructor(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataFormat_constructor[1] = {{ wxLua_wxDataFormat_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxDataFormat_constructor }};
***************
*** 608,612 ****
  int s_wxluatag_wxDataObject = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObject_GetAllFormats[] = { &s_wxluatag_wxDataObject, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxDataObject_GetAllFormats(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataObject_GetAllFormats[1] = {{ wxLua_wxDataObject_GetAllFormats, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxDataObject_GetAllFormats }};
--- 608,612 ----
  int s_wxluatag_wxDataObject = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObject_GetAllFormats[] = { &s_wxluatag_wxDataObject, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxDataObject_GetAllFormats(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataObject_GetAllFormats[1] = {{ wxLua_wxDataObject_GetAllFormats, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxDataObject_GetAllFormats }};
***************
*** 707,711 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObject_GetFormatCount[] = { &s_wxluatag_wxDataObject, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxDataObject_GetFormatCount(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataObject_GetFormatCount[1] = {{ wxLua_wxDataObject_GetFormatCount, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxDataObject_GetFormatCount }};
--- 707,711 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObject_GetFormatCount[] = { &s_wxluatag_wxDataObject, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxDataObject_GetFormatCount(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataObject_GetFormatCount[1] = {{ wxLua_wxDataObject_GetFormatCount, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxDataObject_GetFormatCount }};
***************
*** 730,734 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObject_GetPreferredFormat[] = { &s_wxluatag_wxDataObject, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxDataObject_GetPreferredFormat(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataObject_GetPreferredFormat[1] = {{ wxLua_wxDataObject_GetPreferredFormat, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxDataObject_GetPreferredFormat }};
--- 730,734 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDataObject_GetPreferredFormat[] = { &s_wxluatag_wxDataObject, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxDataObject_GetPreferredFormat(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDataObject_GetPreferredFormat[1] = {{ wxLua_wxDataObject_GetPreferredFormat, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxDataObject_GetPreferredFormat }};
***************
*** 1633,1637 ****
  #endif // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_GiveFeedback[] = { &s_wxluatag_wxDropSource, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxDropSource_GiveFeedback(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDropSource_GiveFeedback[1] = {{ wxLua_wxDropSource_GiveFeedback, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxDropSource_GiveFeedback }};
--- 1633,1637 ----
  #endif // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_GiveFeedback[] = { &s_wxluatag_wxDropSource, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxDropSource_GiveFeedback(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDropSource_GiveFeedback[1] = {{ wxLua_wxDropSource_GiveFeedback, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxDropSource_GiveFeedback }};
***************
*** 1656,1660 ****
  
  #if (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_SetCursor[] = { &s_wxluatag_wxDropSource, &s_wxluaarg_Enumeration, &s_wxluatag_wxCursor, 0 };
  static int LUACALL wxLua_wxDropSource_SetCursor(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDropSource_SetCursor[1] = {{ wxLua_wxDropSource_SetCursor, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxDropSource_SetCursor }};
--- 1656,1660 ----
  
  #if (wxLUA_USE_wxCursor) && (wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDropSource_SetCursor[] = { &s_wxluatag_wxDropSource, &s_wxluaarg_Enum, &s_wxluatag_wxCursor, 0 };
  static int LUACALL wxLua_wxDropSource_SetCursor(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDropSource_SetCursor[1] = {{ wxLua_wxDropSource_SetCursor, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxDropSource_SetCursor }};

Index: file.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/file.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** file.cpp	5 Jun 2007 21:07:22 -0000	1.43
--- file.cpp	6 Jun 2007 03:53:37 -0000	1.44
***************
*** 348,352 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Assign4[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_Assign4(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Assign4[1] = {{ wxLua_wxFileName_Assign4, WXLUAMETHOD_METHOD, 4, 5, s_wxluatagArray_wxLua_wxFileName_Assign4 }};
--- 348,352 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Assign4[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_Assign4(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Assign4[1] = {{ wxLua_wxFileName_Assign4, WXLUAMETHOD_METHOD, 4, 5, s_wxluatagArray_wxLua_wxFileName_Assign4 }};
***************
*** 374,378 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Assign3[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_Assign3(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Assign3[1] = {{ wxLua_wxFileName_Assign3, WXLUAMETHOD_METHOD, 3, 4, s_wxluatagArray_wxLua_wxFileName_Assign3 }};
--- 374,378 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Assign3[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_Assign3(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Assign3[1] = {{ wxLua_wxFileName_Assign3, WXLUAMETHOD_METHOD, 3, 4, s_wxluatagArray_wxLua_wxFileName_Assign3 }};
***************
*** 398,402 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Assign2[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_Assign2(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Assign2[1] = {{ wxLua_wxFileName_Assign2, WXLUAMETHOD_METHOD, 5, 6, s_wxluatagArray_wxLua_wxFileName_Assign2 }};
--- 398,402 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Assign2[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_Assign2(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Assign2[1] = {{ wxLua_wxFileName_Assign2, WXLUAMETHOD_METHOD, 5, 6, s_wxluatagArray_wxLua_wxFileName_Assign2 }};
***************
*** 426,430 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Assign1[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_Assign1(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Assign1[1] = {{ wxLua_wxFileName_Assign1, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFileName_Assign1 }};
--- 426,430 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Assign1[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_Assign1(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Assign1[1] = {{ wxLua_wxFileName_Assign1, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFileName_Assign1 }};
***************
*** 486,490 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignDir[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_AssignDir(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_AssignDir[1] = {{ wxLua_wxFileName_AssignDir, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFileName_AssignDir }};
--- 486,490 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_AssignDir[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_AssignDir(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_AssignDir[1] = {{ wxLua_wxFileName_AssignDir, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFileName_AssignDir }};
***************
*** 846,850 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetForbiddenChars[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_GetForbiddenChars(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetForbiddenChars[1] = {{ wxLua_wxFileName_GetForbiddenChars, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetForbiddenChars }};
--- 846,850 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetForbiddenChars[] = { &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_GetForbiddenChars(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetForbiddenChars[1] = {{ wxLua_wxFileName_GetForbiddenChars, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetForbiddenChars }};
***************
*** 867,871 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetFormat[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_GetFormat(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetFormat[1] = {{ wxLua_wxFileName_GetFormat, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetFormat }};
--- 867,871 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetFormat[] = { &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_GetFormat(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetFormat[1] = {{ wxLua_wxFileName_GetFormat, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetFormat }};
***************
*** 906,910 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetFullPath[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_GetFullPath(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetFullPath[1] = {{ wxLua_wxFileName_GetFullPath, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxFileName_GetFullPath }};
--- 906,910 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetFullPath[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_GetFullPath(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetFullPath[1] = {{ wxLua_wxFileName_GetFullPath, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxFileName_GetFullPath }};
***************
*** 1038,1042 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetPath[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_GetPath(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetPath[1] = {{ wxLua_wxFileName_GetPath, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxFileName_GetPath }};
--- 1038,1042 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetPath[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Number, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_GetPath(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetPath[1] = {{ wxLua_wxFileName_GetPath, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxFileName_GetPath }};
***************
*** 1063,1067 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetPathSeparator[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_GetPathSeparator(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetPathSeparator[1] = {{ wxLua_wxFileName_GetPathSeparator, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetPathSeparator }};
--- 1063,1067 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetPathSeparator[] = { &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_GetPathSeparator(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetPathSeparator[1] = {{ wxLua_wxFileName_GetPathSeparator, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetPathSeparator }};
***************
*** 1083,1087 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetPathSeparators[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_GetPathSeparators(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetPathSeparators[1] = {{ wxLua_wxFileName_GetPathSeparators, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetPathSeparators }};
--- 1083,1087 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetPathSeparators[] = { &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_GetPathSeparators(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetPathSeparators[1] = {{ wxLua_wxFileName_GetPathSeparators, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetPathSeparators }};
***************
*** 1104,1108 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetPathTerminators[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_GetPathTerminators(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetPathTerminators[1] = {{ wxLua_wxFileName_GetPathTerminators, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetPathTerminators }};
--- 1104,1108 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetPathTerminators[] = { &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_GetPathTerminators(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetPathTerminators[1] = {{ wxLua_wxFileName_GetPathTerminators, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetPathTerminators }};
***************
*** 1220,1224 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetVolumeSeparator[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_GetVolumeSeparator(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetVolumeSeparator[1] = {{ wxLua_wxFileName_GetVolumeSeparator, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetVolumeSeparator }};
--- 1220,1224 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_GetVolumeSeparator[] = { &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_GetVolumeSeparator(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_GetVolumeSeparator[1] = {{ wxLua_wxFileName_GetVolumeSeparator, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_GetVolumeSeparator }};
***************
*** 1318,1322 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_IsAbsolute[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_IsAbsolute(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_IsAbsolute[1] = {{ wxLua_wxFileName_IsAbsolute, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxFileName_IsAbsolute }};
--- 1318,1322 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_IsAbsolute[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_IsAbsolute(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_IsAbsolute[1] = {{ wxLua_wxFileName_IsAbsolute, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxFileName_IsAbsolute }};
***************
*** 1341,1345 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_IsCaseSensitive[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_IsCaseSensitive(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_IsCaseSensitive[1] = {{ wxLua_wxFileName_IsCaseSensitive, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_IsCaseSensitive }};
--- 1341,1345 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_IsCaseSensitive[] = { &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_IsCaseSensitive(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_IsCaseSensitive[1] = {{ wxLua_wxFileName_IsCaseSensitive, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 1, s_wxluatagArray_wxLua_wxFileName_IsCaseSensitive }};
***************
*** 1498,1502 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_IsPathSeparator[] = { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_IsPathSeparator(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_IsPathSeparator[1] = {{ wxLua_wxFileName_IsPathSeparator, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxFileName_IsPathSeparator }};
--- 1498,1502 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_IsPathSeparator[] = { &s_wxluaarg_Number, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_IsPathSeparator(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_IsPathSeparator[1] = {{ wxLua_wxFileName_IsPathSeparator, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxFileName_IsPathSeparator }};
***************
*** 1520,1524 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_IsRelative[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_IsRelative(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_IsRelative[1] = {{ wxLua_wxFileName_IsRelative, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxFileName_IsRelative }};
--- 1520,1524 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_IsRelative[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_IsRelative(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_IsRelative[1] = {{ wxLua_wxFileName_IsRelative, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxFileName_IsRelative }};
***************
*** 1543,1547 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_MakeAbsolute[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_MakeAbsolute(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_MakeAbsolute[1] = {{ wxLua_wxFileName_MakeAbsolute, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxFileName_MakeAbsolute }};
--- 1543,1547 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_MakeAbsolute[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_MakeAbsolute(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_MakeAbsolute[1] = {{ wxLua_wxFileName_MakeAbsolute, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxFileName_MakeAbsolute }};
***************
*** 1568,1572 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_MakeRelativeTo[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_MakeRelativeTo(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_MakeRelativeTo[1] = {{ wxLua_wxFileName_MakeRelativeTo, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxFileName_MakeRelativeTo }};
--- 1568,1572 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_MakeRelativeTo[] = { &s_wxluatag_wxFileName, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_MakeRelativeTo(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_MakeRelativeTo[1] = {{ wxLua_wxFileName_MakeRelativeTo, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxFileName_MakeRelativeTo }};
***************
*** 1643,1647 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Normalize[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_Normalize(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Normalize[1] = {{ wxLua_wxFileName_Normalize, WXLUAMETHOD_METHOD, 1, 4, s_wxluatagArray_wxLua_wxFileName_Normalize }};
--- 1643,1647 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_Normalize[] = { &s_wxluatag_wxFileName, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_Normalize(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_Normalize[1] = {{ wxLua_wxFileName_Normalize, WXLUAMETHOD_METHOD, 1, 4, s_wxluatagArray_wxLua_wxFileName_Normalize }};
***************
*** 1744,1748 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_SameAs[] = { &s_wxluatag_wxFileName, &s_wxluatag_wxFileName, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_SameAs(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_SameAs[1] = {{ wxLua_wxFileName_SameAs, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFileName_SameAs }};
--- 1744,1748 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_SameAs[] = { &s_wxluatag_wxFileName, &s_wxluatag_wxFileName, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_SameAs(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_SameAs[1] = {{ wxLua_wxFileName_SameAs, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFileName_SameAs }};
***************
*** 1924,1928 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_SplitPath[] = { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_SplitPath(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_SplitPath[1] = {{ wxLua_wxFileName_SplitPath, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxFileName_SplitPath }};
--- 1924,1928 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_SplitPath[] = { &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_SplitPath(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_SplitPath[1] = {{ wxLua_wxFileName_SplitPath, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxFileName_SplitPath }};
***************
*** 1952,1956 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_SplitPathVolume[] = { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_SplitPathVolume(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_SplitPathVolume[1] = {{ wxLua_wxFileName_SplitPathVolume, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxFileName_SplitPathVolume }};
--- 1952,1956 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_SplitPathVolume[] = { &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_SplitPathVolume(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_SplitPathVolume[1] = {{ wxLua_wxFileName_SplitPathVolume, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxFileName_SplitPathVolume }};
***************
*** 1982,1986 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_SplitVolume[] = { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_SplitVolume(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_SplitVolume[1] = {{ wxLua_wxFileName_SplitVolume, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxFileName_SplitVolume }};
--- 1982,1986 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_SplitVolume[] = { &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_SplitVolume(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_SplitVolume[1] = {{ wxLua_wxFileName_SplitVolume, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxFileName_SplitVolume }};
***************
*** 2069,2073 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_constructor4[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_constructor4(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_constructor4[1] = {{ wxLua_wxFileName_constructor4, WXLUAMETHOD_CONSTRUCTOR, 4, 5, s_wxluatagArray_wxLua_wxFileName_constructor4 }};
--- 2069,2073 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_constructor4[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_constructor4(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_constructor4[1] = {{ wxLua_wxFileName_constructor4, WXLUAMETHOD_CONSTRUCTOR, 4, 5, s_wxluatagArray_wxLua_wxFileName_constructor4 }};
***************
*** 2101,2105 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_constructor3[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_constructor3(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_constructor3[1] = {{ wxLua_wxFileName_constructor3, WXLUAMETHOD_CONSTRUCTOR, 2, 3, s_wxluatagArray_wxLua_wxFileName_constructor3 }};
--- 2101,2105 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_constructor3[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_constructor3(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_constructor3[1] = {{ wxLua_wxFileName_constructor3, WXLUAMETHOD_CONSTRUCTOR, 2, 3, s_wxluatagArray_wxLua_wxFileName_constructor3 }};
***************
*** 2129,2133 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_constructor2[] = { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFileName_constructor2(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_constructor2[1] = {{ wxLua_wxFileName_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxFileName_constructor2 }};
--- 2129,2133 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFileName_constructor2[] = { &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFileName_constructor2(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFileName_constructor2[1] = {{ wxLua_wxFileName_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxFileName_constructor2 }};
***************
*** 2512,2516 ****
  int s_wxluatag_wxFile = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Access[] = { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFile_Access(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Access[1] = {{ wxLua_wxFile_Access, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 2, 2, s_wxluatagArray_wxLua_wxFile_Access }};
--- 2512,2516 ----
  int s_wxluatag_wxFile = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Access[] = { &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFile_Access(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Access[1] = {{ wxLua_wxFile_Access, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 2, 2, s_wxluatagArray_wxLua_wxFile_Access }};
***************
*** 2741,2745 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Open[] = { &s_wxluatag_wxFile, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFile_Open(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Open[1] = {{ wxLua_wxFile_Open, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFile_Open }};
--- 2741,2745 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Open[] = { &s_wxluatag_wxFile, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFile_Open(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Open[1] = {{ wxLua_wxFile_Open, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFile_Open }};
***************
*** 2796,2800 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Seek[] = { &s_wxluatag_wxFile, &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFile_Seek(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Seek[1] = {{ wxLua_wxFile_Seek, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFile_Seek }};
--- 2796,2800 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_Seek[] = { &s_wxluatag_wxFile, &s_wxluaarg_Number, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFile_Seek(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_Seek[1] = {{ wxLua_wxFile_Seek, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxFile_Seek }};
***************
*** 2929,2933 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFile_constructor1(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_constructor1[1] = {{ wxLua_wxFile_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxFile_constructor1 }};
--- 2929,2933 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFile_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFile_constructor1(lua_State *L);
  // static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFile_constructor1[1] = {{ wxLua_wxFile_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxFile_constructor1 }};
***************
*** 3189,3193 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTempFile_Seek[] = { &s_wxluatag_wxTempFile, &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxTempFile_Seek(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTempFile_Seek[1] = {{ wxLua_wxTempFile_Seek, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxTempFile_Seek }};
--- 3189,3193 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxTempFile_Seek[] = { &s_wxluatag_wxTempFile, &s_wxluaarg_Number, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxTempFile_Seek(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxTempFile_Seek[1] = {{ wxLua_wxTempFile_Seek, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxTempFile_Seek }};
***************
*** 4046,4050 ****
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxFile && wxUSE_FILE)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxInputStream_SeekI[] = { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxInputStream_SeekI(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxInputStream_SeekI[1] = {{ wxLua_wxInputStream_SeekI, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxInputStream_SeekI }};
--- 4046,4050 ----
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxFile && wxUSE_FILE)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxInputStream_SeekI[] = { &s_wxluatag_wxInputStream, &s_wxluaarg_Number, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxInputStream_SeekI(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxInputStream_SeekI[1] = {{ wxLua_wxInputStream_SeekI, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxInputStream_SeekI }};
***************
*** 4280,4284 ****
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxFile && wxUSE_FILE)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxOutputStream_SeekO[] = { &s_wxluatag_wxOutputStream, &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxOutputStream_SeekO(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxOutputStream_SeekO[1] = {{ wxLua_wxOutputStream_SeekO, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxOutputStream_SeekO }};
--- 4280,4284 ----
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxFile && wxUSE_FILE)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxOutputStream_SeekO[] = { &s_wxluatag_wxOutputStream, &s_wxluaarg_Number, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxOutputStream_SeekO(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxOutputStream_SeekO[1] = {{ wxLua_wxOutputStream_SeekO, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxOutputStream_SeekO }};

Index: socket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/socket.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** socket.cpp	5 Jun 2007 21:07:23 -0000	1.35
--- socket.cpp	6 Jun 2007 03:53:38 -0000	1.36
***************
*** 495,499 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketBase_SetFlags[] = { &s_wxluatag_wxSocketBase, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxSocketBase_SetFlags(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxSocketBase_SetFlags[1] = {{ wxLua_wxSocketBase_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxSocketBase_SetFlags }};
--- 495,499 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketBase_SetFlags[] = { &s_wxluatag_wxSocketBase, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxSocketBase_SetFlags(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxSocketBase_SetFlags[1] = {{ wxLua_wxSocketBase_SetFlags, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxSocketBase_SetFlags }};
***************
*** 513,517 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketBase_SetNotify[] = { &s_wxluatag_wxSocketBase, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxSocketBase_SetNotify(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxSocketBase_SetNotify[1] = {{ wxLua_wxSocketBase_SetNotify, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxSocketBase_SetNotify }};
--- 513,517 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketBase_SetNotify[] = { &s_wxluatag_wxSocketBase, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxSocketBase_SetNotify(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxSocketBase_SetNotify[1] = {{ wxLua_wxSocketBase_SetNotify, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxSocketBase_SetNotify }};
***************
*** 858,862 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketClient_constructor[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxSocketClient_constructor(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxSocketClient_constructor[1] = {{ wxLua_wxSocketClient_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxSocketClient_constructor }};
--- 858,862 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketClient_constructor[] = { &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxSocketClient_constructor(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxSocketClient_constructor[1] = {{ wxLua_wxSocketClient_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxSocketClient_constructor }};
***************
*** 987,991 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketServer_constructor[] = { &s_wxluatag_wxSockAddress, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxSocketServer_constructor(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxSocketServer_constructor[1] = {{ wxLua_wxSocketServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxSocketServer_constructor }};
--- 987,991 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxSocketServer_constructor[] = { &s_wxluatag_wxSockAddress, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxSocketServer_constructor(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxSocketServer_constructor[1] = {{ wxLua_wxSocketServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxSocketServer_constructor }};
***************
*** 2338,2342 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFTP_SetTransferMode[] = { &s_wxluatag_wxFTP, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxFTP_SetTransferMode(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFTP_SetTransferMode[1] = {{ wxLua_wxFTP_SetTransferMode, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFTP_SetTransferMode }};
--- 2338,2342 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxFTP_SetTransferMode[] = { &s_wxluatag_wxFTP, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxFTP_SetTransferMode(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxFTP_SetTransferMode[1] = {{ wxLua_wxFTP_SetTransferMode, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxFTP_SetTransferMode }};

Index: defsutil.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** defsutil.cpp	5 Jun 2007 21:07:21 -0000	1.33
--- defsutil.cpp	6 Jun 2007 03:53:36 -0000	1.34
***************
*** 245,249 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Kill[] = { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_Kill(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Kill[1] = {{ wxLua_wxProcess_Kill, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 3, s_wxluatagArray_wxLua_wxProcess_Kill }};
--- 245,249 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Kill[] = { &s_wxluaarg_Number, &s_wxluaarg_Enum, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_Kill(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Kill[1] = {{ wxLua_wxProcess_Kill, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 3, s_wxluatagArray_wxLua_wxProcess_Kill }};

Index: datetime.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** datetime.cpp	5 Jun 2007 21:07:21 -0000	1.37
--- datetime.cpp	6 Jun 2007 03:53:36 -0000	1.38
***************
*** 100,104 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTime_Format[] = { &s_wxluatag_wxDateTime, &s_wxluaarg_String, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxDateTime_Format(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDateTime_Format[1] = {{ wxLua_wxDateTime_Format, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxDateTime_Format }};
--- 100,104 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTime_Format[] = { &s_wxluatag_wxDateTime, &s_wxluaarg_String, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxDateTime_Format(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxDateTime_Format[1] = {{ wxLua_wxDateTime_Format, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxDateTime_Format }};
***************
*** 239,243 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxDateTime_GetLastMonthDay[] = { &s_wxluatag_wxDateTime, &s_wxluaarg_...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxluadebug/include wxldebug.h, 1.34, 1.35

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25933/modules/wxluadebug/include

Modified Files:
	wxldebug.h 
Log Message:
Switch s_wxluaarg_Enumeration to s_wxluaarg_Enum
Add the rest of the LUA_TXXX types as s_wxluaarg_XXX and create #defines 
  as well as functions to verify them with the result of lua_type()
Unify all of the wxlua_isXXXtype functions to all call the same function
Get rid of wxLuaStringToLongHashMap in wxlstate.h and don't use it anymore
  in wxLuaCheckStack since we can just use a wxSortedArrayString 
Remove wxLuaState::GetBaseLuaClass since it wasn't used anywhere
Cleanup wxLuaState::CallOverloadedFunction to use new check function


Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxldebug.h	31 May 2007 17:18:54 -0000	1.34
--- wxldebug.h	6 Jun 2007 03:53:40 -0000	1.35
***************
*** 181,185 ****
      void DumpGlobals();
      void DumpTable(const wxString &tableName);
!     void DumpTable(int index, const wxString& tablename, wxLuaStringToLongHashMap& dumpList, int indent);
      void DumpStack();
  
--- 181,185 ----
      void DumpGlobals();
      void DumpTable(const wxString &tableName);
!     void DumpTable(int index, const wxString& tablename, wxSortedArrayString& tableArray, int indent);
      void DumpStack();
  

[Wxlua-commit] wxLua/modules/wxlua/include wxlbind.h, 1.41, 1.42 wxlstate.h, 1.69, 1.70

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

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

Modified Files:
	wxlbind.h wxlstate.h 
Log Message:
Switch s_wxluaarg_Enumeration to s_wxluaarg_Enum
Add the rest of the LUA_TXXX types as s_wxluaarg_XXX and create #defines 
  as well as functions to verify them with the result of lua_type()
Unify all of the wxlua_isXXXtype functions to all call the same function
Get rid of wxLuaStringToLongHashMap in wxlstate.h and don't use it anymore
  in wxLuaCheckStack since we can just use a wxSortedArrayString 
Remove wxLuaState::GetBaseLuaClass since it wasn't used anywhere
Cleanup wxLuaState::CallOverloadedFunction to use new check function


Index: wxlbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** wxlbind.h	5 Jun 2007 21:07:25 -0000	1.41
--- wxlbind.h	6 Jun 2007 03:53:40 -0000	1.42
***************
*** 87,98 ****
  // wxlua arg tags for common lua types
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_None;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_String;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Boolean;
- extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Enumeration;
- extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Number;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LightUserData;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_UserData;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaTable;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction;
  
  struct WXDLLIMPEXP_WXLUA WXLUADEFINE // defines a wxWidgets define for wxLua
--- 87,113 ----
  // wxlua arg tags for common lua types
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_None;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Nil;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Boolean;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LightUserData;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Number;
! extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_String;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaTable;
  extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaFunction;
+ extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_UserData;
+ extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_LuaThread;
+ extern WXDLLIMPEXP_DATA_WXLUA(int) s_wxluaarg_Enum;
+ 
+ #define WXLUAARG_None            0
+ #define WXLUAARG_Nil            -2
+ #define WXLUAARG_Boolean        -3
+ #define WXLUAARG_LightUserData  -4
+ #define WXLUAARG_Number         -5
+ #define WXLUAARG_String         -6
+ #define WXLUAARG_LuaTable       -7
+ #define WXLUAARG_LuaFunction    -8
+ #define WXLUAARG_UserData       -9
+ #define WXLUAARG_LuaThread      -10
+ #define WXLUAARG_Enum           -11
+ 
  
  struct WXDLLIMPEXP_WXLUA WXLUADEFINE // defines a wxWidgets define for wxLua

Index: wxlstate.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** wxlstate.h	5 Jun 2007 21:07:25 -0000	1.69
--- wxlstate.h	6 Jun 2007 03:53:40 -0000	1.70
***************
*** 51,56 ****
  class WXDLLIMPEXP_WXLUA wxLuaWinDestroyCallback;
  
- WX_DECLARE_STRING_HASH_MAP_WITH_DECL(long, wxLuaStringToLongHashMap, class WXDLLIMPEXP_WXLUA);
- 
  // ----------------------------------------------------------------------------
  // String functions - convert between Lua (ansi string) and wxString (encoded)
--- 51,54 ----
***************
*** 157,160 ****
--- 155,166 ----
  
  
+ // Verify if the luatype = lua_type(L, stack_idx) is valid for the 
+ // wxluaarg_type which is one of the predefined WXLUAARG_XXX or s_wxluaarg_XXX types.
+ // Returns 1 if it matches, 0 if it doesn't, -1 if the wxluaarg_type is not known.
+ WXDLLIMPEXP_WXLUA int LUACALL wxlua_iswxluatype(int luatype, int wxluaarg_type);
+ // Get a human readable name for the predefined WXLUAARG_XXX or s_wxluaarg_XXX types.
+ //  returns "unknown" if the tag was not one of the predefined types.
+ WXDLLIMPEXP_WXLUA wxString wxlua_getwxluatypename(int wxluaarg_type);
+ 
  // Helper functions to get numbers, booleans and strings safer.
  // These validate that the object at the stack index specified is a string, bool,
***************
*** 162,169 ****
  // Note: wxLua has a stricter sense of type than lua and we don't want to
  //       always allow coersion between types since oftentimes there's an error.
! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_isstringtype(lua_State* L, int stack_idx);
! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_isbooleantype(lua_State* L, int stack_idx);
! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_isenumerationtype(lua_State* L, int stack_idx);
! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_isnumbertype(lua_State* L, int stack_idx);
  // After verifying using wxlua_isXXXtype return the value, else call
  // wxlua_terror with a message that's appropriate for stack_idx to be a
--- 168,176 ----
  // Note: wxLua has a stricter sense of type than lua and we don't want to
  //       always allow coersion between types since oftentimes there's an error.
! #define wxlua_isstringtype(L, stack_idx)      (wxlua_iswxluatype(lua_type(L, stack_idx), WXLUAARG_String) == 1)
! #define wxlua_isbooleantype(L, stack_idx)     (wxlua_iswxluatype(lua_type(L, stack_idx), WXLUAARG_Boolean) == 1)
! #define wxlua_isenumerationtype(L, stack_idx) (wxlua_iswxluatype(lua_type(L, stack_idx), WXLUAARG_Enum) == 1)
! #define wxlua_isnumbertype(L, stack_idx)      (wxlua_iswxluatype(lua_type(L, stack_idx), WXLUAARG_Number) == 1)
! 
  // After verifying using wxlua_isXXXtype return the value, else call
  // wxlua_terror with a message that's appropriate for stack_idx to be a
***************
*** 472,476 ****
      wxLUA_UNUSED_NOTUNICODE(void RegisterFunction(lua_CFunction func, const wxString &funcName) { RegisterFunction(func, wx2lua(funcName)); })
      // Register all the bindings in the wxLuaStateData, this is done
!     //   automatically by default (internal use)
      void RegisterBindings(bool registerTypes);
  
--- 479,483 ----
      wxLUA_UNUSED_NOTUNICODE(void RegisterFunction(lua_CFunction func, const wxString &funcName) { RegisterFunction(func, wx2lua(funcName)); })
      // Register all the bindings in the wxLuaStateData, this is done
!     //   automatically by default on creation. (internal use)
      void RegisterBindings(bool registerTypes);
  
***************
*** 489,495 ****
      // Get the first WXLUACLASS that has this particular WXLUAMETHOD_CFUNC in it's methods
      const WXLUACLASS* GetLuaClass(const WXLUAMETHOD_CFUNC* method_cfunc) const;
-     // Get base WXLUACLASS for given Tag using WXLUACLASS::class_tag and
-     //   WXLUACLASS::baseclass_tag. returns NULL on failure.
-     const WXLUACLASS* GetBaseLuaClass(int iClassTag) const;
      // returns true if iClassTag is derived or equal to iBaseClassTag by using
      //   WXLUACLASS::class_tag and WXLUACLASS::baseclass_tag.
--- 496,499 ----
***************
*** 906,910 ****
  
      // Return a human readable string of the args for the functions in the method
!     wxString CreateMethodArgTagsMsg(struct WXLUAMETHOD* method);
      // overloaded function call helper
  	int LUACALL CallOverloadedFunction(struct WXLUAMETHOD* method);
--- 910,914 ----
  
      // Return a human readable string of the args for the functions in the method
!     wxArrayString CreateMethodArgTagsMsg(struct WXLUAMETHOD* method);
      // overloaded function call helper
  	int LUACALL CallOverloadedFunction(struct WXLUAMETHOD* method);

[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.31, 1.32

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

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

Modified Files:
	wxldebug.cpp 
Log Message:
Switch s_wxluaarg_Enumeration to s_wxluaarg_Enum
Add the rest of the LUA_TXXX types as s_wxluaarg_XXX and create #defines 
  as well as functions to verify them with the result of lua_type()
Unify all of the wxlua_isXXXtype functions to all call the same function
Get rid of wxLuaStringToLongHashMap in wxlstate.h and don't use it anymore
  in wxLuaCheckStack since we can just use a wxSortedArrayString 
Remove wxLuaState::GetBaseLuaClass since it wasn't used anywhere
Cleanup wxLuaState::CallOverloadedFunction to use new check function


Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** wxldebug.cpp	31 May 2007 17:18:54 -0000	1.31
--- wxldebug.cpp	6 Jun 2007 03:53:40 -0000	1.32
***************
*** 488,495 ****
  
      lua_State* L = m_luaState;
!     wxLuaStringToLongHashMap dumpList;
  
      lua_pushvalue(L, LUA_GLOBALSINDEX);
!     DumpTable(lua_gettop(L), wxT("Globals"), dumpList, 0);
      lua_pop(L, 1);
  }
--- 488,495 ----
  
      lua_State* L = m_luaState;
!     wxSortedArrayString tableArray;
  
      lua_pushvalue(L, LUA_GLOBALSINDEX);
!     DumpTable(lua_gettop(L), wxT("Globals"), tableArray, 0);
      lua_pop(L, 1);
  }
***************
*** 500,512 ****
  
      lua_State* L = m_luaState;
!     wxLuaStringToLongHashMap dumpList;
  
      lua_pushstring(L, wx2lua(name));
      lua_gettable(L, LUA_GLOBALSINDEX);
!     DumpTable(lua_gettop(L), name, dumpList, 0);
      lua_pop(L, 1);
  }
  
! void wxLuaCheckStack::DumpTable(int index, const wxString& tablename, wxLuaStringToLongHashMap& dumpList, int indent)
  {
      wxCHECK_RET(m_luaState, wxT("Invalid lua_State"));
--- 500,512 ----
  
      lua_State* L = m_luaState;
!     wxSortedArrayString tableArray;
  
      lua_pushstring(L, wx2lua(name));
      lua_gettable(L, LUA_GLOBALSINDEX);
!     DumpTable(lua_gettop(L), name, tableArray, 0);
      lua_pop(L, 1);
  }
  
! void wxLuaCheckStack::DumpTable(int index, const wxString& tablename, wxSortedArrayString& tableArray, int indent)
  {
      wxCHECK_RET(m_luaState, wxT("Invalid lua_State"));
***************
*** 545,561 ****
          OutputMsg(info);
  
!         if (dumpList.find(value) != dumpList.end())
          {
              if (valueType == wxT("Table"))
              {
                  wxString tname = wxString::Format(wxT("%s.%s"), tablename.c_str(), indexValue.c_str());
!                 dumpList[value] = 1;
                  int tableIndex = lua_gettop(L);
  //                lua_pushvalue(L, lua_gettop(L));
!                 DumpTable(tableIndex, tname, dumpList, indent+1);
              }
              else
              {
!                 dumpList[value] = 1;
              }
          }
--- 545,561 ----
          OutputMsg(info);
  
!         if (tableArray.Index(value) == wxNOT_FOUND)
          {
              if (valueType == wxT("Table"))
              {
                  wxString tname = wxString::Format(wxT("%s.%s"), tablename.c_str(), indexValue.c_str());
!                 tableArray.Add(value);
                  int tableIndex = lua_gettop(L);
  //                lua_pushvalue(L, lua_gettop(L));
!                 DumpTable(tableIndex, tname, tableArray, indent+1);
              }
              else
              {
!                 tableArray.Add(value);
              }
          }

[Wxlua-commit] wxLua/modules/wxbindstc/src stc.cpp,1.33,1.34

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

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

Modified Files:
	stc.cpp 
Log Message:
Switch s_wxluaarg_Enumeration to s_wxluaarg_Enum
Add the rest of the LUA_TXXX types as s_wxluaarg_XXX and create #defines 
  as well as functions to verify them with the result of lua_type()
Unify all of the wxlua_isXXXtype functions to all call the same function
Get rid of wxLuaStringToLongHashMap in wxlstate.h and don't use it anymore
  in wxLuaCheckStack since we can just use a wxSortedArrayString 
Remove wxLuaState::GetBaseLuaClass since it wasn't used anywhere
Cleanup wxLuaState::CallOverloadedFunction to use new check function


Index: stc.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbindstc/src/stc.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** stc.cpp	5 Jun 2007 21:07:24 -0000	1.33
--- stc.cpp	6 Jun 2007 03:53:39 -0000	1.34
***************
*** 7623,7627 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetFontAttr[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxStyledTextCtrl_StyleSetFontAttr(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetFontAttr[1] = {{ wxLua_wxStyledTextCtrl_StyleSetFontAttr, WXLUAMETHOD_METHOD, 7, 8, s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetFontAttr }};
--- 7623,7627 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetFontAttr[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxStyledTextCtrl_StyleSetFontAttr(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetFontAttr[1] = {{ wxLua_wxStyledTextCtrl_StyleSetFontAttr, WXLUAMETHOD_METHOD, 7, 8, s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetFontAttr }};
***************
*** 7655,7659 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetFontEncoding[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxStyledTextCtrl_StyleSetFontEncoding(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetFontEncoding[1] = {{ wxLua_wxStyledTextCtrl_StyleSetFontEncoding, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetFontEncoding }};
--- 7655,7659 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetFontEncoding[] = { &s_wxluatag_wxStyledTextCtrl, &s_wxluaarg_Number, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxStyledTextCtrl_StyleSetFontEncoding(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextCtrl_StyleSetFontEncoding[1] = {{ wxLua_wxStyledTextCtrl_StyleSetFontEncoding, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxStyledTextCtrl_StyleSetFontEncoding }};
***************
*** 9486,9490 ****
  
  #if wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP
! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult[] = { &s_wxluatag_wxStyledTextEvent, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxStyledTextEvent_SetDragResult(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextEvent_SetDragResult[1] = {{ wxLua_wxStyledTextEvent_SetDragResult, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult }};
--- 9486,9490 ----
  
  #if wxLUA_USE_wxDragDrop && wxUSE_DRAG_AND_DROP
! static wxLuaArgTag s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult[] = { &s_wxluatag_wxStyledTextEvent, &s_wxluaarg_Enum, 0 };
  static int LUACALL wxLua_wxStyledTextEvent_SetDragResult(lua_State *L);
  static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxStyledTextEvent_SetDragResult[1] = {{ wxLua_wxStyledTextEvent_SetDragResult, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxStyledTextEvent_SetDragResult }};

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.112,1.113

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

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

Modified Files:
	genwxbind.lua 
Log Message:
Switch s_wxluaarg_Enumeration to s_wxluaarg_Enum


Index: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** genwxbind.lua	5 Jun 2007 21:07:20 -0000	1.112
--- genwxbind.lua	6 Jun 2007 03:46:37 -0000	1.113
***************
*** 2825,2829 ****
                      table.insert(codeList, "    bool val = wxlua_getbooleantype(L, 2);\n")
                  elseif IsDataTypeEnum(memberType) then
!                     overload_argList = overload_argList.."&s_wxluaarg_Enumeration, "
                      CommentBindingTable(codeList, "    // get the number value\n")
                      table.insert(codeList, "    "..memberType.." val = ("..memberType..")wxlua_getenumerationtype(L, 2);\n")
--- 2825,2829 ----
                      table.insert(codeList, "    bool val = wxlua_getbooleantype(L, 2);\n")
                  elseif IsDataTypeEnum(memberType) then
!                     overload_argList = overload_argList.."&s_wxluaarg_Enum, "
                      CommentBindingTable(codeList, "    // get the number value\n")
                      table.insert(codeList, "    "..memberType.." val = ("..memberType..")wxlua_getenumerationtype(L, 2);\n")
***************
*** 3218,3222 ****
                              argItem = "wxlua_getbooleantype(L, "..argNum..")"
                          elseif IsDataTypeEnum(argType) then
!                             overload_argList = overload_argList.."&s_wxluaarg_Enumeration, "
                              argItem = "("..argType..")wxlua_getenumerationtype(L, "..argNum..")"
                          else
--- 3218,3222 ----
                              argItem = "wxlua_getbooleantype(L, "..argNum..")"
                          elseif IsDataTypeEnum(argType) then
!                             overload_argList = overload_argList.."&s_wxluaarg_Enum, "
                              argItem = "("..argType..")wxlua_getenumerationtype(L, "..argNum..")"
                          else

[Wxlua-commit] wxLua/bindings genwxbind.lua,1.111,1.112

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

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

Modified Files:
	genwxbind.lua 
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: genwxbind.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** genwxbind.lua	31 May 2007 17:18:45 -0000	1.111
--- genwxbind.lua	5 Jun 2007 21:07:20 -0000	1.112
***************
*** 18,23 ****
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 7 -- Used to verify that the bindings are updated
                            -- This must match modules/wxlua/include/wxldefs.h
  
  bindingKeywordTable     = {} -- Binding keywords used by the generator %XXX
--- 18,24 ----
  -- ---------------------------------------------------------------------------
  
! WXLUA_BINDING_VERSION = 8 -- Used to verify that the bindings are updated
                            -- This must match modules/wxlua/include/wxldefs.h
+                           -- otherwise a compile time error will be generated.
  
  bindingKeywordTable     = {} -- Binding keywords used by the generator %XXX
***************
*** 1248,1254 ****
      for line in io.lines(filename) do
          local lineData = SplitString(line, delimiters)
!         local isOverride = nil
!         local isEnd = nil
!         local override = nil
  
          LineNumber = LineNumber + 1
--- 1249,1254 ----
      for line in io.lines(filename) do
          local lineData = SplitString(line, delimiters)
!         local isOverride = false
!         local isEnd = false
  
          LineNumber = LineNumber + 1
***************
*** 1345,1349 ****
  function LineTableErrString(lineTable)
      if lineTable then
!         return "File: '"..lineTable.File.."':(line "..lineTable.LineNumber..")"
      else
          return ""
--- 1345,1349 ----
  function LineTableErrString(lineTable)
      if lineTable then
!         return "File: '"..lineTable.File.."':(line "..lineTable.LineNumber..")\n    '"..lineTable.Line.."'"
      else
          return ""
***************
*** 1522,1526 ****
  
      for l = 1, #interfaceData do
-         -- get lineData
          local lineTable = interfaceData[l]
          local lineTags  = lineTable.Tags
--- 1522,1525 ----
***************
*** 1536,1539 ****
--- 1535,1539 ----
  
              if bindingKeywordTable[tag] then
+ 
                  -- block comment (start)
                  if tag == "/*" then
***************
*** 1629,1633 ****
      while interfaceData[l+1] do -- not for loop so we can adjust l
          l = l + 1
!         -- get lineData
          local lineTable = interfaceData[l]
          local lineTags  = interfaceData[l].Tags
--- 1629,1633 ----
      while interfaceData[l+1] do -- not for loop so we can adjust l
          l = l + 1
! 
          local lineTable = interfaceData[l]
          local lineTags  = interfaceData[l].Tags
***************
*** 2115,2121 ****
                              lineState.Name = tag
  
-                             -- local member= AllocMember(lineState)
-                             -- table.insert(parseState.ObjectStack[1].Members, member)
- 
                              lineState.Action = "propertycomma"
                              lineState.ActionMandatory = false
--- 2115,2118 ----
***************
*** 2175,2179 ****
                                  lineState.ActionMandatory = true
  
!                             elseif IsDelimiter(tag) or  functionAttribTable[tag] then
                                  print("Error: Expected Member Name, got Tag='"..tag.."'. "..LineTableErrString(lineTable))
                              else
--- 2172,2176 ----
                                  lineState.ActionMandatory = true
  
!                             elseif IsDelimiter(tag) or functionAttribTable[tag] then
                                  print("Error: Expected Member Name, got Tag='"..tag.."'. "..LineTableErrString(lineTable))
                              else
***************
*** 2228,2232 ****
                                  lineState.Name = bindingOperatorTable[op]
  
!                             elseif tag == '(' then
                                  if lineState.DataType == parseState.ObjectStack[1].Name then
                                      lineState.IsConstructor = true
--- 2225,2229 ----
                                  lineState.Name = bindingOperatorTable[op]
  
!                             elseif tag == "(" then
                                  if lineState.DataType == parseState.ObjectStack[1].Name then
                                      lineState.IsConstructor = true
***************
*** 2584,2591 ****
          -- de-duplicates include references, must generate them first
          if parseObject.DefType == "include" then
- --            local key = parseObject.Name
- --            if parseObject.Condition then
- --                key = key.."_"..parseObject.Condition
- --            end
  
              local includecondition = FixCondition(parseObject.Condition)
--- 2581,2584 ----
***************
*** 2609,2615 ****
          local parseObject = interface.objectData[o]
  
!         -- ///////////////////////////////////////////////////////////////////
          -- encapsulate non-wxObject objects with a tracked wxObject
          if parseObject.Encapsulate then
              local encapcondition = FixCondition(parseObject.Condition)
              local encapsulationBinding =
--- 2602,2609 ----
          local parseObject = interface.objectData[o]
  
!         -- -------------------------------------------------------------------
          -- encapsulate non-wxObject objects with a tracked wxObject
          if parseObject.Encapsulate then
+ 
              local encapcondition = FixCondition(parseObject.Condition)
              local encapsulationBinding =
***************
*** 2620,2624 ****
              }
  
!             if not encapsulationBindingTable[encapcondition] then encapsulationBindingTable[encapcondition] = {} end
              encapsulationBindingTable[encapcondition][parseObject.Name] = encapsulationBinding
          end
--- 2614,2621 ----
              }
  
!             if not encapsulationBindingTable[encapcondition] then
!                 encapsulationBindingTable[encapcondition] = {}
!             end
! 
              encapsulationBindingTable[encapcondition][parseObject.Name] = encapsulationBinding
          end
***************
*** 2630,2635 ****
              local fullcondition = FixCondition(AddCondition(member.Condition, member.ExtraCondition))
  
!             -- ///////////////////////////////////////////////////////////////
              -- property binding
              if member.DefType == "property" then
                  -- conditions for member are dependent on return type, argument types, and inline conditions
--- 2627,2633 ----
              local fullcondition = FixCondition(AddCondition(member.Condition, member.ExtraCondition))
  
!             -- ---------------------------------------------------------------
              -- property binding
+             -- ---------------------------------------------------------------
              if member.DefType == "property" then
                  -- conditions for member are dependent on return type, argument types, and inline conditions
***************
*** 2666,2669 ****
--- 2664,2668 ----
                      {
                          LuaName = member.Name,
+                         FuncType = "WXLUAMETHOD_GETPROP",
                          Map = "    { WXLUAMETHOD_GETPROP, \""..member.Name.."\", s_wxluafunc_wxLua_"..MakeVar(parseObject.Name).."_Get"..member.Name..", 1 },\n",
                          Condition = propertycondition
***************
*** 2678,2681 ****
--- 2677,2681 ----
                      {
                          LuaName = member.Name,
+                         FuncType = "WXLUAMETHOD_SETPROP",
                          Map = "    { WXLUAMETHOD_SETPROP, \""..member.Name.."\", s_wxluafunc_wxLua_"..MakeVar(parseObject.Name).."_Set"..member.Name..", 1 },\n",
                          Condition = propertycondition
***************
*** 2685,2690 ****
                  end
  
!             -- //////////////////////////////////////////////////////////////////////////////////
              -- member binding
              elseif member.DefType == "member" then
                  local memberType = GetTypeDef(member.DataType)
--- 2685,2691 ----
                  end
  
!             -- ---------------------------------------------------------------
              -- member binding
+             -- ---------------------------------------------------------------
              elseif member.DefType == "member" then
                  local memberType = GetTypeDef(member.DataType)
***************
*** 2721,2731 ****
                  -- GET MEMBER CODE
                  local codeList = {}
                  local funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..memberGetFunc
                  CommentBindingTable(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
!                 table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n")
!                 table.insert(codeList, "{\n")
                  table.insert(codeList, "    wxLuaState wxlState(L);\n")
                  CommentBindingTable(codeList, "    // get this\n")
                  table.insert(codeList, "    "..parseObject.Name.." *self = ("..parseObject.Name.." *) wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n")
  
                  if memberType == "wxString" then
--- 2722,2733 ----
                  -- GET MEMBER CODE
                  local codeList = {}
+                 local overload_argList = ""
                  local funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..memberGetFunc
                  CommentBindingTable(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
!                 table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n")
                  table.insert(codeList, "    wxLuaState wxlState(L);\n")
                  CommentBindingTable(codeList, "    // get this\n")
                  table.insert(codeList, "    "..parseObject.Name.." *self = ("..parseObject.Name.." *) wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n")
+                 overload_argList = "&s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..overload_argList
  
                  if memberType == "wxString" then
***************
*** 2752,2759 ****
                  end
  
!                 CommentBindingTable(codeList, "    // return the number of parameters\n")
                  table.insert(codeList, "    return 1;\n")
                  table.insert(codeList, "}\n\n")
  
                  local funcMapName = "s_wxluafunc_"..funcName
  
--- 2754,2768 ----
                  end
  
!                 CommentBindingTable(codeList, "    // return the number of values\n")
                  table.insert(codeList, "    return 1;\n")
                  table.insert(codeList, "}\n\n")
  
+                 local overload_argListName = "s_wxluatagArray_".. funcName
+                 if overload_argList == "" then
+                     overload_argListName = "s_wxluaargArray_None"
+                 else
+                     overload_argList = "{ "..overload_argList.."0 }"
+                 end
+ 
                  local funcMapName = "s_wxluafunc_"..funcName
  
***************
*** 2764,2770 ****
                      CFunctionName = funcName,
                      Method = codeList,
!                     FuncMap = "{ "..funcName..", 0, 0, s_wxluaargArray_None }",
                      FuncMapName = funcMapName,
!                     Map    = "    { WXLUAMETHOD_METHOD, \""..memberGetFunc.."\", "..funcMapName..", 1 },\n",
                      Condition = membercondition
                  }
--- 2773,2782 ----
                      CFunctionName = funcName,
                      Method = codeList,
!                     ArgArray = overload_argList,
!                     ArgArrayName = overload_argListName,
!                     FuncType = "WXLUAMETHOD_METHOD",
!                     FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 1, 1, "..overload_argListName.." }",
                      FuncMapName = funcMapName,
!                     Map = "    { WXLUAMETHOD_METHOD, \""..memberGetFunc.."\", "..funcMapName..", 1, 0 },\n",
                      Condition = membercondition
                  }
***************
*** 2774,2778 ****
                  {
                      LuaName = member.Name,
!                     Map = "    { WXLUAMETHOD_GETPROP, \""..member.Name.."\", "..funcMapName..", 1 },\n",
                      Condition = membercondition
                  }
--- 2786,2791 ----
                  {
                      LuaName = member.Name,
!                     FuncType = "WXLUAMETHOD_GETPROP",
!                     Map = "    { WXLUAMETHOD_GETPROP, \""..member.Name.."\", "..funcMapName..", 1, 0 },\n",
                      Condition = membercondition
                  }
***************
*** 2789,2799 ****
                  -- SET MEMBER CODE
                  codeList = {}
                  local funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..memberSetFunc
                  CommentBindingTable(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
!                 table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n")
!                 table.insert(codeList, "{\n")
                  table.insert(codeList, "    wxLuaState wxlState(L);\n")
  
-                 local overload_argList = " "
                  if memberType == "wxString" then
                      overload_argList = overload_argList.."&s_wxluaarg_String, "
--- 2802,2811 ----
                  -- SET MEMBER CODE
                  codeList = {}
+                 overload_argList = ""
                  local funcName = "wxLua_"..MakeVar(parseObject.Name).."_"..memberSetFunc
                  CommentBindingTable(codeList, "// "..interface.lineData[member.LineNumber].Line.."\n")
!                 table.insert(codeList, "static int LUACALL "..funcName.."(lua_State *L)\n{\n")
                  table.insert(codeList, "    wxLuaState wxlState(L);\n")
  
                  if memberType == "wxString" then
                      overload_argList = overload_argList.."&s_wxluaarg_String, "
***************
*** 2823,2826 ****
--- 2835,2839 ----
                  CommentBindingTable(codeList, "    // get this\n")
                  table.insert(codeList, "    "..parseObject.Name.." *self = ("..parseObject.Name.." *)wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n")
+                 overload_argList = "&s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..overload_argList
  
                  if not numeric and (not memberPtr or (memberPtr == "&"))  then
***************
*** 2830,2843 ****
                  end
  
!                 CommentBindingTable(codeList, "    // return the number of parameters\n")
                  table.insert(codeList, "    return 0;\n")
                  table.insert(codeList, "}\n\n")
  
                  local overload_argListName = "s_wxluatagArray_".. funcName
!                 overload_argList = overload_argList.."0 }"
!                 if overload_argList == " 0 }" then -- empty
                      overload_argListName = "s_wxluaargArray_None"
                  else
!                     overload_argList = "{"..overload_argList
                  end
  
--- 2843,2855 ----
                  end
  
!                 CommentBindingTable(codeList, "    // return the number of values\n")
                  table.insert(codeList, "    return 0;\n")
                  table.insert(codeList, "}\n\n")
  
                  local overload_argListName = "s_wxluatagArray_".. funcName
!                 if overload_argList == "" then
                      overload_argListName = "s_wxluaargArray_None"
                  else
!                     overload_argList = "{ "..overload_argList.."0 }"
                  end
  
***************
*** 2852,2858 ****
                      ArgArray = overload_argList,
                      ArgArrayName = overload_argListName,
!                     FuncMap = "{ "..funcName..", 1, 1, "..overload_argListName.." }", -- FIXME make sure this is right
                      FuncMapName = funcMapName,
!                     Map = "    { WXLUAMETHOD_METHOD, \""..memberSetFunc.."\", "..funcMapName..", 1 },\n",
                      Condition = membercondition
                  }
--- 2864,2871 ----
                      ArgArray = overload_argList,
                      ArgArrayName = overload_argListName,
!                     FuncType = "WXLUAMETHOD_METHOD",
!                     FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 2, 2, "..overload_argListName.." }", -- FIXME make sure this is right
                      FuncMapName = funcMapName,
!                     Map = "    { WXLUAMETHOD_METHOD, \""..memberSetFunc.."\", "..funcMapName..", 1, 0 },\n",
                      Condition = membercondition
                  }
***************
*** 2862,2866 ****
                  {
                      LuaName = member.Name,
!                     Map = "    { WXLUAMETHOD_SETPROP, \""..member.Name.."\", "..funcMapName..", 1 },\n",
                      Condition = fullcondition
                  }
--- 2875,2880 ----
                  {
                      LuaName = member.Name,
!                     FuncType = "WXLUAMETHOD_SETPROP",
!                     Map = "    { WXLUAMETHOD_SETPROP, \""..member.Name.."\", "..funcMapName..", 1, 0 },\n",
                      Condition = fullcondition
                  }
***************
*** 2875,2880 ****
                  table.insert(interface.objectData[o].BindTable, propertyBinding)
  
!             -- ///////////////////////////////////////////////////////////////
              -- enum binding
              elseif member.DefType == "enum" then
                  -- if we have wxDateTime::TZ, only take the wxDateTime part
--- 2889,2895 ----
                  table.insert(interface.objectData[o].BindTable, propertyBinding)
  
!             -- ---------------------------------------------------------------
              -- enum binding
+             -- ---------------------------------------------------------------
              elseif member.DefType == "enum" then
                  -- if we have wxDateTime::TZ, only take the wxDateTime part
***************
*** 2926,2931 ****
                  end
  
!             -- ///////////////////////////////////////////////////////////////
              -- define binding
              elseif member.DefType == "define" then
                  local value = member.Value or member.Name
--- 2941,2947 ----
                  end
  
!             -- ---------------------------------------------------------------
              -- define binding
+             -- ---------------------------------------------------------------
              elseif member.DefType == "define" then
                  local value = member.Value or member.Name
***************
*** 2940,2945 ****
                  table.insert(defineBindingTable, defineBinding)
  
!             -- ///////////////////////////////////////////////////////////////
!             -- define string binding
              elseif member.DefType == "define_string" then
                  local value = member.Value or member.Name
--- 2956,2962 ----
                  table.insert(defineBindingTable, defineBinding)
  
!             -- ---------------------------------------------------------------
!             -- define_string binding
!             -- ---------------------------------------------------------------
              elseif member.DefType == "define_string" then
                  local value = member.Value or member.Name
***************
*** 2954,2959 ****
                  table.insert(stringBindingTable, stringBinding)
  
!             -- //////////////////////////////////////////////////////////////////////////////////
!             -- define object binding
              elseif member.DefType == "define_object" then
                  local luaname = member.AltName or member.Name -- for %rename
--- 2971,2977 ----
                  table.insert(stringBindingTable, stringBinding)
  
!             -- ---------------------------------------------------------------
!             -- define_object binding
!             -- ---------------------------------------------------------------
              elseif member.DefType == "define_object" then
                  local luaname = member.AltName or member.Name -- for %rename
***************
*** 2968,2973 ****
                  table.insert(objectBindingTable, objectBinding)
  
!             -- //////////////////////////////////////////////////////////////////////////////////
!             -- define pointer binding
              elseif member.DefType == "define_pointer" then
                  local luaname = member.AltName or member.Name -- for %rename
--- 2986,2992 ----
                  table.insert(objectBindingTable, objectBinding)
  
!             -- ---------------------------------------------------------------
!             -- define_pointer binding
!             -- ---------------------------------------------------------------
              elseif member.DefType == "define_pointer" then
                  local luaname = member.AltName or member.Name -- for %rename
***************
*** 2982,2987 ****
                  table.insert(pointerBindingTable, pointerBinding)
  
!             -- //////////////////////////////////////////////////////////////////////////////////
!             -- define event binding
              elseif member.DefType == "define_event" then
                  local luaname = member.AltName or member.Name -- for %rename
--- 3001,3007 ----
                  table.insert(pointerBindingTable, pointerBinding)
  
!             -- ---------------------------------------------------------------
!             -- define_event binding
!             -- ---------------------------------------------------------------
              elseif member.DefType == "define_event" then
                  local luaname = member.AltName or member.Name -- for %rename
***************
*** 2996,3008 ****
                  table.insert(eventBindingTable, eventBinding)
  
!             -- //////////////////////////////////////////////////////////////////////////////////
              -- method binding
              elseif member.DefType == "method" then
-                 -- //////////////////////////////////////////////////////////////////////////////////
-                 -- method parameter bindings
-                 --
-                 -- interface.objectData[o].Members[m].Params
                  local argList = ""
!                 local overload_argList = " "
  
                  local arg = 0
--- 3016,3025 ----
                  table.insert(eventBindingTable, eventBinding)
  
!             -- ---------------------------------------------------------------
              -- method binding
+             -- ---------------------------------------------------------------
              elseif member.DefType == "method" then
                  local argList = ""
!                 local overload_argList = ""
  
                  local arg = 0
***************
*** 3068,3076 ****
                          declare = "wxArrayInt "
                      elseif argType == "LuaTable" then
!                         -- THIS MUST BE AN OVERLOAD AND HANDLED THERE, we just set overload_argList
                          -- the code genererated here is nonsense
                          overload_argList = overload_argList.."&s_wxluaarg_LuaTable, "
!                         argItem = "YOU MUST OVERLOAD THIS FUNCTION "
!                         declare = "YOU MUST OVERLOAD THIS FUNCTION "
                      elseif argType == "LuaFunction" then
                          -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList
--- 3085,3093 ----
                          declare = "wxArrayInt "
                      elseif argType == "LuaTable" then
!                         -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList
                          -- the code genererated here is nonsense
                          overload_argList = overload_argList.."&s_wxluaarg_LuaTable, "
!                         argItem = "YOU MUST OVERRIDE THIS FUNCTION "
!                         declare = "YOU MUST OVERRIDE THIS FUNCTION "
                      elseif argType == "LuaFunction" then
                          -- THIS MUST BE AN OVERRIDE AND HANDLED THERE, we just set overload_argList
***************
*** 3412,3428 ****
                  end
  
-                 local overload_argListName = "s_wxluatagArray_".. funcName
-                 overload_argList = overload_argList.."0 }"
-                 if overload_argList == " 0 }" then -- empty
-                     overload_argListName = "s_wxluaargArray_None"
-                 else
-                     overload_argList = "{"..overload_argList
-                 end
- 
-                 -- add function map only once for the base function name overload
-                 local funcMapName = "s_wxluafunc_"..funcName
-                 local funcMap   = "{ "..funcName..", "..tostring(requiredParamCount)..", "..tostring(paramCount)..", "..overload_argListName.." }"
-                 local methodMap = "    { "..funcType..", \""..funcLuaCall.."\", "..funcMapName..", 1 },\n"
- 
                  -- constructor?
                  if member.IsConstructor then
--- 3429,3432 ----
***************
*** 3465,3472 ****
  
                          table.insert(codeList, "    "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n")
  
                          if member.IsOperator then
                              memberPtr = false
!                             if paramCount > 0 then
                                  functor = "(*self)"..member.IsOperator
                              else
--- 3469,3480 ----
  
                          table.insert(codeList, "    "..parseObject.Name.." * self = ("..parseObject.Name.." *)wxlState.GetUserDataType(1, s_wxluatag_"..MakeClassVar(parseObject.Name)..");\n")
+                         overload_argList = "&s_wxluatag_"..MakeClassVar(parseObject.Name)..", "..overload_argList
+ 
+                         requiredParamCount = requiredParamCount + 1
+                         paramCount = paramCount + 1
  
                          if member.IsOperator then
                              memberPtr = false
!                             if paramCount > 1 then
                                  functor = "(*self)"..member.IsOperator
                              else
***************
*** 3553,3556 ****
--- 3561,3576 ----
                  end
  
+                 local overload_argListName = "s_wxluatagArray_".. funcName
+                 if overload_argList == "" then
+                     overload_argListName = "s_wxluaargArray_None"
+                 else
+                     overload_argList = "{ "..overload_argList.."0 }"
+                 end
+ 
+                 -- add function map only once for the base function name overload
+                 local funcMapName = "s_wxluafunc_"..funcName
+                 local funcMap   = "{ "..funcName..", "..funcType..", "..tostring(requiredParamCount)..", "..tostring(paramCount)..", "..overload_argListName.." }"
+                 local methodMap = "    { "..funcType..", \""..funcLuaCall.."\", "..funcMapName..", 1, 0 },\n"
+ 
                  -- build method condition
                  local methodcondition = nil
***************
*** 3677,3680 ****
--- 3697,3703 ----
                  local funcMapName = "s_wxluafunc_"..funcName
  
+                 local overload_argListName = "s_wxluatagArray_".. funcName
+                 local overload_argList = "{ &s_wxluatag_"..MakeClassVar(parseObject.Name)..", 0 }"
+ 
                  local condition = FixCondition(parseObject.Condition)
  
***************
*** 3684,3692 ****
                      CFunctionName = funcName,
                      Method = codeList,
!                     FuncMap = "{ "..funcName..", 0, 0, s_wxluaargArray_None }", -- FIXME dummy func map name
                      FuncMapName = funcMapName,
!                     ParamCount = 0,
!                     RequiredParamCount = 0,
!                     Map = "    { WXLUAMETHOD_METHOD, \"Delete\", "..funcMapName.." },\n",
                      Condition = condition
                  }
--- 3707,3718 ----
                      CFunctionName = funcName,
                      Method = codeList,
!                     FuncType = "WXLUAMETHOD_METHOD",
!                     FuncMap = "{ "..funcName..", WXLUAMETHOD_METHOD, 1, 1, "..overload_argListName.." }",
                      FuncMapName = funcMapName,
!                     ArgArray = overload_argList,
!                     ArgArrayName = overload_argListName,
!                     ParamCount = 1,
!                     RequiredParamCount = 1,
!                     Map = "    { WXLUAMETHOD_METHOD, \"Delete\", "..funcMapName..", 1, 0 },\n",
                      Condition = condition
                  }
***************
*** 4326,4331 ****
          local methodBindings = sortedBindings[n]
  
!         local paramCount = -1
!         local requiredParamCount = -1
  
          for i = 1, #methodBindings do
--- 4352,4358 ----
          local methodBindings = sortedBindings[n]
  
!         local paramCount = 0
!         local requiredParamCount = 1E6
!         local funcType = methodBindings[1].FuncType
  
          for i = 1, #methodBindings do
***************
*** 4336,4342 ****
                      paramCount = methodBindings[i].ParamCount
                  end
!                 if methodBindings[i].RequiredParamCount and (requiredParamCount < methodBindings[i].RequiredParamCount) then
                      requiredParamCount = methodBindings[i].RequiredParamCount
                  end
              end
          end
--- 4363,4375 ----
                      paramCount = methodBindings[i].ParamCount
                  end
!                 if methodBindings[i].RequiredParamCount and (requiredParamCount > methodBindings[i].RequiredParamCount) then
                      requiredParamCount = methodBindings[i].RequiredParamCount
                  end
+ 
+                 for s in string.gmatch(methodBindings[i].FuncType, "[%a_]+") do
+                     if (string.find(funcType, s, 1, 1) == nil) then
+                         funcType = funcType.."|"..s
+                     end
+                 end
              end
          end
***************
*** 4366,4370 ****
              CommentBindingTable(funcMap, "// function overload table\n")
              table.insert(funcMap, "static WXLUAMETHOD_CFUNC "..funcMapName.."[] =\n{\n")
!             table.insert(funcMap, "    { "..funcName..", -1, -1, s_wxluaargArray_None },\n")
              for i = 1, #methodBindings do
                  if HasCondition(methodBindings[i].Condition) and (methodBindings[i].Condition ~= object.Condition) then
--- 4399,4403 ----
              CommentBindingTable(funcMap, "// function overload table\n")
              table.insert(funcMap, "static WXLUAMETHOD_CFUNC "..funcMapName.."[] =\n{\n")
!             table.insert(funcMap, "    { "..funcName..", WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, "..tostring(requiredParamCount)..", "..tostring(paramCount)..", s_wxluaargArray_None },\n")
              for i = 1, #methodBindings do
                  if HasCondition(methodBindings[i].Condition) and (methodBindings[i].Condition ~= object.Condition) then
***************
*** 4382,4386 ****
              table.insert(funcMap, "static int "..funcMapName.."_count = sizeof("..funcMapName..")/sizeof("..funcMapName.."[0]);\n")
  
!             local methodMap = "    { "..methodBindings[1].FuncType..", \""..methodBindings[1].LuaName.."\", "..funcMapName..", "..funcMapName.."_count }"
  
              local codeList = {}
--- 4415,4419 ----
              table.insert(funcMap, "static int "..funcMapName.."_count = sizeof("..funcMapName..")/sizeof("..funcMapName.."[0]);\n")
  
!             local methodMap = "    { "..funcType..", \""..methodBindings[1].LuaName.."\", "..funcMapName..", "..funcMapName.."_count, 0 }"
  
              local codeList = {}
***************
*** 4467,4471 ****
              {
                  LuaName = name,
!                 Map = "    { WXLUAMETHOD_GETPROP, \""..name.."\", "..member.FuncMapName..", 1 },\n",
                  Condition = member.Condition
              }
--- 4500,4504 ----
              {
                  LuaName = name,
!                 Map = "    { WXLUAMETHOD_GETPROP, \""..name.."\", "..member.FuncMapName..", 1, 0 },\n",
                  Condition = member.Condition
              }
***************
*** 4477,4481 ****
              {
                  LuaName = name,
!                 Map = "    { WXLUAMETHOD_SETPROP, \""..name.."\", "..member.FuncMapName..", 1 },\n",
                  Condition = member.Condition
              }
--- 4510,4514 ----
              {
                  LuaName = name,
!                 Map = "    { WXLUAMETHOD_SETPROP, \""..name.."\", "..member.FuncMapName..", 1, 0 },\n",
                  Condition = member.Condition
              }

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.26, 1.27 wxluacan.h, 1.23, 1.24 wxluacan_bind.cpp, 1.18, 1.19

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

Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30959/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan.cpp wxluacan.h wxluacan_bind.cpp 
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: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** wxluacan.cpp	31 May 2007 17:18:45 -0000	1.26
--- wxluacan.cpp	5 Jun 2007 21:07:20 -0000	1.27
***************
*** 27,33 ****
  int s_wxluatag_wxlCanObj = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, 0 };
  static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject }};
  
  //     void AddObject( wxlCanObj *canobj )
--- 27,33 ----
  int s_wxluatag_wxlCanObj = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxlCanObj, 0 };
  static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_AddObject }};
  
  //     void AddObject( wxlCanObj *canobj )
***************
*** 45,50 ****
  }
  
  static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None }};
  
  //     double GetX()
--- 45,51 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetX[] = { &s_wxluatag_wxlCanObj, 0 };
  static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetX }};
  
  //     double GetX()
***************
*** 63,68 ****
  }
  
  static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None }};
  
  //     double GetY()
--- 64,70 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetY[] = { &s_wxluatag_wxlCanObj, 0 };
  static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetY }};
  
  //     double GetY()
***************
*** 83,89 ****
  
  #if wxLUA_USE_wxColourPenBrush
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxBrush, 0 };
  static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }};
  
  //     void SetBrush( const wxBrush& brush )
--- 85,91 ----
  
  #if wxLUA_USE_wxColourPenBrush
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, 0 };
  static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }};
  
  //     void SetBrush( const wxBrush& brush )
***************
*** 101,107 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxPen, 0 };
  static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen }};
  
  //     void SetPen( const wxPen& pen )
--- 103,109 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxPen, 0 };
  static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPen }};
  
  //     void SetPen( const wxPen& pen )
***************
*** 121,127 ****
  #endif // wxLUA_USE_wxColourPenBrush
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, 0, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPending }};
  
  //     void SetPending( bool pending = true )
--- 123,129 ----
  #endif // wxLUA_USE_wxColourPenBrush
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPending }};
  
  //     void SetPending( bool pending = true )
***************
*** 141,147 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos }};
  
  //    	void SetPos( double x, double y )
--- 143,149 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxlCanObj_SetPos }};
  
  //    	void SetPos( double x, double y )
***************
*** 163,167 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, 0, 2, s_wxluatagArray_wxLua_wxlCanObj_constructor }};
  
  //     wxlCanObj( double x = 0, double y = 0 )
--- 165,169 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxlCanObj_constructor }};
  
  //     wxlCanObj( double x = 0, double y = 0 )
***************
*** 189,204 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObj_methods[] = {
!     { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCanObj_AddObject, 1 },
!     { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxlCanObj_GetX, 1 },
!     { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxlCanObj_GetY, 1 },
  
  #if wxLUA_USE_wxColourPenBrush
!     { WXLUAMETHOD_METHOD, "SetBrush", s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1 },
!     { WXLUAMETHOD_METHOD, "SetPen", s_wxluafunc_wxLua_wxlCanObj_SetPen, 1 },
  #endif // wxLUA_USE_wxColourPenBrush
  
!     { WXLUAMETHOD_METHOD, "SetPending", s_wxluafunc_wxLua_wxlCanObj_SetPending, 1 },
!     { WXLUAMETHOD_METHOD, "SetPos", s_wxluafunc_wxLua_wxlCanObj_SetPos, 1 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObj", s_wxluafunc_wxLua_wxlCanObj_constructor, 1 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 191,206 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObj_methods[] = {
!     { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCanObj_AddObject, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxlCanObj_GetX, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxlCanObj_GetY, 1, 0 },
  
  #if wxLUA_USE_wxColourPenBrush
!     { WXLUAMETHOD_METHOD, "SetBrush", s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetPen", s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, 0 },
  #endif // wxLUA_USE_wxColourPenBrush
  
!     { WXLUAMETHOD_METHOD, "SetPending", s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetPos", s_wxluafunc_wxLua_wxlCanObj_SetPos, 1, 0 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObj", s_wxluafunc_wxLua_wxlCanObj_constructor, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
***************
*** 222,226 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }};
  
  //     wxlCanObjRect(  double x, double y, double w, double h )
--- 224,228 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatagArray_wxLua_wxlCanObjRect_constructor }};
  
  //     wxlCanObjRect(  double x, double y, double w, double h )
***************
*** 250,254 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjRect_methods[] = {
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjRect", s_wxluafunc_wxLua_wxlCanObjRect_constructor, 1 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 252,256 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjRect_methods[] = {
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjRect", s_wxluafunc_wxLua_wxlCanObjRect_constructor, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
***************
*** 272,276 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }};
  
  //     wxlCanObjCircle( double x, double y, double r )
--- 274,278 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjCircle_constructor }};
  
  //     wxlCanObjCircle( double x, double y, double r )
***************
*** 298,302 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjCircle_methods[] = {
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjCircle", s_wxluafunc_wxLua_wxlCanObjCircle_constructor, 1 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 300,304 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjCircle_methods[] = {
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjCircle", s_wxluafunc_wxLua_wxlCanObjCircle_constructor, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
***************
*** 320,324 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }};
  
  //     wxlCanObjScript( double x, double y, const wxString& name )
--- 322,326 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjScript_constructor }};
  
  //     wxlCanObjScript( double x, double y, const wxString& name )
***************
*** 346,350 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjScript_methods[] = {
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjScript", s_wxluafunc_wxLua_wxlCanObjScript_constructor, 1 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 348,352 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjScript_methods[] = {
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjScript", s_wxluafunc_wxLua_wxlCanObjScript_constructor, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
***************
*** 366,372 ****
  int s_wxluatag_wxlCanObjAddScript = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }};
  
  //     void SetScript( const wxString& script )
--- 368,374 ----
  int s_wxluatag_wxlCanObjAddScript = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluatag_wxlCanObjAddScript, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }};
  
  //     void SetScript( const wxString& script )
***************
*** 386,390 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }};
  
  //     wxlCanObjAddScript( double x, double y,  const wxString& script )
--- 388,392 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor }};
  
  //     wxlCanObjAddScript( double x, double y,  const wxString& script )
***************
*** 412,417 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjAddScript_methods[] = {
!     { WXLUAMETHOD_METHOD, "SetScript", s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript, 1 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjAddScript", s_wxluafunc_wxLua_wxlCanObjAddScript_constructor, 1 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 414,419 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjAddScript_methods[] = {
!     { WXLUAMETHOD_METHOD, "SetScript", s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript, 1, 0 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjAddScript", s_wxluafunc_wxLua_wxlCanObjAddScript_constructor, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
***************
*** 433,439 ****
  int s_wxluatag_wxlCan = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_AddObject[] = { &s_wxluatag_wxlCanObj, 0 };
  static int LUACALL wxLua_wxlCan_AddObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject }};
  
  //     void AddObject( wxlCanObj *canobj )
--- 435,441 ----
  int s_wxluatag_wxlCan = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_AddObject[] = { &s_wxluatag_wxlCan, &s_wxluatag_wxlCanObj, 0 };
  static int LUACALL wxLua_wxlCan_AddObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCan_AddObject }};
  
  //     void AddObject( wxlCanObj *canobj )
***************
*** 451,456 ****
  }
  
  static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None }};
  
  //     wxlLuaCanCmd* GetCmdh()
--- 453,459 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetCmdh[] = { &s_wxluatag_wxlCan, 0 };
  static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetCmdh }};
  
  //     wxlLuaCanCmd* GetCmdh()
***************
*** 469,474 ****
  }
  
  static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None }};
  
  //     bool GetYaxis()
--- 472,478 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetYaxis[] = { &s_wxluatag_wxlCan, 0 };
  static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetYaxis }};
  
  //     bool GetYaxis()
***************
*** 491,495 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, 0 };
  static int LUACALL wxLua_wxlCan_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, 1, 4, s_wxluatagArray_wxLua_wxlCan_constructor }};
  
  //     wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize )
--- 495,499 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, 0 };
  static int LUACALL wxLua_wxlCan_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 4, s_wxluatagArray_wxLua_wxlCan_constructor }};
  
  //     wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize )
***************
*** 523,532 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCan_methods[] = {
!     { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCan_AddObject, 1 },
!     { WXLUAMETHOD_METHOD, "GetCmdh", s_wxluafunc_wxLua_wxlCan_GetCmdh, 1 },
!     { WXLUAMETHOD_METHOD, "GetYaxis", s_wxluafunc_wxLua_wxlCan_GetYaxis, 1 },
  
  #if wxLUA_USE_wxPointSizeRect
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCan", s_wxluafunc_wxLua_wxlCan_constructor, 1 },
  #endif // wxLUA_USE_wxPointSizeRect
  
--- 527,536 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCan_methods[] = {
!     { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCan_AddObject, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetCmdh", s_wxluafunc_wxLua_wxlCan_GetCmdh, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetYaxis", s_wxluafunc_wxLua_wxlCan_GetYaxis, 1, 0 },
  
  #if wxLUA_USE_wxPointSizeRect
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCan", s_wxluafunc_wxLua_wxlCan_constructor, 1, 0 },
  #endif // wxLUA_USE_wxPointSizeRect
  
***************
*** 550,556 ****
  int s_wxluatag_wxlLuaCanCmd = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }};
  
  //     void MoveObject( int index, double x, double y )
--- 554,560 ----
  int s_wxluatag_wxlLuaCanCmd = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluatag_wxlLuaCanCmd, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject }};
  
  //     void MoveObject( int index, double x, double y )
***************
*** 574,578 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }};
  
  //     wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 )
--- 578,582 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }};
  
  //     wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 )
***************
*** 600,605 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlLuaCanCmd_methods[] = {
!     { WXLUAMETHOD_METHOD, "MoveObject", s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject, 1 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlLuaCanCmd", s_wxluafunc_wxLua_wxlLuaCanCmd_constructor, 1 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 604,609 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlLuaCanCmd_methods[] = {
!     { WXLUAMETHOD_METHOD, "MoveObject", s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject, 1, 0 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlLuaCanCmd", s_wxluafunc_wxLua_wxlLuaCanCmd_constructor, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };

Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxluacan_bind.cpp	31 May 2007 17:18:45 -0000	1.18
--- wxluacan_bind.cpp	5 Jun 2007 21:07:20 -0000	1.19
***************
*** 98,102 ****
  }
  
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, 0, 0, s_wxluaargArray_None }};
  
  // %function wxlLuaCanCmd* GetCmdhMain()
--- 98,102 ----
  }
  
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};
  
  // %function wxlLuaCanCmd* GetCmdhMain()
***************
*** 113,117 ****
  }
  
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, 0, 0, s_wxluaargArray_None }};
  
  // ---------------------------------------------------------------------------
--- 113,117 ----
  }
  
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};
  
  // ---------------------------------------------------------------------------
***************
*** 123,128 ****
      static WXLUAMETHOD functionList[] =
      {
!         { WXLUAMETHOD_CFUNCTION, "GetCan", s_wxluafunc_wxLua_function_GetCan, 1 },
!         { WXLUAMETHOD_CFUNCTION, "GetCmdhMain", s_wxluafunc_wxLua_function_GetCmdhMain, 1 },
  
          { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, 
--- 123,128 ----
      static WXLUAMETHOD functionList[] =
      {
!         { WXLUAMETHOD_CFUNCTION, "GetCan", s_wxluafunc_wxLua_function_GetCan, 1, 0 },
!         { WXLUAMETHOD_CFUNCTION, "GetCmdhMain", s_wxluafunc_wxLua_function_GetCmdhMain, 1, 0 },
  
          { WXLUAMETHOD_CFUNCTION, 0, 0, 0 }, 

Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** wxluacan.h	31 May 2007 17:18:45 -0000	1.23
--- wxluacan.h	5 Jun 2007 21:07:20 -0000	1.24
***************
*** 18,24 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 7
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 7
  // ---------------------------------------------------------------------------
  
--- 18,24 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 8
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 8
  // ---------------------------------------------------------------------------
  

[Wxlua-commit] wxLua/modules/wxbind/include wxbind.h,1.65,1.66

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

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

Modified Files:
	wxbind.h 
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: wxbind.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** wxbind.h	31 May 2007 17:18:47 -0000	1.65
--- wxbind.h	5 Jun 2007 21:07:20 -0000	1.66
***************
*** 43,49 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 7
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 7
  // ---------------------------------------------------------------------------
  
--- 43,49 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 8
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 8
  // ---------------------------------------------------------------------------
  

[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);

[Wxlua-commit] wxLua/apps/wxlua/src editor.h,1.36,1.37

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

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

Modified Files:
	editor.h 
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: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** editor.h	31 May 2007 17:18:45 -0000	1.36
--- editor.h	5 Jun 2007 21:07:19 -0000	1.37
***************
*** 10,15 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 90579;
! const unsigned char wxLuaEditor[90580] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
--- 10,15 ----
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 90507;
! const unsigned char wxLuaEditor[90508] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
***************
*** 187,194 ****
   45, 45, 32, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 10,
   45, 45, 32, 73,110,105,116,105, 97,108,105,122,101, 32,116,104,101, 32,119,120, 67,111,110,102,105,103, 32,102,111,114, 32,108,111, 97,100,105,110,103, 47,115, 97,118,105,110,103, 32,116,104,101, 32,112,114,101,102,101,114,101,110, 99,101,115, 10,
- 101,100,105,116,111,114, 65,112,112, 58, 83,101,116, 86,101,110,100,111,114, 78, 97,109,101, 40, 34, 76,111,109,116,105, 99,107, 32, 83,111,102,116,119, 97,114,101, 34, 41, 10,
- 101,100,105,116,111,114, 65,112,112, 58, 83,101,116, 65,112,112, 78, 97,109,101, 40, 34,119,120, 76,117, 97, 32, 73, 68, 69, 34, 41, 10,
   10,
!  99,111,110,102,105,103, 32, 61, 32,119,120, 46,119,120, 67,111,110,102,105,103, 66, 97,115,101, 46, 71,101,116, 40, 41, 10,
  105,102, 32, 99,111,110,102,105,103, 32,116,104,101,110, 10,
   32, 32, 32, 32, 99,111,110,102,105,103, 58, 83,101,116, 82,101, 99,111,114,100, 68,101,102, 97,117,108,116,115, 40, 41, 10,
--- 187,192 ----
   45, 45, 32, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 10,
   45, 45, 32, 73,110,105,116,105, 97,108,105,122,101, 32,116,104,101, 32,119,120, 67,111,110,102,105,103, 32,102,111,114, 32,108,111, 97,100,105,110,103, 47,115, 97,118,105,110,103, 32,116,104,101, 32,112,114,101,102,101,114,101,110, 99,101,115, 10,
   10,
!  99,111,110,102,105,103, 32, 61, 32,119,120, 46,119,120, 70,105,108,101, 67,111,110,102,105,103, 40, 34,119,120, 76,117, 97, 73, 68, 69, 34, 44, 32, 34, 87, 88, 76, 85, 65, 34, 41, 10,
  105,102, 32, 99,111,110,102,105,103, 32,116,104,101,110, 10,
   32, 32, 32, 32, 99,111,110,102,105,103, 58, 83,101,116, 82,101, 99,111,114,100, 68,101,102, 97,117,108,116,115, 40, 41, 10,
***************
*** 260,268 ****
   32, 32, 32, 32, 99,111,110,102,105,103, 58, 83,101,116, 80, 97,116,104, 40, 34, 47, 34, 46, 46,119,105,110,100,111,119, 78, 97,109,101, 41, 10,
   10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,115, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 73,110,116, 40, 34,115, 34, 44, 32, 45, 49, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,120, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 73,110,116, 40, 34,120, 34, 44, 32, 48, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,121, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 73,110,116, 40, 34,121, 34, 44, 32, 48, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,119, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 73,110,116, 40, 34,119, 34, 44, 32, 48, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,104, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 73,110,116, 40, 34,104, 34, 44, 32, 48, 41, 10,
   10,
   32, 32, 32, 32,105,102, 32, 40,115, 32,126, 61, 32, 45, 49, 41, 32, 97,110,100, 32, 40,115, 32,126, 61, 32, 50, 41, 32,116,104,101,110, 10,
--- 258,266 ----
   32, 32, 32, 32, 99,111,110,102,105,103, 58, 83,101,116, 80, 97,116,104, 40, 34, 47, 34, 46, 46,119,105,110,100,111,119, 78, 97,109,101, 41, 10,
   10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,115, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 40, 34,115, 34, 44, 32, 45, 49, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,120, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 40, 34,120, 34, 44, 32, 48, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,121, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 40, 34,121, 34, 44, 32, 48, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,119, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 40, 34,119, 34, 44, 32, 48, 41, 10,
!  32, 32, 32, 32,108,111, 99, 97,108, 32, 95, 44, 32,104, 32, 61, 32, 99,111,110,102,105,103, 58, 82,101, 97,100, 40, 34,104, 34, 44, 32, 48, 41, 10,
   10,
   32, 32, 32, 32,105,102, 32, 40,115, 32,126, 61, 32, 45, 49, 41, 32, 97,110,100, 32, 40,115, 32,126, 61, 32, 50, 41, 32,116,104,101,110, 10,
***************
*** 298,308 ****
   32, 32, 32, 32,101,110,100, 10,
   10,
!  32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 73,110,116, 40, 34,115, 34, 44, 32,115, 41, 10,
   10,
   32, 32, 32, 32,105,102, 32,115, 32, 61, 61, 32, 48, 32,116,104,101,110, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 73,110,116, 40, 34,120, 34, 44, 32,120, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 73,110,116, 40, 34,121, 34, 44, 32,121, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 73,110,116, 40, 34,119, 34, 44, 32,119, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 73,110,116, 40, 34,104, 34, 44, 32,104, 41, 10,
   32, 32, 32, 32,101,110,100, 10,
   10,
--- 296,306 ----
   32, 32, 32, 32,101,110,100, 10,
   10,
!  32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 40, 34,115, 34, 44, 32,115, 41, 10,
   10,
   32, 32, 32, 32,105,102, 32,115, 32, 61, 61, 32, 48, 32,116,104,101,110, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 40, 34,120, 34, 44, 32,120, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 40, 34,121, 34, 44, 32,121, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 40, 34,119, 34, 44, 32,119, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 99,111,110,102,105,103, 58, 87,114,105,116,101, 40, 34,104, 34, 44, 32,104, 41, 10,
   32, 32, 32, 32,101,110,100, 10,
   10,
***************
*** 2340,2344 ****
   10,
   32, 32, 32, 32, 67,111,110,102,105,103, 83, 97,118,101, 70,114, 97,109,101, 80,111,115,105,116,105,111,110, 40,102,114, 97,109,101, 44, 32, 34, 77, 97,105,110, 70,114, 97,109,101, 34, 41, 10,
!  32, 32, 32, 32, 99,111,110,102,105,103, 58, 83,101,116, 40, 41, 58, 68,101,115,116,114,111,121, 40, 41, 10,
   32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 10,
   32, 32, 32, 32, 67,108,111,115,101, 87, 97,116, 99,104, 87,105,110,100,111,119, 40, 41, 10,
--- 2338,2342 ----
   10,
   32, 32, 32, 32, 67,111,110,102,105,103, 83, 97,118,101, 70,114, 97,109,101, 80,111,115,105,116,105,111,110, 40,102,114, 97,109,101, 44, 32, 34, 77, 97,105,110, 70,114, 97,109,101, 34, 41, 10,
!  32, 32, 32, 32, 99,111,110,102,105,103, 58, 68,101,108,101,116,101, 40, 41, 32, 45, 45, 32, 97,108,119, 97,121,115, 32,100,101,108,101,116,101, 32,116,104,101, 32, 99,111,110,102,105,103, 10,
   32, 32, 32, 32,101,118,101,110,116, 58, 83,107,105,112, 40, 41, 10,
   32, 32, 32, 32, 67,108,111,115,101, 87, 97,116, 99,104, 87,105,110,100,111,119, 40, 41, 10,

[Wxlua-commit] wxLua/modules/wxbind/src appframe.cpp, 1.42, 1.43 clipdrag.cpp, 1.37, 1.38 config.cpp, 1.35, 1.36 controls.cpp, 1.54, 1.55 data.cpp, 1.42, 1.43 datetime.cpp, 1.36, 1.37 defsutil.cpp, 1.32, 1.33 dialogs.cpp, 1.37, 1.38 event.cpp, 1.41, 1.42 file.cpp, 1.42, 1.43 gdi.cpp, 1.59, 1.60 geometry.cpp, 1.26, 1.27 grid.cpp, 1.33, 1.34 help.cpp, 1.31, 1.32 html.cpp, 1.36, 1.37 image.cpp, 1.36, 1.37 mdi.cpp, 1.32, 1.33 menutool.cpp, 1.34, 1.35 print.cpp, 1.35, 1.36 regex.cpp, 1.27, 1.28 sizer.cpp, 1.29, 1.30 socket.cpp, 1.34, 1.35 thread.cpp, 1.23, 1.24 wave.cpp, 1.33, 1.34 windows.cpp, 1.48, 1.49 wx_bind.cpp, 1.93, 1.94 wxlua.cpp, 1.34, 1.35 xml.cpp, 1.30, 1.31

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

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

Modified Files:
	appframe.cpp clipdrag.cpp config.cpp controls.cpp data.cpp 
	datetime.cpp defsutil.cpp dialogs.cpp event.cpp file.cpp 
	gdi.cpp geometry.cpp grid.cpp help.cpp html.cpp image.cpp 
	mdi.cpp menutool.cpp print.cpp regex.cpp sizer.cpp socket.cpp 
	thread.cpp wave.cpp windows.cpp wx_bind.cpp wxlua.cpp xml.cpp 
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: xml.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/xml.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** xml.cpp	31 May 2007 21:38:47 -0000	1.30
--- xml.cpp	5 Jun 2007 21:07:24 -0000	1.31
***************
*** 35,41 ****
  int s_wxluatag_wxXmlNode = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxXmlNode_AddChild[] = { &s_wxluatag_wxXmlNode, 0 };
  static int LUACALL wxLua_wxXmlNode_AddChild(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxXmlNode_AddChild[1] = {{ wxLua_wxXmlNode_AddChild, 1, 1, s_wxluatagArray_wxLua_wxXmlNode_AddChild }};
  
  //     void AddChild(wxXmlNode *child)
--- 35,41 ----
  int s_wxluatag_wxXmlNode = -1;
  
[...1765 lines suppressed...]
  #if ((wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML))
!     { WXLUAMETHOD_METHOD, "LoadMenuBar", s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload, s_wxluafunc_wxLua_wxXmlResource_LoadMenuBar_overload_count, 0 },
  #endif // ((wxLUA_USE_wxMenu && wxUSE_MENUS) && (wxLUA_USE_wxXMLResource && wxUSE_XML))
  
  #if (wxLUA_USE_wxXMLResource && wxUSE_XML)
!     { WXLUAMETHOD_METHOD, "LoadPanel", s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload, s_wxluafunc_wxLua_wxXmlResource_LoadPanel_overload_count, 0 },
  #endif // (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
  #if (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
!     { WXLUAMETHOD_METHOD, "LoadToolBar", s_wxluafunc_wxLua_wxXmlResource_LoadToolBar, 1, 0 },
  #endif // (wxLUA_USE_wxToolbar) && (wxLUA_USE_wxXMLResource && wxUSE_XML)
  
!     { WXLUAMETHOD_METHOD, "Set", s_wxluafunc_wxLua_wxXmlResource_Set, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetFlags", s_wxluafunc_wxLua_wxXmlResource_SetFlags, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Unload", s_wxluafunc_wxLua_wxXmlResource_Unload, 1, 0 },
  
  #if (wxLUA_USE_wxXMLResource && wxUSE_XML)
!     { WXLUAMETHOD_CONSTRUCTOR, "wxXmlResource", s_wxluafunc_wxLua_wxXmlResource_constructor_overload, s_wxluafunc_wxLua_wxXmlResource_constructor_overload_count, 0 },
  #endif // (wxLUA_USE_wxXMLResource && wxUSE_XML)
  

Index: defsutil.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** defsutil.cpp	31 May 2007 17:18:50 -0000	1.32
--- defsutil.cpp	5 Jun 2007 21:07:21 -0000	1.33
***************
*** 36,41 ****
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_CloseOutput[1] = {{ wxLua_wxProcess_CloseOutput, 0, 0, s_wxluaargArray_None }};
  
  //     void CloseOutput()
--- 36,42 ----
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_CloseOutput[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_CloseOutput[1] = {{ wxLua_wxProcess_CloseOutput, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_CloseOutput }};
  
  //     void CloseOutput()
***************
*** 53,58 ****
  #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  
  static int LUACALL wxLua_wxProcess_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Delete[1] = {{ wxLua_wxProcess_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxProcess_Delete(lua_State *L)
--- 54,60 ----
  #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Delete[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Delete[1] = {{ wxLua_wxProcess_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Delete }};
  
  static int LUACALL wxLua_wxProcess_Delete(lua_State *L)
***************
*** 69,74 ****
  }
  
  static int LUACALL wxLua_wxProcess_Detach(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Detach[1] = {{ wxLua_wxProcess_Detach, 0, 0, s_wxluaargArray_None }};
  
  //     void Detach()
--- 71,77 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Detach[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_Detach(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Detach[1] = {{ wxLua_wxProcess_Detach, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Detach }};
  
  //     void Detach()
***************
*** 86,90 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Exists[] = { &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_Exists(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Exists[1] = {{ wxLua_wxProcess_Exists, 1, 1, s_wxluatagArray_wxLua_wxProcess_Exists }};
  
  //     static bool Exists(int pid)
--- 89,93 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Exists[] = { &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_Exists(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Exists[1] = {{ wxLua_wxProcess_Exists, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 1, s_wxluatagArray_wxLua_wxProcess_Exists }};
  
  //     static bool Exists(int pid)
***************
*** 104,109 ****
  
  #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
  static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetErrorStream[1] = {{ wxLua_wxProcess_GetErrorStream, 0, 0, s_wxluaargArray_None }};
  
  //     wxInputStream *GetErrorStream() const
--- 107,113 ----
  
  #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetErrorStream[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetErrorStream[1] = {{ wxLua_wxProcess_GetErrorStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetErrorStream }};
  
  //     wxInputStream *GetErrorStream() const
***************
*** 122,127 ****
  }
  
  static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetInputStream[1] = {{ wxLua_wxProcess_GetInputStream, 0, 0, s_wxluaargArray_None }};
  
  //     wxInputStream *GetInputStream() const
--- 126,132 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetInputStream[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetInputStream[1] = {{ wxLua_wxProcess_GetInputStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetInputStream }};
  
  //     wxInputStream *GetInputStream() const
***************
*** 140,145 ****
  }
  
  static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetOutputStream[1] = {{ wxLua_wxProcess_GetOutputStream, 0, 0, s_wxluaargArray_None }};
  
  //     wxOutputStream *GetOutputStream() const
--- 145,151 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_GetOutputStream[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_GetOutputStream[1] = {{ wxLua_wxProcess_GetOutputStream, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_GetOutputStream }};
  
  //     wxOutputStream *GetOutputStream() const
***************
*** 161,166 ****
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsErrorAvailable[1] = {{ wxLua_wxProcess_IsErrorAvailable, 0, 0, s_wxluaargArray_None }};
  
  //     bool IsErrorAvailable() const
--- 167,173 ----
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsErrorAvailable[1] = {{ wxLua_wxProcess_IsErrorAvailable, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsErrorAvailable }};
  
  //     bool IsErrorAvailable() const
***************
*** 179,184 ****
  }
  
  static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputAvailable[1] = {{ wxLua_wxProcess_IsInputAvailable, 0, 0, s_wxluaargArray_None }};
  
  //     bool IsInputAvailable() const
--- 186,192 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsInputAvailable[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputAvailable[1] = {{ wxLua_wxProcess_IsInputAvailable, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsInputAvailable }};
  
  //     bool IsInputAvailable() const
***************
*** 197,202 ****
  }
  
  static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputOpened[1] = {{ wxLua_wxProcess_IsInputOpened, 0, 0, s_wxluaargArray_None }};
  
  //     bool IsInputOpened() const
--- 205,211 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsInputOpened[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsInputOpened[1] = {{ wxLua_wxProcess_IsInputOpened, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsInputOpened }};
  
  //     bool IsInputOpened() const
***************
*** 217,222 ****
  #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  
  static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsRedirected[1] = {{ wxLua_wxProcess_IsRedirected, 0, 0, s_wxluaargArray_None }};
  
  //     bool IsRedirected()
--- 226,232 ----
  #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_IsRedirected[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_IsRedirected(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_IsRedirected[1] = {{ wxLua_wxProcess_IsRedirected, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_IsRedirected }};
  
  //     bool IsRedirected()
***************
*** 237,241 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Kill[] = { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_Kill(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Kill[1] = {{ wxLua_wxProcess_Kill, 1, 3, s_wxluatagArray_wxLua_wxProcess_Kill }};
  
  //     static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN)
--- 247,251 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Kill[] = { &s_wxluaarg_Number, &s_wxluaarg_Enumeration, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_Kill(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Kill[1] = {{ wxLua_wxProcess_Kill, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 3, s_wxluatagArray_wxLua_wxProcess_Kill }};
  
  //     static wxKillError Kill(int pid, wxSignal sig = wxSIGTERM, int flags = wxKILL_NOCHILDREN)
***************
*** 261,265 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Open[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_Open(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Open[1] = {{ wxLua_wxProcess_Open, 1, 2, s_wxluatagArray_wxLua_wxProcess_Open }};
  
  //     static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC)
--- 271,275 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Open[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_Open(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Open[1] = {{ wxLua_wxProcess_Open, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 1, 2, s_wxluatagArray_wxLua_wxProcess_Open }};
  
  //     static wxProcess *Open(const wxString& cmd, int flags = wxEXEC_ASYNC)
***************
*** 282,287 ****
  }
  
  static int LUACALL wxLua_wxProcess_Redirect(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Redirect[1] = {{ wxLua_wxProcess_Redirect, 0, 0, s_wxluaargArray_None }};
  
  //     void Redirect()
--- 292,298 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_Redirect[] = { &s_wxluatag_wxProcess, 0 };
  static int LUACALL wxLua_wxProcess_Redirect(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_Redirect[1] = {{ wxLua_wxProcess_Redirect, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxProcess_Redirect }};
  
  //     void Redirect()
***************
*** 299,305 ****
  
  #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_SetPipeStreams[] = { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 };
  static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_SetPipeStreams[1] = {{ wxLua_wxProcess_SetPipeStreams, 3, 3, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }};
  
  //     void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream)
--- 310,316 ----
  
  #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
! static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_SetPipeStreams[] = { &s_wxluatag_wxProcess, &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 };
  static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_SetPipeStreams[1] = {{ wxLua_wxProcess_SetPipeStreams, WXLUAMETHOD_METHOD, 4, 4, s_wxluatagArray_wxLua_wxProcess_SetPipeStreams }};
  
  //     void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream)
***************
*** 325,329 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_constructor[] = { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_constructor[1] = {{ wxLua_wxProcess_constructor, 0, 2, s_wxluatagArray_wxLua_wxProcess_constructor }};
  
  //     wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY)
--- 336,340 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxProcess_constructor[] = { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxProcess_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxProcess_constructor[1] = {{ wxLua_wxProcess_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxProcess_constructor }};
  
  //     wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY)
***************
*** 355,387 ****
  WXLUAMETHOD wxProcess_methods[] = {
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
!     { WXLUAMETHOD_METHOD, "CloseOutput", s_wxluafunc_wxLua_wxProcess_CloseOutput, 1 },
  #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxProcess_Delete },
!     { WXLUAMETHOD_METHOD, "Detach", s_wxluafunc_wxLua_wxProcess_Detach, 1 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Exists", s_wxluafunc_wxLua_wxProcess_Exists, 1 },
  
  #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
!     { WXLUAMETHOD_METHOD, "GetErrorStream", s_wxluafunc_wxLua_wxProcess_GetErrorStream, 1 },
!     { WXLUAMETHOD_METHOD, "GetInputStream", s_wxluafunc_wxLua_wxProcess_GetInputStream, 1 },
!     { WXLUAMETHOD_METHOD, "GetOutputStream", s_wxluafunc_wxLua_wxProcess_GetOutputStream, 1 },
  #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
!     { WXLUAMETHOD_METHOD, "IsErrorAvailable", s_wxluafunc_wxLua_wxProcess_IsErrorAvailable, 1 },
!     { WXLUAMETHOD_METHOD, "IsInputAvailable", s_wxluafunc_wxLua_wxProcess_IsInputAvailable, 1 },
!     { WXLUAMETHOD_METHOD, "IsInputOpened", s_wxluafunc_wxLua_wxProcess_IsInputOpened, 1 },
  #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  
!     { WXLUAMETHOD_METHOD, "IsRedirected", s_wxluafunc_wxLua_wxProcess_IsRedirected, 1 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Kill", s_wxluafunc_wxLua_wxProcess_Kill, 1 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Open", s_wxluafunc_wxLua_wxProcess_Open, 1 },
!     { WXLUAMETHOD_METHOD, "Redirect", s_wxluafunc_wxLua_wxProcess_Redirect, 1 },
  
  #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
!     { WXLUAMETHOD_METHOD, "SetPipeStreams", s_wxluafunc_wxLua_wxProcess_SetPipeStreams, 1 },
  #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
  
!     { WXLUAMETHOD_CONSTRUCTOR, "wxProcess", s_wxluafunc_wxLua_wxProcess_constructor, 1 },
  
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
--- 366,398 ----
  WXLUAMETHOD wxProcess_methods[] = {
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
!     { WXLUAMETHOD_METHOD, "CloseOutput", s_wxluafunc_wxLua_wxProcess_CloseOutput, 1, 0 },
  #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxProcess_Delete, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Detach", s_wxluafunc_wxLua_wxProcess_Detach, 1, 0 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Exists", s_wxluafunc_wxLua_wxProcess_Exists, 1, 0 },
  
  #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
!     { WXLUAMETHOD_METHOD, "GetErrorStream", s_wxluafunc_wxLua_wxProcess_GetErrorStream, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetInputStream", s_wxluafunc_wxLua_wxProcess_GetInputStream, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetOutputStream", s_wxluafunc_wxLua_wxProcess_GetOutputStream, 1, 0 },
  #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
  
  #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
!     { WXLUAMETHOD_METHOD, "IsErrorAvailable", s_wxluafunc_wxLua_wxProcess_IsErrorAvailable, 1, 0 },
!     { WXLUAMETHOD_METHOD, "IsInputAvailable", s_wxluafunc_wxLua_wxProcess_IsInputAvailable, 1, 0 },
!     { WXLUAMETHOD_METHOD, "IsInputOpened", s_wxluafunc_wxLua_wxProcess_IsInputOpened, 1, 0 },
  #endif // (wxUSE_STREAMS) && (wxLUA_USE_wxProcess)
  
!     { WXLUAMETHOD_METHOD, "IsRedirected", s_wxluafunc_wxLua_wxProcess_IsRedirected, 1, 0 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Kill", s_wxluafunc_wxLua_wxProcess_Kill, 1, 0 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "Open", s_wxluafunc_wxLua_wxProcess_Open, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Redirect", s_wxluafunc_wxLua_wxProcess_Redirect, 1, 0 },
  
  #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
!     { WXLUAMETHOD_METHOD, "SetPipeStreams", s_wxluafunc_wxLua_wxProcess_SetPipeStreams, 1, 0 },
  #endif // ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS)
  
!     { WXLUAMETHOD_CONSTRUCTOR, "wxProcess", s_wxluafunc_wxLua_wxProcess_constructor, 1, 0 },
  
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
***************
*** 407,412 ****
  int s_wxluatag_wxMouseState = -1;
  
  static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_AltDown[1] = {{ wxLua_wxMouseState_AltDown, 0, 0, s_wxluaargArray_None }};
  
  //     bool        AltDown()
--- 418,424 ----
  int s_wxluatag_wxMouseState = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_AltDown[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_AltDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_AltDown[1] = {{ wxLua_wxMouseState_AltDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_AltDown }};
  
  //     bool        AltDown()
***************
*** 425,430 ****
  }
  
  static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_CmdDown[1] = {{ wxLua_wxMouseState_CmdDown, 0, 0, s_wxluaargArray_None }};
  
  //     bool        CmdDown()
--- 437,443 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_CmdDown[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_CmdDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_CmdDown[1] = {{ wxLua_wxMouseState_CmdDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_CmdDown }};
  
  //     bool        CmdDown()
***************
*** 443,448 ****
  }
  
  static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ControlDown[1] = {{ wxLua_wxMouseState_ControlDown, 0, 0, s_wxluaargArray_None }};
  
  //     bool        ControlDown()
--- 456,462 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_ControlDown[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_ControlDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ControlDown[1] = {{ wxLua_wxMouseState_ControlDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_ControlDown }};
  
  //     bool        ControlDown()
***************
*** 461,466 ****
  }
  
  static int LUACALL wxLua_wxMouseState_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_Delete[1] = {{ wxLua_wxMouseState_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxMouseState_Delete(lua_State *L)
--- 475,481 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_Delete[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_Delete[1] = {{ wxLua_wxMouseState_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_Delete }};
  
  static int LUACALL wxLua_wxMouseState_Delete(lua_State *L)
***************
*** 477,482 ****
  }
  
  static int LUACALL wxLua_wxMouseState_GetX(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetX[1] = {{ wxLua_wxMouseState_GetX, 0, 0, s_wxluaargArray_None }};
  
  //     wxCoord     GetX()
--- 492,498 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_GetX[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_GetX(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetX[1] = {{ wxLua_wxMouseState_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_GetX }};
  
  //     wxCoord     GetX()
***************
*** 495,500 ****
  }
  
  static int LUACALL wxLua_wxMouseState_GetY(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetY[1] = {{ wxLua_wxMouseState_GetY, 0, 0, s_wxluaargArray_None }};
  
  //     wxCoord     GetY()
--- 511,517 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_GetY[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_GetY(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_GetY[1] = {{ wxLua_wxMouseState_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_GetY }};
  
  //     wxCoord     GetY()
***************
*** 513,518 ****
  }
  
  static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_LeftDown[1] = {{ wxLua_wxMouseState_LeftDown, 0, 0, s_wxluaargArray_None }};
  
  //     bool        LeftDown()
--- 530,536 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_LeftDown[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_LeftDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_LeftDown[1] = {{ wxLua_wxMouseState_LeftDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_LeftDown }};
  
  //     bool        LeftDown()
***************
*** 531,536 ****
  }
  
  static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MetaDown[1] = {{ wxLua_wxMouseState_MetaDown, 0, 0, s_wxluaargArray_None }};
  
  //     bool        MetaDown()
--- 549,555 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_MetaDown[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_MetaDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MetaDown[1] = {{ wxLua_wxMouseState_MetaDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_MetaDown }};
  
  //     bool        MetaDown()
***************
*** 549,554 ****
  }
  
  static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MiddleDown[1] = {{ wxLua_wxMouseState_MiddleDown, 0, 0, s_wxluaargArray_None }};
  
  //     bool        MiddleDown()
--- 568,574 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_MiddleDown[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_MiddleDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_MiddleDown[1] = {{ wxLua_wxMouseState_MiddleDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_MiddleDown }};
  
  //     bool        MiddleDown()
***************
*** 567,572 ****
  }
  
  static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_RightDown[1] = {{ wxLua_wxMouseState_RightDown, 0, 0, s_wxluaargArray_None }};
  
  //     bool        RightDown()
--- 587,593 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_RightDown[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_RightDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_RightDown[1] = {{ wxLua_wxMouseState_RightDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_RightDown }};
  
  //     bool        RightDown()
***************
*** 585,591 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetAltDown[] = { &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetAltDown[1] = {{ wxLua_wxMouseState_SetAltDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetAltDown }};
  
  //     void        SetAltDown(bool down)
--- 606,612 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetAltDown[] = { &s_wxluatag_wxMouseState, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetAltDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetAltDown[1] = {{ wxLua_wxMouseState_SetAltDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetAltDown }};
  
  //     void        SetAltDown(bool down)
***************
*** 603,609 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetControlDown[] = { &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetControlDown[1] = {{ wxLua_wxMouseState_SetControlDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetControlDown }};
  
  //     void        SetControlDown(bool down)
--- 624,630 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetControlDown[] = { &s_wxluatag_wxMouseState, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetControlDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetControlDown[1] = {{ wxLua_wxMouseState_SetControlDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetControlDown }};
  
  //     void        SetControlDown(bool down)
***************
*** 621,627 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetLeftDown[] = { &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetLeftDown[1] = {{ wxLua_wxMouseState_SetLeftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetLeftDown }};
  
  //     void        SetLeftDown(bool down)
--- 642,648 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetLeftDown[] = { &s_wxluatag_wxMouseState, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetLeftDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetLeftDown[1] = {{ wxLua_wxMouseState_SetLeftDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetLeftDown }};
  
  //     void        SetLeftDown(bool down)
***************
*** 639,645 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMetaDown[] = { &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetMetaDown[1] = {{ wxLua_wxMouseState_SetMetaDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMetaDown }};
  
  //     void        SetMetaDown(bool down)
--- 660,666 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMetaDown[] = { &s_wxluatag_wxMouseState, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetMetaDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetMetaDown[1] = {{ wxLua_wxMouseState_SetMetaDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetMetaDown }};
  
  //     void        SetMetaDown(bool down)
***************
*** 657,663 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown[] = { &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetMiddleDown[1] = {{ wxLua_wxMouseState_SetMiddleDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown }};
  
  //     void        SetMiddleDown(bool down)
--- 678,684 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown[] = { &s_wxluatag_wxMouseState, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetMiddleDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetMiddleDown[1] = {{ wxLua_wxMouseState_SetMiddleDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetMiddleDown }};
  
  //     void        SetMiddleDown(bool down)
***************
*** 675,681 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetRightDown[] = { &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetRightDown[1] = {{ wxLua_wxMouseState_SetRightDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetRightDown }};
  
  //     void        SetRightDown(bool down)
--- 696,702 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetRightDown[] = { &s_wxluatag_wxMouseState, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetRightDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetRightDown[1] = {{ wxLua_wxMouseState_SetRightDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetRightDown }};
  
  //     void        SetRightDown(bool down)
***************
*** 693,699 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetShiftDown[] = { &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetShiftDown[1] = {{ wxLua_wxMouseState_SetShiftDown, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetShiftDown }};
  
  //     void        SetShiftDown(bool down)
--- 714,720 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetShiftDown[] = { &s_wxluatag_wxMouseState, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxMouseState_SetShiftDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetShiftDown[1] = {{ wxLua_wxMouseState_SetShiftDown, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetShiftDown }};
  
  //     void        SetShiftDown(bool down)
***************
*** 711,717 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetX[] = { &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxMouseState_SetX(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetX[1] = {{ wxLua_wxMouseState_SetX, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetX }};
  
  //     void        SetX(wxCoord x)
--- 732,738 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetX[] = { &s_wxluatag_wxMouseState, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxMouseState_SetX(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetX[1] = {{ wxLua_wxMouseState_SetX, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetX }};
  
  //     void        SetX(wxCoord x)
***************
*** 729,735 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetY[] = { &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxMouseState_SetY(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetY[1] = {{ wxLua_wxMouseState_SetY, 1, 1, s_wxluatagArray_wxLua_wxMouseState_SetY }};
  
  //     void        SetY(wxCoord y)
--- 750,756 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_SetY[] = { &s_wxluatag_wxMouseState, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxMouseState_SetY(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_SetY[1] = {{ wxLua_wxMouseState_SetY, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxMouseState_SetY }};
  
  //     void        SetY(wxCoord y)
***************
*** 747,752 ****
  }
  
  static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ShiftDown[1] = {{ wxLua_wxMouseState_ShiftDown, 0, 0, s_wxluaargArray_None }};
  
  //     bool        ShiftDown()
--- 768,774 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxMouseState_ShiftDown[] = { &s_wxluatag_wxMouseState, 0 };
  static int LUACALL wxLua_wxMouseState_ShiftDown(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_ShiftDown[1] = {{ wxLua_wxMouseState_ShiftDown, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxMouseState_ShiftDown }};
  
  //     bool        ShiftDown()
***************
*** 766,770 ****
  
  static int LUACALL wxLua_wxMouseState_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_constructor[1] = {{ wxLua_wxMouseState_constructor, 0, 0, s_wxluaargArray_None }};
  
  //     wxMouseState()
--- 788,792 ----
  
  static int LUACALL wxLua_wxMouseState_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxMouseState_constructor[1] = {{ wxLua_wxMouseState_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }};
  
  //     wxMouseState()
***************
*** 789,813 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxMouseState_methods[] = {
!     { WXLUAMETHOD_METHOD, "AltDown", s_wxluafunc_wxLua_wxMouseState_AltDown, 1 },
!     { WXLUAMETHOD_METHOD, "CmdDown", s_wxluafunc_wxLua_wxMouseState_CmdDown, 1 },
!     { WXLUAMETHOD_METHOD, "ControlDown", s_wxluafunc_wxLua_wxMouseState_ControlDown, 1 },
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxMouseState_Delete },
!     { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxMouseState_GetX, 1 },
!     { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxMouseState_GetY, 1 },
!     { WXLUAMETHOD_METHOD, "LeftDown", s_wxluafunc_wxLua_wxMouseState_LeftDown, 1 },
!     { WXLUAMETHOD_METHOD, "MetaDown", s_wxluafunc_wxLua_wxMouseState_MetaDown, 1 },
!     { WXLUAMETHOD_METHOD, "MiddleDown", s_wxluafunc_wxLua_wxMouseState_MiddleDown, 1 },
!     { WXLUAMETHOD_METHOD, "RightDown", s_wxluafunc_wxLua_wxMouseState_RightDown, 1 },
!     { WXLUAMETHOD_METHOD, "SetAltDown", s_wxluafunc_wxLua_wxMouseState_SetAltDown, 1 },
!     { WXLUAMETHOD_METHOD, "SetControlDown", s_wxluafunc_wxLua_wxMouseState_SetControlDown, 1 },
!     { WXLUAMETHOD_METHOD, "SetLeftDown", s_wxluafunc_wxLua_wxMouseState_SetLeftDown, 1 },
!     { WXLUAMETHOD_METHOD, "SetMetaDown", s_wxluafunc_wxLua_wxMouseState_SetMetaDown, 1 },
!     { WXLUAMETHOD_METHOD, "SetMiddleDown", s_wxluafunc_wxLua_wxMouseState_SetMiddleDown, 1 },
!     { WXLUAMETHOD_METHOD, "SetRightDown", s_wxluafunc_wxLua_wxMouseState_SetRightDown, 1 },
!     { WXLUAMETHOD_METHOD, "SetShiftDown", s_wxluafunc_wxLua_wxMouseState_SetShiftDown, 1 },
!     { WXLUAMETHOD_METHOD, "SetX", s_wxluafunc_wxLua_wxMouseState_SetX, 1 },
!     { WXLUAMETHOD_METHOD, "SetY", s_wxluafunc_wxLua_wxMouseState_SetY, 1 },
!     { WXLUAMETHOD_METHOD, "ShiftDown", s_wxluafunc_wxLua_wxMouseState_ShiftDown, 1 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxMouseState", s_wxluafunc_wxLua_wxMouseState_constructor, 1 },
  
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
--- 811,835 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxMouseState_methods[] = {
!     { WXLUAMETHOD_METHOD, "AltDown", s_wxluafunc_wxLua_wxMouseState_AltDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "CmdDown", s_wxluafunc_wxLua_wxMouseState_CmdDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "ControlDown", s_wxluafunc_wxLua_wxMouseState_ControlDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxMouseState_Delete, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxMouseState_GetX, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxMouseState_GetY, 1, 0 },
!     { WXLUAMETHOD_METHOD, "LeftDown", s_wxluafunc_wxLua_wxMouseState_LeftDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "MetaDown", s_wxluafunc_wxLua_wxMouseState_MetaDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "MiddleDown", s_wxluafunc_wxLua_wxMouseState_MiddleDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "RightDown", s_wxluafunc_wxLua_wxMouseState_RightDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetAltDown", s_wxluafunc_wxLua_wxMouseState_SetAltDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetControlDown", s_wxluafunc_wxLua_wxMouseState_SetControlDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetLeftDown", s_wxluafunc_wxLua_wxMouseState_SetLeftDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetMetaDown", s_wxluafunc_wxLua_wxMouseState_SetMetaDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetMiddleDown", s_wxluafunc_wxLua_wxMouseState_SetMiddleDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetRightDown", s_wxluafunc_wxLua_wxMouseState_SetRightDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetShiftDown", s_wxluafunc_wxLua_wxMouseState_SetShiftDown, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetX", s_wxluafunc_wxLua_wxMouseState_SetX, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetY", s_wxluafunc_wxLua_wxMouseState_SetY, 1, 0 },
!     { WXLUAMETHOD_METHOD, "ShiftDown", s_wxluafunc_wxLua_wxMouseState_ShiftDown, 1, 0 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxMouseState", s_wxluafunc_wxLua_wxMouseState_constructor, 1, 0 },
  
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
***************
*** 833,838 ****
  int s_wxluatag_wxBusyCursor = -1;
  
  static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyCursor_Delete[1] = {{ wxLua_wxBusyCursor_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L)
--- 855,861 ----
  int s_wxluatag_wxBusyCursor = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_Delete[] = { &s_wxluatag_wxBusyCursor, 0 };
  static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyCursor_Delete[1] = {{ wxLua_wxBusyCursor_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxBusyCursor_Delete }};
  
  static int LUACALL wxLua_wxBusyCursor_Delete(lua_State *L)
***************
*** 853,857 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, 0 };
  static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyCursor_constructor[1] = {{ wxLua_wxBusyCursor_constructor, 0, 1, s_wxluatagArray_wxLua_wxBusyCursor_constructor }};
  
  // %override wxLua_wxBusyCursor_constructor
--- 876,880 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyCursor_constructor[] = { &s_wxluatag_wxCursor, 0 };
  static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyCursor_constructor[1] = {{ wxLua_wxBusyCursor_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxBusyCursor_constructor }};
  
  // %override wxLua_wxBusyCursor_constructor
***************
*** 884,891 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxBusyCursor_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyCursor_Delete },
  
  #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor)
!     { WXLUAMETHOD_CONSTRUCTOR, "wxBusyCursor", s_wxluafunc_wxLua_wxBusyCursor_constructor, 1 },
  #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor)
  
--- 907,914 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxBusyCursor_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyCursor_Delete, 1, 0 },
  
  #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor)
!     { WXLUAMETHOD_CONSTRUCTOR, "wxBusyCursor", s_wxluafunc_wxLua_wxBusyCursor_constructor, 1, 0 },
  #endif // (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor)
  
***************
*** 912,917 ****
  int s_wxluatag_wxBusyInfo = -1;
  
  static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyInfo_Delete[1] = {{ wxLua_wxBusyInfo_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L)
--- 935,941 ----
  int s_wxluatag_wxBusyInfo = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyInfo_Delete[] = { &s_wxluatag_wxBusyInfo, 0 };
  static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyInfo_Delete[1] = {{ wxLua_wxBusyInfo_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxBusyInfo_Delete }};
  
  static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L)
***************
*** 930,934 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyInfo_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxWindow, 0 };
  static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyInfo_constructor[1] = {{ wxLua_wxBusyInfo_constructor, 1, 2, s_wxluatagArray_wxLua_wxBusyInfo_constructor }};
  
  //     wxBusyInfo(const wxString& message, wxWindow *parent = NULL)
--- 954,958 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxBusyInfo_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxWindow, 0 };
  static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxBusyInfo_constructor[1] = {{ wxLua_wxBusyInfo_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxBusyInfo_constructor }};
  
  //     wxBusyInfo(const wxString& message, wxWindow *parent = NULL)
***************
*** 959,964 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxBusyInfo_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyInfo_Delete },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxBusyInfo", s_wxluafunc_wxLua_wxBusyInfo_constructor, 1 },
  
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
--- 983,988 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxBusyInfo_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxBusyInfo_Delete, 1, 0 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxBusyInfo", s_wxluafunc_wxLua_wxBusyInfo_constructor, 1, 0 },
  
      { WXLUAMETHOD_METHOD, 0, 0, 0 },

Index: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxlua.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxlua.cpp	31 May 2007 17:18:53 -0000	1.34
--- wxlua.cpp	5 Jun 2007 21:07:24 -0000	1.35
***************
*** 33,38 ****
  int s_wxluatag_wxLuaState = -1;
  
  static int LUACALL wxLua_wxLuaState_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaState_Delete[1] = {{ wxLua_wxLuaState_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxLuaState_Delete(lua_State *L)
--- 33,39 ----
  int s_wxluatag_wxLuaState = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaState_Delete[] = { &s_wxluatag_wxLuaState, 0 };
  static int LUACALL wxLua_wxLuaState_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaState_Delete[1] = {{ wxLua_wxLuaState_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaState_Delete }};
  
  static int LUACALL wxLua_wxLuaState_Delete(lua_State *L)
***************
*** 53,57 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaState_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaState_Delete },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 54,58 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaState_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaState_Delete, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
***************
*** 73,78 ****
  int s_wxluatag_wxLuaObject = -1;
  
  static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_Delete[1] = {{ wxLua_wxLuaObject_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L)
--- 74,80 ----
  int s_wxluatag_wxLuaObject = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_Delete[] = { &s_wxluatag_wxLuaObject, 0 };
  static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_Delete[1] = {{ wxLua_wxLuaObject_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_Delete }};
  
  static int LUACALL wxLua_wxLuaObject_Delete(lua_State *L)
***************
*** 89,94 ****
  }
  
  static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags[1] = {{ wxLua_wxLuaObject_GetAllocationFlags, 0, 0, s_wxluaargArray_None }};
  
  //     int  GetAllocationFlags() const
--- 91,97 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags[] = { &s_wxluatag_wxLuaObject, 0 };
  static int LUACALL wxLua_wxLuaObject_GetAllocationFlags(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags[1] = {{ wxLua_wxLuaObject_GetAllocationFlags, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetAllocationFlags }};
  
  //     int  GetAllocationFlags() const
***************
*** 107,112 ****
  }
  
  static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, 0, 0, s_wxluaargArray_None }};
  
  // %override wxLua_wxLuaObject_GetObject
--- 110,116 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_GetObject[] = { &s_wxluatag_wxLuaObject, 0 };
  static int LUACALL wxLua_wxLuaObject_GetObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_GetObject[1] = {{ wxLua_wxLuaObject_GetObject, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_GetObject }};
  
  // %override wxLua_wxLuaObject_GetObject
***************
*** 123,129 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, 1, 1, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }};
  
  //     bool HasAllocationFlag(wxLuaObject_Type flag)
--- 127,133 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enumeration, 0 };
  static int LUACALL wxLua_wxLuaObject_HasAllocationFlag(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag[1] = {{ wxLua_wxLuaObject_HasAllocationFlag, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_HasAllocationFlag }};
  
  //     bool HasAllocationFlag(wxLuaObject_Type flag)
***************
*** 144,150 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag[] = { &s_wxluaarg_Enumeration, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag[1] = {{ wxLua_wxLuaObject_SetAllocationFlag, 2, 2, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }};
  
  //     int  SetAllocationFlag(wxLuaObject_Type flag, bool set)
--- 148,154 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Enumeration, &s_wxluaarg_Boolean, 0 };
  static int LUACALL wxLua_wxLuaObject_SetAllocationFlag(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag[1] = {{ wxLua_wxLuaObject_SetAllocationFlag, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaObject_SetAllocationFlag }};
  
  //     int  SetAllocationFlag(wxLuaObject_Type flag, bool set)
***************
*** 167,173 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, 0, 1, s_wxluatagArray_wxLua_wxLuaObject_SetObject }};
  
  // %override wxLua_wxLuaObject_SetObject
--- 171,177 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaObject_SetObject[] = { &s_wxluatag_wxLuaObject, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaObject_SetObject(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_SetObject[1] = {{ wxLua_wxLuaObject_SetObject, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLuaObject_SetObject }};
  
  // %override wxLua_wxLuaObject_SetObject
***************
*** 185,189 ****
  
  static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, 0, 0, s_wxluaargArray_None }};
  
  // %override wxLua_wxLuaObject_constructor
--- 189,193 ----
  
  static int LUACALL wxLua_wxLuaObject_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaObject_constructor[1] = {{ wxLua_wxLuaObject_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }};
  
  // %override wxLua_wxLuaObject_constructor
***************
*** 208,218 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaObject_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaObject_Delete },
!     { WXLUAMETHOD_METHOD, "GetAllocationFlags", s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags, 1 },
!     { WXLUAMETHOD_METHOD, "GetObject", s_wxluafunc_wxLua_wxLuaObject_GetObject, 1 },
!     { WXLUAMETHOD_METHOD, "HasAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag, 1 },
!     { WXLUAMETHOD_METHOD, "SetAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag, 1 },
!     { WXLUAMETHOD_METHOD, "SetObject", s_wxluafunc_wxLua_wxLuaObject_SetObject, 1 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxLuaObject", s_wxluafunc_wxLua_wxLuaObject_constructor, 1 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 212,222 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaObject_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaObject_Delete, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetAllocationFlags", s_wxluafunc_wxLua_wxLuaObject_GetAllocationFlags, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetObject", s_wxluafunc_wxLua_wxLuaObject_GetObject, 1, 0 },
!     { WXLUAMETHOD_METHOD, "HasAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_HasAllocationFlag, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetAllocationFlag", s_wxluafunc_wxLua_wxLuaObject_SetAllocationFlag, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetObject", s_wxluafunc_wxLua_wxLuaObject_SetObject, 1, 0 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxLuaObject", s_wxluafunc_wxLua_wxLuaObject_constructor, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
***************
*** 236,241 ****
  int s_wxluatag_wxLuaPrintout = -1;
  
  static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_Delete[1] = {{ wxLua_wxLuaPrintout_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L)
--- 240,246 ----
  int s_wxluatag_wxLuaPrintout = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_Delete[] = { &s_wxluatag_wxLuaPrintout, 0 };
  static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_Delete[1] = {{ wxLua_wxLuaPrintout_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_Delete }};
  
  static int LUACALL wxLua_wxLuaPrintout_Delete(lua_State *L)
***************
*** 252,257 ****
  }
  
  static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_GetID[1] = {{ wxLua_wxLuaPrintout_GetID, 0, 0, s_wxluaargArray_None }};
  
  //     wxLuaObject *GetID()
--- 257,263 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_GetID[] = { &s_wxluatag_wxLuaPrintout, 0 };
  static int LUACALL wxLua_wxLuaPrintout_GetID(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_GetID[1] = {{ wxLua_wxLuaPrintout_GetID, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaPrintout_GetID }};
  
  //     wxLuaObject *GetID()
***************
*** 270,276 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo[1] = {{ wxLua_wxLuaPrintout_SetPageInfo, 2, 4, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }};
  
  //     void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0)
--- 276,282 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo[] = { &s_wxluatag_wxLuaPrintout, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaPrintout_SetPageInfo(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo[1] = {{ wxLua_wxLuaPrintout_SetPageInfo, WXLUAMETHOD_METHOD, 3, 5, s_wxluatagArray_wxLua_wxLuaPrintout_SetPageInfo }};
  
  //     void SetPageInfo(int minPage, int maxPage, int pageFrom = 0, int pageTo = 0)
***************
*** 298,302 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 };
  static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_constructor[1] = {{ wxLua_wxLuaPrintout_constructor, 0, 2, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }};
  
  // %override wxLua_wxLuaPrintout_constructor
--- 304,308 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaPrintout_constructor[] = { &s_wxluaarg_String, &s_wxluatag_wxLuaObject, 0 };
  static int LUACALL wxLua_wxLuaPrintout_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaPrintout_constructor[1] = {{ wxLua_wxLuaPrintout_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatagArray_wxLua_wxLuaPrintout_constructor }};
  
  // %override wxLua_wxLuaPrintout_constructor
***************
*** 328,335 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaPrintout_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaPrintout_Delete },
!     { WXLUAMETHOD_METHOD, "GetID", s_wxluafunc_wxLua_wxLuaPrintout_GetID, 1 },
!     { WXLUAMETHOD_METHOD, "SetPageInfo", s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo, 1 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxLuaPrintout", s_wxluafunc_wxLua_wxLuaPrintout_constructor, 1 },
  
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
--- 334,341 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaPrintout_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaPrintout_Delete, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetID", s_wxluafunc_wxLua_wxLuaPrintout_GetID, 1, 0 },
!     { WXLUAMETHOD_METHOD, "SetPageInfo", s_wxluafunc_wxLua_wxLuaPrintout_SetPageInfo, 1, 0 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxLuaPrintout", s_wxluafunc_wxLua_wxLuaPrintout_constructor, 1, 0 },
  
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
***************
*** 358,362 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor[1] = {{ wxLua_wxLuaHtmlWindow_constructor, 1, 6, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }};
  
  // %override wxLua_wxLuaHtmlWindow_constructor
--- 364,368 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxLuaHtmlWindow_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor[1] = {{ wxLua_wxLuaHtmlWindow_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 6, s_wxluatagArray_wxLua_wxLuaHtmlWindow_constructor }};
  
  // %override wxLua_wxLuaHtmlWindow_constructor
***************
*** 399,403 ****
  WXLUAMETHOD wxLuaHtmlWindow_methods[] = {
  #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect)
!     { WXLUAMETHOD_CONSTRUCTOR, "wxLuaHtmlWindow", s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor, 1 },
  #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect)
  
--- 405,409 ----
  WXLUAMETHOD wxLuaHtmlWindow_methods[] = {
  #if (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect)
!     { WXLUAMETHOD_CONSTRUCTOR, "wxLuaHtmlWindow", s_wxluafunc_wxLua_wxLuaHtmlWindow_constructor, 1, 0 },
  #endif // (wxLUA_USE_wxLuaHtmlWindow) && (wxLUA_USE_wxPointSizeRect)
  
***************
*** 424,429 ****
  int s_wxluatag_wxLuaHtmlWinTagEvent = -1;
  
  static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_Delete[1] = {{ wxLua_wxLuaHtmlWinTagEvent_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L)
--- 430,436 ----
  int s_wxluatag_wxLuaHtmlWinTagEvent = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_Delete[] = { &s_wxluatag_wxLuaHtmlWinTagEvent, 0 };
  static int LUACALL wxLua_wxLuaHtmlWinTagEvent_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaHtmlWinTagEvent_Delete[1] = {{ wxLua_wxLuaHtmlWinTagEvent_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaHtmlWinTagEvent_Delete }};
  
 ...
 
[truncated message content]

[Wxlua-commit] wxLua/modules/wxlua/src wxlbind.cpp, 1.61, 1.62 wxlstate.cpp, 1.98, 1.99

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

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

Modified Files:
	wxlbind.cpp wxlstate.cpp 
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: wxlstate.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** wxlstate.cpp	31 May 2007 17:18:54 -0000	1.98
--- wxlstate.cpp	5 Jun 2007 21:07:25 -0000	1.99
***************
*** 1849,1852 ****
--- 1849,1881 ----
  }
  
+ const WXLUACLASS* wxLuaState::GetLuaClass(const WXLUAMETHOD* method) const
+ {
+     wxLuaBindingList::compatibility_iterator node;
+     for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() )
+     {
+         wxLuaBinding* binding = node->GetData();
+ 
+         const WXLUACLASS *pLuaClass = binding->GetLuaClass(method);
+         if (pLuaClass)
+             return pLuaClass;
+     }
+ 
+     return NULL;
+ }
+ const WXLUACLASS* wxLuaState::GetLuaClass(const WXLUAMETHOD_CFUNC* method_cfunc) const
+ {
+     wxLuaBindingList::compatibility_iterator node;
+     for (node = M_WXLSTATEDATA->m_wxlStateData->m_bindingList.GetFirst(); node; node = node->GetNext() )
+     {
+         wxLuaBinding* binding = node->GetData();
+ 
+         const WXLUACLASS *pLuaClass = binding->GetLuaClass(method_cfunc);
+         if (pLuaClass)
+             return pLuaClass;
+     }
+ 
+     return NULL;
+ }
+ 
  const WXLUACLASS* wxLuaState::GetBaseLuaClass(int iClassTag) const
  {
***************
*** 2390,2436 ****
  }
  
! WXLUAMETHOD* wxLuaState::GetLuaMethod(const WXLUACLASS *pClass, const char *cpIndex)
  {
!     int i_method, method_count = pClass->methods_n;
      // find a method in the class, recurse through classes from which this class is derived.
      for (i_method = 0; i_method < method_count; ++i_method)
      {
!         WXLUAMETHOD *pMethod = pClass->methods + i_method;
!         if (WXLUA_HASBIT(pMethod->type, WXLUAMETHOD_METHOD | WXLUAMETHOD_GETPROP)
!                 && (strcmp(pMethod->name, cpIndex) == 0))
          {
!             return pMethod;
          }
      }
  
!     if (pClass->baseclass)
!         return GetLuaMethod(pClass->baseclass, cpIndex);
  
      return NULL;
  }
  
! WXLUAMETHOD* wxLuaState::GetLuaProperty(const WXLUACLASS *pClass, const char *cpIndex, bool isLuaSetProp)
  {
!     wxCHECK_MSG(pClass, NULL, wxT("Invalid WXLUACLASS in wxLuaState::GetLuaProperty"));
  
!     int i_method, method_count = pClass->methods_n;
      // find a method in the class, recurse through classes from which this class is derived.
      for (i_method = 0; i_method < method_count; ++i_method)
      {
!         WXLUAMETHOD *pMethod = pClass->methods + i_method;
          if (isLuaSetProp)
          {
!             if (WXLUA_HASBIT(pMethod->type, WXLUAMETHOD_SETPROP) && (strcmp(pMethod->name, cpIndex) == 0))
!                 return pMethod;
          }
          else
          {
!             if (WXLUA_HASBIT(pMethod->type, WXLUAMETHOD_GETPROP) && (strcmp(pMethod->name, cpIndex) == 0))
!                 return pMethod;
          }
      }
  
!     if (pClass->baseclass)
!         return GetLuaProperty(pClass->baseclass, cpIndex, isLuaSetProp);
  
      return NULL;
--- 2419,2491 ----
  }
  
! WXLUAMETHOD* wxLuaState::GetLuaMethod(const WXLUACLASS *wxlClass, const char *methodName)
  {
!     int i_method, method_count = wxlClass->methods_n;
      // find a method in the class, recurse through classes from which this class is derived.
      for (i_method = 0; i_method < method_count; ++i_method)
      {
!         WXLUAMETHOD *wxlMethod = wxlClass->methods + i_method;
!         if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_METHOD | WXLUAMETHOD_GETPROP)
!                 && (strcmp(wxlMethod->name, methodName) == 0))
          {
!             // iterate through the base classes to find if this function is
!             // an overload, but only if we haven't checked already.
!             if (!WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_OVERLOAD_BASE))
!             {
!                 WXLUACLASS *baseClass = wxlClass->baseclass;
!                 WXLUAMETHOD *parentMethod = wxlMethod;
! 
!                 while (baseClass)
!                 {
!                     parentMethod->type |= WXLUAMETHOD_OVERLOAD_BASE;
! 
!                     WXLUAMETHOD* baseMethod = GetLuaMethod(baseClass, methodName);
!                     if (baseMethod)
!                     {
!                         parentMethod->basemethod = baseMethod;
!                         parentMethod = baseMethod;
! 
!                         // we have already checked the base classes below this
!                         if (WXLUA_HASBIT(baseMethod->type, WXLUAMETHOD_OVERLOAD_BASE))
!                             break;
!                     }
! 
!                     baseClass = baseClass->baseclass;                       
!                 }
!             }
! 
!             return wxlMethod;
          }
      }
  
!     if (wxlClass->baseclass)
!         return GetLuaMethod(wxlClass->baseclass, methodName);
  
      return NULL;
  }
  
! WXLUAMETHOD* wxLuaState::GetLuaProperty(const WXLUACLASS *wxlClass, const char *propName, bool isLuaSetProp)
  {
!     wxCHECK_MSG(wxlClass, NULL, wxT("Invalid WXLUACLASS in wxLuaState::GetLuaProperty"));
  
!     int i_method, method_count = wxlClass->methods_n;
      // find a method in the class, recurse through classes from which this class is derived.
      for (i_method = 0; i_method < method_count; ++i_method)
      {
!         WXLUAMETHOD *wxlMethod = wxlClass->methods + i_method;
          if (isLuaSetProp)
          {
!             if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_SETPROP) && (strcmp(wxlMethod->name, propName) == 0))
!                 return wxlMethod;
          }
          else
          {
!             if (WXLUA_HASBIT(wxlMethod->type, WXLUAMETHOD_GETPROP) && (strcmp(wxlMethod->name, propName) == 0))
!                 return wxlMethod;
          }
      }
  
!     if (wxlClass->baseclass)
!         return GetLuaProperty(wxlClass->baseclass, propName, isLuaSetProp);
  
      return NULL;
***************
*** 3214,3289 ****
  
  
! wxString wxLuaState::CreateMethodArgTagsMsg(struct WXLUAMETHOD* method)
  {
!     wxCHECK_MSG(method, wxEmptyString, wxT("Invalid method table"));
  
!     wxString fnOverloadList;
!     int i, arg, funcs_count = method->funcs_n;
!     WXLUAMETHOD_CFUNC* funcs = method->funcs;
  
!     for (i = 0; i < funcs_count; i++)
      {
!         wxString fnOverload = wxString::Format(wxT("%02d. %s("), (i+1), lua2wx(method->name).c_str());
  
!         for (arg = 0; arg < funcs[i].maxargs; arg++)
          {
!             // optional args?
!             if ((funcs[i].minargs < funcs[i].maxargs) && (arg == funcs[i].minargs))
!             {
!                 fnOverload += wxT("[");
!             }
  
!             if (arg > 0)
!                 fnOverload += wxT(", ");
  
!             int tag = (int)*(funcs[i].argtags[arg]);
  
!             if (tag == s_wxluaarg_String)
!             {
!                 fnOverload += wxT("string");
!             }
!             else if (tag == s_wxluaarg_Boolean)
!             {
!                 fnOverload += wxT("boolean");
!             }
!             else if (tag == s_wxluaarg_Enumeration)
!             {
!                 fnOverload += wxT("enum");
!             }
!             else if (tag == s_wxluaarg_Number)
!             {
!                 fnOverload += wxT("number");
!             }
!             else if (tag == s_wxluaarg_LightUserData)
!             {
!                 fnOverload += wxT("lightuserdata");
!             }
!             else if (tag == s_wxluaarg_UserData)
!             {
!                 fnOverload += wxT("userdata");
!             }
!             else if (tag == s_wxluaarg_LuaTable)
!             {
!                 fnOverload += wxT("luatable");
!             }
!             else if (tag == s_wxluaarg_LuaFunction)
              {
!                 fnOverload += wxT("luafunction");
              }
!             else
              {
!                 fnOverload += GetLuaTagName(tag);
              }
-         }
  
!         // close optional args
!         if (funcs[i].minargs < funcs[i].maxargs)
!         {
!             fnOverload += wxT("]");
!         }
  
!         fnOverload += wxT(")");
  
!         fnOverloadList += fnOverload + wxT("\n");
      }
  
--- 3269,3363 ----
  
  
! wxString wxLuaState::CreateMethodArgTagsMsg(struct WXLUAMETHOD* wxlMethod)
  {
!     wxCHECK_MSG(wxlMethod, wxEmptyString, wxT("Invalid method table"));
  
!     wxString fnOverloadList;   
!     WXLUAMETHOD* method = wxlMethod;
  
!     while (method)
      {
!         WXLUAMETHOD_CFUNC* funcs = method->funcs;
!         int i, arg, funcs_count = wxlMethod->funcs_n;
!         int i_func = 0;
  
!         for (i = 0; i < funcs_count; i++)
          {
!             // skip over the overload function
!             if (WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_OVERLOAD))
!                 continue;
  
!             i_func++; // only count the non overload functions
  
!             wxString fnOverload = wxString::Format(wxT("%02d. %s("), i_func, lua2wx(method->name).c_str());
  
!             for (arg = 0; arg < funcs[i].maxargs; arg++)
              {
!                 // optional args?
!                 if ((funcs[i].minargs < funcs[i].maxargs) && (arg == funcs[i].minargs))
!                 {
!                     fnOverload += wxT("[");
!                 }
! 
!                 if (arg > 0)
!                     fnOverload += wxT(", ");
! 
!                 int tag = (int)*(funcs[i].argtags[arg]);
! 
!                 if (tag == s_wxluaarg_String)
!                 {
!                     fnOverload += wxT("string");
!                 }
!                 else if (tag == s_wxluaarg_Boolean)
!                 {
!                     fnOverload += wxT("boolean");
!                 }
!                 else if (tag == s_wxluaarg_Enumeration)
!                 {
!                     fnOverload += wxT("enum");
!                 }
!                 else if (tag == s_wxluaarg_Number)
!                 {
!                     fnOverload += wxT("number");
!                 }
!                 else if (tag == s_wxluaarg_LightUserData)
!                 {
!                     fnOverload += wxT("lightuserdata");
!                 }
!                 else if (tag == s_wxluaarg_UserData)
!                 {
!                     fnOverload += wxT("userdata");
!                 }
!                 else if (tag == s_wxluaarg_LuaTable)
!                 {
!                     fnOverload += wxT("luatable");
!                 }
!                 else if (tag == s_wxluaarg_LuaFunction)
!                 {
!                     fnOverload += wxT("luafunction");
!                 }
!                 else
!                 {
!                     fnOverload += GetLuaTagName(tag);
!                     if ((arg == 0) && !WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_STATIC))
!                         fnOverload += wxT("(self)");
!                 }
              }
! 
!             // close optional args
!             if (funcs[i].minargs < funcs[i].maxargs)
              {
!                 fnOverload += wxT("]");
              }
  
!             fnOverload += wxT(")");
  
!             if (WXLUA_HASBIT(funcs[i].type, WXLUAMETHOD_STATIC))
!                 fnOverload += wxT(" - static");
  
!             fnOverloadList += fnOverload + wxT("\n");
!         }
! 
!         method = method->basemethod;
      }
  
***************
*** 3292,3298 ****
  
  // Redirect lua function call to 1 method from a list of overloaded functions
! int LUACALL wxLuaState::CallOverloadedFunction(struct WXLUAMETHOD* overloadedMethods)
  {
!     wxCHECK_MSG(overloadedMethods, 0, wxT("Invalid overloaded method table"));
  
      int i, arg;
--- 3366,3372 ----
  
  // Redirect lua function call to 1 method from a list of overloaded functions
! int LUACALL wxLuaState::CallOverloadedFunction(struct WXLUAMETHOD* wxlMethod)
  {
!     wxCHECK_MSG(wxlMethod, 0, wxT("Invalid overloaded method table"));
  
      int i, arg;
***************
*** 3300,3304 ****
  
      // do nothing
!     if (!overloadedMethods || (overloadedMethods->funcs_n < 1))
          return 0;
  
--- 3374,3378 ----
  
      // do nothing
!     if (!wxlMethod || (wxlMethod->funcs_n < 1))
          return 0;
  
***************
*** 3315,3326 ****
      }
  
!     // for methods like pen:SetColour(0,0,0) first lua arg is the wxPen (eg. self)
!     if (WXLUA_HASBIT(overloadedMethods[0].type, WXLUAMETHOD_METHOD))
!     {
!         argCount--;
!         lua_argStart++;
!     }
! 
! #if 0
      // prepare overload function table
      WXLUAMETHOD** overloadFunctionTable = new WXLUAMETHOD*[overloadedMethodCount];
--- 3389,3393 ----
      }
  
! /*
      // prepare overload function table
      WXLUAMETHOD** overloadFunctionTable = new WXLUAMETHOD*[overloadedMethodCount];
***************
*** 3355,3370 ****
      }
  #endif
! #endif // 0
! 
!     int overloadedMethodCount = overloadedMethods->funcs_n;
!     WXLUAMETHOD_CFUNC* overloadFunctionTable = overloadedMethods->funcs;
  
      // only look at the methods that could possibly work
      wxArrayPtrVoid funcArray;
!     for (i = 0; i < overloadedMethodCount; ++i)
      {
!         if ((argCount >= overloadFunctionTable[i].minargs) &&
!             (argCount <= overloadFunctionTable[i].maxargs))
!             funcArray.Add(&overloadFunctionTable[i]);
      }
  
--- 3422,3444 ----
      }
  #endif
! */
  
      // only look at the methods that could possibly work
      wxArrayPtrVoid funcArray;
!     WXLUAMETHOD* method = wxlMethod;
!     while (method)
      {
!         for (i = 0; i < method->funcs_n; ++i)
!         {
!             if (!WXLUA_HASBIT(method->funcs[i].type, WXLUAMETHOD_OVERLOAD) &&
!                 (argCount >= method->funcs[i].minargs) &&
!                 (argCount <= method->funcs[i].maxargs))
!             {
!                 funcArray.Add(&method->funcs[i]);
!             }
! 
!         }
! 
!         method = method->basemethod;
      }
  
***************
*** 3380,3384 ****
          }
  
!         int ltype = lua_Type(arg+1+lua_argStart);
  
          for (i = 0; i < (int)funcArray.GetCount(); i++)
--- 3454,3459 ----
          }
  
!         int arg_lua = arg+1+lua_argStart; // arg N in lua
!         int ltype = lua_Type(arg_lua);
  
          for (i = 0; i < (int)funcArray.GetCount(); i++)
***************
*** 3387,3392 ****
              bestFunc = func;
  
              // does this method have any more arguments?
!             if (!func->argtags || !func->argtags[arg])
              {
                  // this one won't work, try the next
--- 3462,3469 ----
              bestFunc = func;
  
+             int arg_wxlua = arg;              // arg N in wxLuaArgTag
+ 
              // does this method have any more arguments?
!             if (!func->argtags[arg_wxlua])
              {
                  // this one won't work, try the next
***************
*** 3396,3402 ****
  
              // get argument tag id
!             int tag = (int)*(func->argtags[arg]);
  
!             //wxPrintf(wxT("ARG '%s' argCount %d arg %d ltype %d wxtype %d func_count %d, f# %d\n"), lua2wx(overloadedMethods->name).c_str(), argCount, arg, ltype, tag, funcArray.GetCount(), i);
  
              if (tag == s_wxluaarg_String)
--- 3473,3479 ----
  
              // get argument tag id
!             int tag = (int)*(func->argtags[arg_wxlua]);
  
!             //wxPrintf(wxT("ARG '%s' type %d argCount %d arg %d arg_lua %d arg_wxlua %d ltype %d wxtype %d func_count %d/%d\n"), lua2wx(wxlMethod->name).c_str(), func->type, argCount, arg, arg_lua, arg_wxlua, ltype, tag, i, funcArray.GetCount());
  
              if (tag == s_wxluaarg_String)
***************
*** 3434,3438 ****
              else if (tag == s_wxluaarg_LightUserData)
              {
!                 if (!lua_IsLightUserData(arg+1+lua_argStart))
                  {
                      funcArray.RemoveAt(i); i--;
--- 3511,3515 ----
              else if (tag == s_wxluaarg_LightUserData)
              {
!                 if (!lua_IsLightUserData(arg_lua))
                  {
                      funcArray.RemoveAt(i); i--;
***************
*** 3442,3446 ****
              else if (tag == s_wxluaarg_UserData)
              {
!                 if (!lua_IsUserData(arg+1+lua_argStart))
                  {
                      funcArray.RemoveAt(i); i--;
--- 3519,3523 ----
              else if (tag == s_wxluaarg_UserData)
              {
!                 if (!lua_IsUserData(arg_lua))
                  {
                      funcArray.RemoveAt(i); i--;
***************
*** 3450,3454 ****
              else if (tag == s_wxluaarg_LuaTable)
              {
!                 if (!lua_IsTable(arg+1+lua_argStart))
                  {
                      funcArray.RemoveAt(i); i--;
--- 3527,3531 ----
              else if (tag == s_wxluaarg_LuaTable)
              {
!                 if (!lua_IsTable(arg_lua))
                  {
                      funcArray.RemoveAt(i); i--;
***************
*** 3458,3462 ****
              else if (tag == s_wxluaarg_LuaFunction)
              {
!                 if (!lua_IsFunction(arg+1+lua_argStart))
                  {
                      funcArray.RemoveAt(i); i--;
--- 3535,3539 ----
              else if (tag == s_wxluaarg_LuaFunction)
              {
!                 if (!lua_IsFunction(arg_lua))
                  {
                      funcArray.RemoveAt(i); i--;
***************
*** 3464,3468 ****
                  }
              }
!             else if (!IsUserDataType(arg+1+lua_argStart, tag) &&
                  (tag != M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL)) // FIXME!
              {
--- 3541,3545 ----
                  }
              }
!             else if (!IsUserDataType(arg_lua, tag) &&
                  (tag != M_WXLSTATEDATA->m_wxlStateData->m_wxluatag_NULL)) // FIXME!
              {
***************
*** 3541,3558 ****
  
      wxString fnOverloadList = wxT("wxLua Function Overload Table:\n");
!     fnOverloadList += CreateMethodArgTagsMsg(overloadedMethods);
  
      wxString errmsg;
  
!     if (bestFunc == NULL)
          errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument\n%s"), fnCall.c_str(), fnOverloadList.c_str());
      else
      {
!         for (i = 0; i < overloadedMethodCount; i++)
          {
!             if (&overloadFunctionTable[i] == bestFunc)
!                 break;
          }
!         errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument %d on method %02d\n%s"), fnCall.c_str(), (invalidArg+1), (i+1), fnOverloadList.c_str());
      }
  
--- 3618,3642 ----
  
      wxString fnOverloadList = wxT("wxLua Function Overload Table:\n");
!     fnOverloadList += CreateMethodArgTagsMsg(wxlMethod);
  
      wxString errmsg;
  
!     if (1) //bestFunc == NULL) FIXME
          errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument\n%s"), fnCall.c_str(), fnOverloadList.c_str());
      else
      {
!         method = wxlMethod;
!         while (method)
          {
!             for (i = 0; i < method->funcs_n; ++i)
!             {
!                 if (&method->funcs[i] == bestFunc)
!                     break;
!             }
!         
!             method = method->basemethod;
          }
! 
!         errmsg = wxString::Format(wxT("wxLua overloaded function %s has invalid argument %d on method %02d\n%s"), fnCall.c_str(), (invalidArg), (i+1), fnOverloadList.c_str());
      }
  

Index: wxlbind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** wxlbind.cpp	31 May 2007 17:18:54 -0000	1.61
--- wxlbind.cpp	5 Jun 2007 21:07:25 -0000	1.62
***************
*** 54,62 ****
      // otherwise the colon notation *must* be used.
      lua_remove(L, 1); // remove the wxLuaFunction userdata from the stack
      return (*m_wxlMethod->funcs[0].func)(L);
  }
  
! // A function object needs to be deleted because the object is being
! // garbage collected.
  int LUACALL wxlua_gc_wxLuaFunction(lua_State *L)
  {
--- 54,68 ----
      // otherwise the colon notation *must* be used.
      lua_remove(L, 1); // remove the wxLuaFunction userdata from the stack
+ 
+     if (m_wxlMethod->basemethod)
+     {
+         wxLuaState wxlState(L);
+         return wxlState.CallOverloadedFunction(m_wxlMethod);
+     }
+ 
      return (*m_wxlMethod->funcs[0].func)(L);
  }
  
! // A wxLuaFunction object is being garbage collected.
  int LUACALL wxlua_gc_wxLuaFunction(lua_State *L)
  {
***************
*** 86,91 ****
  
          // remove the userdata *this from the stack
!         if (pFunction->m_wxlMethod && WXLUA_HASBIT(pFunction->m_wxlMethod->type, WXLUAMETHOD_STATIC))
!             lua_remove(L, 1);
  
          return pFunction->CallMethod(L);
--- 92,97 ----
  
          // remove the userdata *this from the stack
!         //if (pFunction->m_wxlMethod && WXLUA_HASBIT(pFunction->m_wxlMethod->type, WXLUAMETHOD_STATIC))
!         //    lua_remove(L, 1);
  
          return pFunction->CallMethod(L);
***************
*** 789,794 ****
                          lua_pushstring(L, "__call");
                          //lua_pushcfunction(L, wxlMethod->func);
!                         lua_pushlightuserdata(L, &wxlua_checkremovetable);   // push the method userdata
!                         lua_pushcclosure(L, wxlMethod->funcs[0].func, 1); // push func with func as upvalue
                          lua_rawset(L, -3);
  
--- 795,800 ----
                          lua_pushstring(L, "__call");
                          //lua_pushcfunction(L, wxlMethod->func);
!                         lua_pushlightuserdata(L, &wxlua_checkremovetable); // push tag to recognize table call
!                         lua_pushcclosure(L, wxlMethod->funcs[0].func, 1);  // push func with tag as upvalue
                          lua_rawset(L, -3);
  
***************
*** 969,970 ****
--- 975,1021 ----
      return (luaEvent != NULL) ? lua2wx(luaEvent->name) : wxString();
  }
+ 
+ const WXLUACLASS* wxLuaBinding::GetLuaClass(const WXLUAMETHOD* wxlMethod) const
+ {
+     for (size_t i_class = 0; i_class < m_classCount; ++i_class)    
+     {
+         WXLUACLASS *wxlClass = m_classList + i_class;
+         int i_method, method_count = wxlClass->methods_n;
+         
+         for (i_method = 0; i_method < method_count; ++i_method)
+         {
+             for (int i = 0; i < wxlClass[i_method].methods_n; ++i)
+             {
+                 if (&wxlClass[i_method].methods[i] == wxlMethod)
+                     return wxlClass;
+             }
+         }
+ 
+     }
+ 
+     return NULL;
+ }
+ 
+ const WXLUACLASS* wxLuaBinding::GetLuaClass(const WXLUAMETHOD_CFUNC* wxlMethod_cfunc) const
+ {
+     for (size_t i_class = 0; i_class < m_classCount; ++i_class)    
+     {
+         WXLUACLASS *wxlClass = m_classList + i_class;
+         int i_method, method_count = wxlClass->methods_n;
+         
+         for (i_method = 0; i_method < method_count; ++i_method)
+         {
+             for (int i = 0; i < wxlClass[i_method].methods_n; ++i)
+             {
+                 for (int j = 0; j < wxlClass[i_method].methods[i].funcs_n; ++j)
+                 {
+                     if (&wxlClass[i_method].methods[i].funcs[j] == wxlMethod_cfunc)
+                         return wxlClass;
+                 }
+             }
+         }
+ 
+     }
+ 
+     return NULL;
+ }

[Wxlua-commit] wxLua/samples choices.wx.lua, 1.11, 1.12 editor.wx.lua, 1.51, 1.52 unittest.wx.lua, 1.7, 1.8 wxluasudoku.wx.lua, 1.68, 1.69

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

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

Modified Files:
	choices.wx.lua editor.wx.lua unittest.wx.lua 
	wxluasudoku.wx.lua 
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: choices.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/choices.wx.lua,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** choices.wx.lua	31 May 2007 17:18:55 -0000	1.11
--- choices.wx.lua	5 Jun 2007 21:07:26 -0000	1.12
***************
*** 58,61 ****
--- 58,66 ----
                                     wx.wxDefaultPosition, wx.wxDefaultSize,
                                     choices)
+     -- Test the binding generator to properly overload 
+     --   wxComboBox::SetSelection(int from, int to) (to mark text) and 
+     --   wxControlWithItems::SetSelection(int sel)
+     comboBox:SetSelection(2)
+     comboBox:SetSelection(1, 3)
      local choice = wx.wxChoice(panel2, wx.wxID_ANY,
                                 wx.wxDefaultPosition, wx.wxDefaultSize,

Index: wxluasudoku.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** wxluasudoku.wx.lua	31 May 2007 21:38:49 -0000	1.68
--- wxluasudoku.wx.lua	5 Jun 2007 21:07:26 -0000	1.69
***************
*** 2042,2045 ****
--- 2042,2047 ----
      pageSetupData     = wx.wxPageSetupDialogData(),
  
+     config            = nil, -- the wxFileConfig for saving preferences
+ 
      Colours                = {}, -- table of wxColours to use, indexes below
      VALUE_COLOUR           = 1,
***************
*** 4247,4256 ****
  
  function sudokuGUI.ConfigSave(save_prefs)
!     local config = wx.wxConfigBase.Get(false)
!     if not config then
!         config = wx.wxFileConfig("wxLuaSudoku", "wxLua")
      end
  
!     if not config then return end
  
      -- write the frame position so we can restore it
--- 4249,4257 ----
  
  function sudokuGUI.ConfigSave(save_prefs)
!     if not sudokuGUI.config then
!         sudokuGUI.config = wx.wxFileConfig("wxLuaSudoku", "wxLua")
      end
  
!     if not sudokuGUI.config then return end
  
      -- write the frame position so we can restore it
***************
*** 4258,4262 ****
      local w, h = sudokuGUI.frame:GetClientSizeWH()
      local max  = booltoint(sudokuGUI.frame:IsMaximized())
!     config:Write("wxLuaSudoku/Frame", string.format("x:%d y:%d w:%d h:%d maximized:%d", x, y, w, h, max))
  
      if not save_prefs then return end
--- 4259,4263 ----
      local w, h = sudokuGUI.frame:GetClientSizeWH()
      local max  = booltoint(sudokuGUI.frame:IsMaximized())
!     sudokuGUI.config:Write("wxLuaSudoku/Frame", string.format("x:%d y:%d w:%d h:%d maximized:%d", x, y, w, h, max))
  
      if not save_prefs then return end
***************
*** 4278,4296 ****
      end
  
!     if config then
!         sudokuGUI.ConfigReadWrite(false, config)
!         config:Flush(true)
      end
  end
  
  function sudokuGUI.ConfigLoad()
!     local config = wx.wxConfigBase.Get(false)
!     if not config then
!         config = wx.wxFileConfig("wxLuaSudoku", "wxLua")
      end
  
!     if config then
          local dispX, dispY, dispW, dispH = wx.wxClientDisplayRect()
!         local _, str = config:Read("wxLuaSudoku/Frame")
          local x, y, w, h, max = string.match(str, "x:(%d+) y:(%d+) w:(%d+) h:(%d+) maximized:(%d+)")
          if (x ~= nil) and (y ~= nil) and (w ~= nil) and (h ~= nil) and (max ~= nil) then
--- 4279,4296 ----
      end
  
!     if sudokuGUI.config then
!         sudokuGUI.ConfigReadWrite(false, sudokuGUI.config)
!         sudokuGUI.config:Flush(true)
      end
  end
  
  function sudokuGUI.ConfigLoad()
!     if not sudokuGUI.config then
!         sudokuGUI.config = wx.wxFileConfig("wxLuaSudoku", "wxLua")
      end
  
!     if sudokuGUI.config then
          local dispX, dispY, dispW, dispH = wx.wxClientDisplayRect()
!         local _, str = sudokuGUI.config:Read("wxLuaSudoku/Frame")
          local x, y, w, h, max = string.match(str, "x:(%d+) y:(%d+) w:(%d+) h:(%d+) maximized:(%d+)")
          if (x ~= nil) and (y ~= nil) and (w ~= nil) and (h ~= nil) and (max ~= nil) then
***************
*** 4310,4314 ****
          end
  
!         sudokuGUI.ConfigReadWrite(true, config)
      end
  
--- 4310,4314 ----
          end
  
!         sudokuGUI.ConfigReadWrite(true, sudokuGUI.config)
      end
  

Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** editor.wx.lua	31 May 2007 21:38:49 -0000	1.51
--- editor.wx.lua	5 Jun 2007 21:07:26 -0000	1.52
***************
*** 174,181 ****
  -- ----------------------------------------------------------------------------
  -- Initialize the wxConfig for loading/saving the preferences
- editorApp:SetVendorName("Lomtick Software")
- editorApp:SetAppName("wxLua IDE")
  
! config = wx.wxConfigBase.Get()
  if config then
      config:SetRecordDefaults()
--- 174,179 ----
  -- ----------------------------------------------------------------------------
  -- Initialize the wxConfig for loading/saving the preferences
  
! config = wx.wxFileConfig("wxLuaIDE", "WXLUA")
  if config then
      config:SetRecordDefaults()
***************
*** 2327,2331 ****
  
      ConfigSaveFramePosition(frame, "MainFrame")
!     config:Set():Delete()
      event:Skip()
      CloseWatchWindow()
--- 2325,2329 ----
  
      ConfigSaveFramePosition(frame, "MainFrame")
!     config:Delete() -- always delete the config
      event:Skip()
      CloseWatchWindow()

Index: unittest.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/unittest.wx.lua,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** unittest.wx.lua	31 May 2007 17:18:56 -0000	1.7
--- unittest.wx.lua	5 Jun 2007 21:07:26 -0000	1.8
***************
*** 47,51 ****
  
  -- ---------------------------------------------------------------------------
! print("\nSimple bindings tests.\n")
  -- ---------------------------------------------------------------------------
  
--- 47,51 ----
  
  -- ---------------------------------------------------------------------------
! print("\nSimple bindings tests of numbers, strings, objects.\n")
  -- ---------------------------------------------------------------------------
  
***************
*** 53,68 ****
  PrintOk(a == wx.wxID_ANY and a == -1, "Test %define wxID_ANY == -1")
  
  a = wx.wxEVT_NULL
! PrintOk(a == wx.wxEVT_NULL, "Test %define %event wxEVT_NULL == -1")
  
  a = wx.wxIMAGE_OPTION_CUR_HOTSPOT_X
! PrintOk(a == wx.wxIMAGE_OPTION_CUR_HOTSPOT_X and a == "HotSpotX", "Test %define %string wxIMAGE_OPTION_CUR_HOTSPOT_X")
  
  a = wx.wxNullColour
! PrintOk(a:Ok() == false, "Test %define %object wxNullColour is not Ok()")
  
  a = wx.wxThePenList
! PrintOk(a:FindOrCreatePen(wx.wxColour(1,2,3), 1, wx.wxSOLID):Ok(), "Test %define %pointer wxThePenList:FindOrCreatePen(wx.wxColour, 1, wx.wxSOLID)")
! PrintOk(a:FindOrCreatePen(wx.wxRED, 1, wx.wxSOLID):Ok(), "Test %define %pointer wxThePenList:FindOrCreatePen(wx.wxRED, 1, wx.wxSOLID)")
  
  -- ---------------------------------------------------------------------------
--- 53,77 ----
  PrintOk(a == wx.wxID_ANY and a == -1, "Test %define wxID_ANY == -1")
  
+ a = wx.wxACCEL_NORMAL
+ PrintOk(a == wx.wxACCEL_NORMAL and a == 0, "Test %enum wxACCEL_NORMAL == 0")
+ 
+ a = wx.wxFILE_KIND_UNKNOWN
+ PrintOk(a == wx.wxFILE_KIND_UNKNOWN and a == 0, "Test %enum wxFileKind::wxFILE_KIND_UNKNOWN == 0")
+ 
+ a = wx.wxFile.read
+ PrintOk(a == wx.wxFile.read and a == 0, "Test %enum wxFile::OpenMode::read == 0")
+ 
  a = wx.wxEVT_NULL
! PrintOk(a == wx.wxEVT_NULL, "Test %define_event wxEVT_NULL == -1")
  
  a = wx.wxIMAGE_OPTION_CUR_HOTSPOT_X
! PrintOk(a == wx.wxIMAGE_OPTION_CUR_HOTSPOT_X and a == "HotSpotX", "Test %define_string wxIMAGE_OPTION_CUR_HOTSPOT_X")
  
  a = wx.wxNullColour
! PrintOk(a:Ok() == false, "Test %define_object wxNullColour is not Ok()")
  
  a = wx.wxThePenList
! PrintOk(a:FindOrCreatePen(wx.wxColour(1,2,3), 1, wx.wxSOLID):Ok(), "Test %define_pointer wxThePenList:FindOrCreatePen(wx.wxColour, 1, wx.wxSOLID) is Ok()")
! PrintOk(a:FindOrCreatePen(wx.wxRED, 1, wx.wxSOLID):Ok(), "Test %define_pointer wxThePenList:FindOrCreatePen(wx.wxRED, 1, wx.wxSOLID) is Ok()")
  
  -- ---------------------------------------------------------------------------
***************
*** 82,85 ****
--- 91,95 ----
  pt.x = 10
  PrintOk(pt:GetX() == 10, "%rename %member using wxPoint.x = 10; wxPoint:GetX()")
+ PrintOk(pt.GetX(pt) == 10, "%rename %member using wxPoint.x = 10; wxPoint.GetX(self)")
  pt:SetX(20)
  PrintOk(pt.x == 20, "%rename %member using wxPoint:SetX(20); wxPoint.x")
***************
*** 105,110 ****
  
  -- Test static functions and calling them
! f = wx.wxFileName('a')
! PrintOk(f:GetCwd() == wx.wxFileName.GetCwd(), "Calling static wxString wxFileName::GetCwd(), as member and static.")
  
  -- Test new() constructor function and copying it
--- 115,124 ----
  
  -- Test static functions and calling them
! fname = 'a321.123X!x!'
! f = wx.wxFileName(fname)
! PrintOk(f.GetCwd() == wx.wxFileName.GetCwd(), "Calling static wxString wxFileName::GetCwd(), as static member and static global.")
! 
! -- Test overloaded static and non static functions
! PrintOk(f:FileExists() == wx.wxFileName.FileExists(fname), "Calling static wxFileName::FileExists(str) == member wxFileName::FileExists.")
  
  -- Test new() constructor function and copying it

[Wxlua-commit] wxLua/modules/wxluasocket/src wxluasocket.cpp, 1.21, 1.22

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

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

Modified Files:
	wxluasocket.cpp 
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: wxluasocket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wxluasocket.cpp	31 May 2007 17:18:55 -0000	1.21
--- wxluasocket.cpp	5 Jun 2007 21:07:25 -0000	1.22
***************
*** 27,33 ****
  int s_wxluatag_wxLuaDebuggerServer = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }};
  
  //     bool AddBreakPoint(const wxString &fileName, int lineNumber)
--- 27,33 ----
  int s_wxluatag_wxLuaDebuggerServer = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_AddBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }};
  
  //     bool AddBreakPoint(const wxString &fileName, int lineNumber)
***************
*** 50,55 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }};
  
  //     bool Break()
--- 50,56 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Break[1] = {{ wxLua_wxLuaDebuggerServer_Break, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break }};
  
  //     bool Break()
***************
*** 68,73 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluaargArray_None }};
  
  //     bool ClearAllBreakPoints()
--- 69,75 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[1] = {{ wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }};
  
  //     bool ClearAllBreakPoints()
***************
*** 86,91 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }};
  
  //     bool Continue()
--- 88,94 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue[1] = {{ wxLua_wxLuaDebuggerServer_Continue, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue }};
  
  //     bool Continue()
***************
*** 104,109 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete[1] = {{ wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L)
--- 107,113 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Delete[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete[1] = {{ wxLua_wxLuaDebuggerServer_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Delete }};
  
  static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L)
***************
*** 120,126 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }};
  
  //     void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY)
--- 124,130 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog[1] = {{ wxLua_wxLuaDebuggerServer_DisplayStackDialog, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }};
  
  //     void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY)
***************
*** 142,148 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }};
  
  //     bool EvaluateExpr(int exprRef, const wxString &expr)
--- 146,152 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr[1] = {{ wxLua_wxLuaDebuggerServer_EvaluateExpr, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }};
  
  //     bool EvaluateExpr(int exprRef, const wxString &expr)
***************
*** 165,170 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluaargArray_None }};
  
  //     long GetDebuggeeProcessId() const
--- 169,175 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[1] = {{ wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }};
  
  //     long GetDebuggeeProcessId() const
***************
*** 184,188 ****
  
  static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName[1] = {{ wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }};
  
  //     static wxString GetNetworkName()
--- 189,193 ----
  
  static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName[1] = {{ wxLua_wxLuaDebuggerServer_GetNetworkName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }};
  
  //     static wxString GetNetworkName()
***************
*** 200,204 ****
  
  static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName[1] = {{ wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }};
  
  //     static wxString GetProgramName()
--- 205,209 ----
  
  static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName[1] = {{ wxLua_wxLuaDebuggerServer_GetProgramName, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }};
  
  //     static wxString GetProgramName()
***************
*** 215,220 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }};
  
  //     bool KillDebuggee()
--- 220,226 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee[1] = {{ wxLua_wxLuaDebuggerServer_KillDebuggee, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee }};
  
  //     bool KillDebuggee()
***************
*** 233,239 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }};
  
  //     bool RemoveBreakPoint(const wxString &fileName, int lineNumber)
--- 239,245 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[1] = {{ wxLua_wxLuaDebuggerServer_RemoveBreakPoint, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }};
  
  //     bool RemoveBreakPoint(const wxString &fileName, int lineNumber)
***************
*** 256,261 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }};
  
  //     bool Reset()
--- 262,268 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset[1] = {{ wxLua_wxLuaDebuggerServer_Reset, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset }};
  
  //     bool Reset()
***************
*** 274,280 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }};
  
  //     bool Run(const wxString &file, const wxString &fileName)
--- 281,287 ----
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluatag_wxLuaDebuggerServer, &s_wxluaarg_String, &s_wxluaarg_String, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Run[1] = {{ wxLua_wxLuaDebuggerServer_Run, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }};
  
  //     bool Run(const wxString &file, const wxString &fileName)
***************
*** 297,302 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }};
  
  //     long StartClient()
--- 304,310 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient[1] = {{ wxLua_wxLuaDebuggerServer_StartClient, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient }};
  
  //     long StartClient()
***************
*** 315,320 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluaargArray_None }};
  
  //     bool StartServer()
--- 323,329 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer[1] = {{ wxLua_wxLuaDebuggerServer_StartServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer }};
  
  //     bool StartServer()
***************
*** 333,338 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }};
  
  //     bool Step()
--- 342,348 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_Step[1] = {{ wxLua_wxLuaDebuggerServer_Step, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step }};
  
  //     bool Step()
***************
*** 351,356 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }};
  
  //     bool StepOut()
--- 361,367 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut[1] = {{ wxLua_wxLuaDebuggerServer_StepOut, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut }};
  
  //     bool StepOut()
***************
*** 369,374 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }};
  
  //     bool StepOver()
--- 380,386 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver[1] = {{ wxLua_wxLuaDebuggerServer_StepOver, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver }};
  
  //     bool StepOver()
***************
*** 387,392 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }};
  
  //     bool StopServer()
--- 399,405 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer[] = { &s_wxluatag_wxLuaDebuggerServer, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer[1] = {{ wxLua_wxLuaDebuggerServer_StopServer, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer }};
  
  //     bool StopServer()
***************
*** 407,411 ****
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }};
  
  //     wxLuaDebuggerServer(int portNumber)
--- 420,424 ----
  static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 };
  static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor[1] = {{ wxLua_wxLuaDebuggerServer_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }};
  
  //     wxLuaDebuggerServer(int portNumber)
***************
*** 431,455 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaDebuggerServer_methods[] = {
!     { WXLUAMETHOD_METHOD, "AddBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint, 1 },
!     { WXLUAMETHOD_METHOD, "Break", s_wxluafunc_wxLua_wxLuaDebuggerServer_Break, 1 },
!     { WXLUAMETHOD_METHOD, "ClearAllBreakPoints", s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 1 },
!     { WXLUAMETHOD_METHOD, "Continue", s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue, 1 },
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete },
!     { WXLUAMETHOD_METHOD, "DisplayStackDialog", s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1 },
!     { WXLUAMETHOD_METHOD, "EvaluateExpr", s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr, 1 },
!     { WXLUAMETHOD_METHOD, "GetDebuggeeProcessId", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 1 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetNetworkName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName, 1 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetProgramName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName, 1 },
!     { WXLUAMETHOD_METHOD, "KillDebuggee", s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee, 1 },
!     { WXLUAMETHOD_METHOD, "RemoveBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 1 },
!     { WXLUAMETHOD_METHOD, "Reset", s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset, 1 },
!     { WXLUAMETHOD_METHOD, "Run", s_wxluafunc_wxLua_wxLuaDebuggerServer_Run, 1 },
!     { WXLUAMETHOD_METHOD, "StartClient", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient, 1 },
!     { WXLUAMETHOD_METHOD, "StartServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer, 1 },
!     { WXLUAMETHOD_METHOD, "Step", s_wxluafunc_wxLua_wxLuaDebuggerServer_Step, 1 },
!     { WXLUAMETHOD_METHOD, "StepOut", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut, 1 },
!     { WXLUAMETHOD_METHOD, "StepOver", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver, 1 },
!     { WXLUAMETHOD_METHOD, "StopServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer, 1 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxLuaDebuggerServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor, 1 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 444,468 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaDebuggerServer_methods[] = {
!     { WXLUAMETHOD_METHOD, "AddBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_AddBreakPoint, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Break", s_wxluafunc_wxLua_wxLuaDebuggerServer_Break, 1, 0 },
!     { WXLUAMETHOD_METHOD, "ClearAllBreakPoints", s_wxluafunc_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Continue", s_wxluafunc_wxLua_wxLuaDebuggerServer_Continue, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerServer_Delete, 1, 0 },
!     { WXLUAMETHOD_METHOD, "DisplayStackDialog", s_wxluafunc_wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1, 0 },
!     { WXLUAMETHOD_METHOD, "EvaluateExpr", s_wxluafunc_wxLua_wxLuaDebuggerServer_EvaluateExpr, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetDebuggeeProcessId", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 1, 0 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetNetworkName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetNetworkName, 1, 0 },
!     { WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, "GetProgramName", s_wxluafunc_wxLua_wxLuaDebuggerServer_GetProgramName, 1, 0 },
!     { WXLUAMETHOD_METHOD, "KillDebuggee", s_wxluafunc_wxLua_wxLuaDebuggerServer_KillDebuggee, 1, 0 },
!     { WXLUAMETHOD_METHOD, "RemoveBreakPoint", s_wxluafunc_wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Reset", s_wxluafunc_wxLua_wxLuaDebuggerServer_Reset, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Run", s_wxluafunc_wxLua_wxLuaDebuggerServer_Run, 1, 0 },
!     { WXLUAMETHOD_METHOD, "StartClient", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartClient, 1, 0 },
!     { WXLUAMETHOD_METHOD, "StartServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StartServer, 1, 0 },
!     { WXLUAMETHOD_METHOD, "Step", s_wxluafunc_wxLua_wxLuaDebuggerServer_Step, 1, 0 },
!     { WXLUAMETHOD_METHOD, "StepOut", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOut, 1, 0 },
!     { WXLUAMETHOD_METHOD, "StepOver", s_wxluafunc_wxLua_wxLuaDebuggerServer_StepOver, 1, 0 },
!     { WXLUAMETHOD_METHOD, "StopServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_StopServer, 1, 0 },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxLuaDebuggerServer", s_wxluafunc_wxLua_wxLuaDebuggerServer_constructor, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
***************
*** 471,476 ****
  int s_wxluatag_wxLuaDebuggerEvent = -1;
  
  static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete[1] = {{ wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }};
  
  static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L)
--- 484,490 ----
  int s_wxluatag_wxLuaDebuggerEvent = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_Delete[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 };
  static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete[1] = {{ wxLua_wxLuaDebuggerEvent_Delete, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_Delete }};
  
  static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L)
***************
*** 487,492 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }};
  
  //     wxString GetFileName() const
--- 501,507 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 };
  static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName[1] = {{ wxLua_wxLuaDebuggerEvent_GetFileName, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName }};
  
  //     wxString GetFileName() const
***************
*** 505,510 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }};
  
  //     int GetLineNumber() const
--- 520,526 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 };
  static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber[1] = {{ wxLua_wxLuaDebuggerEvent_GetLineNumber, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }};
  
  //     int GetLineNumber() const
***************
*** 523,528 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }};
  
  //     wxString GetMessage() const
--- 539,545 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 };
  static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage[1] = {{ wxLua_wxLuaDebuggerEvent_GetMessage, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage }};
  
  //     wxString GetMessage() const
***************
*** 541,546 ****
  }
  
  static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }};
  
  //     int GetReference() const
--- 558,564 ----
  }
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { &s_wxluatag_wxLuaDebuggerEvent, 0 };
  static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L);
! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference[1] = {{ wxLua_wxLuaDebuggerEvent_GetReference, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference }};
  
  //     int GetReference() const
***************
*** 563,571 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaDebuggerEvent_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete },
!     { WXLUAMETHOD_METHOD, "GetFileName", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName, 1 },
!     { WXLUAMETHOD_METHOD, "GetLineNumber", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber, 1 },
!     { WXLUAMETHOD_METHOD, "GetMessage", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage, 1 },
!     { WXLUAMETHOD_METHOD, "GetReference", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference, 1 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };
--- 581,589 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxLuaDebuggerEvent_methods[] = {
!     { WXLUAMETHOD_METHOD, "Delete", s_wxluafunc_wxLua_wxLuaDebuggerEvent_Delete, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetFileName", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetFileName, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetLineNumber", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetLineNumber, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetMessage", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetMessage, 1, 0 },
!     { WXLUAMETHOD_METHOD, "GetReference", s_wxluafunc_wxLua_wxLuaDebuggerEvent_GetReference, 1, 0 },
      { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };