Thread: [Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.23, 1.24 wxluacan.h, 1.21, 1.22 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-serv5608/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan.cpp wxluacan.h wxluacan_bind.cpp 
Log Message:
simplified binding generator and write bindings out alphabetically
use #elif statements to guarantee there is only one item with the same name


Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** wxluacan.cpp	15 Mar 2007 00:01:08 -0000	1.23
--- wxluacan.cpp	15 Mar 2007 23:24:48 -0000	1.24
***************
*** 27,63 ****
  int s_wxluatag_wxlCanObj = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
! //     wxlCanObj(  double x = 0, double y = 0 )
! static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     wxlCanObj *returns;
!     // get number of arguments
!     int argCount = lua_gettop(L);
!     // double y = 0
!     double y = (argCount >= 2 ? (double)wxlState.GetNumberType(2) : 0);
!     // double x = 0
!     double x = (argCount >= 1 ? (double)wxlState.GetNumberType(1) : 0);
!     // call constructor
!     returns = new wxlCanObj(x, y);
!     // push the constructed class pointer
!     wxlState.PushUserDataType(s_wxluatag_wxlCanObj, returns);
! 
!     return 1;
! }
! 
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
! //    	void SetPos( double x, double y )
! static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // double y
!     double y = (double)wxlState.GetNumberType(3);
!     // double x
!     double x = (double)wxlState.GetNumberType(2);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call SetPos
!     self->SetPos(x, y);
  
      return 0;
--- 27,41 ----
  int s_wxluatag_wxlCanObj = -1;
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, 0 };
! //     void AddObject( wxlCanObj *canobj )
! static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // wxlCanObj canobj
!     wxlCanObj * canobj = (wxlCanObj *)wxlState.GetUserDataType(2, s_wxluatag_wxlCanObj);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call AddObject
!     self->AddObject(canobj);
  
      return 0;
***************
*** 94,162 ****
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluaarg_Boolean, 0 };
! //     void SetPending( bool pending = true )
! static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // get number of arguments
!     int argCount = lua_gettop(L);
!     // bool pending = true
!     bool pending = (argCount >= 2 ? wxlState.GetBooleanType(2) : true);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call SetPending
!     self->SetPending(pending);
  
      return 0;
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_AddObject[] = { &s_wxluatag_wxlCanObj, 0 };
! //     void AddObject( wxlCanObj *canobj )
! static int LUACALL wxLua_wxlCanObj_AddObject(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // wxlCanObj canobj
!     wxlCanObj * canobj = (wxlCanObj *)wxlState.GetUserDataType(2, s_wxluatag_wxlCanObj);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call AddObject
!     self->AddObject(canobj);
  
      return 0;
  }
  
  
! #if wxLUA_USE_wxColourPenBrush
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxPen, 0 };
! //     void SetPen( const wxPen& pen )
! static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // const wxPen pen
!     const wxPen * pen = (const wxPen *)wxlState.GetUserDataType(2, s_wxluatag_wxPen);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call SetPen
!     self->SetPen(*pen);
  
      return 0;
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxBrush, 0 };
! //     void SetBrush( const wxBrush& brush )
! static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // const wxBrush brush
!     const wxBrush * brush = (const wxBrush *)wxlState.GetUserDataType(2, s_wxluatag_wxBrush);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call SetBrush
!     self->SetBrush(*brush);
  
      return 0;
  }
  
! #endif // wxLUA_USE_wxColourPenBrush
  
  
--- 72,162 ----
  }
  
! 
! #if wxLUA_USE_wxColourPenBrush
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetBrush[] = { &s_wxluatag_wxBrush, 0 };
! //     void SetBrush( const wxBrush& brush )
! static int LUACALL wxLua_wxlCanObj_SetBrush(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // const wxBrush brush
!     const wxBrush * brush = (const wxBrush *)wxlState.GetUserDataType(2, s_wxluatag_wxBrush);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call SetBrush
!     self->SetBrush(*brush);
  
      return 0;
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPen[] = { &s_wxluatag_wxPen, 0 };
! //     void SetPen( const wxPen& pen )
! static int LUACALL wxLua_wxlCanObj_SetPen(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // const wxPen pen
!     const wxPen * pen = (const wxPen *)wxlState.GetUserDataType(2, s_wxluatag_wxPen);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call SetPen
!     self->SetPen(*pen);
  
      return 0;
  }
  
+ #endif // wxLUA_USE_wxColourPenBrush
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPending[] = { &s_wxluaarg_Boolean, 0 };
! //     void SetPending( bool pending = true )
! static int LUACALL wxLua_wxlCanObj_SetPending(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // get number of arguments
!     int argCount = lua_gettop(L);
!     // bool pending = true
!     bool pending = (argCount >= 2 ? wxlState.GetBooleanType(2) : true);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call SetPending
!     self->SetPending(pending);
  
      return 0;
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_SetPos[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
! //    	void SetPos( double x, double y )
! static int LUACALL wxLua_wxlCanObj_SetPos(lua_State *L)
  {
      wxLuaState wxlState(L);
!     // double y
!     double y = (double)wxlState.GetNumberType(3);
!     // double x
!     double x = (double)wxlState.GetNumberType(2);
      // get this
      wxlCanObj * self = (wxlCanObj *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObj);
!     // call SetPos
!     self->SetPos(x, y);
  
      return 0;
  }
  
! static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObj_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
! //     wxlCanObj(  double x = 0, double y = 0 )
! static int LUACALL wxLua_wxlCanObj_constructor(lua_State *L)
! {
!     wxLuaState wxlState(L);
!     wxlCanObj *returns;
!     // get number of arguments
!     int argCount = lua_gettop(L);
!     // double y = 0
!     double y = (argCount >= 2 ? (double)wxlState.GetNumberType(2) : 0);
!     // double x = 0
!     double x = (argCount >= 1 ? (double)wxlState.GetNumberType(1) : 0);
!     // call constructor
!     returns = new wxlCanObj(x, y);
!     // push the constructed class pointer
!     wxlState.PushUserDataType(s_wxluatag_wxlCanObj, returns);
! 
!     return 1;
! }
  
  
***************
*** 164,179 ****
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObj_methods[] = {
!     { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor },
!     { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos },
      { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None },
-     { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending },
-     { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject },
  
  #if wxLUA_USE_wxColourPenBrush
-     { LuaMethod, "SetPen", wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen },
      { LuaMethod, "SetBrush", wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush },
! #endif  // wxLUA_USE_wxColourPenBrush
  
  };
  
--- 164,179 ----
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObj_methods[] = {
!     { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_AddObject },
      { LuaMethod, "GetX", wxLua_wxlCanObj_GetX, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetY", wxLua_wxlCanObj_GetY, 0, 0, s_wxluaargArray_None },
  
  #if wxLUA_USE_wxColourPenBrush
      { LuaMethod, "SetBrush", wxLua_wxlCanObj_SetBrush, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetBrush },
!     { LuaMethod, "SetPen", wxLua_wxlCanObj_SetPen, 1, 1, s_wxluatagArray_wxLua_wxlCanObj_SetPen },
! #endif // wxLUA_USE_wxColourPenBrush
  
+     { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, s_wxluatagArray_wxLua_wxlCanObj_SetPending },
+     { LuaMethod, "SetPos", wxLua_wxlCanObj_SetPos, 2, 2, s_wxluatagArray_wxLua_wxlCanObj_SetPos },
+     { LuaConstructor, "wxlCanObj", wxLua_wxlCanObj_constructor, 2, 0, s_wxluatagArray_wxLua_wxlCanObj_constructor },
  };
  
***************
*** 297,300 ****
--- 297,315 ----
  int s_wxluatag_wxlCanObjAddScript = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluaarg_String, 0 };
+ //     void SetScript( const wxString& script )
+ static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // const wxString script
+     const wxString script = wxlState.GetwxStringType(2);
+     // get this
+     wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObjAddScript);
+     // call SetScript
+     self->SetScript(script);
+ 
+     return 0;
+ }
+ 
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 };
  //     wxlCanObjAddScript(  double x, double y,  const wxString& script  )
***************
*** 317,341 ****
  }
  
- static wxLuaArgTag s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript[] = { &s_wxluaarg_String, 0 };
- //     void SetScript( const wxString& script )
- static int LUACALL wxLua_wxlCanObjAddScript_SetScript(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     // const wxString script
-     const wxString script = wxlState.GetwxStringType(2);
-     // get this
-     wxlCanObjAddScript * self = (wxlCanObjAddScript *)wxlState.GetUserDataType(1, s_wxluatag_wxlCanObjAddScript);
-     // call SetScript
-     self->SetScript(script);
- 
-     return 0;
- }
- 
  
  
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjAddScript_methods[] = {
-     { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor },
      { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript },
  };
  
--- 332,341 ----
  }
  
  
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlCanObjAddScript_methods[] = {
      { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, s_wxluatagArray_wxLua_wxlCanObjAddScript_SetScript },
+     { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, s_wxluatagArray_wxLua_wxlCanObjAddScript_constructor },
  };
  
***************
*** 364,393 ****
  }
  
! //     bool GetYaxis()
! static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L)
  {
      wxLuaState wxlState(L);
!     bool returns;
      // get this
      wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan);
!     // call GetYaxis
!     returns = self->GetYaxis();
!     // push the result flag
!     lua_pushboolean(L, returns);
  
      return 1;
  }
  
! //     wxlLuaCanCmd* GetCmdh()
! static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L)
  {
      wxLuaState wxlState(L);
!     wxlLuaCanCmd *returns;
      // get this
      wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan);
!     // call GetCmdh
!     returns = (wxlLuaCanCmd *)self->GetCmdh();
!     // push the result datatype
!     wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns);
  
      return 1;
--- 364,393 ----
  }
  
! //     wxlLuaCanCmd* GetCmdh()
! static int LUACALL wxLua_wxlCan_GetCmdh(lua_State *L)
  {
      wxLuaState wxlState(L);
!     wxlLuaCanCmd *returns;
      // get this
      wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan);
!     // call GetCmdh
!     returns = (wxlLuaCanCmd *)self->GetCmdh();
!     // push the result datatype
!     wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns);
  
      return 1;
  }
  
! //     bool GetYaxis()
! static int LUACALL wxLua_wxlCan_GetYaxis(lua_State *L)
  {
      wxLuaState wxlState(L);
!     bool returns;
      // get this
      wxlCan * self = (wxlCan *)wxlState.GetUserDataType(1, s_wxluatag_wxlCan);
!     // call GetYaxis
!     returns = self->GetYaxis();
!     // push the result flag
!     lua_pushboolean(L, returns);
  
      return 1;
***************
*** 427,436 ****
  WXLUAMETHOD wxlCan_methods[] = {
      { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject },
-     { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None },
  
  #if wxLUA_USE_wxPointSizeRect
      { LuaConstructor, "wxlCan", wxLua_wxlCan_constructor, 4, 1, s_wxluatagArray_wxLua_wxlCan_constructor },
! #endif  // wxLUA_USE_wxPointSizeRect
  
  };
--- 427,436 ----
  WXLUAMETHOD wxlCan_methods[] = {
      { LuaMethod, "AddObject", wxLua_wxlCan_AddObject, 1, 1, s_wxluatagArray_wxLua_wxlCan_AddObject },
      { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, s_wxluaargArray_None },
  
  #if wxLUA_USE_wxPointSizeRect
      { LuaConstructor, "wxlCan", wxLua_wxlCan_constructor, 4, 1, s_wxluatagArray_wxLua_wxlCan_constructor },
! #endif // wxLUA_USE_wxPointSizeRect
  
  };
***************
*** 445,448 ****
--- 445,467 ----
  int s_wxluatag_wxlLuaCanCmd = -1;
  
+ static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
+ //     void MoveObject( int index, double x, double y )
+ static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     // double y
+     double y = (double)wxlState.GetNumberType(4);
+     // double x
+     double x = (double)wxlState.GetNumberType(3);
+     // int index
+     int index = (int)wxlState.GetNumberType(2);
+     // get this
+     wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.GetUserDataType(1, s_wxluatag_wxlLuaCanCmd);
+     // call MoveObject
+     self->MoveObject(index, x, y);
+ 
+     return 0;
+ }
+ 
  static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor[] = { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 };
  //     wxlLuaCanCmd(  wxlCan* canvas, int maxCommands = -1 )
***************
*** 465,493 ****
  }
  
- static wxLuaArgTag s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 };
- //     void MoveObject( int index, double x, double y )
- static int LUACALL wxLua_wxlLuaCanCmd_MoveObject(lua_State *L)
- {
-     wxLuaState wxlState(L);
-     // double y
-     double y = (double)wxlState.GetNumberType(4);
-     // double x
-     double x = (double)wxlState.GetNumberType(3);
-     // int index
-     int index = (int)wxlState.GetNumberType(2);
-     // get this
-     wxlLuaCanCmd * self = (wxlLuaCanCmd *)wxlState.GetUserDataType(1, s_wxluatag_wxlLuaCanCmd);
-     // call MoveObject
-     self->MoveObject(index, x, y);
- 
-     return 0;
- }
- 
  
  
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlLuaCanCmd_methods[] = {
-     { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor },
      { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject },
  };
  
--- 484,493 ----
  }
  
  
  // Map Lua Class Methods to C Binding Functions
  WXLUAMETHOD wxlLuaCanCmd_methods[] = {
      { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, s_wxluatagArray_wxLua_wxlLuaCanCmd_MoveObject },
+     { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, s_wxluatagArray_wxLua_wxlLuaCanCmd_constructor },
  };
  

Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** wxluacan_bind.cpp	9 Mar 2007 06:10:13 -0000	1.15
--- wxluacan_bind.cpp	15 Mar 2007 23:24:49 -0000	1.16
***************
*** 28,31 ****
--- 28,32 ----
      static WXLUAEVENT eventList[] =
      {
+ 
          { 0, 0, 0 },
      };
***************
*** 35,39 ****
  
  // ---------------------------------------------------------------------------
! // wxLuaGetDefineList_wxluacan() is called to register defines and enums
  // ---------------------------------------------------------------------------
  
--- 36,40 ----
  
  // ---------------------------------------------------------------------------
! // wxLuaGetDefineList_wxluacan() is called to register %define and %enum
  // ---------------------------------------------------------------------------
  
***************
*** 42,52 ****
      static WXLUADEFINE defineList[] =
      {
-         // -------------------------------------------------------------------
-         // %define
-         // -------------------------------------------------------------------
- 
-         // -------------------------------------------------------------------
-         // %enum
-         // -------------------------------------------------------------------
  
          { 0, 0 },
--- 43,46 ----
***************
*** 58,62 ****
  // ---------------------------------------------------------------------------
  
! // wxLuaGetStringList_wxluacan() is called to register strings
  // ---------------------------------------------------------------------------
  
--- 52,56 ----
  // ---------------------------------------------------------------------------
  
! // wxLuaGetStringList_wxluacan() is called to register %define %string
  // ---------------------------------------------------------------------------
  
***************
*** 65,71 ****
      static WXLUASTRING stringList[] =
      {
-         // -------------------------------------------------------------------
-         // %define %string
-         // -------------------------------------------------------------------
  
          { 0, 0 },
--- 59,62 ----
***************
*** 83,86 ****
--- 74,78 ----
      static WXLUAOBJECT objectList[] =
      {
+ 
          { 0, 0, 0, 0 },
      };
***************
*** 93,97 ****
  // ---------------------------------------------------------------------------
  
- 
  // %function wxlCan* GetCan()
  static int LUACALL wxLua_function_GetCan(lua_State *L)
--- 85,88 ----
***************
*** 120,125 ****
  }
  
- 
- 
  // ---------------------------------------------------------------------------
  // wxLuaGetFunctionList_wxluacan() is called to register global functions
--- 111,114 ----
***************
*** 132,135 ****
--- 121,125 ----
          { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, s_wxluaargArray_None },
          { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, s_wxluaargArray_None },
+ 
          { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, 
      };
***************
*** 155,158 ****
--- 145,149 ----
          { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj", NULL }, 
          { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor", NULL }, 
+ 
          { 0, 0, 0, 0, 0, 0, 0 }, 
      };
***************
*** 164,168 ****
  
  // ---------------------------------------------------------------------------
! // wxLuaGetClassList_wxluacan() is called to register classes
  // ---------------------------------------------------------------------------
  
--- 155,159 ----
  
  // ---------------------------------------------------------------------------
! // wxLuaBinding_wxluacan() - the binding class
  // ---------------------------------------------------------------------------
  

Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wxluacan.h	15 Mar 2007 00:01:08 -0000	1.21
--- wxluacan.h	15 Mar 2007 23:24:49 -0000	1.22
***************
*** 54,86 ****
  
  // ---------------------------------------------------------------------------
! // Lua Tag Method Values for each Class
  // ---------------------------------------------------------------------------
  
  extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCan;
- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObj;
- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjAddScript;
- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjCircle;
- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjRect;
- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlCanObjScript;
- extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd;
- 
- 
- 
- // ---------------------------------------------------------------------------
- // Method Tables
- // ---------------------------------------------------------------------------
- 
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCan_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCan_methodCount;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjAddScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjAddScript_methodCount;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjRect_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjRect_methodCount;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount;
--- 54,79 ----
  
  // ---------------------------------------------------------------------------
! // Lua Tag Method Values and Tables for each Class
  // ---------------------------------------------------------------------------
  
  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_DATA(int) s_wxluatag_wxlCanObj;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObj_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObj_methodCount;
+ 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_DATA(int) s_wxluatag_wxlCanObjCircle;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjCircle_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjCircle_methodCount;
+ 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_DATA(int) s_wxluatag_wxlCanObjScript;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlCanObjScript_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlCanObjScript_methodCount;
+ extern WXLUA_NO_DLLIMPEXP_DATA(int) s_wxluatag_wxlLuaCanCmd;
  extern WXLUA_NO_DLLIMPEXP WXLUAMETHOD wxlLuaCanCmd_methods[];
  extern WXLUA_NO_DLLIMPEXP_DATA(int) wxlLuaCanCmd_methodCount;
***************
*** 89,93 ****
  
  // ---------------------------------------------------------------------------
! // Encapsulation Declarations
  // ---------------------------------------------------------------------------
  
--- 82,86 ----
  
  // ---------------------------------------------------------------------------
! // Encapsulation Declarations - need to be public for other bindings.
  // ---------------------------------------------------------------------------

Thread: [Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.23, 1.24 wxluacan.h, 1.21, 1.22 wxluacan_bin

wxlua-commit