Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5286/wxLua/bindings/wxwidgets
Modified Files:
wx_datatypes.lua wxadv_adv.i wxbase_file.i
Log Message:
Update bindings.wx.lua to handle multiple base classes
remove wrong wxBitmapComboBox base class temporarily
Index: wxadv_adv.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_adv.i,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wxadv_adv.i 17 Jan 2008 22:37:29 -0000 1.4
--- wxadv_adv.i 20 May 2009 04:43:41 -0000 1.5
***************
*** 144,148 ****
%include "wx/bmpcbox.h"
! %class wxBitmapComboBox, wxControlWithItems
wxBitmapComboBox()
//wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "comboBox")
--- 144,148 ----
%include "wx/bmpcbox.h"
! %class wxBitmapComboBox //, wxControlWithItems
wxBitmapComboBox()
//wxBitmapComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n = 0, const wxString choices[] = NULL, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "comboBox")
Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** wx_datatypes.lua 14 May 2009 05:06:21 -0000 1.100
--- wx_datatypes.lua 20 May 2009 04:43:41 -0000 1.101
***************
*** 583,589 ****
},
wxBitmapComboBox = {
- BaseClasses = {
- [1] = "wxControlWithItems",
- },
Condition = "wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX",
IsNumber = false,
--- 583,586 ----
Index: wxbase_file.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxbase_file.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxbase_file.i 1 Apr 2008 04:19:42 -0000 1.5
--- wxbase_file.i 20 May 2009 04:43:41 -0000 1.6
***************
*** 954,958 ****
%endenum
! %class %noclassinfo %delete wxFileSystem, wxObject
wxFileSystem()
--- 954,958 ----
%endenum
! %class %delete wxFileSystem, wxObject
wxFileSystem()
|
