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...> - 2007-06-27 03:12:02
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13326/wxLua/docs Modified Files: wxluaref.html Log Message: Unicode compilation fix for genwxbind Add wxRenderer to bindings Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** wxluaref.html 26 Jun 2007 16:15:48 -0000 1.34 --- wxluaref.html 27 Jun 2007 03:11:27 -0000 1.35 *************** *** 1394,1397 **** --- 1394,1402 ---- <td>Lua tables are hash tables <tr> + <td><a href="#wxHeaderButtonParams">wxHeaderButtonParams</a> + <td bgcolor=FFAAAA> + <td align="center" bgcolor=AAFFAA>X + <td> + <tr> <td><a href="#wxHelpController">wxHelpController</a> <td align="center" bgcolor=AAFFAA>X *************** *** 1674,1677 **** --- 1679,1687 ---- <td> <tr> + <td><a href="#wxLanguageInfo">wxLanguageInfo</a> + <td bgcolor=FFAAAA> + <td align="center" bgcolor=AAFFAA>X + <td> + <tr> <td><a href="#wxLayoutAlgorithm">wxLayoutAlgorithm</a> <td align="center" bgcolor=AAFFAA>X *************** *** 2344,2355 **** <td> <tr> ! <td>wxRendererNative <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> ! <td>wxRendererVersion <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> --- 2354,2365 ---- <td> <tr> ! <td><a href="#wxRendererNative">wxRendererNative</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> ! <td><a href="#wxRendererVersion">wxRendererVersion</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> *************** *** 2669,2675 **** <td> <tr> ! <td>wxSplitterRenderParams <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> --- 2679,2685 ---- <td> <tr> ! <td><a href="#wxSplitterRenderParams">wxSplitterRenderParams</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> *************** *** 3296,3299 **** --- 3306,3310 ---- <a href="#wxGridCellAttr::wxAttrKind">wxGridCellAttr::wxAttrKind</a><br> <a href="#wxGridTableRequest">wxGridTableRequest</a><br> + <a href="#wxHeaderSortIconType">wxHeaderSortIconType</a><br> <a href="#wxHelpEvent::Origin">wxHelpEvent::Origin</a><br> <a href="#wxHelpSearchMode">wxHelpSearchMode</a><br> *************** *** 3334,3337 **** --- 3345,3349 ---- <a href="#wxRegionContain">wxRegionContain</a><br> <a href="#wxRelationship">wxRelationship</a><br> + <a href="#wxRendererVersion::dummy">wxRendererVersion::dummy</a><br> <a href="#wxSashDragStatus">wxSashDragStatus</a><br> <a href="#wxSashEdgePosition">wxSashEdgePosition</a><br> *************** *** 7695,7700 **** </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <b><font size=+1 color=#DD0000><i>%struct</i> <a name="wxLanguageInfo">wxLanguageInfo</a></font></b> <blockquote> <font color=#CC6600> <i>%member</i> int Language; <font color=#009900>// <a href="#wxLanguage">wxLanguage</a> id</font></font><br> <font color=#CC6600> <i>%member</i> <a href="#wxString">wxString</a> CanonicalName; <font color=#009900>// Canonical name, e.g. fr_FR</font></font><br> --- 7707,7714 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <b><font size=+1 color=#DD0000><i>%struct</i> <i>%delete</i> <i>%encapsulate</i> <a name="wxLanguageInfo">wxLanguageInfo</a></font></b> <blockquote> + <a href="#wxLanguageInfo">wxLanguageInfo</a>() <font color=#009900>// you must set all the values by hand</font><br> + <br> <font color=#CC6600> <i>%member</i> int Language; <font color=#009900>// <a href="#wxLanguage">wxLanguage</a> id</font></font><br> <font color=#CC6600> <i>%member</i> <a href="#wxString">wxString</a> CanonicalName; <font color=#009900>// Canonical name, e.g. fr_FR</font></font><br> *************** *** 7825,7832 **** <font color=#AA0000><i>%function</i> <a href="#wxLocale">wxLocale</a>* wxGetLocale()</font><br> <br> ! <font color=#AA0000><i>%wxchkver_2_8</i> <i>%function</i> <a href="#wxString">wxString</a> wxGetTranslation(const <a href="#wxString">wxString</a>& sz, const <a href="#wxString">wxString</a>& domain="")</font><br> <font color=#AA0000>!<i>%wxchkver_2_8</i> <i>%function</i> <a href="#wxString">wxString</a> wxGetTranslation(const <a href="#wxString">wxString</a>& sz)</font><br> <br> ! <font color=#990099><i>%wxchkver_2_8</i> <i>%rename</i> wxGetTranslationPlural <i>%function</i> <a href="#wxString">wxString</a> wxGetTranslation(const <a href="#wxString">wxString</a>& sz1, const <a href="#wxString">wxString</a>& sz2, size_t n, const <a href="#wxString">wxString</a>& domain="")</font><br> <font color=#990099>!<i>%wxchkver_2_8</i> <i>%rename</i> wxGetTranslationPlural <i>%function</i> <a href="#wxString">wxString</a> wxGetTranslation(const <a href="#wxString">wxString</a>& sz1, const <a href="#wxString">wxString</a>& sz2, size_t n)</font><br> <br> --- 7839,7846 ---- <font color=#AA0000><i>%function</i> <a href="#wxLocale">wxLocale</a>* wxGetLocale()</font><br> <br> ! <font color=#AA0000><i>%wxchkver_2_8</i> <i>%function</i> <a href="#wxString">wxString</a> wxGetTranslation(const <a href="#wxString">wxString</a>& sz, const wxChar* domain=NULL)</font><br> <font color=#AA0000>!<i>%wxchkver_2_8</i> <i>%function</i> <a href="#wxString">wxString</a> wxGetTranslation(const <a href="#wxString">wxString</a>& sz)</font><br> <br> ! <font color=#990099><i>%wxchkver_2_8</i> <i>%rename</i> wxGetTranslationPlural <i>%function</i> <a href="#wxString">wxString</a> wxGetTranslation(const <a href="#wxString">wxString</a>& sz1, const <a href="#wxString">wxString</a>& sz2, size_t n, const wxChar* domain=NULL)</font><br> <font color=#990099>!<i>%wxchkver_2_8</i> <i>%rename</i> wxGetTranslationPlural <i>%function</i> <a href="#wxString">wxString</a> wxGetTranslation(const <a href="#wxString">wxString</a>& sz1, const <a href="#wxString">wxString</a>& sz2, size_t n)</font><br> <br> *************** *** 12809,12812 **** --- 12823,13005 ---- <br> <i>%endif</i> <font color=#009900>// <i>%wxchkver_2_8</i> && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// wxRenderer</font><br> + <br> + <i>%if</i> wxLUA_USE_wxRenderer<br> + <br> + <i>%include</i> "wx/renderer.h"<br> + <br> + <font color=#006666><i>%wxHAS_NATIVE_RENDERER</i> <i>%define</i> wxHAS_NATIVE_RENDERER 1</font><br> + <br> + <b><font size=+1 color=#0066CC><i>%enum</i></font></b> + <blockquote><font color=#0066CC> + wxCONTROL_DISABLED <font color=#009900>//= 0x00000001, // control is disabled</font><br> + wxCONTROL_FOCUSED <font color=#009900>//= 0x00000002, // currently has keyboard focus</font><br> + wxCONTROL_PRESSED <font color=#009900>//= 0x00000004, // (button) is pressed</font><br> + wxCONTROL_SPECIAL <font color=#009900>//= 0x00000008, // control-specific bit:</font><br> + wxCONTROL_ISDEFAULT <font color=#009900>//= wxCONTROL_SPECIAL, // only for the buttons</font><br> + wxCONTROL_ISSUBMENU <font color=#009900>//= wxCONTROL_SPECIAL, // only for the menu items</font><br> + wxCONTROL_EXPANDED <font color=#009900>//= wxCONTROL_SPECIAL, // only for the tree items</font><br> + wxCONTROL_SIZEGRIP <font color=#009900>//= wxCONTROL_SPECIAL, // only for the status bar panes</font><br> + wxCONTROL_CURRENT <font color=#009900>//= 0x00000010, // mouse is currently over the control</font><br> + wxCONTROL_SELECTED <font color=#009900>//= 0x00000020, // selected item in e.g. listbox</font><br> + wxCONTROL_CHECKED <font color=#009900>//= 0x00000040, // (check/radio button) is checked</font><br> + wxCONTROL_CHECKABLE <font color=#009900>//= 0x00000080, // (menu) item can be checked</font><br> + wxCONTROL_UNDETERMINED <font color=#009900>//= wxCONTROL_CHECKABLE, // (check) undetermined state</font><br> + <br> + wxCONTROL_FLAGS_MASK <font color=#009900>//= 0x000000ff,</font><br> + <br> + <font color=#009900>// this is a pseudo flag not used directly by wxRenderer but rather by some</font><br> + <font color=#009900>// controls internally</font><br> + wxCONTROL_DIRTY <font color=#009900>//= 0x80000000</font><br> + </font> + </blockquote><font color=#0066CC><i>%endenum</i></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%struct</i> <i>%delete</i> <i>%encapsulate</i> <a name="wxSplitterRenderParams">wxSplitterRenderParams</a></font></b> + <blockquote> + <font color=#009900>// the only way to initialize this struct is by using this ctor</font><br> + <a href="#wxSplitterRenderParams">wxSplitterRenderParams</a>(wxCoord widthSash_, wxCoord border_, bool isSens_)<br> + <br> + <font color=#CC6600> <i>%member</i> const wxCoord widthSash <font color=#009900>// the width of the splitter sash</font></font><br> + <font color=#CC6600> <i>%member</i> const wxCoord border <font color=#009900>// the width of the border of the splitter window</font></font><br> + <font color=#CC6600> <i>%member</i> const bool isHotSensitive <font color=#009900>// true if the splitter changes its appearance when the mouse is over it</font></font><br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endstruct</i></font></font><br> + <br> + <br> + <font color=#009900>// extra optional parameters for DrawHeaderButton</font><br> + <b><font size=+1 color=#DD0000><i>%struct</i> <i>%delete</i> <i>%encapsulate</i> <a name="wxHeaderButtonParams">wxHeaderButtonParams</a></font></b> + <blockquote> + <a href="#wxHeaderButtonParams">wxHeaderButtonParams</a>()<br> + <br> + <font color=#CC6600> <i>%member</i> <a href="#wxColour">wxColour</a> m_arrowColour;</font><br> + <font color=#CC6600> <i>%member</i> <a href="#wxColour">wxColour</a> m_selectionColour;</font><br> + <font color=#CC6600> <i>%member</i> <a href="#wxString">wxString</a> m_labelText;</font><br> + <font color=#CC6600> <i>%member</i> <a href="#wxFont">wxFont</a> m_labelFont;</font><br> + <font color=#CC6600> <i>%member</i> <a href="#wxColour">wxColour</a> m_labelColour;</font><br> + <font color=#CC6600> <i>%member</i> <a href="#wxBitmap">wxBitmap</a> m_labelBitmap;</font><br> + <font color=#CC6600> <i>%member</i> int m_labelAlignment;</font><br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endstruct</i></font></font><br> + <br> + <b><font size=+1 color=#0066CC><i>%enum</i> <a name="wxHeaderSortIconType">wxHeaderSortIconType</a></font></b> + <blockquote><font color=#0066CC> + wxHDR_SORT_ICON_NONE, <font color=#009900>// Header button has no sort arrow</font><br> + wxHDR_SORT_ICON_UP, <font color=#009900>// Header button an an up sort arrow icon</font><br> + wxHDR_SORT_ICON_DOWN <font color=#009900>// Header button an a down sort arrow icon</font><br> + </font> + </blockquote><font color=#0066CC><i>%endenum</i></font><br> + <br> + <font color=#009900>// the current version and age of <a href="#wxRendererNative">wxRendererNative</a> interface: different</font><br> + <font color=#009900>// versions are incompatible (in both ways) while the ages inside the same</font><br> + <font color=#009900>// version are upwards compatible, i.e. the version of the renderer must</font><br> + <font color=#009900>// match the version of the main program exactly while the age may be</font><br> + <font color=#009900>// highergreater or equal to it</font><br> + <b><font size=+1 color=#0066CC><i>%enum</i> <a name="wxRendererVersion::dummy">wxRendererVersion::dummy</a></font></b> + <blockquote><font color=#0066CC> + Current_Version <font color=#009900>//= 1,</font><br> + Current_Age <font color=#009900>//= 5</font><br> + </font> + </blockquote><font color=#0066CC><i>%endenum</i></font><br> + <br> + <font color=#009900>// <a href="#wxRendererNative">wxRendererNative</a> interface version</font><br> + <b><font size=+1 color=#DD0000><i>%struct</i> <i>%delete</i> <i>%encapsulate</i> <a name="wxRendererVersion">wxRendererVersion</a></font></b> + <blockquote> + <a href="#wxRendererVersion">wxRendererVersion</a>(int version_, int age_)<br> + <br> + <font color=#009900>// check if the given version is compatible with the current one</font><br> + static bool IsCompatible(const <a href="#wxRendererVersion">wxRendererVersion</a>& ver)<br> + <br> + <font color=#CC6600> <i>%member</i> const int version;</font><br> + <font color=#CC6600> <i>%member</i> const int age;</font><br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endstruct</i></font></font><br> + <br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxRendererNative">wxRendererNative</a></font></b> + <blockquote> + <font color=#009900>// pseudo constructors</font><br> + <font color=#009900>// -------------------</font><br> + <font color=#009900>// return the currently used renderer</font><br> + static <a href="#wxRendererNative">wxRendererNative</a>& Get();<br> + <font color=#009900>// return the generic implementation of the renderer</font><br> + static <a href="#wxRendererNative">wxRendererNative</a>& GetGeneric();<br> + <font color=#009900>// return the default (native) implementation for this platform</font><br> + static <a href="#wxRendererNative">wxRendererNative</a>& GetDefault();<br> + <br> + <br> + <font color=#009900>// draw the header control button (used by <a href="#wxListCtrl">wxListCtrl</a>) Returns optimal</font><br> + <font color=#009900>// width for the label contents.</font><br> + virtual int DrawHeaderButton(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRect">wxRect</a>& rect, int flags = 0, <a href="#wxHeaderSortIconType">wxHeaderSortIconType</a> sortArrow = wxHDR_SORT_ICON_NONE, <a href="#wxHeaderButtonParams">wxHeaderButtonParams</a>* params=NULL) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// Draw the contents of a header control button (label, sort arrows, etc.)</font><br> + <font color=#009900>// Normally only called by DrawHeaderButton.</font><br> + virtual int DrawHeaderButtonContents(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRect">wxRect</a>& rect, int flags = 0, <a href="#wxHeaderSortIconType">wxHeaderSortIconType</a> sortArrow = wxHDR_SORT_ICON_NONE, <a href="#wxHeaderButtonParams">wxHeaderButtonParams</a>* params=NULL) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// Returns the default height of a header button, either a fixed platform</font><br> + <font color=#009900>// height if available, or a generic height based on the window's font.</font><br> + virtual int GetHeaderButtonHeight(<a href="#wxWindow">wxWindow</a> *win) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// draw the expanded/collapsed icon for a tree control item</font><br> + virtual void DrawTreeItemButton(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRect">wxRect</a>& rect, int flags = 0) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// draw the border for sash window: this border must be such that the sash</font><br> + <font color=#009900>// drawn by DrawSash() blends into it well</font><br> + virtual void DrawSplitterBorder(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRect">wxRect</a>& rect, int flags = 0) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// draw a (vertical) sash</font><br> + virtual void DrawSplitterSash(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxSize">wxSize</a>& size, wxCoord position, <a href="#wxOrientation">wxOrientation</a> orient, int flags = 0) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// draw a combobox dropdown button</font><br> + <font color=#009900>// flags may use wxCONTROL_PRESSED and wxCONTROL_CURRENT</font><br> + virtual void DrawComboBoxDropButton(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRect">wxRect</a>& rect, int flags = 0) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// draw a dropdown arrow</font><br> + <font color=#009900>// flags may use wxCONTROL_PRESSED and wxCONTROL_CURRENT</font><br> + virtual void DrawDropArrow(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRect">wxRect</a>& rect, int flags = 0) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// draw check button</font><br> + <font color=#009900>// flags may use wxCONTROL_CHECKED, wxCONTROL_UNDETERMINED and wxCONTROL_CURRENT</font><br> + virtual void DrawCheckBox(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRect">wxRect</a>& rect, int flags = 0) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// draw blank button</font><br> + <font color=#009900>// flags may use wxCONTROL_PRESSED, wxCONTROL_CURRENT and wxCONTROL_ISDEFAULT</font><br> + virtual void DrawPushButton(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRect">wxRect</a>& rect, int flags = 0) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// draw rectangle indicating that an item in e.g. a list control has been selected or focused</font><br> + <font color=#009900>// flags may use</font><br> + <font color=#009900>// wxCONTROL_SELECTED (item is selected, e.g. draw background)</font><br> + <font color=#009900>// wxCONTROL_CURRENT (item is the current item, e.g. dotted border)</font><br> + <font color=#009900>// wxCONTROL_FOCUSED (the whole control has focus, e.g. blue background vs. grey otherwise)</font><br> + virtual void DrawItemSelectionRect(<a href="#wxWindow">wxWindow</a> *win, <a href="#wxDC">wxDC</a>& dc, const <a href="#wxRect">wxRect</a>& rect, int flags = 0) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// geometry functions</font><br> + <font color=#009900>// ------------------</font><br> + <br> + <font color=#009900>// get the splitter parameters: the x field of the returned point is the</font><br> + <font color=#009900>// sash width and the y field is the border width</font><br> + virtual <a href="#wxSplitterRenderParams">wxSplitterRenderParams</a> GetSplitterParams(const <a href="#wxWindow">wxWindow</a> *win) <font color=#009900>//= 0;</font><br> + <br> + <font color=#009900>// changing the global renderer</font><br> + <font color=#009900>// ----------------------------</font><br> + <br> + <i>%if</i> wxUSE_DYNLIB_CLASS<br> + <font color=#009900>// load the renderer from the specified DLL, the returned pointer must be</font><br> + <font color=#009900>// deleted by caller if not NULL when it is not used any more</font><br> + static <i>%gc</i> <a href="#wxRendererNative">wxRendererNative</a> *Load(const <a href="#wxString">wxString</a>& name);<br> + <i>%endif</i> <font color=#009900>// wxUSE_DYNLIB_CLASS</font><br> + <br> + <font color=#009900>// set the renderer to use, passing NULL reverts to using the default</font><br> + <font color=#009900>// renderer</font><br> + <font color=#009900>//</font><br> + <font color=#009900>// return the previous renderer used with Set() or NULL if none</font><br> + static <i>%gc</i> <a href="#wxRendererNative">wxRendererNative</a> *Set(<i>%ungc</i> <a href="#wxRendererNative">wxRendererNative</a> *renderer);<br> + <br> + <font color=#009900>// this function is used for version checking: Load() refuses to load any</font><br> + <font color=#009900>// DLLs implementing an older or incompatible version; it should be</font><br> + <font color=#009900>// implemented simply by returning wxRendererVersion::Current_XXX values</font><br> + virtual <a href="#wxRendererVersion">wxRendererVersion</a> GetVersion() const <font color=#009900>//= 0;</font><br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// wxLUA_USE_wxRenderer</font><br> <br><HR> |
|
From: John L. <jr...@us...> - 2007-06-27 03:12:01
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13326/wxLua/bindings/wxwidgets Modified Files: datetime.i gdi.i wx_datatypes.lua Log Message: Unicode compilation fix for genwxbind Add wxRenderer to bindings Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** datetime.i 26 Jun 2007 22:16:38 -0000 1.36 --- datetime.i 27 Jun 2007 03:11:27 -0000 1.37 *************** *** 778,782 **** %endenum ! %struct wxLanguageInfo %member int Language; // wxLanguage id %member wxString CanonicalName; // Canonical name, e.g. fr_FR --- 778,784 ---- %endenum ! %struct %delete %encapsulate wxLanguageInfo ! wxLanguageInfo() // you must set all the values by hand ! %member int Language; // wxLanguage id %member wxString CanonicalName; // Canonical name, e.g. fr_FR Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** wx_datatypes.lua 26 Jun 2007 03:22:04 -0000 1.78 --- wx_datatypes.lua 27 Jun 2007 03:11:27 -0000 1.79 *************** *** 1689,1692 **** --- 1689,1705 ---- Name = "wxHTTP", }, + wxHeaderButtonParams = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "struct", + Encapsulate = true, + IsNumber = false, + Name = "wxHeaderButtonParams", + }, + wxHeaderSortIconType = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "enum", + IsNumber = true, + Name = "wxHeaderSortIconType", + }, wxHelpController = { BaseClass = "wxHelpControllerBase", *************** *** 2092,2095 **** --- 2105,2109 ---- Condition = "wxUSE_INTL", DefType = "struct", + Encapsulate = true, IsNumber = false, Name = "wxLanguageInfo", *************** *** 3004,3007 **** --- 3018,3041 ---- Name = "wxRelationship", }, + wxRendererNative = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxRendererNative", + }, + wxRendererVersion = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "struct", + Encapsulate = true, + IsNumber = false, + Name = "wxRendererVersion", + }, + ["wxRendererVersion::dummy"] = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "enum", + IsNumber = true, + Name = "wxRendererVersion::dummy", + }, wxSashDragStatus = { Condition = "wxLUA_USE_wxSashWindow && wxUSE_SASH", *************** *** 3286,3289 **** --- 3320,3330 ---- Name = "wxSplitterEvent", }, + wxSplitterRenderParams = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "struct", + Encapsulate = true, + IsNumber = false, + Name = "wxSplitterRenderParams", + }, wxSplitterWindow = { BaseClass = "wxWindow", *************** *** 4033,4036 **** --- 4074,4078 ---- ["%win"] = "defined(__WXMSW__)", ["%wince"] = "defined(__WXWINCE__)", + ["%wxHAS_NATIVE_RENDERER"] = "defined(wxHAS_NATIVE_RENDERER)", ["%wxchkver_2_4"] = "wxCHECK_VERSION(2,4,0)", ["%wxchkver_2_6"] = "wxCHECK_VERSION(2,6,0)", *************** *** 4150,4153 **** --- 4192,4196 ---- wxLUA_USE_wxRegEx = "wxLUA_USE_wxRegEx", wxLUA_USE_wxRegion = "wxLUA_USE_wxRegion", + wxLUA_USE_wxRenderer = "wxLUA_USE_wxRenderer", wxLUA_USE_wxSashWindow = "wxLUA_USE_wxSashWindow", wxLUA_USE_wxScrollBar = "wxLUA_USE_wxScrollBar", Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** gdi.i 25 Jun 2007 03:19:37 -0000 1.59 --- gdi.i 27 Jun 2007 03:11:27 -0000 1.60 *************** *** 1738,1739 **** --- 1738,1908 ---- %endif // %wxchkver_2_8 && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL + + // --------------------------------------------------------------------------- + // wxRenderer + + %if wxLUA_USE_wxRenderer + + %include "wx/renderer.h" + + %wxHAS_NATIVE_RENDERER %define wxHAS_NATIVE_RENDERER 1 + + %enum + wxCONTROL_DISABLED //= 0x00000001, // control is disabled + wxCONTROL_FOCUSED //= 0x00000002, // currently has keyboard focus + wxCONTROL_PRESSED //= 0x00000004, // (button) is pressed + wxCONTROL_SPECIAL //= 0x00000008, // control-specific bit: + wxCONTROL_ISDEFAULT //= wxCONTROL_SPECIAL, // only for the buttons + wxCONTROL_ISSUBMENU //= wxCONTROL_SPECIAL, // only for the menu items + wxCONTROL_EXPANDED //= wxCONTROL_SPECIAL, // only for the tree items + wxCONTROL_SIZEGRIP //= wxCONTROL_SPECIAL, // only for the status bar panes + wxCONTROL_CURRENT //= 0x00000010, // mouse is currently over the control + wxCONTROL_SELECTED //= 0x00000020, // selected item in e.g. listbox + wxCONTROL_CHECKED //= 0x00000040, // (check/radio button) is checked + wxCONTROL_CHECKABLE //= 0x00000080, // (menu) item can be checked + wxCONTROL_UNDETERMINED //= wxCONTROL_CHECKABLE, // (check) undetermined state + + wxCONTROL_FLAGS_MASK //= 0x000000ff, + + // this is a pseudo flag not used directly by wxRenderer but rather by some + // controls internally + wxCONTROL_DIRTY //= 0x80000000 + %endenum + + %struct %delete %encapsulate wxSplitterRenderParams + // the only way to initialize this struct is by using this ctor + wxSplitterRenderParams(wxCoord widthSash_, wxCoord border_, bool isSens_) + + %member const wxCoord widthSash // the width of the splitter sash + %member const wxCoord border // the width of the border of the splitter window + %member const bool isHotSensitive // true if the splitter changes its appearance when the mouse is over it + %endstruct + + + // extra optional parameters for DrawHeaderButton + %struct %delete %encapsulate wxHeaderButtonParams + wxHeaderButtonParams() + + %member wxColour m_arrowColour; + %member wxColour m_selectionColour; + %member wxString m_labelText; + %member wxFont m_labelFont; + %member wxColour m_labelColour; + %member wxBitmap m_labelBitmap; + %member int m_labelAlignment; + %endstruct + + %enum wxHeaderSortIconType + wxHDR_SORT_ICON_NONE, // Header button has no sort arrow + wxHDR_SORT_ICON_UP, // Header button an an up sort arrow icon + wxHDR_SORT_ICON_DOWN // Header button an a down sort arrow icon + %endenum + + // the current version and age of wxRendererNative interface: different + // versions are incompatible (in both ways) while the ages inside the same + // version are upwards compatible, i.e. the version of the renderer must + // match the version of the main program exactly while the age may be + // highergreater or equal to it + %enum wxRendererVersion::dummy + Current_Version //= 1, + Current_Age //= 5 + %endenum + + // wxRendererNative interface version + %struct %delete %encapsulate wxRendererVersion + wxRendererVersion(int version_, int age_) + + // check if the given version is compatible with the current one + static bool IsCompatible(const wxRendererVersion& ver) + + %member const int version; + %member const int age; + %endstruct + + + %class %delete %noclassinfo %encapsulate wxRendererNative + // pseudo constructors + // ------------------- + // return the currently used renderer + static wxRendererNative& Get(); + // return the generic implementation of the renderer + static wxRendererNative& GetGeneric(); + // return the default (native) implementation for this platform + static wxRendererNative& GetDefault(); + + + // draw the header control button (used by wxListCtrl) Returns optimal + // width for the label contents. + virtual int DrawHeaderButton(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, wxHeaderButtonParams* params=NULL) //= 0; + + // Draw the contents of a header control button (label, sort arrows, etc.) + // Normally only called by DrawHeaderButton. + virtual int DrawHeaderButtonContents(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0, wxHeaderSortIconType sortArrow = wxHDR_SORT_ICON_NONE, wxHeaderButtonParams* params=NULL) //= 0; + + // Returns the default height of a header button, either a fixed platform + // height if available, or a generic height based on the window's font. + virtual int GetHeaderButtonHeight(wxWindow *win) //= 0; + + // draw the expanded/collapsed icon for a tree control item + virtual void DrawTreeItemButton(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0) //= 0; + + // draw the border for sash window: this border must be such that the sash + // drawn by DrawSash() blends into it well + virtual void DrawSplitterBorder(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0) //= 0; + + // draw a (vertical) sash + virtual void DrawSplitterSash(wxWindow *win, wxDC& dc, const wxSize& size, wxCoord position, wxOrientation orient, int flags = 0) //= 0; + + // draw a combobox dropdown button + // flags may use wxCONTROL_PRESSED and wxCONTROL_CURRENT + virtual void DrawComboBoxDropButton(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0) //= 0; + + // draw a dropdown arrow + // flags may use wxCONTROL_PRESSED and wxCONTROL_CURRENT + virtual void DrawDropArrow(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0) //= 0; + + // draw check button + // flags may use wxCONTROL_CHECKED, wxCONTROL_UNDETERMINED and wxCONTROL_CURRENT + virtual void DrawCheckBox(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0) //= 0; + + // draw blank button + // flags may use wxCONTROL_PRESSED, wxCONTROL_CURRENT and wxCONTROL_ISDEFAULT + virtual void DrawPushButton(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0) //= 0; + + // draw rectangle indicating that an item in e.g. a list control has been selected or focused + // flags may use + // wxCONTROL_SELECTED (item is selected, e.g. draw background) + // wxCONTROL_CURRENT (item is the current item, e.g. dotted border) + // wxCONTROL_FOCUSED (the whole control has focus, e.g. blue background vs. grey otherwise) + virtual void DrawItemSelectionRect(wxWindow *win, wxDC& dc, const wxRect& rect, int flags = 0) //= 0; + + // geometry functions + // ------------------ + + // get the splitter parameters: the x field of the returned point is the + // sash width and the y field is the border width + virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win) //= 0; + + // changing the global renderer + // ---------------------------- + + %if wxUSE_DYNLIB_CLASS + // load the renderer from the specified DLL, the returned pointer must be + // deleted by caller if not NULL when it is not used any more + static %gc wxRendererNative *Load(const wxString& name); + %endif // wxUSE_DYNLIB_CLASS + + // set the renderer to use, passing NULL reverts to using the default + // renderer + // + // return the previous renderer used with Set() or NULL if none + static %gc wxRendererNative *Set(%ungc wxRendererNative *renderer); + + // this function is used for version checking: Load() refuses to load any + // DLLs implementing an older or incompatible version; it should be + // implemented simply by returning wxRendererVersion::Current_XXX values + virtual wxRendererVersion GetVersion() const //= 0; + + %endclass + + %endif // wxLUA_USE_wxRenderer |
|
From: John L. <jr...@us...> - 2007-06-27 03:12:00
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13326/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Unicode compilation fix for genwxbind Add wxRenderer to bindings Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** wxstc_datatypes.lua 26 Jun 2007 03:22:04 -0000 1.68 --- wxstc_datatypes.lua 27 Jun 2007 03:11:27 -0000 1.69 *************** *** 1689,1692 **** --- 1689,1705 ---- Name = "wxHTTP", }, + wxHeaderButtonParams = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "struct", + Encapsulate = true, + IsNumber = false, + Name = "wxHeaderButtonParams", + }, + wxHeaderSortIconType = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "enum", + IsNumber = true, + Name = "wxHeaderSortIconType", + }, wxHelpController = { BaseClass = "wxHelpControllerBase", *************** *** 2092,2095 **** --- 2105,2109 ---- Condition = "wxUSE_INTL", DefType = "struct", + Encapsulate = true, IsNumber = false, Name = "wxLanguageInfo", *************** *** 3004,3007 **** --- 3018,3041 ---- Name = "wxRelationship", }, + wxRendererNative = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxRendererNative", + }, + wxRendererVersion = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "struct", + Encapsulate = true, + IsNumber = false, + Name = "wxRendererVersion", + }, + ["wxRendererVersion::dummy"] = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "enum", + IsNumber = true, + Name = "wxRendererVersion::dummy", + }, wxSashDragStatus = { Condition = "wxLUA_USE_wxSashWindow && wxUSE_SASH", *************** *** 3286,3289 **** --- 3320,3330 ---- Name = "wxSplitterEvent", }, + wxSplitterRenderParams = { + Condition = "wxLUA_USE_wxRenderer", + DefType = "struct", + Encapsulate = true, + IsNumber = false, + Name = "wxSplitterRenderParams", + }, wxSplitterWindow = { BaseClass = "wxWindow", *************** *** 4044,4047 **** --- 4085,4089 ---- ["%win"] = "defined(__WXMSW__)", ["%wince"] = "defined(__WXWINCE__)", + ["%wxHAS_NATIVE_RENDERER"] = "defined(wxHAS_NATIVE_RENDERER)", ["%wxchkver_2_4"] = "wxCHECK_VERSION(2,4,0)", ["%wxchkver_2_6"] = "wxCHECK_VERSION(2,6,0)", *************** *** 4161,4164 **** --- 4203,4207 ---- wxLUA_USE_wxRegEx = "wxLUA_USE_wxRegEx", wxLUA_USE_wxRegion = "wxLUA_USE_wxRegion", + wxLUA_USE_wxRenderer = "wxLUA_USE_wxRenderer", wxLUA_USE_wxSashWindow = "wxLUA_USE_wxSashWindow", wxLUA_USE_wxScrollBar = "wxLUA_USE_wxScrollBar", |
|
From: John L. <jr...@us...> - 2007-06-27 03:12:00
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13326/wxLua/bindings Modified Files: genidocs.lua genwxbind.lua Log Message: Unicode compilation fix for genwxbind Add wxRenderer to bindings Index: genidocs.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genidocs.lua,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** genidocs.lua 25 Jun 2007 03:19:37 -0000 1.9 --- genidocs.lua 27 Jun 2007 03:11:26 -0000 1.10 *************** *** 142,146 **** for k, v in pairs(dataTypeTable) do -- hack for special classes ! if (v.DefType == "class") or (v.DefType == "wx2lua") then allClasses[k] = true -- the ones we wrap end --- 142,146 ---- for k, v in pairs(dataTypeTable) do -- hack for special classes ! if (v.DefType == "class") or (v.DefType == "struct") or (v.DefType == "wx2lua") then allClasses[k] = true -- the ones we wrap end Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** genwxbind.lua 26 Jun 2007 22:16:38 -0000 1.135 --- genwxbind.lua 27 Jun 2007 03:11:26 -0000 1.136 *************** *** 709,713 **** preprocConditionTable["%__WXWINCE__"] = "defined(__WXWINCE__)" ! preprocConditionTable["wxHAS_POWER_EVENTS"] = "defined(wxHAS_POWER_EVENTS)" -- wxUSE_ conditions --- 709,714 ---- preprocConditionTable["%__WXWINCE__"] = "defined(__WXWINCE__)" ! preprocConditionTable["wxHAS_POWER_EVENTS"] = "defined(wxHAS_POWER_EVENTS)" ! preprocConditionTable["%wxHAS_NATIVE_RENDERER"] = "defined(wxHAS_NATIVE_RENDERER)" -- wxUSE_ conditions *************** *** 1009,1012 **** --- 1010,1014 ---- preprocConditionTable["wxLUA_USE_wxRegEx"] = "wxLUA_USE_wxRegEx" preprocConditionTable["wxLUA_USE_wxRegion"] = "wxLUA_USE_wxRegion" + preprocConditionTable["wxLUA_USE_wxRenderer"] = "wxLUA_USE_wxRenderer" preprocConditionTable["wxLUA_USE_wxSashWindow"] = "wxLUA_USE_wxSashWindow" preprocConditionTable["wxLUA_USE_wxScrollBar"] = "wxLUA_USE_wxScrollBar" *************** *** 1813,1817 **** parseState.ObjectStack[1].DeleteRequired = true ! if parseState.ObjectStack[1].DefType ~= "class" then print("Error: %delete is not used for a %class. "..LineTableErrString(lineTable)) end --- 1815,1819 ---- parseState.ObjectStack[1].DeleteRequired = true ! if (parseState.ObjectStack[1].DefType ~= "class") and (parseState.ObjectStack[1].DefType ~= "struct") then print("Error: %delete is not used for a %class. "..LineTableErrString(lineTable)) end *************** *** 1820,1824 **** parseState.ObjectStack[1].HasClassInfo = false ! if parseState.ObjectStack[1].DefType ~= "class" then print("Error: %noclassinfo is not used for a %class. "..LineTableErrString(lineTable)) end --- 1822,1826 ---- parseState.ObjectStack[1].HasClassInfo = false ! if (parseState.ObjectStack[1].DefType ~= "class") and (parseState.ObjectStack[1].DefType ~= "struct") then print("Error: %noclassinfo is not used for a %class. "..LineTableErrString(lineTable)) end *************** *** 1834,1838 **** parseState.ObjectStack[1].Encapsulate = true ! if parseState.ObjectStack[1].DefType ~= "class" then print("Error: %encapsulate is not used for a %class. "..LineTableErrString(lineTable)) end --- 1836,1840 ---- parseState.ObjectStack[1].Encapsulate = true ! if (parseState.ObjectStack[1].DefType ~= "class") and (parseState.ObjectStack[1].DefType ~= "struct") then print("Error: %encapsulate is not used for a %class. "..LineTableErrString(lineTable)) end *************** *** 1885,1889 **** --- 1887,1894 ---- lineState.Action = "structname" lineState.ActionMandatory = true + lineState.ActionAttributes["%delete"] = true lineState.ActionAttributes["%noclassinfo"] = true + lineState.ActionAttributes["%abstract"] = true + lineState.ActionAttributes["%encapsulate"] = true elseif tag == "%endstruct" then *************** *** 2792,2796 **** table.insert(interface.objectData[o].BindTable, propertyBinding) ! -- SET MEMBER CODE codeList = {} overload_argList = "" --- 2797,2803 ---- table.insert(interface.objectData[o].BindTable, propertyBinding) ! -- SET MEMBER CODE, not for const members ! if not string.find(member.DataTypeWithAttrib, "const ", 1, 1) then ! codeList = {} overload_argList = "" *************** *** 2881,2884 **** --- 2888,2892 ---- table.insert(interface.objectData[o].BindTable, propertyBinding) + end -- --------------------------------------------------------------- -- enum binding *************** *** 3163,3167 **** if opt then if (opt == "\"\"") or (opt == "wxEmptyString") or (opt == "NULL") then ! opt = "wxEmptyString" elseif string.sub(opt, 1, 1) == "\"" then opt = "wxT("..opt..")" --- 3171,3175 ---- if opt then if (opt == "\"\"") or (opt == "wxEmptyString") or (opt == "NULL") then ! opt = "wxString(wxEmptyString)" elseif string.sub(opt, 1, 1) == "\"" then opt = "wxT("..opt..")" |
|
From: John L. <jr...@us...> - 2007-06-27 03:11:33
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13326/wxLua/modules/wxbind/src Modified Files: datetime.cpp gdi.cpp wx_bind.cpp Log Message: Unicode compilation fix for genwxbind Add wxRenderer to bindings Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** wx_bind.cpp 26 Jun 2007 22:16:38 -0000 1.120 --- wx_bind.cpp 27 Jun 2007 03:11:29 -0000 1.121 *************** *** 1067,1070 **** --- 1067,1088 ---- #endif // (wxCHECK_VERSION(2,8,1)) && (wxLUA_USE_wxConfig && wxUSE_CONFIG) + #if wxLUA_USE_wxRenderer + { "wxCONTROL_CHECKABLE", wxCONTROL_CHECKABLE }, + { "wxCONTROL_CHECKED", wxCONTROL_CHECKED }, + { "wxCONTROL_CURRENT", wxCONTROL_CURRENT }, + { "wxCONTROL_DIRTY", wxCONTROL_DIRTY }, + { "wxCONTROL_DISABLED", wxCONTROL_DISABLED }, + { "wxCONTROL_EXPANDED", wxCONTROL_EXPANDED }, + { "wxCONTROL_FLAGS_MASK", wxCONTROL_FLAGS_MASK }, + { "wxCONTROL_FOCUSED", wxCONTROL_FOCUSED }, + { "wxCONTROL_ISDEFAULT", wxCONTROL_ISDEFAULT }, + { "wxCONTROL_ISSUBMENU", wxCONTROL_ISSUBMENU }, + { "wxCONTROL_PRESSED", wxCONTROL_PRESSED }, + { "wxCONTROL_SELECTED", wxCONTROL_SELECTED }, + { "wxCONTROL_SIZEGRIP", wxCONTROL_SIZEGRIP }, + { "wxCONTROL_SPECIAL", wxCONTROL_SPECIAL }, + { "wxCONTROL_UNDETERMINED", wxCONTROL_UNDETERMINED }, + #endif // wxLUA_USE_wxRenderer + #if wxLUA_USE_wxDC { "wxCOPY", wxCOPY }, *************** *** 1616,1619 **** --- 1634,1647 ---- #endif // !wxCHECK_VERSION(2,8,0) + #if (defined(wxHAS_NATIVE_RENDERER)) && (wxLUA_USE_wxRenderer) + { "wxHAS_NATIVE_RENDERER", 1 }, + #endif // (defined(wxHAS_NATIVE_RENDERER)) && (wxLUA_USE_wxRenderer) + + #if wxLUA_USE_wxRenderer + { "wxHDR_SORT_ICON_DOWN", wxHDR_SORT_ICON_DOWN }, + { "wxHDR_SORT_ICON_NONE", wxHDR_SORT_ICON_NONE }, + { "wxHDR_SORT_ICON_UP", wxHDR_SORT_ICON_UP }, + #endif // wxLUA_USE_wxRenderer + { "wxHELP", wxHELP }, *************** *** 5485,5489 **** int argCount = lua_gettop(L); // const wxChar domain = NULL ! wxString domain = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxEmptyString); // const wxString sz const wxString sz = wxlState.GetwxStringType(1); --- 5513,5517 ---- int argCount = lua_gettop(L); // const wxChar domain = NULL ! wxString domain = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // const wxString sz const wxString sz = wxlState.GetwxStringType(1); *************** *** 5533,5537 **** int argCount = lua_gettop(L); // const wxChar domain = NULL ! wxString domain = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxEmptyString); // size_t n size_t n = (size_t)wxlua_getnumbertype(L, 3); --- 5561,5565 ---- int argCount = lua_gettop(L); // const wxChar domain = NULL ! wxString domain = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString)); // size_t n size_t n = (size_t)wxlua_getnumbertype(L, 3); *************** *** 7351,7354 **** --- 7379,7386 ---- #endif // (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL_HTTP) + #if wxLUA_USE_wxRenderer + { "wxHeaderButtonParams", wxHeaderButtonParams_methods, wxHeaderButtonParams_methodCount, NULL, &s_wxluatag_wxHeaderButtonParams, NULL, NULL ,s_wxluadefineArray_None, 0, }, + #endif // wxLUA_USE_wxRenderer + #if wxLUA_USE_wxHelpController && wxUSE_HELP { "wxHelpController", wxHelpController_methods, wxHelpController_methodCount, CLASSINFO(wxHelpController), &s_wxluatag_wxHelpController, "wxHelpControllerBase", NULL ,s_wxluadefineArray_None, 0, }, *************** *** 7786,7789 **** --- 7818,7826 ---- #endif // wxLUA_USE_wxRegion + #if wxLUA_USE_wxRenderer + { "wxRendererNative", wxRendererNative_methods, wxRendererNative_methodCount, NULL, &s_wxluatag_wxRendererNative, NULL, NULL ,s_wxluadefineArray_None, 0, }, + { "wxRendererVersion", wxRendererVersion_methods, wxRendererVersion_methodCount, NULL, &s_wxluatag_wxRendererVersion, NULL, NULL ,wxRendererVersion_enums, wxRendererVersion_enumCount, }, + #endif // wxLUA_USE_wxRenderer + #if wxLUA_USE_wxSashWindow && wxUSE_SASH { "wxSashEvent", wxSashEvent_methods, wxSashEvent_methodCount, CLASSINFO(wxSashEvent), &s_wxluatag_wxSashEvent, "wxCommandEvent", NULL ,s_wxluadefineArray_None, 0, }, *************** *** 7877,7880 **** --- 7914,7924 ---- #if wxLUA_USE_wxSplitterWindow { "wxSplitterEvent", wxSplitterEvent_methods, wxSplitterEvent_methodCount, CLASSINFO(wxSplitterEvent), &s_wxluatag_wxSplitterEvent, "wxNotifyEvent", NULL ,s_wxluadefineArray_None, 0, }, + #endif // wxLUA_USE_wxSplitterWindow + + #if wxLUA_USE_wxRenderer + { "wxSplitterRenderParams", wxSplitterRenderParams_methods, wxSplitterRenderParams_methodCount, NULL, &s_wxluatag_wxSplitterRenderParams, NULL, NULL ,s_wxluadefineArray_None, 0, }, + #endif // wxLUA_USE_wxRenderer + + #if wxLUA_USE_wxSplitterWindow { "wxSplitterWindow", wxSplitterWindow_methods, wxSplitterWindow_methodCount, CLASSINFO(wxSplitterWindow), &s_wxluatag_wxSplitterWindow, "wxWindow", NULL ,s_wxluadefineArray_None, 0, }, #endif // wxLUA_USE_wxSplitterWindow *************** *** 8473,8476 **** --- 8517,8528 ---- + #if wxLUA_USE_wxRenderer + wxLUA_IMPLEMENT_ENCAPSULATION(wxHeaderButtonParams, wxHeaderButtonParams) + wxLUA_IMPLEMENT_ENCAPSULATION(wxRendererNative, wxRendererNative) + wxLUA_IMPLEMENT_ENCAPSULATION(wxRendererVersion, wxRendererVersion) + wxLUA_IMPLEMENT_ENCAPSULATION(wxSplitterRenderParams, wxSplitterRenderParams) + #endif // wxLUA_USE_wxRenderer + + #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH wxLUA_IMPLEMENT_ENCAPSULATION(wxStopWatch, wxStopWatch) *************** *** 8500,8503 **** --- 8552,8556 ---- #if wxUSE_INTL + wxLUA_IMPLEMENT_ENCAPSULATION(wxLanguageInfo, wxLanguageInfo) wxLUA_IMPLEMENT_ENCAPSULATION(wxLocale, wxLocale) #endif // wxUSE_INTL Index: gdi.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/gdi.cpp,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** gdi.cpp 25 Jun 2007 03:19:43 -0000 1.79 --- gdi.cpp 27 Jun 2007 03:11:29 -0000 1.80 *************** *** 15674,15675 **** --- 15674,16803 ---- #endif // wxCHECK_VERSION(2,8,0) && wxLUA_USE_wxAnimation && wxUSE_ANIMATIONCTRL + + #if wxLUA_USE_wxRenderer + // --------------------------------------------------------------------------- + // Bind struct wxSplitterRenderParams + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxSplitterRenderParams' [...1101 lines suppressed...] + { "GetDefault", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererNative_GetDefault, 1, NULL }, + { "GetGeneric", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererNative_GetGeneric, 1, NULL }, + { "GetHeaderButtonHeight", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererNative_GetHeaderButtonHeight, 1, NULL }, + { "GetSplitterParams", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererNative_GetSplitterParams, 1, NULL }, + { "GetVersion", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxRendererNative_GetVersion, 1, NULL }, + + #if ((wxLUA_USE_wxRenderer) && (wxUSE_DYNLIB_CLASS)) && (wxLUA_USE_wxRenderer) + { "Load", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererNative_Load, 1, NULL }, + #endif // ((wxLUA_USE_wxRenderer) && (wxUSE_DYNLIB_CLASS)) && (wxLUA_USE_wxRenderer) + + { "Set", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxRendererNative_Set, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxRendererNative_delete, 1, NULL }, + + { 0, 0, 0, 0 }, + }; + + int wxRendererNative_methodCount = sizeof(wxRendererNative_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // wxLUA_USE_wxRenderer + Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** datetime.cpp 26 Jun 2007 16:15:48 -0000 1.52 --- datetime.cpp 27 Jun 2007 03:11:28 -0000 1.53 *************** *** 5407,5410 **** --- 5407,5445 ---- #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) + static wxLuaArgTag s_wxluatagArray_wxLua_wxLanguageInfo_delete[] = { &s_wxluatag_wxLanguageInfo, NULL }; + static int LUACALL wxLua_wxLanguageInfo_delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxLanguageInfo_delete[1] = {{ wxLua_wxLanguageInfo_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLanguageInfo_delete }}; + static int LUACALL wxLua_wxLanguageInfo_delete(lua_State *L) + { + wxLuaState wxlState(L); + wxLanguageInfo * self = (wxLanguageInfo *)wxlState.GetUserDataType(1, s_wxluatag_wxLanguageInfo); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + static int LUACALL wxLua_wxLanguageInfo_constructor(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxLanguageInfo_constructor[1] = {{ wxLua_wxLanguageInfo_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; + // wxLanguageInfo() // you must set all the values by hand + static int LUACALL wxLua_wxLanguageInfo_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxLanguageInfo *returns; + // call constructor + returns = new wxLanguageInfo(); + // add to tracked memory list + wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLanguageInfo((wxLanguageInfo *)returns)); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxLanguageInfo, returns); + + return 1; + } + + *************** *** 5439,5442 **** --- 5474,5480 ---- #endif // ((wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL)) + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLanguageInfo_delete, 1, NULL }, + { "wxLanguageInfo", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLanguageInfo_constructor, 1, NULL }, + { 0, 0, 0, 0 }, }; |
|
From: John L. <jr...@us...> - 2007-06-27 03:11:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13326/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Unicode compilation fix for genwxbind Add wxRenderer to bindings Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wxluasetup.h 26 Jun 2007 03:22:05 -0000 1.15 --- wxluasetup.h 27 Jun 2007 03:11:28 -0000 1.16 *************** *** 106,109 **** --- 106,110 ---- #define wxLUA_USE_wxRegEx 1 #define wxLUA_USE_wxRegion 1 + #define wxLUA_USE_wxRenderer 1 #define wxLUA_USE_wxSashWindow 1 #define wxLUA_USE_wxScrollBar 1 |
|
From: John L. <jr...@us...> - 2007-06-27 03:11:31
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv13326/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Unicode compilation fix for genwxbind Add wxRenderer to bindings Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** wxbind.h 26 Jun 2007 03:22:05 -0000 1.83 --- wxbind.h 27 Jun 2007 03:11:28 -0000 1.84 *************** *** 599,602 **** --- 599,606 ---- #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX + #if wxLUA_USE_wxRenderer + #include "wx/renderer.h" + #endif // wxLUA_USE_wxRenderer + #if wxLUA_USE_wxSashWindow && wxUSE_SASH #include "wx/laywin.h" *************** *** 2272,2275 **** --- 2276,2296 ---- #endif // wxLUA_USE_wxRegion + #if wxLUA_USE_wxRenderer + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxHeaderButtonParams; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxHeaderButtonParams_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxHeaderButtonParams_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxRendererNative; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxRendererNative_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxRendererNative_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxRendererVersion; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxRendererVersion_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxRendererVersion_methodCount; + extern WXDLLIMPEXP_WXBIND wxLuaBindDefine wxRendererVersion_enums[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxRendererVersion_enumCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSplitterRenderParams; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSplitterRenderParams_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxSplitterRenderParams_methodCount; + #endif // wxLUA_USE_wxRenderer + #if wxLUA_USE_wxSashWindow && wxUSE_SASH extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxCalculateLayoutEvent; *************** *** 2849,2852 **** --- 2870,2880 ---- #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX + #if wxLUA_USE_wxRenderer + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxHeaderButtonParams, wxHeaderButtonParams) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxRendererNative, wxRendererNative) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxRendererVersion, wxRendererVersion) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxSplitterRenderParams, wxSplitterRenderParams) + #endif // wxLUA_USE_wxRenderer + #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxStopWatch, wxStopWatch) *************** *** 2871,2874 **** --- 2899,2903 ---- #if wxUSE_INTL + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLanguageInfo, wxLanguageInfo) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLocale, wxLocale) #endif // wxUSE_INTL |
|
From: John L. <jr...@us...> - 2007-06-26 22:16:42
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3484/wxLua/modules/wxbind/src Modified Files: wx_bind.cpp Log Message: "fix" for wxGetTranslation. Seems like passing an empty wxString for const wxChar* parameter fails if the function checks that the input == NULL. This should evaluate to true, str.c_str()[0] == 0, so what's really the problem? Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** wx_bind.cpp 26 Jun 2007 03:22:07 -0000 1.119 --- wx_bind.cpp 26 Jun 2007 22:16:38 -0000 1.120 *************** *** 5477,5481 **** #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL) static wxLuaArgTag s_wxluatagArray_wxLua_function_wxGetTranslation[] = { &s_wxluaarg_String, &s_wxluaarg_String, NULL }; ! // %wxchkver_2_8 %function wxString wxGetTranslation(const wxString& sz, const wxString& domain="") static int LUACALL wxLua_function_wxGetTranslation(lua_State *L) { --- 5477,5481 ---- #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL) static wxLuaArgTag s_wxluatagArray_wxLua_function_wxGetTranslation[] = { &s_wxluaarg_String, &s_wxluaarg_String, NULL }; ! // %wxchkver_2_8 %function wxString wxGetTranslation(const wxString& sz, const wxChar* domain=NULL) static int LUACALL wxLua_function_wxGetTranslation(lua_State *L) { *************** *** 5484,5493 **** // get number of arguments int argCount = lua_gettop(L); ! // const wxString domain = "" ! const wxString domain = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxString(wxEmptyString)); // const wxString sz const wxString sz = wxlState.GetwxStringType(1); // call wxGetTranslation ! returns = (wxGetTranslation(sz, domain)); // push the result string wxlState.lua_PushString(returns); --- 5484,5493 ---- // get number of arguments int argCount = lua_gettop(L); ! // const wxChar domain = NULL ! wxString domain = (argCount >= 2 ? wxlState.GetwxStringType(2) : wxEmptyString); // const wxString sz const wxString sz = wxlState.GetwxStringType(1); // call wxGetTranslation ! returns = (wxGetTranslation(sz, domain.IsEmpty() ? NULL : domain.c_str())); // push the result string wxlState.lua_PushString(returns); *************** *** 5525,5529 **** #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL) static wxLuaArgTag s_wxluatagArray_wxLua_function_wxGetTranslationPlural[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; ! // %wxchkver_2_8 %rename wxGetTranslationPlural %function wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n, const wxString& domain="") static int LUACALL wxLua_function_wxGetTranslationPlural(lua_State *L) { --- 5525,5529 ---- #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL) static wxLuaArgTag s_wxluatagArray_wxLua_function_wxGetTranslationPlural[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Number, &s_wxluaarg_String, NULL }; ! // %wxchkver_2_8 %rename wxGetTranslationPlural %function wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n, const wxChar* domain=NULL) static int LUACALL wxLua_function_wxGetTranslationPlural(lua_State *L) { *************** *** 5532,5537 **** // get number of arguments int argCount = lua_gettop(L); ! // const wxString domain = "" ! const wxString domain = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString)); // size_t n size_t n = (size_t)wxlua_getnumbertype(L, 3); --- 5532,5537 ---- // get number of arguments int argCount = lua_gettop(L); ! // const wxChar domain = NULL ! wxString domain = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxEmptyString); // size_t n size_t n = (size_t)wxlua_getnumbertype(L, 3); *************** *** 5541,5545 **** const wxString sz1 = wxlState.GetwxStringType(1); // call wxGetTranslation ! returns = (wxGetTranslation(sz1, sz2, n, domain)); // push the result string wxlState.lua_PushString(returns); --- 5541,5545 ---- const wxString sz1 = wxlState.GetwxStringType(1); // call wxGetTranslation ! returns = (wxGetTranslation(sz1, sz2, n, domain.IsEmpty() ? NULL : domain.c_str())); // push the result string wxlState.lua_PushString(returns); |
|
From: John L. <jr...@us...> - 2007-06-26 22:16:41
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3484/wxLua/bindings Modified Files: genwxbind.lua Log Message: "fix" for wxGetTranslation. Seems like passing an empty wxString for const wxChar* parameter fails if the function checks that the input == NULL. This should evaluate to true, str.c_str()[0] == 0, so what's really the problem? Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** genwxbind.lua 26 Jun 2007 03:22:04 -0000 1.134 --- genwxbind.lua 26 Jun 2007 22:16:38 -0000 1.135 *************** *** 3067,3070 **** --- 3067,3071 ---- local origIndirectionCount = indirectionCount local argCast = nil + local argListOverride = nil -- Does DataType need to be translated from typeDef *************** *** 3155,3159 **** end elseif (indirectionCount == 1) and (argPtr == "*") then ! if argType == "wxString" then overload_argList = overload_argList.."&s_wxluaarg_String, " argItem = "wxlState.GetwxStringType("..argNum..")" --- 3156,3160 ---- end elseif (indirectionCount == 1) and (argPtr == "*") then ! if (argType == "wxString") or (argType == "wxChar") then overload_argList = overload_argList.."&s_wxluaarg_String, " argItem = "wxlState.GetwxStringType("..argNum..")" *************** *** 3169,3172 **** --- 3170,3179 ---- end end + + if (argType == "wxChar") then + argTypeWithAttrib = "wxString " + argListOverride = argName..".IsEmpty() ? NULL : "..argName..".c_str()" + end + elseif argType == "char" then overload_argList = overload_argList.."&s_wxluaarg_String, " *************** *** 3278,3282 **** end ! argList = argList..argName -- except for string arrays, the declare is the argType --- 3285,3289 ---- end ! argList = argList..(argListOverride or argName) -- except for string arrays, the declare is the argType |
|
From: John L. <jr...@us...> - 2007-06-26 22:16:41
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3484/wxLua/bindings/wxwidgets Modified Files: datetime.i Log Message: "fix" for wxGetTranslation. Seems like passing an empty wxString for const wxChar* parameter fails if the function checks that the input == NULL. This should evaluate to true, str.c_str()[0] == 0, so what's really the problem? Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** datetime.i 26 Jun 2007 16:15:47 -0000 1.35 --- datetime.i 26 Jun 2007 22:16:38 -0000 1.36 *************** *** 906,913 **** %function wxLocale* wxGetLocale() ! %wxchkver_2_8 %function wxString wxGetTranslation(const wxString& sz, const wxString& domain="") !%wxchkver_2_8 %function wxString wxGetTranslation(const wxString& sz) ! %wxchkver_2_8 %rename wxGetTranslationPlural %function wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n, const wxString& domain="") !%wxchkver_2_8 %rename wxGetTranslationPlural %function wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n) --- 906,913 ---- %function wxLocale* wxGetLocale() ! %wxchkver_2_8 %function wxString wxGetTranslation(const wxString& sz, const wxChar* domain=NULL) !%wxchkver_2_8 %function wxString wxGetTranslation(const wxString& sz) ! %wxchkver_2_8 %rename wxGetTranslationPlural %function wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n, const wxChar* domain=NULL) !%wxchkver_2_8 %rename wxGetTranslationPlural %function wxString wxGetTranslation(const wxString& sz1, const wxString& sz2, size_t n) |
|
From: John L. <jr...@us...> - 2007-06-26 16:15:57
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27934/wxLua/docs Modified Files: wxluaref.html Log Message: Added wxLocale::Init functions for debugging problems Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxluaref.html 26 Jun 2007 03:22:05 -0000 1.33 --- wxluaref.html 26 Jun 2007 16:15:48 -0000 1.34 *************** *** 7708,7712 **** <br> <font color=#009900>// call Init() if you use this ctor</font><br> ! <font color=#009900>//<a href="#wxLocale">wxLocale</a>()</font><br> <br> <font color=#009900>// the ctor has a side effect of changing current locale</font><br> --- 7708,7712 ---- <br> <font color=#009900>// call Init() if you use this ctor</font><br> ! <a href="#wxLocale">wxLocale</a>()<br> <br> <font color=#009900>// the ctor has a side effect of changing current locale</font><br> *************** *** 7719,7725 **** <font color=#009900>// the same as a function (returns true on success)</font><br> <font color=#009900>//bool Init(const wxChar *szName, const wxChar *szShort = (const wxChar *) NULL, const wxChar *szLocale = (const wxChar *) NULL, bool bLoadDefault = true, bool bConvertEncoding = false)</font><br> <br> <font color=#009900>// same as second ctor (returns true on success)</font><br> ! <font color=#009900>//bool Init(int language = wxLANGUAGE_DEFAULT, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);</font><br> <br> <font color=#009900>// Try to get user's (or OS's) preferred language setting.</font><br> --- 7719,7726 ---- <font color=#009900>// the same as a function (returns true on success)</font><br> <font color=#009900>//bool Init(const wxChar *szName, const wxChar *szShort = (const wxChar *) NULL, const wxChar *szLocale = (const wxChar *) NULL, bool bLoadDefault = true, bool bConvertEncoding = false)</font><br> + bool Init(const <a href="#wxString">wxString</a> &szName, const <a href="#wxString">wxString</a> &szShort = "", const <a href="#wxString">wxString</a> &szLocale = "", bool bLoadDefault = true, bool bConvertEncoding = false)<br> <br> <font color=#009900>// same as second ctor (returns true on success)</font><br> ! bool Init(int language = wxLANGUAGE_DEFAULT, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING);<br> <br> <font color=#009900>// Try to get user's (or OS's) preferred language setting.</font><br> |
|
From: John L. <jr...@us...> - 2007-06-26 16:15:52
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27934/wxLua/modules/wxbind/src Modified Files: datetime.cpp Log Message: Added wxLocale::Init functions for debugging problems Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** datetime.cpp 26 Jun 2007 03:22:06 -0000 1.51 --- datetime.cpp 26 Jun 2007 16:15:48 -0000 1.52 *************** *** 5816,5819 **** --- 5816,5873 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLocale_Init1[] = { &s_wxluatag_wxLocale, &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxLocale_Init1(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_Init1[1] = {{ wxLua_wxLocale_Init1, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxLocale_Init1 }}; + // bool Init(int language = wxLANGUAGE_DEFAULT, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); + static int LUACALL wxLua_wxLocale_Init1(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING + int flags = (argCount >= 3 ? (int)wxlua_getnumbertype(L, 3) : wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); + // int language = wxLANGUAGE_DEFAULT + int language = (argCount >= 2 ? (int)wxlua_getnumbertype(L, 2) : wxLANGUAGE_DEFAULT); + // get this + wxLocale * self = (wxLocale *)wxlState.GetUserDataType(1, s_wxluatag_wxLocale); + // call Init + returns = (self->Init(language, flags)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxLocale_Init[] = { &s_wxluatag_wxLocale, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, NULL }; + static int LUACALL wxLua_wxLocale_Init(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_Init[1] = {{ wxLua_wxLocale_Init, WXLUAMETHOD_METHOD, 2, 6, s_wxluatagArray_wxLua_wxLocale_Init }}; + // bool Init(const wxString &szName, const wxString &szShort = "", const wxString &szLocale = "", bool bLoadDefault = true, bool bConvertEncoding = false) + static int LUACALL wxLua_wxLocale_Init(lua_State *L) + { + wxLuaState wxlState(L); + bool returns; + // get number of arguments + int argCount = lua_gettop(L); + // bool bConvertEncoding = false + bool bConvertEncoding = (argCount >= 6 ? wxlua_getbooleantype(L, 6) : false); + // bool bLoadDefault = true + bool bLoadDefault = (argCount >= 5 ? wxlua_getbooleantype(L, 5) : true); + // const wxString szLocale = "" + const wxString szLocale = (argCount >= 4 ? wxlState.GetwxStringType(4) : wxString(wxEmptyString)); + // const wxString szShort = "" + const wxString szShort = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); + // const wxString szName + const wxString szName = wxlState.GetwxStringType(2); + // get this + wxLocale * self = (wxLocale *)wxlState.GetUserDataType(1, s_wxluatag_wxLocale); + // call Init + returns = (self->Init(szName, szShort, szLocale, bLoadDefault, bConvertEncoding)); + // push the result flag + lua_pushboolean(L, returns); + + return 1; + } + #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL) *************** *** 5891,5899 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLocale_constructor1[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; ! static int LUACALL wxLua_wxLocale_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_constructor1[1] = {{ wxLua_wxLocale_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxLocale_constructor1 }}; // wxLocale(int language, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING) ! static int LUACALL wxLua_wxLocale_constructor1(lua_State *L) { wxluabind_removetableforcall(L); --- 5945,5953 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLocale_constructor2[] = { &s_wxluaarg_Number, &s_wxluaarg_Number, NULL }; ! static int LUACALL wxLua_wxLocale_constructor2(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_constructor2[1] = {{ wxLua_wxLocale_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxLocale_constructor2 }}; // wxLocale(int language, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING) ! static int LUACALL wxLua_wxLocale_constructor2(lua_State *L) { wxluabind_removetableforcall(L); *************** *** 5916,5924 **** } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLocale_constructor[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, NULL }; ! static int LUACALL wxLua_wxLocale_constructor(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_constructor[1] = {{ wxLua_wxLocale_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 5, s_wxluatagArray_wxLua_wxLocale_constructor }}; // wxLocale(const wxString& szName, const wxString& szShort = "", const wxString& szLocale = "", bool bLoadDefault = true, bool bConvertEncoding = false) ! static int LUACALL wxLua_wxLocale_constructor(lua_State *L) { wxluabind_removetableforcall(L); --- 5970,5978 ---- } ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLocale_constructor1[] = { &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, NULL }; ! static int LUACALL wxLua_wxLocale_constructor1(lua_State *L); ! // static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_constructor1[1] = {{ wxLua_wxLocale_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 5, s_wxluatagArray_wxLua_wxLocale_constructor1 }}; // wxLocale(const wxString& szName, const wxString& szShort = "", const wxString& szLocale = "", bool bLoadDefault = true, bool bConvertEncoding = false) ! static int LUACALL wxLua_wxLocale_constructor1(lua_State *L) { wxluabind_removetableforcall(L); *************** *** 5947,5950 **** --- 6001,6022 ---- } + static int LUACALL wxLua_wxLocale_constructor(lua_State *L); + // static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_constructor[1] = {{ wxLua_wxLocale_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; + // wxLocale() + static int LUACALL wxLua_wxLocale_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxLocale *returns; + // call constructor + returns = new wxLocale(); + // add to tracked memory list + wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLocale((wxLocale *)returns)); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxLocale, returns); + + return 1; + } + *************** *** 5985,5995 **** return wxlState.CallOverloadedFunction(&overload_method); } static int LUACALL wxLua_wxLocale_constructor_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_constructor_overload[] = { ! { wxLua_wxLocale_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 1, 5, s_wxluaargArray_None }, ! { wxLua_wxLocale_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxLocale_constructor1 }, ! { wxLua_wxLocale_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 5, s_wxluatagArray_wxLua_wxLocale_constructor }, }; static int s_wxluafunc_wxLua_wxLocale_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxLocale_constructor_overload)/sizeof(wxLuaBindCFunc); --- 6057,6085 ---- return wxlState.CallOverloadedFunction(&overload_method); } + static int LUACALL wxLua_wxLocale_Init_overload(lua_State *L); + // function overload table + static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_Init_overload[] = + { + { wxLua_wxLocale_Init_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 1, 6, s_wxluaargArray_None }, + { wxLua_wxLocale_Init1, WXLUAMETHOD_METHOD, 1, 3, s_wxluatagArray_wxLua_wxLocale_Init1 }, + { wxLua_wxLocale_Init, WXLUAMETHOD_METHOD, 2, 6, s_wxluatagArray_wxLua_wxLocale_Init }, + }; + static int s_wxluafunc_wxLua_wxLocale_Init_overload_count = sizeof(s_wxluafunc_wxLua_wxLocale_Init_overload)/sizeof(wxLuaBindCFunc); + // Overloaded function for wxLocale::Init + static int LUACALL wxLua_wxLocale_Init_overload(lua_State *L) + { + wxLuaState wxlState(L); + static wxLuaBindMethod overload_method = + { "Init", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLocale_Init_overload, s_wxluafunc_wxLua_wxLocale_Init_overload_count, 0 }; + return wxlState.CallOverloadedFunction(&overload_method); + } static int LUACALL wxLua_wxLocale_constructor_overload(lua_State *L); // function overload table static wxLuaBindCFunc s_wxluafunc_wxLua_wxLocale_constructor_overload[] = { ! { wxLua_wxLocale_constructor_overload, WXLUAMETHOD_METHOD|WXLUAMETHOD_OVERLOAD, 0, 5, s_wxluaargArray_None }, ! { wxLua_wxLocale_constructor2, WXLUAMETHOD_CONSTRUCTOR, 1, 2, s_wxluatagArray_wxLua_wxLocale_constructor2 }, ! { wxLua_wxLocale_constructor1, WXLUAMETHOD_CONSTRUCTOR, 1, 5, s_wxluatagArray_wxLua_wxLocale_constructor1 }, ! { wxLua_wxLocale_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }, }; static int s_wxluafunc_wxLua_wxLocale_constructor_overload_count = sizeof(s_wxluafunc_wxLua_wxLocale_constructor_overload)/sizeof(wxLuaBindCFunc); *************** *** 6035,6038 **** --- 6125,6132 ---- { "GetSystemLanguage", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLocale_GetSystemLanguage, 1, NULL }, + #if (wxUSE_INTL) + { "Init", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLocale_Init_overload, s_wxluafunc_wxLua_wxLocale_Init_overload_count, 0 }, + #endif // (wxUSE_INTL) + #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_INTL) { "IsAvailable", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLocale_IsAvailable, 1, NULL }, |
|
From: John L. <jr...@us...> - 2007-06-26 16:15:51
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv27934/wxLua/bindings/wxwidgets Modified Files: datetime.i Log Message: Added wxLocale::Init functions for debugging problems Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** datetime.i 26 Jun 2007 03:22:04 -0000 1.34 --- datetime.i 26 Jun 2007 16:15:47 -0000 1.35 *************** *** 789,793 **** // call Init() if you use this ctor ! //wxLocale() // the ctor has a side effect of changing current locale --- 789,793 ---- // call Init() if you use this ctor ! wxLocale() // the ctor has a side effect of changing current locale *************** *** 800,806 **** // the same as a function (returns true on success) //bool Init(const wxChar *szName, const wxChar *szShort = (const wxChar *) NULL, const wxChar *szLocale = (const wxChar *) NULL, bool bLoadDefault = true, bool bConvertEncoding = false) // same as second ctor (returns true on success) ! //bool Init(int language = wxLANGUAGE_DEFAULT, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); // Try to get user's (or OS's) preferred language setting. --- 800,807 ---- // the same as a function (returns true on success) //bool Init(const wxChar *szName, const wxChar *szShort = (const wxChar *) NULL, const wxChar *szLocale = (const wxChar *) NULL, bool bLoadDefault = true, bool bConvertEncoding = false) + bool Init(const wxString &szName, const wxString &szShort = "", const wxString &szLocale = "", bool bLoadDefault = true, bool bConvertEncoding = false) // same as second ctor (returns true on success) ! bool Init(int language = wxLANGUAGE_DEFAULT, int flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING); // Try to get user's (or OS's) preferred language setting. |
|
From: John L. <jr...@us...> - 2007-06-26 03:22:55
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/setup In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/modules/wxbind/setup Modified Files: wxluasetup.h Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: wxluasetup.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/setup/wxluasetup.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wxluasetup.h 18 Jun 2007 19:51:30 -0000 1.14 --- wxluasetup.h 26 Jun 2007 03:22:05 -0000 1.15 *************** *** 82,85 **** --- 82,87 ---- #define wxLUA_USE_wxListBox 1 #define wxLUA_USE_wxListCtrl 1 + #define wxLUA_USE_wxLog 1 + #define wxLUA_USE_wxLogWindow 1 #define wxLUA_USE_wxLuaHtmlWindow 1 #define wxLUA_USE_wxLuaPrintout 1 *************** *** 121,124 **** --- 123,127 ---- #define wxLUA_USE_wxStaticText 1 #define wxLUA_USE_wxStatusBar 1 + #define wxLUA_USE_wxStopWatch 1 #define wxLUA_USE_wxStringList 1 #define wxLUA_USE_wxSystemOptions 1 |
|
From: John L. <jr...@us...> - 2007-06-26 03:22:49
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/bindings/wxwidgets Modified Files: appframe.i datetime.i sizer.i windows.i wx_datatypes.lua Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: sizer.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/sizer.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** sizer.i 25 Jun 2007 03:19:38 -0000 1.16 --- sizer.i 26 Jun 2007 03:22:04 -0000 1.17 *************** *** 10,13 **** --- 10,53 ---- %if wxLUA_USE_wxSizer + %if %wxchkver_2_8 + + // --------------------------------------------------------------------------- + // wxSizerFlags + + %class %delete %encapsulate %noclassinfo wxSizerFlags + wxSizerFlags(int proportion = 0) + + // setters for all sizer flags, they all return the object itself so that + // calls to them can be chained + + wxSizerFlags& Proportion(int proportion) + wxSizerFlags& Align(int alignment) // combination of wxAlignment values + wxSizerFlags& Expand() // wxEXPAND + + // some shortcuts for Align() + wxSizerFlags& Centre() //{ return Align(wxCENTRE); } + wxSizerFlags& Center() //{ return Centre(); } + wxSizerFlags& Left() //{ return Align(wxALIGN_LEFT); } + wxSizerFlags& Right() //{ return Align(wxALIGN_RIGHT); } + wxSizerFlags& Top() //{ return Align(wxALIGN_TOP); } + wxSizerFlags& Bottom() //{ return Align(wxALIGN_BOTTOM); } + + static int GetDefaultBorder() // default border size used by Border() below + wxSizerFlags& Border(int direction, int borderInPixels) + wxSizerFlags& Border(int direction = wxALL) + wxSizerFlags& DoubleBorder(int direction = wxALL) + + wxSizerFlags& TripleBorder(int direction = wxALL) + wxSizerFlags& HorzBorder() + wxSizerFlags& DoubleHorzBorder() + wxSizerFlags& Shaped() + wxSizerFlags& FixedMinSize() + + // accessors for wxSizer only + int GetProportion() const + int GetFlags() const + int GetBorderInPixels() const + %endclass + // --------------------------------------------------------------------------- // wxSizerItem *************** *** 148,153 **** %class wxFlexGridSizer, wxGridSizer ! wxFlexGridSizer(int rows, int cols, int vgap, int hgap) ! // wxFlexGridSizer(int cols, int vgap = 0, int hgap = 0) void AddGrowableCol( size_t idx, int proportion = 0 ) --- 188,193 ---- %class wxFlexGridSizer, wxGridSizer ! wxFlexGridSizer(int rows, int cols, int vgap=0, int hgap=0) ! // wxFlexGridSizer(int cols, int vgap = 0, int hgap = 0) // just use the above constructor void AddGrowableCol( size_t idx, int proportion = 0 ) Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** windows.i 25 Jun 2007 03:19:38 -0000 1.48 --- windows.i 26 Jun 2007 03:22:04 -0000 1.49 *************** *** 22,25 **** --- 22,35 ---- // --------------------------------------------------------------------------- + // wxWindowUpdateLocker - Note this only calls wxWindow::Freeze() -> Thaw() + + %include "wx/wupdlock.h" + + %class %delete %noclassinfo %encapsulate wxWindowUpdateLocker + // NOTE: ALWAYS delete() this when done since lua's gc may not delete it soon enough + wxWindowUpdateLocker(wxWindow *winToLock = NULL) + %endclass + + // --------------------------------------------------------------------------- // wxWindow %define wxSIMPLE_BORDER *************** *** 60,67 **** %endenum ! %mac|%x11|%motif %typedef WXWidget void* ! %gtk %typedef WXWidget unsigned long // GtkWidget* what could you do with it? ! %mgl %typedef WXWidget window_t ! %msw|%os2 %typedef WXWidget unsigned long %class %delete %noclassinfo %encapsulate wxVisualAttributes --- 70,77 ---- %endenum ! //%mac|%x11|%motif %typedef WXWidget void* ! //%gtk %typedef WXWidget unsigned long // GtkWidget* what could you do with it? ! //%mgl %typedef WXWidget window_t ! //%msw|%os2 %typedef WXWidget unsigned long %class %delete %noclassinfo %encapsulate wxVisualAttributes *************** *** 145,149 **** virtual wxColour GetForegroundColour() wxWindow* GetGrandParent() const ! WXWidget GetHandle() const virtual wxString GetHelpText() const int GetId() const --- 155,159 ---- virtual wxColour GetForegroundColour() wxWindow* GetGrandParent() const ! //WXWidget GetHandle() const virtual wxString GetHelpText() const int GetId() const Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** datetime.i 25 Jun 2007 03:19:37 -0000 1.33 --- datetime.i 26 Jun 2007 03:22:04 -0000 1.34 *************** *** 372,375 **** --- 372,395 ---- %endif //wxLUA_USE_wxTimer && wxUSE_TIMER + + // --------------------------------------------------------------------------- + // wxStopWatch + + %if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + + %include "wx/stopwatch.h" + + %class %delete %noclassinfo %encapsulate wxStopWatch + wxStopWatch() // ctor starts the stop watch + + void Start(long t0 = 0) // start the stop watch at the moment t0 + void Pause() + void Resume() + long Time() const + %endclass + + %endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + + // --------------------------------------------------------------------------- // wxCalendarCtrl Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** wx_datatypes.lua 25 Jun 2007 03:19:38 -0000 1.77 --- wx_datatypes.lua 26 Jun 2007 03:22:04 -0000 1.78 *************** *** 12,16 **** { WXHANDLE = "void *", - WXWidget = "unsigned long", ["wxDateTime::wxDateTime_t"] = "unsigned short", wxDouble = "double", --- 12,15 ---- *************** *** 385,389 **** wxBoxSizer = { BaseClass = "wxSizer", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 384,388 ---- wxBoxSizer = { BaseClass = "wxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1058,1062 **** }, wxEdge = { ! Condition = "wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))", DefType = "enum", IsNumber = true, --- 1057,1061 ---- }, wxEdge = { ! Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", DefType = "enum", IsNumber = true, *************** *** 1274,1278 **** wxFlexGridSizer = { BaseClass = "wxGridSizer", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 1273,1277 ---- wxFlexGridSizer = { BaseClass = "wxGridSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1280,1284 **** }, wxFlexSizerGrowMode = { ! Condition = "wxLUA_USE_wxSizer", DefType = "enum", IsNumber = true, --- 1279,1283 ---- }, wxFlexSizerGrowMode = { ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "enum", IsNumber = true, *************** *** 1387,1391 **** }, wxGBPosition = { ! Condition = "wxLUA_USE_wxSizer", DefType = "class", Encapsulate = true, --- 1386,1390 ---- }, wxGBPosition = { ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", Encapsulate = true, *************** *** 1395,1399 **** wxGBSizerItem = { BaseClass = "wxSizerItem", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 1394,1398 ---- wxGBSizerItem = { BaseClass = "wxSizerItem", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1401,1405 **** }, wxGBSpan = { ! Condition = "wxLUA_USE_wxSizer", DefType = "class", Encapsulate = true, --- 1400,1404 ---- }, wxGBSpan = { ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", Encapsulate = true, *************** *** 1470,1474 **** wxGridBagSizer = { BaseClass = "wxFlexGridSizer", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 1469,1473 ---- wxGridBagSizer = { BaseClass = "wxFlexGridSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1651,1655 **** wxGridSizer = { BaseClass = "wxSizer", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 1650,1654 ---- wxGridSizer = { BaseClass = "wxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1990,1994 **** wxIndividualLayoutConstraint = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))", DefType = "class", IsNumber = false, --- 1989,1993 ---- wxIndividualLayoutConstraint = { BaseClass = "wxObject", ! Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", DefType = "class", IsNumber = false, *************** *** 2111,2115 **** wxLayoutConstraints = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))", DefType = "class", IsNumber = false, --- 2110,2114 ---- wxLayoutConstraints = { BaseClass = "wxObject", ! Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", DefType = "class", IsNumber = false, *************** *** 2223,2227 **** }, wxLog = { ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2222,2226 ---- }, wxLog = { ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2231,2235 **** wxLogBuffer = { BaseClass = "wxLog", ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2230,2234 ---- wxLogBuffer = { BaseClass = "wxLog", ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2239,2243 **** wxLogChain = { BaseClass = "wxLog", ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2238,2242 ---- wxLogChain = { BaseClass = "wxLog", ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2245,2251 **** Name = "wxLogChain", }, wxLogNull = { BaseClass = "wxLog", ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2244,2258 ---- Name = "wxLogChain", }, + wxLogGui = { + BaseClass = "wxLog", + Condition = "(wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI)", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxLogGui", + }, wxLogNull = { BaseClass = "wxLog", ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2255,2259 **** wxLogPassThrough = { BaseClass = "wxLogChain", ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2262,2266 ---- wxLogPassThrough = { BaseClass = "wxLogChain", ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2261,2264 **** --- 2268,2287 ---- Name = "wxLogPassThrough", }, + wxLogTextCtrl = { + BaseClass = "wxLog", + Condition = "(wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxLogTextCtrl", + }, + wxLogWindow = { + BaseClass = "wxLogPassThrough", + Condition = "(wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxLogWindow", + }, wxLongLong = { Condition = "wxUSE_LONGLONG", *************** *** 2536,2540 **** wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0)))", DefType = "class", IsNumber = false, --- 2559,2563 ---- wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0)))", DefType = "class", IsNumber = false, *************** *** 2976,2980 **** }, wxRelationship = { ! Condition = "wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))", DefType = "enum", IsNumber = true, --- 2999,3003 ---- }, wxRelationship = { ! Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", DefType = "enum", IsNumber = true, *************** *** 3093,3096 **** --- 3116,3126 ---- Name = "wxSingleChoiceDialog", }, + wxSingleInstanceChecker = { + Condition = "wxUSE_SNGLINST_CHECKER", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxSingleInstanceChecker", + }, wxSize = { Condition = "wxLUA_USE_wxPointSizeRect", *************** *** 3108,3119 **** wxSizer = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, Name = "wxSizer", }, wxSizerItem = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 3138,3156 ---- wxSizer = { BaseClass = "wxObject", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, Name = "wxSizer", }, + wxSizerFlags = { + Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxSizerFlags", + }, wxSizerItem = { BaseClass = "wxObject", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 3284,3288 **** wxStaticBoxSizer = { BaseClass = "wxBoxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxUSE_STATBOX)", DefType = "class", IsNumber = false, --- 3321,3325 ---- wxStaticBoxSizer = { BaseClass = "wxBoxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_STATBOX)", DefType = "class", IsNumber = false, *************** *** 3312,3316 **** wxStdDialogButtonSizer = { BaseClass = "wxBoxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxUSE_BUTTON)", DefType = "class", IsNumber = false, --- 3349,3353 ---- wxStdDialogButtonSizer = { BaseClass = "wxBoxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)", DefType = "class", IsNumber = false, *************** *** 3336,3339 **** --- 3373,3383 ---- Name = "wxStockGDI::Item", }, + wxStopWatch = { + Condition = "wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxStopWatch", + }, wxStreamBase = { Condition = "wxUSE_STREAMS", *************** *** 3851,3854 **** --- 3895,3904 ---- Name = "wxWindowList", }, + wxWindowUpdateLocker = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxWindowUpdateLocker", + }, wxWindowVariant = { DefType = "enum", *************** *** 4076,4079 **** --- 4126,4131 ---- wxLUA_USE_wxListBox = "wxLUA_USE_wxListBox", wxLUA_USE_wxListCtrl = "wxLUA_USE_wxListCtrl", + wxLUA_USE_wxLog = "wxLUA_USE_wxLog", + wxLUA_USE_wxLogWindow = "wxLUA_USE_wxLogWindow", wxLUA_USE_wxLuaHtmlWindow = "wxLUA_USE_wxLuaHtmlWindow", wxLUA_USE_wxLuaPrintout = "wxLUA_USE_wxLuaPrintout", *************** *** 4115,4118 **** --- 4167,4171 ---- wxLUA_USE_wxStaticText = "wxLUA_USE_wxStaticText", wxLUA_USE_wxStatusBar = "wxLUA_USE_wxStatusBar", + wxLUA_USE_wxStopWatch = "wxLUA_USE_wxStopWatch", wxLUA_USE_wxStringList = "wxLUA_USE_wxStringList", wxLUA_USE_wxSystemOptions = "wxLUA_USE_wxSystemOptions", Index: appframe.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/appframe.i,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** appframe.i 25 Jun 2007 16:07:57 -0000 1.43 --- appframe.i 26 Jun 2007 03:22:04 -0000 1.44 *************** *** 11,15 **** // wxLog ! %if wxUSE_LOG %include "wx/log.h" --- 11,15 ---- // wxLog ! %if wxLUA_USE_wxLog && wxUSE_LOG %include "wx/log.h" *************** *** 135,143 **** // just treat it as a wxLog. ! /* %class %delete %noclassinfo %encapsulate wxLogGui, wxLog wxLogGui() %endclass ! */ // --------------------------------------------------------------------------- --- 135,145 ---- // just treat it as a wxLog. ! %if wxUSE_LOGGUI ! %class %delete %noclassinfo %encapsulate wxLogGui, wxLog wxLogGui() %endclass ! ! %endif // wxUSE_LOGGUI // --------------------------------------------------------------------------- *************** *** 178,183 **** */ ! %endif //wxUSE_LOG // --------------------------------------------------------------------------- --- 180,244 ---- */ ! // --------------------------------------------------------------------------- ! // wxLogTextCtrl ! ! %if wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL ! ! %class %delete %noclassinfo %encapsulate wxLogTextCtrl, wxLog ! wxLogTextCtrl(wxTextCtrl* textCtrl); ! ! %endclass + %endif // wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL + + // --------------------------------------------------------------------------- + // wxLogWindow + + %if wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW + + %class %delete %noclassinfo %encapsulate wxLogWindow, wxLogPassThrough + wxLogWindow(wxWindow *pParent, const wxString& szTitle, bool bShow = true, bool bPassToOld = true); + + void Show(bool show = true) + wxFrame * GetFrame() const + + //virtual void OnFrameCreate(wxFrame *frame) + //virtual bool OnFrameClose(wxFrame *frame) + //virtual void OnFrameDelete(wxFrame *frame) + %endclass + + %endif // wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW + + + %endif // wxLUA_USE_wxLog && wxUSE_LOG + + // --------------------------------------------------------------------------- + // wxSingleInstanceChecker + + %if wxUSE_SNGLINST_CHECKER + + %include "wx/snglinst.h" + + %class %delete %noclassinfo %encapsulate wxSingleInstanceChecker + wxSingleInstanceChecker() // default ctor, use Create() after it + // like Create() but no error checking (dangerous!) + //wxSingleInstanceChecker(const wxString& name, const wxString& path = "") + + // name must be given and be as unique as possible, it is used as the mutex + // name under Win32 and the lock file name under Unix - + // wxTheApp->GetAppName() may be a good value for this parameter + // + // path is optional and is ignored under Win32 and used as the directory to + // create the lock file in under Unix (default is wxGetHomeDir()) + // + // returns false if initialization failed, it doesn't mean that another + // instance is running - use IsAnotherRunning() to check it + bool Create(const wxString& name, const wxString& path = "") + + bool IsAnotherRunning() const // is another copy of this program already running? + + %endclass + + %endif // wxUSE_SNGLINST_CHECKER // --------------------------------------------------------------------------- |
|
From: John L. <jr...@us...> - 2007-06-26 03:22:49
|
Update of /cvsroot/wxlua/wxLua/bindings/wxstc In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/bindings/wxstc Modified Files: wxstc_datatypes.lua Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: wxstc_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxstc/wxstc_datatypes.lua,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** wxstc_datatypes.lua 25 Jun 2007 03:19:37 -0000 1.67 --- wxstc_datatypes.lua 26 Jun 2007 03:22:04 -0000 1.68 *************** *** 12,16 **** { WXHANDLE = "void *", - WXWidget = "unsigned long", ["wxDateTime::wxDateTime_t"] = "unsigned short", wxDouble = "double", --- 12,15 ---- *************** *** 385,389 **** wxBoxSizer = { BaseClass = "wxSizer", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 384,388 ---- wxBoxSizer = { BaseClass = "wxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1058,1062 **** }, wxEdge = { ! Condition = "wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))", DefType = "enum", IsNumber = true, --- 1057,1061 ---- }, wxEdge = { ! Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", DefType = "enum", IsNumber = true, *************** *** 1274,1278 **** wxFlexGridSizer = { BaseClass = "wxGridSizer", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 1273,1277 ---- wxFlexGridSizer = { BaseClass = "wxGridSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1280,1284 **** }, wxFlexSizerGrowMode = { ! Condition = "wxLUA_USE_wxSizer", DefType = "enum", IsNumber = true, --- 1279,1283 ---- }, wxFlexSizerGrowMode = { ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "enum", IsNumber = true, *************** *** 1387,1391 **** }, wxGBPosition = { ! Condition = "wxLUA_USE_wxSizer", DefType = "class", Encapsulate = true, --- 1386,1390 ---- }, wxGBPosition = { ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", Encapsulate = true, *************** *** 1395,1399 **** wxGBSizerItem = { BaseClass = "wxSizerItem", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 1394,1398 ---- wxGBSizerItem = { BaseClass = "wxSizerItem", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1401,1405 **** }, wxGBSpan = { ! Condition = "wxLUA_USE_wxSizer", DefType = "class", Encapsulate = true, --- 1400,1404 ---- }, wxGBSpan = { ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", Encapsulate = true, *************** *** 1470,1474 **** wxGridBagSizer = { BaseClass = "wxFlexGridSizer", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 1469,1473 ---- wxGridBagSizer = { BaseClass = "wxFlexGridSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1651,1655 **** wxGridSizer = { BaseClass = "wxSizer", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 1650,1654 ---- wxGridSizer = { BaseClass = "wxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 1990,1994 **** wxIndividualLayoutConstraint = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))", DefType = "class", IsNumber = false, --- 1989,1993 ---- wxIndividualLayoutConstraint = { BaseClass = "wxObject", ! Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", DefType = "class", IsNumber = false, *************** *** 2111,2115 **** wxLayoutConstraints = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))", DefType = "class", IsNumber = false, --- 2110,2114 ---- wxLayoutConstraints = { BaseClass = "wxObject", ! Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", DefType = "class", IsNumber = false, *************** *** 2223,2227 **** }, wxLog = { ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2222,2226 ---- }, wxLog = { ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2231,2235 **** wxLogBuffer = { BaseClass = "wxLog", ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2230,2234 ---- wxLogBuffer = { BaseClass = "wxLog", ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2239,2243 **** wxLogChain = { BaseClass = "wxLog", ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2238,2242 ---- wxLogChain = { BaseClass = "wxLog", ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2245,2251 **** Name = "wxLogChain", }, wxLogNull = { BaseClass = "wxLog", ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2244,2258 ---- Name = "wxLogChain", }, + wxLogGui = { + BaseClass = "wxLog", + Condition = "(wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI)", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxLogGui", + }, wxLogNull = { BaseClass = "wxLog", ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2255,2259 **** wxLogPassThrough = { BaseClass = "wxLogChain", ! Condition = "wxUSE_LOG", DefType = "class", Encapsulate = true, --- 2262,2266 ---- wxLogPassThrough = { BaseClass = "wxLogChain", ! Condition = "wxLUA_USE_wxLog && wxUSE_LOG", DefType = "class", Encapsulate = true, *************** *** 2261,2264 **** --- 2268,2287 ---- Name = "wxLogPassThrough", }, + wxLogTextCtrl = { + BaseClass = "wxLog", + Condition = "(wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxLogTextCtrl", + }, + wxLogWindow = { + BaseClass = "wxLogPassThrough", + Condition = "(wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxLogWindow", + }, wxLongLong = { Condition = "wxUSE_LONGLONG", *************** *** 2536,2540 **** wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0)))", DefType = "class", IsNumber = false, --- 2559,2563 ---- wxNotebookSizer = { BaseClass = "wxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0)))", DefType = "class", IsNumber = false, *************** *** 2976,2980 **** }, wxRelationship = { ! Condition = "wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))", DefType = "enum", IsNumber = true, --- 2999,3003 ---- }, wxRelationship = { ! Condition = "(wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))", DefType = "enum", IsNumber = true, *************** *** 3093,3096 **** --- 3116,3126 ---- Name = "wxSingleChoiceDialog", }, + wxSingleInstanceChecker = { + Condition = "wxUSE_SNGLINST_CHECKER", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxSingleInstanceChecker", + }, wxSize = { Condition = "wxLUA_USE_wxPointSizeRect", *************** *** 3108,3119 **** wxSizer = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, Name = "wxSizer", }, wxSizerItem = { BaseClass = "wxObject", ! Condition = "wxLUA_USE_wxSizer", DefType = "class", IsNumber = false, --- 3138,3156 ---- wxSizer = { BaseClass = "wxObject", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, Name = "wxSizer", }, + wxSizerFlags = { + Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxSizerFlags", + }, wxSizerItem = { BaseClass = "wxObject", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, *************** *** 3284,3288 **** wxStaticBoxSizer = { BaseClass = "wxBoxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxUSE_STATBOX)", DefType = "class", IsNumber = false, --- 3321,3325 ---- wxStaticBoxSizer = { BaseClass = "wxBoxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_STATBOX)", DefType = "class", IsNumber = false, *************** *** 3312,3316 **** wxStdDialogButtonSizer = { BaseClass = "wxBoxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxUSE_BUTTON)", DefType = "class", IsNumber = false, --- 3349,3353 ---- wxStdDialogButtonSizer = { BaseClass = "wxBoxSizer", ! Condition = "(wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)", DefType = "class", IsNumber = false, *************** *** 3336,3339 **** --- 3373,3383 ---- Name = "wxStockGDI::Item", }, + wxStopWatch = { + Condition = "wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH", + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxStopWatch", + }, wxStreamBase = { Condition = "wxUSE_STREAMS", *************** *** 3862,3865 **** --- 3906,3915 ---- Name = "wxWindowList", }, + wxWindowUpdateLocker = { + DefType = "class", + Encapsulate = true, + IsNumber = false, + Name = "wxWindowUpdateLocker", + }, wxWindowVariant = { DefType = "enum", *************** *** 4087,4090 **** --- 4137,4142 ---- wxLUA_USE_wxListBox = "wxLUA_USE_wxListBox", wxLUA_USE_wxListCtrl = "wxLUA_USE_wxListCtrl", + wxLUA_USE_wxLog = "wxLUA_USE_wxLog", + wxLUA_USE_wxLogWindow = "wxLUA_USE_wxLogWindow", wxLUA_USE_wxLuaHtmlWindow = "wxLUA_USE_wxLuaHtmlWindow", wxLUA_USE_wxLuaPrintout = "wxLUA_USE_wxLuaPrintout", *************** *** 4126,4129 **** --- 4178,4182 ---- wxLUA_USE_wxStaticText = "wxLUA_USE_wxStaticText", wxLUA_USE_wxStatusBar = "wxLUA_USE_wxStatusBar", + wxLUA_USE_wxStopWatch = "wxLUA_USE_wxStopWatch", wxLUA_USE_wxStringList = "wxLUA_USE_wxStringList", wxLUA_USE_wxSystemOptions = "wxLUA_USE_wxSystemOptions", |
|
From: John L. <jr...@us...> - 2007-06-26 03:22:49
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/modules/wxbind/include Modified Files: wxbind.h Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: wxbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/include/wxbind.h,v retrieving revision 1.82 retrieving revision 1.83 diff -C2 -d -r1.82 -r1.83 *** wxbind.h 25 Jun 2007 03:19:40 -0000 1.82 --- wxbind.h 26 Jun 2007 03:22:05 -0000 1.83 *************** *** 156,159 **** --- 156,167 ---- #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxUSE_POSTSCRIPT) + #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) + #include "wx/gbsizer.h" + #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) + + #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) + #include "wx/layout.h" + #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) + #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) #include "wx/protocol/protocol.h" *************** *** 204,207 **** --- 212,216 ---- #include "wx/tokenzr.h" #include "wx/utils.h" + #include "wx/wupdlock.h" #include "wxlua/include/wxlua_bind.h" *************** *** 502,509 **** #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK - #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) - #include "wx/layout.h" - #endif // wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) - #if wxLUA_USE_wxList && !wxUSE_STL #include "wx/list.h" --- 511,514 ---- *************** *** 518,521 **** --- 523,530 ---- #endif // wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL + #if wxLUA_USE_wxLog && wxUSE_LOG + #include "wx/log.h" + #endif // wxLUA_USE_wxLog && wxUSE_LOG + #if wxLUA_USE_wxLuaHtmlWindow #include "wxbind/include/wxlhtmlwin.h" *************** *** 599,606 **** #endif // wxLUA_USE_wxScrollBar && wxUSE_SCROLLBAR - #if wxLUA_USE_wxSizer - #include "wx/gbsizer.h" - #endif // wxLUA_USE_wxSizer - #if wxLUA_USE_wxSlider && wxUSE_SLIDER #include "wx/slider.h" --- 608,611 ---- *************** *** 649,652 **** --- 654,661 ---- #endif // wxLUA_USE_wxStatusBar && wxUSE_STATUSBAR + #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + #include "wx/stopwatch.h" + #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + #if wxLUA_USE_wxSystemOptions #include "wx/sysopt.h" *************** *** 707,714 **** #endif // wxUSE_FONTDLG && wxLUA_USE_wxFontDialog - #if wxUSE_LOG - #include "wx/log.h" - #endif // wxUSE_LOG - #if wxUSE_LONGLONG #include "wx/longlong.h" --- 716,719 ---- *************** *** 719,722 **** --- 724,731 ---- #endif // wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog + #if wxUSE_SNGLINST_CHECKER + #include "wx/snglinst.h" + #endif // wxUSE_SNGLINST_CHECKER + #if wxUSE_STREAMS #include "wx/datstrm.h" *************** *** 955,958 **** --- 964,985 ---- #endif // (wxLUA_USE_wxListBox && wxUSE_LISTBOX) && (wxLUA_USE_wxCheckListBox && wxUSE_CHECKLISTBOX) + #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogWindow; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogWindow_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogWindow_methodCount; + #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) + + #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogTextCtrl; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogTextCtrl_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogTextCtrl_methodCount; + #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) + + #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogGui; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogGui_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogGui_methodCount; + #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) + #if (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (defined(__WXMSW__) || defined(__WXMAC__)) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxPrinterDC; *************** *** 979,999 **** #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxUSE_POSTSCRIPT) ! #if (wxLUA_USE_wxSizer) && (wxUSE_BUTTON) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStdDialogButtonSizer; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStdDialogButtonSizer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxStdDialogButtonSizer_methodCount; ! #endif // (wxLUA_USE_wxSizer) && (wxUSE_BUTTON) ! #if (wxLUA_USE_wxSizer) && (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNotebookSizer; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxNotebookSizer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxNotebookSizer_methodCount; ! #endif // (wxLUA_USE_wxSizer) && (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) ! #if (wxLUA_USE_wxSizer) && (wxUSE_STATBOX) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStaticBoxSizer; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStaticBoxSizer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxStaticBoxSizer_methodCount; ! #endif // (wxLUA_USE_wxSizer) && (wxUSE_STATBOX) #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) --- 1006,1068 ---- #endif // (wxLUA_USE_wxPrint && wxUSE_PRINTING_ARCHITECTURE) && (wxUSE_POSTSCRIPT) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBoxSizer; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxBoxSizer_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxBoxSizer_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFlexGridSizer; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFlexGridSizer_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxFlexGridSizer_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGBPosition; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGBPosition_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxGBPosition_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGBSizerItem; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGBSizerItem_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxGBSizerItem_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGBSpan; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGBSpan_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxGBSpan_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridBagSizer; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGridBagSizer_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxGridBagSizer_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridSizer; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGridSizer_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxGridSizer_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSizer; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSizer_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxSizer_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSizerFlags; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSizerFlags_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxSizerFlags_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSizerItem; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSizerItem_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxSizerItem_methodCount; ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) ! ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStdDialogButtonSizer; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStdDialogButtonSizer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxStdDialogButtonSizer_methodCount; ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxNotebookSizer; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxNotebookSizer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxNotebookSizer_methodCount; ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_NOTEBOOK && (!wxCHECK_VERSION(2,6,0))) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_STATBOX) extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStaticBoxSizer; extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStaticBoxSizer_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxStaticBoxSizer_methodCount; ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_STATBOX) ! ! #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIndividualLayoutConstraint; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxIndividualLayoutConstraint_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxIndividualLayoutConstraint_methodCount; ! extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLayoutConstraints; ! extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLayoutConstraints_methods[]; ! extern WXDLLIMPEXP_DATA_WXBIND(int) wxLayoutConstraints_methodCount; ! #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) #if (wxLUA_USE_wxSocket && wxUSE_SOCKETS) && (wxUSE_PROTOCOL) *************** *** 1219,1222 **** --- 1288,1294 ---- extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWindowDisabler_methods[]; extern WXDLLIMPEXP_DATA_WXBIND(int) wxWindowDisabler_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxWindowUpdateLocker; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxWindowUpdateLocker_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxWindowUpdateLocker_methodCount; #if wxCHECK_VERSION(2,4,0) && defined(__WXMSW__) && wxLUA_USE_wxTabCtrl && wxUSE_TAB_DIALOG *************** *** 1963,1975 **** #endif // wxLUA_USE_wxJoystick && wxUSE_JOYSTICK - #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxIndividualLayoutConstraint; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxIndividualLayoutConstraint_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxIndividualLayoutConstraint_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLayoutConstraints; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLayoutConstraints_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxLayoutConstraints_methodCount; - #endif // wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) - #if wxLUA_USE_wxList && !wxUSE_STL extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxList; --- 2035,2038 ---- *************** *** 2005,2008 **** --- 2068,2089 ---- #endif // wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL + #if wxLUA_USE_wxLog && wxUSE_LOG + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLog_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogBuffer; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogBuffer_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogBuffer_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogChain; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogChain_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogChain_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogNull; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogNull_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogNull_methodCount; + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogPassThrough; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogPassThrough_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogPassThrough_methodCount; + #endif // wxLUA_USE_wxLog && wxUSE_LOG + #if wxLUA_USE_wxLuaHtmlWindow extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLuaHtmlWinTagEvent; *************** *** 2224,2257 **** #endif // wxLUA_USE_wxScrolledWindow - #if wxLUA_USE_wxSizer - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxBoxSizer; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxBoxSizer_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxBoxSizer_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxFlexGridSizer; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxFlexGridSizer_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxFlexGridSizer_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGBPosition; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGBPosition_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxGBPosition_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGBSizerItem; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGBSizerItem_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxGBSizerItem_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGBSpan; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGBSpan_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxGBSpan_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridBagSizer; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGridBagSizer_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxGridBagSizer_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxGridSizer; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxGridSizer_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxGridSizer_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSizer; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSizer_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxSizer_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSizerItem; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSizerItem_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxSizerItem_methodCount; - #endif // wxLUA_USE_wxSizer - #if wxLUA_USE_wxSlider && wxUSE_SLIDER extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSlider; --- 2305,2308 ---- *************** *** 2350,2353 **** --- 2401,2410 ---- #endif // wxLUA_USE_wxStatusBar && wxUSE_STATUSBAR + #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxStopWatch; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxStopWatch_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxStopWatch_methodCount; + #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + #if wxLUA_USE_wxSystemOptions extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSystemOptions; *************** *** 2512,2533 **** #endif // wxUSE_INTL - #if wxUSE_LOG - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLog; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLog_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxLog_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogBuffer; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogBuffer_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogBuffer_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogChain; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogChain_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogChain_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogNull; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogNull_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogNull_methodCount; - extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLogPassThrough; - extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxLogPassThrough_methods[]; - extern WXDLLIMPEXP_DATA_WXBIND(int) wxLogPassThrough_methodCount; - #endif // wxUSE_LOG - #if wxUSE_LONGLONG extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxLongLong; --- 2569,2572 ---- *************** *** 2545,2548 **** --- 2584,2593 ---- #endif // wxUSE_PROGRESSDLG && wxLUA_USE_wxProgressDialog + #if wxUSE_SNGLINST_CHECKER + extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxSingleInstanceChecker; + extern WXDLLIMPEXP_WXBIND wxLuaBindMethod wxSingleInstanceChecker_methods[]; + extern WXDLLIMPEXP_DATA_WXBIND(int) wxSingleInstanceChecker_methodCount; + #endif // wxUSE_SNGLINST_CHECKER + #if wxUSE_STREAMS extern WXDLLIMPEXP_DATA_WXBIND(int) s_wxluatag_wxDataInputStream; *************** *** 2607,2610 **** --- 2652,2673 ---- #endif // (wxLUA_USE_wxDataObject && wxUSE_DATAOBJ) && (wxCHECK_VERSION(2,8,0)) + #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogWindow, wxLogWindow) + #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) + + #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogTextCtrl, wxLogTextCtrl) + #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) + + #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogGui, wxLogGui) + #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) + + #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxGBPosition, wxGBPosition) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxGBSpan, wxGBSpan) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxSizerFlags, wxSizerFlags) + #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFileType, wxFileType) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxFileType::MessageParameters, wxFileType_MessageParameters) *************** *** 2617,2620 **** --- 2680,2684 ---- wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxVisualAttributes, wxVisualAttributes) wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowDisabler, wxWindowDisabler) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxWindowUpdateLocker, wxWindowUpdateLocker) #if wxCHECK_VERSION(2,8,0) *************** *** 2763,2766 **** --- 2827,2838 ---- #endif // wxLUA_USE_wxListCtrl && wxUSE_LISTCTRL + #if wxLUA_USE_wxLog && wxUSE_LOG + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLog, wxLog) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogBuffer, wxLogBuffer) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogChain, wxLogChain) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogNull, wxLogNull) + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogPassThrough, wxLogPassThrough) + #endif // wxLUA_USE_wxLog && wxUSE_LOG + #if wxLUA_USE_wxPointSizeRect wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxPoint, wxPoint) *************** *** 2777,2784 **** #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX ! #if wxLUA_USE_wxSizer ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxGBPosition, wxGBPosition) ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxGBSpan, wxGBSpan) ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL --- 2849,2855 ---- #endif // wxLUA_USE_wxRegEx && wxUSE_REGEX ! #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH ! wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxStopWatch, wxStopWatch) ! #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH #if wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL *************** *** 2803,2814 **** #endif // wxUSE_INTL - #if wxUSE_LOG - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLog, wxLog) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogBuffer, wxLogBuffer) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogChain, wxLogChain) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogNull, wxLogNull) - wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLogPassThrough, wxLogPassThrough) - #endif // wxUSE_LOG - #if wxUSE_LONGLONG wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxLongLong, wxLongLong) --- 2874,2877 ---- *************** *** 2816,2819 **** --- 2879,2886 ---- #endif // wxUSE_LONGLONG + #if wxUSE_SNGLINST_CHECKER + wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxSingleInstanceChecker, wxSingleInstanceChecker) + #endif // wxUSE_SNGLINST_CHECKER + #if wxUSE_STREAMS wxLUA_DECLARE_ENCAPSULATION(WXDLLIMPEXP_WXBIND, wxDataInputStream, wxDataInputStream) |
|
From: John L. <jr...@us...> - 2007-06-26 03:22:49
|
Update of /cvsroot/wxlua/wxLua/modules/lua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/modules/lua/src Modified Files: lcode.c ldebug.c ltable.c lvm.c Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: ltable.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/ltable.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ltable.c 29 Mar 2006 05:48:11 -0000 1.2 --- ltable.c 26 Jun 2007 03:22:05 -0000 1.3 *************** *** 49,53 **** #define hashpow2(t,n) (gnode(t, lmod((n), sizenode(t)))) ! #define hashstr(t,str) hashpow2(t, (str)->tsv.hash) #define hashboolean(t,p) hashpow2(t, p) --- 49,53 ---- #define hashpow2(t,n) (gnode(t, lmod((n), sizenode(t)))) ! #define hashstr(t,str) hashpow2(t, (str)->tsv.hash) #define hashboolean(t,p) hashpow2(t, p) *************** *** 85,90 **** unsigned int a[numints]; int i; ! n += 1; /* normalize number (avoid -0) */ ! lua_assert(sizeof(a) <= sizeof(n)); memcpy(a, &n, sizeof(a)); for (i = 1; i < numints; i++) a[0] += a[i]; --- 85,90 ---- unsigned int a[numints]; int i; ! if (luai_numeq(n, 0)) /* avoid problems with -0 */ ! return gnode(t, 0); memcpy(a, &n, sizeof(a)); for (i = 1; i < numints; i++) a[0] += a[i]; *************** *** 303,307 **** setarrayvector(L, t, nasize); /* create new hash part with appropriate size */ ! setnodevector(L, t, nhsize); if (nasize < oldasize) { /* array part must shrink? */ t->sizearray = nasize; --- 303,307 ---- setarrayvector(L, t, nasize); /* create new hash part with appropriate size */ ! setnodevector(L, t, nhsize); if (nasize < oldasize) { /* array part must shrink? */ t->sizearray = nasize; *************** *** 391,399 **** /* ! ** inserts a new key into a hash table; first, check whether key's main ! ** position is free. If not, check whether colliding node is in its main ! ** position or not: if it is not, move colliding node to an empty place and ! ** put new key in its main position; otherwise (colliding node is in its main ! ** position), new key goes to an empty position. */ static TValue *newkey (lua_State *L, Table *t, const TValue *key) { --- 391,399 ---- /* ! ** inserts a new key into a hash table; first, check whether key's main ! ** position is free. If not, check whether colliding node is in its main ! ** position or not: if it is not, move colliding node to an empty place and ! ** put new key in its main position; otherwise (colliding node is in its main ! ** position), new key goes to an empty position. */ static TValue *newkey (lua_State *L, Table *t, const TValue *key) { Index: lvm.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lvm.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** lvm.c 25 Apr 2007 02:52:20 -0000 1.4 --- lvm.c 26 Jun 2007 03:22:05 -0000 1.5 *************** *** 62,70 **** const Instruction *oldpc = L->savedpc; L->savedpc = pc; ! if (mask > LUA_MASKLINE) { /* instruction-hook set? */ ! if (L->hookcount == 0) { ! resethookcount(L); ! luaD_callhook(L, LUA_HOOKCOUNT, -1); ! } } if (mask & LUA_MASKLINE) { --- 62,68 ---- const Instruction *oldpc = L->savedpc; L->savedpc = pc; ! if ((mask & LUA_MASKCOUNT) && L->hookcount == 0) { ! resethookcount(L); ! luaD_callhook(L, LUA_HOOKCOUNT, -1); } if (mask & LUA_MASKLINE) { *************** *** 128,132 **** return; } ! t = tm; /* else repeat with `tm' */ } luaG_runerror(L, "loop in gettable"); --- 126,130 ---- return; } ! t = tm; /* else repeat with `tm' */ } luaG_runerror(L, "loop in gettable"); *************** *** 155,159 **** return; } ! t = tm; /* else repeat with `tm' */ } luaG_runerror(L, "loop in settable"); --- 153,157 ---- return; } ! t = tm; /* else repeat with `tm' */ } luaG_runerror(L, "loop in settable"); Index: ldebug.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/ldebug.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ldebug.c 22 Sep 2006 19:39:59 -0000 1.3 --- ldebug.c 26 Jun 2007 03:22:05 -0000 1.4 *************** *** 564,569 **** void luaG_concaterror (lua_State *L, StkId p1, StkId p2) { ! if (ttisstring(p1)) p1 = p2; ! lua_assert(!ttisstring(p1)); luaG_typeerror(L, p1, "concatenate"); } --- 564,569 ---- void luaG_concaterror (lua_State *L, StkId p1, StkId p2) { ! if (ttisstring(p1) || ttisnumber(p1)) p1 = p2; ! lua_assert(!ttisstring(p1) && !ttisnumber(p1)); luaG_typeerror(L, p1, "concatenate"); } Index: lcode.c =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/lua/src/lcode.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** lcode.c 25 Apr 2007 02:52:20 -0000 1.5 --- lcode.c 26 Jun 2007 03:22:05 -0000 1.6 *************** *** 700,704 **** switch (op) { case OPR_MINUS: { ! if (e->k == VK) luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants */ codearith(fs, OP_UNM, e, &e2); --- 700,704 ---- switch (op) { case OPR_MINUS: { ! if (!isnumeral(e)) luaK_exp2anyreg(fs, e); /* cannot operate on non-numeric constants */ codearith(fs, OP_UNM, e, &e2); |
|
From: John L. <jr...@us...> - 2007-06-26 03:22:49
|
Update of /cvsroot/wxlua/wxLua/docs In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/docs Modified Files: changelog.txt readme.txt wxluaref.html Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: wxluaref.html =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/wxluaref.html,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxluaref.html 25 Jun 2007 03:19:38 -0000 1.32 --- wxluaref.html 26 Jun 2007 03:22:05 -0000 1.33 *************** *** 1749,1755 **** <td> <tr> ! <td>wxLogGui <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> --- 1749,1755 ---- <td> <tr> ! <td><a href="#wxLogGui">wxLogGui</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> *************** *** 1774,1785 **** <td> <tr> ! <td>wxLogTextCtrl <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> ! <td>wxLogWindow <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> --- 1774,1785 ---- <td> <tr> ! <td><a href="#wxLogTextCtrl">wxLogTextCtrl</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> ! <td><a href="#wxLogWindow">wxLogWindow</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> *************** *** 2559,2565 **** <td> <tr> ! <td>wxSingleInstanceChecker <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> --- 2559,2565 ---- <td> <tr> ! <td><a href="#wxSingleInstanceChecker">wxSingleInstanceChecker</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> *************** *** 2579,2585 **** <td> <tr> ! <td>wxSizerFlags <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> --- 2579,2585 ---- <td> <tr> ! <td><a href="#wxSizerFlags">wxSizerFlags</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> *************** *** 2734,2740 **** <td> <tr> ! <td>wxStopWatch <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> --- 2734,2740 ---- <td> <tr> ! <td><a href="#wxStopWatch">wxStopWatch</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> *************** *** 3164,3170 **** <td> <tr> ! <td>wxWindowUpdateLocker <td align="center" bgcolor=AAFFAA>X - <td bgcolor=FFAAAA> <td> <tr> --- 3164,3170 ---- <td> <tr> ! <td><a href="#wxWindowUpdateLocker">wxWindowUpdateLocker</a> ! <td align="center" bgcolor=AAFFAA>X <td align="center" bgcolor=AAFFAA>X <td> <tr> *************** *** 3432,3436 **** <font color=#009900>// <a href="#wxLog">wxLog</a></font><br> <br> ! <i>%if</i> wxUSE_LOG<br> <br> <i>%include</i> "wx/log.h"<br> --- 3432,3436 ---- <font color=#009900>// <a href="#wxLog">wxLog</a></font><br> <br> ! <i>%if</i> wxLUA_USE_wxLog && wxUSE_LOG<br> <br> <i>%include</i> "wx/log.h"<br> *************** *** 3558,3570 **** <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// wxLogGui - wxWidgets creates and installs one of these at startup,</font><br> <font color=#009900>// just treat it as a <a href="#wxLog">wxLog</a>.</font><br> <br> ! <font color=#888888>/*<br> ! <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxLogGui">wxLogGui</a>, <a href="#wxLog">wxLog</a></font></b></font> ! <blockquote><font color=#888888> ! wxLogGui()<br> ! </font></blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><font color=#888888><br> ! */</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> --- 3558,3572 ---- <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// <a href="#wxLogGui">wxLogGui</a> - wxWidgets creates and installs one of these at startup,</font><br> <font color=#009900>// just treat it as a <a href="#wxLog">wxLog</a>.</font><br> <br> ! <i>%if</i> wxUSE_LOGGUI<br> ! <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxLogGui">wxLogGui</a>, <a href="#wxLog">wxLog</a></font></b> ! <blockquote> ! <a href="#wxLogGui">wxLogGui</a>()<br> ! </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> ! <br> ! <i>%endif</i> <font color=#009900>// wxUSE_LOGGUI</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> *************** *** 3609,3614 **** */</font><br> <br> ! <i>%endif</i> <font color=#009900>//wxUSE_LOG</font><br> <br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> --- 3611,3678 ---- */</font><br> <br> ! <font color=#009900>// ---------------------------------------------------------------------------</font><br> ! <font color=#009900>// <a href="#wxLogTextCtrl">wxLogTextCtrl</a></font><br> ! <br> ! <i>%if</i> wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL<br> ! <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxLogTextCtrl">wxLogTextCtrl</a>, <a href="#wxLog">wxLog</a></font></b> ! <blockquote> ! <a href="#wxLogTextCtrl">wxLogTextCtrl</a>(<a href="#wxTextCtrl">wxTextCtrl</a>* textCtrl);<br> <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxLogWindow">wxLogWindow</a></font><br> + <br> + <i>%if</i> wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxLogWindow">wxLogWindow</a>, <a href="#wxLogPassThrough">wxLogPassThrough</a></font></b> + <blockquote> + <a href="#wxLogWindow">wxLogWindow</a>(<a href="#wxWindow">wxWindow</a> *pParent, const <a href="#wxString">wxString</a>& szTitle, bool bShow = true, bool bPassToOld = true);<br> + <br> + void Show(bool show = true)<br> + <a href="#wxFrame">wxFrame</a> * GetFrame() const<br> + <br> + <font color=#009900>//virtual void OnFrameCreate(<a href="#wxFrame">wxFrame</a> *frame)</font><br> + <font color=#009900>//virtual bool OnFrameClose(<a href="#wxFrame">wxFrame</a> *frame)</font><br> + <font color=#009900>//virtual void OnFrameDelete(<a href="#wxFrame">wxFrame</a> *frame)</font><br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW</font><br> + <br> + <br> + <i>%endif</i> <font color=#009900>// wxLUA_USE_wxLog && wxUSE_LOG</font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxSingleInstanceChecker">wxSingleInstanceChecker</a></font><br> + <br> + <i>%if</i> wxUSE_SNGLINST_CHECKER<br> + <br> + <i>%include</i> "wx/snglinst.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxSingleInstanceChecker">wxSingleInstanceChecker</a></font></b> + <blockquote> + <a href="#wxSingleInstanceChecker">wxSingleInstanceChecker</a>() <font color=#009900>// default ctor, use Create() after it</font><br> + <font color=#009900>// like Create() but no error checking (dangerous!)</font><br> + <font color=#009900>//<a href="#wxSingleInstanceChecker">wxSingleInstanceChecker</a>(const <a href="#wxString">wxString</a>& name, const <a href="#wxString">wxString</a>& path = "")</font><br> + <br> + <font color=#009900>// name must be given and be as unique as possible, it is used as the mutex</font><br> + <font color=#009900>// name under Win32 and the lock file name under Unix -</font><br> + <font color=#009900>// wxTheApp->GetAppName() may be a good value for this parameter</font><br> + <font color=#009900>//</font><br> + <font color=#009900>// path is optional and is ignored under Win32 and used as the directory to</font><br> + <font color=#009900>// create the lock file in under Unix (default is wxGetHomeDir())</font><br> + <font color=#009900>//</font><br> + <font color=#009900>// returns false if initialization failed, it doesn't mean that another</font><br> + <font color=#009900>// instance is running - use IsAnotherRunning() to check it</font><br> + bool Create(const <a href="#wxString">wxString</a>& name, const <a href="#wxString">wxString</a>& path = "")<br> + <br> + bool IsAnotherRunning() const <font color=#009900>// is another copy of this program already running?</font><br> + <br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// wxUSE_SNGLINST_CHECKER</font><br> <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> *************** *** 3933,3937 **** <i>%include</i> "wx/taskbar.h"<br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxTaskBarIcon">wxTaskBarIcon</a>, <a href="#wxEvtHandler">wxEvtHandler</a></font></b> <blockquote> <a href="#wxTaskBarIcon">wxTaskBarIcon</a>()<br> --- 3997,4001 ---- <i>%include</i> "wx/taskbar.h"<br> <br> ! <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <a name="wxTaskBarIcon">wxTaskBarIcon</a>, <a href="#wxEvtHandler">wxEvtHandler</a></font></b> <blockquote> <a href="#wxTaskBarIcon">wxTaskBarIcon</a>()<br> *************** *** 6831,6836 **** <font color=#AA0000><i>%function</i> long wxGetUTCTime()</font><br> <font color=#AA0000><i>%function</i> <a href="#wxLongLong">wxLongLong</a> wxGetLocalTimeMillis()</font><br> ! <font color=#AA0000><i>%wxcompat_2_6</i> <i>%function</i> void wxStartTimer() <font color=#009900>// deprecated in 2.8 use wxStopWatch</font></font><br> ! <font color=#AA0000><i>%wxcompat_2_6</i> <i>%function</i> long wxGetElapsedTime(bool resetTimer = true) <font color=#009900>// deprecated in 2.8 use wxStopWatch</font></font><br> <font color=#AA0000><i>%function</i> void wxSleep(int secs)</font><br> <font color=#AA0000><i>%wxchkver_2_6</i> <i>%function</i> void wxMilliSleep(unsigned long milliseconds)</font><br> --- 6895,6900 ---- <font color=#AA0000><i>%function</i> long wxGetUTCTime()</font><br> <font color=#AA0000><i>%function</i> <a href="#wxLongLong">wxLongLong</a> wxGetLocalTimeMillis()</font><br> ! <font color=#AA0000><i>%wxcompat_2_6</i> <i>%function</i> void wxStartTimer() <font color=#009900>// deprecated in 2.8 use <a href="#wxStopWatch">wxStopWatch</a></font></font><br> ! <font color=#AA0000><i>%wxcompat_2_6</i> <i>%function</i> long wxGetElapsedTime(bool resetTimer = true) <font color=#009900>// deprecated in 2.8 use <a href="#wxStopWatch">wxStopWatch</a></font></font><br> <font color=#AA0000><i>%function</i> void wxSleep(int secs)</font><br> <font color=#AA0000><i>%wxchkver_2_6</i> <i>%function</i> void wxMilliSleep(unsigned long milliseconds)</font><br> *************** *** 7206,7209 **** --- 7270,7294 ---- <i>%endif</i> <font color=#009900>//wxLUA_USE_wxTimer && wxUSE_TIMER</font><br> <br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxStopWatch">wxStopWatch</a></font><br> + <br> + <i>%if</i> wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH<br> + <br> + <i>%include</i> "wx/stopwatch.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxStopWatch">wxStopWatch</a></font></b> + <blockquote> + <a href="#wxStopWatch">wxStopWatch</a>() <font color=#009900>// ctor starts the stop watch</font><br> + <br> + void Start(long t0 = 0) <font color=#009900>// start the stop watch at the moment t0</font><br> + void Pause()<br> + void Resume()<br> + long Time() const<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <i>%endif</i> <font color=#009900>// wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH</font><br> + <br> + <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxCalendarCtrl">wxCalendarCtrl</a></font><br> *************** *** 16785,16788 **** --- 16870,16914 ---- <i>%if</i> wxLUA_USE_wxSizer<br> <br> + <i>%if</i> <i>%wxchkver_2_8</i><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxSizerFlags">wxSizerFlags</a></font><br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%encapsulate</i> <i>%noclassinfo</i> <a name="wxSizerFlags">wxSizerFlags</a></font></b> + <blockquote> + <a href="#wxSizerFlags">wxSizerFlags</a>(int proportion = 0)<br> + <br> + <font color=#009900>// setters for all sizer flags, they all return the object itself so that</font><br> + <font color=#009900>// calls to them can be chained</font><br> + <br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Proportion(int proportion)<br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Align(int alignment) <font color=#009900>// combination of <a href="#wxAlignment">wxAlignment</a> values</font><br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Expand() <font color=#009900>// wxEXPAND</font><br> + <br> + <font color=#009900>// some shortcuts for Align()</font><br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Centre() <font color=#009900>//{ return Align(wxCENTRE); }</font><br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Center() <font color=#009900>//{ return Centre(); }</font><br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Left() <font color=#009900>//{ return Align(wxALIGN_LEFT); }</font><br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Right() <font color=#009900>//{ return Align(wxALIGN_RIGHT); }</font><br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Top() <font color=#009900>//{ return Align(wxALIGN_TOP); }</font><br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Bottom() <font color=#009900>//{ return Align(wxALIGN_BOTTOM); }</font><br> + <br> + static int GetDefaultBorder() <font color=#009900>// default border size used by Border() below</font><br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Border(int direction, int borderInPixels)<br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Border(int direction = wxALL)<br> + <a href="#wxSizerFlags">wxSizerFlags</a>& DoubleBorder(int direction = wxALL)<br> + <br> + <a href="#wxSizerFlags">wxSizerFlags</a>& TripleBorder(int direction = wxALL)<br> + <a href="#wxSizerFlags">wxSizerFlags</a>& HorzBorder()<br> + <a href="#wxSizerFlags">wxSizerFlags</a>& DoubleHorzBorder()<br> + <a href="#wxSizerFlags">wxSizerFlags</a>& Shaped()<br> + <a href="#wxSizerFlags">wxSizerFlags</a>& FixedMinSize()<br> + <br> + <font color=#009900>// accessors for <a href="#wxSizer">wxSizer</a> only</font><br> + int GetProportion() const<br> + int GetFlags() const<br> + int GetBorderInPixels() const<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxSizerItem">wxSizerItem</a></font><br> *************** *** 16793,16798 **** <a href="#wxSizerItem">wxSizerItem</a>(<a href="#wxWindow">wxWindow</a>* window, int proportion, int flag, int border, <a href="#wxObject">wxObject</a>* userData)<br> <a href="#wxSizerItem">wxSizerItem</a>(<a href="#wxSizer">wxSizer</a>* sizer, int proportion, int flag, int border, <a href="#wxObject">wxObject</a>* userData)<br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>(<a href="#wxWindow">wxWindow</a>* window, const wxSizerFlags& flags)</font><br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>(<a href="#wxSizer">wxSizer</a>* window, const wxSizerFlags& flags)</font><br> <br> <a href="#wxSize">wxSize</a> CalcMin()<br> --- 16919,16924 ---- <a href="#wxSizerItem">wxSizerItem</a>(<a href="#wxWindow">wxWindow</a>* window, int proportion, int flag, int border, <a href="#wxObject">wxObject</a>* userData)<br> <a href="#wxSizerItem">wxSizerItem</a>(<a href="#wxSizer">wxSizer</a>* sizer, int proportion, int flag, int border, <a href="#wxObject">wxObject</a>* userData)<br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>(<a href="#wxWindow">wxWindow</a>* window, const <a href="#wxSizerFlags">wxSizerFlags</a>& flags)</font><br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>(<a href="#wxSizer">wxSizer</a>* window, const <a href="#wxSizerFlags">wxSizerFlags</a>& flags)</font><br> <br> <a href="#wxSize">wxSize</a> CalcMin()<br> *************** *** 16839,16844 **** <a href="#wxSizerItem">wxSizerItem</a>* Add(<a href="#wxSizer">wxSizer</a>* sizer, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> <a href="#wxSizerItem">wxSizerItem</a>* Add(int width, int height, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Add(<a href="#wxWindow">wxWindow</a>* window, const wxSizerFlags& flags)</font><br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Add(<a href="#wxSizer">wxSizer</a>* sizer, const wxSizerFlags& flags)</font><br> <a href="#wxSizerItem">wxSizerItem</a>* AddSpacer(int size)<br> <a href="#wxSizerItem">wxSizerItem</a>* AddStretchSpacer(int prop = 1)<br> --- 16965,16970 ---- <a href="#wxSizerItem">wxSizerItem</a>* Add(<a href="#wxSizer">wxSizer</a>* sizer, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> <a href="#wxSizerItem">wxSizerItem</a>* Add(int width, int height, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Add(<a href="#wxWindow">wxWindow</a>* window, const <a href="#wxSizerFlags">wxSizerFlags</a>& flags)</font><br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Add(<a href="#wxSizer">wxSizer</a>* sizer, const <a href="#wxSizerFlags">wxSizerFlags</a>& flags)</font><br> <a href="#wxSizerItem">wxSizerItem</a>* AddSpacer(int size)<br> <a href="#wxSizerItem">wxSizerItem</a>* AddStretchSpacer(int prop = 1)<br> *************** *** 16858,16863 **** <a href="#wxSizerItem">wxSizerItem</a>* Insert(size_t index, <a href="#wxSizer">wxSizer</a>* sizer, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> <a href="#wxSizerItem">wxSizerItem</a>* Insert(size_t index, int width, int height, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Insert(size_t index, <a href="#wxWindow">wxWindow</a>* window, const wxSizerFlags& flags)</font><br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Insert(size_t index, <a href="#wxSizer">wxSizer</a>* sizer, const wxSizerFlags& flags)</font><br> <a href="#wxSizerItem">wxSizerItem</a>* InsertSpacer(size_t index, int size)<br> <a href="#wxSizerItem">wxSizerItem</a>* InsertStretchSpacer(size_t index, int prop = 1)<br> --- 16984,16989 ---- <a href="#wxSizerItem">wxSizerItem</a>* Insert(size_t index, <a href="#wxSizer">wxSizer</a>* sizer, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> <a href="#wxSizerItem">wxSizerItem</a>* Insert(size_t index, int width, int height, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Insert(size_t index, <a href="#wxWindow">wxWindow</a>* window, const <a href="#wxSizerFlags">wxSizerFlags</a>& flags)</font><br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Insert(size_t index, <a href="#wxSizer">wxSizer</a>* sizer, const <a href="#wxSizerFlags">wxSizerFlags</a>& flags)</font><br> <a href="#wxSizerItem">wxSizerItem</a>* InsertSpacer(size_t index, int size)<br> <a href="#wxSizerItem">wxSizerItem</a>* InsertStretchSpacer(size_t index, int prop = 1)<br> *************** *** 16866,16871 **** void Prepend(<a href="#wxSizer">wxSizer</a>* sizer, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> void Prepend(int width, int height, int proportion = 0, int flag = 0, int border= 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Prepend(<a href="#wxWindow">wxWindow</a>* window, const wxSizerFlags& flags)</font><br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Prepend(<a href="#wxSizer">wxSizer</a>* sizer, const wxSizerFlags& flags)</font><br> <a href="#wxSizerItem">wxSizerItem</a>* PrependSpacer(int size)<br> <a href="#wxSizerItem">wxSizerItem</a>* PrependStretchSpacer(int prop = 1)<br> --- 16992,16997 ---- void Prepend(<a href="#wxSizer">wxSizer</a>* sizer, int proportion = 0, int flag = 0, int border = 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> void Prepend(int width, int height, int proportion = 0, int flag = 0, int border= 0, <a href="#wxObject">wxObject</a>* userData = NULL)<br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Prepend(<a href="#wxWindow">wxWindow</a>* window, const <a href="#wxSizerFlags">wxSizerFlags</a>& flags)</font><br> ! <font color=#009900>//<a href="#wxSizerItem">wxSizerItem</a>* Prepend(<a href="#wxSizer">wxSizer</a>* sizer, const <a href="#wxSizerFlags">wxSizerFlags</a>& flags)</font><br> <a href="#wxSizerItem">wxSizerItem</a>* PrependSpacer(int size)<br> <a href="#wxSizerItem">wxSizerItem</a>* PrependStretchSpacer(int prop = 1)<br> *************** *** 16930,16935 **** <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxFlexGridSizer">wxFlexGridSizer</a>, <a href="#wxGridSizer">wxGridSizer</a></font></b> <blockquote> ! <a href="#wxFlexGridSizer">wxFlexGridSizer</a>(int rows, int cols, int vgap, int hgap)<br> ! <font color=#009900>// <a href="#wxFlexGridSizer">wxFlexGridSizer</a>(int cols, int vgap = 0, int hgap = 0)</font><br> <br> void AddGrowableCol( size_t idx, int proportion = 0 )<br> --- 17056,17061 ---- <b><font size=+1 color=#DD0000><i>%class</i> <a name="wxFlexGridSizer">wxFlexGridSizer</a>, <a href="#wxGridSizer">wxGridSizer</a></font></b> <blockquote> ! <a href="#wxFlexGridSizer">wxFlexGridSizer</a>(int rows, int cols, int vgap=0, int hgap=0)<br> ! <font color=#009900>// <a href="#wxFlexGridSizer">wxFlexGridSizer</a>(int cols, int vgap = 0, int hgap = 0) // just use the above constructor</font><br> <br> void AddGrowableCol( size_t idx, int proportion = 0 )<br> *************** *** 17967,17970 **** --- 18093,18107 ---- <br> <font color=#009900>// ---------------------------------------------------------------------------</font><br> + <font color=#009900>// <a href="#wxWindowUpdateLocker">wxWindowUpdateLocker</a> - Note this only calls wxWindow::Freeze() -> Thaw()</font><br> + <br> + <i>%include</i> "wx/wupdlock.h"<br> + <br> + <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxWindowUpdateLocker">wxWindowUpdateLocker</a></font></b> + <blockquote> + <font color=#009900>// NOTE: ALWAYS delete() this when done since lua's gc may not delete it soon enough</font><br> + <a href="#wxWindowUpdateLocker">wxWindowUpdateLocker</a>(<a href="#wxWindow">wxWindow</a> *winToLock = NULL)<br> + </blockquote><font color=#DD0000><font color=#DD0000><i>%endclass</i></font></font><br> + <br> + <font color=#009900>// ---------------------------------------------------------------------------</font><br> <font color=#009900>// <a href="#wxWindow">wxWindow</a></font><br> <font color=#006666><i>%define</i> wxSIMPLE_BORDER</font><br> *************** *** 18009,18016 **** </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <i>%mac</i>|<i>%x11</i>|<i>%motif</i> <i>%typedef</i> WXWidget void*<br> ! <i>%gtk</i> <i>%typedef</i> WXWidget unsigned long <font color=#009900>// GtkWidget* what could you do with it?</font><br> ! <i>%mgl</i> <i>%typedef</i> WXWidget window_t<br> ! <i>%msw</i>|<i>%os2</i> <i>%typedef</i> WXWidget unsigned long<br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxVisualAttributes">wxVisualAttributes</a></font></b> --- 18146,18153 ---- </blockquote><font color=#0066CC><i>%endenum</i></font><br> <br> ! <font color=#009900>//<i>%mac</i>|<i>%x11</i>|<i>%motif</i> <i>%typedef</i> WXWidget void*</font><br> ! <font color=#009900>//<i>%gtk</i> <i>%typedef</i> WXWidget unsigned long // GtkWidget* what could you do with it?</font><br> ! <font color=#009900>//<i>%mgl</i> <i>%typedef</i> WXWidget window_t</font><br> ! <font color=#009900>//<i>%msw</i>|<i>%os2</i> <i>%typedef</i> WXWidget unsigned long</font><br> <br> <b><font size=+1 color=#DD0000><i>%class</i> <i>%delete</i> <i>%noclassinfo</i> <i>%encapsulate</i> <a name="wxVisualAttributes">wxVisualAttributes</a></font></b> *************** *** 18096,18100 **** virtual <a href="#wxColour">wxColour</a> GetForegroundColour()<br> <a href="#wxWindow">wxWindow</a>* GetGrandParent() const<br> ! WXWidget GetHandle() const<br> virtual <a href="#wxString">wxString</a> GetHelpText() const<br> int GetId() const<br> --- 18233,18237 ---- virtual <a href="#wxColour">wxColour</a> GetForegroundColour()<br> <a href="#wxWindow">wxWindow</a>* GetGrandParent() const<br> ! <font color=#009900>//WXWidget GetHandle() const</font><br> virtual <a href="#wxString">wxString</a> GetHelpText() const<br> int GetId() const<br> Index: changelog.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/changelog.txt,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** changelog.txt 25 Jun 2007 03:19:38 -0000 1.38 --- changelog.txt 26 Jun 2007 03:22:04 -0000 1.39 *************** *** 113,116 **** --- 113,118 ---- or release it. + - Apply patches 1-6 for Lua 5.1.2 + version 2.8.0.0 (released 24/12/2006) -------------------------------------------------------------------- Index: readme.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/docs/readme.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme.txt 30 Dec 2005 04:35:59 -0000 1.2 --- readme.txt 26 Jun 2007 03:22:05 -0000 1.3 *************** *** 26,62 **** interface dialogs, image manipulation, file manipulation, sockets, displaying HTML, and printing to name a few. - - ------------------------------------------------------------------------------- - Brief description of the wxLua internals - - The core of wxLua is based upon a ref counted class called wxLuaState derived - from the wxWidget's wxObject class. The wxLuaState class contains as a member - of it's ref data the 'C' lua_State which is the heart of lua. Since the class - is ref counted, it should be passed as const wxLuaState& and can be used in - much the same way as a wxBitmap, wxPen, or any of the other wxObject derived - classes that make use of it's ref counting. What this means for wxLua is that - instead of keeping pointers to the lua_State you have instances of the - wxLuaState. When the lua_State is closed, all the wxLuaStates sharing the ref - data will now know about it and segfaults from dangling pointers are avoided. - - The wxLuaState contains all of the lua 'C' functions, such as - lua_gettop(lua_State* L), but as member functions named lua_GetTop() which - use the internal lua_State and check for it's validity before use when compiled - in debug mode. The functions are capitalized to make them easier to find in an - editor. When the wxLuaState is Ok(), it means that the wxLuaState has - it's ref data and the lua_State is created. - - It is instructive to follow the creation of the wxLuaState by looking at - bool wxLuaState::Create(wxEvtHandler *handler, wxWindowID id) in - wxLua/modules/wxlua/src/wxlstate.cpp. The lua_State is created using lua_open() - and then the lua libraries are loaded, base, table, string, math, and so on. - Pushed into the lua_State is a light user data of of the wxLuaStateRefData with - the name "__wxLuaStateRefData". This is to allow us to then find the - wxLuaStateRefData "owner" of the lua_State when lua calls a 'C' function, see - wxLuaStateRefData::GetLuaStateRefData. We register print, alert, and traceback - functions to get the output of lua print() statements and send error messages - as wxLuaEvents, see wxEVT_LUA_ERROR. - - After the initial setup, the bindings are registered. - - TODO --- 26,27 ---- |
|
From: John L. <jr...@us...> - 2007-06-26 03:22:49
|
Update of /cvsroot/wxlua/wxLua/bindings In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/bindings Modified Files: genwxbind.lua Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: genwxbind.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/genwxbind.lua,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** genwxbind.lua 25 Jun 2007 03:19:37 -0000 1.133 --- genwxbind.lua 26 Jun 2007 03:22:04 -0000 1.134 *************** *** 985,988 **** --- 985,990 ---- preprocConditionTable["wxLUA_USE_wxListBox"] = "wxLUA_USE_wxListBox" preprocConditionTable["wxLUA_USE_wxListCtrl"] = "wxLUA_USE_wxListCtrl" + preprocConditionTable["wxLUA_USE_wxLog"] = "wxLUA_USE_wxLog" + preprocConditionTable["wxLUA_USE_wxLogWindow"] = "wxLUA_USE_wxLogWindow" preprocConditionTable["wxLUA_USE_wxLuaHtmlWindow"] = "wxLUA_USE_wxLuaHtmlWindow" preprocConditionTable["wxLUA_USE_wxLuaPrintout"] = "wxLUA_USE_wxLuaPrintout" *************** *** 1024,1027 **** --- 1026,1030 ---- preprocConditionTable["wxLUA_USE_wxStaticText"] = "wxLUA_USE_wxStaticText" preprocConditionTable["wxLUA_USE_wxStatusBar"] = "wxLUA_USE_wxStatusBar" + preprocConditionTable["wxLUA_USE_wxStopWatch"] = "wxLUA_USE_wxStopWatch" preprocConditionTable["wxLUA_USE_wxStringList"] = "wxLUA_USE_wxStringList" preprocConditionTable["wxLUA_USE_wxSystemOptions"] = "wxLUA_USE_wxSystemOptions" |
|
From: John L. <jr...@us...> - 2007-06-26 03:22:12
|
Update of /cvsroot/wxlua/wxLua/modules/wxbind/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/modules/wxbind/src Modified Files: appframe.cpp datetime.cpp dialogs.cpp sizer.cpp windows.cpp wx_bind.cpp Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: appframe.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/appframe.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** appframe.cpp 25 Jun 2007 16:07:58 -0000 1.61 --- appframe.cpp 26 Jun 2007 03:22:05 -0000 1.62 *************** *** 27,31 **** ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLog --- 27,31 ---- ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLog *************** *** 147,151 **** ! #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) static int LUACALL wxLua_wxLog_GetRepetitionCounting(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLog_GetRepetitionCounting[1] = {{ wxLua_wxLog_GetRepetitionCounting, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; --- 147,151 ---- ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) static int LUACALL wxLua_wxLog_GetRepetitionCounting(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLog_GetRepetitionCounting[1] = {{ wxLua_wxLog_GetRepetitionCounting, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; *************** *** 162,166 **** } ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) static int LUACALL wxLua_wxLog_GetTimestamp(lua_State *L); --- 162,166 ---- } ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) static int LUACALL wxLua_wxLog_GetTimestamp(lua_State *L); *************** *** 194,198 **** ! #if (wxUSE_LOG) && (wxLUA_USE_wxArrayString) static int LUACALL wxLua_wxLog_GetTraceMasks(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLog_GetTraceMasks[1] = {{ wxLua_wxLog_GetTraceMasks, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; --- 194,198 ---- ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxArrayString) static int LUACALL wxLua_wxLog_GetTraceMasks(lua_State *L); static wxLuaBindCFunc s_wxluafunc_wxLua_wxLog_GetTraceMasks[1] = {{ wxLua_wxLog_GetTraceMasks, WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, 0, 0, s_wxluaargArray_None }}; *************** *** 213,217 **** } ! #endif // (wxUSE_LOG) && (wxLUA_USE_wxArrayString) static int LUACALL wxLua_wxLog_GetVerbose(lua_State *L); --- 213,217 ---- } ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxArrayString) static int LUACALL wxLua_wxLog_GetVerbose(lua_State *L); *************** *** 322,326 **** ! #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) static wxLuaArgTag s_wxluatagArray_wxLua_wxLog_SetRepetitionCounting[] = { &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxLog_SetRepetitionCounting(lua_State *L); --- 322,326 ---- ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) static wxLuaArgTag s_wxluatagArray_wxLua_wxLog_SetRepetitionCounting[] = { &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxLog_SetRepetitionCounting(lua_State *L); *************** *** 339,343 **** } ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) static wxLuaArgTag s_wxluatagArray_wxLua_wxLog_SetTimestamp[] = { &s_wxluaarg_String, NULL }; --- 339,343 ---- } ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) static wxLuaArgTag s_wxluatagArray_wxLua_wxLog_SetTimestamp[] = { &s_wxluaarg_String, NULL }; *************** *** 427,440 **** { "GetLogLevel", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetLogLevel, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) { "GetRepetitionCounting", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetRepetitionCounting, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) { "GetTimestamp", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTimestamp, 1, NULL }, { "GetTraceMask", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTraceMask, 1, NULL }, ! #if (wxUSE_LOG) && (wxLUA_USE_wxArrayString) { "GetTraceMasks", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTraceMasks, 1, NULL }, ! #endif // (wxUSE_LOG) && (wxLUA_USE_wxArrayString) { "GetVerbose", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetVerbose, 1, NULL }, --- 427,440 ---- { "GetLogLevel", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetLogLevel, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) { "GetRepetitionCounting", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetRepetitionCounting, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) { "GetTimestamp", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTimestamp, 1, NULL }, { "GetTraceMask", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTraceMask, 1, NULL }, ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxArrayString) { "GetTraceMasks", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetTraceMasks, 1, NULL }, ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxArrayString) { "GetVerbose", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_GetVerbose, 1, NULL }, *************** *** 446,452 **** { "SetLogLevel", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetLogLevel, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) { "SetRepetitionCounting", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetRepetitionCounting, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxUSE_LOG) { "SetTimestamp", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetTimestamp, 1, NULL }, --- 446,452 ---- { "SetLogLevel", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetLogLevel, 1, NULL }, ! #if (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) { "SetRepetitionCounting", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetRepetitionCounting, 1, NULL }, ! #endif // (wxCHECK_VERSION(2,8,0)) && (wxLUA_USE_wxLog && wxUSE_LOG) { "SetTimestamp", WXLUAMETHOD_METHOD|WXLUAMETHOD_STATIC, s_wxluafunc_wxLua_wxLog_SetTimestamp, 1, NULL }, *************** *** 461,468 **** int wxLog_methodCount = sizeof(wxLog_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogBuffer --- 461,468 ---- int wxLog_methodCount = sizeof(wxLog_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogBuffer *************** *** 538,545 **** int wxLogBuffer_methodCount = sizeof(wxLogBuffer_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogChain --- 538,545 ---- int wxLogBuffer_methodCount = sizeof(wxLogBuffer_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogChain *************** *** 673,680 **** int wxLogChain_methodCount = sizeof(wxLogChain_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogNull --- 673,738 ---- int wxLogChain_methodCount = sizeof(wxLogChain_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) ! // --------------------------------------------------------------------------- ! // Bind class wxLogGui ! // --------------------------------------------------------------------------- ! ! // Lua MetaTable Tag for Class 'wxLogGui' ! int s_wxluatag_wxLogGui = -1; ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogGui_delete[] = { &s_wxluatag_wxLogGui, NULL }; ! static int LUACALL wxLua_wxLogGui_delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogGui_delete[1] = {{ wxLua_wxLogGui_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogGui_delete }}; ! static int LUACALL wxLua_wxLogGui_delete(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLogGui * self = (wxLogGui *)wxlState.GetUserDataType(1, s_wxluatag_wxLogGui); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; ! } ! ! static int LUACALL wxLua_wxLogGui_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogGui_constructor[1] = {{ wxLua_wxLogGui_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; ! // wxLogGui() ! static int LUACALL wxLua_wxLogGui_constructor(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxLogGui *returns; ! // call constructor ! returns = new wxLogGui(); ! // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLogGui((wxLogGui *)returns)); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLogGui, returns); ! ! return 1; ! } ! ! ! ! ! // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLogGui_methods[] = { ! { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLogGui_delete, 1, NULL }, ! { "wxLogGui", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLogGui_constructor, 1, NULL }, ! ! { 0, 0, 0, 0 }, ! }; ! ! int wxLogGui_methodCount = sizeof(wxLogGui_methods)/sizeof(wxLuaBindMethod) - 1; ! ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxUSE_LOGGUI) ! ! ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogNull *************** *** 731,738 **** int wxLogNull_methodCount = sizeof(wxLogNull_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG ! #if wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogPassThrough --- 789,796 ---- int wxLogNull_methodCount = sizeof(wxLogNull_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! #if wxLUA_USE_wxLog && wxUSE_LOG // --------------------------------------------------------------------------- // Bind class wxLogPassThrough *************** *** 789,793 **** int wxLogPassThrough_methodCount = sizeof(wxLogPassThrough_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxUSE_LOG --- 847,1134 ---- int wxLogPassThrough_methodCount = sizeof(wxLogPassThrough_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLog && wxUSE_LOG ! ! ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) ! // --------------------------------------------------------------------------- ! // Bind class wxLogTextCtrl ! // --------------------------------------------------------------------------- ! ! // Lua MetaTable Tag for Class 'wxLogTextCtrl' ! int s_wxluatag_wxLogTextCtrl = -1; ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogTextCtrl_delete[] = { &s_wxluatag_wxLogTextCtrl, NULL }; ! static int LUACALL wxLua_wxLogTextCtrl_delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogTextCtrl_delete[1] = {{ wxLua_wxLogTextCtrl_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogTextCtrl_delete }}; ! static int LUACALL wxLua_wxLogTextCtrl_delete(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLogTextCtrl * self = (wxLogTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxLogTextCtrl); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; ! } ! ! ! #if (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogTextCtrl_constructor[] = { &s_wxluatag_wxTextCtrl, NULL }; ! static int LUACALL wxLua_wxLogTextCtrl_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogTextCtrl_constructor[1] = {{ wxLua_wxLogTextCtrl_constructor, WXLUAMETHOD_CONSTRUCTOR, 1, 1, s_wxluatagArray_wxLua_wxLogTextCtrl_constructor }}; ! // wxLogTextCtrl(wxTextCtrl* textCtrl); ! static int LUACALL wxLua_wxLogTextCtrl_constructor(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxLogTextCtrl *returns; ! // wxTextCtrl textCtrl ! wxTextCtrl * textCtrl = (wxTextCtrl *)wxlState.GetUserDataType(1, s_wxluatag_wxTextCtrl); ! // call constructor ! returns = new wxLogTextCtrl(textCtrl); ! // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLogTextCtrl((wxLogTextCtrl *)returns)); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLogTextCtrl, returns); ! ! return 1; ! } ! ! #endif // (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)) ! ! ! ! // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLogTextCtrl_methods[] = { ! { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLogTextCtrl_delete, 1, NULL }, ! ! #if (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)) ! { "wxLogTextCtrl", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLogTextCtrl_constructor, 1, NULL }, ! #endif // (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL)) ! ! { 0, 0, 0, 0 }, ! }; ! ! int wxLogTextCtrl_methodCount = sizeof(wxLogTextCtrl_methods)/sizeof(wxLuaBindMethod) - 1; ! ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxTextCtrl && wxUSE_TEXTCTRL) ! ! ! #if (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) ! // --------------------------------------------------------------------------- ! // Bind class wxLogWindow ! // --------------------------------------------------------------------------- ! ! // Lua MetaTable Tag for Class 'wxLogWindow' ! int s_wxluatag_wxLogWindow = -1; ! ! #if (wxLUA_USE_wxFrame) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)) ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_GetFrame[] = { &s_wxluatag_wxLogWindow, NULL }; ! static int LUACALL wxLua_wxLogWindow_GetFrame(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_GetFrame[1] = {{ wxLua_wxLogWindow_GetFrame, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxLogWindow_GetFrame }}; ! // wxFrame * GetFrame() const ! static int LUACALL wxLua_wxLogWindow_GetFrame(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxFrame *returns; ! // get this ! wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow); ! // call GetFrame ! returns = (wxFrame *)self->GetFrame(); ! // push the result datatype ! wxlState.PushUserDataType(s_wxluatag_wxFrame, returns); ! ! return 1; ! } ! ! #endif // (wxLUA_USE_wxFrame) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)) ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_Show[] = { &s_wxluatag_wxLogWindow, &s_wxluaarg_Boolean, NULL }; ! static int LUACALL wxLua_wxLogWindow_Show(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_Show[1] = {{ wxLua_wxLogWindow_Show, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxLogWindow_Show }}; ! // void Show(bool show = true) ! static int LUACALL wxLua_wxLogWindow_Show(lua_State *L) ! { ! wxLuaState wxlState(L); ! // get number of arguments ! int argCount = lua_gettop(L); ! // bool show = true ! bool show = (argCount >= 2 ? wxlua_getbooleantype(L, 2) : true); ! // get this ! wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow); ! // call Show ! self->Show(show); ! ! return 0; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_delete[] = { &s_wxluatag_wxLogWindow, NULL }; ! static int LUACALL wxLua_wxLogWindow_delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_delete[1] = {{ wxLua_wxLogWindow_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxLogWindow_delete }}; ! static int LUACALL wxLua_wxLogWindow_delete(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLogWindow * self = (wxLogWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxLogWindow); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLogWindow_constructor[] = { &s_wxluatag_wxWindow, &s_wxluaarg_String, &s_wxluaarg_Boolean, &s_wxluaarg_Boolean, NULL }; ! static int LUACALL wxLua_wxLogWindow_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxLogWindow_constructor[1] = {{ wxLua_wxLogWindow_constructor, WXLUAMETHOD_CONSTRUCTOR, 2, 4, s_wxluatagArray_wxLua_wxLogWindow_constructor }}; ! // wxLogWindow(wxWindow *pParent, const wxString& szTitle, bool bShow = true, bool bPassToOld = true); ! static int LUACALL wxLua_wxLogWindow_constructor(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxLogWindow *returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // bool bPassToOld = true ! bool bPassToOld = (argCount >= 4 ? wxlua_getbooleantype(L, 4) : true); ! // bool bShow = true ! bool bShow = (argCount >= 3 ? wxlua_getbooleantype(L, 3) : true); ! // const wxString szTitle ! const wxString szTitle = wxlState.GetwxStringType(2); ! // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); ! // call constructor ! returns = new wxLogWindow(pParent, szTitle, bShow, bPassToOld); ! // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxLogWindow((wxLogWindow *)returns)); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLogWindow, returns); ! ! return 1; ! } ! ! ! ! ! // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxLogWindow_methods[] = { ! #if (wxLUA_USE_wxFrame) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)) ! { "GetFrame", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLogWindow_GetFrame, 1, NULL }, ! #endif // (wxLUA_USE_wxFrame) && ((wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW)) ! ! { "Show", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxLogWindow_Show, 1, NULL }, ! { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxLogWindow_delete, 1, NULL }, ! { "wxLogWindow", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxLogWindow_constructor, 1, NULL }, ! ! { 0, 0, 0, 0 }, ! }; ! ! int wxLogWindow_methodCount = sizeof(wxLogWindow_methods)/sizeof(wxLuaBindMethod) - 1; ! ! #endif // (wxLUA_USE_wxLog && wxUSE_LOG) && (wxLUA_USE_wxLogWindow && wxUSE_LOGWINDOW) ! ! ! #if wxUSE_SNGLINST_CHECKER ! // --------------------------------------------------------------------------- ! // Bind class wxSingleInstanceChecker ! // --------------------------------------------------------------------------- ! ! // Lua MetaTable Tag for Class 'wxSingleInstanceChecker' ! int s_wxluatag_wxSingleInstanceChecker = -1; ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSingleInstanceChecker_Create[] = { &s_wxluatag_wxSingleInstanceChecker, &s_wxluaarg_String, &s_wxluaarg_String, NULL }; ! static int LUACALL wxLua_wxSingleInstanceChecker_Create(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleInstanceChecker_Create[1] = {{ wxLua_wxSingleInstanceChecker_Create, WXLUAMETHOD_METHOD, 2, 3, s_wxluatagArray_wxLua_wxSingleInstanceChecker_Create }}; ! // bool Create(const wxString& name, const wxString& path = "") ! static int LUACALL wxLua_wxSingleInstanceChecker_Create(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get number of arguments ! int argCount = lua_gettop(L); ! // const wxString path = "" ! const wxString path = (argCount >= 3 ? wxlState.GetwxStringType(3) : wxString(wxEmptyString)); ! // const wxString name ! const wxString name = wxlState.GetwxStringType(2); ! // get this ! wxSingleInstanceChecker * self = (wxSingleInstanceChecker *)wxlState.GetUserDataType(1, s_wxluatag_wxSingleInstanceChecker); ! // call Create ! returns = (self->Create(name, path)); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSingleInstanceChecker_IsAnotherRunning[] = { &s_wxluatag_wxSingleInstanceChecker, NULL }; ! static int LUACALL wxLua_wxSingleInstanceChecker_IsAnotherRunning(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleInstanceChecker_IsAnotherRunning[1] = {{ wxLua_wxSingleInstanceChecker_IsAnotherRunning, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxSingleInstanceChecker_IsAnotherRunning }}; ! // bool IsAnotherRunning() const // is another copy of this program already running? ! static int LUACALL wxLua_wxSingleInstanceChecker_IsAnotherRunning(lua_State *L) ! { ! wxLuaState wxlState(L); ! bool returns; ! // get this ! wxSingleInstanceChecker * self = (wxSingleInstanceChecker *)wxlState.GetUserDataType(1, s_wxluatag_wxSingleInstanceChecker); ! // call IsAnotherRunning ! returns = (self->IsAnotherRunning()); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxSingleInstanceChecker_delete[] = { &s_wxluatag_wxSingleInstanceChecker, NULL }; ! static int LUACALL wxLua_wxSingleInstanceChecker_delete(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleInstanceChecker_delete[1] = {{ wxLua_wxSingleInstanceChecker_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxSingleInstanceChecker_delete }}; ! static int LUACALL wxLua_wxSingleInstanceChecker_delete(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxSingleInstanceChecker * self = (wxSingleInstanceChecker *)wxlState.GetUserDataType(1, s_wxluatag_wxSingleInstanceChecker); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; ! } ! ! static int LUACALL wxLua_wxSingleInstanceChecker_constructor(lua_State *L); ! static wxLuaBindCFunc s_wxluafunc_wxLua_wxSingleInstanceChecker_constructor[1] = {{ wxLua_wxSingleInstanceChecker_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; ! // wxSingleInstanceChecker() // default ctor, use Create() after it ! static int LUACALL wxLua_wxSingleInstanceChecker_constructor(lua_State *L) ! { ! wxluabind_removetableforcall(L); ! wxLuaState wxlState(L); ! wxSingleInstanceChecker *returns; ! // call constructor ! returns = new wxSingleInstanceChecker(); ! // add to tracked memory list ! wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxSingleInstanceChecker((wxSingleInstanceChecker *)returns)); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxSingleInstanceChecker, returns); ! ! return 1; ! } ! ! ! ! ! // Map Lua Class Methods to C Binding Functions ! wxLuaBindMethod wxSingleInstanceChecker_methods[] = { ! { "Create", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxSingleInstanceChecker_Create, 1, NULL }, ! { "IsAnotherRunning", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxSingleInstanceChecker_IsAnotherRunning, 1, NULL }, ! { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxSingleInstanceChecker_delete, 1, NULL }, ! { "wxSingleInstanceChecker", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxSingleInstanceChecker_constructor, 1, NULL }, ! ! { 0, 0, 0, 0 }, ! }; ! ! int wxSingleInstanceChecker_methodCount = sizeof(wxSingleInstanceChecker_methods)/sizeof(wxLuaBindMethod) - 1; ! ! #endif // wxUSE_SNGLINST_CHECKER Index: datetime.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/datetime.cpp,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** datetime.cpp 25 Jun 2007 03:19:42 -0000 1.50 --- datetime.cpp 26 Jun 2007 03:22:06 -0000 1.51 *************** *** 3873,3876 **** --- 3873,4005 ---- + #if wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + // --------------------------------------------------------------------------- + // Bind class wxStopWatch + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxStopWatch' + int s_wxluatag_wxStopWatch = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_Pause[] = { &s_wxluatag_wxStopWatch, NULL }; + static int LUACALL wxLua_wxStopWatch_Pause(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_Pause[1] = {{ wxLua_wxStopWatch_Pause, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStopWatch_Pause }}; + // void Pause() + static int LUACALL wxLua_wxStopWatch_Pause(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // call Pause + self->Pause(); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_Resume[] = { &s_wxluatag_wxStopWatch, NULL }; + static int LUACALL wxLua_wxStopWatch_Resume(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_Resume[1] = {{ wxLua_wxStopWatch_Resume, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStopWatch_Resume }}; + // void Resume() + static int LUACALL wxLua_wxStopWatch_Resume(lua_State *L) + { + wxLuaState wxlState(L); + // get this + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // call Resume + self->Resume(); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_Start[] = { &s_wxluatag_wxStopWatch, &s_wxluaarg_Number, NULL }; + static int LUACALL wxLua_wxStopWatch_Start(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_Start[1] = {{ wxLua_wxStopWatch_Start, WXLUAMETHOD_METHOD, 1, 2, s_wxluatagArray_wxLua_wxStopWatch_Start }}; + // void Start(long t0 = 0) // start the stop watch at the moment t0 + static int LUACALL wxLua_wxStopWatch_Start(lua_State *L) + { + wxLuaState wxlState(L); + // get number of arguments + int argCount = lua_gettop(L); + // long t0 = 0 + long t0 = (argCount >= 2 ? (long)wxlua_getnumbertype(L, 2) : 0); + // get this + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // call Start + self->Start(t0); + + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_Time[] = { &s_wxluatag_wxStopWatch, NULL }; + static int LUACALL wxLua_wxStopWatch_Time(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_Time[1] = {{ wxLua_wxStopWatch_Time, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxStopWatch_Time }}; + // long Time() const + static int LUACALL wxLua_wxStopWatch_Time(lua_State *L) + { + wxLuaState wxlState(L); + long returns; + // get this + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // call Time + returns = (self->Time()); + // push the result number + lua_pushnumber(L, returns); + + return 1; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxStopWatch_delete[] = { &s_wxluatag_wxStopWatch, NULL }; + static int LUACALL wxLua_wxStopWatch_delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_delete[1] = {{ wxLua_wxStopWatch_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxStopWatch_delete }}; + static int LUACALL wxLua_wxStopWatch_delete(lua_State *L) + { + wxLuaState wxlState(L); + wxStopWatch * self = (wxStopWatch *)wxlState.GetUserDataType(1, s_wxluatag_wxStopWatch); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + static int LUACALL wxLua_wxStopWatch_constructor(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxStopWatch_constructor[1] = {{ wxLua_wxStopWatch_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 0, s_wxluaargArray_None }}; + // wxStopWatch() // ctor starts the stop watch + static int LUACALL wxLua_wxStopWatch_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxStopWatch *returns; + // call constructor + returns = new wxStopWatch(); + // add to tracked memory list + wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxStopWatch((wxStopWatch *)returns)); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxStopWatch, returns); + + return 1; + } + + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxStopWatch_methods[] = { + { "Pause", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStopWatch_Pause, 1, NULL }, + { "Resume", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStopWatch_Resume, 1, NULL }, + { "Start", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStopWatch_Start, 1, NULL }, + { "Time", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxStopWatch_Time, 1, NULL }, + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxStopWatch_delete, 1, NULL }, + { "wxStopWatch", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxStopWatch_constructor, 1, NULL }, + + { 0, 0, 0, 0 }, + }; + + int wxStopWatch_methodCount = sizeof(wxStopWatch_methods)/sizeof(wxLuaBindMethod) - 1; + + #endif // wxLUA_USE_wxStopWatch && wxUSE_STOPWATCH + + #if wxLUA_USE_wxCalendarCtrl && wxUSE_CALENDARCTRL // --------------------------------------------------------------------------- Index: dialogs.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/dialogs.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** dialogs.cpp 25 Jun 2007 03:19:42 -0000 1.52 --- dialogs.cpp 26 Jun 2007 03:22:07 -0000 1.53 *************** *** 72,76 **** #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) ! #if (wxLUA_USE_wxSizer) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateButtonSizer(lua_State *L); --- 72,76 ---- #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateButtonSizer(lua_State *L); *************** *** 93,99 **** } ! #endif // (wxLUA_USE_wxSizer) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if (wxLUA_USE_wxSizer) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateSeparatedButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateSeparatedButtonSizer(lua_State *L); --- 93,99 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateSeparatedButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateSeparatedButtonSizer(lua_State *L); *************** *** 116,122 **** } ! #endif // (wxLUA_USE_wxSizer) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateStdDialogButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateStdDialogButtonSizer(lua_State *L); --- 116,122 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateStdDialogButtonSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; static int LUACALL wxLua_wxDialog_CreateStdDialogButtonSizer(lua_State *L); *************** *** 139,145 **** } ! #endif // ((wxLUA_USE_wxSizer) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if (wxLUA_USE_wxSizer) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateTextSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDialog_CreateTextSizer(lua_State *L); --- 139,145 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_CreateTextSizer[] = { &s_wxluatag_wxDialog, &s_wxluaarg_String, NULL }; static int LUACALL wxLua_wxDialog_CreateTextSizer(lua_State *L); *************** *** 162,166 **** } ! #endif // (wxLUA_USE_wxSizer) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_EndModal[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; --- 162,166 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) static wxLuaArgTag s_wxluatagArray_wxLua_wxDialog_EndModal[] = { &s_wxluatag_wxDialog, &s_wxluaarg_Number, NULL }; *************** *** 341,359 **** #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) ! #if (wxLUA_USE_wxSizer) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateButtonSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if (wxLUA_USE_wxSizer) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateSeparatedButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateSeparatedButtonSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateStdDialogButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateStdDialogButtonSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if (wxLUA_USE_wxSizer) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) { "CreateTextSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateTextSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) { "EndModal", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_EndModal, 1, NULL }, --- 341,359 ---- #endif // (wxLUA_USE_wxPointSizeRect) && (wxLUA_USE_wxDialog) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateButtonSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateSeparatedButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateSeparatedButtonSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxCHECK_VERSION(2,8,0) && wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) { "CreateStdDialogButtonSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateStdDialogButtonSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) && (wxUSE_BUTTON)) && ((wxUSE_BUTTON) && (wxLUA_USE_wxDialog)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) { "CreateTextSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_CreateTextSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxUSE_STATTEXT) && (wxLUA_USE_wxDialog)) { "EndModal", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxDialog_EndModal, 1, NULL }, *************** *** 3907,3911 **** ! #if (wxLUA_USE_wxSizer) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) static wxLuaArgTag s_wxluatagArray_wxLua_wxWizard_GetPageAreaSizer[] = { &s_wxluatag_wxWizard, NULL }; static int LUACALL wxLua_wxWizard_GetPageAreaSizer(lua_State *L); --- 3907,3911 ---- ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) static wxLuaArgTag s_wxluatagArray_wxLua_wxWizard_GetPageAreaSizer[] = { &s_wxluatag_wxWizard, NULL }; static int LUACALL wxLua_wxWizard_GetPageAreaSizer(lua_State *L); *************** *** 3926,3930 **** } ! #endif // (wxLUA_USE_wxSizer) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) --- 3926,3930 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) *************** *** 4138,4144 **** { "GetCurrentPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWizard_GetCurrentPage, 1, NULL }, ! #if (wxLUA_USE_wxSizer) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) { "GetPageAreaSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWizard_GetPageAreaSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) --- 4138,4144 ---- { "GetCurrentPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWizard_GetCurrentPage, 1, NULL }, ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) { "GetPageAreaSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWizard_GetPageAreaSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) #if (wxLUA_USE_wxPointSizeRect) && (wxUSE_WIZARDDLG && wxLUA_USE_wxWizard) Index: windows.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/windows.cpp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** windows.cpp 25 Jun 2007 03:19:49 -0000 1.68 --- windows.cpp 26 Jun 2007 03:22:07 -0000 1.69 *************** *** 85,88 **** --- 85,146 ---- // --------------------------------------------------------------------------- + // Bind class wxWindowUpdateLocker + // --------------------------------------------------------------------------- + + // Lua MetaTable Tag for Class 'wxWindowUpdateLocker' + int s_wxluatag_wxWindowUpdateLocker = -1; + + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindowUpdateLocker_delete[] = { &s_wxluatag_wxWindowUpdateLocker, NULL }; + static int LUACALL wxLua_wxWindowUpdateLocker_delete(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindowUpdateLocker_delete[1] = {{ wxLua_wxWindowUpdateLocker_delete, WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, 1, 1, s_wxluatagArray_wxLua_wxWindowUpdateLocker_delete }}; + static int LUACALL wxLua_wxWindowUpdateLocker_delete(lua_State *L) + { + wxLuaState wxlState(L); + wxWindowUpdateLocker * self = (wxWindowUpdateLocker *)wxlState.GetUserDataType(1, s_wxluatag_wxWindowUpdateLocker); + // if removed from tracked mem list, reset the tag so that gc() is not called on this object. + if ((self != NULL) && wxlState.RemoveTrackedObject(self)) + { + lua_pushnil(L); + lua_setmetatable(L, -2); + } + return 0; + } + + static wxLuaArgTag s_wxluatagArray_wxLua_wxWindowUpdateLocker_constructor[] = { &s_wxluatag_wxWindow, NULL }; + static int LUACALL wxLua_wxWindowUpdateLocker_constructor(lua_State *L); + static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindowUpdateLocker_constructor[1] = {{ wxLua_wxWindowUpdateLocker_constructor, WXLUAMETHOD_CONSTRUCTOR, 0, 1, s_wxluatagArray_wxLua_wxWindowUpdateLocker_constructor }}; + // wxWindowUpdateLocker(wxWindow *winToLock = NULL) + static int LUACALL wxLua_wxWindowUpdateLocker_constructor(lua_State *L) + { + wxluabind_removetableforcall(L); + wxLuaState wxlState(L); + wxWindowUpdateLocker *returns; + // get number of arguments + int argCount = lua_gettop(L); + // wxWindow winToLock = NULL + wxWindow * winToLock = (argCount >= 1 ? (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow) : NULL); + // call constructor + returns = new wxWindowUpdateLocker(winToLock); + // add to tracked memory list + wxlState.AddTrackedObject((long)returns, new wxLua_wxObject_wxWindowUpdateLocker((wxWindowUpdateLocker *)returns)); + // push the constructed class pointer + wxlState.PushUserDataType(s_wxluatag_wxWindowUpdateLocker, returns); + + return 1; + } + + + + // Map Lua Class Methods to C Binding Functions + wxLuaBindMethod wxWindowUpdateLocker_methods[] = { + { "delete", WXLUAMETHOD_METHOD|WXLUAMETHOD_DELETE, s_wxluafunc_wxLua_wxWindowUpdateLocker_delete, 1, NULL }, + { "wxWindowUpdateLocker", WXLUAMETHOD_CONSTRUCTOR, s_wxluafunc_wxLua_wxWindowUpdateLocker_constructor, 1, NULL }, + { 0, 0, 0, 0 }, + }; + + int wxWindowUpdateLocker_methodCount = sizeof(wxWindowUpdateLocker_methods)/sizeof(wxLuaBindMethod) - 1; + + + // --------------------------------------------------------------------------- // Bind class wxVisualAttributes // --------------------------------------------------------------------------- *************** *** 1160,1164 **** ! #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetConstraints[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetConstraints(lua_State *L); --- 1218,1222 ---- ! #if ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetConstraints[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetConstraints(lua_State *L); *************** *** 1179,1185 **** } ! #endif // (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) ! #if wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetContainingSizer[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetContainingSizer(lua_State *L); --- 1237,1243 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetContainingSizer[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetContainingSizer(lua_State *L); *************** *** 1200,1204 **** } ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxCursor --- 1258,1262 ---- } ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxCursor *************** *** 1393,1415 **** } - static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetHandle[] = { &s_wxluatag_wxWindow, NULL }; - static int LUACALL wxLua_wxWindow_GetHandle(lua_State *L); - static wxLuaBindCFunc s_wxluafunc_wxLua_wxWindow_GetHandle[1] = {{ wxLua_wxWindow_GetHandle, WXLUAMETHOD_METHOD, 1, 1, s_wxluatagArray_wxLua_wxWindow_GetHandle }}; - // %override wxLua_wxWindow_GetHandle - // void *GetHandle() const - static int LUACALL wxLua_wxWindow_GetHandle(lua_State *L) - { - wxLuaState wxlState(L); - // get this - wxWindow *self = (wxWindow *)wxlState.GetUserDataType(1, s_wxluatag_wxWindow); - // call GetHandle - void *handle = (void *)self->GetHandle(); - // push handle - lua_pushlightuserdata(L, handle); - // return the number of parameters - return 1; - } - - static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetHelpText[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetHelpText(lua_State *L); --- 1451,1454 ---- *************** *** 1795,1799 **** ! #if wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetSizer[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetSizer(lua_State *L); --- 1834,1838 ---- ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_GetSizer[] = { &s_wxluatag_wxWindow, NULL }; static int LUACALL wxLua_wxWindow_GetSizer(lua_State *L); *************** *** 1814,1818 **** } ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxFont --- 1853,1857 ---- } ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxFont *************** *** 2930,2934 **** ! #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetConstraints[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxLayoutConstraints, NULL }; static int LUACALL wxLua_wxWindow_SetConstraints(lua_State *L); --- 2969,2973 ---- ! #if ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetConstraints[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxLayoutConstraints, NULL }; static int LUACALL wxLua_wxWindow_SetConstraints(lua_State *L); *************** *** 2948,2954 **** } ! #endif // (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) ! #if wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetContainingSizer[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSizer, NULL }; static int LUACALL wxLua_wxWindow_SetContainingSizer(lua_State *L); --- 2987,2993 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetContainingSizer[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSizer, NULL }; static int LUACALL wxLua_wxWindow_SetContainingSizer(lua_State *L); *************** *** 2968,2972 **** } ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxCursor --- 3007,3011 ---- } ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxCursor *************** *** 3481,3485 **** ! #if wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSizer[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSizer, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxWindow_SetSizer(lua_State *L); --- 3520,3524 ---- ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetSizer[] = { &s_wxluatag_wxWindow, &s_wxluatag_wxSizer, &s_wxluaarg_Boolean, NULL }; static int LUACALL wxLua_wxWindow_SetSizer(lua_State *L); *************** *** 3524,3528 **** } ! #endif // wxLUA_USE_wxSizer static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetThemeEnabled[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; --- 3563,3567 ---- } ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) static wxLuaArgTag s_wxluatagArray_wxLua_wxWindow_SetThemeEnabled[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Boolean, NULL }; *************** *** 4421,4431 **** { "GetClientSizeWH", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetClientSizeWH, 1, NULL }, ! #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) { "GetConstraints", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetConstraints, 1, NULL }, ! #endif // (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) ! #if wxLUA_USE_wxSizer { "GetContainingSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetContainingSizer, 1, NULL }, ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxCursor --- 4460,4470 ---- { "GetClientSizeWH", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetClientSizeWH, 1, NULL }, ! #if ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) { "GetConstraints", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetConstraints, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "GetContainingSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetContainingSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxCursor *************** *** 4455,4459 **** { "GetGrandParent", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetGrandParent, 1, NULL }, - { "GetHandle", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetHandle, 1, NULL }, { "GetHelpText", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetHelpText, 1, NULL }, { "GetId", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetId, 1, NULL }, --- 4494,4497 ---- *************** *** 4495,4501 **** { "GetSizeWH", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetSizeWH, 1, NULL }, ! #if wxLUA_USE_wxSizer { "GetSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetSizer, 1, NULL }, ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxFont --- 4533,4539 ---- { "GetSizeWH", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetSizeWH, 1, NULL }, ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "GetSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_GetSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxFont *************** *** 4610,4620 **** #endif // (wxLUA_USE_wxPointSizeRect) ! #if (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) { "SetConstraints", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetConstraints, 1, NULL }, ! #endif // (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) && (!wxCHECK_VERSION(2,6,0)) ! #if wxLUA_USE_wxSizer { "SetContainingSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetContainingSizer, 1, NULL }, ! #endif // wxLUA_USE_wxSizer #if wxLUA_USE_wxCursor --- 4648,4658 ---- #endif // (wxLUA_USE_wxPointSizeRect) ! #if ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) { "SetConstraints", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetConstraints, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)))) && (!wxCHECK_VERSION(2,6,0)) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "SetContainingSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetContainingSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) #if wxLUA_USE_wxCursor *************** *** 4673,4680 **** #endif // (wxLUA_USE_wxPointSizeRect) ! #if wxLUA_USE_wxSizer { "SetSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetSizer, 1, NULL }, { "SetSizerAndFit", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetSizerAndFit, 1, NULL }, ! #endif // wxLUA_USE_wxSizer { "SetThemeEnabled", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetThemeEnabled, 1, NULL }, --- 4711,4718 ---- #endif // (wxLUA_USE_wxPointSizeRect) ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "SetSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetSizer, 1, NULL }, { "SetSizerAndFit", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetSizerAndFit, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) { "SetThemeEnabled", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxWindow_SetThemeEnabled, 1, NULL }, *************** *** 5247,5251 **** #endif // (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0)) ! #if (wxLUA_USE_wxSizer) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_GetControlSizer[] = { &s_wxluatag_wxBookCtrlBase, NULL }; static int LUACALL wxLua_wxBookCtrlBase_GetControlSizer(lua_State *L); --- 5285,5289 ---- #endif // (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_GetControlSizer[] = { &s_wxluatag_wxBookCtrlBase, NULL }; static int LUACALL wxLua_wxBookCtrlBase_GetControlSizer(lua_State *L); *************** *** 5266,5270 **** } ! #endif // (wxLUA_USE_wxSizer) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_GetCurrentPage[] = { &s_wxluatag_wxBookCtrlBase, NULL }; --- 5304,5308 ---- } ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) static wxLuaArgTag s_wxluatagArray_wxLua_wxBookCtrlBase_GetCurrentPage[] = { &s_wxluatag_wxBookCtrlBase, NULL }; *************** *** 5704,5710 **** #endif // (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0)) ! #if (wxLUA_USE_wxSizer) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) { "GetControlSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBase_GetControlSizer, 1, NULL }, ! #endif // (wxLUA_USE_wxSizer) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) { "GetCurrentPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBase_GetCurrentPage, 1, NULL }, --- 5742,5748 ---- #endif // (wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0)) ! #if ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) { "GetControlSizer", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBase_GetControlSizer, 1, NULL }, ! #endif // ((wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0))) && ((wxLUA_USE_wxNotebook && wxUSE_BOOKCTRL) && (wxCHECK_VERSION(2,8,0))) { "GetCurrentPage", WXLUAMETHOD_METHOD, s_wxluafunc_wxLua_wxBookCtrlBase_GetCurrentPage, 1, NULL }, Index: sizer.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/sizer.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** sizer.cpp 18 Jun 2007 21:40:49 -0000 1.42 --- sizer.cpp 26 Jun 2007 03:22:07 -0000 1.43 *************** *** 27,31 **** ! #if wxLUA_USE_wxSizer // --------------------------------------------------------------------------- // Bind class wxSizerItem --- 27,532 ---- ! #if (wxLUA_USE_wxSizer) && (wxCHECK_VERSION(2,8,0)) ! // --------------------------------------------------------------------------- [...2419 lines suppressed...] --- 5107,5114 ---- int wxLayoutConstraints_methodCount = sizeof(wxLayoutConstraints_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) ! #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) // --------------------------------------------------------------------------- // Bind class wxIndividualLayoutConstraint *************** *** 4857,4860 **** int wxIndividualLayoutConstraint_methodCount = sizeof(wxIndividualLayoutConstraint_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) --- 5360,5363 ---- int wxIndividualLayoutConstraint_methodCount = sizeof(wxIndividualLayoutConstraint_methods)/sizeof(wxLuaBindMethod) - 1; ! #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) Index: wx_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxbind/src/wx_bind.cpp,v retrieving revision 1.118 retrieving revision 1.119 diff -C2 -d -r1.118 -r1.119 *** wx_bind.cpp 25 Jun 2007 03:19:49 -0000 1.118 --- wx_bind.cpp 26 Jun 2007 03:22:07 -0000 1.119 *************** *** 818,826 **** { "wxARE_FILENAMES_CASE_SENSITIVE", wxARE_FILENAMES_CASE_SENSITIVE }, ! #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) { "wxAbove", wxAbove }, { "wxAbsolute", wxAbsolute }, { "wxAsIs", wxAsIs }, ! #endif // wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) { "wxBACKINGSTORE", wxBACKINGSTORE }, --- 818,826 ---- { "wxARE_FILENAMES_CASE_SENSITIVE", wxARE_FILENAMES_CASE_SENSITIVE }, ! #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) { "wxAbove", wxAbove }, { "wxAbsolute", wxAbsolute }, { "wxAsIs", wxAsIs }, ! #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) { "wxBACKINGSTORE", wxBACKINGSTORE }, *************** *** 957,964 **** #endif // wxLUA_USE_wxButton && wxUSE_BUTTON ! #if wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) { "wxBelow", wxBelow }, { "wxBottom", wxBottom }, ! #endif // wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0)) #if (wxLUA_USE_wxColourPenBrush) && (wxCHECK_VERSION(2,8,0)) --- 957,964 ---- #endif // wxLUA_USE_wxButton && wxUSE_BUTTON ! #if (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) { "wxBelow", wxBelow }, { "wxBottom", wxBottom }, ! #endif // (wxLUA_USE_wxSizer) && (wxLUA_USE_wxLayoutConstraints && (!wxCHECK_VERSION(2,6,0))) #if (wxLUA_USE_wxColourPenBrush) && (... [truncated message content] |
|
From: John L. <jr...@us...> - 2007-06-26 03:22:12
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15715/wxLua/samples Modified Files: wxluasudoku.wx.lua Log Message: Added more classes Updated lua 5.1.2 with patches 1-6 Made wxluasudoku a little faster Index: wxluasudoku.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/wxluasudoku.wx.lua,v retrieving revision 1.71 retrieving revision 1.72 diff -C2 -d -r1.71 -r1.72 *** wxluasudoku.wx.lua 14 Jun 2007 01:23:20 -0000 1.71 --- wxluasudoku.wx.lua 26 Jun 2007 03:22:07 -0000 1.72 *************** *** 406,409 **** --- 406,437 ---- end + + -- Generate a table of {[cell] = {hash table of cells that are in the row, col, block of this cell}} + sudoku.cellToRowColBlockCellsTable = {} + for cell = 1, 81 do + local row, col = sudoku.CellToRowCol(cell) + local block_cell = sudoku.BlockToCell(sudoku.CellToBlock(cell)) + + sudoku.cellToRowColBlockCellsTable[cell] = {} + + for rcb = 1, 9 do + local c = sudoku.RowColToCell(rcb, col) + sudoku.cellToRowColBlockCellsTable[cell][c] = true + c = sudoku.RowColToCell(row, rcb) + sudoku.cellToRowColBlockCellsTable[cell][c] = true + c = rcb + block_cell + sudoku.LinearBlockCellTable[rcb] + sudoku.cellToRowColBlockCellsTable[cell][c] = true + end + end + + -- Generate a table of {[cell] = {array of cells that are in the row, col, block of this cell}} + sudoku.cellToRowColBlockCellsArray = {} + for cell = 1, 81 do + sudoku.cellToRowColBlockCellsArray[cell] = {} + for k, v in pairs(sudoku.cellToRowColBlockCellsTable) do + table.insert(sudoku.cellToRowColBlockCellsArray, k) + end + end + -- ============================================================================ -- Get the cell value at a specific row, col *************** *** 585,617 **** end function sudoku.RemoveCellPossible(cell, value, sudokuTable) ! if sudokuTable.possible[cell][value] then ! sudokuTable.possible[cell][value] = nil ! end end -- Remove a possible values from the row, col, block. Modifies input sudokuTable. -- if exceptTable then don't remove it from exceptTable[cell#] = true ! function sudoku.RemovePossibleAll(row, col, value, sudokuTable, exceptTable, break_if_empty) exceptTable = exceptTable or {} break_if_empty = break_if_empty or false - local block_cell = sudoku.BlockToCell(sudoku.RowColToBlock(row, col)) - - for rcb = 1, 9 do - local cell = sudoku.RowColToCell(rcb, col) - if (not exceptTable[cell]) and sudokuTable.possible[cell][value] then - sudokuTable.possible[cell][value] = nil - if break_if_empty and (not sudoku.HasCellValue(cell, sudokuTable)) and TableIsEmpty(sudokuTable.possible[cell]) then return nil end - end - - cell = sudoku.RowColToCell(row, rcb) - if (not exceptTable[cell]) and sudokuTable.possible[cell][value] then - sudokuTable.possible[cell][value] = nil - if break_if_empty and (not sudoku.HasCellValue(cell, sudokuTable)) and TableIsEmpty(sudokuTable.possible[cell]) then return nil end - end ! cell = rcb + block_cell + sudoku.LinearBlockCellTable[rcb] ! if (not exceptTable[cell]) and sudokuTable.possible[cell][value] then ! sudokuTable.possible[cell][value] = nil ! if break_if_empty and (not sudoku.HasCellValue(cell, sudokuTable)) and TableIsEmpty(sudokuTable.possible[cell]) then return nil end end end --- 613,629 ---- end function sudoku.RemoveCellPossible(cell, value, sudokuTable) ! sudokuTable.possible[cell][value] = nil end -- Remove a possible values from the row, col, block. Modifies input sudokuTable. -- if exceptTable then don't remove it from exceptTable[cell#] = true ! function sudoku.RemovePossibleAll(cell, value, sudokuTable, exceptTable, break_if_empty) exceptTable = exceptTable or {} break_if_empty = break_if_empty or false ! for i, c in ipairs(sudoku.cellToRowColBlockCellsArray[cell]) do ! if (not exceptTable[c]) and sudokuTable.possible[c][value] then ! sudokuTable.possible[c][value] = nil ! if break_if_empty and (not sudoku.HasCellValue(c, sudokuTable)) and TableIsEmpty(sudokuTable.possible[c]) then return nil end end end *************** *** 1064,1070 **** end if count == 1 then sudoku.SetValue(row, col, value, sudokuTable) ! sudoku.RemovePossibleAll(row, col, value, sudokuTable) ! changed_cells[sudoku.RowColToCell(row, col)] = value end end --- 1076,1083 ---- end if count == 1 then + local cell = sudoku.RowColToCell(row, col) sudoku.SetValue(row, col, value, sudokuTable) ! sudoku.RemovePossibleAll(cell, value, sudokuTable) ! changed_cells[cell] = value end end *************** *** 1115,1121 **** if TableCount(possible[value]) == 1 then local cell = possible[value][1] ! local r, c = sudoku.CellToRowCol(cell) ! sudoku.SetValue(r, c, value, sudokuTable) ! sudoku.RemovePossibleAll(r, c, value, sudokuTable) changed_cells[cell] = value end --- 1128,1133 ---- if TableCount(possible[value]) == 1 then local cell = possible[value][1] ! sudoku.SetCellValue(cell, value, sudokuTable) ! sudoku.RemovePossibleAll(cell, value, sudokuTable) changed_cells[cell] = value end *************** *** 1156,1162 **** if TableCount(possible[value]) == 1 then local cell = possible[value][1] ! local row, col = sudoku.CellToRowCol(cell) ! sudoku.SetValue(row, col, value, sudokuTable) ! sudoku.RemovePossibleAll(row, col, value, sudokuTable) changed_cells[cell] = value end --- 1168,1173 ---- if TableCount(possible[value]) == 1 then local cell = possible[value][1] ! sudoku.SetCellValue(cell, value, sudokuTable) ! sudoku.RemovePossibleAll(cell, value, sudokuTable) changed_cells[cell] = value end *************** *** 1265,1270 **** -- don't use SetValue since we only care about possible s1.values[cell] = k --sudoku.SetValue(row, col, k, s1) ! local row, col = sudoku.CellToRowCol(cell) ! sudoku.RemovePossibleAll(row, col, k, s1, nil, true) guesses[cell] = guesses[cell] + 1 --- 1276,1280 ---- -- don't use SetValue since we only care about possible s1.values[cell] = k --sudoku.SetValue(row, col, k, s1) ! sudoku.RemovePossibleAll(cell, k, s1, nil, true) guesses[cell] = guesses[cell] + 1 *************** *** 1352,1356 **** if sudoku.IsValidValue(row, col, value, sudokuTable) then sudoku.SetCellValue(cell, value, sudokuTable) ! sudoku.RemovePossibleAll(row, col, value, sudokuTable) else -- try other values starting at value+1 and wrapping around --- 1362,1366 ---- if sudoku.IsValidValue(row, col, value, sudokuTable) then sudoku.SetCellValue(cell, value, sudokuTable) ! sudoku.RemovePossibleAll(cell, value, sudokuTable) else -- try other values starting at value+1 and wrapping around *************** *** 1361,1365 **** if sudoku.IsValidValue(row, col, i, sudokuTable) then sudoku.SetCellValue(cell, i, sudokuTable) ! sudoku.RemovePossibleAll(row, col, i, sudokuTable) set_value = true break --- 1371,1375 ---- if sudoku.IsValidValue(row, col, i, sudokuTable) then sudoku.SetCellValue(cell, i, sudokuTable) ! sudoku.RemovePossibleAll(cell, i, sudokuTable) set_value = true break |
|
From: John L. <jr...@us...> - 2007-06-25 23:04:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10540/wxLua/modules/wxlua/src Modified Files: wxlbind.cpp wxlstate.cpp Log Message: Replace wxLuaState::GetCallBaseClassfunction with wxlua_getcallbaseclassfunction so we no longer need a wxLuaState in the __index func for class objects Better names for the metatable C functions Index: wxlstate.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlstate.cpp,v retrieving revision 1.117 retrieving revision 1.118 diff -C2 -d -r1.117 -r1.118 *** wxlstate.cpp 25 Jun 2007 19:44:54 -0000 1.117 --- wxlstate.cpp 25 Jun 2007 23:04:02 -0000 1.118 *************** *** 44,47 **** --- 44,49 ---- int wxlua_lreg_derivedmethods_key = WXLUA_LREG_DERIVED_METHODS; int wxlua_lreg_wxluastaterefdata_key = WXLUA_LREG_WXLUASTATEREFDATA; + int wxlua_lreg_callbaseclassfunc_key = WXLUA_LREG_CALLBASECLASSFUNC; + int wxlua_lreg_metatable_tag_key = WXLUA_METATABLE_TAG; int wxlua_lreg_metatable_class_key = WXLUA_METATABLE_CLASS; *************** *** 82,85 **** --- 84,89 ---- msg += lua2wx(s); lua_pop(L, 1); /* pop result */ + /* + // we do this now in wxluabind__tostring_wxLuaBindClass // if we know the type, add it *************** *** 94,97 **** --- 98,102 ---- } } + */ } *************** *** 834,838 **** //---------------------------------------------------------------------------- ! bool wxlua_setderivedmethod(lua_State* L, void *pObject, const char *method_name, wxLuaObject* wxlObj) { wxlua_pushkey_wxLuaDerivedMethods(L); --- 839,843 ---- //---------------------------------------------------------------------------- ! bool LUACALL wxlua_setderivedmethod(lua_State* L, void *pObject, const char *method_name, wxLuaObject* wxlObj) { wxlua_pushkey_wxLuaDerivedMethods(L); *************** *** 885,889 **** return true; } ! bool wxlua_hasderivedmethod(lua_State* L, void *pObject, const char *method_name, bool push_method) { bool found = false; --- 890,894 ---- return true; } ! bool LUACALL wxlua_hasderivedmethod(lua_State* L, void *pObject, const char *method_name, bool push_method) { bool found = false; *************** *** 929,933 **** return found; } ! bool wxlua_removederivedmethod(lua_State* L, void *pObject) { bool found = false; --- 934,938 ---- return found; } ! bool LUACALL wxlua_removederivedmethod(lua_State* L, void *pObject) { bool found = false; *************** *** 979,982 **** --- 984,1004 ---- } + bool LUACALL wxlua_getcallbaseclassfunction(lua_State*L) + { + wxlua_pushkey_CallBaseClassFunc(L); + lua_rawget( L, LUA_REGISTRYINDEX ); // pop key, push bool + bool call_base = (bool)lua_toboolean(L, -1); + lua_pop(L, 1); // pop bool + + return call_base; + } + + void LUACALL wxlua_setcallbaseclassfunction(lua_State*L, bool call_base) + { + wxlua_pushkey_CallBaseClassFunc(L); + lua_pushboolean(L, call_base); + lua_rawset( L, LUA_REGISTRYINDEX ); // pop key and bool + } + // ---------------------------------------------------------------------------- // wxFindWindowByPointer - find a window by it's pointer *************** *** 1109,1113 **** wxLuaStateData::wxLuaStateData() :m_bindings_registered(false), - m_callbase_func(false), m_inEventType(wxEVT_NULL), m_is_running(false), --- 1131,1134 ---- *************** *** 2009,2014 **** } ! tsettagmethod(g_wxluatag_wxLuaFunction, "__gc", wxlua_gc_wxLuaFunction); ! tsettagmethod(g_wxluatag_wxLuaFunction, "__call", wxlua_call_wxLuaFunction); // Finally - set the global tags from the bindings we've just installed --- 2030,2035 ---- } ! tsettagmethod(g_wxluatag_wxLuaFunction, "__gc", wxlua__gc_wxLuaFunction); ! tsettagmethod(g_wxluatag_wxLuaFunction, "__call", wxlua__call_wxLuaFunction); // Finally - set the global tags from the bindings we've just installed *************** *** 2142,2151 **** { wxCHECK_RET(Ok(), wxT("Invalid wxLuaState")); ! M_WXLSTATEDATA->m_wxlStateData->m_callbase_func = call_base; } bool wxLuaState::GetCallBaseClassFunction() { wxCHECK_MSG(Ok(), false, wxT("Invalid wxLuaState")); ! return M_WXLSTATEDATA->m_wxlStateData->m_callbase_func; } --- 2163,2172 ---- { wxCHECK_RET(Ok(), wxT("Invalid wxLuaState")); ! wxlua_setcallbaseclassfunction(M_WXLSTATEDATA->m_lua_State, call_base); } bool wxLuaState::GetCallBaseClassFunction() { wxCHECK_MSG(Ok(), false, wxT("Invalid wxLuaState")); ! return wxlua_getcallbaseclassfunction(M_WXLSTATEDATA->m_lua_State); } Index: wxlbind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/src/wxlbind.cpp,v retrieving revision 1.80 retrieving revision 1.81 diff -C2 -d -r1.80 -r1.81 *** wxlbind.cpp 25 Jun 2007 19:44:53 -0000 1.80 --- wxlbind.cpp 25 Jun 2007 23:04:02 -0000 1.81 *************** *** 69,73 **** } ! int LUACALL wxlua_gc_wxLuaFunction(lua_State *L) { // Sanity check, but this is only attached to a wxLuaFunction, so it has to be ok. --- 69,73 ---- } ! int LUACALL wxlua__gc_wxLuaFunction(lua_State *L) { // Sanity check, but this is only attached to a wxLuaFunction, so it has to be ok. *************** *** 81,85 **** } ! int LUACALL wxlua_call_wxLuaFunction(lua_State *L) { // Sanity check, but this is only attached to a wxLuaFunction, so it has to be ok. --- 81,85 ---- } ! int LUACALL wxlua__call_wxLuaFunction(lua_State *L) { // Sanity check, but this is only attached to a wxLuaFunction, so it has to be ok. *************** *** 88,96 **** wxLuaFunction *wxlFunction = (wxLuaFunction *)wxlua_ttouserdata(L, 1, false); - // remove the userdata *this from the stack - // can't do this when there's both static and nonstatic overloaded functions - //if (wxlFunction->m_wxlMethod && WXLUA_HASBIT(wxlFunction->m_wxlMethod->type, WXLUAMETHOD_STATIC)) - // lua_remove(L, 1); - return wxlFunction->CallMethod(L); } --- 88,91 ---- *************** *** 248,252 **** // ---------------------------------------------------------------------------- ! int LUACALL wxluabind_gc_wxLuaBindClass(lua_State *L) { wxLuaBindClass *wxlClass = (wxLuaBindClass *)lua_touserdata(L, lua_upvalueindex(1)); --- 243,247 ---- // ---------------------------------------------------------------------------- ! int LUACALL wxluabind__gc_wxLuaBindClass(lua_State *L) { wxLuaBindClass *wxlClass = (wxLuaBindClass *)lua_touserdata(L, lua_upvalueindex(1)); *************** *** 276,284 **** // ---------------------------------------------------------------------------- ! int LUACALL wxluabind_index_wxLuaBindClass(lua_State *L) { - wxLuaState wxlState(L); - wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); - // This function is called for the __index metable of the wxLua userdata // for class instances. The stack contains 1 = userdata, 2 = "FuncName" --- 271,276 ---- // ---------------------------------------------------------------------------- ! int LUACALL wxluabind__index_wxLuaBindClass(lua_State *L) { // This function is called for the __index metable of the wxLua userdata // for class instances. The stack contains 1 = userdata, 2 = "FuncName" *************** *** 289,294 **** // the called function knows to call the base class instead of recalling // the lua function and recursing. ! //wxCHECK_MSG(!wxlState.GetCallBaseClassFunction(), 0, wxT("Base class function call not reset")); ! wxlState.SetCallBaseClassFunction(false); bool callbase = false; --- 281,285 ---- // the called function knows to call the base class instead of recalling // the lua function and recursing. ! wxlua_setcallbaseclassfunction(L, false); bool callbase = false; *************** *** 333,337 **** found = true; result = 1; ! wxLuaFunction *wxlFunc = new wxLuaFunction(wxlMethod, wxlClass, pObject); wxlua_tpushusertag(L, wxlFunc, g_wxluatag_wxLuaFunction); } --- 324,328 ---- found = true; result = 1; ! wxLuaFunction *wxlFunc = new wxLuaFunction(wxlMethod, pObject); wxlua_tpushusertag(L, wxlFunc, g_wxluatag_wxLuaFunction); } *************** *** 363,372 **** // This MUST be reset to false in the base class function ! if (found && callbase) wxlState.SetCallBaseClassFunction(true); } } if (!found) ! wxlState.terror(wxString::Format(_("wxLua: Attempt to call an invalid method '%s'."), lua2wx(name).c_str())); return result; --- 354,363 ---- // This MUST be reset to false in the base class function ! if (found && callbase) wxlua_setcallbaseclassfunction(L, true); } } if (!found) ! wxlua_terror(L, wxString::Format(_("wxLua: Attempt to call an invalid method '%s'."), lua2wx(name).c_str())); return result; *************** *** 427,434 **** --- 418,456 ---- } + // ---------------------------------------------------------------------------- + // wxluabind__tostring_wxLuaBindClass + // ---------------------------------------------------------------------------- + + int LUACALL wxluabind__tostring_wxLuaBindClass(lua_State *L) + { + wxLuaState wxlState(L); + wxCHECK_MSG(wxlState.Ok(), 0, wxT("Invalid wxLuaState")); + + wxString str(wxT("Invalid wxLua userdata!")); // should never happen + + if (lua_isuserdata(L, 1)) + { + // this should be identical to Lua's tostring for a userdata + str = wxString::Format(wxT("userdata: %p"), lua_touserdata(L, 1)); + + int nTag = wxlua_ttag(L, 1); + if (nTag != WXLUA_NOTAG) + { + wxString name = wxlState.GetLuaTagName(nTag); + if (!name.IsEmpty()) + str += wxString::Format(wxT(" (%s)"), name.c_str()); + } + } + + lua_pushstring(L, wx2lua(str)); + return 1; + } + + // ---------------------------------------------------------------------------- // Use the pointer to this int as a special tag to know that __call has been // made on a table and that we want to remove the table for the bindings to // work. This is because lua always pushes the table on the stack if '.' or ':' // is used for the __call metamethod. + // ---------------------------------------------------------------------------- static int wxluabind_checkremovetable = 0; *************** *** 682,688 **** static const luaL_reg s_funcTable[] = { ! {"__gc", wxluabind_gc_wxLuaBindClass }, ! {"__index", wxluabind_index_wxLuaBindClass }, ! {"__newindex", wxluabind__newindex_wxLuaBindClass } }; static const size_t s_funcCount = sizeof(s_funcTable)/sizeof(s_funcTable[0]); --- 704,711 ---- static const luaL_reg s_funcTable[] = { ! {"__gc", wxluabind__gc_wxLuaBindClass }, ! {"__index", wxluabind__index_wxLuaBindClass }, ! {"__newindex", wxluabind__newindex_wxLuaBindClass }, ! {"__tostring", wxluabind__tostring_wxLuaBindClass } }; static const size_t s_funcCount = sizeof(s_funcTable)/sizeof(s_funcTable[0]); |
|
From: John L. <jr...@us...> - 2007-06-25 23:04:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxlua/include In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10540/wxLua/modules/wxlua/include Modified Files: wxlbind.h wxlstate.h Log Message: Replace wxLuaState::GetCallBaseClassfunction with wxlua_getcallbaseclassfunction so we no longer need a wxLuaState in the __index func for class objects Better names for the metatable C functions Index: wxlbind.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlbind.h,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** wxlbind.h 25 Jun 2007 19:44:50 -0000 1.54 --- wxlbind.h 25 Jun 2007 23:04:00 -0000 1.55 *************** *** 23,32 **** // ---------------------------------------------------------------------------- ! // memory deallocation function for created wxLuaBindClass defined objects, lua's __gc ! WXDLLIMPEXP_WXLUA int LUACALL wxluabind_gc_wxLuaBindClass(lua_State *L); ! // lua 'set table' function for created wxLuaBindClass defined objects, lua's __newindex WXDLLIMPEXP_WXLUA int LUACALL wxluabind__newindex_wxLuaBindClass(lua_State *L); ! // lua 'get table' function for created wxLuaBindClass defined objects, lua's __index ! WXDLLIMPEXP_WXLUA int LUACALL wxluabind_index_wxLuaBindClass(lua_State *L); // If there is a special userdata upvalue, remove 1 value if !only_check // (hack to remove the table lua pushes onto the stack when calling the --- 23,35 ---- // ---------------------------------------------------------------------------- ! // memory deallocation function for created wxLuaBindClass defined objects, lua's __gc metatable index ! WXDLLIMPEXP_WXLUA int LUACALL wxluabind__gc_wxLuaBindClass(lua_State *L); ! // lua 'set table' function for created wxLuaBindClass defined objects, lua's __newindex metatable index WXDLLIMPEXP_WXLUA int LUACALL wxluabind__newindex_wxLuaBindClass(lua_State *L); ! // lua 'get table' function for created wxLuaBindClass defined objects, lua's __index metatable index ! WXDLLIMPEXP_WXLUA int LUACALL wxluabind__index_wxLuaBindClass(lua_State *L); ! // lua 'tostring' function for created wxLuaBindClass defined objects, lua's __tostring metatable index ! WXDLLIMPEXP_WXLUA int LUACALL wxluabind__tostring_wxLuaBindClass(lua_State *L); ! // If there is a special userdata upvalue, remove 1 value if !only_check // (hack to remove the table lua pushes onto the stack when calling the *************** *** 183,188 **** { public: ! wxLuaFunction(wxLuaBindMethod *wxlMethod, wxLuaBindClass *wxlClass, void *pObject) ! : m_wxlMethod(wxlMethod), m_wxlClass(wxlClass), m_pObject(pObject) {} ~wxLuaFunction() {} --- 186,191 ---- { public: ! wxLuaFunction(wxLuaBindMethod *wxlMethod, void *pObject) ! : m_wxlMethod(wxlMethod), m_pObject(pObject) {} ~wxLuaFunction() {} *************** *** 192,196 **** wxLuaBindMethod *m_wxlMethod; - wxLuaBindClass *m_wxlClass; void *m_pObject; }; --- 195,198 ---- *************** *** 198,204 **** // Garbage collect and free memory associated with the wxLuaFunction class // lua's __gc metatable function. ! int LUACALL wxlua_gc_wxLuaFunction(lua_State *L); // call a wxLuaFunction, lua's __call metatable function. ! int LUACALL wxlua_call_wxLuaFunction(lua_State *L); // ---------------------------------------------------------------------------- --- 200,206 ---- // Garbage collect and free memory associated with the wxLuaFunction class // lua's __gc metatable function. ! int LUACALL wxlua__gc_wxLuaFunction(lua_State *L); // call a wxLuaFunction, lua's __call metatable function. ! int LUACALL wxlua__call_wxLuaFunction(lua_State *L); // ---------------------------------------------------------------------------- Index: wxlstate.h =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxlua/include/wxlstate.h,v retrieving revision 1.83 retrieving revision 1.84 diff -C2 -d -r1.83 -r1.84 *** wxlstate.h 25 Jun 2007 19:44:50 -0000 1.83 --- wxlstate.h 25 Jun 2007 23:04:00 -0000 1.84 *************** *** 48,57 **** if (luastr == NULL) return wxEmptyString; // check for NULL - wxString str; - #if wxUSE_UNICODE ! str = wxString(luastr, wxConvUTF8); #else ! str = wxString(wxConvUTF8.cMB2WC(luastr), *wxConvCurrent); #endif // wxUSE_UNICODE --- 48,55 ---- if (luastr == NULL) return wxEmptyString; // check for NULL #if wxUSE_UNICODE ! wxString str(luastr, wxConvUTF8); #else ! wxString str(wxConvUTF8.cMB2WC(luastr), *wxConvCurrent); #endif // wxUSE_UNICODE *************** *** 99,104 **** #define WXLUA_LREG_DERIVED_METHODS 3 #define WXLUA_LREG_WXLUASTATEREFDATA 4 ! #define WXLUA_METATABLE_TAG 5 ! #define WXLUA_METATABLE_CLASS 6 // Light user data used as keys in the lua registry table for wxLua items. --- 97,103 ---- #define WXLUA_LREG_DERIVED_METHODS 3 #define WXLUA_LREG_WXLUASTATEREFDATA 4 ! #define WXLUA_LREG_CALLBASECLASSFUNC 5 ! #define WXLUA_METATABLE_TAG 6 ! #define WXLUA_METATABLE_CLASS 7 // Light user data used as keys in the lua registry table for wxLua items. *************** *** 108,111 **** --- 107,111 ---- extern WXDLLIMPEXP_DATA_WXLUA(int) wxlua_lreg_derivedmethods_key; // WXLUA_LREG_DERIVED_METHODS extern WXDLLIMPEXP_DATA_WXLUA(int) wxlua_lreg_wxluastaterefdata_key; // WXLUA_LREG_WXLUASTATEREFDATA + extern WXDLLIMPEXP_DATA_WXLUA(int) wxlua_lreg_callbaseclassfunc_key; // WXLUA_LREG_CALLBASECLASSFUNC // Light user data used as keys in the metatables created for the class userdata objects. *************** *** 124,130 **** // t[lightuserdata object] = {["derived func/value name"] = wxLuaObject(lua function/value), ...} #define wxlua_pushkey_wxLuaDerivedMethods(L) lua_pushlightuserdata(L, &wxlua_lreg_derivedmethods_key) ! // Push a key of an index of the LUA_REGISTRYINDEX table that is a lightuserdata of the // wxLuaStateRefData for this lua_State. #define wxlua_pushkey_wxLuaStateRefData(L) lua_pushlightuserdata(L, &wxlua_lreg_wxluastaterefdata_key) // Push a key of an index into the metatable of a wxLua userdata for the "tag" --- 124,133 ---- // t[lightuserdata object] = {["derived func/value name"] = wxLuaObject(lua function/value), ...} #define wxlua_pushkey_wxLuaDerivedMethods(L) lua_pushlightuserdata(L, &wxlua_lreg_derivedmethods_key) ! // Push a key that is an index of the LUA_REGISTRYINDEX table that is a lightuserdata of the // wxLuaStateRefData for this lua_State. #define wxlua_pushkey_wxLuaStateRefData(L) lua_pushlightuserdata(L, &wxlua_lreg_wxluastaterefdata_key) + // Push a key that is an index of the LUA_REGISTRYINDEX table that is boolean value + // of whether the lua code has prepended a '_' to indicate they want the base class function called. + #define wxlua_pushkey_CallBaseClassFunc(L) lua_pushlightuserdata(L, &wxlua_lreg_callbaseclassfunc_key) // Push a key of an index into the metatable of a wxLua userdata for the "tag" *************** *** 286,297 **** // The derived methods are stored in the "wxLuaDerivedMethods" table in the // lua registry table. ! bool wxlua_setderivedmethod(lua_State* L, void *pObject, const char *method_name, wxLuaObject* wxlObj); // Is there a derived method given an object and and a method name. // If push_method then push the method onto the stack. // A derived method is when a function or value is set to a wxLua userdata. ! bool wxlua_hasderivedmethod(lua_State* L, void *pObject, const char *method_name, bool push_method); // When an object is being garbage collected and we call RemoveTrackedObject // object on it, we should also remove any derived functions or values it may have. ! bool wxlua_removederivedmethod(lua_State* L, void *pObject); //---------------------------------------------------------------------------- --- 289,307 ---- // The derived methods are stored in the "wxLuaDerivedMethods" table in the // lua registry table. ! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_setderivedmethod(lua_State* L, void *pObject, const char *method_name, wxLuaObject* wxlObj); // Is there a derived method given an object and and a method name. // If push_method then push the method onto the stack. // A derived method is when a function or value is set to a wxLua userdata. ! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_hasderivedmethod(lua_State* L, void *pObject, const char *method_name, bool push_method); // When an object is being garbage collected and we call RemoveTrackedObject // object on it, we should also remove any derived functions or values it may have. ! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_removederivedmethod(lua_State* L, void *pObject); ! ! // Get the value of the flag set to determine if a virtual C++ class member ! // function should call it's own base class function or a wxLua derived method. ! WXDLLIMPEXP_WXLUA bool LUACALL wxlua_getcallbaseclassfunction(lua_State*L); ! // Set if the class member function call has a prepended '_' to imply that ! // the user wants the base class function and not the derived method. ! WXDLLIMPEXP_WXLUA void LUACALL wxlua_setcallbaseclassfunction(lua_State*L, bool call_base); //---------------------------------------------------------------------------- *************** *** 310,315 **** bool m_bindings_registered; // Are the bindings registered into the lua_State - bool m_callbase_func; // call the base class function instead of derived func - wxEventType m_inEventType; // wxEventType set when in event, else wxEVT_NULL --- 320,323 ---- |
|
From: John L. <jr...@us...> - 2007-06-25 23:04:07
|
Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv10540/wxLua/modules/wxluadebug/src Modified Files: wxldebug.cpp Log Message: Replace wxLuaState::GetCallBaseClassfunction with wxlua_getcallbaseclassfunction so we no longer need a wxLuaState in the __index func for class objects Better names for the metatable C functions Index: wxldebug.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** wxldebug.cpp 25 Jun 2007 16:07:58 -0000 1.36 --- wxldebug.cpp 25 Jun 2007 23:04:02 -0000 1.37 *************** *** 458,461 **** --- 458,463 ---- else if (udata == &wxlua_lreg_wxluastaterefdata_key) s += wxT(" - wxLuaStateRefData"); + else if (udata == &wxlua_lreg_callbaseclassfunc_key) + s += wxT(" - CallBaseClassFunc"); else if (udata == &wxlua_lreg_metatable_tag_key) |
