[Wxlua-commit] wxLua/apps/wxluacan/src wxluacan_bind.cpp, 1.34, 1.35

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

Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9404/wxLua/apps/wxluacan/src

Modified Files:
	wxluacan_bind.cpp 
Log Message:
Allow multiple inheritance in the bindings.


Index: wxluacan_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxluacan_bind.cpp	29 Jan 2008 04:22:51 -0000	1.34
--- wxluacan_bind.cpp	14 May 2009 05:06:21 -0000	1.35
***************
*** 641,655 ****
  // ---------------------------------------------------------------------------
  
  wxLuaBindClass* wxLuaGetClassList_wxluacan(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { "wxlCan", wxlCan_methods, wxlCan_methodCount, NULL, &wxluatype_wxlCan, "wxScrolledWindow", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, NULL, &wxluatype_wxlCanObj, "wxObject", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &wxluatype_wxlCanObjAddScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &wxluatype_wxlCanObjCircle, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &wxluatype_wxlCanObjRect, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &wxluatype_wxlCanObjScript, "wxlCanObj", NULL ,g_wxluanumberArray_None, 0, }, 
!         { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &wxluatype_wxlLuaCanCmd, "wxCommandProcessor", NULL ,g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 }, 
--- 641,682 ----
  // ---------------------------------------------------------------------------
  
+ static const char* wxluaclassname_wxCommandProcessor = "wxCommandProcessor";
+ static const char* wxluaclassname_wxObject = "wxObject";
+ static const char* wxluaclassname_wxScrolledWindow = "wxScrolledWindow";
+ static const char* wxluaclassname_wxlCan = "wxlCan";
+ static const char* wxluaclassname_wxlCanObj = "wxlCanObj";
+ static const char* wxluaclassname_wxlCanObjAddScript = "wxlCanObjAddScript";
+ static const char* wxluaclassname_wxlCanObjCircle = "wxlCanObjCircle";
+ static const char* wxluaclassname_wxlCanObjRect = "wxlCanObjRect";
+ static const char* wxluaclassname_wxlCanObjScript = "wxlCanObjScript";
+ static const char* wxluaclassname_wxlLuaCanCmd = "wxlLuaCanCmd";
+ 
+ static const char* wxluabaseclassnames_wxlCan[] = { wxluaclassname_wxScrolledWindow, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCan[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObj[] = { wxluaclassname_wxObject, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObj[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObjAddScript[] = { wxluaclassname_wxlCanObj, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObjAddScript[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObjCircle[] = { wxluaclassname_wxlCanObj, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObjCircle[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObjRect[] = { wxluaclassname_wxlCanObj, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObjRect[] = { NULL };
+ static const char* wxluabaseclassnames_wxlCanObjScript[] = { wxluaclassname_wxlCanObj, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlCanObjScript[] = { NULL };
+ static const char* wxluabaseclassnames_wxlLuaCanCmd[] = { wxluaclassname_wxCommandProcessor, NULL };
+ static wxLuaBindClass* wxluabaseclassbinds_wxlLuaCanCmd[] = { NULL };
+ 
+ 
  wxLuaBindClass* wxLuaGetClassList_wxluacan(size_t &count)
  {
      static wxLuaBindClass classList[] =
      {
!         { wxluaclassname_wxlCan, wxlCan_methods, wxlCan_methodCount, NULL, &wxluatype_wxlCan, wxluabaseclassnames_wxlCan, wxluabaseclassbinds_wxlCan, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObj, wxlCanObj_methods, wxlCanObj_methodCount, NULL, &wxluatype_wxlCanObj, wxluabaseclassnames_wxlCanObj, wxluabaseclassbinds_wxlCanObj, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObjAddScript, wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, NULL, &wxluatype_wxlCanObjAddScript, wxluabaseclassnames_wxlCanObjAddScript, wxluabaseclassbinds_wxlCanObjAddScript, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObjCircle, wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, NULL, &wxluatype_wxlCanObjCircle, wxluabaseclassnames_wxlCanObjCircle, wxluabaseclassbinds_wxlCanObjCircle, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObjRect, wxlCanObjRect_methods, wxlCanObjRect_methodCount, NULL, &wxluatype_wxlCanObjRect, wxluabaseclassnames_wxlCanObjRect, wxluabaseclassbinds_wxlCanObjRect, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlCanObjScript, wxlCanObjScript_methods, wxlCanObjScript_methodCount, NULL, &wxluatype_wxlCanObjScript, wxluabaseclassnames_wxlCanObjScript, wxluabaseclassbinds_wxlCanObjScript, g_wxluanumberArray_None, 0, }, 
!         { wxluaclassname_wxlLuaCanCmd, wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, NULL, &wxluatype_wxlLuaCanCmd, wxluabaseclassnames_wxlLuaCanCmd, wxluabaseclassbinds_wxlLuaCanCmd, g_wxluanumberArray_None, 0, }, 
  
          { 0, 0, 0, 0, 0, 0, 0 },