[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.29, 1.30 wxluacan.h, 1.26, 1.27 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-serv15480/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan.cpp wxluacan.h wxluacan_bind.cpp 
Log Message:
Add a simple method to get the binding info, seems small and works well
Addd sample lua program bindings.wx.lua to show them in a listctrl
Fix incircles to work with new bindings
Put the "name" of the struct binding items first always


Index: wxluacan.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** wxluacan.cpp	7 Jun 2007 03:21:58 -0000	1.29
--- wxluacan.cpp	8 Jun 2007 01:36:21 -0000	1.30
***************
*** 183,198 ****
  // 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 },
  };
--- 183,198 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxlCanObj_methods[] = {
!     { "AddObject", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_AddObject, 1, NULL },
!     { "GetX", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_GetX, 1, NULL },
!     { "GetY", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_GetY, 1, NULL },
  
  #if wxLUA_USE_wxColourPenBrush
!     { "SetBrush", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetBrush, 1, NULL },
!     { "SetPen", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPen, 1, NULL },
  #endif // wxLUA_USE_wxColourPenBrush
  
!     { "SetPending", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPending, 1, NULL },
!     { "SetPos", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObj_SetPos, 1, NULL },
!     { "wxlCanObj", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxlCanObj_constructor, 1, NULL },
      { 0, 0, 0, 0 },
  };
***************
*** 237,241 ****
  // 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 },
  };
--- 237,241 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxlCanObjRect_methods[] = {
!     { "wxlCanObjRect", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxlCanObjRect_constructor, 1, NULL },
      { 0, 0, 0, 0 },
  };
***************
*** 278,282 ****
  // 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 },
  };
--- 278,282 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxlCanObjCircle_methods[] = {
!     { "wxlCanObjCircle", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxlCanObjCircle_constructor, 1, NULL },
      { 0, 0, 0, 0 },
  };
***************
*** 319,323 ****
  // 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 },
  };
--- 319,323 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxlCanObjScript_methods[] = {
!     { "wxlCanObjScript", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxlCanObjScript_constructor, 1, NULL },
      { 0, 0, 0, 0 },
  };
***************
*** 377,382 ****
  // 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 },
  };
--- 377,382 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxlCanObjAddScript_methods[] = {
!     { "SetScript", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCanObjAddScript_SetScript, 1, NULL },
!     { "wxlCanObjAddScript", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxlCanObjAddScript_constructor, 1, NULL },
      { 0, 0, 0, 0 },
  };
***************
*** 480,489 ****
  // 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
  
--- 480,489 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxlCan_methods[] = {
!     { "AddObject", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCan_AddObject, 1, NULL },
!     { "GetCmdh", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCan_GetCmdh, 1, NULL },
!     { "GetYaxis", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlCan_GetYaxis, 1, NULL },
  
  #if wxLUA_USE_wxPointSizeRect
!     { "wxlCan", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxlCan_constructor, 1, NULL },
  #endif // wxLUA_USE_wxPointSizeRect
  
***************
*** 549,554 ****
  // 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 },
  };
--- 549,554 ----
  // Map Lua Class Methods to C Binding Functions
  wxLuaBindMethod wxlLuaCanCmd_methods[] = {
!     { "MoveObject", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxlLuaCanCmd_MoveObject, 1, NULL },
!     { "wxlLuaCanCmd", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxlLuaCanCmd_constructor, 1, NULL },
      { 0, 0, 0, 0 },
  };

Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wxluacan_bind.cpp	7 Jun 2007 03:21:58 -0000	1.21
--- wxluacan_bind.cpp	8 Jun 2007 01:36:21 -0000	1.22
***************
*** 121,126 ****
      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 }, 
--- 121,126 ----
      static wxLuaBindMethod functionList[] =
      {
!         { "GetCan", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_GetCan, 1, NULL },
!         { "GetCmdhMain", WXLUAMETHOD_CFUNCTION, s_wxluafunc_wxLua_function_GetCmdhMain, 1, NULL },
  
          { 0, 0, 0, 0 }, 

Index: wxluacan.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** wxluacan.h	7 Jun 2007 03:21:58 -0000	1.26
--- wxluacan.h	8 Jun 2007 01:36:21 -0000	1.27
***************
*** 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
  // ---------------------------------------------------------------------------
  
--- 18,24 ----
  //   the current version of the bindings.
  //   See 'bindings/genwxbind.lua' and 'modules/wxlua/include/wxldefs.h'
! #if WXLUA_BINDING_VERSION > 10
  #   error "The WXLUA_BINDING_VERSION in the bindings is too old, regenerate bindings."
! #endif //WXLUA_BINDING_VERSION > 10
  // ---------------------------------------------------------------------------

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.29, 1.30 wxluacan.h, 1.26, 1.27 wxluacan_bin

[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan.cpp, 1.29, 1.30 wxluacan.h, 1.26, 1.27 wxluacan_bind.cpp, 1.21, 1.22