[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
  // ---------------------------------------------------------------------------