[Wxlua-commit] wxLua/bindings/wxwidgets appframe.i,1.18,1.19 clipdrag.i,1.18,1.19 controls.i,1.20,1.21 data.i,1.16,1.17 defsutil.i,1.24,1.25 override.hpp,1.47,1.48

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

Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv24769/wxLua/bindings/wxwidgets

Modified Files:
	appframe.i clipdrag.i controls.i data.i defsutil.i 
	override.hpp 
Log Message:
add wxArrayInt/String constructors and ToLuaTable() func
add more default constructors


Index: controls.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** controls.i	25 May 2006 22:50:04 -0000	1.20
--- controls.i	26 May 2006 03:19:51 -0000	1.21
***************
*** 23,26 ****
--- 23,27 ----
  
  %class wxButton, wxControl
+     %constructor wxButtonDefault()
      wxButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton")
  
***************
*** 43,46 ****
--- 44,48 ----
  
  %class wxBitmapButton, wxButton
+     %constructor wxBitmapButtonDefault()
      wxBitmapButton( wxWindow* parent, wxWindowID id, const wxBitmap& bitmap, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxBitmapButton")
  
***************
*** 72,75 ****
--- 74,78 ----
  
  %class wxToggleButton, wxControl
+     %constructor wxToggleButtonDefault()
      wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxToggleButton")
  
***************
*** 102,105 ****
--- 105,109 ----
  
  %class wxCheckBox, wxControl
+     %constructor wxCheckBoxDefault()
      wxCheckBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& val = wxDefaultValidator, const wxString& name = "wxCheckBox")
  
***************
*** 168,171 ****
--- 172,176 ----
  
  %class wxChoice, wxControlWithItems
+     %constructor wxChoiceDefault()
      wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice")
  
***************
*** 191,194 ****
--- 196,200 ----
  
  %class wxComboBox, wxControlWithItems
+     %constructor wxComboBoxDefault()
      wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox")
  
***************
*** 233,236 ****
--- 239,243 ----
  
  %class wxGauge, wxControl
+     %constructor wxGaugeDefault()
      wxGauge(wxWindow* parent, wxWindowID id, int range, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxGA_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxGauge")
  
***************
*** 271,274 ****
--- 278,282 ----
  
  %class wxListBox, wxControlWithItems
+     %constructor wxListBoxDefault()
      wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox")
  
***************
*** 297,300 ****
--- 305,309 ----
  
  %class wxCheckListBox, wxListBox
+     %constructor wxCheckListBoxDefault()
      wxCheckListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox")
  
***************
*** 624,627 ****
--- 633,637 ----
  
  %class wxRadioBox, wxControl
+     %constructor wxRadioBoxDefault()
      wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox")
  
***************
*** 665,668 ****
--- 675,679 ----
  
  %class wxRadioButton, wxControl
+     %constructor wxRadioButtonDefault()
      wxRadioButton(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioButton")
  
***************
*** 687,690 ****
--- 698,702 ----
  
  %class wxScrollBar, wxControl
+     %constructor wxScrollBarDefault()
      wxScrollBar(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSB_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxScrollBar")
  
***************
*** 724,727 ****
--- 736,740 ----
  
  %class wxSlider, wxControl
+     %constructor wxSliderDefault()
      wxSlider(wxWindow* parent, wxWindowID id, int value , int minValue, int maxValue, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSL_HORIZONTAL, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSlider")
  
***************
*** 772,775 ****
--- 785,789 ----
  
  %class wxSpinButton, wxControl
+     %constructor wxSpinButtonDefault()
      wxSpinButton(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const wxString& name = "wxSpinButton")
  
***************
*** 818,821 ****
--- 832,836 ----
  
  %class wxSpinCtrl, wxControl
+     %constructor wxSpinCtrlDefault()
      wxSpinCtrl(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSP_ARROW_KEYS, int min = 0, int max = 100, int initial = 0, const wxString& name = "wxSpinCtrl")
  
***************
*** 877,880 ****
--- 892,896 ----
  
  %class wxTextCtrl, wxControl
+     %constructor wxTextCtrlDefault()
      wxTextCtrl(wxWindow *parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxTextCtrl")
  
***************
*** 1046,1049 ****
--- 1062,1066 ----
  
  %class wxTreeCtrl, wxControl
+     %constructor wxTreeCtrlDefault()
      wxTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTR_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxTreeCtrl")
  
***************
*** 1174,1178 ****
  
      bool IsOk()
!     long GetValue() const // get a pointer to the internal data to use as a reference
  
      %operator wxTreeItemId& operator=(const wxTreeItemId& otherId)
--- 1191,1195 ----
  
      bool IsOk()
!     long GetValue() const // get a pointer to the internal data to use as a reference in a lua table
  
      %operator wxTreeItemId& operator=(const wxTreeItemId& otherId)

Index: override.hpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** override.hpp	25 May 2006 22:50:04 -0000	1.47
--- override.hpp	26 May 2006 03:19:51 -0000	1.48
***************
*** 1219,1222 ****
--- 1219,1244 ----
  %end
  
+ %override wxLua_wxArrayInt_ToLuaTable
+ // int ToLuaTable const
+ static int LUACALL wxLua_wxArrayInt_ToLuaTable(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayInt * self = (wxArrayInt *)wxlState.GetUserDataType(1, s_wxluatag_wxArrayInt);
+     wxlState.PushwxArrayIntTable(*self);
+     return 1;
+ }
+ %end
+ 
+ %override wxLua_wxArrayString_ToLuaTable
+ // int ToLuaTable const
+ static int LUACALL wxLua_wxArrayString_ToLuaTable(lua_State *L)
+ {
+     wxLuaState wxlState(L);
+     wxArrayString * self = (wxArrayString *)wxlState.GetUserDataType(1, s_wxluatag_wxArrayString);
+     wxlState.PushwxArrayStringTable(*self);
+     return 1;
+ }
+ %end
+ 
  %override wxLua_wxStringList_constructor
  // wxStringList()

Index: clipdrag.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** clipdrag.i	18 May 2006 05:47:39 -0000	1.18
--- clipdrag.i	26 May 2006 03:19:51 -0000	1.19
***************
*** 70,75 ****
      %define %object wxFormatInvalid
  
!     %override wxDataFormat(wxDataFormatId format = wxDF_INVALID)
!     %override %constructor wxDataFormatUser(const wxString &format)
  
      wxString GetId() const
--- 70,75 ----
      %define %object wxFormatInvalid
  
!     %overload wxDataFormat(wxDataFormatId format = wxDF_INVALID)
!     %overload %constructor wxDataFormatUser(const wxString &format)
  
      wxString GetId() const

Index: defsutil.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** defsutil.i	25 May 2006 22:50:04 -0000	1.24
--- defsutil.i	26 May 2006 03:19:51 -0000	1.25
***************
*** 11,15 ****
  %include "wx/utils.h"
  
! // This list of global functions are taken from the wxWindow's manual
  
  //-----------------------------------------------------------------------------
--- 11,15 ----
  %include "wx/utils.h"
  
! // This list of global functions is taken from the wxWindow's manual
  
  //-----------------------------------------------------------------------------

Index: appframe.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** appframe.i	25 May 2006 22:50:04 -0000	1.18
--- appframe.i	26 May 2006 03:19:51 -0000	1.19
***************
*** 294,299 ****
  
  %class %delete %noclassinfo %encapsulate wxAcceleratorEntry
!     wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
!     %constructor wxAcceleratorEntryCopy(const wxAcceleratorEntry& entry)
  
      int GetCommand() const
--- 294,299 ----
  
  %class %delete %noclassinfo %encapsulate wxAcceleratorEntry
!     %overload wxAcceleratorEntry(int flags = 0, int keyCode = 0, int cmd = 0)
!     %overload %constructor wxAcceleratorEntryCopy(const wxAcceleratorEntry& entry)
  
      int GetCommand() const

Index: data.i
===================================================================
RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** data.i	24 May 2006 04:50:00 -0000	1.16
--- data.i	26 May 2006 03:19:51 -0000	1.17
***************
*** 266,269 ****
--- 266,276 ----
  
  %class %delete %noclassinfo %encapsulate wxArrayInt
+     %overload wxArrayInt()
+     %overload %constructor wxArrayIntCopy(const wxArrayInt& array)
+     %overload %constructor wxArrayIntFromTable(const wxArrayInt_FromLuaTable& array)
+ 
+     // %override [lua table] wxArrayInt::ToLuaTable() const
+     int ToLuaTable() const
+ 
      void Add( int num )
      void Alloc(size_t count)
***************
*** 292,298 ****
  
  %class %delete %noclassinfo %encapsulate wxArrayString
!     wxArrayString()
!     %constructor wxArrayStringCopy(const wxArrayString& array)
!     %constructor wxArrayStringFromTable(const wxArrayString_FromLuaTable& array)
  
      size_t Add(const wxString& str, size_t copies = 1)
--- 299,308 ----
  
  %class %delete %noclassinfo %encapsulate wxArrayString
!     %overload wxArrayString()
!     %overload %constructor wxArrayStringCopy(const wxArrayString& array)
!     %overload %constructor wxArrayStringFromTable(const wxArrayString_FromLuaTable& array)
! 
!     // %override [lua table] wxArrayString::ToLuaTable() const
!     int ToLuaTable() const
  
      size_t Add(const wxString& str, size_t copies = 1)