Menu
▾
▴
wxlua-commit — CVS commits of wxLua
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(191) |
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(238) |
Dec
(68) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(104) |
Feb
(518) |
Mar
(302) |
Apr
(211) |
May
(311) |
Jun
(55) |
Jul
(6) |
Aug
(35) |
Sep
(76) |
Oct
(50) |
Nov
(37) |
Dec
(340) |
| 2007 |
Jan
(23) |
Feb
(107) |
Mar
(98) |
Apr
(60) |
May
(136) |
Jun
(371) |
Jul
(175) |
Aug
(74) |
Sep
(3) |
Oct
(2) |
Nov
(53) |
Dec
(129) |
| 2008 |
Jan
(337) |
Feb
(23) |
Mar
(18) |
Apr
(4) |
May
(3) |
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
(33) |
Nov
|
Dec
(26) |
| 2009 |
Jan
(4) |
Feb
(1) |
Mar
(15) |
Apr
|
May
(35) |
Jun
(11) |
Jul
|
Aug
|
Sep
(19) |
Oct
(26) |
Nov
(11) |
Dec
(11) |
| 2010 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(8) |
Sep
|
Oct
|
Nov
(8) |
Dec
(7) |
| 2011 |
Jan
|
Feb
|
Mar
(4) |
Apr
(8) |
May
(5) |
Jun
(8) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(13) |
Dec
|
|
From: John L. <jr...@us...> - 2006-05-26 03:42:07
|
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) |
|
From: John L. <jr...@us...> - 2006-05-26 03:41:56
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25591/wxLua/docs Modified Files: wxluaref.html Log Message: update ref Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxluaref.html 25 May 2006 03:55:22 -0000 1.6 --- wxluaref.html 26 May 2006 03:20:27 -0000 1.7 *************** *** 42,46 **** <a href="#wxBufferedPaintDC">wxBufferedPaintDC</a><br> <a href="#wxBusyCursor">wxBusyCursor</a><br> ! wxBusyInfo - NOT WRAPPED<br> <a href="#wxButton">wxButton</a><br> wxCSConv - NOT WRAPPED<br> --- 42,46 ---- <a href="#wxBufferedPaintDC">wxBufferedPaintDC</a><br> <a href="#wxBusyCursor">wxBusyCursor</a><br> ! <a href="#wxBusyInfo">wxBusyInfo</a><br> <a href="#wxButton">wxButton</a><br> wxCSConv - NOT WRAPPED<br> *************** *** 66,70 **** <a href="#wxColour">wxColour</a><br> <a href="#wxColourData">wxColourData</a><br> ! wxColourDatabase - NOT WRAPPED<br> <a href="#wxColourDialog">wxColourDialog</a><br> <a href="#wxComboBox">wxComboBox</a><br> --- 66,70 ---- <a href="#wxColour">wxColour</a><br> <a href="#wxColourData">wxColourData</a><br> ! <a href="#wxColourDatabase">wxColourDatabase</a><br> <a href="#wxColourDialog">wxColourDialog</a><br> <a href="#wxComboBox">wxComboBox</a><br> *************** *** 123,127 **** wxDebugStreamBuf - NOT WRAPPED<br> wxDelegateRendererNative - NOT WRAPPED<br> ! <a href="#wxDialUpEvent">wxDialUpEvent</a><br> wxDialUpManager - NOT WRAPPED<br> <a href="#wxDialog">wxDialog</a><br> --- 123,127 ---- wxDebugStreamBuf - NOT WRAPPED<br> wxDelegateRendererNative - NOT WRAPPED<br> ! wxDialUpEvent - NOT WRAPPED<br> wxDialUpManager - NOT WRAPPED<br> <a href="#wxDialog">wxDialog</a><br> *************** *** 192,196 **** <a href="#wxGLContext">wxGLContext</a><br> <a href="#wxGauge">wxGauge</a><br> ! wxGenericDirCtrl - NOT WRAPPED<br> <a href="#wxGenericValidator">wxGenericValidator</a><br> <a href="#wxGrid">wxGrid</a><br> --- 192,196 ---- <a href="#wxGLContext">wxGLContext</a><br> <a href="#wxGauge">wxGauge</a><br> ! <a href="#wxGenericDirCtrl">wxGenericDirCtrl</a><br> <a href="#wxGenericValidator">wxGenericValidator</a><br> <a href="#wxGrid">wxGrid</a><br> *************** *** 268,272 **** <a href="#wxInputStream">wxInputStream</a><br> <a href="#wxJPEGHandler">wxJPEGHandler</a> - NOT IN WX REF MANUAL<br> ! wxJoystick - NOT WRAPPED<br> <a href="#wxJoystickEvent">wxJoystickEvent</a><br> <a href="#wxKeyEvent">wxKeyEvent</a><br> --- 268,272 ---- <a href="#wxInputStream">wxInputStream</a><br> <a href="#wxJPEGHandler">wxJPEGHandler</a> - NOT IN WX REF MANUAL<br> ! <a href="#wxJoystick">wxJoystick</a><br> <a href="#wxJoystickEvent">wxJoystickEvent</a><br> <a href="#wxKeyEvent">wxKeyEvent</a><br> *************** *** 353,357 **** <a href="#wxPalette">wxPalette</a><br> <a href="#wxPanel">wxPanel</a><br> ! wxPasswordEntryDialog - NOT WRAPPED<br> wxPathList - NOT WRAPPED<br> <a href="#wxPen">wxPen</a><br> --- 353,357 ---- <a href="#wxPalette">wxPalette</a><br> <a href="#wxPanel">wxPanel</a><br> ! <a href="#wxPasswordEntryDialog">wxPasswordEntryDialog</a><br> wxPathList - NOT WRAPPED<br> <a href="#wxPen">wxPen</a><br> *************** *** 426,430 **** <a href="#wxSpinCtrl">wxSpinCtrl</a><br> <a href="#wxSpinEvent">wxSpinEvent</a><br> ! wxSplashScreen - NOT WRAPPED<br> <a href="#wxSplitterEvent">wxSplitterEvent</a><br> wxSplitterRenderParams - NOT WRAPPED<br> --- 426,431 ---- <a href="#wxSpinCtrl">wxSpinCtrl</a><br> <a href="#wxSpinEvent">wxSpinEvent</a><br> ! <a href="#wxSplashScreen">wxSplashScreen</a><br> ! <a href="#wxSplashScreenWindow">wxSplashScreenWindow</a> - NOT IN WX REF MANUAL<br> <a href="#wxSplitterEvent">wxSplitterEvent</a><br> wxSplitterRenderParams - NOT WRAPPED<br> *************** *** 929,934 **** <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxAcceleratorEntry">wxAcceleratorEntry</a></b></font></font><blockquote> ! <a href="#wxAcceleratorEntry">wxAcceleratorEntry</a>(int flags = 0, int keyCode = 0, int cmd = 0)<br> ! <i>%constructor</i> wxAcceleratorEntryCopy(const <a href="#wxAcceleratorEntry">wxAcceleratorEntry</a>& entry)<br> <br> int GetCommand() const<br> --- 930,935 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxAcceleratorEntry">wxAcceleratorEntry</a></b></font></font><blockquote> ! <font color=#CC3333> <i>%overload</i> <a href="#wxAcceleratorEntry">wxAcceleratorEntry</a>(int flags = 0, int keyCode = 0, int cmd = 0)</font><br> ! <font color=#CC3333> <i>%overload</i> <i>%constructor</i> wxAcceleratorEntryCopy(const <a href="#wxAcceleratorEntry">wxAcceleratorEntry</a>& entry)</font><br> <br> int GetCommand() const<br> *************** *** 1105,1110 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> //-----------------------------------------------------------------------------<br> ! // <a href="#wxSystemOptions">wxSystemOptions</a> - FIXME add wxLUA_USE_wxSystemOptions<br> <br> <i>%include</i> "wx/sysopt.h"<br> --- 1106,1115 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> + <i>%endif</i> wxLUA_USE_wxSystemSettings<br> + <br> //-----------------------------------------------------------------------------<br> ! // wxSystemOptions<br> ! <br> ! <i>%if</i> wxLUA_USE_wxSystemOptions<br> <br> <i>%include</i> "wx/sysopt.h"<br> *************** *** 1121,1125 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> wxLUA_USE_wxSystemSettings<br> <HR> <h2>clipdrag.i</h2> --- 1126,1130 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> wxLUA_USE_wxSystemOptions<br> <HR> <h2>clipdrag.i</h2> *************** *** 1195,1200 **** <font color=#007755> <i>%define</i> <i>%object</i> wxFormatInvalid</font><br> <br> ! <font color=#CC3300> <i>%override</i> <a href="#wxDataFormat">wxDataFormat</a>(<a href="#wxDataFormatId">wxDataFormatId</a> format = wxDF_INVALID)</font><br> ! <font color=#CC3300> <i>%override</i> <i>%constructor</i> wxDataFormatUser(const <a href="#wxString">wxString</a> &format)</font><br> <br> <a href="#wxString">wxString</a> GetId() const<br> --- 1200,1205 ---- <font color=#007755> <i>%define</i> <i>%object</i> wxFormatInvalid</font><br> <br> ! <font color=#CC3333> <i>%overload</i> <a href="#wxDataFormat">wxDataFormat</a>(<a href="#wxDataFormatId">wxDataFormatId</a> format = wxDF_INVALID)</font><br> ! <font color=#CC3333> <i>%overload</i> <i>%constructor</i> wxDataFormatUser(const <a href="#wxString">wxString</a> &format)</font><br> <br> <a href="#wxString">wxString</a> GetId() const<br> *************** *** 1584,1587 **** --- 1589,1593 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxButton">wxButton</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxButtonDefault()<br> <a href="#wxButton">wxButton</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxButton")<br> <br> *************** *** 1604,1607 **** --- 1610,1614 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxBitmapButton">wxBitmapButton</a></b>, <a href="#wxButton">wxButton</a></font></font><blockquote> + <i>%constructor</i> wxBitmapButtonDefault()<br> <a href="#wxBitmapButton">wxBitmapButton</a>( <a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxBitmap">wxBitmap</a>& bitmap, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxBU_AUTODRAW, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxBitmapButton")<br> <br> *************** *** 1628,1636 **** // wxToggleButton<br> <br> ! <i>%if</i> wxLUA_USE_wxButton<br> <br> <i>%include</i> "wx/tglbtn.h"<br> <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxToggleButton">wxToggleButton</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> <a href="#wxToggleButton">wxToggleButton</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxToggleButton")<br> <br> --- 1635,1644 ---- // wxToggleButton<br> <br> ! <i>%if</i> wxLUA_USE_wxToggleButton<br> <br> <i>%include</i> "wx/tglbtn.h"<br> <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxToggleButton">wxToggleButton</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxToggleButtonDefault()<br> <a href="#wxToggleButton">wxToggleButton</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxToggleButton")<br> <br> *************** *** 1643,1647 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> wxLUA_USE_wxButton<br> <br> //-----------------------------------------------------------------------------<br> --- 1651,1655 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> wxLUA_USE_wxToggleButton<br> <br> //-----------------------------------------------------------------------------<br> *************** *** 1663,1666 **** --- 1671,1675 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxCheckBox">wxCheckBox</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxCheckBoxDefault()<br> <a href="#wxCheckBox">wxCheckBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& val = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxCheckBox")<br> <br> *************** *** 1682,1686 **** // wxControlWithItems<br> <br> ! <i>%if</i> wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox<br> <br> <i>%include</i> "wx/ctrlsub.h"<br> --- 1691,1695 ---- // wxControlWithItems<br> <br> ! <i>%if</i> wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox<br> <br> <i>%include</i> "wx/ctrlsub.h"<br> *************** *** 1719,1723 **** </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox<br> <br> //-----------------------------------------------------------------------------<br> --- 1728,1732 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> ! <i>%endif</i> wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox<br> <br> //-----------------------------------------------------------------------------<br> *************** *** 1729,1732 **** --- 1738,1742 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxChoice">wxChoice</a></b>, <a href="#wxControlWithItems">wxControlWithItems</a></font></font><blockquote> + <i>%constructor</i> wxChoiceDefault()<br> <a href="#wxChoice">wxChoice</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxChoice")<br> <br> *************** *** 1752,1755 **** --- 1762,1766 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxComboBox">wxComboBox</a></b>, <a href="#wxControlWithItems">wxControlWithItems</a></font></font><blockquote> + <i>%constructor</i> wxComboBoxDefault()<br> <a href="#wxComboBox">wxComboBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxComboBox")<br> <br> *************** *** 1794,1797 **** --- 1805,1809 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxGauge">wxGauge</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxGaugeDefault()<br> <a href="#wxGauge">wxGauge</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, int range, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxGA_HORIZONTAL, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxGauge")<br> <br> *************** *** 1832,1835 **** --- 1844,1848 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxListBox">wxListBox</a></b>, <a href="#wxControlWithItems">wxControlWithItems</a></font></font><blockquote> + <i>%constructor</i> wxListBoxDefault()<br> <a href="#wxListBox">wxListBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxListBox")<br> <br> *************** *** 1858,1861 **** --- 1871,1875 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxCheckListBox">wxCheckListBox</a></b>, <a href="#wxListBox">wxListBox</a></font></font><blockquote> + <i>%constructor</i> wxCheckListBoxDefault()<br> <a href="#wxCheckListBox">wxCheckListBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxCheckListBox")<br> <br> *************** *** 2185,2188 **** --- 2199,2203 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxRadioBox">wxRadioBox</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxRadioBoxDefault()<br> <a href="#wxRadioBox">wxRadioBox</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioBox")<br> <br> *************** *** 2226,2229 **** --- 2241,2245 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxRadioButton">wxRadioButton</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxRadioButtonDefault()<br> <a href="#wxRadioButton">wxRadioButton</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxString">wxString</a>& label, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxRadioButton")<br> <br> *************** *** 2248,2251 **** --- 2264,2268 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxScrollBar">wxScrollBar</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxScrollBarDefault()<br> <a href="#wxScrollBar">wxScrollBar</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxSB_HORIZONTAL, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxScrollBar")<br> <br> *************** *** 2285,2288 **** --- 2302,2306 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxSlider">wxSlider</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxSliderDefault()<br> <a href="#wxSlider">wxSlider</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, int value , int minValue, int maxValue, const <a href="#wxPoint">wxPoint</a>& point = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxSL_HORIZONTAL, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxSlider")<br> <br> *************** *** 2333,2336 **** --- 2351,2355 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxSpinButton">wxSpinButton</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxSpinButtonDefault()<br> <a href="#wxSpinButton">wxSpinButton</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id = -1, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, const <a href="#wxString">wxString</a>& name = "wxSpinButton")<br> <br> *************** *** 2379,2382 **** --- 2398,2402 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxSpinCtrl">wxSpinCtrl</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxSpinCtrlDefault()<br> <a href="#wxSpinCtrl">wxSpinCtrl</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id = wxID_ANY, const <a href="#wxString">wxString</a>& value = wxEmptyString, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxSP_ARROW_KEYS, int min = 0, int max = 100, int initial = 0, const <a href="#wxString">wxString</a>& name = "wxSpinCtrl")<br> <br> *************** *** 2438,2441 **** --- 2458,2462 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxTextCtrl">wxTextCtrl</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxTextCtrlDefault()<br> <a href="#wxTextCtrl">wxTextCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, wxWindowID id, const <a href="#wxString">wxString</a>& value = "", const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = 0, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxTextCtrl")<br> <br> *************** *** 2607,2610 **** --- 2628,2632 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxTreeCtrl">wxTreeCtrl</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxTreeCtrlDefault()<br> <a href="#wxTreeCtrl">wxTreeCtrl</a>(<a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxTR_DEFAULT_STYLE, const <a href="#wxValidator">wxValidator</a>& validator = wxDefaultValidator, const <a href="#wxString">wxString</a>& name = "wxTreeCtrl")<br> <br> *************** *** 2734,2745 **** <font color=#CC3333> <i>%overload</i> <i>%constructor</i> wxTreeItemIdCopy(const <a href="#wxTreeItemId">wxTreeItemId</a>& id)</font><br> <br> ! bool IsOk()<br> ! double GetValue() const<br> ! void SetValue(double value) // probably DON'T USE!<br> <br> <i>%operator</i> <a href="#wxTreeItemId">wxTreeItemId</a>& operator=(const <a href="#wxTreeItemId">wxTreeItemId</a>& otherId)<br> <i>%operator</i> bool operator==(const <a href="#wxTreeItemId">wxTreeItemId</a>& otherId) const<br> <br> ! <font color=#000077> <i>%property</i>=Value, read, write</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> --- 2756,2766 ---- <font color=#CC3333> <i>%overload</i> <i>%constructor</i> wxTreeItemIdCopy(const <a href="#wxTreeItemId">wxTreeItemId</a>& id)</font><br> <br> ! bool IsOk()<br> ! long GetValue() const // get a pointer to the internal data to use as a reference in a lua table<br> <br> <i>%operator</i> <a href="#wxTreeItemId">wxTreeItemId</a>& operator=(const <a href="#wxTreeItemId">wxTreeItemId</a>& otherId)<br> <i>%operator</i> bool operator==(const <a href="#wxTreeItemId">wxTreeItemId</a>& otherId) const<br> <br> ! <font color=#000077> <i>%property</i>=Value, read</font><br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> *************** *** 2780,2783 **** --- 2801,2805 ---- <br> <a href="#wxTreeEvent">wxTreeEvent</a>(wxEventType commandType = wxEVT_NULL, int id = 0)<br> + <br> int GetKeyCode() const<br> <a href="#wxTreeItemId">wxTreeItemId</a> GetItem() const<br> *************** *** 2797,2800 **** --- 2819,2866 ---- <br> <i>%endif</i> wxLUA_USE_wxTreeCtrl<br> + <br> + //-----------------------------------------------------------------------------<br> + // wxGenericDirCtrl<br> + <br> + <i>%if</i> wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG<br> + <br> + <i>%include</i> "wx/dirctrl.h"<br> + <br> + <font color=#007700><font size=+1>%<b><a name="enum">enum</a></b></font><blockquote> + wxDIRCTRL_DIR_ONLY<br> + wxDIRCTRL_SELECT_FIRST<br> + wxDIRCTRL_SHOW_FILTERS<br> + wxDIRCTRL_3D_INTERNAL<br> + wxDIRCTRL_EDIT_LABELS<br> + </blockquote><i>%endenum</i></font><br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxGenericDirCtrl">wxGenericDirCtrl</a></b>, <a href="#wxControl">wxControl</a></font></font><blockquote> + <i>%constructor</i> wxGenericDirCtrlDefault()<br> + <a href="#wxGenericDirCtrl">wxGenericDirCtrl</a>(<a href="#wxWindow">wxWindow</a> *parent, const wxWindowID id = wxID_ANY, const <a href="#wxString">wxString</a> &dir = wxDirDialogDefaultFolderStr, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, const <a href="#wxString">wxString</a>& filter = "", int defaultFilter = 0, const <a href="#wxString">wxString</a>& name = "wxGenericDirCtrl")<br> + <br> + bool Create(<a href="#wxWindow">wxWindow</a> *parent, const wxWindowID id = wxID_ANY, const <a href="#wxString">wxString</a> &dir = wxDirDialogDefaultFolderStr, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, const <a href="#wxString">wxString</a>& filter = "", int defaultFilter = 0, const <a href="#wxString">wxString</a>& name = "wxGenericDirCtrl")<br> + void CollapseTree()<br> + bool ExpandPath(const <a href="#wxString">wxString</a>& path)<br> + <a href="#wxString">wxString</a> GetDefaultPath() const<br> + <a href="#wxString">wxString</a> GetPath() const<br> + <a href="#wxString">wxString</a> GetFilePath() const<br> + <a href="#wxString">wxString</a> GetFilter() const<br> + int GetFilterIndex() const<br> + //wxDirFilterListCtrl* GetFilterListCtrl() const<br> + <a href="#wxTreeItemId">wxTreeItemId</a> GetRootId()<br> + <a href="#wxTreeCtrl">wxTreeCtrl</a>* GetTreeCtrl() const<br> + void ReCreateTree()<br> + void SetDefaultPath(const <a href="#wxString">wxString</a>& path)<br> + void SetFilter(const <a href="#wxString">wxString</a>& filter)<br> + void SetFilterIndex(int n)<br> + void SetPath(const <a href="#wxString">wxString</a>& path)<br> + void ShowHidden( bool show )<br> + bool GetShowHidden()<br> + <br> + //<a href="#wxTreeItemId">wxTreeItemId</a> FindChild(<a href="#wxTreeItemId">wxTreeItemId</a> parentId, const <a href="#wxString">wxString</a>& path, bool& done)<br> + <br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + <i>%endif</i> wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG<br> <HR> <h2>data.i</h2> *************** *** 3066,3069 **** --- 3132,3142 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxArrayInt">wxArrayInt</a></b></font></font><blockquote> + <font color=#CC3333> <i>%overload</i> <a href="#wxArrayInt">wxArrayInt</a>()</font><br> + <font color=#CC3333> <i>%overload</i> <i>%constructor</i> wxArrayIntCopy(const <a href="#wxArrayInt">wxArrayInt</a>& array)</font><br> + <font color=#CC3333> <i>%overload</i> <i>%constructor</i> wxArrayIntFromTable(const wxArrayInt_FromLuaTable& array)</font><br> + <br> + <font color=#CC3300> // <i>%override</i> [lua table] wxArrayInt::ToLuaTable() const</font><br> + int ToLuaTable() const<br> + <br> void Add( int num )<br> void Alloc(size_t count)<br> *************** *** 3092,3098 **** <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxArrayString">wxArrayString</a></b></font></font><blockquote> ! <a href="#wxArrayString">wxArrayString</a>()<br> ! <i>%constructor</i> wxArrayStringCopy(const <a href="#wxArrayString">wxArrayString</a>& array)<br> ! <i>%constructor</i> wxArrayStringFromTable(const wxArrayString_FromLuaTable& array)<br> <br> size_t Add(const <a href="#wxString">wxString</a>& str, size_t copies = 1)<br> --- 3165,3174 ---- <br> <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxArrayString">wxArrayString</a></b></font></font><blockquote> ! <font color=#CC3333> <i>%overload</i> <a href="#wxArrayString">wxArrayString</a>()</font><br> ! <font color=#CC3333> <i>%overload</i> <i>%constructor</i> wxArrayStringCopy(const <a href="#wxArrayString">wxArrayString</a>& array)</font><br> ! <font color=#CC3333> <i>%overload</i> <i>%constructor</i> wxArrayStringFromTable(const wxArrayString_FromLuaTable& array)</font><br> ! <br> ! <font color=#CC3300> // <i>%override</i> [lua table] wxArrayString::ToLuaTable() const</font><br> ! int ToLuaTable() const<br> <br> size_t Add(const <a href="#wxString">wxString</a>& str, size_t copies = 1)<br> *************** *** 3666,3670 **** <i>%include</i> "wx/utils.h"<br> <br> ! // This list of global functions are taken from the wxWindow's manual<br> <br> //-----------------------------------------------------------------------------<br> --- 3742,3746 ---- <i>%include</i> "wx/utils.h"<br> <br> ! // This list of global functions is taken from the wxWindow's manual<br> <br> //-----------------------------------------------------------------------------<br> *************** *** 3680,3683 **** --- 3756,3761 ---- // wxProcess<br> <br> + <i>%if</i> wxLUA_USE_wxProcess<br> + <br> <font color=#007700><font size=+1>%<b><a name="enum">enum</a></b></font><blockquote> wxEXEC_ASYNC<br> *************** *** 3745,3748 **** --- 3823,3828 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> + <i>%endif</i> wxLUA_USE_wxProcess<br> + <br> //-----------------------------------------------------------------------------<br> // Process control functions<br> *************** *** 4228,4231 **** --- 4308,4313 ---- // wxBusyCursor<br> <br> + <i>%if</i> wxLUA_USE_wxBusyCursor<br> + <br> <i>%include</i> "wx/utils.h"<br> <br> *************** *** 4234,4237 **** --- 4316,4335 ---- <a href="#wxBusyCursor">wxBusyCursor</a>(<a href="#wxCursor">wxCursor</a>* cursor = wxHOURGLASS_CURSOR)<br> </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + <i>%endif</i> wxLUA_USE_wxBusyCursor<br> + <br> + //-----------------------------------------------------------------------------<br> + // wxBusyInfo<br> + <br> + <i>%if</i> wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO<br> + <br> + <i>%include</i> "wx/busyinfo.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <b><a name="wxBusyInfo">wxBusyInfo</a></b>, <a href="#wxObject">wxObject</a></font></font><blockquote> + // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough<br> + <a href="#wxBusyInfo">wxBusyInfo</a>(const <a href="#wxString">wxString</a>& message, <a href="#wxWindow">wxWindow</a> *parent = NULL)<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + <i>%endif</i> wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO<br> <HR> <h2>dialogs.i</h2> *************** *** 4461,4464 **** --- 4559,4564 ---- // <a href="#wxMultiChoiceDialog">wxMultiChoiceDialog</a> - use wxGetMultipleChoices<br> <br> + <i>%if</i> wxLUA_USE_wxMultiChoiceDialog<br> + <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxMultiChoiceDialog">wxMultiChoiceDialog</a></b>, <a href="#wxDialog">wxDialog</a></font></font><blockquote> <a href="#wxMultiChoiceDialog">wxMultiChoiceDialog</a>(<a href="#wxWindow">wxWindow</a>* parent, const <a href="#wxString">wxString</a>& message, const <a href="#wxString">wxString</a>& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition)<br> *************** *** 4469,4472 **** --- 4569,4574 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> + <i>%endif</i> wxLUA_USE_wxMultiChoiceDialog<br> + <br> //-----------------------------------------------------------------------------<br> // <a href="#wxSingleChoiceDialog">wxSingleChoiceDialog</a> - use wxGetSingleChoice or wxGetSingleChoiceIndex<br> *************** *** 4490,4497 **** <br> //-----------------------------------------------------------------------------<br> ! // <a href="#wxTextEntryDialog">wxTextEntryDialog</a> - use wxGetTextFromUser<br> <br> <i>%if</i> wxLUA_USE_wxTextEntryDialog<br> <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxTextEntryDialog">wxTextEntryDialog</a></b>, <a href="#wxDialog">wxDialog</a></font></font><blockquote> <a href="#wxTextEntryDialog">wxTextEntryDialog</a>(<a href="#wxWindow">wxWindow</a>* parent, const <a href="#wxString">wxString</a>& message, const <a href="#wxString">wxString</a>& caption = "Please enter text", const <a href="#wxString">wxString</a>& defaultValue = "", long style = wxOK | wxCANCEL | wxCENTRE, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition)<br> --- 4592,4601 ---- <br> //-----------------------------------------------------------------------------<br> ! // <a href="#wxTextEntryDialog">wxTextEntryDialog</a> - see also wxGetTextFromUser<br> <br> <i>%if</i> wxLUA_USE_wxTextEntryDialog<br> <br> + <font color=#007755><i>%define</i> wxTextEntryDialogStyle</font><br> + <br> <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxTextEntryDialog">wxTextEntryDialog</a></b>, <a href="#wxDialog">wxDialog</a></font></font><blockquote> <a href="#wxTextEntryDialog">wxTextEntryDialog</a>(<a href="#wxWindow">wxWindow</a>* parent, const <a href="#wxString">wxString</a>& message, const <a href="#wxString">wxString</a>& caption = "Please enter text", const <a href="#wxString">wxString</a>& defaultValue = "", long style = wxOK | wxCANCEL | wxCENTRE, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition)<br> *************** *** 4504,4507 **** --- 4608,4619 ---- </blockquote><font color=#AA0000><i>%endclass</i></font><br> <br> + //-----------------------------------------------------------------------------<br> + // <a href="#wxPasswordEntryDialog">wxPasswordEntryDialog</a> - see also wxGetPasswordFromUser<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxPasswordEntryDialog">wxPasswordEntryDialog</a></b>, <a href="#wxTextEntryDialog">wxTextEntryDialog</a></font></font><blockquote> + <a href="#wxPasswordEntryDialog">wxPasswordEntryDialog</a>(<a href="#wxWindow">wxWindow</a> *parent, const <a href="#wxString">wxString</a>& message, const <a href="#wxString">wxString</a>& caption = wxGetPasswordFromUserPromptStr, const <a href="#wxString">wxString</a>& value = "", long style = wxTextEntryDialogStyle, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition)<br> + <br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> <i>%endif</i> wxLUA_USE_wxTextEntryDialog<br> <br> *************** *** 4665,4668 **** --- 4777,4811 ---- // <i>%endclass</i><br> <br> + <br> + //-----------------------------------------------------------------------------<br> + // wxSplashScreen<br> + <br> + <i>%if</i> wxLUA_USE_wxSplashScreen<br> + <br> + <i>%include</i> "wx/splash.h"<br> + <br> + <font color=#007755><i>%define</i> wxSPLASH_CENTRE_ON_PARENT</font><br> + <font color=#007755><i>%define</i> wxSPLASH_CENTRE_ON_SCREEN</font><br> + <font color=#007755><i>%define</i> wxSPLASH_NO_CENTRE</font><br> + <font color=#007755><i>%define</i> wxSPLASH_TIMEOUT</font><br> + <font color=#007755><i>%define</i> wxSPLASH_NO_TIMEOUT</font><br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxSplashScreen">wxSplashScreen</a></b>, <a href="#wxFrame">wxFrame</a></font></font><blockquote> + <a href="#wxSplashScreen">wxSplashScreen</a>(const <a href="#wxBitmap">wxBitmap</a>& bitmap, long splashStyle, int milliseconds, <a href="#wxWindow">wxWindow</a>* parent, wxWindowID id, const <a href="#wxPoint">wxPoint</a>& pos = wxDefaultPosition, const <a href="#wxSize">wxSize</a>& size = wxDefaultSize, long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP)<br> + <br> + long GetSplashStyle() const<br> + <a href="#wxSplashScreenWindow">wxSplashScreenWindow</a>* GetSplashWindow() const<br> + int GetTimeout() const<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <b><a name="wxSplashScreenWindow">wxSplashScreenWindow</a></b>, <a href="#wxWindow">wxWindow</a></font></font><blockquote> + // don't need to create this, just get it from wxSplashScreen<br> + <br> + void SetBitmap(const <a href="#wxBitmap">wxBitmap</a>& bitmap)<br> + <a href="#wxBitmap">wxBitmap</a>& GetBitmap()<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + <i>%endif</i> wxLUA_USE_wxSplashScreen<br> + <br> //-----------------------------------------------------------------------------<br> // wxWizard<br> *************** *** 4924,4941 **** <br> //-----------------------------------------------------------------------------<br> ! // <a href="#wxDialUpEvent">wxDialUpEvent</a> - TODO - the rest of wxDialUp is missing, anyone care?<br> <br> ! <i>%if</i> !<i>%mac</i><br> ! <i>%include</i> "wx/dialup.h"<br> <br> ! <font color=#AA0000><font size=+1><i>%class</i> <i>%noclassinfo</i> <b><a name="wxDialUpEvent">wxDialUpEvent</a></b>, <a href="#wxCommandEvent">wxCommandEvent</a></font></font><blockquote> ! <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_DIALUP_CONNECTED</font><br> ! <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_DIALUP_DISCONNECTED</font><br> <br> ! <a href="#wxDialUpEvent">wxDialUpEvent</a>(bool isConnected, bool isOwnEvent)<br> ! bool IsConnectedEvent() const<br> ! bool IsOwnEvent() const<br> ! </blockquote><font color=#AA0000><i>%endclass</i></font><br> ! <i>%endif</i><br> <br> //-----------------------------------------------------------------------------<br> --- 5067,5084 ---- <br> //-----------------------------------------------------------------------------<br> ! // wxDialUpEvent - TODO - the rest of wxDialUp is missing, anyone care?<br> <br> ! //<i>%if</i> !<i>%mac</i><br> ! //<i>%include</i> "wx/dialup.h"<br> <br> ! //<i>%class</i> <i>%noclassinfo</i> wxDialUpEvent, wxCommandEvent<br> ! // <i>%define</i> <i>%event</i> wxEVT_DIALUP_CONNECTED<br> ! // <i>%define</i> <i>%event</i> wxEVT_DIALUP_DISCONNECTED<br> <br> ! // wxDialUpEvent(bool isConnected, bool isOwnEvent)<br> ! // bool IsConnectedEvent() const<br> ! // bool IsOwnEvent() const<br> ! //<i>%endclass</i><br> ! //<i>%endif</i><br> <br> //-----------------------------------------------------------------------------<br> *************** *** 5136,5165 **** <br> //-----------------------------------------------------------------------------<br> - // <a href="#wxJoystickEvent">wxJoystickEvent</a> - FIXME add rest of wxJoystick?<br> - <br> - <i>%include</i> "wx/event.h"<br> - <br> - <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxJoystickEvent">wxJoystickEvent</a></b>, <a href="#wxEvent">wxEvent</a></font></font><blockquote> - <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_JOY_BUTTON_DOWN</font><br> - <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_JOY_BUTTON_UP</font><br> - <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_JOY_MOVE</font><br> - <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_JOY_ZMOVE</font><br> - <br> - <a href="#wxJoystickEvent">wxJoystickEvent</a>(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0)<br> - <br> - bool ButtonDown(int button = wxJOY_BUTTON_ANY) const<br> - bool ButtonIsDown(int button = wxJOY_BUTTON_ANY) const<br> - bool ButtonUp(int button = wxJOY_BUTTON_ANY) const<br> - int GetButtonChange() const<br> - int GetButtonState() const<br> - int GetJoystick() const<br> - <a href="#wxPoint">wxPoint</a> GetPosition() const<br> - int GetZPosition() const<br> - bool IsButton() const<br> - bool IsMove() const<br> - bool IsZMove() const<br> - </blockquote><font color=#AA0000><i>%endclass</i></font><br> - <br> - //-----------------------------------------------------------------------------<br> // wxMouseEvent<br> <br> --- 5279,5282 ---- *************** *** 6362,6365 **** --- 6479,6493 ---- <br> //-----------------------------------------------------------------------------<br> + // wxColourDatabase<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <b><a name="wxColourDatabase">wxColourDatabase</a></b></font></font><blockquote> + <a href="#wxColourDatabase">wxColourDatabase</a>()<br> + <br> + <a href="#wxColour">wxColour</a> Find(const <a href="#wxString">wxString</a>& name) const<br> + <a href="#wxString">wxString</a> FindName(const <a href="#wxColour">wxColour</a>& colour) const<br> + void AddColour(const <a href="#wxString">wxString</a>& name, const <a href="#wxColour">wxColour</a>& colour)<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + //-----------------------------------------------------------------------------<br> // wxPen<br> <br> *************** *** 11370,11373 **** --- 11498,11503 ---- <i>%endif</i> // <i>%msw</i>&!<i>%wxchkver25</i><br> <br> + <i>%endif</i> wxLUA_USE_wxWave<br> + <br> //-----------------------------------------------------------------------------<br> // wxMediaCtrl<br> *************** *** 11432,11435 **** --- 11562,11658 ---- <i>%endif</i> //wxLUA_USE_wxMediaCtrl & wxUSE_MEDIACTRL<br> <br> + //-----------------------------------------------------------------------------<br> + // wxJoystick<br> + <br> + <i>%if</i> wxLUA_USE_wxJoystick|wxUSE_JOYSTICK<br> + <br> + <i>%include</i> "wx/joystick.h"<br> + <br> + <font color=#007700><font size=+1>%<b><a name="enum">enum</a></b></font><blockquote> + wxJOYSTICK1<br> + wxJOYSTICK2<br> + </blockquote><i>%endenum</i></font><br> + <br> + <font color=#007700><font size=+1>%<b><a name="enum">enum</a></b></font><blockquote> + wxJOY_BUTTON_ANY<br> + wxJOY_BUTTON1<br> + wxJOY_BUTTON2<br> + wxJOY_BUTTON3<br> + wxJOY_BUTTON4<br> + </blockquote><i>%endenum</i></font><br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxJoystick">wxJoystick</a></b>, <a href="#wxObject">wxObject</a></font></font><blockquote> + <a href="#wxJoystick">wxJoystick</a>(int joystick = wxJOYSTICK1)<br> + <br> + int GetButtonState() const<br> + int GetManufacturerId() const<br> + int GetMovementThreshold() const<br> + int GetNumberAxes() const<br> + int GetNumberButtons() const<br> + int GetNumberJoysticks() const<br> + int GetPollingMax() const<br> + int GetPollingMin() const<br> + int GetProductId() const<br> + <a href="#wxString">wxString</a> GetProductName() const<br> + <a href="#wxPoint">wxPoint</a> GetPosition() const<br> + int GetPOVPosition() const<br> + int GetPOVCTSPosition() const<br> + int GetRudderMax() const<br> + int GetRudderMin() const<br> + int GetRudderPosition() const<br> + int GetUMax() const<br> + int GetUMin() const<br> + int GetUPosition() const<br> + int GetVMax() const<br> + int GetVMin() const<br> + int GetVPosition() const<br> + int GetXMax() const<br> + int GetXMin() const<br> + int GetYMax() const<br> + int GetYMin() const<br> + int GetZMax() const<br> + int GetZMin() const<br> + int GetZPosition() const<br> + bool HasPOV() const<br> + bool HasPOV4Dir() const<br> + bool HasPOVCTS() const<br> + bool HasRudder() const<br> + bool HasU() const<br> + bool HasV() const<br> + bool HasZ() const<br> + bool IsOk() const<br> + bool ReleaseCapture()<br> + bool SetCapture(<a href="#wxWindow">wxWindow</a>* win, int pollingFreq = 0)<br> + void SetMovementThreshold(int threshold)<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + //-----------------------------------------------------------------------------<br> + // <a href="#wxJoystickEvent">wxJoystickEvent</a> - FIXME add rest of wxJoystick?<br> + <br> + <i>%include</i> "wx/event.h"<br> + <br> + <font color=#AA0000><font size=+1><i>%class</i> <i>%delete</i> <b><a name="wxJoystickEvent">wxJoystickEvent</a></b>, <a href="#wxEvent">wxEvent</a></font></font><blockquote> + <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_JOY_BUTTON_DOWN</font><br> + <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_JOY_BUTTON_UP</font><br> + <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_JOY_MOVE</font><br> + <font color=#557700> <i>%define</i> <i>%event</i> wxEVT_JOY_ZMOVE</font><br> + <br> + <a href="#wxJoystickEvent">wxJoystickEvent</a>(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0)<br> + <br> + bool ButtonDown(int button = wxJOY_BUTTON_ANY) const<br> + bool ButtonIsDown(int button = wxJOY_BUTTON_ANY) const<br> + bool ButtonUp(int button = wxJOY_BUTTON_ANY) const<br> + int GetButtonChange() const<br> + int GetButtonState() const<br> + int GetJoystick() const<br> + <a href="#wxPoint">wxPoint</a> GetPosition() const<br> + int GetZPosition() const<br> + bool IsButton() const<br> + bool IsMove() const<br> + bool IsZMove() const<br> + </blockquote><font color=#AA0000><i>%endclass</i></font><br> + <br> + <i>%endif</i> wxLUA_USE_wxJoystick|wxUSE_JOYSTICK<br> + <br> <HR> <h2>windows.i</h2> |
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27299/wxLua/modules/wxbind/src Modified Files: appframe.cpp controls.cpp defsutil.cpp dialogs.cpp event.cpp gdi.cpp wave.cpp wx_bind.cpp Log Message: add all conditions to genwxbind.lua add more wxLUA_USE_XXX Add wxJoystick, wxBusyInfo, wxPasswordEntryDialog, wxSplashScreen remove duplicate code in wxldebug.cpp Index: controls.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/controls.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** controls.cpp 18 May 2006 05:47:39 -0000 1.26 --- controls.cpp 25 May 2006 22:50:05 -0000 1.27 *************** *** 431,435 **** ! #if wxLUA_USE_wxButton // ------------------------------------------------------------------------------------------------- // Bind class wxToggleButton --- 431,435 ---- ! #if wxLUA_USE_wxToggleButton // ------------------------------------------------------------------------------------------------- // Bind class wxToggleButton *************** *** 440,444 **** ! #if ((wxLUA_USE_wxButton) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) // 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") static int LUACALL wxLua_wxToggleButton_constructor(lua_State *L) --- 440,444 ---- ! #if ((wxLUA_USE_wxToggleButton) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) // 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") static int LUACALL wxLua_wxToggleButton_constructor(lua_State *L) *************** *** 551,555 **** static WXLUAMETHOD s_wxToggleButton_methods[] = { ! #if ((wxLUA_USE_wxButton) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxToggleButton", wxLua_wxToggleButton_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxToggleButton_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, --- 551,555 ---- static WXLUAMETHOD s_wxToggleButton_methods[] = { ! #if ((wxLUA_USE_wxToggleButton) && (wxLUA_USE_wxValidator)) && (wxLUA_USE_wxPointSizeRect) { LuaConstructor, "wxToggleButton", wxLua_wxToggleButton_constructor, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, { LuaMethod, "Create", wxLua_wxToggleButton_Create, 8, 3, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluatag_wxValidator, &s_wxluaarg_String, 0 } }, *************** *** 784,788 **** ! #if wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox // ------------------------------------------------------------------------------------------------- // Bind class wxControlWithItems --- 784,788 ---- ! #if wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox // ------------------------------------------------------------------------------------------------- // Bind class wxControlWithItems *************** *** 793,797 **** ! #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox) && (wxLUA_USE_wxArrayString) // %overload %rename AppendStrings void Append(const wxArrayString& strings) static int LUACALL wxLua_wxControlWithItems_AppendStrings(lua_State *L) --- 793,797 ---- ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox) // %overload %rename AppendStrings void Append(const wxArrayString& strings) static int LUACALL wxLua_wxControlWithItems_AppendStrings(lua_State *L) *************** *** 1109,1113 **** // Overloaded function bindings ! #if ((wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox) && (wxLUA_USE_wxArrayString))||(wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox) // Overloaded functions for wxLua_wxControlWithItems_Append static int LUACALL wxLua_wxControlWithItems_Append(lua_State *L) --- 1109,1113 ---- // Overloaded function bindings ! #if ((wxLUA_USE_wxArrayString) && (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox))||(wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox) // Overloaded functions for wxLua_wxControlWithItems_Append static int LUACALL wxLua_wxControlWithItems_Append(lua_State *L) *************** *** 1117,1121 **** { ! #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox) && (wxLUA_USE_wxArrayString) { LuaMethod, "AppendStrings", wxLua_wxControlWithItems_AppendStrings, 1, 1, { &s_wxluatag_wxArrayString, 0 } }, #endif --- 1117,1121 ---- { ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox) { LuaMethod, "AppendStrings", wxLua_wxControlWithItems_AppendStrings, 1, 1, { &s_wxluatag_wxArrayString, 0 } }, #endif *************** *** 1131,1135 **** ! #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox) // Overloaded functions for wxLua_wxControlWithItems_Insert static int LUACALL wxLua_wxControlWithItems_Insert(lua_State *L) --- 1131,1135 ---- ! #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox) // Overloaded functions for wxLua_wxControlWithItems_Insert static int LUACALL wxLua_wxControlWithItems_Insert(lua_State *L) *************** *** 1152,1156 **** static WXLUAMETHOD s_wxControlWithItems_methods[] = { ! #if (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox) && (wxLUA_USE_wxArrayString) { LuaMethod, "AppendStrings", wxLua_wxControlWithItems_AppendStrings, 1, 1, { &s_wxluatag_wxArrayString, 0 } }, #endif --- 1152,1156 ---- static WXLUAMETHOD s_wxControlWithItems_methods[] = { ! #if (wxLUA_USE_wxArrayString) && (wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox) { LuaMethod, "AppendStrings", wxLua_wxControlWithItems_AppendStrings, 1, 1, { &s_wxluatag_wxArrayString, 0 } }, #endif *************** *** 9925,9929 **** } ! // bool IsOk() static int LUACALL wxLua_wxTreeItemId_IsOk(lua_State *L) { --- 9925,9929 ---- } ! // bool IsOk() static int LUACALL wxLua_wxTreeItemId_IsOk(lua_State *L) { *************** *** 9941,9949 **** // %override wxLua_wxTreeItemId_GetValue ! // double GetValue() const; static int LUACALL wxLua_wxTreeItemId_GetValue(lua_State *L) { wxLuaState wxlState(L); ! double returns; // get this wxTreeItemId *self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); --- 9941,9949 ---- // %override wxLua_wxTreeItemId_GetValue ! // long GetValue() const; static int LUACALL wxLua_wxTreeItemId_GetValue(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxTreeItemId *self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); *************** *** 9956,9974 **** } - // %override wxLua_wxTreeItemId_SetValue - // void SetValue(double value); - static int LUACALL wxLua_wxTreeItemId_SetValue(lua_State *L) - { - wxLuaState wxlState(L); - // double value - long value = (long)wxlState.GetNumberType(2); - // get this - wxTreeItemId *self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); - // call SetValue - self->m_pItem = (void *) value; - // return the number of parameters - return 0; - } - // %operator wxTreeItemId& operator=(const wxTreeItemId& otherId) static int LUACALL wxLua_wxTreeItemId_op_assign(lua_State *L) --- 9956,9959 ---- *************** *** 10059,10067 **** { LuaMethod, "IsOk", wxLua_wxTreeItemId_IsOk, 0, 0, { 0 } }, { LuaMethod, "GetValue", wxLua_wxTreeItemId_GetValue, 0, 0, { 0 } }, - { LuaMethod, "SetValue", wxLua_wxTreeItemId_SetValue, 1, 1, { &s_wxluaarg_Number, 0 } }, { LuaMethod, "op_assign", wxLua_wxTreeItemId_op_assign, 1, 1, { &s_wxluatag_wxTreeItemId, 0 } }, { LuaMethod, "op_eq", wxLua_wxTreeItemId_op_eq, 1, 1, { &s_wxluatag_wxTreeItemId, 0 } }, { LuaGetProp, "Value", wxLua_wxTreeItemId_GetValue, 0, 0, {0} }, - { LuaSetProp, "Value", wxLua_wxTreeItemId_SetValue, 1, 1, {0} }, { LuaDelete, "wxTreeItemId", wxLua_wxTreeItemId_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxTreeItemId_Delete, 0, 0, {0} }, --- 10044,10050 ---- *************** *** 10374,10375 **** --- 10357,10742 ---- #endif + + #if wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG + // ------------------------------------------------------------------------------------------------- + // Bind class wxGenericDirCtrl + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxGenericDirCtrl = -1; + + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG) + // wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = wxID_ANY, const wxString &dir = wxDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, const wxString& filter = "", int defaultFilter = 0, const wxString& name = "wxGenericDirCtrl") + static int LUACALL wxLua_wxGenericDirCtrl_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxGenericDirCtrl *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxGenericDirCtrl" + const wxString name = (argCount >= 9 ? lua2wx(wxlState.GetStringType(9)) : wxString(wxT("wxGenericDirCtrl"))); + // int defaultFilter = 0 + int defaultFilter = (argCount >= 8 ? (int)wxlState.GetNumberType(8) : 0); + // const wxString filter = "" + const wxString filter = (argCount >= 7 ? lua2wx(wxlState.GetStringType(7)) : wxString(wxEmptyString)); + // long style = wxDIRCTRL_3D_INTERNAL | wxSUNKEN_BORDER + long style = (argCount >= 6 ? (long)wxlState.GetNumberType(6) : wxDIRCTRL_3D_INTERNAL | wxSUNKEN_BORDER); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 5 ? (const wxSize *)wxlState.GetUserDataType(5, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 4 ? (const wxPoint *)wxlState.GetUserDataType(4, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString dir = wxDirDialogDefaultFolderStr + const wxString dir = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxDirDialogDefaultFolderStr)); + // const wxWindowID id = wxID_ANY + const wxWindowID id = (argCount >= 2 ? (wxWindowID)wxlState.GetNumberType(2) : wxID_ANY); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call constructor + returns = new wxGenericDirCtrl(parent, id, dir, *pos, *size, style, filter, defaultFilter, name); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxGenericDirCtrl, returns); + + return 1; + } + + // bool Create(wxWindow *parent, const wxWindowID id = wxID_ANY, const wxString &dir = wxDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, const wxString& filter = "", int defaultFilter = 0, const wxString& name = "wxGenericDirCtrl") + static int LUACALL wxLua_wxGenericDirCtrl_Create(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxString name = "wxGenericDirCtrl" + const wxString name = (argCount >= 10 ? lua2wx(wxlState.GetStringType(10)) : wxString(wxT("wxGenericDirCtrl"))); + // int defaultFilter = 0 + int defaultFilter = (argCount >= 9 ? (int)wxlState.GetNumberType(9) : 0); + // const wxString filter = "" + const wxString filter = (argCount >= 8 ? lua2wx(wxlState.GetStringType(8)) : wxString(wxEmptyString)); + // long style = wxDIRCTRL_3D_INTERNAL | wxSUNKEN_BORDER + long style = (argCount >= 7 ? (long)wxlState.GetNumberType(7) : wxDIRCTRL_3D_INTERNAL | wxSUNKEN_BORDER); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 6 ? (const wxSize *)wxlState.GetUserDataType(6, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 5 ? (const wxPoint *)wxlState.GetUserDataType(5, s_wxluatag_wxPoint) : &wxDefaultPosition); + // const wxString dir = wxDirDialogDefaultFolderStr + const wxString dir = (argCount >= 4 ? lua2wx(wxlState.GetStringType(4)) : wxString(wxDirDialogDefaultFolderStr)); + // const wxWindowID id = wxID_ANY + const wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlState.GetNumberType(3) : wxID_ANY); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call Create + returns = self->Create(parent, id, dir, *pos, *size, style, filter, defaultFilter, name); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif + + + #if (wxLUA_USE_wxTreeCtrl) && (wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG) + // wxTreeItemId GetRootId() + static int LUACALL wxLua_wxGenericDirCtrl_GetRootId(lua_State *L) + { + wxLuaState wxlState(L); + wxTreeItemId *returns; + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call GetRootId + // allocate a new object using the copy constructor + returns = new wxTreeItemId(self->GetRootId()); + // add the new object to the tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxTreeItemId *)returns); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxTreeItemId, returns); + + return 1; + } + + // wxTreeCtrl* GetTreeCtrl() const + static int LUACALL wxLua_wxGenericDirCtrl_GetTreeCtrl(lua_State *L) + { + wxLuaState wxlState(L); + wxTreeCtrl *returns; + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call GetTreeCtrl + returns = self->GetTreeCtrl(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxTreeCtrl, returns); + + return 1; + } + + #endif + + // %constructor wxGenericDirCtrlDefault() + static int LUACALL wxLua_wxGenericDirCtrlDefault_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxGenericDirCtrl *returns; + // call constructor + returns = new wxGenericDirCtrl(); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxGenericDirCtrl, returns); + + return 1; + } + + // void CollapseTree() + static int LUACALL wxLua_wxGenericDirCtrl_CollapseTree(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call CollapseTree + self->CollapseTree(); + + return 0; + } + + // bool ExpandPath(const wxString& path) + static int LUACALL wxLua_wxGenericDirCtrl_ExpandPath(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // const wxString path + const wxString path = lua2wx(wxlState.GetStringType(2)); + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call ExpandPath + returns = self->ExpandPath(path); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // wxString GetDefaultPath() const + static int LUACALL wxLua_wxGenericDirCtrl_GetDefaultPath(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call GetDefaultPath + returns = self->GetDefaultPath(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetPath() const + static int LUACALL wxLua_wxGenericDirCtrl_GetPath(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call GetPath + returns = self->GetPath(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetFilePath() const + static int LUACALL wxLua_wxGenericDirCtrl_GetFilePath(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call GetFilePath + returns = self->GetFilePath(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // wxString GetFilter() const + static int LUACALL wxLua_wxGenericDirCtrl_GetFilter(lua_State *L) + { + wxLuaState wxlState(L); + wxString returns; + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call GetFilter + returns = self->GetFilter(); + // push the result string + lua_pushstring(L, wx2lua(returns) ); + + return 1; + } + + // int GetFilterIndex() const + static int LUACALL wxLua_wxGenericDirCtrl_GetFilterIndex(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call GetFilterIndex + returns = self->GetFilterIndex(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // void ReCreateTree() + static int LUACALL wxLua_wxGenericDirCtrl_ReCreateTree(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call ReCreateTree + self->ReCreateTree(); + + return 0; + } + + // void SetDefaultPath(const wxString& path) + static int LUACALL wxLua_wxGenericDirCtrl_SetDefaultPath(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString path + const wxString path = lua2wx(wxlState.GetStringType(2)); + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call SetDefaultPath + self->SetDefaultPath(path); + + return 0; + } + + // void SetFilter(const wxString& filter) + static int LUACALL wxLua_wxGenericDirCtrl_SetFilter(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString filter + const wxString filter = lua2wx(wxlState.GetStringType(2)); + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call SetFilter + self->SetFilter(filter); + + return 0; + } + + // void SetFilterIndex(int n) + static int LUACALL wxLua_wxGenericDirCtrl_SetFilterIndex(lua_State *L) + { + wxLuaState wxlState(L); + // int n + int n = (int)wxlState.GetNumberType(2); + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call SetFilterIndex + self->SetFilterIndex(n); + + return 0; + } + + // void SetPath(const wxString& path) + static int LUACALL wxLua_wxGenericDirCtrl_SetPath(lua_State *L) + { + wxLuaState wxlState(L); + // const wxString path + const wxString path = lua2wx(wxlState.GetStringType(2)); + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call SetPath + self->SetPath(path); + + return 0; + } + + // void ShowHidden( bool show ) + static int LUACALL wxLua_wxGenericDirCtrl_ShowHidden(lua_State *L) + { + wxLuaState wxlState(L); + // bool show + bool show = wxlState.GetBooleanType(2); + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call ShowHidden + self->ShowHidden(show); + + return 0; + } + + // bool GetShowHidden() + static int LUACALL wxLua_wxGenericDirCtrl_GetShowHidden(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxGenericDirCtrl * self = (wxGenericDirCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxGenericDirCtrl); + // call GetShowHidden + returns = self->GetShowHidden(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static int LUACALL wxLua_wxGenericDirCtrl_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxGenericDirCtrl_methods[] = { + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG) + { LuaConstructor, "wxGenericDirCtrl", wxLua_wxGenericDirCtrl_constructor, 9, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, + { LuaMethod, "Create", wxLua_wxGenericDirCtrl_Create, 9, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, + #endif + + + #if (wxLUA_USE_wxTreeCtrl) && (wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG) + { LuaMethod, "GetRootId", wxLua_wxGenericDirCtrl_GetRootId, 0, 0, { 0 } }, + { LuaMethod, "GetTreeCtrl", wxLua_wxGenericDirCtrl_GetTreeCtrl, 0, 0, { 0 } }, + #endif + + { LuaConstructor, "wxGenericDirCtrlDefault", wxLua_wxGenericDirCtrlDefault_constructor, 0, 0, { 0 } }, + { LuaMethod, "CollapseTree", wxLua_wxGenericDirCtrl_CollapseTree, 0, 0, { 0 } }, + { LuaMethod, "ExpandPath", wxLua_wxGenericDirCtrl_ExpandPath, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "GetDefaultPath", wxLua_wxGenericDirCtrl_GetDefaultPath, 0, 0, { 0 } }, + { LuaMethod, "GetPath", wxLua_wxGenericDirCtrl_GetPath, 0, 0, { 0 } }, + { LuaMethod, "GetFilePath", wxLua_wxGenericDirCtrl_GetFilePath, 0, 0, { 0 } }, + { LuaMethod, "GetFilter", wxLua_wxGenericDirCtrl_GetFilter, 0, 0, { 0 } }, + { LuaMethod, "GetFilterIndex", wxLua_wxGenericDirCtrl_GetFilterIndex, 0, 0, { 0 } }, + { LuaMethod, "ReCreateTree", wxLua_wxGenericDirCtrl_ReCreateTree, 0, 0, { 0 } }, + { LuaMethod, "SetDefaultPath", wxLua_wxGenericDirCtrl_SetDefaultPath, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "SetFilter", wxLua_wxGenericDirCtrl_SetFilter, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "SetFilterIndex", wxLua_wxGenericDirCtrl_SetFilterIndex, 1, 1, { &s_wxluaarg_Number, 0 } }, + { LuaMethod, "SetPath", wxLua_wxGenericDirCtrl_SetPath, 1, 1, { &s_wxluaarg_String, 0 } }, + { LuaMethod, "ShowHidden", wxLua_wxGenericDirCtrl_ShowHidden, 1, 1, { &s_wxluaarg_Boolean, 0 } }, + { LuaMethod, "GetShowHidden", wxLua_wxGenericDirCtrl_GetShowHidden, 0, 0, { 0 } }, + { LuaDelete, "wxGenericDirCtrl", wxLua_wxGenericDirCtrl_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxGenericDirCtrl_methods = s_wxGenericDirCtrl_methods; + int wxGenericDirCtrl_methodCount = sizeof(s_wxGenericDirCtrl_methods)/sizeof(s_wxGenericDirCtrl_methods[0]); + #endif + Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** dialogs.cpp 17 May 2006 22:47:10 -0000 1.16 --- dialogs.cpp 25 May 2006 22:50:05 -0000 1.17 *************** *** 1152,1155 **** --- 1152,1157 ---- #endif + + #if wxLUA_USE_wxMultiChoiceDialog // ------------------------------------------------------------------------------------------------- // Bind class wxMultiChoiceDialog *************** *** 1159,1169 **** int s_wxluatag_wxMultiChoiceDialog = -1; - static int LUACALL wxLua_wxMultiChoiceDialog_destructor(lua_State *) - { - return 0; - } - ! #if wxLUA_USE_wxArrayInt // wxArrayInt GetSelections() const // FIXME static int LUACALL wxLua_wxMultiChoiceDialog_GetSelections(lua_State *L) --- 1161,1166 ---- int s_wxluatag_wxMultiChoiceDialog = -1; ! #if (wxLUA_USE_wxArrayInt) && (wxLUA_USE_wxMultiChoiceDialog) // wxArrayInt GetSelections() const // FIXME static int LUACALL wxLua_wxMultiChoiceDialog_GetSelections(lua_State *L) *************** *** 1201,1205 **** ! #if wxLUA_USE_wxPointSizeRect // wxMultiChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) static int LUACALL wxLua_wxMultiChoiceDialog_constructor(lua_State *L) --- 1198,1202 ---- ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMultiChoiceDialog) // wxMultiChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) static int LUACALL wxLua_wxMultiChoiceDialog_constructor(lua_State *L) *************** *** 1234,1237 **** --- 1231,1239 ---- #endif + static int LUACALL wxLua_wxMultiChoiceDialog_destructor(lua_State *) + { + return 0; + } + *************** *** 1240,1246 **** // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxMultiChoiceDialog_methods[] = { - { LuaDelete, "wxMultiChoiceDialog", wxLua_wxMultiChoiceDialog_destructor, 0, 0, {0} }, ! #if wxLUA_USE_wxArrayInt { LuaMethod, "GetSelections", wxLua_wxMultiChoiceDialog_GetSelections, 0, 0, { 0 } }, { LuaMethod, "SetSelections", wxLua_wxMultiChoiceDialog_SetSelections, 1, 1, { &s_wxluatag_wxArrayInt, 0 } }, --- 1242,1247 ---- // Map Lua Class Methods to C Binding Functions static WXLUAMETHOD s_wxMultiChoiceDialog_methods[] = { ! #if (wxLUA_USE_wxArrayInt) && (wxLUA_USE_wxMultiChoiceDialog) { LuaMethod, "GetSelections", wxLua_wxMultiChoiceDialog_GetSelections, 0, 0, { 0 } }, { LuaMethod, "SetSelections", wxLua_wxMultiChoiceDialog_SetSelections, 1, 1, { &s_wxluatag_wxArrayInt, 0 } }, *************** *** 1248,1255 **** ! #if wxLUA_USE_wxPointSizeRect { LuaConstructor, "wxMultiChoiceDialog", wxLua_wxMultiChoiceDialog_constructor, 6, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif }; --- 1249,1257 ---- ! #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxMultiChoiceDialog) { LuaConstructor, "wxMultiChoiceDialog", wxLua_wxMultiChoiceDialog_constructor, 6, 4, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_LuaTable, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, #endif + { LuaDelete, "wxMultiChoiceDialog", wxLua_wxMultiChoiceDialog_destructor, 0, 0, {0} }, }; *************** *** 1257,1260 **** --- 1259,1263 ---- WXLUAMETHOD* wxMultiChoiceDialog_methods = s_wxMultiChoiceDialog_methods; int wxMultiChoiceDialog_methodCount = sizeof(s_wxMultiChoiceDialog_methods)/sizeof(s_wxMultiChoiceDialog_methods[0]); + #endif *************** *** 1477,1480 **** --- 1480,1550 ---- + #if wxLUA_USE_wxTextEntryDialog + // ------------------------------------------------------------------------------------------------- + // Bind class wxPasswordEntryDialog + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxPasswordEntryDialog = -1; + + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxTextEntryDialog) + // wxPasswordEntryDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxGetPasswordFromUserPromptStr, const wxString& value = "", long style = wxTextEntryDialogStyle, const wxPoint& pos = wxDefaultPosition) + static int LUACALL wxLua_wxPasswordEntryDialog_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxPasswordEntryDialog *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 6 ? (const wxPoint *)wxlState.GetUserDataType(6, s_wxluatag_wxPoint) : &wxDefaultPosition); + // long style = wxTextEntryDialogStyle + long style = (argCount >= 5 ? (long)wxlState.GetNumberType(5) : wxTextEntryDialogStyle); + // const wxString value = "" + const wxString value = (argCount >= 4 ? lua2wx(wxlState.GetStringType(4)) : wxString(wxEmptyString)); + // const wxString caption = wxGetPasswordFromUserPromptStr + const wxString caption = (argCount >= 3 ? lua2wx(wxlState.GetStringType(3)) : wxString(wxGetPasswordFromUserPromptStr)); + // const wxString message + const wxString message = lua2wx(wxlState.GetStringType(2)); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); + // call constructor + returns = new wxPasswordEntryDialog(parent, message, caption, value, style, *pos); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxPasswordEntryDialog, returns); + + return 1; + } + + #endif + + static int LUACALL wxLua_wxPasswordEntryDialog_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxPasswordEntryDialog_methods[] = { + + #if (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxTextEntryDialog) + { LuaConstructor, "wxPasswordEntryDialog", wxLua_wxPasswordEntryDialog_constructor, 6, 2, { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluatag_wxPoint, 0 } }, + #endif + + { LuaDelete, "wxPasswordEntryDialog", wxLua_wxPasswordEntryDialog_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxPasswordEntryDialog_methods = s_wxPasswordEntryDialog_methods; + int wxPasswordEntryDialog_methodCount = sizeof(s_wxPasswordEntryDialog_methods)/sizeof(s_wxPasswordEntryDialog_methods[0]); + #endif + + #if wxLUA_USE_wxFontDialog // ------------------------------------------------------------------------------------------------- *************** *** 2449,2452 **** --- 2519,2708 ---- + #if wxLUA_USE_wxSplashScreen + // ------------------------------------------------------------------------------------------------- + // Bind class wxSplashScreen + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxSplashScreen = -1; + + + #if ((wxLUA_USE_wxSplashScreen) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) + // wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) + static int LUACALL wxLua_wxSplashScreen_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxSplashScreen *returns; + // get number of arguments + int argCount = lua_gettop(L); + // long style = wxSIMPLE_BORDER | wxFRAME_NO_TASKBAR | wxSTAY_ON_TOP + long style = (argCount >= 8 ? (long)wxlState.GetNumberType(8) : wxSIMPLE_BORDER | wxFRAME_NO_TASKBAR | wxSTAY_ON_TOP); + // const wxSize size = wxDefaultSize + const wxSize * size = (argCount >= 7 ? (const wxSize *)wxlState.GetUserDataType(7, s_wxluatag_wxSize) : &wxDefaultSize); + // const wxPoint pos = wxDefaultPosition + const wxPoint * pos = (argCount >= 6 ? (const wxPoint *)wxlState.GetUserDataType(6, s_wxluatag_wxPoint) : &wxDefaultPosition); + // wxWindowID id + wxWindowID id = (wxWindowID)wxlState.GetNumberType(5); + // wxWindow parent + wxWindow * parent = (wxWindow *)wxlState.GetUserDataType(4, s_wxluatag_wxWindow); + // int milliseconds + int milliseconds = (int)wxlState.GetNumberType(3); + // long splashStyle + long splashStyle = (long)wxlState.GetNumberType(2); + // const wxBitmap bitmap + const wxBitmap * bitmap = (const wxBitmap *)wxlState.GetUserDataType(1, s_wxluatag_wxBitmap); + // call constructor + returns = new wxSplashScreen(*bitmap, splashStyle, milliseconds, parent, id, *pos, *size, style); + // add to tracked window list + if (returns && returns->IsKindOf(CLASSINFO(wxWindow))) + wxlState.AddToTrackedWindowList((wxWindow*)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxSplashScreen, returns); + + return 1; + } + + #endif + + // long GetSplashStyle() const + static int LUACALL wxLua_wxSplashScreen_GetSplashStyle(lua_State *L) + { + wxLuaState wxlState(L); + long returns; + // get this + wxSplashScreen * self = (wxSplashScreen *)wxlState.GetUserDataType(1, s_wxluatag_wxSplashScreen); + // call GetSplashStyle + returns = self->GetSplashStyle(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + // wxSplashScreenWindow* GetSplashWindow() const + static int LUACALL wxLua_wxSplashScreen_GetSplashWindow(lua_State *L) + { + wxLuaState wxlState(L); + wxSplashScreenWindow *returns; + // get this + wxSplashScreen * self = (wxSplashScreen *)wxlState.GetUserDataType(1, s_wxluatag_wxSplashScreen); + // call GetSplashWindow + returns = self->GetSplashWindow(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxSplashScreenWindow, returns); + + return 1; + } + + // int GetTimeout() const + static int LUACALL wxLua_wxSplashScreen_GetTimeout(lua_State *L) + { + wxLuaState wxlState(L); + int returns; + // get this + wxSplashScreen * self = (wxSplashScreen *)wxlState.GetUserDataType(1, s_wxluatag_wxSplashScreen); + // call GetTimeout + returns = self->GetTimeout(); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + static int LUACALL wxLua_wxSplashScreen_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxSplashScreen_methods[] = { + + #if ((wxLUA_USE_wxSplashScreen) && (wxLUA_USE_wxBitmap)) && (wxLUA_USE_wxPointSizeRect) + { LuaConstructor, "wxSplashScreen", wxLua_wxSplashScreen_constructor, 8, 5, { &s_wxluatag_wxBitmap, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluatag_wxWindow, &s_wxluaarg_Number, &s_wxluatag_wxPoint, &s_wxluatag_wxSize, &s_wxluaarg_Number, 0 } }, + #endif + + { LuaMethod, "GetSplashStyle", wxLua_wxSplashScreen_GetSplashStyle, 0, 0, { 0 } }, + { LuaMethod, "GetSplashWindow", wxLua_wxSplashScreen_GetSplashWindow, 0, 0, { 0 } }, + { LuaMethod, "GetTimeout", wxLua_wxSplashScreen_GetTimeout, 0, 0, { 0 } }, + { LuaDelete, "wxSplashScreen", wxLua_wxSplashScreen_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxSplashScreen_methods = s_wxSplashScreen_methods; + int wxSplashScreen_methodCount = sizeof(s_wxSplashScreen_methods)/sizeof(s_wxSplashScreen_methods[0]); + #endif + + + #if wxLUA_USE_wxSplashScreen + // ------------------------------------------------------------------------------------------------- + // Bind class wxSplashScreenWindow + // ------------------------------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class + int s_wxluatag_wxSplashScreenWindow = -1; + + + #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxSplashScreen) + // void SetBitmap(const wxBitmap& bitmap) + static int LUACALL wxLua_wxSplashScreenWindow_SetBitmap(lua_State *L) + { + wxLuaState wxlState(L); + // const wxBitmap bitmap + const wxBitmap * bitmap = (const wxBitmap *)wxlState.GetUserDataType(2, s_wxluatag_wxBitmap); + // get this + wxSplashScreenWindow * self = (wxSplashScreenWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxSplashScreenWindow); + // call SetBitmap + self->SetBitmap(*bitmap); + + return 0; + } + + // wxBitmap& GetBitmap() + static int LUACALL wxLua_wxSplashScreenWindow_GetBitmap(lua_State *L) + { + wxLuaState wxlState(L); + wxBitmap *returns; + // get this + wxSplashScreenWindow * self = (wxSplashScreenWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxSplashScreenWindow); + // call GetBitmap + returns = &self->GetBitmap(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxBitmap, returns); + + return 1; + } + + #endif + + static int LUACALL wxLua_wxSplashScreenWindow_destructor(lua_State *) + { + return 0; + } + + + + + + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxSplashScreenWindow_methods[] = { + + #if (wxLUA_USE_wxBitmap) && (wxLUA_USE_wxSplashScreen) + { LuaMethod, "SetBitmap", wxLua_wxSplashScreenWindow_SetBitmap, 1, 1, { &s_wxluatag_wxBitmap, 0 } }, + { LuaMethod, "GetBitmap", wxLua_wxSplashScreenWindow_GetBitmap, 0, 0, { 0 } }, + #endif + + { LuaDelete, "wxSplashScreenWindow", wxLua_wxSplashScreenWindow_destructor, 0, 0, {0} }, + }; + + // Extern accessor to class method map + WXLUAMETHOD* wxSplashScreenWindow_methods = s_wxSplashScreenWindow_methods; + int wxSplashScreenWindow_methodCount = sizeof(s_wxSplashScreenWindow_methods)/sizeof(s_wxSplashScreenWindow_methods[0]); + #endif + + #if wxLUA_USE_wxWizard // ------------------------------------------------------------------------------------------------- Index: defsutil.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/defsutil.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** defsutil.cpp 16 May 2006 22:47:09 -0000 1.15 --- defsutil.cpp 25 May 2006 22:50:05 -0000 1.16 *************** *** 29,32 **** --- 29,34 ---- + + #if wxLUA_USE_wxProcess // ------------------------------------------------------------------------------------------------- // Bind class wxProcess *************** *** 36,39 **** --- 38,169 ---- int s_wxluatag_wxProcess = -1; + + #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) + // wxInputStream *GetErrorStream() const + static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) + { + wxLuaState wxlState(L); + wxInputStream *returns; + // get this + wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); + // call GetErrorStream + returns = self->GetErrorStream(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); + + return 1; + } + + // wxInputStream *GetInputStream() const + static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L) + { + wxLuaState wxlState(L); + wxInputStream *returns; + // get this + wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); + // call GetInputStream + returns = self->GetInputStream(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); + + return 1; + } + + // wxOutputStream *GetOutputStream() const + static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L) + { + wxLuaState wxlState(L); + wxOutputStream *returns; + // get this + wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); + // call GetOutputStream + returns = self->GetOutputStream(); + // push the result datatype + wxlState.PushUserDataType(s_wxluatag_wxOutputStream, returns); + + return 1; + } + + // void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) + static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L) + { + wxLuaState wxlState(L); + // wxInputStream errStream + wxInputStream * errStream = (wxInputStream *)wxlState.GetUserDataType(4, s_wxluatag_wxInputStream); + // wxOutputStream inStream + wxOutputStream * inStream = (wxOutputStream *)wxlState.GetUserDataType(3, s_wxluatag_wxOutputStream); + // wxInputStream outStream + wxInputStream * outStream = (wxInputStream *)wxlState.GetUserDataType(2, s_wxluatag_wxInputStream); + // get this + wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); + // call SetPipeStreams + self->SetPipeStreams(outStream, inStream, errStream); + + return 0; + } + + #endif + + + #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + // void CloseOutput() + static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); + // call CloseOutput + self->CloseOutput(); + + return 0; + } + + // bool IsErrorAvailable() const + static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); + // call IsErrorAvailable + returns = self->IsErrorAvailable(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool IsInputAvailable() const + static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); + // call IsInputAvailable + returns = self->IsInputAvailable(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + // bool IsInputOpened() const + static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get this + wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); + // call IsInputOpened + returns = self->IsInputOpened(); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + #endif + // wxProcess(wxEvtHandler *parent = NULL, int nId = wxID_ANY) static int LUACALL wxLua_wxProcess_constructor(lua_State *L) *************** *** 177,309 **** - #if wxUSE_STREAMS - // void CloseOutput() - static int LUACALL wxLua_wxProcess_CloseOutput(lua_State *L) - { - wxLuaState wxlState(L); - // get this - wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); - // call CloseOutput - self->CloseOutput(); - return 0; - } - // wxInputStream *GetErrorStream() const - static int LUACALL wxLua_wxProcess_GetErrorStream(lua_State *L) - { - wxLuaState wxlState(L); - wxInputStream *returns; - // get this - wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); - // call GetErrorStream - returns = self->GetErrorStream(); - // push the result datatype - wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); ! return 1; ! } ! ! // wxInputStream *GetInputStream() const ! static int LUACALL wxLua_wxProcess_GetInputStream(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxInputStream *returns; ! // get this ! wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); ! // call GetInputStream ! returns = self->GetInputStream(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxInputStream, returns); ! ! return 1; ! } ! ! // wxOutputStream *GetOutputStream() const ! static int LUACALL wxLua_wxProcess_GetOutputStream(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxOutputStream *returns; ! // get this ! wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); ! // call GetOutputStream ! returns = self->GetOutputStream(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxOutputStream, returns); ! ! return 1; ! } ! ! // bool IsErrorAvailable() const ! static int LUACALL wxLua_wxProcess_IsErrorAvailable(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); ! // call IsErrorAvailable ! returns = self->IsErrorAvailable(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! // bool IsInputAvailable() const ! static int LUACALL wxLua_wxProcess_IsInputAvailable(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); ! // call IsInputAvailable ! returns = self->IsInputAvailable(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! // bool IsInputOpened() const ! static int LUACALL wxLua_wxProcess_IsInputOpened(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); ! // call IsInputOpened ! returns = self->IsInputOpened(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! // void SetPipeStreams(wxInputStream *outStream, wxOutputStream *inStream, wxInputStream *errStream) ! static int LUACALL wxLua_wxProcess_SetPipeStreams(lua_State *L) ! { ! wxLuaState wxlState(L); ! // wxInputStream errStream ! wxInputStream * errStream = (wxInputStream *)wxlState.GetUserDataType(4, s_wxluatag_wxInputStream); ! // wxOutputStream inStream ! wxOutputStream * inStream = (wxOutputStream *)wxlState.GetUserDataType(3, s_wxluatag_wxOutputStream); ! // wxInputStream outStream ! wxInputStream * outStream = (wxInputStream *)wxlState.GetUserDataType(2, s_wxluatag_wxInputStream); ! // get this ! wxProcess * self = (wxProcess *)wxlState.GetUserDataType(1, s_wxluatag_wxProcess); ! // call SetPipeStreams ! self->SetPipeStreams(outStream, inStream, errStream); ! ! return 0; ! } #endif - - - // Map Lua Class Methods to C Binding Functions - static WXLUAMETHOD s_wxProcess_methods[] = { { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Detach", wxLua_wxProcess_Detach, 0, 0, { 0 } }, --- 307,331 ---- ! // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxProcess_methods[] = { + #if ((wxUSE_STREAMS) && (wxLUA_USE_wxProcess)) && (wxUSE_STREAMS) + { LuaMethod, "GetErrorStream", wxLua_wxProcess_GetErrorStream, 0, 0, { 0 } }, + { LuaMethod, "GetInputStream", wxLua_wxProcess_GetInputStream, 0, 0, { 0 } }, + { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, { 0 } }, + { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 } }, #endif + #if (wxUSE_STREAMS) && (wxLUA_USE_wxProcess) + { LuaMethod, "CloseOutput", wxLua_wxProcess_CloseOutput, 0, 0, { 0 } }, + { LuaMethod, "IsErrorAvailable", wxLua_wxProcess_IsErrorAvailable, 0, 0, { 0 } }, + { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, { 0 } }, + { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, { 0 } }, + #endif { LuaConstructor, "wxProcess", wxLua_wxProcess_constructor, 2, 0, { &s_wxluatag_wxEvtHandler, &s_wxluaarg_Number, 0 } }, { LuaMethod, "Detach", wxLua_wxProcess_Detach, 0, 0, { 0 } }, *************** *** 315,330 **** { LuaDelete, "wxProcess", wxLua_wxProcess_destructor, 0, 0, {0} }, { LuaMethod, "Delete", wxLua_wxProcess_Delete, 0, 0, {0} }, - - #if wxUSE_STREAMS - { LuaMethod, "CloseOutput", wxLua_wxProcess_CloseOutput, 0, 0, { 0 } }, - { LuaMethod, "GetErrorStream", wxLua_wxProcess_GetErrorStream, 0, 0, { 0 } }, - { LuaMethod, "GetInputStream", wxLua_wxProcess_GetInputStream, 0, 0, { 0 } }, - { LuaMethod, "GetOutputStream", wxLua_wxProcess_GetOutputStream, 0, 0, { 0 } }, - { LuaMethod, "IsErrorAvailable", wxLua_wxProcess_IsErrorAvailable, 0, 0, { 0 } }, - { LuaMethod, "IsInputAvailable", wxLua_wxProcess_IsInputAvailable, 0, 0, { 0 } }, - { LuaMethod, "IsInputOpened", wxLua_wxProcess_IsInputOpened, 0, 0, { 0 } }, - { LuaMethod, "SetPipeStreams", wxLua_wxProcess_SetPipeStreams, 3, 3, { &s_wxluatag_wxInputStream, &s_wxluatag_wxOutputStream, &s_wxluatag_wxInputStream, 0 } }, - #endif - }; --- 337,340 ---- *************** *** 332,335 **** --- 342,346 ---- WXLUAMETHOD* wxProcess_methods = s_wxProcess_methods; int wxProcess_methodCount = sizeof(s_wxProcess_methods)/sizeof(s_wxProcess_methods[0]); + #endif *************** *** 693,696 **** --- 704,709 ---- #endif + + #if wxLUA_USE_wxBusyCursor // ------------------------------------------------------------------------------------------------- // Bind class wxBusyCursor *************** *** 700,703 **** --- 713,742 ---- int s_wxluatag_wxBusyCursor = -1; + + #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) + // %override wxLua_wxBusyCursor_constructor + // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) + static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) + { + wxLuaState wxlState(L); + wxBusyCursor *returns; + // get number of arguments + int argCount = lua_gettop(L); + // const wxCursor cursor = wxHOURGLASS_CURSOR + + // NOTE: gcc complains that wxHOURGLASS_CURSOR is const, if changed to const MSVC complains wxBusyCursor takes non const + wxCursor * cursor = (argCount >= 1 ? (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor) : (wxCursor*)wxHOURGLASS_CURSOR); + // call constructor + returns = new wxBusyCursor(cursor); + // add to tracked memory list + wxLua_AddToTrackedMemoryList(wxlState, (wxBusyCursor *)returns); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); + + return 1; + } + + #endif + static int LUACALL wxLua_wxBusyCursor_destructor(lua_State *L) { *************** *** 726,771 **** ! #if wxLUA_USE_wxCursor ! // %override wxLua_wxBusyCursor_constructor ! // wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) ! static int LUACALL wxLua_wxBusyCursor_constructor(lua_State *L) { wxLuaState wxlState(L); ! wxBusyCursor *returns; // get number of arguments int argCount = lua_gettop(L); ! // const wxCursor cursor = wxHOURGLASS_CURSOR ! ! // NOTE: gcc complains that wxHOURGLASS_CURSOR is const, if changed to const MSVC complains wxBusyCursor takes non const ! wxCursor * cursor = (argCount >= 1 ? (wxCursor *)wxlState.GetUserDataType(1, s_wxluatag_wxCursor) : (wxCursor*)wxHOURGLASS_CURSOR); // call constructor ! returns = new wxBusyCursor(cursor); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBusyCursor *)returns); // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxBusyCursor, returns); return 1; } ! #endif - // Map Lua Class Methods to C Binding Functions - static WXLUAMETHOD s_wxBusyCursor_methods[] = { - { LuaDelete, "wxBusyCursor", wxLua_wxBusyCursor_destructor, 0, 0, {0} }, - { LuaMethod, "Delete", wxLua_wxBusyCursor_Delete, 0, 0, {0} }, - #if wxLUA_USE_wxCursor - { LuaConstructor, "wxBusyCursor", wxLua_wxBusyCursor_constructor, 1, 0, { &s_wxluatag_wxCursor, 0 } }, - #endif }; // Extern accessor to class method map ! WXLUAMETHOD* wxBusyCursor_methods = s_wxBusyCursor_methods; ! int wxBusyCursor_methodCount = sizeof(s_wxBusyCursor_methods)/sizeof(s_wxBusyCursor_methods[0]); --- 765,856 ---- ! ! ! ! // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxBusyCursor_methods[] = { ! ! #if (wxLUA_USE_wxBusyCursor) && (wxLUA_USE_wxCursor) ! { LuaConstructor, "wxBusyCursor", wxLua_wxBusyCursor_constructor, 1, 0, { &s_wxluatag_wxCursor, 0 } }, ! #endif ! ! { LuaDelete, "wxBusyCursor", wxLua_wxBusyCursor_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxBusyCursor_Delete, 0, 0, {0} }, ! }; ! ! // Extern accessor to class method map ! WXLUAMETHOD* wxBusyCursor_methods = s_wxBusyCursor_methods; ! int wxBusyCursor_methodCount = sizeof(s_wxBusyCursor_methods)/sizeof(s_wxBusyCursor_methods[0]); ! #endif ! ! ! #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO ! // ------------------------------------------------------------------------------------------------- ! // Bind class wxBusyInfo ! // ------------------------------------------------------------------------------------------------- ! ! // Lua MetaTable Tag for Class ! int s_wxluatag_wxBusyInfo = -1; ! ! // wxBusyInfo(const wxString& message, wxWindow *parent = NULL) ! static int LUACALL wxLua_wxBusyInfo_constructor(lua_State *L) { wxLuaState wxlState(L); ! wxBusyInfo *returns; // get number of arguments int argCount = lua_gettop(L); ! // wxWindow parent = NULL ! wxWindow * parent = (argCount >= 2 ? (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow) : NULL); ! // const wxString message ! const wxString message = lua2wx(wxlState.GetStringType(1)); // call constructor ! returns = new wxBusyInfo(message, parent); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxBusyInfo *)returns); // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxBusyInfo, returns); return 1; } ! static int LUACALL wxLua_wxBusyInfo_destructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxBusyInfo * self = (wxBusyInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxBusyInfo); + // remove from tracked memory list + if (self != 0) + wxlState.RemoveTrackedMemory(self); + return 0; + } + static int LUACALL wxLua_wxBusyInfo_Delete(lua_State *L) + { + wxLuaState wxlState(L); + wxBusyInfo * self = (wxBusyInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxBusyInfo); + // remove from tracked memory list + if (self != 0) + if (wxlState.RemoveTrackedMemory(self)) + { // if removed, reset the tag so that gc() is not called on this object. + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + // Map Lua Class Methods to C Binding Functions + static WXLUAMETHOD s_wxBusyInfo_methods[] = { + { LuaConstructor, "wxBusyInfo", wxLua_wxBusyInfo_constructor, 2, 1, { &s_wxluaarg_String, &s_wxluatag_wxWindow, 0 } }, + { LuaDelete, "wxBusyInfo", wxLua_wxBusyInfo_destructor, 0, 0, {0} }, + { LuaMethod, "Delete", wxLua_wxBusyInfo_Delete, 0, 0, {0} }, }; // Extern accessor to class method map ! WXLUAMETHOD* wxBusyInfo_methods = s_wxBusyInfo_methods; ! int wxBusyInfo_methodCount = sizeof(s_wxBusyInfo_methods)/sizeof(s_wxBusyInfo_methods[0]); ! #endif Index: event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** event.cpp 25 May 2006 03:55:23 -0000 1.20 --- event.cpp 25 May 2006 22:50:05 -0000 1.21 *************** *** 269,273 **** else { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid event type, expected a number for parameter %d, got '%s'."), evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); return 0; --- 269,273 ---- else { ! wxlState.terror(wxString::Format(wxT("wxLua: Disconnect: Invalid event type, expected a number for parameter %d, got '%s'."), evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); return 0; *************** *** 1283,1364 **** int wxCloseEvent_methodCount = sizeof(s_wxCloseEvent_methods)/sizeof(s_wxCloseEvent_methods[0]); - - #if !defined(__WXMAC__) - // ------------------------------------------------------------------------------------------------- - // Bind class wxDialUpEvent - // ------------------------------------------------------------------------------------------------- - - // Lua MetaTable Tag for Class - int s_wxluatag_wxDialUpEvent = -1; - - // wxDialUpEvent(bool isConnected, bool isOwnEvent) - static int LUACALL wxLua_wxDialUpEvent_constructor(lua_State *L) - { - wxLuaState wxlState(L); - wxDialUpEvent *returns; - // bool isOwnEvent - bool isOwnEvent = wxlState.GetBooleanType(2); - // bool isConnected - bool isConnected = wxlState.GetBooleanType(1); - // call constructor - returns = new wxDialUpEvent(isConnected, isOwnEvent); - // push the constructed class pointer - wxlState.PushUserDataType(s_wxluatag_wxDialUpEvent, returns); - - return 1; - } - - // bool IsConnectedEvent() const - static int LUACALL wxLua_wxDialUpEvent_IsConnectedEvent(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // get this - wxDialUpEvent * self = (wxDialUpEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDialUpEvent); - // call IsConnectedEvent - returns = self->IsConnectedEvent(); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - - // bool IsOwnEvent() const - static int LUACALL wxLua_wxDialUpEvent_IsOwnEvent(lua_State *L) - { - wxLuaState wxlState(L); - bool returns; - // get this - wxDialUpEvent * self = (wxDialUpEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxDialUpEvent); - // call IsOwnEvent - returns = self->IsOwnEvent(); - // push the result flag - lua_pushboolean(L, returns); - - return 1; - } - - static int LUACALL wxLua_wxDialUpEvent_destructor(lua_State *) - { - return 0; - } - - - - - - // Map Lua Class Methods to C Binding Functions - static WXLUAMETHOD s_wxDialUpEvent_methods[] = { - { LuaConstructor, "wxDialUpEvent", wxLua_wxDialUpEvent_constructor, 2, 2, { &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, 0 } }, - { LuaMethod, "IsConnectedEvent", wxLua_wxDialUpEvent_IsConnectedEvent, 0, 0, { 0 } }, - { LuaMethod, "IsOwnEvent", wxLua_wxDialUpEvent_... [truncated message content] |
|
From: John L. <jr...@us...> - 2006-05-25 22:50:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27299/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp Log Message: add all conditions to genwxbind.lua add more wxLUA_USE_XXX Add wxJoystick, wxBusyInfo, wxPasswordEntryDialog, wxSplashScreen remove duplicate code in wxldebug.cpp Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxldebug.cpp 2 May 2006 05:25:06 -0000 1.13 --- wxldebug.cpp 25 May 2006 22:50:05 -0000 1.14 *************** *** 24,28 **** #include "wxluadebug/include/wxldebug.h" - #include "wxlua/include/internal.h" // ---------------------------------------------------------------------------- --- 24,27 ---- *************** *** 220,266 **** wxString source; ! // get the index ! switch (lua_type(L, -2)) ! { ! case LUA_TNIL: ! name = wxT("Nil"); ! break; ! ! case LUA_TBOOLEAN: ! name = MakeBoolean(lua_toboolean(L, -2)); ! break; ! ! case LUA_TNUMBER: ! name = MakeNumber(lua_tonumber(L, -2)); ! break; ! ! case LUA_TSTRING: ! name = lua2wx(lua_tostring(L, -2)); ! break; ! ! case LUA_TTABLE: ! name = GetTableInfo(wxlState, -2); ! break; ! ! case LUA_TFUNCTION: ! if (lua_iscfunction(L, -2)) ! name.Printf(wxT("%p"), lua_tocfunction(L, -2)); ! else ! name.Printf(wxT("%p"), lua_topointer(L, -2)); ! break; ! ! case LUA_TUSERDATA: ! name = GetUserDataInfo(wxlState, -2); ! break; ! ! case LUA_TLIGHTUSERDATA: ! name = GetUserDataInfo(wxlState, -2, false); ! break; ! ! case LUA_TTHREAD: ! name.Printf(wxT("%p"), lua_topointer(L, -2)); ! break; ! } ! // get the type and value GetTypeValue(wxlState, -1, type, value); --- 219,224 ---- wxString source; ! // get the index, just want the name=value, type is dummy here ! GetTypeValue(wxlState, -2, type, name); // get the type and value GetTypeValue(wxlState, -1, type, value); *************** *** 295,299 **** wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); lua_State* L = wxlState.GetLuaState(); ! int l_type = lua_type(L, -1); switch (l_type) --- 253,257 ---- wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); lua_State* L = wxlState.GetLuaState(); ! int l_type = lua_type(L, index); switch (l_type) *************** *** 306,337 **** case LUA_TBOOLEAN: type = wxT("Boolean"); ! value = MakeBoolean(lua_toboolean(L, -1)); break; case LUA_TNUMBER: type = wxT("Number"); ! value = MakeNumber(lua_tonumber(L, -1)); break; case LUA_TSTRING: type = wxT("String"); ! value = lua2wx(lua_tostring(L, -1)); break; case LUA_TTABLE: type = wxT("Table"); ! value = GetTableInfo(wxlState, -1); break; case LUA_TFUNCTION: ! if (lua_iscfunction(L, -1)) { type = wxT("C Function"); ! value.Printf(wxT("%p"), lua_tocfunction(L, -1)); } else { type = wxT("Lua Function"); ! value.Printf(wxT("%p"), lua_topointer(L, -1)); } break; --- 264,295 ---- case LUA_TBOOLEAN: type = wxT("Boolean"); ! value = MakeBoolean(lua_toboolean(L, index)); break; case LUA_TNUMBER: type = wxT("Number"); ! value = MakeNumber(lua_tonumber(L, index)); break; case LUA_TSTRING: type = wxT("String"); ! value = lua2wx(lua_tostring(L, index)); break; case LUA_TTABLE: type = wxT("Table"); ! value = GetTableInfo(wxlState, index); break; case LUA_TFUNCTION: ! if (lua_iscfunction(L, index)) { type = wxT("C Function"); ! value.Printf(wxT("0x%p"), lua_tocfunction(L, index)); } else { type = wxT("Lua Function"); ! value.Printf(wxT("0x%p"), lua_topointer(L, index)); } break; *************** *** 339,353 **** case LUA_TUSERDATA: type = wxT("User Data"); ! value = GetUserDataInfo(wxlState, -1); break; case LUA_TLIGHTUSERDATA: type = wxT("Light User Data"); ! value = GetUserDataInfo(wxlState, -1, false); break; case LUA_TTHREAD: type = wxT("Thread"); ! value.Printf(wxT("%p"), lua_topointer(L, -1)); break; } --- 297,311 ---- case LUA_TUSERDATA: type = wxT("User Data"); ! value = GetUserDataInfo(wxlState, index); break; case LUA_TLIGHTUSERDATA: type = wxT("Light User Data"); ! value = GetUserDataInfo(wxlState, index, false); break; case LUA_TTHREAD: type = wxT("Thread"); ! value.Printf(wxT("0x%p"), lua_topointer(L, index)); break; } *************** *** 383,389 **** if (nItems == 0) ! return wxString::Format(wxT("%p"), pItem); ! return wxString::Format(wxT("%p (approx %u items)"), pItem, nItems); } --- 341,347 ---- if (nItems == 0) ! return wxString::Format(wxT("0x%p"), pItem); ! return wxString::Format(wxT("0x%p (approx %u items)"), pItem, nItems); } *************** *** 402,411 **** if (pTagName != NULL) ! return wxString::Format(wxT("%p (%s)"), lua_touserdata(L, index), lua2wx(pTagName).c_str()); ! return wxString::Format(wxT("%p (%u)"), lua_touserdata(L, index), nTag); } ! return wxString::Format(wxT("%p"), lua_touserdata(L, index)); } --- 360,369 ---- if (pTagName != NULL) ! return wxString::Format(wxT("0x%p (%s)"), lua_touserdata(L, index), lua2wx(pTagName).c_str()); ! return wxString::Format(wxT("0x%p (%u)"), lua_touserdata(L, index), nTag); } ! return wxString::Format(wxT("0x%p"), lua_touserdata(L, index)); } |
|
From: John L. <jr...@us...> - 2006-05-25 22:50:19
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27299/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: add all conditions to genwxbind.lua add more wxLUA_USE_XXX Add wxJoystick, wxBusyInfo, wxPasswordEntryDialog, wxSplashScreen remove duplicate code in wxldebug.cpp Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wxluasetup.h 24 May 2006 04:50:01 -0000 1.7 --- wxluasetup.h 25 May 2006 22:50:05 -0000 1.8 *************** *** 15,18 **** --- 15,20 ---- #define wxLUA_USE_wxBitmapButton 1 #define wxLUA_USE_wxBrushList 1 + #define wxLUA_USE_wxBusyCursor 1 + #define wxLUA_USE_wxBusyInfo 1 #define wxLUA_USE_wxButton 1 #define wxLUA_USE_wxCalendarCtrl 1 *************** *** 51,54 **** --- 53,57 ---- #define wxLUA_USE_wxFrame 1 #define wxLUA_USE_wxGauge 1 + #define wxLUA_USE_wxGenericDirCtrl 1 #define wxLUA_USE_wxGenericValidator 1 #define wxLUA_USE_wxGLCanvas 0 *************** *** 62,65 **** --- 65,69 ---- #define wxLUA_USE_wxImage 1 #define wxLUA_USE_wxImageList 1 + #define wxLUA_USE_wxJoystick 1 #define wxLUA_USE_wxLayoutConstraints 1 #define wxLUA_USE_wxList 1 *************** *** 74,77 **** --- 78,82 ---- #define wxLUA_USE_wxMetafile 1 #define wxLUA_USE_wxMiniFrame 1 + #define wxLUA_USE_wxMultiChoiceDialog 1 #define wxLUA_USE_wxNotebook 1 #define wxLUA_USE_wxObject 1 *************** *** 80,83 **** --- 85,89 ---- #define wxLUA_USE_wxPointSizeRect 1 #define wxLUA_USE_wxPrint 1 + #define wxLUA_USE_wxProcess 1 #define wxLUA_USE_wxProgressDialog 1 #define wxLUA_USE_wxRadioBox 1 *************** *** 94,97 **** --- 100,104 ---- #define wxLUA_USE_wxSpinButton 1 #define wxLUA_USE_wxSpinCtrl 1 + #define wxLUA_USE_wxSplashScreen 1 #define wxLUA_USE_wxSplitterWindow 1 #define wxLUA_USE_wxStaticBitmap 1 *************** *** 101,104 **** --- 108,112 ---- #define wxLUA_USE_wxStatusBar 1 #define wxLUA_USE_wxStringList 1 + #define wxLUA_USE_wxSystemOptions 1 #define wxLUA_USE_wxSystemSettings 1 #define wxLUA_USE_wxTabCtrl 0 *************** *** 109,112 **** --- 117,121 ---- #define wxLUA_USE_wxTimer 1 #define wxLUA_USE_wxTimeSpan 1 + #define wxLUA_USE_wxToggleButton 1 #define wxLUA_USE_wxToolbar 1 #define wxLUA_USE_wxTooltip 1 |
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27299/wxLua/bindings/wxwidgets Modified Files: appframe.i controls.i defsutil.i dialogs.i event.i gdi.i override.hpp wave.i wx_datatypes.lua Log Message: add all conditions to genwxbind.lua add more wxLUA_USE_XXX Add wxJoystick, wxBusyInfo, wxPasswordEntryDialog, wxSplashScreen remove duplicate code in wxldebug.cpp Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** wave.i 17 May 2006 05:02:04 -0000 1.8 --- wave.i 25 May 2006 22:50:05 -0000 1.9 *************** *** 61,64 **** --- 61,66 ---- %endif // %msw&!%wxchkver25 + %endif wxLUA_USE_wxWave + //----------------------------------------------------------------------------- // wxMediaCtrl *************** *** 123,124 **** --- 125,219 ---- %endif //wxLUA_USE_wxMediaCtrl & wxUSE_MEDIACTRL + //----------------------------------------------------------------------------- + // wxJoystick + + %if wxLUA_USE_wxJoystick|wxUSE_JOYSTICK + + %include "wx/joystick.h" + + %enum + wxJOYSTICK1 + wxJOYSTICK2 + %endenum + + %enum + wxJOY_BUTTON_ANY + wxJOY_BUTTON1 + wxJOY_BUTTON2 + wxJOY_BUTTON3 + wxJOY_BUTTON4 + %endenum + + %class %delete wxJoystick, wxObject + wxJoystick(int joystick = wxJOYSTICK1) + + int GetButtonState() const + int GetManufacturerId() const + int GetMovementThreshold() const + int GetNumberAxes() const + int GetNumberButtons() const + int GetNumberJoysticks() const + int GetPollingMax() const + int GetPollingMin() const + int GetProductId() const + wxString GetProductName() const + wxPoint GetPosition() const + int GetPOVPosition() const + int GetPOVCTSPosition() const + int GetRudderMax() const + int GetRudderMin() const + int GetRudderPosition() const + int GetUMax() const + int GetUMin() const + int GetUPosition() const + int GetVMax() const + int GetVMin() const + int GetVPosition() const + int GetXMax() const + int GetXMin() const + int GetYMax() const + int GetYMin() const + int GetZMax() const + int GetZMin() const + int GetZPosition() const + bool HasPOV() const + bool HasPOV4Dir() const + bool HasPOVCTS() const + bool HasRudder() const + bool HasU() const + bool HasV() const + bool HasZ() const + bool IsOk() const + bool ReleaseCapture() + bool SetCapture(wxWindow* win, int pollingFreq = 0) + void SetMovementThreshold(int threshold) + %endclass + + //----------------------------------------------------------------------------- + // wxJoystickEvent - FIXME add rest of wxJoystick? + + %include "wx/event.h" + + %class %delete wxJoystickEvent, wxEvent + %define %event wxEVT_JOY_BUTTON_DOWN + %define %event wxEVT_JOY_BUTTON_UP + %define %event wxEVT_JOY_MOVE + %define %event wxEVT_JOY_ZMOVE + + wxJoystickEvent(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0) + + bool ButtonDown(int button = wxJOY_BUTTON_ANY) const + bool ButtonIsDown(int button = wxJOY_BUTTON_ANY) const + bool ButtonUp(int button = wxJOY_BUTTON_ANY) const + int GetButtonChange() const + int GetButtonState() const + int GetJoystick() const + wxPoint GetPosition() const + int GetZPosition() const + bool IsButton() const + bool IsMove() const + bool IsZMove() const + %endclass + + %endif wxLUA_USE_wxJoystick|wxUSE_JOYSTICK + Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wx_datatypes.lua 24 May 2006 04:50:00 -0000 1.32 --- wx_datatypes.lua 25 May 2006 22:50:05 -0000 1.33 *************** *** 337,344 **** --- 337,352 ---- }, wxBusyCursor = { + Condition = "wxLUA_USE_wxBusyCursor", DefType = "class", Intrinsic = false, Name = "wxBusyCursor", }, + wxBusyInfo = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO", + DefType = "class", + Intrinsic = false, + Name = "wxBusyInfo", + }, wxButton = { BaseClass = "wxControl", *************** *** 502,505 **** --- 510,519 ---- Name = "wxColourData", }, + wxColourDatabase = { + Condition = "wxLUA_USE_wxColourPenBrush", + DefType = "class", + Intrinsic = false, + Name = "wxColourDatabase", + }, wxColourDialog = { BaseClass = "wxDialog", *************** *** 563,567 **** wxControlWithItems = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox", DefType = "class", Intrinsic = false, --- 577,581 ---- wxControlWithItems = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox", DefType = "class", Intrinsic = false, *************** *** 686,696 **** Name = "wxDateTime::WeekDay", }, - wxDialUpEvent = { - BaseClass = "wxCommandEvent", - Condition = "!defined(__WXMAC__)", - DefType = "class", - Intrinsic = false, - Name = "wxDialUpEvent", - }, wxDialog = { BaseClass = "wxTopLevelWindow", --- 700,703 ---- *************** *** 1111,1114 **** --- 1118,1128 ---- Name = "wxGauge", }, + wxGenericDirCtrl = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG", + DefType = "class", + Intrinsic = false, + Name = "wxGenericDirCtrl", + }, wxGenericValidator = { BaseClass = "wxValidator", *************** *** 1590,1595 **** --- 1604,1617 ---- Name = "wxJPEGHandler", }, + wxJoystick = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK", + DefType = "class", + Intrinsic = false, + Name = "wxJoystick", + }, wxJoystickEvent = { BaseClass = "wxEvent", + Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK", DefType = "class", Intrinsic = false, *************** *** 1614,1617 **** --- 1636,1640 ---- }, wxKillError = { + Condition = "wxLUA_USE_wxProcess", DefType = "enum", Intrinsic = true, *************** *** 1794,1798 **** wxMediaCtrl = { BaseClass = "wxControl", ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "class", Intrinsic = false, --- 1817,1821 ---- wxMediaCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "class", Intrinsic = false, *************** *** 1800,1804 **** }, wxMediaCtrlPlayerControls = { ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "enum", Intrinsic = true, --- 1823,1827 ---- }, wxMediaCtrlPlayerControls = { ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "enum", Intrinsic = true, *************** *** 1807,1811 **** wxMediaEvent = { BaseClass = "wxNotifyEvent", ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "class", Intrinsic = false, --- 1830,1834 ---- wxMediaEvent = { BaseClass = "wxNotifyEvent", ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "class", Intrinsic = false, *************** *** 1813,1817 **** }, wxMediaState = { ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "enum", Intrinsic = true, --- 1836,1840 ---- }, wxMediaState = { ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "enum", Intrinsic = true, *************** *** 1926,1929 **** --- 1949,1953 ---- wxMultiChoiceDialog = { BaseClass = "wxDialog", + Condition = "wxLUA_USE_wxMultiChoiceDialog", DefType = "class", Intrinsic = false, *************** *** 2060,2063 **** --- 2084,2094 ---- Name = "wxPaperSize", }, + wxPasswordEntryDialog = { + BaseClass = "wxTextEntryDialog", + Condition = "wxLUA_USE_wxTextEntryDialog", + DefType = "class", + Intrinsic = false, + Name = "wxPasswordEntryDialog", + }, wxPathFormat = { Condition = "wxLUA_USE_wxFileName", *************** *** 2207,2210 **** --- 2238,2242 ---- wxProcess = { BaseClass = "wxEvtHandler", + Condition = "wxLUA_USE_wxProcess", DefType = "class", Intrinsic = false, *************** *** 2387,2390 **** --- 2419,2423 ---- }, wxSignal = { + Condition = "wxLUA_USE_wxProcess", DefType = "enum", Intrinsic = true, *************** *** 2524,2527 **** --- 2557,2574 ---- Name = "wxSpinEvent", }, + wxSplashScreen = { + BaseClass = "wxFrame", + Condition = "wxLUA_USE_wxSplashScreen", + DefType = "class", + Intrinsic = false, + Name = "wxSplashScreen", + }, + wxSplashScreenWindow = { + BaseClass = "wxWindow", + Condition = "wxLUA_USE_wxSplashScreen", + DefType = "class", + Intrinsic = false, + Name = "wxSplashScreenWindow", + }, wxSplitterEvent = { BaseClass = "wxCommandEvent", *************** *** 2645,2649 **** wxSystemOptions = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSystemSettings", DefType = "class", Intrinsic = false, --- 2692,2696 ---- wxSystemOptions = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSystemOptions", DefType = "class", Intrinsic = false, *************** *** 2770,2774 **** wxToggleButton = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxButton", DefType = "class", Intrinsic = false, --- 2817,2821 ---- wxToggleButton = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxToggleButton", DefType = "class", Intrinsic = false, *************** *** 3176,3181 **** WXWIN_COMPATIBILITY_2_6 = "WXWIN_COMPATIBILITY_2_6", WXWIN_COMPATIBILITY_2_8 = "WXWIN_COMPATIBILITY_2_8", - wxLUA_USE_CODEDRAGON = "wxLUA_USE_CODEDRAGON", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_MDI = "wxLUA_USE_MDI", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", --- 3223,3228 ---- WXWIN_COMPATIBILITY_2_6 = "WXWIN_COMPATIBILITY_2_6", WXWIN_COMPATIBILITY_2_8 = "WXWIN_COMPATIBILITY_2_8", wxLUA_USE_FL = "wxLUA_USE_FL", + wxLUA_USE_Geometry = "wxLUA_USE_Geometry", wxLUA_USE_MDI = "wxLUA_USE_MDI", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", *************** *** 3183,3189 **** --- 3230,3239 ---- wxLUA_USE_wxArrayInt = "wxLUA_USE_wxArrayInt", wxLUA_USE_wxArrayString = "wxLUA_USE_wxArrayString", + wxLUA_USE_wxArtProvider = "wxLUA_USE_wxArtProvider", wxLUA_USE_wxBitmap = "wxLUA_USE_wxBitmap", wxLUA_USE_wxBitmapButton = "wxLUA_USE_wxBitmapButton", wxLUA_USE_wxBrushList = "wxLUA_USE_wxBrushList", + wxLUA_USE_wxBusyCursor = "wxLUA_USE_wxBusyCursor", + wxLUA_USE_wxBusyInfo = "wxLUA_USE_wxBusyInfo", wxLUA_USE_wxButton = "wxLUA_USE_wxButton", wxLUA_USE_wxCalendarCtrl = "wxLUA_USE_wxCalendarCtrl", *************** *** 3199,3202 **** --- 3249,3254 ---- wxLUA_USE_wxCommandProcessor = "wxLUA_USE_wxCommandProcessor", wxLUA_USE_wxConfig = "wxLUA_USE_wxConfig", + wxLUA_USE_wxCriticalSection = "wxLUA_USE_wxCriticalSection", + wxLUA_USE_wxCriticalSectionLocker = "wxLUA_USE_wxCriticalSectionLocker", wxLUA_USE_wxCursor = "wxLUA_USE_wxCursor", wxLUA_USE_wxDC = "wxLUA_USE_wxDC", *************** *** 3221,3224 **** --- 3273,3277 ---- wxLUA_USE_wxGLCanvas = "wxLUA_USE_wxGLCanvas", wxLUA_USE_wxGauge = "wxLUA_USE_wxGauge", + wxLUA_USE_wxGenericDirCtrl = "wxLUA_USE_wxGenericDirCtrl", wxLUA_USE_wxGenericValidator = "wxLUA_USE_wxGenericValidator", wxLUA_USE_wxGrid = "wxLUA_USE_wxGrid", *************** *** 3231,3234 **** --- 3284,3288 ---- wxLUA_USE_wxImage = "wxLUA_USE_wxImage", wxLUA_USE_wxImageList = "wxLUA_USE_wxImageList", + wxLUA_USE_wxJoystick = "wxLUA_USE_wxJoystick", wxLUA_USE_wxLayoutConstraints = "wxLUA_USE_wxLayoutConstraints", wxLUA_USE_wxList = "wxLUA_USE_wxList", *************** *** 3243,3246 **** --- 3297,3301 ---- wxLUA_USE_wxMetafile = "wxLUA_USE_wxMetafile", wxLUA_USE_wxMiniFrame = "wxLUA_USE_wxMiniFrame", + wxLUA_USE_wxMultiChoiceDialog = "wxLUA_USE_wxMultiChoiceDialog", wxLUA_USE_wxNotebook = "wxLUA_USE_wxNotebook", wxLUA_USE_wxObject = "wxLUA_USE_wxObject", *************** *** 3249,3252 **** --- 3304,3308 ---- wxLUA_USE_wxPointSizeRect = "wxLUA_USE_wxPointSizeRect", wxLUA_USE_wxPrint = "wxLUA_USE_wxPrint", + wxLUA_USE_wxProcess = "wxLUA_USE_wxProcess", wxLUA_USE_wxProgressDialog = "wxLUA_USE_wxProgressDialog", wxLUA_USE_wxRadioBox = "wxLUA_USE_wxRadioBox", *************** *** 3263,3266 **** --- 3319,3323 ---- wxLUA_USE_wxSpinButton = "wxLUA_USE_wxSpinButton", wxLUA_USE_wxSpinCtrl = "wxLUA_USE_wxSpinCtrl", + wxLUA_USE_wxSplashScreen = "wxLUA_USE_wxSplashScreen", wxLUA_USE_wxSplitterWindow = "wxLUA_USE_wxSplitterWindow", wxLUA_USE_wxStaticBitmap = "wxLUA_USE_wxStaticBitmap", *************** *** 3270,3273 **** --- 3327,3331 ---- wxLUA_USE_wxStatusBar = "wxLUA_USE_wxStatusBar", wxLUA_USE_wxStringList = "wxLUA_USE_wxStringList", + wxLUA_USE_wxSystemOptions = "wxLUA_USE_wxSystemOptions", wxLUA_USE_wxSystemSettings = "wxLUA_USE_wxSystemSettings", wxLUA_USE_wxTabCtrl = "wxLUA_USE_wxTabCtrl", *************** *** 3278,3281 **** --- 3336,3340 ---- wxLUA_USE_wxTimeSpan = "wxLUA_USE_wxTimeSpan", wxLUA_USE_wxTimer = "wxLUA_USE_wxTimer", + wxLUA_USE_wxToggleButton = "wxLUA_USE_wxToggleButton", wxLUA_USE_wxToolbar = "wxLUA_USE_wxToolbar", wxLUA_USE_wxTooltip = "wxLUA_USE_wxTooltip", Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** appframe.i 17 May 2006 22:47:09 -0000 1.17 --- appframe.i 25 May 2006 22:50:04 -0000 1.18 *************** *** 470,475 **** %endclass //----------------------------------------------------------------------------- ! // wxSystemOptions - FIXME add wxLUA_USE_wxSystemOptions %include "wx/sysopt.h" --- 470,479 ---- %endclass + %endif wxLUA_USE_wxSystemSettings + //----------------------------------------------------------------------------- ! // wxSystemOptions ! ! %if wxLUA_USE_wxSystemOptions %include "wx/sysopt.h" *************** *** 486,488 **** %endclass ! %endif wxLUA_USE_wxSystemSettings --- 490,492 ---- %endclass ! %endif wxLUA_USE_wxSystemOptions Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** gdi.i 18 May 2006 05:47:39 -0000 1.24 --- gdi.i 25 May 2006 22:50:04 -0000 1.25 *************** *** 462,465 **** --- 462,476 ---- //----------------------------------------------------------------------------- + // wxColourDatabase + + %class %delete %noclassinfo %encapsulate wxColourDatabase + wxColourDatabase() + + wxColour Find(const wxString& name) const + wxString FindName(const wxColour& colour) const + void AddColour(const wxString& name, const wxColour& colour) + %endclass + + //----------------------------------------------------------------------------- // wxPen Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** override.hpp 25 May 2006 04:44:10 -0000 1.46 --- override.hpp 25 May 2006 22:50:04 -0000 1.47 *************** *** 818,826 **** %override wxLua_wxTreeItemId_GetValue ! // double GetValue() const; static int LUACALL wxLua_wxTreeItemId_GetValue(lua_State *L) { wxLuaState wxlState(L); ! double returns; // get this wxTreeItemId *self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); --- 818,826 ---- %override wxLua_wxTreeItemId_GetValue ! // long GetValue() const; static int LUACALL wxLua_wxTreeItemId_GetValue(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxTreeItemId *self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); *************** *** 834,853 **** %end - %override wxLua_wxTreeItemId_SetValue - // void SetValue(double value); - static int LUACALL wxLua_wxTreeItemId_SetValue(lua_State *L) - { - wxLuaState wxlState(L); - // double value - long value = (long)wxlState.GetNumberType(2); - // get this - wxTreeItemId *self = (wxTreeItemId *)wxlState.GetUserDataType(1, s_wxluatag_wxTreeItemId); - // call SetValue - self->m_pItem = (void *) value; - // return the number of parameters - return 0; - } - %end - %override wxLua_wxTreeCtrl_GetFirstChild // wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const --- 834,837 ---- Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** dialogs.i 17 May 2006 05:02:04 -0000 1.18 --- dialogs.i 25 May 2006 22:50:04 -0000 1.19 *************** *** 224,227 **** --- 224,229 ---- // wxMultiChoiceDialog - use wxGetMultipleChoices + %if wxLUA_USE_wxMultiChoiceDialog + %class wxMultiChoiceDialog, wxDialog wxMultiChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) *************** *** 232,235 **** --- 234,239 ---- %endclass + %endif wxLUA_USE_wxMultiChoiceDialog + //----------------------------------------------------------------------------- // wxSingleChoiceDialog - use wxGetSingleChoice or wxGetSingleChoiceIndex *************** *** 253,260 **** //----------------------------------------------------------------------------- ! // wxTextEntryDialog - use wxGetTextFromUser %if wxLUA_USE_wxTextEntryDialog %class wxTextEntryDialog, wxDialog wxTextEntryDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Please enter text", const wxString& defaultValue = "", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition) --- 257,266 ---- //----------------------------------------------------------------------------- ! // wxTextEntryDialog - see also wxGetTextFromUser %if wxLUA_USE_wxTextEntryDialog + %define wxTextEntryDialogStyle + %class wxTextEntryDialog, wxDialog wxTextEntryDialog(wxWindow* parent, const wxString& message, const wxString& caption = "Please enter text", const wxString& defaultValue = "", long style = wxOK | wxCANCEL | wxCENTRE, const wxPoint& pos = wxDefaultPosition) *************** *** 267,270 **** --- 273,284 ---- %endclass + //----------------------------------------------------------------------------- + // wxPasswordEntryDialog - see also wxGetPasswordFromUser + + %class wxPasswordEntryDialog, wxTextEntryDialog + wxPasswordEntryDialog(wxWindow *parent, const wxString& message, const wxString& caption = wxGetPasswordFromUserPromptStr, const wxString& value = "", long style = wxTextEntryDialogStyle, const wxPoint& pos = wxDefaultPosition) + + %endclass + %endif wxLUA_USE_wxTextEntryDialog *************** *** 428,431 **** --- 442,476 ---- // %endclass + + //----------------------------------------------------------------------------- + // wxSplashScreen + + %if wxLUA_USE_wxSplashScreen + + %include "wx/splash.h" + + %define wxSPLASH_CENTRE_ON_PARENT + %define wxSPLASH_CENTRE_ON_SCREEN + %define wxSPLASH_NO_CENTRE + %define wxSPLASH_TIMEOUT + %define wxSPLASH_NO_TIMEOUT + + %class wxSplashScreen, wxFrame + wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxSIMPLE_BORDER|wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP) + + long GetSplashStyle() const + wxSplashScreenWindow* GetSplashWindow() const + int GetTimeout() const + %endclass + + %class wxSplashScreenWindow, wxWindow + // don't need to create this, just get it from wxSplashScreen + + void SetBitmap(const wxBitmap& bitmap) + wxBitmap& GetBitmap() + %endclass + + %endif wxLUA_USE_wxSplashScreen + //----------------------------------------------------------------------------- // wxWizard Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** controls.i 18 May 2006 05:47:39 -0000 1.19 --- controls.i 25 May 2006 22:50:04 -0000 1.20 *************** *** 67,71 **** // wxToggleButton ! %if wxLUA_USE_wxButton %include "wx/tglbtn.h" --- 67,71 ---- // wxToggleButton ! %if wxLUA_USE_wxToggleButton %include "wx/tglbtn.h" *************** *** 82,86 **** %endclass ! %endif wxLUA_USE_wxButton //----------------------------------------------------------------------------- --- 82,86 ---- %endclass ! %endif wxLUA_USE_wxToggleButton //----------------------------------------------------------------------------- *************** *** 121,125 **** // wxControlWithItems ! %if wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox %include "wx/ctrlsub.h" --- 121,125 ---- // wxControlWithItems ! %if wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox %include "wx/ctrlsub.h" *************** *** 158,162 **** %endclass ! %endif wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox //----------------------------------------------------------------------------- --- 158,162 ---- %endclass ! %endif wxLUA_USE_wxChoice|wxLUA_USE_wxComboBox|wxLUA_USE_wxListBox //----------------------------------------------------------------------------- *************** *** 1173,1184 **** %overload %constructor wxTreeItemIdCopy(const wxTreeItemId& id) ! bool IsOk() ! double GetValue() const ! void SetValue(double value) // probably DON'T USE! %operator wxTreeItemId& operator=(const wxTreeItemId& otherId) %operator bool operator==(const wxTreeItemId& otherId) const ! %property=Value, read, write %endclass --- 1173,1183 ---- %overload %constructor wxTreeItemIdCopy(const wxTreeItemId& id) ! bool IsOk() ! long GetValue() const // get a pointer to the internal data to use as a reference %operator wxTreeItemId& operator=(const wxTreeItemId& otherId) %operator bool operator==(const wxTreeItemId& otherId) const ! %property=Value, read %endclass *************** *** 1219,1222 **** --- 1218,1222 ---- wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0) + int GetKeyCode() const wxTreeItemId GetItem() const *************** *** 1236,1237 **** --- 1236,1281 ---- %endif wxLUA_USE_wxTreeCtrl + + //----------------------------------------------------------------------------- + // wxGenericDirCtrl + + %if wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG + + %include "wx/dirctrl.h" + + %enum + wxDIRCTRL_DIR_ONLY + wxDIRCTRL_SELECT_FIRST + wxDIRCTRL_SHOW_FILTERS + wxDIRCTRL_3D_INTERNAL + wxDIRCTRL_EDIT_LABELS + %endenum + + %class wxGenericDirCtrl, wxControl + %constructor wxGenericDirCtrlDefault() + wxGenericDirCtrl(wxWindow *parent, const wxWindowID id = wxID_ANY, const wxString &dir = wxDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, const wxString& filter = "", int defaultFilter = 0, const wxString& name = "wxGenericDirCtrl") + + bool Create(wxWindow *parent, const wxWindowID id = wxID_ANY, const wxString &dir = wxDirDialogDefaultFolderStr, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDIRCTRL_3D_INTERNAL|wxSUNKEN_BORDER, const wxString& filter = "", int defaultFilter = 0, const wxString& name = "wxGenericDirCtrl") + void CollapseTree() + bool ExpandPath(const wxString& path) + wxString GetDefaultPath() const + wxString GetPath() const + wxString GetFilePath() const + wxString GetFilter() const + int GetFilterIndex() const + //wxDirFilterListCtrl* GetFilterListCtrl() const + wxTreeItemId GetRootId() + wxTreeCtrl* GetTreeCtrl() const + void ReCreateTree() + void SetDefaultPath(const wxString& path) + void SetFilter(const wxString& filter) + void SetFilterIndex(int n) + void SetPath(const wxString& path) + void ShowHidden( bool show ) + bool GetShowHidden() + + //wxTreeItemId FindChild(wxTreeItemId parentId, const wxString& path, bool& done) + + %endclass + + %endif wxLUA_USE_wxGenericDirCtrl&wxUSE_DIRDLG Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** defsutil.i 17 May 2006 05:02:04 -0000 1.23 --- defsutil.i 25 May 2006 22:50:04 -0000 1.24 *************** *** 25,28 **** --- 25,30 ---- // wxProcess + %if wxLUA_USE_wxProcess + %enum wxEXEC_ASYNC *************** *** 90,93 **** --- 92,97 ---- %endclass + %endif wxLUA_USE_wxProcess + //----------------------------------------------------------------------------- // Process control functions *************** *** 573,576 **** --- 577,582 ---- // wxBusyCursor + %if wxLUA_USE_wxBusyCursor + %include "wx/utils.h" *************** *** 579,580 **** --- 585,602 ---- wxBusyCursor(wxCursor* cursor = wxHOURGLASS_CURSOR) %endclass + + %endif wxLUA_USE_wxBusyCursor + + //----------------------------------------------------------------------------- + // wxBusyInfo + + %if wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO + + %include "wx/busyinfo.h" + + %class %delete %noclassinfo wxBusyInfo, wxObject + // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough + wxBusyInfo(const wxString& message, wxWindow *parent = NULL) + %endclass + + %endif wxLUA_USE_wxBusyInfo&wxUSE_BUSYINFO Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** event.i 25 May 2006 03:55:22 -0000 1.15 --- event.i 25 May 2006 22:50:04 -0000 1.16 *************** *** 190,205 **** // wxDialUpEvent - TODO - the rest of wxDialUp is missing, anyone care? ! %if !%mac ! %include "wx/dialup.h" ! %class %noclassinfo wxDialUpEvent, wxCommandEvent ! %define %event wxEVT_DIALUP_CONNECTED ! %define %event wxEVT_DIALUP_DISCONNECTED ! wxDialUpEvent(bool isConnected, bool isOwnEvent) ! bool IsConnectedEvent() const ! bool IsOwnEvent() const ! %endclass ! %endif //----------------------------------------------------------------------------- --- 190,205 ---- // wxDialUpEvent - TODO - the rest of wxDialUp is missing, anyone care? ! //%if !%mac ! //%include "wx/dialup.h" ! //%class %noclassinfo wxDialUpEvent, wxCommandEvent ! // %define %event wxEVT_DIALUP_CONNECTED ! // %define %event wxEVT_DIALUP_DISCONNECTED ! // wxDialUpEvent(bool isConnected, bool isOwnEvent) ! // bool IsConnectedEvent() const ! // bool IsOwnEvent() const ! //%endclass ! //%endif //----------------------------------------------------------------------------- *************** *** 400,429 **** //----------------------------------------------------------------------------- - // wxJoystickEvent - FIXME add rest of wxJoystick? - - %include "wx/event.h" - - %class %delete wxJoystickEvent, wxEvent - %define %event wxEVT_JOY_BUTTON_DOWN - %define %event wxEVT_JOY_BUTTON_UP - %define %event wxEVT_JOY_MOVE - %define %event wxEVT_JOY_ZMOVE - - wxJoystickEvent(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0) - - bool ButtonDown(int button = wxJOY_BUTTON_ANY) const - bool ButtonIsDown(int button = wxJOY_BUTTON_ANY) const - bool ButtonUp(int button = wxJOY_BUTTON_ANY) const - int GetButtonChange() const - int GetButtonState() const - int GetJoystick() const - wxPoint GetPosition() const - int GetZPosition() const - bool IsButton() const - bool IsMove() const - bool IsZMove() const - %endclass - - //----------------------------------------------------------------------------- // wxMouseEvent --- 400,403 ---- |
|
From: John L. <jr...@us...> - 2006-05-25 22:50:18
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27299/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: add all conditions to genwxbind.lua add more wxLUA_USE_XXX Add wxJoystick, wxBusyInfo, wxPasswordEntryDialog, wxSplashScreen remove duplicate code in wxldebug.cpp Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** wxbind.h 24 May 2006 04:50:00 -0000 1.30 --- wxbind.h 25 May 2006 22:50:05 -0000 1.31 *************** *** 42,50 **** - #if !defined(__WXMAC__) - #include "wx/dialup.h" - #endif - - #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) #include "wx/generic/helpext.h" --- 42,45 ---- *************** *** 118,126 **** - #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) - #include "wx/mediactrl.h" - #endif - - #if (wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame) #include "wx/minifram.h" --- 113,116 ---- *************** *** 198,204 **** #if wxLUA_USE_wxButton #include "wx/button.h" - #include "wx/tglbtn.h" #endif --- 188,203 ---- + #if wxLUA_USE_wxBusyCursor + #include "wx/utils.h" + #endif + + + #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO + #include "wx/busyinfo.h" + #endif + + #if wxLUA_USE_wxButton #include "wx/button.h" #endif *************** *** 225,229 **** ! #if wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox #include "wx/ctrlsub.h" #endif --- 224,228 ---- ! #if wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox #include "wx/ctrlsub.h" #endif *************** *** 388,391 **** --- 387,395 ---- + #if wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG + #include "wx/dirctrl.h" + #endif + + #if wxLUA_USE_wxGenericValidator #include "wx/valgen.h" *************** *** 426,429 **** --- 430,439 ---- + #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK + #include "wx/event.h" + #include "wx/joystick.h" + #endif + + #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) #include "wx/layout.h" *************** *** 456,459 **** --- 466,474 ---- + #if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL + #include "wx/mediactrl.h" + #endif + + #if wxLUA_USE_wxMenu #include "wx/event.h" *************** *** 563,566 **** --- 578,586 ---- + #if wxLUA_USE_wxSplashScreen + #include "wx/splash.h" + #endif + + #if wxLUA_USE_wxSplitterWindow #include "wx/splitter.h" *************** *** 593,599 **** #if wxLUA_USE_wxSystemSettings #include "wx/settings.h" - #include "wx/sysopt.h" #endif --- 613,623 ---- + #if wxLUA_USE_wxSystemOptions + #include "wx/sysopt.h" + #endif + + #if wxLUA_USE_wxSystemSettings #include "wx/settings.h" #endif *************** *** 624,627 **** --- 648,656 ---- + #if wxLUA_USE_wxToggleButton + #include "wx/tglbtn.h" + #endif + + #if wxLUA_USE_wxToolbar #include "wx/tbarbase.h" *************** *** 664,672 **** // Lua Tag Method Values for each Class - #if !defined(__WXMAC__) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDialUpEvent; - #endif - - #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxExtHelpController; --- 693,696 ---- *************** *** 761,770 **** - #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMediaCtrl; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMediaEvent; - #endif - - #if (wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMiniFrame; --- 785,788 ---- *************** *** 839,843 **** extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxActivateEvent; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBusyCursor; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxClientData; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCloseEvent; --- 857,860 ---- *************** *** 852,856 **** extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIdleEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxInitDialogEvent; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystickEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxKeyEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaObject; --- 869,872 ---- *************** *** 860,868 **** extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMouseEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMoveEvent; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMultiChoiceDialog; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNotifyEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPaintEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPanel; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProcess; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProcessEvent; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxScrollEvent; --- 876,882 ---- *************** *** 942,948 **** #if wxLUA_USE_wxButton extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxButton; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToggleButton; #endif --- 956,971 ---- + #if wxLUA_USE_wxBusyCursor + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBusyCursor; + #endif + + + #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBusyInfo; + #endif + + #if wxLUA_USE_wxButton extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxButton; #endif *************** *** 971,975 **** ! #if wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxControlWithItems; #endif --- 994,998 ---- ! #if wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxControlWithItems; #endif *************** *** 995,998 **** --- 1018,1022 ---- extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBrush; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColour; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxColourDatabase; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPen; #endif *************** *** 1162,1165 **** --- 1186,1194 ---- + #if wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGenericDirCtrl; + #endif + + #if wxLUA_USE_wxGenericValidator extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGenericValidator; *************** *** 1231,1234 **** --- 1260,1269 ---- + #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystick; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxJoystickEvent; + #endif + + #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIndividualLayoutConstraint; *************** *** 1273,1276 **** --- 1308,1317 ---- + #if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMediaCtrl; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMediaEvent; + #endif + + #if wxLUA_USE_wxMenu extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMenu; *************** *** 1287,1290 **** --- 1328,1336 ---- + #if wxLUA_USE_wxMultiChoiceDialog + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxMultiChoiceDialog; + #endif + + #if wxLUA_USE_wxNotebook extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBookCtrlBase; *************** *** 1337,1340 **** --- 1383,1391 ---- + #if wxLUA_USE_wxProcess + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProcess; + #endif + + #if wxLUA_USE_wxProgressDialog extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxProgressDialog; *************** *** 1434,1437 **** --- 1485,1494 ---- + #if wxLUA_USE_wxSplashScreen + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSplashScreen; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSplashScreenWindow; + #endif + + #if wxLUA_USE_wxSplitterWindow extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSplitterEvent; *************** *** 1465,1470 **** ! #if wxLUA_USE_wxSystemSettings extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSystemOptions; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSystemSettings; #endif --- 1522,1531 ---- ! #if wxLUA_USE_wxSystemOptions extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSystemOptions; + #endif + + + #if wxLUA_USE_wxSystemSettings extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSystemSettings; #endif *************** *** 1484,1487 **** --- 1545,1549 ---- #if wxLUA_USE_wxTextEntryDialog + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPasswordEntryDialog; extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxTextEntryDialog; #endif *************** *** 1504,1507 **** --- 1566,1574 ---- + #if wxLUA_USE_wxToggleButton + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToggleButton; + #endif + + #if wxLUA_USE_wxToolbar extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxToolBar; *************** *** 1566,1575 **** // Method Table - #if !defined(__WXMAC__) - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxDialUpEvent_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxDialUpEvent_methodCount; - #endif - - #if (!defined(__WXMSW__)) && (wxLUA_USE_wxHelpController) && (wxUSE_HELP) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxExtHelpController_methods; --- 1633,1636 ---- *************** *** 1688,1699 **** - #if (wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave) - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMediaCtrl_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxMediaCtrl_methodCount; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMediaEvent_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxMediaEvent_methodCount; - #endif - - #if (wxLUA_USE_wxMiniFrame) && (wxLUA_USE_wxFrame) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMiniFrame_methods; --- 1749,1752 ---- *************** *** 1785,1790 **** extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxActivateEvent_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxActivateEvent_methodCount; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxBusyCursor_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxBusyCursor_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxClientData_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxClientData_methodCount; --- 1838,1841 ---- *************** *** 1811,1816 **** extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxInitDialogEvent_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxInitDialogEvent_methodCount; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxJoystickEvent_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystickEvent_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxKeyEvent_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxKeyEvent_methodCount; --- 1862,1865 ---- *************** *** 1827,1832 **** extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMoveEvent_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxMoveEvent_methodCount; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMultiChoiceDialog_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxMultiChoiceDialog_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxNotifyEvent_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxNotifyEvent_methodCount; --- 1876,1879 ---- *************** *** 1835,1840 **** extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxPanel_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxPanel_methodCount; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxProcess_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxProcess_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxProcessEvent_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxProcessEvent_methodCount; --- 1882,1885 ---- *************** *** 1950,1958 **** #if wxLUA_USE_wxButton extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxButton_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxButton_methodCount; - extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxToggleButton_methods; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxToggleButton_methodCount; #endif --- 1995,2013 ---- + #if wxLUA_USE_wxBusyCursor + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxBusyCursor_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxBusyCursor_methodCount; + #endif + + + #if wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxBusyInfo_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxBusyInfo_methodCount; + #endif + + #if wxLUA_USE_wxButton extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxButton_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxButton_methodCount; #endif *************** *** 1988,1992 **** ! #if wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxControlWithItems_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxControlWithItems_methodCount; --- 2043,2047 ---- ! #if wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxControlWithItems_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxControlWithItems_methodCount; *************** *** 2019,2022 **** --- 2074,2079 ---- extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxColour_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxColour_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxColourDatabase_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxColourDatabase_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxPen_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxPen_methodCount; *************** *** 2238,2241 **** --- 2295,2304 ---- + #if wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGenericDirCtrl_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxGenericDirCtrl_methodCount; + #endif + + #if wxLUA_USE_wxGenericValidator extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxGenericValidator_methods; *************** *** 2352,2355 **** --- 2415,2426 ---- + #if wxLUA_USE_wxJoystick || wxUSE_JOYSTICK + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxJoystick_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystick_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxJoystickEvent_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxJoystickEvent_methodCount; + #endif + + #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxIndividualLayoutConstraint_methods; *************** *** 2408,2411 **** --- 2479,2490 ---- + #if wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMediaCtrl_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxMediaCtrl_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMediaEvent_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxMediaEvent_methodCount; + #endif + + #if wxLUA_USE_wxMenu extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMenu_methods; *************** *** 2428,2431 **** --- 2507,2516 ---- + #if wxLUA_USE_wxMultiChoiceDialog + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxMultiChoiceDialog_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxMultiChoiceDialog_methodCount; + #endif + + #if wxLUA_USE_wxNotebook extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxBookCtrlBase_methods; *************** *** 2500,2503 **** --- 2585,2594 ---- + #if wxLUA_USE_wxProcess + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxProcess_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxProcess_methodCount; + #endif + + #if wxLUA_USE_wxProgressDialog extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxProgressDialog_methods; *************** *** 2638,2641 **** --- 2729,2740 ---- + #if wxLUA_USE_wxSplashScreen + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSplashScreen_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxSplashScreen_methodCount; + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSplashScreenWindow_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxSplashScreenWindow_methodCount; + #endif + + #if wxLUA_USE_wxSplitterWindow extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSplitterEvent_methods; *************** *** 2676,2682 **** ! #if wxLUA_USE_wxSystemSettings extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSystemOptions_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxSystemOptions_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSystemSettings_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxSystemSettings_methodCount; --- 2775,2785 ---- ! #if wxLUA_USE_wxSystemOptions extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSystemOptions_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxSystemOptions_methodCount; + #endif + + + #if wxLUA_USE_wxSystemSettings extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxSystemSettings_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxSystemSettings_methodCount; *************** *** 2701,2704 **** --- 2804,2809 ---- #if wxLUA_USE_wxTextEntryDialog + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxPasswordEntryDialog_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxPasswordEntryDialog_methodCount; extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxTextEntryDialog_methods; extern WXDLLIMPEXP_DATA_WXBIND(int) wxTextEntryDialog_methodCount; *************** *** 2726,2729 **** --- 2831,2840 ---- + #if wxLUA_USE_wxToggleButton + extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxToggleButton_methods; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxToggleButton_methodCount; + #endif + + #if wxLUA_USE_wxToolbar extern WXDLLIMPEXP_WXBIND WXLUAMETHOD* wxToolBar_methods; *************** *** 2813,2818 **** - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursor) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxProcess) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxString) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler) --- 2924,2927 ---- *************** *** 2846,2849 **** --- 2955,2963 ---- + #if wxLUA_USE_wxBusyCursor + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxBusyCursor) + #endif + + #if wxLUA_USE_wxCalendarCtrl wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCalendarDateAttr) *************** *** 2851,2854 **** --- 2965,2973 ---- + #if wxLUA_USE_wxColourPenBrush + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxColourDatabase) + #endif + + #if wxLUA_USE_wxCriticalSection wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxCriticalSection) *************** *** 2923,2926 **** --- 3042,3050 ---- + #if wxLUA_USE_wxProcess + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxProcess) + #endif + + #if wxLUA_USE_wxRegEx wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxRegEx) |
|
From: John L. <jr...@us...> - 2006-05-25 22:50:18
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27299/wxLua/bindings Modified Files: genwxbind.lua Log Message: add all conditions to genwxbind.lua add more wxLUA_USE_XXX Add wxJoystick, wxBusyInfo, wxPasswordEntryDialog, wxSplashScreen remove duplicate code in wxldebug.cpp Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** genwxbind.lua 25 May 2006 03:55:22 -0000 1.68 --- genwxbind.lua 25 May 2006 22:50:04 -0000 1.69 *************** *** 832,945 **** -- wxLUA_USE_ conditions ! conditions["wxLUA_USE_CODEDRAGON"] = "wxLUA_USE_CODEDRAGON" ! conditions["wxLUA_USE_FL"] = "wxLUA_USE_FL" ! conditions["wxLUA_USE_MDI"] = "wxLUA_USE_MDI" ! conditions["wxLUA_USE_wxAcceleratorTable"] = "wxLUA_USE_wxAcceleratorTable" ! conditions["wxLUA_USE_wxApp"] = "wxLUA_USE_wxApp" ! conditions["wxLUA_USE_wxArrayInt"] = "wxLUA_USE_wxArrayInt" ! conditions["wxLUA_USE_wxArrayString"] = "wxLUA_USE_wxArrayString" ! conditions["wxLUA_USE_wxBitmap"] = "wxLUA_USE_wxBitmap" ! conditions["wxLUA_USE_wxBitmapButton"] = "wxLUA_USE_wxBitmapButton" ! conditions["wxLUA_USE_wxBrushList"] = "wxLUA_USE_wxBrushList" ! conditions["wxLUA_USE_wxButton"] = "wxLUA_USE_wxButton" ! conditions["wxLUA_USE_wxCalendarCtrl"] = "wxLUA_USE_wxCalendarCtrl" ! conditions["wxLUA_USE_wxCaret"] = "wxLUA_USE_wxCaret" ! conditions["wxLUA_USE_wxCheckBox"] = "wxLUA_USE_wxCheckBox" ! conditions["wxLUA_USE_wxCheckListBox"] = "wxLUA_USE_wxCheckListBox" ! conditions["wxLUA_USE_wxChoice"] = "wxLUA_USE_wxChoice" ! conditions["wxLUA_USE_wxClassInfo"] = "wxLUA_USE_wxClassInfo" ! conditions["wxLUA_USE_wxClipboard"] = "wxLUA_USE_wxClipboard" ! conditions["wxLUA_USE_wxColourDialog"] = "wxLUA_USE_wxColourDialog" ! conditions["wxLUA_USE_wxColourPenBrush"] = "wxLUA_USE_wxColourPenBrush" ! conditions["wxLUA_USE_wxComboBox"] = "wxLUA_USE_wxComboBox" ! conditions["wxLUA_USE_wxCommandProcessor"] = "wxLUA_USE_wxCommandProcessor" ! conditions["wxLUA_USE_wxConfig"] = "wxLUA_USE_wxConfig" ! conditions["wxLUA_USE_wxCursor"] = "wxLUA_USE_wxCursor" ! conditions["wxLUA_USE_wxDC"] = "wxLUA_USE_wxDC" ! conditions["wxLUA_USE_wxDataObject"] = "wxLUA_USE_wxDataObject" ! conditions["wxLUA_USE_wxDateSpan"] = "wxLUA_USE_wxDateSpan" ! conditions["wxLUA_USE_wxDateTime"] = "wxLUA_USE_wxDateTime" ! conditions["wxLUA_USE_wxDialog"] = "wxLUA_USE_wxDialog" ! conditions["wxLUA_USE_wxDir"] = "wxLUA_USE_wxDir" ! conditions["wxLUA_USE_wxDirDialog"] = "wxLUA_USE_wxDirDialog" ! conditions["wxLUA_USE_wxDragDrop"] = "wxLUA_USE_wxDragDrop" ! conditions["wxLUA_USE_wxFile"] = "wxLUA_USE_wxFile" ! conditions["wxLUA_USE_wxFileDialog"] = "wxLUA_USE_wxFileDialog" ! conditions["wxLUA_USE_wxFileHistory"] = "wxLUA_USE_wxFileHistory" ! conditions["wxLUA_USE_wxFileName"] = "wxLUA_USE_wxFileName" ! conditions["wxLUA_USE_wxFindReplaceDialog"] = "wxLUA_USE_wxFindReplaceDialog" ! conditions["wxLUA_USE_wxFont"] = "wxLUA_USE_wxFont" ! conditions["wxLUA_USE_wxFontDialog"] = "wxLUA_USE_wxFontDialog" ! conditions["wxLUA_USE_wxFontEnumerator"] = "wxLUA_USE_wxFontEnumerator" ! conditions["wxLUA_USE_wxFontList"] = "wxLUA_USE_wxFontList" ! conditions["wxLUA_USE_wxFontMapper"] = "wxLUA_USE_wxFontMapper" ! conditions["wxLUA_USE_wxFrame"] = "wxLUA_USE_wxFrame" ! conditions["wxLUA_USE_wxGauge"] = "wxLUA_USE_wxGauge" ! conditions["wxLUA_USE_wxGenericValidator"] = "wxLUA_USE_wxGenericValidator" ! conditions["wxLUA_USE_wxGLCanvas"] = "wxLUA_USE_wxGLCanvas" ! conditions["wxLUA_USE_wxGrid"] = "wxLUA_USE_wxGrid" ! conditions["wxLUA_USE_wxHTML"] = "wxLUA_USE_wxHTML" ! conditions["wxLUA_USE_wxHashTable"] = "wxLUA_USE_wxHashTable" ! conditions["wxLUA_USE_wxHelpController"] = "wxLUA_USE_wxHelpController" ! conditions["wxLUA_USE_wxHtmlHelpController"] = "wxLUA_USE_wxHtmlHelpController" ! conditions["wxLUA_USE_wxID_XXX"] = "wxLUA_USE_wxID_XXX" ! conditions["wxLUA_USE_wxIcon"] = "wxLUA_USE_wxIcon" ! conditions["wxLUA_USE_wxImage"] = "wxLUA_USE_wxImage" ! conditions["wxLUA_USE_wxImageList"] = "wxLUA_USE_wxImageList" ! conditions["wxLUA_USE_wxLayoutConstraints"] = "wxLUA_USE_wxLayoutConstraints" ! conditions["wxLUA_USE_wxList"] = "wxLUA_USE_wxList" ! conditions["wxLUA_USE_wxListBox"] = "wxLUA_USE_wxListBox" ! conditions["wxLUA_USE_wxListCtrl"] = "wxLUA_USE_wxListCtrl" ! conditions["wxLUA_USE_wxLuaHtmlWindow"] = "wxLUA_USE_wxLuaHtmlWindow" ! conditions["wxLUA_USE_wxLuaPrintout"] = "wxLUA_USE_wxLuaPrintout" ! conditions["wxLUA_USE_wxMask"] = "wxLUA_USE_wxMask" ! conditions["wxLUA_USE_wxMediaCtrl"] = "wxLUA_USE_wxMediaCtrl" ! conditions["wxLUA_USE_wxMenu"] = "wxLUA_USE_wxMenu" ! conditions["wxLUA_USE_wxMessageDialog"] = "wxLUA_USE_wxMessageDialog" ! conditions["wxLUA_USE_wxMetafile"] = "wxLUA_USE_wxMetafile" ! conditions["wxLUA_USE_wxMiniFrame"] = "wxLUA_USE_wxMiniFrame" ! conditions["wxLUA_USE_wxNotebook"] = "wxLUA_USE_wxNotebook" ! conditions["wxLUA_USE_wxObject"] = "wxLUA_USE_wxObject" ! conditions["wxLUA_USE_wxPalette"] = "wxLUA_USE_wxPalette" ! conditions["wxLUA_USE_wxPenList"] = "wxLUA_USE_wxPenList" ! conditions["wxLUA_USE_wxPointSizeRect"] = "wxLUA_USE_wxPointSizeRect" ! conditions["wxLUA_USE_wxPrint"] = "wxLUA_USE_wxPrint" ! conditions["wxLUA_USE_wxProgressDialog"] = "wxLUA_USE_wxProgressDialog" ! conditions["wxLUA_USE_wxRadioBox"] = "wxLUA_USE_wxRadioBox" ! conditions["wxLUA_USE_wxRadioButton"] = "wxLUA_USE_wxRadioButton" ! conditions["wxLUA_USE_wxRegEx"] = "wxLUA_USE_wxRegEx" ! conditions["wxLUA_USE_wxRegion"] = "wxLUA_USE_wxRegion" ! conditions["wxLUA_USE_wxSashWindow"] = "wxLUA_USE_wxSashWindow" ! conditions["wxLUA_USE_wxScrollBar"] = "wxLUA_USE_wxScrollBar" ! conditions["wxLUA_USE_wxScrolledWindow"] = "wxLUA_USE_wxScrolledWindow" ! conditions["wxLUA_USE_wxSingleChoiceDialog"] = "wxLUA_USE_wxSingleChoiceDialog" ! conditions["wxLUA_USE_wxSizer"] = "wxLUA_USE_wxSizer" ! conditions["wxLUA_USE_wxSlider"] = "wxLUA_USE_wxSlider" ! conditions["wxLUA_USE_wxSocket"] = "wxLUA_USE_wxSocket" ! conditions["wxLUA_USE_wxSpinButton"] = "wxLUA_USE_wxSpinButton" ! conditions["wxLUA_USE_wxSpinCtrl"] = "wxLUA_USE_wxSpinCtrl" ! conditions["wxLUA_USE_wxSplitterWindow"] = "wxLUA_USE_wxSplitterWindow" ! conditions["wxLUA_USE_wxStaticBitmap"] = "wxLUA_USE_wxStaticBitmap" ! conditions["wxLUA_USE_wxStaticBox"] = "wxLUA_USE_wxStaticBox" ! conditions["wxLUA_USE_wxStaticLine"] = "wxLUA_USE_wxStaticLine" ! conditions["wxLUA_USE_wxStaticText"] = "wxLUA_USE_wxStaticText" ! conditions["wxLUA_USE_wxStatusBar"] = "wxLUA_USE_wxStatusBar" ! conditions["wxLUA_USE_wxStringList"] = "wxLUA_USE_wxStringList" ! conditions["wxLUA_USE_wxSystemSettings"] = "wxLUA_USE_wxSystemSettings" ! conditions["wxLUA_USE_wxTabCtrl"] = "wxLUA_USE_wxTabCtrl" ! conditions["wxLUA_USE_wxTaskBarIcon"] = "wxLUA_USE_wxTaskBarIcon" ! conditions["wxLUA_USE_wxTextCtrl"] = "wxLUA_USE_wxTextCtrl" ! conditions["wxLUA_USE_wxTextEntryDialog"] = "wxLUA_USE_wxTextEntryDialog" ! conditions["wxLUA_USE_wxTextValidator"] = "wxLUA_USE_wxTextValidator" ! conditions["wxLUA_USE_wxTimeSpan"] = "wxLUA_USE_wxTimeSpan" ! conditions["wxLUA_USE_wxTimer"] = "wxLUA_USE_wxTimer" ! conditions["wxLUA_USE_wxToolbar"] = "wxLUA_USE_wxToolbar" ! conditions["wxLUA_USE_wxTooltip"] = "wxLUA_USE_wxTooltip" ! conditions["wxLUA_USE_wxTreeCtrl"] = "wxLUA_USE_wxTreeCtrl" ! conditions["wxLUA_USE_wxValidator"] = "wxLUA_USE_wxValidator" ! conditions["wxLUA_USE_wxWave"] = "wxLUA_USE_wxWave" ! conditions["wxLUA_USE_wxWindowList"] = "wxLUA_USE_wxWindowList" ! conditions["wxLUA_USE_wxWizard"] = "wxLUA_USE_wxWizard" ! conditions["wxLUA_USE_wxXMLResource"] = "wxLUA_USE_wxXMLResource" -- condition operators of #if statements --- 832,957 ---- -- wxLUA_USE_ conditions ! conditions["wxLUA_USE_FL"] = "wxLUA_USE_FL" ! conditions["wxLUA_USE_Geometry"] = "wxLUA_USE_Geometry" ! conditions["wxLUA_USE_MDI"] = "wxLUA_USE_MDI" ! conditions["wxLUA_USE_wxAcceleratorTable"] = "wxLUA_USE_wxAcceleratorTable" ! conditions["wxLUA_USE_wxApp"] = "wxLUA_USE_wxApp" ! conditions["wxLUA_USE_wxArrayInt"] = "wxLUA_USE_wxArrayInt" ! conditions["wxLUA_USE_wxArrayString"] = "wxLUA_USE_wxArrayString" ! conditions["wxLUA_USE_wxArtProvider"] = "wxLUA_USE_wxArtProvider" ! conditions["wxLUA_USE_wxBitmap"] = "wxLUA_USE_wxBitmap" ! conditions["wxLUA_USE_wxBitmapButton"] = "wxLUA_USE_wxBitmapButton" ! conditions["wxLUA_USE_wxBrushList"] = "wxLUA_USE_wxBrushList" ! conditions["wxLUA_USE_wxBusyCursor"] = "wxLUA_USE_wxBusyCursor" ! conditions["wxLUA_USE_wxBusyInfo"] = "wxLUA_USE_wxBusyInfo" ! conditions["wxLUA_USE_wxButton"] = "wxLUA_USE_wxButton" ! conditions["wxLUA_USE_wxCalendarCtrl"] = "wxLUA_USE_wxCalendarCtrl" ! conditions["wxLUA_USE_wxCaret"] = "wxLUA_USE_wxCaret" ! conditions["wxLUA_USE_wxCheckBox"] = "wxLUA_USE_wxCheckBox" ! conditions["wxLUA_USE_wxCheckListBox"] = "wxLUA_USE_wxCheckListBox" ! conditions["wxLUA_USE_wxChoice"] = "wxLUA_USE_wxChoice" ! conditions["wxLUA_USE_wxClassInfo"] = "wxLUA_USE_wxClassInfo" ! conditions["wxLUA_USE_wxClipboard"] = "wxLUA_USE_wxClipboard" ! conditions["wxLUA_USE_wxColourDialog"] = "wxLUA_USE_wxColourDialog" ! conditions["wxLUA_USE_wxColourPenBrush"] = "wxLUA_USE_wxColourPenBrush" ! conditions["wxLUA_USE_wxComboBox"] = "wxLUA_USE_wxComboBox" ! conditions["wxLUA_USE_wxCommandProcessor"] = "wxLUA_USE_wxCommandProcessor" ! conditions["wxLUA_USE_wxConfig"] = "wxLUA_USE_wxConfig" ! conditions["wxLUA_USE_wxCursor"] = "wxLUA_USE_wxCursor" ! conditions["wxLUA_USE_wxCriticalSection"] = "wxLUA_USE_wxCriticalSection" ! conditions["wxLUA_USE_wxCriticalSectionLocker"] = "wxLUA_USE_wxCriticalSectionLocker" ! conditions["wxLUA_USE_wxDataObject"] = "wxLUA_USE_wxDataObject" ! conditions["wxLUA_USE_wxDateSpan"] = "wxLUA_USE_wxDateSpan" ! conditions["wxLUA_USE_wxDateTime"] = "wxLUA_USE_wxDateTime" ! conditions["wxLUA_USE_wxDC"] = "wxLUA_USE_wxDC" ! conditions["wxLUA_USE_wxDialog"] = "wxLUA_USE_wxDialog" ! conditions["wxLUA_USE_wxDir"] = "wxLUA_USE_wxDir" ! conditions["wxLUA_USE_wxDirDialog"] = "wxLUA_USE_wxDirDialog" ! conditions["wxLUA_USE_wxDragDrop"] = "wxLUA_USE_wxDragDrop" ! conditions["wxLUA_USE_wxFile"] = "wxLUA_USE_wxFile" ! conditions["wxLUA_USE_wxFileDialog"] = "wxLUA_USE_wxFileDialog" ! conditions["wxLUA_USE_wxFileHistory"] = "wxLUA_USE_wxFileHistory" ! conditions["wxLUA_USE_wxFileName"] = "wxLUA_USE_wxFileName" ! conditions["wxLUA_USE_wxFindReplaceDialog"] = "wxLUA_USE_wxFindReplaceDialog" ! conditions["wxLUA_USE_wxFont"] = "wxLUA_USE_wxFont" ! conditions["wxLUA_USE_wxFontDialog"] = "wxLUA_USE_wxFontDialog" ! conditions["wxLUA_USE_wxFontEnumerator"] = "wxLUA_USE_wxFontEnumerator" ! conditions["wxLUA_USE_wxFontList"] = "wxLUA_USE_wxFontList" ! conditions["wxLUA_USE_wxFontMapper"] = "wxLUA_USE_wxFontMapper" ! conditions["wxLUA_USE_wxFrame"] = "wxLUA_USE_wxFrame" ! conditions["wxLUA_USE_wxGauge"] = "wxLUA_USE_wxGauge" ! conditions["wxLUA_USE_wxGenericDirCtrl"] = "wxLUA_USE_wxGenericDirCtrl" ! conditions["wxLUA_USE_wxGenericValidator"] = "wxLUA_USE_wxGenericValidator" ! conditions["wxLUA_USE_wxGLCanvas"] = "wxLUA_USE_wxGLCanvas" ! conditions["wxLUA_USE_wxGrid"] = "wxLUA_USE_wxGrid" ! conditions["wxLUA_USE_wxHashTable"] = "wxLUA_USE_wxHashTable" ! conditions["wxLUA_USE_wxHelpController"] = "wxLUA_USE_wxHelpController" ! conditions["wxLUA_USE_wxHTML"] = "wxLUA_USE_wxHTML" ! conditions["wxLUA_USE_wxHtmlHelpController"] = "wxLUA_USE_wxHtmlHelpController" ! conditions["wxLUA_USE_wxIcon"] = "wxLUA_USE_wxIcon" ! conditions["wxLUA_USE_wxID_XXX"] = "wxLUA_USE_wxID_XXX" ! conditions["wxLUA_USE_wxImage"] = "wxLUA_USE_wxImage" ! conditions["wxLUA_USE_wxImageList"] = "wxLUA_USE_wxImageList" ! conditions["wxLUA_USE_wxJoystick"] = "wxLUA_USE_wxJoystick" ! conditions["wxLUA_USE_wxLayoutConstraints"] = "wxLUA_USE_wxLayoutConstraints" ! conditions["wxLUA_USE_wxList"] = "wxLUA_USE_wxList" ! conditions["wxLUA_USE_wxListBox"] = "wxLUA_USE_wxListBox" ! conditions["wxLUA_USE_wxListCtrl"] = "wxLUA_USE_wxListCtrl" ! conditions["wxLUA_USE_wxLuaHtmlWindow"] = "wxLUA_USE_wxLuaHtmlWindow" ! conditions["wxLUA_USE_wxLuaPrintout"] = "wxLUA_USE_wxLuaPrintout" ! conditions["wxLUA_USE_wxMask"] = "wxLUA_USE_wxMask" ! conditions["wxLUA_USE_wxMediaCtrl"] = "wxLUA_USE_wxMediaCtrl" ! conditions["wxLUA_USE_wxMenu"] = "wxLUA_USE_wxMenu" ! conditions["wxLUA_USE_wxMessageDialog"] = "wxLUA_USE_wxMessageDialog" ! conditions["wxLUA_USE_wxMetafile"] = "wxLUA_USE_wxMetafile" ! conditions["wxLUA_USE_wxMiniFrame"] = "wxLUA_USE_wxMiniFrame" ! conditions["wxLUA_USE_wxMultiChoiceDialog"] = "wxLUA_USE_wxMultiChoiceDialog" ! conditions["wxLUA_USE_wxNotebook"] = "wxLUA_USE_wxNotebook" ! conditions["wxLUA_USE_wxObject"] = "wxLUA_USE_wxObject" ! conditions["wxLUA_USE_wxPalette"] = "wxLUA_USE_wxPalette" ! conditions["wxLUA_USE_wxPenList"] = "wxLUA_USE_wxPenList" ! conditions["wxLUA_USE_wxPointSizeRect"] = "wxLUA_USE_wxPointSizeRect" ! conditions["wxLUA_USE_wxPrint"] = "wxLUA_USE_wxPrint" ! conditions["wxLUA_USE_wxProcess"] = "wxLUA_USE_wxProcess" ! conditions["wxLUA_USE_wxProgressDialog"] = "wxLUA_USE_wxProgressDialog" ! conditions["wxLUA_USE_wxRadioBox"] = "wxLUA_USE_wxRadioBox" ! conditions["wxLUA_USE_wxRadioButton"] = "wxLUA_USE_wxRadioButton" ! conditions["wxLUA_USE_wxRegEx"] = "wxLUA_USE_wxRegEx" ! conditions["wxLUA_USE_wxRegion"] = "wxLUA_USE_wxRegion" ! conditions["wxLUA_USE_wxSashWindow"] = "wxLUA_USE_wxSashWindow" ! conditions["wxLUA_USE_wxScrollBar"] = "wxLUA_USE_wxScrollBar" ! conditions["wxLUA_USE_wxScrolledWindow"] = "wxLUA_USE_wxScrolledWindow" ! conditions["wxLUA_USE_wxSingleChoiceDialog"] = "wxLUA_USE_wxSingleChoiceDialog" ! conditions["wxLUA_USE_wxSizer"] = "wxLUA_USE_wxSizer" ! conditions["wxLUA_USE_wxSlider"] = "wxLUA_USE_wxSlider" ! conditions["wxLUA_USE_wxSocket"] = "wxLUA_USE_wxSocket" ! conditions["wxLUA_USE_wxSpinButton"] = "wxLUA_USE_wxSpinButton" ! conditions["wxLUA_USE_wxSpinCtrl"] = "wxLUA_USE_wxSpinCtrl" ! conditions["wxLUA_USE_wxSplashScreen"] = "wxLUA_USE_wxSplashScreen" ! conditions["wxLUA_USE_wxSplitterWindow"] = "wxLUA_USE_wxSplitterWindow" ! conditions["wxLUA_USE_wxStaticBitmap"] = "wxLUA_USE_wxStaticBitmap" ! conditions["wxLUA_USE_wxStaticBox"] = "wxLUA_USE_wxStaticBox" ! conditions["wxLUA_USE_wxStaticLine"] = "wxLUA_USE_wxStaticLine" ! conditions["wxLUA_USE_wxStaticText"] = "wxLUA_USE_wxStaticText" ! conditions["wxLUA_USE_wxStatusBar"] = "wxLUA_USE_wxStatusBar" ! conditions["wxLUA_USE_wxStringList"] = "wxLUA_USE_wxStringList" ! conditions["wxLUA_USE_wxSystemOptions"] = "wxLUA_USE_wxSystemOptions" ! conditions["wxLUA_USE_wxSystemSettings"] = "wxLUA_USE_wxSystemSettings" ! conditions["wxLUA_USE_wxTabCtrl"] = "wxLUA_USE_wxTabCtrl" ! conditions["wxLUA_USE_wxTaskBarIcon"] = "wxLUA_USE_wxTaskBarIcon" ! conditions["wxLUA_USE_wxTextCtrl"] = "wxLUA_USE_wxTextCtrl" ! conditions["wxLUA_USE_wxTextEntryDialog"] = "wxLUA_USE_wxTextEntryDialog" ! conditions["wxLUA_USE_wxTextValidator"] = "wxLUA_USE_wxTextValidator" ! conditions["wxLUA_USE_wxTimer"] = "wxLUA_USE_wxTimer" ! conditions["wxLUA_USE_wxTimeSpan"] = "wxLUA_USE_wxTimeSpan" ! conditions["wxLUA_USE_wxToggleButton"] = "wxLUA_USE_wxToggleButton" ! conditions["wxLUA_USE_wxToolbar"] = "wxLUA_USE_wxToolbar" ! conditions["wxLUA_USE_wxTooltip"] = "wxLUA_USE_wxTooltip" ! conditions["wxLUA_USE_wxTreeCtrl"] = "wxLUA_USE_wxTreeCtrl" ! conditions["wxLUA_USE_wxValidator"] = "wxLUA_USE_wxValidator" ! conditions["wxLUA_USE_wxWave"] = "wxLUA_USE_wxWave" ! conditions["wxLUA_USE_wxWindowList"] = "wxLUA_USE_wxWindowList" ! conditions["wxLUA_USE_wxWizard"] = "wxLUA_USE_wxWizard" ! conditions["wxLUA_USE_wxXMLResource"] = "wxLUA_USE_wxXMLResource" -- condition operators of #if statements |
|
From: John L. <jr...@us...> - 2006-05-25 22:50:17
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27299/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: add all conditions to genwxbind.lua add more wxLUA_USE_XXX Add wxJoystick, wxBusyInfo, wxPasswordEntryDialog, wxSplashScreen remove duplicate code in wxldebug.cpp Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** wxstc_datatypes.lua 24 May 2006 04:50:00 -0000 1.28 --- wxstc_datatypes.lua 25 May 2006 22:50:04 -0000 1.29 *************** *** 337,344 **** --- 337,352 ---- }, wxBusyCursor = { + Condition = "wxLUA_USE_wxBusyCursor", DefType = "class", Intrinsic = false, Name = "wxBusyCursor", }, + wxBusyInfo = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxBusyInfo && wxUSE_BUSYINFO", + DefType = "class", + Intrinsic = false, + Name = "wxBusyInfo", + }, wxButton = { BaseClass = "wxControl", *************** *** 502,505 **** --- 510,519 ---- Name = "wxColourData", }, + wxColourDatabase = { + Condition = "wxLUA_USE_wxColourPenBrush", + DefType = "class", + Intrinsic = false, + Name = "wxColourDatabase", + }, wxColourDialog = { BaseClass = "wxDialog", *************** *** 563,567 **** wxControlWithItems = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox", DefType = "class", Intrinsic = false, --- 577,581 ---- wxControlWithItems = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxChoice || wxLUA_USE_wxComboBox || wxLUA_USE_wxListBox", DefType = "class", Intrinsic = false, *************** *** 686,696 **** Name = "wxDateTime::WeekDay", }, - wxDialUpEvent = { - BaseClass = "wxCommandEvent", - Condition = "!defined(__WXMAC__)", - DefType = "class", - Intrinsic = false, - Name = "wxDialUpEvent", - }, wxDialog = { BaseClass = "wxTopLevelWindow", --- 700,703 ---- *************** *** 1111,1114 **** --- 1118,1128 ---- Name = "wxGauge", }, + wxGenericDirCtrl = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_wxGenericDirCtrl && wxUSE_DIRDLG", + DefType = "class", + Intrinsic = false, + Name = "wxGenericDirCtrl", + }, wxGenericValidator = { BaseClass = "wxValidator", *************** *** 1590,1595 **** --- 1604,1617 ---- Name = "wxJPEGHandler", }, + wxJoystick = { + BaseClass = "wxObject", + Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK", + DefType = "class", + Intrinsic = false, + Name = "wxJoystick", + }, wxJoystickEvent = { BaseClass = "wxEvent", + Condition = "wxLUA_USE_wxJoystick || wxUSE_JOYSTICK", DefType = "class", Intrinsic = false, *************** *** 1614,1617 **** --- 1636,1640 ---- }, wxKillError = { + Condition = "wxLUA_USE_wxProcess", DefType = "enum", Intrinsic = true, *************** *** 1794,1798 **** wxMediaCtrl = { BaseClass = "wxControl", ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "class", Intrinsic = false, --- 1817,1821 ---- wxMediaCtrl = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "class", Intrinsic = false, *************** *** 1800,1804 **** }, wxMediaCtrlPlayerControls = { ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "enum", Intrinsic = true, --- 1823,1827 ---- }, wxMediaCtrlPlayerControls = { ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "enum", Intrinsic = true, *************** *** 1807,1811 **** wxMediaEvent = { BaseClass = "wxNotifyEvent", ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "class", Intrinsic = false, --- 1830,1834 ---- wxMediaEvent = { BaseClass = "wxNotifyEvent", ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "class", Intrinsic = false, *************** *** 1813,1817 **** }, wxMediaState = { ! Condition = "(wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL) && (wxLUA_USE_wxWave)", DefType = "enum", Intrinsic = true, --- 1836,1840 ---- }, wxMediaState = { ! Condition = "wxLUA_USE_wxMediaCtrl && wxUSE_MEDIACTRL", DefType = "enum", Intrinsic = true, *************** *** 1926,1929 **** --- 1949,1953 ---- wxMultiChoiceDialog = { BaseClass = "wxDialog", + Condition = "wxLUA_USE_wxMultiChoiceDialog", DefType = "class", Intrinsic = false, *************** *** 2060,2063 **** --- 2084,2094 ---- Name = "wxPaperSize", }, + wxPasswordEntryDialog = { + BaseClass = "wxTextEntryDialog", + Condition = "wxLUA_USE_wxTextEntryDialog", + DefType = "class", + Intrinsic = false, + Name = "wxPasswordEntryDialog", + }, wxPathFormat = { Condition = "wxLUA_USE_wxFileName", *************** *** 2207,2210 **** --- 2238,2242 ---- wxProcess = { BaseClass = "wxEvtHandler", + Condition = "wxLUA_USE_wxProcess", DefType = "class", Intrinsic = false, *************** *** 2387,2390 **** --- 2419,2423 ---- }, wxSignal = { + Condition = "wxLUA_USE_wxProcess", DefType = "enum", Intrinsic = true, *************** *** 2523,2526 **** --- 2556,2573 ---- Name = "wxSpinEvent", }, + wxSplashScreen = { + BaseClass = "wxFrame", + Condition = "wxLUA_USE_wxSplashScreen", + DefType = "class", + Intrinsic = false, + Name = "wxSplashScreen", + }, + wxSplashScreenWindow = { + BaseClass = "wxWindow", + Condition = "wxLUA_USE_wxSplashScreen", + DefType = "class", + Intrinsic = false, + Name = "wxSplashScreenWindow", + }, wxSplitterEvent = { BaseClass = "wxCommandEvent", *************** *** 2656,2660 **** wxSystemOptions = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSystemSettings", DefType = "class", Intrinsic = false, --- 2703,2707 ---- wxSystemOptions = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSystemOptions", DefType = "class", Intrinsic = false, *************** *** 2781,2785 **** wxToggleButton = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxButton", DefType = "class", Intrinsic = false, --- 2828,2832 ---- wxToggleButton = { BaseClass = "wxControl", ! Condition = "wxLUA_USE_wxToggleButton", DefType = "class", Intrinsic = false, *************** *** 3187,3192 **** WXWIN_COMPATIBILITY_2_6 = "WXWIN_COMPATIBILITY_2_6", WXWIN_COMPATIBILITY_2_8 = "WXWIN_COMPATIBILITY_2_8", - wxLUA_USE_CODEDRAGON = "wxLUA_USE_CODEDRAGON", wxLUA_USE_FL = "wxLUA_USE_FL", wxLUA_USE_MDI = "wxLUA_USE_MDI", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", --- 3234,3239 ---- WXWIN_COMPATIBILITY_2_6 = "WXWIN_COMPATIBILITY_2_6", WXWIN_COMPATIBILITY_2_8 = "WXWIN_COMPATIBILITY_2_8", wxLUA_USE_FL = "wxLUA_USE_FL", + wxLUA_USE_Geometry = "wxLUA_USE_Geometry", wxLUA_USE_MDI = "wxLUA_USE_MDI", wxLUA_USE_wxAcceleratorTable = "wxLUA_USE_wxAcceleratorTable", *************** *** 3194,3200 **** --- 3241,3250 ---- wxLUA_USE_wxArrayInt = "wxLUA_USE_wxArrayInt", wxLUA_USE_wxArrayString = "wxLUA_USE_wxArrayString", + wxLUA_USE_wxArtProvider = "wxLUA_USE_wxArtProvider", wxLUA_USE_wxBitmap = "wxLUA_USE_wxBitmap", wxLUA_USE_wxBitmapButton = "wxLUA_USE_wxBitmapButton", wxLUA_USE_wxBrushList = "wxLUA_USE_wxBrushList", + wxLUA_USE_wxBusyCursor = "wxLUA_USE_wxBusyCursor", + wxLUA_USE_wxBusyInfo = "wxLUA_USE_wxBusyInfo", wxLUA_USE_wxButton = "wxLUA_USE_wxButton", wxLUA_USE_wxCalendarCtrl = "wxLUA_USE_wxCalendarCtrl", *************** *** 3210,3213 **** --- 3260,3265 ---- wxLUA_USE_wxCommandProcessor = "wxLUA_USE_wxCommandProcessor", wxLUA_USE_wxConfig = "wxLUA_USE_wxConfig", + wxLUA_USE_wxCriticalSection = "wxLUA_USE_wxCriticalSection", + wxLUA_USE_wxCriticalSectionLocker = "wxLUA_USE_wxCriticalSectionLocker", wxLUA_USE_wxCursor = "wxLUA_USE_wxCursor", wxLUA_USE_wxDC = "wxLUA_USE_wxDC", *************** *** 3232,3235 **** --- 3284,3288 ---- wxLUA_USE_wxGLCanvas = "wxLUA_USE_wxGLCanvas", wxLUA_USE_wxGauge = "wxLUA_USE_wxGauge", + wxLUA_USE_wxGenericDirCtrl = "wxLUA_USE_wxGenericDirCtrl", wxLUA_USE_wxGenericValidator = "wxLUA_USE_wxGenericValidator", wxLUA_USE_wxGrid = "wxLUA_USE_wxGrid", *************** *** 3242,3245 **** --- 3295,3299 ---- wxLUA_USE_wxImage = "wxLUA_USE_wxImage", wxLUA_USE_wxImageList = "wxLUA_USE_wxImageList", + wxLUA_USE_wxJoystick = "wxLUA_USE_wxJoystick", wxLUA_USE_wxLayoutConstraints = "wxLUA_USE_wxLayoutConstraints", wxLUA_USE_wxList = "wxLUA_USE_wxList", *************** *** 3254,3257 **** --- 3308,3312 ---- wxLUA_USE_wxMetafile = "wxLUA_USE_wxMetafile", wxLUA_USE_wxMiniFrame = "wxLUA_USE_wxMiniFrame", + wxLUA_USE_wxMultiChoiceDialog = "wxLUA_USE_wxMultiChoiceDialog", wxLUA_USE_wxNotebook = "wxLUA_USE_wxNotebook", wxLUA_USE_wxObject = "wxLUA_USE_wxObject", *************** *** 3260,3263 **** --- 3315,3319 ---- wxLUA_USE_wxPointSizeRect = "wxLUA_USE_wxPointSizeRect", wxLUA_USE_wxPrint = "wxLUA_USE_wxPrint", + wxLUA_USE_wxProcess = "wxLUA_USE_wxProcess", wxLUA_USE_wxProgressDialog = "wxLUA_USE_wxProgressDialog", wxLUA_USE_wxRadioBox = "wxLUA_USE_wxRadioBox", *************** *** 3274,3277 **** --- 3330,3334 ---- wxLUA_USE_wxSpinButton = "wxLUA_USE_wxSpinButton", wxLUA_USE_wxSpinCtrl = "wxLUA_USE_wxSpinCtrl", + wxLUA_USE_wxSplashScreen = "wxLUA_USE_wxSplashScreen", wxLUA_USE_wxSplitterWindow = "wxLUA_USE_wxSplitterWindow", wxLUA_USE_wxStaticBitmap = "wxLUA_USE_wxStaticBitmap", *************** *** 3281,3284 **** --- 3338,3342 ---- wxLUA_USE_wxStatusBar = "wxLUA_USE_wxStatusBar", wxLUA_USE_wxStringList = "wxLUA_USE_wxStringList", + wxLUA_USE_wxSystemOptions = "wxLUA_USE_wxSystemOptions", wxLUA_USE_wxSystemSettings = "wxLUA_USE_wxSystemSettings", wxLUA_USE_wxTabCtrl = "wxLUA_USE_wxTabCtrl", *************** *** 3289,3292 **** --- 3347,3351 ---- wxLUA_USE_wxTimeSpan = "wxLUA_USE_wxTimeSpan", wxLUA_USE_wxTimer = "wxLUA_USE_wxTimer", + wxLUA_USE_wxToggleButton = "wxLUA_USE_wxToggleButton", wxLUA_USE_wxToolbar = "wxLUA_USE_wxToolbar", wxLUA_USE_wxTooltip = "wxLUA_USE_wxTooltip", |
|
From: John L. <jr...@us...> - 2006-05-25 04:44:13
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28928/wxLua/bindings/wxwidgets Modified Files: override.hpp Log Message: update docs for wxEvtHandler::ConnectEvent to Connect Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** override.hpp 25 May 2006 03:55:22 -0000 1.45 --- override.hpp 25 May 2006 04:44:10 -0000 1.46 *************** *** 1850,1854 **** else { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid event type, expected a number for parameter %d, got '%s'."), evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); return 0; --- 1850,1854 ---- else { ! wxlState.terror(wxString::Format(wxT("wxLua: Disconnect: Invalid event type, expected a number for parameter %d, got '%s'."), evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); return 0; |
|
From: John L. <jr...@us...> - 2006-05-25 04:44:13
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28928/wxLua/docs Modified Files: wxlua.html Log Message: update docs for wxEvtHandler::ConnectEvent to Connect Index: wxlua.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxlua.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** wxlua.html 24 May 2006 04:50:00 -0000 1.6 --- wxlua.html 25 May 2006 04:44:10 -0000 1.7 *************** *** 5,8 **** --- 5,10 ---- + + *************** *** 10,13 **** --- 12,16 ---- [...3705 lines suppressed...] + <li>The other functions are documented in wxlstate.h.</li> + </ul> + <br> + </body> </html> |
|
From: John L. <jr...@us...> - 2006-05-25 04:39:55
|
Update of /cvsroot/wxlua/wxLua/apps/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27399/wxLua/apps/wxlua/src Modified Files: editor.h Log Message: update editor.h for ConnectEvent -> Connect Index: editor.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** editor.h 15 May 2006 21:57:49 -0000 1.14 --- editor.h 25 May 2006 04:39:52 -0000 1.15 *************** *** 9,2004 **** extern const unsigned char wxLuaEditor[]; ! const size_t wxLuaEditor_len = 74835; ! const unsigned char wxLuaEditor[74836] = { ! 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 13, 10, ! 45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 13, 10, ! 45, 45, 32, 80,117,114,112,111,115,101, 58, 32, 32, 32, 32, 32,119,120, 76,117, 97, 32, 73, 68, 69, 13, 10, ! 45, 45, 32, 65,117,116,104,111,114, 58, 32, 32, 32, 32, 32, 32, 74, 32, 87,105,110,119,111,111,100, 13, 10, ! 45, 45, 32, 67,114,101, 97,116,101,100, 58, 32, 32, 32, 32, 32, 77, 97,114, 99,104, 32, 50, 48, 48, 50, 13, 10, ! 45, 45, 32, 67,111,112,121,114,105,103,104,116, 58, 32, 32, 32, 40, 99, 41, 32, 50, 48, 48, 50, 45, 53, 32, 76,111,109,116,105, 99,107, 32, 83,111,102,116,119, 97,114,101, 46, 32, 65,108,108, 32,114,105,103,104,116,115, 32,114,101,115,101,114,118,101,100, 46, 13, 10, [...3963 lines suppressed...] ! 10, ! 32, 32, 32, 32,102,111,114, 32,105,110,100,101,120, 32, 61, 32, 49, 44, 32, 35, 97,114,103, 32,100,111, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,102,105,108,101, 78, 97,109,101, 32, 61, 32, 97,114,103, 91,105,110,100,101,120, 93, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,108,111, 97,100, 70,105,108,101, 40,102,105,108,101, 78, 97,109,101, 44, 32,102,105,108,101, 78, 97,109,101, 41, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 10, ! 32, 32, 32, 32,105,102, 32,110,111,116,101, 98,111,111,107, 58, 71,101,116, 80, 97,103,101, 67,111,117,110,116, 40, 41, 32, 62, 32, 48, 32,116,104,101,110, 10, ! 32, 32, 32, 32, 32, 32, 32, 32,110,111,116,101, 98,111,111,107, 58, 83,101,116, 83,101,108,101, 99,116,105,111,110, 40, 48, 41, 10, ! 32, 32, 32, 32,101,108,115,101, 10, ! 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 99,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10, ! 32, 32, 32, 32, 32, 32, 32,115,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 10, ! 32, 32, 32, 32,101,110,100, 10, ! 101,108,115,101, 10, ! 32, 32, 32, 32,108,111, 99, 97,108, 32,101,100,105,116,111,114, 32, 61, 32, 99,114,101, 97,116,101, 69,100,105,116,111,114, 40, 34, 85,110,116,105,116,108,101,100, 34, 41, 10, ! 32, 32, 32, 32,115,101,116,117,112, 75,101,121,119,111,114,100,115, 40,101,100,105,116,111,114, 44, 32, 49, 41, 10, ! 101,110,100, 10, ! 10, ! 45, 45,102,114, 97,109,101, 58, 83,101,116, 73, 99,111,110, 40,119,120, 76,117, 97, 69,100,105,116,111,114, 73, 99,111,110, 41, 32, 45, 45, 70, 73, 88, 77, 69, 32, 97,100,100, 32,116,104,105,115, 32, 98, 97, 99,107, 10, 0 }; |
|
From: John L. <jr...@us...> - 2006-05-25 04:00:51
|
Update of /cvsroot/wxlua/website In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12883/website Modified Files: luasample.lua luasample.lua.html Log Message: change wxEvtHandler::ConnectEvent to Connect Index: luasample.lua =================================================================== RCS file: /cvsroot/wxlua/website/luasample.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luasample.lua 22 Feb 2006 21:46:53 -0000 1.1 --- luasample.lua 25 May 2006 04:00:48 -0000 1.2 *************** *** 22,35 **** -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close(true) end ) -- connect the selection event of the about menu item ! frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox('This is the "About" dialog of the Minimal wxLua sample.', ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame) ! end ) -- finally, show the frame window --- 22,35 ---- -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close(true) end ) -- connect the selection event of the about menu item ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox('This is the "About" dialog of the Minimal wxLua sample.', ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame) ! end ) -- finally, show the frame window Index: luasample.lua.html =================================================================== RCS file: /cvsroot/wxlua/website/luasample.lua.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** luasample.lua.html 22 Feb 2006 21:49:44 -0000 1.1 --- luasample.lua.html 25 May 2006 04:00:48 -0000 1.2 *************** *** 26,39 **** <span style="font-style: italic"><span style="color: #9A1900">-- connect the selection event of the exit menu item to an</span></span> <span style="font-style: italic"><span style="color: #9A1900">-- event handler that closes the window</span></span> ! <span style="font-weight: bold"><span style="color: #000000">frame:ConnectEvent</span></span><span style="color: #990000">(</span>wx<span style="color: #990000">.</span>wxID_EXIT<span style="color: #990000">,</span> wx<span style="color: #990000">.</span>wxEVT_COMMAND_MENU_SELECTED<span style="color: #990000">,</span> ! <span style="font-weight: bold"><span style="color: #0000FF">function</span></span> <span style="color: #990000">(</span>event<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #000000">frame:Close</span></span><span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">true</span></span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span> <span style="color: #990000">)</span> <span style="font-style: italic"><span style="color: #9A1900">-- connect the selection event of the about menu item</span></span> ! <span style="font-weight: bold"><span style="color: #000000">frame:ConnectEvent</span></span><span style="color: #990000">(</span>wx<span style="color: #990000">.</span>wxID_ABOUT<span style="color: #990000">,</span> wx<span style="color: #990000">.</span>wxEVT_COMMAND_MENU_SELECTED<span style="color: #990000">,</span> ! <span style="font-weight: bold"><span style="color: #0000FF">function</span></span> <span style="color: #990000">(</span>event<span style="color: #990000">)</span> ! wx<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #000000">wxMessageBox</span></span><span style="color: #990000">(</span><span style="color: #FF0000">'This is the "About" dialog of the Minimal wxLua sample.'</span><span style="color: #990000">,</span> ! <span style="color: #FF0000">"About wxLua"</span><span style="color: #990000">,</span> ! wx<span style="color: #990000">.</span>wxOK <span style="color: #990000">+</span> wx<span style="color: #990000">.</span>wxICON_INFORMATION<span style="color: #990000">,</span> ! frame<span style="color: #990000">)</span> ! <span style="font-weight: bold"><span style="color: #0000FF">end</span></span> <span style="color: #990000">)</span> <span style="font-style: italic"><span style="color: #9A1900">-- finally, show the frame window</span></span> --- 26,39 ---- <span style="font-style: italic"><span style="color: #9A1900">-- connect the selection event of the exit menu item to an</span></span> <span style="font-style: italic"><span style="color: #9A1900">-- event handler that closes the window</span></span> ! <span style="font-weight: bold"><span style="color: #000000">frame:Connect</span></span><span style="color: #990000">(</span>wx<span style="color: #990000">.</span>wxID_EXIT<span style="color: #990000">,</span> wx<span style="color: #990000">.</span>wxEVT_COMMAND_MENU_SELECTED<span style="color: #990000">,</span> ! <span style="font-weight: bold"><span style="color: #0000FF">function</span></span> <span style="color: #990000">(</span>event<span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #000000">frame:Close</span></span><span style="color: #990000">(</span><span style="font-weight: bold"><span style="color: #0000FF">true</span></span><span style="color: #990000">)</span> <span style="font-weight: bold"><span style="color: #0000FF">end</span></span> <span style="color: #990000">)</span> <span style="font-style: italic"><span style="color: #9A1900">-- connect the selection event of the about menu item</span></span> ! <span style="font-weight: bold"><span style="color: #000000">frame:Connect</span></span><span style="color: #990000">(</span>wx<span style="color: #990000">.</span>wxID_ABOUT<span style="color: #990000">,</span> wx<span style="color: #990000">.</span>wxEVT_COMMAND_MENU_SELECTED<span style="color: #990000">,</span> ! <span style="font-weight: bold"><span style="color: #0000FF">function</span></span> <span style="color: #990000">(</span>event<span style="color: #990000">)</span> ! wx<span style="color: #990000">.</span><span style="font-weight: bold"><span style="color: #000000">wxMessageBox</span></span><span style="color: #990000">(</span><span style="color: #FF0000">'This is the "About" dialog of the Minimal wxLua sample.'</span><span style="color: #990000">,</span> ! <span style="color: #FF0000">"About wxLua"</span><span style="color: #990000">,</span> ! wx<span style="color: #990000">.</span>wxOK <span style="color: #990000">+</span> wx<span style="color: #990000">.</span>wxICON_INFORMATION<span style="color: #990000">,</span> ! frame<span style="color: #990000">)</span> ! <span style="font-weight: bold"><span style="color: #0000FF">end</span></span> <span style="color: #990000">)</span> <span style="font-style: italic"><span style="color: #9A1900">-- finally, show the frame window</span></span> |
|
From: John L. <jr...@us...> - 2006-05-25 03:55:34
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10746/wxLua/apps/wxluacan/src Modified Files: wxluacan.h Log Message: changed wxEvtHandler::ConnectEvent to Connect update all samples to reflect this add win id ranges to connect add untested wxEvtHandler::Disconnect Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxluacan.h 25 May 2006 01:19:07 -0000 1.11 --- wxluacan.h 25 May 2006 03:55:22 -0000 1.12 *************** *** 40,67 **** // Lua Tag Method Values for each Class ! extern (int) s_wxluatag_wxlCan; ! extern (int) s_wxluatag_wxlCanObj; ! extern (int) s_wxluatag_wxlCanObjAddScript; ! extern (int) s_wxluatag_wxlCanObjCircle; ! extern (int) s_wxluatag_wxlCanObjRect; ! extern (int) s_wxluatag_wxlCanObjScript; ! extern (int) s_wxluatag_wxlLuaCanCmd; // Method Table extern WXLUAMETHOD* wxlCan_methods; ! extern (int) wxlCan_methodCount; extern WXLUAMETHOD* wxlCanObj_methods; ! extern (int) wxlCanObj_methodCount; extern WXLUAMETHOD* wxlCanObjAddScript_methods; ! extern (int) wxlCanObjAddScript_methodCount; extern WXLUAMETHOD* wxlCanObjCircle_methods; ! extern (int) wxlCanObjCircle_methodCount; extern WXLUAMETHOD* wxlCanObjRect_methods; ! extern (int) wxlCanObjRect_methodCount; extern WXLUAMETHOD* wxlCanObjScript_methods; ! extern (int) wxlCanObjScript_methodCount; extern WXLUAMETHOD* wxlLuaCanCmd_methods; ! extern (int) wxlLuaCanCmd_methodCount; --- 40,67 ---- // Lua Tag Method Values for each Class ! extern int s_wxluatag_wxlCan; ! extern int s_wxluatag_wxlCanObj; ! extern int s_wxluatag_wxlCanObjAddScript; ! extern int s_wxluatag_wxlCanObjCircle; ! extern int s_wxluatag_wxlCanObjRect; ! extern int s_wxluatag_wxlCanObjScript; ! extern int s_wxluatag_wxlLuaCanCmd; // Method Table extern WXLUAMETHOD* wxlCan_methods; ! extern int wxlCan_methodCount; extern WXLUAMETHOD* wxlCanObj_methods; ! extern int wxlCanObj_methodCount; extern WXLUAMETHOD* wxlCanObjAddScript_methods; ! extern int wxlCanObjAddScript_methodCount; extern WXLUAMETHOD* wxlCanObjCircle_methods; ! extern int wxlCanObjCircle_methodCount; extern WXLUAMETHOD* wxlCanObjRect_methods; ! extern int wxlCanObjRect_methodCount; extern WXLUAMETHOD* wxlCanObjScript_methods; ! extern int wxlCanObjScript_methodCount; extern WXLUAMETHOD* wxlLuaCanCmd_methods; ! extern int wxlLuaCanCmd_methodCount; |
|
From: John L. <jr...@us...> - 2006-05-25 03:55:34
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10746/wxLua/docs Modified Files: changelog.txt wxluaref.html Log Message: changed wxEvtHandler::ConnectEvent to Connect update all samples to reflect this add win id ranges to connect add untested wxEvtHandler::Disconnect Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxluaref.html 24 May 2006 04:50:00 -0000 1.5 --- wxluaref.html 25 May 2006 03:55:22 -0000 1.6 *************** *** 4754,4763 **** void AddPendingEvent(<a href="#wxEvent">wxEvent</a>& event)<br> <br> ! <font color=#CC3300> // <i>%override</i> wxEvtHandler::ConnectEvent(int id, wxEventType eventType, lua function)</font><br> ! <font color=#CC3300> // <i>%override</i> wxEvtHandler::ConnectEvent(wxEventType eventType, lua function)</font><br> ! void ConnectEvent()<br> <br> ! //bool Disconnect(wxEventType eventType = wxEVT_NULL, wxObjectEventFunction function = NULL, <a href="#wxObject">wxObject</a>* userData = NULL, <a href="#wxEvtHandler">wxEvtHandler</a>* eventSink = NULL)<br> ! //bool Disconnect(int id = wxID_ANY, wxEventType eventType = wxEVT_NULL, wxObjectEventFunction function = NULL, <a href="#wxObject">wxObject</a>* userData = NULL, <a href="#wxEvtHandler">wxEvtHandler</a>* eventSink = NULL)<br> <br> //void* GetClientData()<br> --- 4754,4769 ---- void AddPendingEvent(<a href="#wxEvent">wxEvent</a>& event)<br> <br> ! // NOTE: Connect used to be called ConnectEvent which is not the name of any C++ function.<br> <br> ! <font color=#CC3300> // <i>%override</i> wxEvtHandler::Connect(int id, int lastId, wxEventType eventType, lua function)</font><br> ! <font color=#CC3300> // <i>%override</i> wxEvtHandler::Connect(int id, wxEventType eventType, lua function)</font><br> ! <font color=#CC3300> // <i>%override</i> wxEvtHandler::Connect(wxEventType eventType, lua function)</font><br> ! // Note: wxLua uses the userdata and the event sink and so they're not available<br> ! void Connect(int id, int lastId, wxEventType eventType, LuaFunction func)<br> ! <br> ! <font color=#CC3300> // <i>%override</i> bool Disconnect(int winid, int lastId, wxEventType eventType)</font><br> ! <font color=#CC3300> // <i>%override</i> bool Disconnect(int winid, wxEventType eventType)</font><br> ! <font color=#CC3300> // <i>%override</i> bool Disconnect(wxEventType eventType)</font><br> ! bool Disconnect(int id, int lastId, wxEventType eventType)<br> <br> //void* GetClientData()<br> Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** changelog.txt 20 May 2006 20:45:14 -0000 1.11 --- changelog.txt 25 May 2006 03:55:22 -0000 1.12 *************** *** 7,10 **** --- 7,11 ---- - Switched from lua 5.0 to lua 5.1 + - All bindings for wxWidgets have been updated to 2.6.3 - Reordered bindings/wxwidgets/overrides.hpp to follow binding *.i files - Fixed %member tag for bindings to work properly *************** *** 25,29 **** (previously they were ignored) - now the lua executable is called wxlua-lua to avoid conflicts ! with other installations of lua and a verbatim lua5.1 library and executable is created instead - updated wrapper generators and all build system for shared builds --- 26,30 ---- (previously they were ignored) - now the lua executable is called wxlua-lua to avoid conflicts ! with other installations of lua and a verbatim lua5.1 library and executable is created instead - updated wrapper generators and all build system for shared builds *************** *** 31,35 **** - added the new module "luamodule" which can be used to create a wx.dll/.so module to use with the require() function of lua with the verbatim interpreter ! version 2.6.2.0 (released 10/03/2006) --- 32,39 ---- - added the new module "luamodule" which can be used to create a wx.dll/.so module to use with the require() function of lua with the verbatim interpreter ! - *** Changed wxEvtHandler::ConnectEvent to wxEvtHandler::Connect since there ! is NO C++ function called ConnectEvent. ! - Fixed wxEvtHandler::Connect[Event] to follow the C++ winID semantics for the ! case where there is no winId supplied, use wxID_ANY. version 2.6.2.0 (released 10/03/2006) |
|
From: John L. <jr...@us...> - 2006-05-25 03:55:34
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10746/wxLua/bindings/wxwidgets Modified Files: event.i override.hpp Log Message: changed wxEvtHandler::ConnectEvent to Connect update all samples to reflect this add win id ranges to connect add untested wxEvtHandler::Disconnect Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** event.i 18 May 2006 05:47:39 -0000 1.14 --- event.i 25 May 2006 03:55:22 -0000 1.15 *************** *** 18,27 **** void AddPendingEvent(wxEvent& event) ! // %override wxEvtHandler::ConnectEvent(int id, wxEventType eventType, lua function) ! // %override wxEvtHandler::ConnectEvent(wxEventType eventType, lua function) ! void ConnectEvent() ! //bool Disconnect(wxEventType eventType = wxEVT_NULL, wxObjectEventFunction function = NULL, wxObject* userData = NULL, wxEvtHandler* eventSink = NULL) ! //bool Disconnect(int id = wxID_ANY, wxEventType eventType = wxEVT_NULL, wxObjectEventFunction function = NULL, wxObject* userData = NULL, wxEvtHandler* eventSink = NULL) //void* GetClientData() --- 18,33 ---- void AddPendingEvent(wxEvent& event) ! // NOTE: Connect used to be called ConnectEvent which is not the name of any C++ function. ! // %override wxEvtHandler::Connect(int id, int lastId, wxEventType eventType, lua function) ! // %override wxEvtHandler::Connect(int id, wxEventType eventType, lua function) ! // %override wxEvtHandler::Connect(wxEventType eventType, lua function) ! // Note: wxLua uses the userdata and the event sink and so they're not available ! void Connect(int id, int lastId, wxEventType eventType, LuaFunction func) ! ! // %override bool Disconnect(int winid, int lastId, wxEventType eventType) ! // %override bool Disconnect(int winid, wxEventType eventType) ! // %override bool Disconnect(wxEventType eventType) ! bool Disconnect(int id, int lastId, wxEventType eventType) //void* GetClientData() Index: override.hpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/override.hpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** override.hpp 24 May 2006 16:56:45 -0000 1.44 --- override.hpp 25 May 2006 03:55:22 -0000 1.45 *************** *** 1646,1651 **** %end ! %override wxLua_wxEvtHandler_ConnectEvent ! // void ConnectEvent() #include "wxlua/include/wxlcallb.h" --- 1646,1651 ---- %end ! %override wxLua_wxEvtHandler_Connect ! // void Connect(int id, int lastId, wxEventType eventType, LuaFunction func) #include "wxlua/include/wxlcallb.h" *************** *** 1659,1663 **** // which is a reference to the event object // associated with the event. ! static int LUACALL wxLua_wxEvtHandler_ConnectEvent(lua_State *L) { wxCHECK_MSG(s_wxluatag_wxEvtHandler != -1, 0, wxT("wxEvtHandler is not wrapped by wxLua")); --- 1659,1663 ---- // which is a reference to the event object // associated with the event. ! static int LUACALL wxLua_wxEvtHandler_Connect(lua_State *L) { wxCHECK_MSG(s_wxluatag_wxEvtHandler != -1, 0, wxT("wxEvtHandler is not wrapped by wxLua")); *************** *** 1665,1670 **** wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! int id; ! double eventType = 0; wxLuaCallback *pCallback = NULL; --- 1665,1671 ---- wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! int winId = wxID_ANY; ! int lastId = wxID_ANY; ! int eventType = 0; wxLuaCallback *pCallback = NULL; *************** *** 1673,1691 **** wxEvtHandler *evtHandler = (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler); switch (nParams) { ! case 4: { ! if (!lua_isfunction(L, 4)) ! { ! wxlState.terror("wxLua: ConnectEvent: Callback function is not a valid Lua function for parameter 3."); ! return 0; ! } if (wxlState.IsNumberType(3)) ! eventType = lua_tonumber(L, 3); else { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid event type, expected a number for parameter 2, got '%s'."), wxlState.lua_TypeNameIndex(3).c_str())); return 0; --- 1674,1692 ---- wxEvtHandler *evtHandler = (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler); + int func_idx = 0; + int evttype_idx = 0; + switch (nParams) { ! case 5: { ! func_idx = 5; ! evttype_idx = 4; if (wxlState.IsNumberType(3)) ! lastId = (int)lua_tonumber(L, 3); else { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid lastId, expected a number for parameter 2, got '%s'."), wxlState.lua_TypeNameIndex(3).c_str())); return 0; *************** *** 1693,1741 **** if (wxlState.IsNumberType(2)) ! id = (int)lua_tonumber(L, 2); else { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid id, expected a number for parameter 1, got '%s'."), ! wxlState.lua_TypeNameIndex(3).c_str())); return 0; } - // Create and connect the callback - pCallback = new wxLuaCallback(wxlState, 4, id, (int) eventType, evtHandler); - break; } ! case 3: { ! if (!lua_isfunction(L, 3)) { ! wxlState.terror("wxLua: ConnectEvent: Callback function is not a valid Lua function for parameter 2."); return 0; } if (evtHandler->IsKindOf(CLASSINFO(wxWindow))) { // FIXME! bug in Mac this is the fix ! #if defined(__WXMAC__) && !wxCHECK_VERSION(2,6,0) ! id = -1; ! #else ! id = ((wxWindow *)evtHandler)->GetId(); #endif } else { ! wxlState.terror("wxLua: ConnectEvent: Unexpected event object type, expected a wxWindow."); return 0; } if (wxlState.IsNumberType(2)) { ! eventType = lua_tonumber(L, 2); ! // Create and connect the callback ! pCallback = new wxLuaCallback(wxlState, 3, id, (int) eventType, evtHandler); } else { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid event type, expected a number for parameter 1, got '%s'."), wxlState.lua_TypeNameIndex(2).c_str())); return 0; --- 1694,1830 ---- if (wxlState.IsNumberType(2)) ! winId = (int)lua_tonumber(L, 2); else { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid winId, expected a number for parameter 1, got '%s'."), ! wxlState.lua_TypeNameIndex(2).c_str())); return 0; } break; } ! case 4: { ! func_idx = 4; ! evttype_idx = 3; ! ! if (wxlState.IsNumberType(2)) ! winId = (int)lua_tonumber(L, 2); ! else { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid id, expected a number for parameter 1, got '%s'."), ! wxlState.lua_TypeNameIndex(2).c_str())); return 0; } + break; + } + case 3: + { + func_idx = 3; + evttype_idx = 2; + /* + // Is this right? wxWidgets just uses wxID_ANY for no winId overload if (evtHandler->IsKindOf(CLASSINFO(wxWindow))) { // FIXME! bug in Mac this is the fix ! #if !defined(__WXMAC__) || wxCHECK_VERSION(2,6,0) ! winId = ((wxWindow *)evtHandler)->GetId(); ! wxPrintf(wxT("winId %d\n"), winId); #endif } else { ! wxlState.terror("wxLua: Connect: Unexpected event object type, expected a wxWindow."); ! return 0; ! } ! */ ! break; ! } ! default: ! { ! wxlState.terror("wxLua: Connect: Incorrect number of parameters."); ! return 0; ! } ! } ! ! if (!lua_isfunction(L, func_idx)) ! { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Callback function is not a valid Lua function for parameter %d."), ! func_idx-1)); // -1 for self ! return 0; ! } ! ! if (wxlState.IsNumberType(evttype_idx)) ! eventType = lua_tonumber(L, evttype_idx); ! else ! { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid event type, expected a number for parameter %d, got '%s'."), ! evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); ! return 0; ! } ! ! // Create and connect the callback ! pCallback = new wxLuaCallback(wxlState, nParams, winId, lastId, eventType, evtHandler); ! ! return 0; ! } ! %end ! ! %override wxLua_wxEvtHandler_Disconnect ! // void Disconnect(int id, int lastId, wxEventType eventType) ! ! #include "wxlua/include/wxlcallb.h" ! static int LUACALL wxLua_wxEvtHandler_Disconnect(lua_State *L) ! { ! wxCHECK_MSG(s_wxluatag_wxEvtHandler != -1, 0, wxT("wxEvtHandler is not wrapped by wxLua")); ! wxLuaState wxlState(L); ! wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! ! int winId = wxID_ANY; ! int lastId = wxID_ANY; ! int eventType = 0; ! ! int nParams = lua_gettop(L); ! ! wxEvtHandler *evtHandler = (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler); ! ! int evttype_idx = 0; ! ! switch (nParams) ! { ! case 4: ! { ! evttype_idx = 4; ! ! if (wxlState.IsNumberType(3)) ! lastId = (int)lua_tonumber(L, 3); ! else ! { ! wxlState.terror(wxString::Format(wxT("wxLua: Disconnect: Invalid lastId, expected a number for parameter 2, got '%s'."), ! wxlState.lua_TypeNameIndex(3).c_str())); return 0; } if (wxlState.IsNumberType(2)) + winId = (int)lua_tonumber(L, 2); + else { ! wxlState.terror(wxString::Format(wxT("wxLua: Disconnect: Invalid winId, expected a number for parameter 1, got '%s'."), ! wxlState.lua_TypeNameIndex(2).c_str())); ! return 0; } + + break; + } + case 3: + { + evttype_idx = 3; + + if (wxlState.IsNumberType(2)) + winId = (int)lua_tonumber(L, 2); else { ! wxlState.terror(wxString::Format(wxT("wxLua: Disconnect: Invalid id, expected a number for parameter 1, got '%s'."), wxlState.lua_TypeNameIndex(2).c_str())); return 0; *************** *** 1744,1754 **** break; } ! default: { ! wxlState.terror("wxLua: ConnectEvent: Incorrect number of parameters."); break; } } ! return 0; } %end --- 1833,1863 ---- break; } ! case 2: { ! evttype_idx = 2; ! break; } + default: + { + wxlState.terror("wxLua: Disconnect: Incorrect number of parameters."); + return 0; + } } ! ! if (wxlState.IsNumberType(evttype_idx)) ! eventType = lua_tonumber(L, evttype_idx); ! else ! { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid event type, expected a number for parameter %d, got '%s'."), ! evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); ! return 0; ! } ! ! // Try to disconnect from the callback ! bool returns = evtHandler->Disconnect(winId, lastId, eventType, (wxObjectEventFunction)&wxLuaCallback::EventHandler); ! ! lua_pushboolean(L, returns); ! return 1; } %end |
|
From: John L. <jr...@us...> - 2006-05-25 03:55:34
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10746/wxLua/modules/wxlua/src Modified Files: wxlcallb.cpp wxlstate.cpp Log Message: changed wxEvtHandler::ConnectEvent to Connect update all samples to reflect this add win id ranges to connect add untested wxEvtHandler::Disconnect Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** wxlstate.cpp 18 May 2006 05:47:40 -0000 1.69 --- wxlstate.cpp 25 May 2006 03:55:23 -0000 1.70 *************** *** 1567,1571 **** { M_WXLSTATEDATA->m_wxlStateData->m_windowList.Append(pWindow); ! new wxLuaCallback(*this, 3, pWindow->GetId(), wxEVT_DESTROY, pWindow->GetEventHandler()); } } --- 1567,1571 ---- { M_WXLSTATEDATA->m_wxlStateData->m_windowList.Append(pWindow); ! new wxLuaCallback(*this, 3, pWindow->GetId(), wxID_ANY, wxEVT_DESTROY, pWindow->GetEventHandler()); } } Index: wxlcallb.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlcallb.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wxlcallb.cpp 14 May 2006 17:45:05 -0000 1.17 --- wxlcallb.cpp 25 May 2006 03:55:23 -0000 1.18 *************** *** 35,42 **** wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID id, wxEventType eventType, wxEvtHandler *pEvtHandler ) : wxEvtHandler(), m_wxlState(state), ! m_pHandler(pEvtHandler), m_id(id), m_eventType(eventType) { --- 35,42 ---- wxLuaCallback::wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID winId, wxWindowID lastId, wxEventType eventType, wxEvtHandler *pEvtHandler ) : wxEvtHandler(), m_wxlState(state), ! m_pHandler(pEvtHandler), m_id(winId), m_lastId(lastId), m_eventType(eventType) { *************** *** 45,49 **** m_routine = m_wxlState.tinsert(theRoutine); ! pEvtHandler->Connect( id, eventType, (wxObjectEventFunction)&wxLuaCallback::EventHandler, this); --- 45,49 ---- m_routine = m_wxlState.tinsert(theRoutine); ! pEvtHandler->Connect( winId, lastId, eventType, (wxObjectEventFunction)&wxLuaCallback::EventHandler, this); |
|
From: John L. <jr...@us...> - 2006-05-25 03:55:34
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10746/wxLua/bindings Modified Files: genwxbind.lua Log Message: changed wxEvtHandler::ConnectEvent to Connect update all samples to reflect this add win id ranges to connect add untested wxEvtHandler::Disconnect Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** genwxbind.lua 24 May 2006 04:50:00 -0000 1.67 --- genwxbind.lua 25 May 2006 03:55:22 -0000 1.68 *************** *** 67,71 **** assert(type(output_cpp_impexpdatasymbol) == "string", "output_cpp_impexpdatasymbol is not a string") - assert(type(hook_lua_namespace) == "string", "hook_lua_namespace is not a string") assert(type(hook_cpp_namespace) == "string", "hook_cpp_namespace is not a string") --- 67,70 ---- *************** *** 1171,1177 **** while lineData[i+1] do i = i + 1 ! if lineData[i] == "/*" then inComment = true ! elseif lineData[i] == "*/" then inComment = false elseif lineData[i] == "%override" then --- 1170,1176 ---- while lineData[i+1] do i = i + 1 ! if (not inOverride) and (lineData[i] == "/*") then inComment = true ! elseif (not inOverride) and (lineData[i] == "*/") then inComment = false elseif lineData[i] == "%override" then *************** *** 2548,2551 **** --- 2547,2556 ---- end + function MakeImpExpData(data_type) + if output_cpp_impexpdatasymbol and (string.len(output_cpp_impexpdatasymbol) > 0) then + return output_cpp_impexpdatasymbol.."("..data_type..")" + end + return data_type + end -- Create Language Binding *************** *** 2966,2970 **** local objectTagBinding = { ! ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 2971,2975 ---- local objectTagBinding = { ! ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 3003,3007 **** local objectTagBinding = { ! ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 3008,3012 ---- local objectTagBinding = { ! ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 3039,3043 **** local eventTagBinding = { ! ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } --- 3044,3048 ---- local eventTagBinding = { ! ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", Condition = fullcondition } *************** *** 3726,3732 **** local classTagBinding = { ! ExternDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n", ! ExternMethodCountDeclaration = "extern "..output_cpp_impexpdatasymbol.."(int) "..MakeVar(parseObject.Name).."_methodCount;\n", Condition = tagcondition } --- 3731,3737 ---- local classTagBinding = { ! ExternDeclaration = "extern "..MakeImpExpData("int").." s_wxluatag_"..MakeClassVar(parseObject.Name)..";\n", ExternMethodDeclaration = "extern "..output_cpp_impexpsymbol.." WXLUAMETHOD* "..MakeVar(parseObject.Name).."_methods;\n", ! ExternMethodCountDeclaration = "extern "..MakeImpExpData("int").." "..MakeVar(parseObject.Name).."_methodCount;\n", Condition = tagcondition } |
|
From: John L. <jr...@us...> - 2006-05-25 03:55:34
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10746/wxLua/samples Modified Files: calculator.wx.lua choices.wx.lua debug.wx.lua dialog.wx.lua editor.wx.lua fldemo.wx.lua grid.wx.lua htmlwin.wx.lua luamodule.wx.lua mdi.wx.lua minimal.wx.lua printing.wx.lua scribble.wx.lua tree.wx.lua wxluasudoku.wx.lua Log Message: changed wxEvtHandler::ConnectEvent to Connect update all samples to reflect this add win id ranges to connect add untested wxEvtHandler::Disconnect Index: debug.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/debug.wx.lua,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** debug.wx.lua 28 Apr 2006 04:12:43 -0000 1.6 --- debug.wx.lua 25 May 2006 03:55:23 -0000 1.7 *************** *** 115,120 **** end ! frame:ConnectEvent(wx.wxEVT_PAINT, Paint) ! frame:ConnectEvent(wx.wxEVT_ERASE_BACKGROUND, function(event) end) function OnLeftDown(event) --- 115,120 ---- end ! frame:Connect(wx.wxEVT_PAINT, Paint) ! frame:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) end) function OnLeftDown(event) *************** *** 172,178 **** end ! frame:ConnectEvent(-1, wx.wxEVT_LEFT_DOWN, OnLeftDown ) ! frame:ConnectEvent(-1, wx.wxEVT_LEFT_UP, OnLeftUp ) ! frame:ConnectEvent(-1, wx.wxEVT_MOTION, OnMotion ) function QuerySaveChanges() --- 172,178 ---- end ! frame:Connect(-1, wx.wxEVT_LEFT_DOWN, OnLeftDown ) ! frame:Connect(-1, wx.wxEVT_LEFT_UP, OnLeftUp ) ! frame:Connect(-1, wx.wxEVT_MOTION, OnMotion ) function QuerySaveChanges() *************** *** 307,318 **** frame:SetStatusText("Welcome to wxLua.") ! frame:ConnectEvent(wx.wxID_EXIT, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) end ) ! frame:ConnectEvent(wx.wxID_NEW, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isOKToContinue = 1 --- 307,316 ---- frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) end ) ! frame:Connect(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isOKToContinue = 1 *************** *** 335,340 **** end ) ! frame:ConnectEvent(wx.wxID_OPEN, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isOKToContinue = 1 --- 333,337 ---- end ) ! frame:Connect(wx.wxID_OPEN, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isOKToContinue = 1 *************** *** 355,360 **** end ) ! frame:ConnectEvent(wx.wxID_SAVE, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isSaved --- 352,356 ---- end ) ! frame:Connect(wx.wxID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isSaved *************** *** 369,374 **** end ) ! frame:ConnectEvent(wx.wxID_SAVEAS, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isSaved = SaveAs() --- 365,369 ---- end ) ! frame:Connect(wx.wxID_SAVEAS, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local isSaved = SaveAs() *************** *** 378,383 **** end ) ! frame:ConnectEvent(wx.wxID_ABOUT, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the Scribble wxLua Sample.', --- 373,377 ---- end ) ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the Scribble wxLua Sample.', *************** *** 387,397 **** end ) ! frame:ConnectEvent(wxID_NOPROMPT, ! wx.wxEVT_UPDATE_UI, function ( event ) end) ! frame:ConnectEvent(wxID_NOPROMPT, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) if config:ReadInt("/Controls/Check", 1) == 1 then --- 381,389 ---- end ) ! frame:Connect(wxID_NOPROMPT, wx.wxEVT_UPDATE_UI, function ( event ) end) ! frame:Connect(wxID_NOPROMPT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) if config:ReadInt("/Controls/Check", 1) == 1 then *************** *** 402,406 **** end ) ! frame:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, function (event) local isOkToClose = 1 --- 394,398 ---- end ) ! frame:Connect(wx.wxEVT_CLOSE_WINDOW, function (event) local isOkToClose = 1 *************** *** 441,446 **** end ) ! frame:ConnectEvent(wxID_DEBUG, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) causeError() --- 433,437 ---- end ) ! frame:Connect(wxID_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) causeError() Index: mdi.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/mdi.wx.lua,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** mdi.wx.lua 28 Apr 2006 04:12:43 -0000 1.8 --- mdi.wx.lua 25 May 2006 03:55:23 -0000 1.9 *************** *** 30,34 **** dc:Delete() -- ALWAYS Delete() any wxDCs created when done end ! child:ConnectEvent(wx.wxEVT_PAINT, Paint) child:Show(true) end --- 30,34 ---- dc:Delete() -- ALWAYS Delete() any wxDCs created when done end ! child:Connect(wx.wxEVT_PAINT, Paint) child:Show(true) end *************** *** 57,67 **** frame:SetStatusText("Welcome to wxLua.") ! frame:ConnectEvent(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) CreateChild() end ) ! frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close() end ) ! frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the MDI wxLua sample.', --- 57,67 ---- frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) CreateChild() end ) ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close() end ) ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the MDI wxLua sample.', Index: fldemo.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/fldemo.wx.lua,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** fldemo.wx.lua 25 Feb 2006 23:29:58 -0000 1.3 --- fldemo.wx.lua 25 May 2006 03:55:23 -0000 1.4 *************** *** 112,122 **** frame:SetStatusText("Welcome to wxLua.") ! frame:ConnectEvent(wx.wxID_EXIT, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) end ) ! frame:ConnectEvent( wx.wxEVT_CLOSE_WINDOW, function ( event ) event:Skip() --- 112,121 ---- frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) end ) ! frame:Connect( wx.wxEVT_CLOSE_WINDOW, function ( event ) event:Skip() *************** *** 125,130 **** end) ! frame:ConnectEvent(wx.wxID_ABOUT, ! wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the FL Demo wxLua sample.', --- 124,128 ---- end) ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox( 'This is the "About" dialog of the FL Demo wxLua sample.', Index: choices.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/choices.wx.lua,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** choices.wx.lua 28 Apr 2006 04:12:43 -0000 1.7 --- choices.wx.lua 25 May 2006 03:55:23 -0000 1.8 *************** *** 83,94 **** notebook:GetBestSize():GetHeight()) ! frame:ConnectEvent(wx.wxID_ANY, wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, HandleEvents) ! frame:ConnectEvent(wx.wxID_ANY, wx.wxEVT_COMMAND_RADIOBOX_SELECTED, HandleEvents) ! frame:ConnectEvent(wx.wxID_ANY, wx.wxEVT_COMMAND_LISTBOX_SELECTED, HandleEvents) ! frame:ConnectEvent(wx.wxID_ANY, wx.wxEVT_COMMAND_COMBOBOX_SELECTED, HandleEvents) ! frame:ConnectEvent(wx.wxID_ANY, wx.wxEVT_COMMAND_CHOICE_SELECTED, HandleEvents) ! frame:ConnectEvent(wx.wxID_ANY, wx.wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, HandleEvents) frame:Show(true) --- 83,94 ---- notebook:GetBestSize():GetHeight()) ! frame:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, HandleEvents) ! frame:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_RADIOBOX_SELECTED, HandleEvents) ! frame:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_LISTBOX_SELECTED, HandleEvents) ! frame:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_COMBOBOX_SELECTED, HandleEvents) ! frame:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_CHOICE_SELECTED, HandleEvents) ! frame:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, HandleEvents) frame:Show(true) Index: minimal.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/minimal.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** minimal.wx.lua 28 Apr 2006 04:12:43 -0000 1.5 --- minimal.wx.lua 25 May 2006 03:55:23 -0000 1.6 *************** *** 43,47 **** -- connect the paint event handler function with the paint event ! panel:ConnectEvent(wx.wxEVT_PAINT, OnPaint) -- create a simple file menu --- 43,47 ---- -- connect the paint event handler function with the paint event ! panel:Connect(wx.wxEVT_PAINT, OnPaint) -- create a simple file menu *************** *** 67,75 **** -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close(true) end ) -- connect the selection event of the about menu item ! frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the Minimal wxLua sample.', --- 67,75 ---- -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close(true) end ) -- connect the selection event of the about menu item ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the Minimal wxLua sample.', Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** wxluasudoku.wx.lua 14 May 2006 07:48:09 -0000 1.46 --- wxluasudoku.wx.lua 25 May 2006 03:55:23 -0000 1.47 *************** *** 2011,2020 **** end ! win:ConnectEvent(wx.wxEVT_ERASE_BACKGROUND, function(event) end) ! win:ConnectEvent(wx.wxEVT_PAINT, sudokuGUI.OnPaintCellWindow) ! win:ConnectEvent(wx.wxEVT_KEY_DOWN, sudokuGUI.OnKeyDownCellWindow ) ! win:ConnectEvent(wx.wxEVT_KEY_UP, sudokuGUI.OnKeyUpCellWindow ) ! win:ConnectEvent(wx.wxEVT_LEFT_DOWN, sudokuGUI.OnLeftClickCellWindow ) ! win:ConnectEvent(wx.wxEVT_LEFT_DCLICK, sudokuGUI.OnLeftDClickCellWindow ) return win end --- 2011,2020 ---- end ! win:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) end) ! win:Connect(wx.wxEVT_PAINT, sudokuGUI.OnPaintCellWindow) ! win:Connect(wx.wxEVT_KEY_DOWN, sudokuGUI.OnKeyDownCellWindow ) ! win:Connect(wx.wxEVT_KEY_UP, sudokuGUI.OnKeyUpCellWindow ) ! win:Connect(wx.wxEVT_LEFT_DOWN, sudokuGUI.OnLeftClickCellWindow ) ! win:Connect(wx.wxEVT_LEFT_DCLICK, sudokuGUI.OnLeftDClickCellWindow ) return win end *************** *** 2375,2383 **** wx.wxDefaultPosition, wx.wxSize(600, 600)) ! previewFrame:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, ! function (event) ! previewFrame:Destroy() ! event:Skip() ! end ) previewFrame:Centre(wx.wxBOTH) --- 2375,2383 ---- wx.wxDefaultPosition, wx.wxSize(600, 600)) ! previewFrame:Connect(wx.wxEVT_CLOSE_WINDOW, ! function (event) ! previewFrame:Destroy() ! event:Skip() ! end ) previewFrame:Centre(wx.wxBOTH) *************** *** 2610,2628 **** --cellTextCtrl:SetValidator(valid) ! sudokuGUI.cellTextCtrl:ConnectEvent(winId, wx.wxEVT_COMMAND_TEXT_ENTER, ! function (event) ! local win = event:GetEventObject():DynamicCast("wxWindow") ! sudokuGUI.SaveCellTextCtrlValue() ! win:Show(false) -- just hide it, we'll destroy it later ! end) ! sudokuGUI.cellTextCtrl:ConnectEvent(wx.wxEVT_CHAR, ! function (event) ! if (event:GetKeyCode() == wx.WXK_ESCAPE) then ! sudokuGUI.cellTextCtrl:Show(false) ! sudokuGUI.cellTextCtrl:SetValue("") ! end ! event:Skip() ! end) end --- 2610,2628 ---- --cellTextCtrl:SetValidator(valid) ! sudokuGUI.cellTextCtrl:Connect(winId, wx.wxEVT_COMMAND_TEXT_ENTER, ! function (event) ! local win = event:GetEventObject():DynamicCast("wxWindow") ! sudokuGUI.SaveCellTextCtrlValue() ! win:Show(false) -- just hide it, we'll destroy it later ! end) ! sudokuGUI.cellTextCtrl:Connect(wx.wxEVT_CHAR, ! function (event) ! if (event:GetKeyCode() == wx.WXK_ESCAPE) then ! sudokuGUI.cellTextCtrl:Show(false) ! sudokuGUI.cellTextCtrl:SetValue("") ! end ! event:Skip() ! end) end *************** *** 3315,3319 **** panel:SetSizer( mainSizer ) ! sampleWin:ConnectEvent(wx.wxEVT_PAINT, function (event) local win = event:GetEventObject():DynamicCast("wxWindow") --- 3315,3319 ---- panel:SetSizer( mainSizer ) ! sampleWin:Connect(wx.wxEVT_PAINT, function (event) local win = event:GetEventObject():DynamicCast("wxWindow") *************** *** 3417,3421 **** end) ! panel:ConnectEvent(ID_LISTBOX, wx.wxEVT_COMMAND_LISTBOX_SELECTED, function (event) local sel = event:GetSelection() + 1 --- 3417,3421 ---- end) ! panel:Connect(ID_LISTBOX, wx.wxEVT_COMMAND_LISTBOX_SELECTED, function (event) local sel = event:GetSelection() + 1 *************** *** 3425,3429 **** end) ! panel:ConnectEvent(ID_FONT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local sel = fcListBox:GetSelection() + 1 --- 3425,3429 ---- end) ! panel:Connect(ID_FONT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local sel = fcListBox:GetSelection() + 1 *************** *** 3439,3443 **** sampleWin:Refresh(false) end) ! panel:ConnectEvent(ID_COLOUR_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local sel = fcListBox:GetSelection() + 1 --- 3439,3443 ---- sampleWin:Refresh(false) end) ! panel:Connect(ID_COLOUR_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local sel = fcListBox:GetSelection() + 1 *************** *** 3453,3457 **** sampleWin:Refresh(false) end) ! panel:ConnectEvent(ID_RESET_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local sel = fcListBox:GetSelection() + 1 --- 3453,3457 ---- sampleWin:Refresh(false) end) ! panel:Connect(ID_RESET_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local sel = fcListBox:GetSelection() + 1 *************** *** 3580,3584 **** end ! panel:ConnectEvent(ID_LISTBOX, wx.wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, function (event) local sel = event:GetSelection() --- 3580,3584 ---- end ! panel:Connect(ID_LISTBOX, wx.wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, function (event) local sel = event:GetSelection() *************** *** 3662,3666 **** end ! panel:ConnectEvent(ID_LISTBOX, wx.wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, function (event) local sel = event:GetSelection() --- 3662,3666 ---- end ! panel:Connect(ID_LISTBOX, wx.wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, function (event) local sel = event:GetSelection() *************** *** 3727,3736 **** mainSizer:SetSizeHints( dialog ) ! dialog:ConnectEvent(wx.wxID_APPLY, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local sel = notebook:GetSelection() if sel >= 0 then notebookPages[sel+1].Apply() end end) ! dialog:ConnectEvent(wx.wxID_OK, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) for n = 1, 3 do --- 3727,3736 ---- mainSizer:SetSizeHints( dialog ) ! dialog:Connect(wx.wxID_APPLY, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) local sel = notebook:GetSelection() if sel >= 0 then notebookPages[sel+1].Apply() end end) ! dialog:Connect(wx.wxID_OK, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) for n = 1, 3 do *************** *** 3741,3745 **** event:Skip() -- wxDialog will cancel automatically end) ! dialog:ConnectEvent(wx.wxID_CANCEL, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) for n = 1, 3 do --- 3741,3745 ---- event:Skip() -- wxDialog will cancel automatically end) ! dialog:Connect(wx.wxID_CANCEL, wx.wxEVT_COMMAND_BUTTON_CLICKED, function (event) for n = 1, 3 do *************** *** 4407,4412 **** -- ------------------------------------------------------------------------ ! sudokuGUI.frame:ConnectEvent(wx.wxID_ANY, wx.wxEVT_COMMAND_MENU_SELECTED, ! sudokuGUI.OnMenuEvent) -- ------------------------------------------------------------------------ --- 4407,4412 ---- -- ------------------------------------------------------------------------ ! sudokuGUI.frame:Connect(wx.wxID_ANY, wx.wxEVT_COMMAND_MENU_SELECTED, ! sudokuGUI.OnMenuEvent) -- ------------------------------------------------------------------------ *************** *** 4470,4474 **** -- After being created - connect the size event to help MSW repaint the -- child windows ! sudokuGUI.frame:ConnectEvent(wx.wxEVT_SIZE, function (event) local width, height = sudokuGUI.frame:GetClientSize() --- 4470,4474 ---- -- After being created - connect the size event to help MSW repaint the -- child windows ! sudokuGUI.frame:Connect(wx.wxEVT_SIZE, function (event) local width, height = sudokuGUI.frame:GetClientSize() *************** *** 4480,4484 **** -- save the config when closing the frame ! sudokuGUI.frame:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, function (event) event:Skip(true) -- allow it to really exit --- 4480,4484 ---- -- save the config when closing the frame ! sudokuGUI.frame:Connect(wx.wxEVT_CLOSE_WINDOW, function (event) event:Skip(true) -- allow it to really exit Index: tree.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/tree.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tree.wx.lua 28 Apr 2006 04:12:43 -0000 1.5 --- tree.wx.lua 25 May 2006 03:55:23 -0000 1.6 *************** *** 37,41 **** -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) --- 37,41 ---- -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) *************** *** 43,47 **** -- connect the selection event of the about menu item ! frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the wxLua wxTreeCtrl sample.', --- 43,47 ---- -- connect the selection event of the about menu item ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the wxLua wxTreeCtrl sample.', *************** *** 89,93 **** -- connect to some events from the wxTreeCtrl ! tree:ConnectEvent( wx.wxEVT_COMMAND_TREE_ITEM_EXPANDING, function( event ) local item_id = event:GetItem() --- 89,93 ---- -- connect to some events from the wxTreeCtrl ! tree:Connect( wx.wxEVT_COMMAND_TREE_ITEM_EXPANDING, function( event ) local item_id = event:GetItem() *************** *** 95,99 **** textCtrl:AppendText(str) end ) ! tree:ConnectEvent( wx.wxEVT_COMMAND_TREE_ITEM_COLLAPSING, function( event ) local item_id = event:GetItem() --- 95,99 ---- textCtrl:AppendText(str) end ) ! tree:Connect( wx.wxEVT_COMMAND_TREE_ITEM_COLLAPSING, function( event ) local item_id = event:GetItem() *************** *** 101,105 **** textCtrl:AppendText(str) end ) ! tree:ConnectEvent( wx.wxEVT_COMMAND_TREE_ITEM_ACTIVATED, function( event ) local item_id = event:GetItem() --- 101,105 ---- textCtrl:AppendText(str) end ) ! tree:Connect( wx.wxEVT_COMMAND_TREE_ITEM_ACTIVATED, function( event ) local item_id = event:GetItem() *************** *** 107,111 **** textCtrl:AppendText(str) end ) ! tree:ConnectEvent( wx.wxEVT_COMMAND_TREE_SEL_CHANGED, function( event ) local item_id = event:GetItem() --- 107,111 ---- textCtrl:AppendText(str) end ) ! tree:Connect( wx.wxEVT_COMMAND_TREE_SEL_CHANGED, function( event ) local item_id = event:GetItem() Index: htmlwin.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/htmlwin.wx.lua,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** htmlwin.wx.lua 28 Apr 2006 04:12:43 -0000 1.8 --- htmlwin.wx.lua 25 May 2006 03:55:23 -0000 1.9 *************** *** 63,67 **** frame:SetStatusText("Welcome to wxLua.") ! frame:ConnectEvent(wx.wxID_PREVIEW, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) --- 63,67 ---- frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_PREVIEW, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) *************** *** 69,73 **** end ) ! frame:ConnectEvent(wx.wxID_PRINT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) --- 69,73 ---- end ) ! frame:Connect(wx.wxID_PRINT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) local printing = wx.wxHtmlEasyPrinting("HtmlWindow.wx.lua", frame) *************** *** 77,81 **** -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) --- 77,81 ---- -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close(true) *************** *** 83,87 **** -- connect the selection event of the about menu item ! frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the wxHtmlWindow wxLua sample.', --- 83,87 ---- -- connect the selection event of the about menu item ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the wxHtmlWindow wxLua sample.', *************** *** 100,104 **** -- when a lua custom tag is parsed in the html, this event handler -- will be invoked ! wx.wxGetApp():ConnectEvent(wx.wxID_ANY, wx.wxEVT_HTML_TAG_HANDLER, function (event) CreateBoundWindow(event) end) --- 100,104 ---- -- when a lua custom tag is parsed in the html, this event handler -- will be invoked ! wx.wxGetApp():Connect(wx.wxID_ANY, wx.wxEVT_HTML_TAG_HANDLER, function (event) CreateBoundWindow(event) end) Index: dialog.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/dialog.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dialog.wx.lua 28 Apr 2006 04:12:43 -0000 1.5 --- dialog.wx.lua 25 May 2006 03:55:23 -0000 1.6 *************** *** 59,63 **** -- Attach an event handler to the CelsiusToFahrenheit button ! dialog:ConnectEvent(ID_CELSIUS_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) local celsiusString = celsiusTextCtrl:GetValue() --- 59,63 ---- -- Attach an event handler to the CelsiusToFahrenheit button ! dialog:Connect(ID_CELSIUS_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) local celsiusString = celsiusTextCtrl:GetValue() *************** *** 74,78 **** -- Attach an event handler to the FahrenheitToCelsius button ! dialog:ConnectEvent(ID_FAHRENHEIT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) local fahrenheitString = fahrenheitTextCtrl:GetValue() --- 74,78 ---- -- Attach an event handler to the FahrenheitToCelsius button ! dialog:Connect(ID_FAHRENHEIT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) local fahrenheitString = fahrenheitTextCtrl:GetValue() *************** *** 89,96 **** -- Attach an event handler to the Close button ! dialog:ConnectEvent(ID_CLOSE_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) dialog:Destroy() end) ! dialog:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, function (event) dialog:Destroy() --- 89,96 ---- -- Attach an event handler to the Close button ! dialog:Connect(ID_CLOSE_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) dialog:Destroy() end) ! dialog:Connect(wx.wxEVT_CLOSE_WINDOW, function (event) dialog:Destroy() *************** *** 99,103 **** -- Attach an event handler to the About button ! dialog:ConnectEvent(ID_ABOUT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) wx.wxMessageBox("Based on the C++ version by Marco Ghislanzoni", --- 99,103 ---- -- Attach an event handler to the About button ! dialog:Connect(ID_ABOUT_BUTTON, wx.wxEVT_COMMAND_BUTTON_CLICKED, function(event) wx.wxMessageBox("Based on the C++ version by Marco Ghislanzoni", Index: editor.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** editor.wx.lua 15 May 2006 21:55:36 -0000 1.17 --- editor.wx.lua 25 May 2006 03:55:23 -0000 1.18 *************** *** 148,152 **** wx.wxCLIP_CHILDREN) ! notebook:ConnectEvent(wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, function ( event ) local selection = event:GetSelection() --- 148,152 ---- wx.wxCLIP_CHILDREN) ! notebook:Connect(wx.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, function ( event ) [...1117 lines suppressed...] if watchListCtrl then --- 1869,1873 ---- end) ! editorApp:Connect(-1, wx.wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, function (event) if watchListCtrl then *************** *** 1951,1955 **** menuBar:Append(helpMenu, "&Help") ! frame:ConnectEvent(ID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, displayAbout) frame:SetStatusWidths{-1, 29, 29, 150} --- 1951,1955 ---- menuBar:Append(helpMenu, "&Help") ! frame:Connect(ID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, displayAbout) frame:SetStatusWidths{-1, 29, 29, 150} Index: grid.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/grid.wx.lua,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** grid.wx.lua 27 Apr 2006 22:53:36 -0000 1.5 --- grid.wx.lua 25 May 2006 03:55:23 -0000 1.6 *************** *** 28,37 **** frame:SetStatusText("Welcome to wxLua.") ! frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close() end ) ! frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the Grid wxLua sample.', --- 28,37 ---- frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) frame:Close() end ) ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, function (event) wx.wxMessageBox('This is the "About" dialog of the Grid wxLua sample.', Index: printing.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/printing.wx.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** printing.wx.lua 28 Apr 2006 04:12:43 -0000 1.9 --- printing.wx.lua 25 May 2006 03:55:23 -0000 1.10 *************** *** 177,185 **** wx.wxSize(600, 650)) ! previewFrame:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, ! function (event) ! previewFrame:Destroy() ! event:Skip() ! end ) previewFrame:Centre(wx.wxBOTH) --- 177,185 ---- wx.wxSize(600, 650)) ! previewFrame:Connect(wx.wxEVT_CLOSE_WINDOW, ! function (event) ! previewFrame:Destroy() ! event:Skip() ! end ) previewFrame:Centre(wx.wxBOTH) *************** *** 230,234 **** -- connect the paint event handler with the paint event ! frame:ConnectEvent(wx.wxEVT_PAINT, Paint) -- create a simple file menu --- 230,234 ---- -- connect the paint event handler with the paint event ! frame:Connect(wx.wxEVT_PAINT, Paint) -- create a simple file menu *************** *** 256,296 **** frame:SetStatusText("Welcome to wxLua.") ! frame:ConnectEvent(ID_PAGESETUP, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! PageSetup() ! end ) ! ! frame:ConnectEvent(ID_PRINTSETUP, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! PrintSetup() ! end ) ! frame:ConnectEvent(ID_PRINTPREVIEW, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! PrintPreview() ! end ) ! frame:ConnectEvent(ID_PRINT, ! wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! Print() ! end ) -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! frame:Close(true) ! end ) -- connect the selection event of the about menu item ! frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox( 'This is the "About" dialog of the Printing wxLua sample.', ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame ) ! end ) -- show the frame window --- 256,284 ---- frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(ID_PAGESETUP, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) PageSetup() end ) ! frame:Connect(ID_PRINTSETUP, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) PrintSetup() end ) + frame:Connect(ID_PRINTPREVIEW, wx.wxEVT_COMMAND_MENU_SELECTED, + function (event) PrintPreview() end ) ! frame:Connect(ID_PRINT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) Print() end ) -- connect the selection event of the exit menu item to an -- event handler that closes the window ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close(true) end ) -- connect the selection event of the about menu item ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox('This is the "About" dialog of the Printing wxLua sample.', ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame ) ! end ) -- show the frame window Index: scribble.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/scribble.wx.lua,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** scribble.wx.lua 28 Apr 2006 04:12:43 -0000 1.8 --- scribble.wx.lua 25 May 2006 03:55:23 -0000 1.9 *************** *** 220,230 **** wx.wxDEFAULT_FRAME_STYLE ) ! frame:ConnectEvent(wx.wxEVT_PAINT, OnPaint) ! frame:ConnectEvent(wx.wxEVT_ERASE_BACKGROUND, function(event) end) ! frame:ConnectEvent(-1, wx.wxEVT_LEFT_DOWN, OnLeftDown ) ! frame:ConnectEvent(-1, wx.wxEVT_LEFT_UP, OnLeftUp ) ! frame:ConnectEvent(-1, wx.wxEVT_MOTION, OnMotion ) local fileMenu = wx.wxMenu() --- 220,230 ---- wx.wxDEFAULT_FRAME_STYLE ) ! frame:Connect(wx.wxEVT_PAINT, OnPaint) ! frame:Connect(wx.wxEVT_ERASE_BACKGROUND, function(event) end) ! frame:Connect(-1, wx.wxEVT_LEFT_DOWN, OnLeftDown ) ! frame:Connect(-1, wx.wxEVT_LEFT_UP, OnLeftUp ) ! frame:Connect(-1, wx.wxEVT_MOTION, OnMotion ) local fileMenu = wx.wxMenu() *************** *** 248,349 **** frame:SetStatusText("Welcome to wxLua.") ! frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! frame:Close(true) ! end ) ! frame:ConnectEvent(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local isOKToContinue = 1 ! if isModified then ! local response = QuerySaveChanges() ! if response == wx.wxID_YES then ! isOKToContinue = SaveChanges() ! elseif response == wx.wxID_CANCEL then ! isOKToContinue = nil ! end ! end ! if isOKToContinue then ! fileName = "" ! frame:SetTitle( "Scribble Demo") ! pointsList = {} ! redrawRequired = true ! frame:Refresh() ! isModified = false ! end ! end ) ! frame:ConnectEvent(wx.wxID_OPEN, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local isOKToContinue = 1 ! if isModified then ! local response = QuerySaveChanges() ! if response == wx.wxID_YES then ! isOKToContinue = SaveChanges() ! elseif response == wx.wxID_CANCEL then ! isOKToContinue = nil ! end ! end ! if isOKToContinue then ! Open() ! redrawRequired = true ! frame:Refresh() ! isModified = false ! end ! end ) ! frame:ConnectEvent(wx.wxID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local isSaved ! if fileName == "" then ! isSaved = SaveAs() ! else ! isSaved = SaveScribbles() ! end ! if isSaved then ! isModified = false ! end ! end ) ! frame:ConnectEvent(wx.wxID_SAVEAS, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local isSaved = SaveAs() ! if isSaved then ! isModified = false ! end ! end ) ! frame:ConnectEvent(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox( 'This is the "About" dialog of the Scribble wxLua Sample.', ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame ) ! end ) ! frame:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, ! function (event) ! local isOkToClose = 1 ! if isModified then ! local dialog = wx.wxMessageDialog( frame, ! "Save changes before exiting?", ! "Save Changes?", ! wx.wxYES_NO + wx.wxCENTRE + wx.wxICON_QUESTION ) ! local result = dialog:ShowModal() ! dialog:Destroy() ! if result == wx.wxID_YES then ! isOkToClose = SaveChanges() ! end ! end ! if isOkToClose then ! -- prevent paint events using the bitmapDC after we ! -- have deleted them ! isRunning = false ! bitmap:Delete() ! -- ensure the event is passed on so ! -- that it is handled ! event:Skip() ! end ! end ) frame:Show(true) --- 248,349 ---- frame:SetStatusText("Welcome to wxLua.") ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! frame:Close(true) ! end ) ! frame:Connect(wx.wxID_NEW, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local isOKToContinue = 1 ! if isModified then ! local response = QuerySaveChanges() ! if response == wx.wxID_YES then ! isOKToContinue = SaveChanges() ! elseif response == wx.wxID_CANCEL then ! isOKToContinue = nil ! end ! end ! if isOKToContinue then ! fileName = "" ! frame:SetTitle( "Scribble Demo") ! pointsList = {} ! redrawRequired = true ! frame:Refresh() ! isModified = false ! end ! end ) ! frame:Connect(wx.wxID_OPEN, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local isOKToContinue = 1 ! if isModified then ! local response = QuerySaveChanges() ! if response == wx.wxID_YES then ! isOKToContinue = SaveChanges() ! elseif response == wx.wxID_CANCEL then ! isOKToContinue = nil ! end ! end ! if isOKToContinue then ! Open() ! redrawRequired = true ! frame:Refresh() ! isModified = false ! end ! end ) ! frame:Connect(wx.wxID_SAVE, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local isSaved ! if fileName == "" then ! isSaved = SaveAs() ! else ! isSaved = SaveScribbles() ! end ! if isSaved then ! isModified = false ! end ! end ) ! frame:Connect(wx.wxID_SAVEAS, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! local isSaved = SaveAs() ! if isSaved then ! isModified = false ! end ! end ) ! frame:Connect(wx.wxID_ABOUT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) ! wx.wxMessageBox('This is the "About" dialog of the Scribble wxLua Sample.', ! "About wxLua", ! wx.wxOK + wx.wxICON_INFORMATION, ! frame ) ! end ) ! frame:Connect(wx.wxEVT_CLOSE_WINDOW, ! function (event) ! local isOkToClose = 1 ! if isModified then ! local dialog = wx.wxMessageDialog( frame, ! "Save changes before exiting?", ! "Save Changes?", ! wx.wxYES_NO + wx.wxCENTRE + wx.wxICON_QUESTION ) ! local result = dialog:ShowModal() ! dialog:Destroy() ! if result == wx.wxID_YES then ! isOkToClose = SaveChanges() ! end ! end ! if isOkToClose then ! -- prevent paint events using the bitmapDC after we ! -- have deleted them ! isRunning = false ! bitmap:Delete() ! -- ensure the event is passed on so ! -- that it is handled ! event:Skip() ! end ! end ) frame:Show(true) Index: luamodule.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/luamodule.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** luamodule.wx.lua 20 May 2006 20:22:24 -0000 1.2 --- luamodule.wx.lua 25 May 2006 03:55:23 -0000 1.3 *************** *** 11,15 **** -- to make this sample script work out-of-the-box, we need to add ! -- to the paths looked by require() all possible locations of the -- wx.dll/.so module. -- Please also note that this sample can be executed only when --- 11,15 ---- -- to make this sample script work out-of-the-box, we need to add ! -- to the paths looked by require() all possible locations of the -- wx.dll/.so module. -- Please also note that this sample can be executed only when *************** *** 31,36 **** menuBar:Append(fileMenu, "&File") frame:SetMenuBar(menuBar) ! frame:ConnectEvent(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close(true) end ) frame:Show(true) --- 31,36 ---- menuBar:Append(fileMenu, "&File") frame:SetMenuBar(menuBar) ! frame:Connect(wx.wxID_EXIT, wx.wxEVT_COMMAND_MENU_SELECTED, ! function (event) frame:Close(true) end ) frame:Show(true) Index: calculator.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/calculator.wx.lua,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** calculator.wx.lua 28 Apr 2006 04:12:43 -0000 1.4 --- calculator.wx.lua 25 May 2006 03:55:23 -0000 1.5 *************** *** 259,282 **** clearDisplay = nil ! dialog:ConnectEvent(ID_0, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_1, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_2, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_3, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_4, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_5, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_6, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_7, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_8, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_9, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_DECIMAL, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:ConnectEvent(ID_EQUALS, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:ConnectEvent(ID_PLUS, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:ConnectEvent(ID_MINUS, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:ConnectEvent(ID_MULTIPLY, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:ConnectEvent(ID_DIVIDE, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:ConnectEvent(ID_OFF, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnQuit) ! dialog:ConnectEvent(ID_CLEAR, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnClear) ! dialog:ConnectEvent(wx.wxEVT_CLOSE_WINDOW, OnQuit) accelTable = wx.wxAcceleratorTable({ --- 259,282 ---- clearDisplay = nil ! dialog:Connect(ID_0, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_1, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_2, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_3, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_4, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_5, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_6, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_7, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_8, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_9, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_DECIMAL, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnNumber) ! dialog:Connect(ID_EQUALS, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:Connect(ID_PLUS, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:Connect(ID_MINUS, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:Connect(ID_MULTIPLY, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:Connect(ID_DIVIDE, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnOperator) ! dialog:Connect(ID_OFF, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnQuit) ! dialog:Connect(ID_CLEAR, wx.wxEVT_COMMAND_BUTTON_CLICKED, OnClear) ! dialog:Connect(wx.wxEVT_CLOSE_WINDOW, OnQuit) accelTable = wx.wxAcceleratorTable({ |
|
From: John L. <jr...@us...> - 2006-05-25 03:55:34
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10746/wxLua/modules/wxlua/include Modified Files: wxlcallb.h Log Message: changed wxEvtHandler::ConnectEvent to Connect update all samples to reflect this add win id ranges to connect add untested wxEvtHandler::Disconnect Index: wxlcallb.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlcallb.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxlcallb.h 14 May 2006 17:45:05 -0000 1.10 --- wxlcallb.h 25 May 2006 03:55:23 -0000 1.11 *************** *** 25,30 **** { public: wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID id, wxEventType eventType, wxEvtHandler *pHandler ); --- 25,32 ---- { public: + // winID and lastID follow the same notation as wxEvtHandler::Connect + // if only one event Id is needed set lastId = wxID_ANY wxLuaCallback( const wxLuaState& state, int theRoutine, ! wxWindowID winId, wxWindowID lastId, wxEventType eventType, wxEvtHandler *pHandler ); *************** *** 57,60 **** --- 59,63 ---- wxEvtHandler* m_pHandler; wxWindowID m_id; + wxWindowID m_lastId; wxEventType m_eventType; |
|
From: John L. <jr...@us...> - 2006-05-25 03:55:34
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10746/wxLua/modules/wxbind/src Modified Files: event.cpp Log Message: changed wxEvtHandler::ConnectEvent to Connect update all samples to reflect this add win id ranges to connect add untested wxEvtHandler::Disconnect Index: event.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/event.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** event.cpp 18 May 2006 05:47:39 -0000 1.19 --- event.cpp 25 May 2006 03:55:23 -0000 1.20 *************** *** 66,71 **** } ! // %override wxLua_wxEvtHandler_ConnectEvent ! // void ConnectEvent() #include "wxlua/include/wxlcallb.h" --- 66,71 ---- } ! // %override wxLua_wxEvtHandler_Connect ! // void Connect(int id, int lastId, wxEventType eventType, LuaFunction func) #include "wxlua/include/wxlcallb.h" *************** *** 79,83 **** // which is a reference to the event object // associated with the event. ! static int LUACALL wxLua_wxEvtHandler_ConnectEvent(lua_State *L) { wxCHECK_MSG(s_wxluatag_wxEvtHandler != -1, 0, wxT("wxEvtHandler is not wrapped by wxLua")); --- 79,83 ---- // which is a reference to the event object // associated with the event. ! static int LUACALL wxLua_wxEvtHandler_Connect(lua_State *L) { wxCHECK_MSG(s_wxluatag_wxEvtHandler != -1, 0, wxT("wxEvtHandler is not wrapped by wxLua")); *************** *** 85,90 **** wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! int id; ! double eventType = 0; wxLuaCallback *pCallback = NULL; --- 85,91 ---- wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! int winId = wxID_ANY; ! int lastId = wxID_ANY; ! int eventType = 0; wxLuaCallback *pCallback = NULL; *************** *** 93,111 **** wxEvtHandler *evtHandler = (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler); switch (nParams) { ! case 4: { ! if (!lua_isfunction(L, 4)) ! { ! wxlState.terror("wxLua: ConnectEvent: Callback function is not a valid Lua function for parameter 3."); ! return 0; ! } if (wxlState.IsNumberType(3)) ! eventType = lua_tonumber(L, 3); else { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid event type, expected a number for parameter 2, got '%s'."), wxlState.lua_TypeNameIndex(3).c_str())); return 0; --- 94,112 ---- wxEvtHandler *evtHandler = (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler); + int func_idx = 0; + int evttype_idx = 0; + switch (nParams) { ! case 5: { ! func_idx = 5; ! evttype_idx = 4; if (wxlState.IsNumberType(3)) ! lastId = (int)lua_tonumber(L, 3); else { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid lastId, expected a number for parameter 2, got '%s'."), wxlState.lua_TypeNameIndex(3).c_str())); return 0; *************** *** 113,161 **** if (wxlState.IsNumberType(2)) ! id = (int)lua_tonumber(L, 2); else { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid id, expected a number for parameter 1, got '%s'."), ! wxlState.lua_TypeNameIndex(3).c_str())); return 0; } - // Create and connect the callback - pCallback = new wxLuaCallback(wxlState, 4, id, (int) eventType, evtHandler); - break; } ! case 3: { ! if (!lua_isfunction(L, 3)) { ! wxlState.terror("wxLua: ConnectEvent: Callback function is not a valid Lua function for parameter 2."); return 0; } if (evtHandler->IsKindOf(CLASSINFO(wxWindow))) { // FIXME! bug in Mac this is the fix ! #if defined(__WXMAC__) && !wxCHECK_VERSION(2,6,0) ! id = -1; ! #else ! id = ((wxWindow *)evtHandler)->GetId(); #endif } else { ! wxlState.terror("wxLua: ConnectEvent: Unexpected event object type, expected a wxWindow."); return 0; } if (wxlState.IsNumberType(2)) { ! eventType = lua_tonumber(L, 2); ! // Create and connect the callback ! pCallback = new wxLuaCallback(wxlState, 3, id, (int) eventType, evtHandler); } else { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid event type, expected a number for parameter 1, got '%s'."), wxlState.lua_TypeNameIndex(2).c_str())); return 0; --- 114,249 ---- if (wxlState.IsNumberType(2)) ! winId = (int)lua_tonumber(L, 2); else { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid winId, expected a number for parameter 1, got '%s'."), ! wxlState.lua_TypeNameIndex(2).c_str())); return 0; } break; } ! case 4: { ! func_idx = 4; ! evttype_idx = 3; ! ! if (wxlState.IsNumberType(2)) ! winId = (int)lua_tonumber(L, 2); ! else { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid id, expected a number for parameter 1, got '%s'."), ! wxlState.lua_TypeNameIndex(2).c_str())); return 0; } + break; + } + case 3: + { + func_idx = 3; + evttype_idx = 2; + /* + // Is this right? wxWidgets just uses wxID_ANY for no winId overload if (evtHandler->IsKindOf(CLASSINFO(wxWindow))) { // FIXME! bug in Mac this is the fix ! #if !defined(__WXMAC__) || wxCHECK_VERSION(2,6,0) ! winId = ((wxWindow *)evtHandler)->GetId(); ! wxPrintf(wxT("winId %d\n"), winId); #endif } else { ! wxlState.terror("wxLua: Connect: Unexpected event object type, expected a wxWindow."); ! return 0; ! } ! */ ! break; ! } ! default: ! { ! wxlState.terror("wxLua: Connect: Incorrect number of parameters."); ! return 0; ! } ! } ! ! if (!lua_isfunction(L, func_idx)) ! { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Callback function is not a valid Lua function for parameter %d."), ! func_idx-1)); // -1 for self ! return 0; ! } ! ! if (wxlState.IsNumberType(evttype_idx)) ! eventType = lua_tonumber(L, evttype_idx); ! else ! { ! wxlState.terror(wxString::Format(wxT("wxLua: Connect: Invalid event type, expected a number for parameter %d, got '%s'."), ! evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); ! return 0; ! } ! ! // Create and connect the callback ! pCallback = new wxLuaCallback(wxlState, nParams, winId, lastId, eventType, evtHandler); ! ! return 0; ! } ! ! // %override wxLua_wxEvtHandler_Disconnect ! // void Disconnect(int id, int lastId, wxEventType eventType) ! ! #include "wxlua/include/wxlcallb.h" ! static int LUACALL wxLua_wxEvtHandler_Disconnect(lua_State *L) ! { ! wxCHECK_MSG(s_wxluatag_wxEvtHandler != -1, 0, wxT("wxEvtHandler is not wrapped by wxLua")); ! wxLuaState wxlState(L); ! wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); ! ! int winId = wxID_ANY; ! int lastId = wxID_ANY; ! int eventType = 0; ! ! int nParams = lua_gettop(L); ! ! wxEvtHandler *evtHandler = (wxEvtHandler *)wxlState.GetUserDataType(1, s_wxluatag_wxEvtHandler); ! ! int evttype_idx = 0; ! ! switch (nParams) ! { ! case 4: ! { ! evttype_idx = 4; ! ! if (wxlState.IsNumberType(3)) ! lastId = (int)lua_tonumber(L, 3); ! else ! { ! wxlState.terror(wxString::Format(wxT("wxLua: Disconnect: Invalid lastId, expected a number for parameter 2, got '%s'."), ! wxlState.lua_TypeNameIndex(3).c_str())); return 0; } if (wxlState.IsNumberType(2)) + winId = (int)lua_tonumber(L, 2); + else { ! wxlState.terror(wxString::Format(wxT("wxLua: Disconnect: Invalid winId, expected a number for parameter 1, got '%s'."), ! wxlState.lua_TypeNameIndex(2).c_str())); ! return 0; } + + break; + } + case 3: + { + evttype_idx = 3; + + if (wxlState.IsNumberType(2)) + winId = (int)lua_tonumber(L, 2); else { ! wxlState.terror(wxString::Format(wxT("wxLua: Disconnect: Invalid id, expected a number for parameter 1, got '%s'."), wxlState.lua_TypeNameIndex(2).c_str())); return 0; *************** *** 164,174 **** break; } ! default: { ! wxlState.terror("wxLua: ConnectEvent: Incorrect number of parameters."); break; } } ! return 0; } --- 252,282 ---- break; } ! case 2: { ! evttype_idx = 2; ! break; } + default: + { + wxlState.terror("wxLua: Disconnect: Incorrect number of parameters."); + return 0; + } } ! ! if (wxlState.IsNumberType(evttype_idx)) ! eventType = lua_tonumber(L, evttype_idx); ! else ! { ! wxlState.terror(wxString::Format(wxT("wxLua: ConnectEvent: Invalid event type, expected a number for parameter %d, got '%s'."), ! evttype_idx - 1, wxlState.lua_TypeNameIndex(evttype_idx).c_str())); ! return 0; ! } ! ! // Try to disconnect from the callback ! bool returns = evtHandler->Disconnect(winId, lastId, eventType, (wxObjectEventFunction)&wxLuaCallback::EventHandler); ! ! lua_pushboolean(L, returns); ! return 1; } *************** *** 261,265 **** { LuaConstructor, "wxEvtHandler", wxLua_wxEvtHandler_constructor, 0, 0, { 0 } }, { LuaMethod, "AddPendingEvent", wxLua_wxEvtHandler_AddPendingEvent, 1, 1, { &s_wxluatag_wxEvent, 0 } }, ! { LuaMethod, "ConnectEvent", wxLua_wxEvtHandler_ConnectEvent, 0, 0, { 0 } }, { LuaMethod, "GetClientObject", wxLua_wxEvtHandler_GetClientObject, 0, 0, { 0 } }, { LuaMethod, "GetEvtHandlerEnabled", wxLua_wxEvtHandler_GetEvtHandlerEnabled, 0, 0, { 0 } }, --- 369,374 ---- { LuaConstructor, "wxEvtHandler", wxLua_wxEvtHandler_constructor, 0, 0, { 0 } }, { LuaMethod, "AddPendingEvent", wxLua_wxEvtHandler_AddPendingEvent, 1, 1, { &s_wxluatag_wxEvent, 0 } }, ! { LuaMethod, "Connect", wxLua_wxEvtHandler_Connect, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_LuaFunction, 0 } }, ! { LuaMethod, "Disconnect", wxLua_wxEvtHandler_Disconnect, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, { LuaMethod, "GetClientObject", wxLua_wxEvtHandler_GetClientObject, 0, 0, { 0 } }, { LuaMethod, "GetEvtHandlerEnabled", wxLua_wxEvtHandler_GetEvtHandlerEnabled, 0, 0, { 0 } }, |
|
From: John L. <jr...@us...> - 2006-05-25 01:19:13
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21513/wxLua/bindings/wxwidgets Modified Files: wx_rules.lua Log Message: regen wxluacan bindings cleanup rules files Index: wx_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_rules.lua,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wx_rules.lua 20 May 2006 19:40:19 -0000 1.15 --- wx_rules.lua 25 May 2006 01:19:07 -0000 1.16 *************** *** 22,26 **** output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! output_cpp_impexpsymbol = "WXDLLIMPEXP_WXBIND" output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXBIND" --- 22,30 ---- output_cpp_filepath = wxlua_dir.."modules/wxbind/src" ! --============================================================================= ! -- Set the DLLIMPEXP macros for compiling these bindings into a DLL ! -- Set to "" for no IMPEXP macros ! ! output_cpp_impexpsymbol = "WXDLLIMPEXP_WXBIND" output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXBIND" *************** *** 150,154 **** ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden. -- The files are loaded from the interface_filepath. override_fileTable = { "override.hpp" } --- 154,159 ---- ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden or empty ! -- table {} for none. -- The files are loaded from the interface_filepath. override_fileTable = { "override.hpp" } |
|
From: John L. <jr...@us...> - 2006-05-25 01:19:13
|
Update of /cvsroot/wxlua/wxLua/apps/wxluacan/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21513/wxLua/apps/wxluacan/src Modified Files: wxluacan.cpp wxluacan.h wxluacan_bind.cpp wxluacan_rules.lua Log Message: regen wxluacan bindings cleanup rules files Index: wxluacan.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wxluacan.cpp 23 Apr 2006 19:36:48 -0000 1.12 --- wxluacan.cpp 25 May 2006 01:19:07 -0000 1.13 *************** *** 163,167 **** - // Overloaded function bindings --- 163,166 ---- *************** *** 174,178 **** { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } }, ! { LuaDelete, "wxlCanObj", wxLua_wxlCanObj_destructor, 0, 0, {0} }, #if wxLUA_USE_wxColourPenBrush --- 173,177 ---- { LuaMethod, "SetPending", wxLua_wxlCanObj_SetPending, 1, 0, { &s_wxluaarg_Boolean, 0 } }, { LuaMethod, "AddObject", wxLua_wxlCanObj_AddObject, 1, 1, { &s_wxluatag_wxlCanObj, 0 } }, ! { LuaDelete, "wxlCanObj", wxLua_wxlCanObj_destructor, 0, 0, {0} }, #if wxLUA_USE_wxColourPenBrush *************** *** 222,226 **** - // Overloaded function bindings --- 221,224 ---- *************** *** 228,232 **** static WXLUAMETHOD s_wxlCanObjRect_methods[] = { { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjRect", wxLua_wxlCanObjRect_destructor, 0, 0, {0} }, }; --- 226,230 ---- static WXLUAMETHOD s_wxlCanObjRect_methods[] = { { LuaConstructor, "wxlCanObjRect", wxLua_wxlCanObjRect_constructor, 4, 4, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjRect", wxLua_wxlCanObjRect_destructor, 0, 0, {0} }, }; *************** *** 268,272 **** - // Overloaded function bindings --- 266,269 ---- *************** *** 274,278 **** static WXLUAMETHOD s_wxlCanObjCircle_methods[] = { { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjCircle", wxLua_wxlCanObjCircle_destructor, 0, 0, {0} }, }; --- 271,275 ---- static WXLUAMETHOD s_wxlCanObjCircle_methods[] = { { LuaConstructor, "wxlCanObjCircle", wxLua_wxlCanObjCircle_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlCanObjCircle", wxLua_wxlCanObjCircle_destructor, 0, 0, {0} }, }; *************** *** 314,318 **** - // Overloaded function bindings --- 311,314 ---- *************** *** 320,324 **** static WXLUAMETHOD s_wxlCanObjScript_methods[] = { { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjScript", wxLua_wxlCanObjScript_destructor, 0, 0, {0} }, }; --- 316,320 ---- static WXLUAMETHOD s_wxlCanObjScript_methods[] = { { LuaConstructor, "wxlCanObjScript", wxLua_wxlCanObjScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjScript", wxLua_wxlCanObjScript_destructor, 0, 0, {0} }, }; *************** *** 374,378 **** - // Overloaded function bindings --- 370,373 ---- *************** *** 381,385 **** { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_destructor, 0, 0, {0} }, }; --- 376,380 ---- { LuaConstructor, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_constructor, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, { LuaMethod, "SetScript", wxLua_wxlCanObjAddScript_SetScript, 1, 1, { &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxlCanObjAddScript", wxLua_wxlCanObjAddScript_destructor, 0, 0, {0} }, }; *************** *** 473,477 **** - // Overloaded function bindings --- 468,471 ---- *************** *** 481,485 **** { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, { 0 } }, { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, { 0 } }, ! { LuaDelete, "wxlCan", wxLua_wxlCan_destructor, 0, 0, {0} }, #if wxLUA_USE_wxPointSizeRect --- 475,479 ---- { LuaMethod, "GetYaxis", wxLua_wxlCan_GetYaxis, 0, 0, { 0 } }, { LuaMethod, "GetCmdh", wxLua_wxlCan_GetCmdh, 0, 0, { 0 } }, ! { LuaDelete, "wxlCan", wxLua_wxlCan_destructor, 0, 0, {0} }, #if wxLUA_USE_wxPointSizeRect *************** *** 544,548 **** - // Overloaded function bindings --- 538,541 ---- *************** *** 551,555 **** { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 } }, { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_destructor, 0, 0, {0} }, }; --- 544,548 ---- { LuaConstructor, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_constructor, 2, 1, { &s_wxluatag_wxlCan, &s_wxluaarg_Number, 0 } }, { LuaMethod, "MoveObject", wxLua_wxlLuaCanCmd_MoveObject, 3, 3, { &s_wxluaarg_Number, &s_wxluaarg_Number, &s_wxluaarg_Number, 0 } }, ! { LuaDelete, "wxlLuaCanCmd", wxLua_wxlLuaCanCmd_destructor, 0, 0, {0} }, }; Index: wxluacan.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wxluacan.h 17 Apr 2006 22:42:29 -0000 1.10 --- wxluacan.h 25 May 2006 01:19:07 -0000 1.11 *************** *** 29,67 **** // bind wxLuaBinding_wxluacan to a single wxLuaState ! extern bool wxLuaBinding_wxluacan_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxluacan for all wxLuaStates ! extern bool wxLuaBinding_wxluacan_init(); #include "canlua.h" #include "cansim.h" - #include "cancom.h" - #include "wxlua/include/internal.h" #include "wx/gdicmn.h" // Lua Tag Method Values for each Class ! extern int s_wxluatag_wxlCanObjAddScript; ! extern int s_wxluatag_wxlLuaCanCmd; ! extern int s_wxluatag_wxlCan; ! extern int s_wxluatag_wxlCanObjScript; ! extern int s_wxluatag_wxlCanObjCircle; ! extern int s_wxluatag_wxlCanObjRect; ! extern int s_wxluatag_wxlCanObj; // Method Table ! extern WXLUAMETHOD* wxlCanObjAddScript_methods; ! extern int wxlCanObjAddScript_methodCount; ! extern WXLUAMETHOD* wxlLuaCanCmd_methods; ! extern int wxlLuaCanCmd_methodCount; ! extern WXLUAMETHOD* wxlCan_methods; ! extern int wxlCan_methodCount; ! extern WXLUAMETHOD* wxlCanObjScript_methods; ! extern int wxlCanObjScript_methodCount; ! extern WXLUAMETHOD* wxlCanObjCircle_methods; ! extern int wxlCanObjCircle_methodCount; ! extern WXLUAMETHOD* wxlCanObjRect_methods; ! extern int wxlCanObjRect_methodCount; ! extern WXLUAMETHOD* wxlCanObj_methods; ! extern int wxlCanObj_methodCount; --- 29,67 ---- // bind wxLuaBinding_wxluacan to a single wxLuaState ! extern bool wxLuaBinding_wxluacan_bind(const wxLuaState& wxlState); // initialize wxLuaBinding_wxluacan for all wxLuaStates ! extern bool wxLuaBinding_wxluacan_init(); + #include "cancom.h" #include "canlua.h" #include "cansim.h" #include "wx/gdicmn.h" + #include "wxlua/include/internal.h" // Lua Tag Method Values for each Class ! extern (int) s_wxluatag_wxlCan; ! extern (int) s_wxluatag_wxlCanObj; ! extern (int) s_wxluatag_wxlCanObjAddScript; ! extern (int) s_wxluatag_wxlCanObjCircle; ! extern (int) s_wxluatag_wxlCanObjRect; ! extern (int) s_wxluatag_wxlCanObjScript; ! extern (int) s_wxluatag_wxlLuaCanCmd; // Method Table ! extern WXLUAMETHOD* wxlCan_methods; ! extern (int) wxlCan_methodCount; ! extern WXLUAMETHOD* wxlCanObj_methods; ! extern (int) wxlCanObj_methodCount; ! extern WXLUAMETHOD* wxlCanObjAddScript_methods; ! extern (int) wxlCanObjAddScript_methodCount; ! extern WXLUAMETHOD* wxlCanObjCircle_methods; ! extern (int) wxlCanObjCircle_methodCount; ! extern WXLUAMETHOD* wxlCanObjRect_methods; ! extern (int) wxlCanObjRect_methodCount; ! extern WXLUAMETHOD* wxlCanObjScript_methods; ! extern (int) wxlCanObjScript_methodCount; ! extern WXLUAMETHOD* wxlLuaCanCmd_methods; ! extern (int) wxlLuaCanCmd_methodCount; Index: wxluacan_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_bind.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** wxluacan_bind.cpp 24 Apr 2006 02:33:26 -0000 1.5 --- wxluacan_bind.cpp 25 May 2006 01:19:07 -0000 1.6 *************** *** 93,118 **** ! // %function wxlLuaCanCmd* GetCmdhMain() ! static int LUACALL wxLua_function_GetCmdhMain(lua_State *L) { wxLuaState wxlState(L); ! wxlLuaCanCmd *returns; ! // call GetCmdhMain ! returns = GetCmdhMain(); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns); return 1; } ! // %function wxlCan* GetCan() ! static int LUACALL wxLua_function_GetCan(lua_State *L) { wxLuaState wxlState(L); ! wxlCan *returns; ! // call GetCan ! returns = GetCan(); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlCan, returns); return 1; --- 93,118 ---- ! // %function wxlCan* GetCan() ! static int LUACALL wxLua_function_GetCan(lua_State *L) { wxLuaState wxlState(L); ! wxlCan *returns; ! // call GetCan ! returns = GetCan(); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlCan, returns); return 1; } ! // %function wxlLuaCanCmd* GetCmdhMain() ! static int LUACALL wxLua_function_GetCmdhMain(lua_State *L) { wxLuaState wxlState(L); ! wxlLuaCanCmd *returns; ! // call GetCmdhMain ! returns = GetCmdhMain(); // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxlLuaCanCmd, returns); return 1; *************** *** 125,130 **** static WXLUAMETHOD functionList[] = { - { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, { 0 } }, { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, { 0 } }, { LuaGlobal, 0, 0, 0, 0, {0} }, }; --- 125,130 ---- static WXLUAMETHOD functionList[] = { { LuaGlobal, "GetCan", wxLua_function_GetCan, 0, 0, { 0 } }, + { LuaGlobal, "GetCmdhMain", wxLua_function_GetCmdhMain, 0, 0, { 0 } }, { LuaGlobal, 0, 0, 0, 0, {0} }, }; *************** *** 133,136 **** --- 133,157 ---- } + + + WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count) + { + static WXLUACLASS classList[] = + { + { "wxlCan", wxlCan_methods, wxlCan_methodCount, -1, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow" }, + { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, -1, NULL, &s_wxluatag_wxlCanObj, "wxObject" }, + { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj" }, + { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, -1, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj" }, + { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, -1, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj" }, + { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj" }, + { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, -1, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor" }, + { 0, 0, 0, 0, 0, 0, 0 }, + }; + count = (sizeof(classList)/sizeof(classList[0])) - 1; + + return classList; + } + + // ---------------------------------------------------------------------------- // wxLuaGetClassList_wxluacan() is called to register classes *************** *** 203,222 **** - - WXLUACLASS* wxLuaGetClassList_wxluacan(size_t &count) - { - static WXLUACLASS classList[] = - { - { "wxlCanObjAddScript", wxlCanObjAddScript_methods, wxlCanObjAddScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjAddScript, "wxlCanObj" }, - { "wxlLuaCanCmd", wxlLuaCanCmd_methods, wxlLuaCanCmd_methodCount, -1, NULL, &s_wxluatag_wxlLuaCanCmd, "wxCommandProcessor" }, - { "wxlCan", wxlCan_methods, wxlCan_methodCount, -1, NULL, &s_wxluatag_wxlCan, "wxScrolledWindow" }, - { "wxlCanObjScript", wxlCanObjScript_methods, wxlCanObjScript_methodCount, -1, NULL, &s_wxluatag_wxlCanObjScript, "wxlCanObj" }, - { "wxlCanObjCircle", wxlCanObjCircle_methods, wxlCanObjCircle_methodCount, -1, NULL, &s_wxluatag_wxlCanObjCircle, "wxlCanObj" }, - { "wxlCanObjRect", wxlCanObjRect_methods, wxlCanObjRect_methodCount, -1, NULL, &s_wxluatag_wxlCanObjRect, "wxlCanObj" }, - { "wxlCanObj", wxlCanObj_methods, wxlCanObj_methodCount, -1, NULL, &s_wxluatag_wxlCanObj, "wxObject" }, - { 0, 0, 0, 0, 0, 0, 0 }, - }; - count = (sizeof(classList)/sizeof(classList[0])) - 1; - - return classList; - } --- 224,225 ---- Index: wxluacan_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/apps/wxluacan/src/wxluacan_rules.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wxluacan_rules.lua 24 Apr 2006 02:33:26 -0000 1.9 --- wxluacan_rules.lua 25 May 2006 01:19:07 -0000 1.10 *************** *** 22,25 **** --- 22,32 ---- output_cpp_filepath = "." + --============================================================================= + -- Set the DLLIMPEXP macros for compiling these bindings into a DLL + -- Set to "" for no IMPEXP macros + + output_cpp_impexpsymbol = "" + output_cpp_impexpdatasymbol = "" + ------------------------------------------------------------------------------- -- Set the name of the header file that will have the #includes from the *************** *** 77,81 **** ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden. -- The files are loaded from the interface_filepath. override_fileTable = {} --- 84,89 ---- ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden or empty ! -- table {} for none. -- The files are loaded from the interface_filepath. override_fileTable = {} |
|
From: John L. <jr...@us...> - 2006-05-25 01:19:11
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21513/wxLua/bindings/wxstc Modified Files: wxstc_rules.lua Log Message: regen wxluacan bindings cleanup rules files Index: wxstc_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_rules.lua,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxstc_rules.lua 24 May 2006 04:50:00 -0000 1.15 --- wxstc_rules.lua 25 May 2006 01:19:07 -0000 1.16 *************** *** 22,26 **** output_cpp_filepath = wxlua_dir.."modules/wxbindstc/src" ! output_cpp_impexpsymbol = "WXDLLIMPEXP_WXBINDSTC" output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXBINDSTC" --- 22,30 ---- output_cpp_filepath = wxlua_dir.."modules/wxbindstc/src" ! --============================================================================= ! -- Set the DLLIMPEXP macros for compiling these bindings into a DLL ! -- Set to "" for no IMPEXP macros ! ! output_cpp_impexpsymbol = "WXDLLIMPEXP_WXBINDSTC" output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXBINDSTC" *************** *** 85,89 **** ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden. -- The files are loaded from the interface_filepath. override_fileTable = { "override.hpp" } --- 89,94 ---- ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden or empty ! -- table {} for none. -- The files are loaded from the interface_filepath. override_fileTable = { "override.hpp" } |
|
From: John L. <jr...@us...> - 2006-05-25 01:19:11
|
Update of /cvsroot/wxlua/wxLua/bindings/wxluasocket In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv21513/wxLua/bindings/wxluasocket Modified Files: wxluasocket_rules.lua Log Message: regen wxluacan bindings cleanup rules files Index: wxluasocket_rules.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxluasocket/wxluasocket_rules.lua,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxluasocket_rules.lua 24 May 2006 04:53:46 -0000 1.1 --- wxluasocket_rules.lua 25 May 2006 01:19:07 -0000 1.2 *************** *** 22,25 **** --- 22,29 ---- output_cpp_filepath = wxlua_dir.."modules/wxluasocket/src" + --============================================================================= + -- Set the DLLIMPEXP macros for compiling these bindings into a DLL + -- Set to "" for no IMPEXP macros + output_cpp_impexpsymbol = "WXDLLIMPEXP_WXLUASOCKET" output_cpp_impexpdatasymbol = "WXDLLIMPEXP_DATA_WXLUASOCKET" *************** *** 86,90 **** ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden. -- The files are loaded from the interface_filepath. override_fileTable = { "override.hpp" } --- 90,95 ---- ------------------------------------------------------------------------------- ! -- A list of files that contain bindings that need to be overridden or empty ! -- table {} for none. -- The files are loaded from the interface_filepath. override_fileTable = { "override.hpp" } |
