[Wxlua-commit] wxLua/modules/wxbind/src wxadv_bind.cpp, 1.20, 1.21 wxbase_bind.cpp, 1.19, 1.20

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

Update of /cvsroot/wxlua/wxLua/modules/wxbind/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5286/wxLua/modules/wxbind/src

Modified Files:
	wxadv_bind.cpp wxbase_bind.cpp 
Log Message:
Update bindings.wx.lua to handle multiple base classes
remove wrong wxBitmapComboBox base class temporarily


Index: wxadv_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxadv_bind.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wxadv_bind.cpp	19 May 2009 03:20:53 -0000	1.20
--- wxadv_bind.cpp	20 May 2009 04:43:41 -0000	1.21
***************
*** 15532,15536 ****
  static const char* wxluaclassname_wxCommandEvent = "wxCommandEvent";
  static const char* wxluaclassname_wxControl = "wxControl";
- static const char* wxluaclassname_wxControlWithItems = "wxControlWithItems";
  static const char* wxluaclassname_wxDateEvent = "wxDateEvent";
  static const char* wxluaclassname_wxDialog = "wxDialog";
--- 15532,15535 ----
***************
*** 15598,15603 ****
  static const char* wxluabaseclassnames_wxAnimationCtrl[] = { wxluaclassname_wxControl, NULL };
  static wxLuaBindClass* wxluabaseclassbinds_wxAnimationCtrl[] = { NULL };
- static const char* wxluabaseclassnames_wxBitmapComboBox[] = { wxluaclassname_wxControlWithItems, NULL };
- static wxLuaBindClass* wxluabaseclassbinds_wxBitmapComboBox[] = { NULL };
  static const char* wxluabaseclassnames_wxCalculateLayoutEvent[] = { wxluaclassname_wxEvent, NULL };
  static wxLuaBindClass* wxluabaseclassbinds_wxCalculateLayoutEvent[] = { NULL };
--- 15597,15600 ----
***************
*** 15880,15884 ****
  
  #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX
!         { wxluaclassname_wxBitmapComboBox, wxBitmapComboBox_methods, wxBitmapComboBox_methodCount, CLASSINFO(wxBitmapComboBox), &wxluatype_wxBitmapComboBox, wxluabaseclassnames_wxBitmapComboBox, wxluabaseclassbinds_wxBitmapComboBox, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX
  
--- 15877,15881 ----
  
  #if wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX
!         { wxluaclassname_wxBitmapComboBox, wxBitmapComboBox_methods, wxBitmapComboBox_methodCount, CLASSINFO(wxBitmapComboBox), &wxluatype_wxBitmapComboBox, NULL, NULL, g_wxluanumberArray_None, 0, }, 
  #endif // wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX
  

Index: wxbase_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wxbase_bind.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxbase_bind.cpp	19 May 2009 03:20:53 -0000	1.19
--- wxbase_bind.cpp	20 May 2009 04:43:41 -0000	1.20
***************
*** 2612,2616 ****
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { wxluaclassname_wxFileSystem, wxFileSystem_methods, wxFileSystem_methodCount, NULL, &wxluatype_wxFileSystem, wxluabaseclassnames_wxFileSystem, wxluabaseclassbinds_wxFileSystem, g_wxluanumberArray_None, 0, }, 
          { wxluaclassname_wxFileSystemHandler, wxFileSystemHandler_methods, wxFileSystemHandler_methodCount, CLASSINFO(wxFileSystemHandler), &wxluatype_wxFileSystemHandler, wxluabaseclassnames_wxFileSystemHandler, wxluabaseclassbinds_wxFileSystemHandler, g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
--- 2612,2616 ----
  
  #if (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)
!         { wxluaclassname_wxFileSystem, wxFileSystem_methods, wxFileSystem_methodCount, CLASSINFO(wxFileSystem), &wxluatype_wxFileSystem, wxluabaseclassnames_wxFileSystem, wxluabaseclassbinds_wxFileSystem, g_wxluanumberArray_None, 0, }, 
          { wxluaclassname_wxFileSystemHandler, wxFileSystemHandler_methods, wxFileSystemHandler_methodCount, CLASSINFO(wxFileSystemHandler), &wxluatype_wxFileSystemHandler, wxluabaseclassnames_wxFileSystemHandler, wxluabaseclassbinds_wxFileSystemHandler, g_wxluanumberArray_None, 0, }, 
  #endif // (wxUSE_STREAMS) && (wxUSE_FILESYSTEM)