[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.37, 1.38 wxluacan.h, 1.38, 1.39 wxluacan_bind.cpp, 1.27, 1.28

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

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

Modified Files:
	wxluacan.cpp wxluacan.h wxluacan_bind.cpp 
Log Message:
 * Updated the naming conventions of the wxLua C/C++ functions to get rid of
   the term "tag" which dates back to Lua 4. Lua 5 does not use "tags", but
   rather metatables to attach functions to userdata in Lua.
   The new term for the C++ objects that wxLua wraps in Lua userdata and
   assigns a metatable to are wxLua types.
   wxLua types < 0, the WXLUA_TXXX types, correspond to the LUA_TXXX Lua types.
   wxLua types > 0 are types from the bindings and denote a class or struct.
 - Most notably for people who have written their own overrides for their
   bindings will be that wxLuaState::PushUserTag() is now wxluaT_PushUserDataType().
   Those two functions existed before, but basically did the same thing.
   The calling arguments of PushUserTag() were taken however and were the
   reverse of what PushUserDataType() had.
 - wxluaT_new/get/set/tag() are now wxluaT_new/setmetatable() and
   wxluaT_type() where the latter works just like lua_type(), but returns
   one of the wxLua types.

 - Fix crash in wxListCtrl and wxTreeCtrl::AssignImageList() to use the
   %ungc tag to release wxLua from deleting the input wxImageList.



Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** wxluacan.cpp	20 Dec 2007 02:26:54 -0000	1.37
--- wxluacan.cpp	22 Dec 2007 06:07:07 -0000	1.38
***************
*** 25,40 ****
  
  // Lua MetaTable Tag for Class 'wxlCanObj'
! int s_wxluatag_wxlCanObj = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxlCanObj, NULL };
  static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_AddObject }};
  //     void AddObject( wxlCanObj *canobj )
  static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L)
  {
      // wxlCanObj canobj
!     wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxlCanObj);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj);
      // call AddObject
      self->AddObject(canobj);
--- 25,40 ----
  
  // Lua MetaTable Tag for Class 'wxlCanObj'
! int g_wxluatype_wxlCanObj = -1;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_AddObject[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_wxlCanObj, NULL };
  static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_AddObject[1] = {{ wxLua_wxlCanObj_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_AddObject }};
  //     void AddObject( wxlCanObj *canobj )
  static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L)
  {
      // wxlCanObj canobj
!     wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxlCanObj);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj);
      // call AddObject
      self->AddObject(canobj);
***************
*** 43,54 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetX[] = { &s_wxluatag_wxlCanObj, NULL };
  static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetX }};
  //     double GetX()
  static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L)
  {
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj);
      // call GetX
      double returns = (self->GetX());
--- 43,54 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_GetX[] = { &g_wxluatype_wxlCanObj, NULL };
  static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetX[1] = {{ wxLua_wxlCanObj_GetX, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCanObj_GetX }};
  //     double GetX()
  static int LUACALL wxLua_wxlCanObj_GetX(lua_State *L)
  {
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj);
      // call GetX
      double returns = (self->GetX());
***************
*** 59,70 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_GetY[] = { &s_wxluatag_wxlCanObj, NULL };
  static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_GetY }};
  //     double GetY()
  static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L)
  {
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj);
      // call GetY
      double returns = (self->GetY());
--- 59,70 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_GetY[] = { &g_wxluatype_wxlCanObj, NULL };
  static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_GetY[1] = {{ wxLua_wxlCanObj_GetY, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCanObj_GetY }};
  //     double GetY()
  static int LUACALL wxLua_wxlCanObj_GetY(lua_State *L)
  {
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj);
      // call GetY
      double returns = (self->GetY());
***************
*** 77,90 ****
  
  #if wxLUA_USE_wxColourPenBrush
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxBrush, NULL };
  static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetBrush }};
  //     void SetBrush( const wxBrush& brush )
  static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L)
  {
      // const wxBrush brush
!     const wxBrush * brush = (const wxBrush *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxBrush);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj);
      // call SetBrush
      self->SetBrush(*brush);
--- 77,90 ----
  
  #if wxLUA_USE_wxColourPenBrush
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetBrush[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_wxBrush, NULL };
  static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetBrush[1] = {{ wxLua_wxlCanObj_SetBrush, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetBrush }};
  //     void SetBrush( const wxBrush& brush )
  static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L)
  {
      // const wxBrush brush
!     const wxBrush * brush = (const wxBrush *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxBrush);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj);
      // call SetBrush
      self->SetBrush(*brush);
***************
*** 93,106 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxlCanObj, &s_wxluatag_wxPen, NULL };
  static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPen }};
  //     void SetPen( const wxPen& pen )
  static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L)
  {
      // const wxPen pen
!     const wxPen * pen = (const wxPen *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxPen);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj);
      // call SetPen
      self->SetPen(*pen);
--- 93,106 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPen[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_wxPen, NULL };
  static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPen[1] = {{ wxLua_wxlCanObj_SetPen, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetPen }};
  //     void SetPen( const wxPen& pen )
  static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L)
  {
      // const wxPen pen
!     const wxPen * pen = (const wxPen *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxPen);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj);
      // call SetPen
      self->SetPen(*pen);
***************
*** 111,117 ****
  #endif // wxLUA_USE_wxColourPenBrush
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Boolean, NULL };
  static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPending }};
  //     void SetPending( bool pending = true )
  static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L)
--- 111,117 ----
  #endif // wxLUA_USE_wxColourPenBrush
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPending[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_TBOOLEAN, NULL };
  static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPending[1] = {{ wxLua_wxlCanObj_SetPending, WXLUAMETHOD_METHOD, 1, 2, s_wxluatypeArray_wxLua_wxlCanObj_SetPending }};
  //     void SetPending( bool pending = true )
  static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L)
***************
*** 122,126 ****
      bool pending = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj);
      // call SetPending
      self->SetPending(pending);
--- 122,126 ----
      bool pending = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj);
      // call SetPending
      self->SetPending(pending);
***************
*** 129,135 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluatag_wxlCanObj, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatagArray_wxLua_wxlCanObj_SetPos }};
  //    	void SetPos( double x, double y )
  static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L)
--- 129,135 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_SetPos[] = { &g_wxluatype_wxlCanObj, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_SetPos[1] = {{ wxLua_wxlCanObj_SetPos, WXLUAMETHOD_METHOD, 3, 3, s_wxluatypeArray_wxLua_wxlCanObj_SetPos }};
  //    	void SetPos( double x, double y )
  static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L)
***************
*** 140,144 ****
      double x = (double)wxlua_getnumbertype(L, 2);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObj);
      // call SetPos
      self->SetPos(x, y);
--- 140,144 ----
      double x = (double)wxlua_getnumbertype(L, 2);
      // get this
!     wxlCanObj * self = (wxlCanObj *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObj);
      // call SetPos
      self->SetPos(x, y);
***************
*** 147,153 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L);
! static wxLuaBindCFunc 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 )
  static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L)
--- 147,153 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObj_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObj_constructor[1] = {{ wxLua_wxlCanObj_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 2, s_wxluatypeArray_wxLua_wxlCanObj_constructor }};
  //     wxlCanObj( double x = 0, double y = 0 )
  static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L)
***************
*** 162,166 ****
      wxlCanObj* returns = new wxlCanObj(x, y);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObj, returns);
  
      return 1;
--- 162,166 ----
      wxlCanObj* returns = new wxlCanObj(x, y);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObj);
  
      return 1;
***************
*** 194,202 ****
  
  // Lua MetaTable Tag for Class 'wxlCanObjRect'
! int s_wxluatag_wxlCanObjRect = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjRect_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L);
! static wxLuaBindCFunc 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 )
  static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L)
--- 194,202 ----
  
  // Lua MetaTable Tag for Class 'wxlCanObjRect'
! int g_wxluatype_wxlCanObjRect = -1;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjRect_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjRect_constructor[1] = {{ wxLua_wxlCanObjRect_constructor, WXLUAMETHOD_CONSTRUCTOR, 4, 4, s_wxluatypeArray_wxLua_wxlCanObjRect_constructor }};
  //     wxlCanObjRect(  double x, double y, double w, double h )
  static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L)
***************
*** 213,217 ****
      wxlCanObjRect* returns = new wxlCanObjRect(x, y, w, h);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObjRect, returns);
  
      return 1;
--- 213,217 ----
      wxlCanObjRect* returns = new wxlCanObjRect(x, y, w, h);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjRect);
  
      return 1;
***************
*** 234,242 ****
  
  // Lua MetaTable Tag for Class 'wxlCanObjCircle'
! int s_wxluatag_wxlCanObjCircle = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjCircle_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L);
! static wxLuaBindCFunc 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 )
  static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L)
--- 234,242 ----
  
  // Lua MetaTable Tag for Class 'wxlCanObjCircle'
! int g_wxluatype_wxlCanObjCircle = -1;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjCircle_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjCircle_constructor[1] = {{ wxLua_wxlCanObjCircle_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjCircle_constructor }};
  //     wxlCanObjCircle( double x, double y, double r )
  static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L)
***************
*** 251,255 ****
      wxlCanObjCircle* returns = new wxlCanObjCircle(x, y, r);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObjCircle, returns);
  
      return 1;
--- 251,255 ----
      wxlCanObjCircle* returns = new wxlCanObjCircle(x, y, r);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjCircle);
  
      return 1;
***************
*** 272,280 ****
  
  // Lua MetaTable Tag for Class 'wxlCanObjScript'
! int s_wxluatag_wxlCanObjScript = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L);
! static wxLuaBindCFunc 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 )
  static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L)
--- 272,280 ----
  
  // Lua MetaTable Tag for Class 'wxlCanObjScript'
! int g_wxluatype_wxlCanObjScript = -1;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjScript_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL };
  static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjScript_constructor[1] = {{ wxLua_wxlCanObjScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjScript_constructor }};
  //     wxlCanObjScript( double x, double y, const wxString& name )
  static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L)
***************
*** 289,293 ****
      wxlCanObjScript* returns = new wxlCanObjScript(x, y, name);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObjScript, returns);
  
      return 1;
--- 289,293 ----
      wxlCanObjScript* returns = new wxlCanObjScript(x, y, name);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjScript);
  
      return 1;
***************
*** 310,318 ****
  
  // Lua MetaTable Tag for Class 'wxlCanObjAddScript'
! int s_wxluatag_wxlCanObjAddScript = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluatag_wxlCanObjAddScript, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript }};
  //     void SetScript( const wxString& script )
  static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L)
--- 310,318 ----
  
  // Lua MetaTable Tag for Class 'wxlCanObjAddScript'
! int g_wxluatype_wxlCanObjAddScript = -1;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjAddScript_SetScript[] = { &g_wxluatype_wxlCanObjAddScript, &g_wxluatype_TSTRING, NULL };
  static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript[1] = {{ wxLua_wxlCanObjAddScript_SetScript, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCanObjAddScript_SetScript }};
  //     void SetScript( const wxString& script )
  static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L)
***************
*** 321,325 ****
      const wxString script = wxlua_getwxStringtype(L, 2);
      // get this
!     wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCanObjAddScript);
      // call SetScript
      self->SetScript(script);
--- 321,325 ----
      const wxString script = wxlua_getwxStringtype(L, 2);
      // get this
!     wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCanObjAddScript);
      // call SetScript
      self->SetScript(script);
***************
*** 328,334 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, NULL };
  static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L);
! static wxLuaBindCFunc 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 )
  static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L)
--- 328,334 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCanObjAddScript_constructor[] = { &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TSTRING, NULL };
  static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCanObjAddScript_constructor[1] = {{ wxLua_wxlCanObjAddScript_constructor, WXLUAMETHOD_CONSTRUCTOR, 3, 3, s_wxluatypeArray_wxLua_wxlCanObjAddScript_constructor }};
  //     wxlCanObjAddScript( double x, double y,  const wxString& script )
  static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L)
***************
*** 343,347 ****
      wxlCanObjAddScript* returns = new wxlCanObjAddScript(x, y, script);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlCanObjAddScript, returns);
  
      return 1;
--- 343,347 ----
      wxlCanObjAddScript* returns = new wxlCanObjAddScript(x, y, script);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCanObjAddScript);
  
      return 1;
***************
*** 365,380 ****
  
  // Lua MetaTable Tag for Class 'wxlCan'
! int s_wxluatag_wxlCan = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_AddObject[] = { &s_wxluatag_wxlCan, &s_wxluatag_wxlCanObj, NULL };
  static int LUACALL wxLua_wxlCan_AddObject(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatagArray_wxLua_wxlCan_AddObject }};
  //     void AddObject( wxlCanObj *canobj )
  static int LUACALL wxLua_wxlCan_AddObject(lua_State *L)
  {
      // wxlCanObj canobj
!     wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxlCanObj);
      // get this
!     wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCan);
      // call AddObject
      self->AddObject(canobj);
--- 365,380 ----
  
  // Lua MetaTable Tag for Class 'wxlCan'
! int g_wxluatype_wxlCan = -1;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_AddObject[] = { &g_wxluatype_wxlCan, &g_wxluatype_wxlCanObj, NULL };
  static int LUACALL wxLua_wxlCan_AddObject(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_AddObject[1] = {{ wxLua_wxlCan_AddObject, WXLUAMETHOD_METHOD, 2, 2, s_wxluatypeArray_wxLua_wxlCan_AddObject }};
  //     void AddObject( wxlCanObj *canobj )
  static int LUACALL wxLua_wxlCan_AddObject(lua_State *L)
  {
      // wxlCanObj canobj
!     wxlCanObj * canobj = (wxlCanObj *)wxluaT_getuserdatatype(L, 2, g_wxluatype_wxlCanObj);
      // get this
!     wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan);
      // call AddObject
      self->AddObject(canobj);
***************
*** 383,410 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetCmdh[] = { &s_wxluatag_wxlCan, NULL };
  static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetCmdh }};
  //     wxlLuaCanCmd* GetCmdh()
  static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L)
  {
      // get this
!     wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCan);
      // call GetCmdh
      wxlLuaCanCmd* returns = (wxlLuaCanCmd*)self->GetCmdh();
      // push the result datatype
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlLuaCanCmd, returns);
  
      return 1;
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_GetYaxis[] = { &s_wxluatag_wxlCan, NULL };
  static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxlCan_GetYaxis }};
  //     bool GetYaxis()
  static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L)
  {
      // get this
!     wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCan);
      // call GetYaxis
      bool returns = (self->GetYaxis());
--- 383,410 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_GetCmdh[] = { &g_wxluatype_wxlCan, NULL };
  static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetCmdh[1] = {{ wxLua_wxlCan_GetCmdh, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCan_GetCmdh }};
  //     wxlLuaCanCmd* GetCmdh()
  static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L)
  {
      // get this
!     wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan);
      // call GetCmdh
      wxlLuaCanCmd* returns = (wxlLuaCanCmd*)self->GetCmdh();
      // push the result datatype
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlLuaCanCmd);
  
      return 1;
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_GetYaxis[] = { &g_wxluatype_wxlCan, NULL };
  static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_GetYaxis[1] = {{ wxLua_wxlCan_GetYaxis, WXLUAMETHOD_METHOD, 1, 1, s_wxluatypeArray_wxLua_wxlCan_GetYaxis }};
  //     bool GetYaxis()
  static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L)
  {
      // get this
!     wxlCan * self = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan);
      // call GetYaxis
      bool returns = (self->GetYaxis());
***************
*** 417,423 ****
  
  #if wxLUA_USE_wxPointSizeRect
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCan_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, NULL };
  static int LUACALL wxLua_wxlCan_constructor(lua_State *L);
! static wxLuaBindCFunc 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 )
  static int LUACALL wxLua_wxlCan_constructor(lua_State *L)
--- 417,423 ----
  
  #if wxLUA_USE_wxPointSizeRect
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlCan_constructor[] = { &g_wxluatype_wxWindow, &g_wxluatype_TNUMBER, &g_wxluatype_wxPoint, &g_wxluatype_wxSize, NULL };
  static int LUACALL wxLua_wxlCan_constructor(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlCan_constructor[1] = {{ wxLua_wxlCan_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 4, s_wxluatypeArray_wxLua_wxlCan_constructor }};
  //     wxlCan( wxWindow* parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize )
  static int LUACALL wxLua_wxlCan_constructor(lua_State *L)
***************
*** 426,440 ****
      int argCount = lua_gettop(L);
      // const wxSize size = wxDefaultSize
!     const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, s_wxluatag_wxSize) : &wxDefaultSize);
      // const wxPoint pos = wxDefaultPosition
!     const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, s_wxluatag_wxPoint) : &wxDefaultPosition);
      // wxWindowID id = -1
      wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1);
      // wxWindow parent
!     wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxWindow);
      // call constructor
      wxlCan* returns = new wxlCan(parent, id, *pos, *size);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlCan, returns);
  
      return 1;
--- 426,440 ----
      int argCount = lua_gettop(L);
      // const wxSize size = wxDefaultSize
!     const wxSize * size = (argCount >= 4 ? (const wxSize *)wxluaT_getuserdatatype(L, 4, g_wxluatype_wxSize) : &wxDefaultSize);
      // const wxPoint pos = wxDefaultPosition
!     const wxPoint * pos = (argCount >= 3 ? (const wxPoint *)wxluaT_getuserdatatype(L, 3, g_wxluatype_wxPoint) : &wxDefaultPosition);
      // wxWindowID id = -1
      wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlua_getnumbertype(L, 2) : -1);
      // wxWindow parent
!     wxWindow * parent = (wxWindow *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxWindow);
      // call constructor
      wxlCan* returns = new wxlCan(parent, id, *pos, *size);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCan);
  
      return 1;
***************
*** 466,474 ****
  
  // Lua MetaTable Tag for Class 'wxlLuaCanCmd'
! int s_wxluatag_wxlLuaCanCmd = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluatag_wxlLuaCanCmd, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L);
! static wxLuaBindCFunc 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 )
  static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L)
--- 466,474 ----
  
  // Lua MetaTable Tag for Class 'wxlLuaCanCmd'
! int g_wxluatype_wxlLuaCanCmd = -1;
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &g_wxluatype_wxlLuaCanCmd, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, &g_wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject[1] = {{ wxLua_wxlLuaCanCmd_MoveObject, WXLUAMETHOD_METHOD, 4, 4, s_wxluatypeArray_wxLua_wxlLuaCanCmd_MoveObject }};
  //     void MoveObject( int index, double x, double y )
  static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L)
***************
*** 481,485 ****
      int index = (int)wxlua_getnumbertype(L, 2);
      // get this
!     wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlLuaCanCmd);
      // call MoveObject
      self->MoveObject(index, x, y);
--- 481,485 ----
      int index = (int)wxlua_getnumbertype(L, 2);
      // get this
!     wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlLuaCanCmd);
      // call MoveObject
      self->MoveObject(index, x, y);
***************
*** 488,494 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, NULL };
  static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor }};
  //     wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 )
  static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L)
--- 488,494 ----
  }
  
! static wxLuaArgType s_wxluatypeArray_wxLua_wxlLuaCanCmd_constructor[] = { &g_wxluatype_wxlCan, &g_wxluatype_TNUMBER, NULL };
  static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L);
! static wxLuaBindCFunc s_wxluafunc_wxLua_wxlLuaCanCmd_constructor[1] = {{ wxLua_wxlLuaCanCmd_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatypeArray_wxLua_wxlLuaCanCmd_constructor }};
  //     wxlLuaCanCmd( wxlCan* canvas, int maxCommands = -1 )
  static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L)
***************
*** 499,507 ****
      int maxCommands = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1);
      // wxlCan canvas
!     wxlCan * canvas = (wxlCan *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxlCan);
      // call constructor
      wxlLuaCanCmd* returns = new wxlLuaCanCmd(canvas, maxCommands);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlLuaCanCmd, returns);
  
      return 1;
--- 499,507 ----
      int maxCommands = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : -1);
      // wxlCan canvas
!     wxlCan * canvas = (wxlCan *)wxluaT_getuserdatatype(L, 1, g_wxluatype_wxlCan);
      // call constructor
      wxlLuaCanCmd* returns = new wxlLuaCanCmd(canvas, maxCommands);
      // push the constructed class pointer
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlLuaCanCmd);
  
      return 1;

Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** wxluacan_bind.cpp	10 Dec 2007 05:39:04 -0000	1.27
--- wxluacan_bind.cpp	22 Dec 2007 06:07:07 -0000	1.28
***************
*** 39,51 ****
  // ---------------------------------------------------------------------------
  
! wxLuaBindDefine* wxLuaGetDefineList_wxluacan(size_t &count)
  {
!     static wxLuaBindDefine defineList[] =
      {
  
          { 0, 0 },
      };
!     count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1;
!     return defineList;
  }
  
--- 39,51 ----
  // ---------------------------------------------------------------------------
  
! wxLuaBindNumber* wxLuaGetDefineList_wxluacan(size_t &count)
  {
!     static wxLuaBindNumber numberList[] =
      {
  
          { 0, 0 },
      };
!     count = sizeof(numberList)/sizeof(wxLuaBindNumber) - 1;
!     return numberList;
  }
  
***************
*** 91,99 ****
      wxlCan* returns = (wxlCan*)GetCan();
      // push the result datatype
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlCan, returns);
  
      return 1;
  }
! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};
  
  // %function wxlLuaCanCmd* GetCmdhMain()
--- 91,99 ----
      wxlCan* returns = (wxlCan*)GetCan();
      // push the result datatype
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlCan);
  
      return 1;
  }
! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }};
  
  // %function wxlLuaCanCmd* GetCmdhMain()
***************
*** 103,111 ****
      wxlLuaCanCmd* returns = (wxlLuaCanCmd*)GetCmdhMain();
      // push the result datatype
!     wxluaT_pushuserdatatype(L, s_wxluatag_wxlLuaCanCmd, returns);
  
      return 1;
  }
! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};
  
  // ---------------------------------------------------------------------------
--- 103,111 ----
      wxlLuaCanCmd* returns = (wxlLuaCanCmd*)GetCmdhMain();
      // push the result datatype
!     wxluaT_pushuserdatatype(L, returns, g_wxluatype_wxlLuaCanCmd);
  
      return 1;
  }
! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, g_wxluaargtypeArray_None }};
  
  // ---------------------------------------------------------------------------
***************
*** 136,146 ****
      static wxLuaBindClass classList[] =
      {
!         { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,s_wxluadefineArray_None, 0, }, 
!         { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &s_wxluatag_wxlCanObj, "wxObject", NULL ,s_wxluadefineArray_None, 0, }, 
!         { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, 
!         { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, 
!         { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, 
!         { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL ,s_wxluadefineArray_None, 0, }, 
!         { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL ,s_wxluadefineArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 
--- 136,146 ----
      static wxLuaBindClass classList[] =
      {
!         { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &g_wxluatype_wxlCan, "wxScrolledWindow", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &g_wxluatype_wxlCanObj, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &g_wxluatype_wxlCanObjAddScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &g_wxluatype_wxlCanObjCircle, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &g_wxluatype_wxlCanObjRect, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &g_wxluatype_wxlCanObjScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &g_wxluatype_wxlLuaCanCmd, "wxCommandProcessor", NULL ,g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 
***************
*** 162,166 ****
      m_nameSpace     = wxT("wxluacan");
      m_classArray    = wxLuaGetClassList_wxluacan(m_classCount);
!     m_defineArray   = wxLuaGetDefineList_wxluacan(m_defineCount);
      m_stringArray   = wxLuaGetStringList_wxluacan(m_stringCount);
      m_eventArray    = wxLuaGetEventList_wxluacan(m_eventCount);
--- 162,166 ----
      m_nameSpace     = wxT("wxluacan");
      m_classArray    = wxLuaGetClassList_wxluacan(m_classCount);
!     m_numberArray   = wxLuaGetDefineList_wxluacan(m_numberCount);
      m_stringArray   = wxLuaGetStringList_wxluacan(m_stringCount);
      m_eventArray    = wxLuaGetEventList_wxluacan(m_eventCount);

Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** wxluacan.h	20 Dec 2007 02:26:54 -0000	1.38
--- wxluacan.h	22 Dec 2007 06:07:07 -0000	1.39
***************
*** 18,24 ****
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 20
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 20
  // ---------------------------------------------------------------------------
  
--- 18,24 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 21
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 21
  // ---------------------------------------------------------------------------
  
***************
*** 58,62 ****
  
  extern wxLuaBindClass  *wxLuaGetClassList_wxluacan(size_t &count);
! extern wxLuaBindDefine *wxLuaGetDefineList_wxluacan(size_t &count);
  extern wxLuaBindString *wxLuaGetStringList_wxluacan(size_t &count);
  extern wxLuaBindEvent  *wxLuaGetEventList_wxluacan(size_t &count);
--- 58,62 ----
  
  extern wxLuaBindClass  *wxLuaGetClassList_wxluacan(size_t &count);
! extern wxLuaBindNumber *wxLuaGetDefineList_wxluacan(size_t &count);
  extern wxLuaBindString *wxLuaGetStringList_wxluacan(size_t &count);
  extern wxLuaBindEvent  *wxLuaGetEventList_wxluacan(size_t &count);
***************
*** 68,90 ****
  // ---------------------------------------------------------------------------
  
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount;
--- 68,90 ----
  // ---------------------------------------------------------------------------
  
! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCan;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCan_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObj;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObj_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjAddScript;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjAddScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjCircle;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjCircle_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjRect;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjRect_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlCanObjScript;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlCanObjScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP_DATA(int) g_wxluatype_wxlLuaCanCmd;
  extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount;