[Wxlua-commit] wxLua/bindings/wxwidgets wx_datatypes.lua, 1.101, 1.102 wxadv_adv.i, 1.5, 1.6

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11505/wxLua/bindings/wxwidgets

Modified Files:
	wx_datatypes.lua wxadv_adv.i 
Log Message:
Add methods for wxBitmapComboBox and fix inheritance.


Index: wxadv_adv.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxadv_adv.i,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** wxadv_adv.i	20 May 2009 04:43:41 -0000	1.5
--- wxadv_adv.i	29 Jun 2009 03:22:46 -0000	1.6
***************
*** 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, wxControl
      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")
***************
*** 151,167 ****
      bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox")
  
!     int Append(const wxString&  item, const wxBitmap& bitmap = wxNullBitmap)
!     int Append(const wxString&  item, const wxBitmap& bitmap, voidptr_long data ) // C++ is (void *clientData) You can put a number here
!     int Append(const wxString&  item, const wxBitmap& bitmap, wxClientData *clientData)
  
      wxSize GetBitmapSize() const
!     wxBitmap  GetItemBitmap(unsigned int n) const
  
!     int Insert(const wxString&  item, const wxBitmap& bitmap, unsigned int pos)
!     int Insert(const wxString&  item, const wxBitmap& bitmap, unsigned int pos, voidptr_long data ) // C++ is (void *clientData) You can put a number here
!     int Insert(const wxString&  item, const wxBitmap& bitmap, unsigned int pos, wxClientData *clientData)
  
      void SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
  
  %endclass
  
--- 151,185 ----
      bool Create(wxWindow* parent, wxWindowID id, const wxString& value, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices = wxLuaNullSmartwxArrayString, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapComboBox")
  
!     int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap)
!     int Append(const wxString& item, const wxBitmap& bitmap, voidptr_long data ) // C++ is (void *clientData) You can put a number here
!     int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData)
  
      wxSize GetBitmapSize() const
!     wxBitmap GetItemBitmap(unsigned int n) const
  
!     int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos)
!     int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, voidptr_long data ) // C++ is (void *clientData) You can put a number here
!     int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos, wxClientData *clientData)
  
      void SetItemBitmap(unsigned int n, const wxBitmap& bitmap)
  
+     void Clear()
+     void Delete(unsigned int n)
+     unsigned int GetCount() const
+     wxString GetString(unsigned int n) const
+     void SetString(unsigned int n, const wxString& s)
+     int FindString(const wxString& s, bool bCase = false) const
+     void Select(int n)
+     int GetSelection() const
+     //void GetSelection(long* from, long* to) const
+     void SetSelection(int n)
+     //void SetSelection(long from, long to)
+     //int GetWidestItemWidth()
+     //int GetWidestItem()
+     
+     void SetValue(const wxString& value)
+     void SetString(unsigned int n, const wxString& s)
+     bool SetStringSelection(const wxString& s)
+     
  %endclass
  

Index: wx_datatypes.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** wx_datatypes.lua	20 May 2009 04:43:41 -0000	1.101
--- wx_datatypes.lua	29 Jun 2009 03:22:46 -0000	1.102
***************
*** 583,586 ****
--- 583,589 ----
    },
    wxBitmapComboBox = {
+     BaseClasses = {
+       [1] = "wxControl",
+     },
      Condition = "wxLUA_USE_wxBitmapComboBox && wxUSE_BITMAPCOMBOBOX",
      IsNumber = false,