Thread: [Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.27, 1.28 wxluacan.h, 1.24, 1.25 wxluacan_bin

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	wxluacan.cpp wxluacan.h wxluacan_bind.cpp 
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: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** wxluacan.cpp	5 Jun 2007 21:07:20 -0000	1.27
--- wxluacan.cpp	6 Jun 2007 23:42:53 -0000	1.28
***************
*** 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 )
--- 27,33 ----
  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 )
***************
*** 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()
--- 45,51 ----
  }

! 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()
***************
*** 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()
--- 64,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()
***************
*** 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 )
--- 85,91 ----

  #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 )
***************
*** 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 )
--- 103,109 ----
  }

! 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 )
***************
*** 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 )
--- 123,129 ----
  #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 )
***************
*** 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 )
--- 143,149 ----
  }

! 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 )
***************
*** 163,174 ****
  }

! 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 )
  static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L)
  {
!     wxlua_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObj *returns;
--- 163,174 ----
  }

! 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)
  {
!     wxluabind_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObj *returns;
***************
*** 190,217 ****

  // 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 },
  };

! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxlCanObj_methods[0]) - 1;

! WXLUADEFINE wxlCanObj_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObj_enumCount = sizeof(wxlCanObj_enums)/sizeof(wxlCanObj_enums[0]) - 1;

  // ---------------------------------------------------------------------------
--- 190,217 ----

  // Map Lua Class Methods to C Binding Functions
! wxLuaBindMethod wxlCanObj_methods[] = {
!     { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCanObj_AddObject, 1, NULL },
!     { WXLUAMETHOD_METHOD, "GetX", s_wxluafunc_wxLua_wxlCanObj_GetX, 1, NULL },
!     { WXLUAMETHOD_METHOD, "GetY", s_wxluafunc_wxLua_wxlCanObj_GetY, 1, NULL },

  #if wxLUA_USE_wxColourPenBrush
!     { WXLUAMETHOD_METHOD, "SetBrush", s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, NULL },
!     { WXLUAMETHOD_METHOD, "SetPen", s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, NULL },
  #endif // wxLUA_USE_wxColourPenBrush

!     { WXLUAMETHOD_METHOD, "SetPending", s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, NULL },
!     { WXLUAMETHOD_METHOD, "SetPos", s_wxluafunc_wxLua_wxlCanObj_SetPos, 1, NULL },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObj", s_wxluafunc_wxLua_wxlCanObj_constructor, 1, NULL },
!     { 0, 0, 0, 0 },
  };

! int wxlCanObj_methodCount = sizeof(wxlCanObj_methods)/sizeof(wxLuaBindMethod) - 1;

! wxLuaBindDefine wxlCanObj_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObj_enumCount = sizeof(wxlCanObj_enums)/sizeof(wxLuaBindDefine) - 1;

  // ---------------------------------------------------------------------------
***************
*** 222,233 ****
  int s_wxluatag_wxlCanObjRect = -1;

! 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 )
  static int LUACALL wxLua_wxlCanObjRect_constructor(lua_State *L)
  {
!     wxlua_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObjRect *returns;
--- 222,233 ----
  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)
  {
!     wxluabind_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObjRect *returns;
***************
*** 251,267 ****

  // 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 },
  };

! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxlCanObjRect_methods[0]) - 1;

! WXLUADEFINE wxlCanObjRect_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObjRect_enumCount = sizeof(wxlCanObjRect_enums)/sizeof(wxlCanObjRect_enums[0]) - 1;

  // ---------------------------------------------------------------------------
--- 251,267 ----

  // Map Lua Class Methods to C Binding Functions
! wxLuaBindMethod wxlCanObjRect_methods[] = {
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjRect", s_wxluafunc_wxLua_wxlCanObjRect_constructor, 1, NULL },
!     { 0, 0, 0, 0 },
  };

! int wxlCanObjRect_methodCount = sizeof(wxlCanObjRect_methods)/sizeof(wxLuaBindMethod) - 1;

! wxLuaBindDefine wxlCanObjRect_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObjRect_enumCount = sizeof(wxlCanObjRect_enums)/sizeof(wxLuaBindDefine) - 1;

  // ---------------------------------------------------------------------------
***************
*** 272,283 ****
  int s_wxluatag_wxlCanObjCircle = -1;

! 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 )
  static int LUACALL wxLua_wxlCanObjCircle_constructor(lua_State *L)
  {
!     wxlua_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObjCircle *returns;
--- 272,283 ----
  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)
  {
!     wxluabind_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObjCircle *returns;
***************
*** 299,315 ****

  // 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 },
  };

! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxlCanObjCircle_methods[0]) - 1;

! WXLUADEFINE wxlCanObjCircle_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObjCircle_enumCount = sizeof(wxlCanObjCircle_enums)/sizeof(wxlCanObjCircle_enums[0]) - 1;

  // ---------------------------------------------------------------------------
--- 299,315 ----

  // Map Lua Class Methods to C Binding Functions
! wxLuaBindMethod wxlCanObjCircle_methods[] = {
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjCircle", s_wxluafunc_wxLua_wxlCanObjCircle_constructor, 1, NULL },
!     { 0, 0, 0, 0 },
  };

! int wxlCanObjCircle_methodCount = sizeof(wxlCanObjCircle_methods)/sizeof(wxLuaBindMethod) - 1;

! wxLuaBindDefine wxlCanObjCircle_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObjCircle_enumCount = sizeof(wxlCanObjCircle_enums)/sizeof(wxLuaBindDefine) - 1;

  // ---------------------------------------------------------------------------
***************
*** 320,331 ****
  int s_wxluatag_wxlCanObjScript = -1;

! 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 )
  static int LUACALL wxLua_wxlCanObjScript_constructor(lua_State *L)
  {
!     wxlua_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObjScript *returns;
--- 320,331 ----
  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)
  {
!     wxluabind_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObjScript *returns;
***************
*** 347,363 ****

  // 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 },
  };

! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxlCanObjScript_methods[0]) - 1;

! WXLUADEFINE wxlCanObjScript_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObjScript_enumCount = sizeof(wxlCanObjScript_enums)/sizeof(wxlCanObjScript_enums[0]) - 1;

  // ---------------------------------------------------------------------------
--- 347,363 ----

  // Map Lua Class Methods to C Binding Functions
! wxLuaBindMethod wxlCanObjScript_methods[] = {
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjScript", s_wxluafunc_wxLua_wxlCanObjScript_constructor, 1, NULL },
!     { 0, 0, 0, 0 },
  };

! int wxlCanObjScript_methodCount = sizeof(wxlCanObjScript_methods)/sizeof(wxLuaBindMethod) - 1;

! wxLuaBindDefine wxlCanObjScript_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObjScript_enumCount = sizeof(wxlCanObjScript_enums)/sizeof(wxLuaBindDefine) - 1;

  // ---------------------------------------------------------------------------
***************
*** 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 )
--- 368,374 ----
  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 )
***************
*** 386,397 ****
  }

! 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 )
  static int LUACALL wxLua_wxlCanObjAddScript_constructor(lua_State *L)
  {
!     wxlua_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObjAddScript *returns;
--- 386,397 ----
  }

! 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)
  {
!     wxluabind_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCanObjAddScript *returns;
***************
*** 413,430 ****

  // 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 },
  };

! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxlCanObjAddScript_methods[0]) - 1;

! WXLUADEFINE wxlCanObjAddScript_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObjAddScript_enumCount = sizeof(wxlCanObjAddScript_enums)/sizeof(wxlCanObjAddScript_enums[0]) - 1;

  // ---------------------------------------------------------------------------
--- 413,430 ----

  // Map Lua Class Methods to C Binding Functions
! wxLuaBindMethod wxlCanObjAddScript_methods[] = {
!     { WXLUAMETHOD_METHOD, "SetScript", s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript, 1, NULL },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCanObjAddScript", s_wxluafunc_wxLua_wxlCanObjAddScript_constructor, 1, NULL },
!     { 0, 0, 0, 0 },
  };

! int wxlCanObjAddScript_methodCount = sizeof(wxlCanObjAddScript_methods)/sizeof(wxLuaBindMethod) - 1;

! wxLuaBindDefine wxlCanObjAddScript_enums[] = {
      { NULL, 0, },
  };

! int wxlCanObjAddScript_enumCount = sizeof(wxlCanObjAddScript_enums)/sizeof(wxLuaBindDefine) - 1;

  // ---------------------------------------------------------------------------
***************
*** 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 )
--- 435,441 ----
  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 )
***************
*** 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()
--- 453,459 ----
  }

! 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()
***************
*** 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()
--- 472,478 ----
  }

! 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()
***************
*** 493,504 ****

  #if wxLUA_USE_wxPointSizeRect
! 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 )
  static int LUACALL wxLua_wxlCan_constructor(lua_State *L)
  {
!     wxlua_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCan *returns;
--- 493,504 ----

  #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)
  {
!     wxluabind_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlCan *returns;
***************
*** 526,549 ****

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

!     { WXLUAMETHOD_METHOD, 0, 0, 0 },
  };

! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxlCan_methods[0]) - 1;

! WXLUADEFINE wxlCan_enums[] = {
      { NULL, 0, },
  };

! int wxlCan_enumCount = sizeof(wxlCan_enums)/sizeof(wxlCan_enums[0]) - 1;

  // ---------------------------------------------------------------------------
--- 526,549 ----

  // Map Lua Class Methods to C Binding Functions
! wxLuaBindMethod wxlCan_methods[] = {
!     { WXLUAMETHOD_METHOD, "AddObject", s_wxluafunc_wxLua_wxlCan_AddObject, 1, NULL },
!     { WXLUAMETHOD_METHOD, "GetCmdh", s_wxluafunc_wxLua_wxlCan_GetCmdh, 1, NULL },
!     { WXLUAMETHOD_METHOD, "GetYaxis", s_wxluafunc_wxLua_wxlCan_GetYaxis, 1, NULL },

  #if wxLUA_USE_wxPointSizeRect
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlCan", s_wxluafunc_wxLua_wxlCan_constructor, 1, NULL },
  #endif // wxLUA_USE_wxPointSizeRect

!     { 0, 0, 0, 0 },
  };

! int wxlCan_methodCount = sizeof(wxlCan_methods)/sizeof(wxLuaBindMethod) - 1;

! wxLuaBindDefine wxlCan_enums[] = {
      { NULL, 0, },
  };

! int wxlCan_enumCount = sizeof(wxlCan_enums)/sizeof(wxLuaBindDefine) - 1;

  // ---------------------------------------------------------------------------
***************
*** 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 )
--- 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, 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 )
***************
*** 576,587 ****
  }

! 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 )
  static int LUACALL wxLua_wxlLuaCanCmd_constructor(lua_State *L)
  {
!     wxlua_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlLuaCanCmd *returns;
--- 576,587 ----
  }

! 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)
  {
!     wxluabind_removetableforcall(L);
      wxLuaState wxlState(L);
      wxlLuaCanCmd *returns;
***************
*** 603,619 ****

  // 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 },
  };

! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxlLuaCanCmd_methods[0]) - 1;

! WXLUADEFINE wxlLuaCanCmd_enums[] = {
      { NULL, 0, },
  };

! int wxlLuaCanCmd_enumCount = sizeof(wxlLuaCanCmd_enums)/sizeof(wxlLuaCanCmd_enums[0]) - 1;

--- 603,619 ----

  // Map Lua Class Methods to C Binding Functions
! wxLuaBindMethod wxlLuaCanCmd_methods[] = {
!     { WXLUAMETHOD_METHOD, "MoveObject", s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject, 1, NULL },
!     { WXLUAMETHOD_CONSTRUCTOR, "wxlLuaCanCmd", s_wxluafunc_wxLua_wxlLuaCanCmd_constructor, 1, NULL },
!     { 0, 0, 0, 0 },
  };

! int wxlLuaCanCmd_methodCount = sizeof(wxlLuaCanCmd_methods)/sizeof(wxLuaBindMethod) - 1;

! wxLuaBindDefine wxlLuaCanCmd_enums[] = {
      { NULL, 0, },
  };

! int wxlLuaCanCmd_enumCount = sizeof(wxlLuaCanCmd_enums)/sizeof(wxLuaBindDefine) - 1;

Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxluacan_bind.cpp	5 Jun 2007 21:07:20 -0000	1.19
--- wxluacan_bind.cpp	6 Jun 2007 23:42:53 -0000	1.20
***************
*** 24,35 ****
  // ---------------------------------------------------------------------------

! WXLUAEVENT* wxLuaGetEventList_wxluacan(size_t &count)
  {
!     static WXLUAEVENT eventList[] =
      {

          { 0, 0, 0 },
      };
!     count = (sizeof(eventList)/sizeof(eventList[0])) - 1;
      return eventList;
  }
--- 24,35 ----
  // ---------------------------------------------------------------------------

! wxLuaBindEvent* wxLuaGetEventList_wxluacan(size_t &count)
  {
!     static wxLuaBindEvent eventList[] =
      {

          { 0, 0, 0 },
      };
!     count = sizeof(eventList)/sizeof(wxLuaBindEvent) - 1;
      return eventList;
  }
***************
*** 39,50 ****
  // ---------------------------------------------------------------------------

! WXLUADEFINE* wxLuaGetDefineList_wxluacan(size_t &count)
  {
!     static WXLUADEFINE defineList[] =
      {

          { 0, 0 },
      };
!     count = (sizeof(defineList)/sizeof(defineList[0])) - 1;
      return defineList;
  }
--- 39,50 ----
  // ---------------------------------------------------------------------------

! wxLuaBindDefine* wxLuaGetDefineList_wxluacan(size_t &count)
  {
!     static wxLuaBindDefine defineList[] =
      {

          { 0, 0 },
      };
!     count = sizeof(defineList)/sizeof(wxLuaBindDefine) - 1;
      return defineList;
  }
***************
*** 55,66 ****
  // ---------------------------------------------------------------------------

! WXLUASTRING* wxLuaGetStringList_wxluacan(size_t &count)
  {
!     static WXLUASTRING stringList[] =
      {

          { 0, 0 },
      };
!     count = (sizeof(stringList)/sizeof(stringList[0])) - 1;
      return stringList;
  }
--- 55,66 ----
  // ---------------------------------------------------------------------------

! wxLuaBindString* wxLuaGetStringList_wxluacan(size_t &count)
  {
!     static wxLuaBindString stringList[] =
      {

          { 0, 0 },
      };
!     count = sizeof(stringList)/sizeof(wxLuaBindString) - 1;
      return stringList;
  }
***************
*** 70,81 ****
  // ---------------------------------------------------------------------------

! WXLUAOBJECT* wxLuaGetObjectList_wxluacan(size_t &count)
  {
!     static WXLUAOBJECT objectList[] =
      {

          { 0, 0, 0, 0 },
      };
!     count = (sizeof(objectList)/sizeof(objectList[0])) - 1;
      return objectList;
  }
--- 70,81 ----
  // ---------------------------------------------------------------------------

! wxLuaBindObject* wxLuaGetObjectList_wxluacan(size_t &count)
  {
!     static wxLuaBindObject objectList[] =
      {

          { 0, 0, 0, 0 },
      };
!     count = sizeof(objectList)/sizeof(wxLuaBindObject) - 1;
      return objectList;
  }
***************
*** 98,102 ****
  }

! static WXLUAMETHOD_CFUNC s_wxluafunc_wxLua_function_GetCan[1] = {{ wxLua_function_GetCan, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};

  // %function wxlLuaCanCmd* GetCmdhMain()
--- 98,102 ----
  }

! static wxLuaBindCFunc 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, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};

  // ---------------------------------------------------------------------------
--- 113,117 ----
  }

! static wxLuaBindCFunc s_wxluafunc_wxLua_function_GetCmdhMain[1] = {{ wxLua_function_GetCmdhMain, WXLUAMETHOD_CFUNCTION, 0, 0, s_wxluaargArray_None }};

  // ---------------------------------------------------------------------------
***************
*** 119,132 ****
  // ---------------------------------------------------------------------------

! WXLUAMETHOD* wxLuaGetFunctionList_wxluacan(size_t &count)
  {
!     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 }, 
      };
!     count = (sizeof(functionList)/sizeof(functionList[0])) - 1;
      return functionList;
  }
--- 119,132 ----
  // ---------------------------------------------------------------------------

! wxLuaBindMethod* wxLuaGetFunctionList_wxluacan(size_t &count)
  {
!     static wxLuaBindMethod functionList[] =
      {
!         { WXLUAMETHOD_CFUNCTION, "GetCan", s_wxluafunc_wxLua_function_GetCan, 1, NULL },
!         { WXLUAMETHOD_CFUNCTION, "GetCmdhMain", s_wxluafunc_wxLua_function_GetCmdhMain, 1, NULL },

!         { 0, 0, 0, 0 }, 
      };
!     count = sizeof(functionList)/sizeof(wxLuaBindMethod) - 1;
      return functionList;
  }
***************
*** 138,144 ****
  // ---------------------------------------------------------------------------

! WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count)
  {
!     static WXLUACLASS classList[] =
      {
          { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,wxlCan_enums, wxlCan_enumCount, }, 
--- 138,144 ----
  // ---------------------------------------------------------------------------

! wxLuaBindClass* wxLuaGetClassList_wxluacan(size_t &count)
  {
!     static wxLuaBindClass classList[] =
      {
          { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow", NULL ,wxlCan_enums, wxlCan_enumCount, }, 
***************
*** 152,156 ****
          { 0, 0, 0, 0, 0, 0, 0 }, 
      };
!     count = (sizeof(classList)/sizeof(classList[0])) - 1;

      return classList;
--- 152,156 ----
          { 0, 0, 0, 0, 0, 0, 0 }, 
      };
!     count = sizeof(classList)/sizeof(wxLuaBindClass) - 1;

      return classList;
***************
*** 163,172 ****

  // binding class
! extern WXLUACLASS  *wxLuaGetClassList_wxluacan(size_t &count);
! extern WXLUADEFINE *wxLuaGetDefineList_wxluacan(size_t &count);
! extern WXLUASTRING *wxLuaGetStringList_wxluacan(size_t &count);
! extern WXLUAEVENT  *wxLuaGetEventList_wxluacan(size_t &count);
! extern WXLUAOBJECT *wxLuaGetObjectList_wxluacan(size_t &count);
! extern WXLUAMETHOD *wxLuaGetFunctionList_wxluacan(size_t &count);

--- 163,172 ----

  // binding class
! 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);
! extern wxLuaBindObject *wxLuaGetObjectList_wxluacan(size_t &count);
! extern wxLuaBindMethod *wxLuaGetFunctionList_wxluacan(size_t &count);

***************
*** 175,186 ****
  wxLuaBinding_wxluacan::wxLuaBinding_wxluacan() : wxLuaBinding()
  {
!     m_bindingName  = wxT("wxluacan");
!     m_nameSpace    = wxT("wxluacan");
!     m_classList    = wxLuaGetClassList_wxluacan(m_classCount);
!     m_defineList   = wxLuaGetDefineList_wxluacan(m_defineCount);
!     m_stringList   = wxLuaGetStringList_wxluacan(m_stringCount);
!     m_eventList    = wxLuaGetEventList_wxluacan(m_eventCount);
!     m_objectList   = wxLuaGetObjectList_wxluacan(m_objectCount);
!     m_functionList = wxLuaGetFunctionList_wxluacan(m_functionCount);
  }

--- 175,186 ----
  wxLuaBinding_wxluacan::wxLuaBinding_wxluacan() : wxLuaBinding()
  {
!     m_bindingName   = wxT("wxluacan");
!     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);
!     m_objectArray   = wxLuaGetObjectList_wxluacan(m_objectCount);
!     m_functionArray = wxLuaGetFunctionList_wxluacan(m_functionCount);
  }

Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** wxluacan.h	5 Jun 2007 21:07:20 -0000	1.24
--- wxluacan.h	6 Jun 2007 23:42:53 -0000	1.25
***************
*** 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
  // ---------------------------------------------------------------------------

--- 18,24 ----
  //   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
  // ---------------------------------------------------------------------------

***************
*** 58,94 ****

  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCan_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_enumCount;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObj_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_enumCount;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjAddScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjAddScript_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_enumCount;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjCircle_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_enumCount;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjRect_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjRect_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_enumCount;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlCanObjScript_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_enumCount;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd;
! extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount;
! extern WXLUA_NO_DLLIMPEXP WXLUADEFINE wxlLuaCanCmd_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_enumCount;

--- 58,94 ----

  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 wxLuaBindDefine wxlCan_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_enumCount;
  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 wxLuaBindDefine wxlCanObj_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_enumCount;
  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 wxLuaBindDefine wxlCanObjAddScript_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_enumCount;
  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 wxLuaBindDefine wxlCanObjCircle_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_enumCount;
  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 wxLuaBindDefine wxlCanObjRect_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_enumCount;
  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 wxLuaBindDefine wxlCanObjScript_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_enumCount;
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd;
! extern WXLUA_NO_DLLIMPEXP wxLuaBindMethod wxlLuaCanCmd_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount;
! extern WXLUA_NO_DLLIMPEXP wxLuaBindDefine wxlLuaCanCmd_enums[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_enumCount;

Thread: [Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.27, 1.28 wxluacan.h, 1.24, 1.25 wxluacan_bin

wxlua-commit