From: John L. <jr...@us...> - 2007-06-18 21:41:09
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32406/wxLua/bindings/wxwidgets Modified Files: controls.i gdi.i windows.i wx_datatypes.lua Log Message: Fix last commit of trying to preserve the order of the binding conditions, this way works. Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** windows.i 18 Jun 2007 19:51:26 -0000 1.45 --- windows.i 18 Jun 2007 21:40:32 -0000 1.46 *************** *** 619,623 **** virtual bool AddPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); virtual bool AddSubPage(wxWindow *page, const wxString& text, bool bSelect = false, int imageId = wxNOT_FOUND); - virtual bool DeletePage(size_t pos); virtual bool IsNodeExpanded(size_t pos) const; --- 619,622 ---- Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** wx_datatypes.lua 18 Jun 2007 19:51:26 -0000 1.72 --- wx_datatypes.lua 18 Jun 2007 21:40:33 -0000 1.73 *************** *** 307,311 **** wxAutoBufferedPaintDC = { BaseClass = "wxDC", ! Condition = "(wxCHECK_VERSION(2,8,0)) && (wxCHECK_VERSION(2,8,0))", DefType = "class", IsNumber = false, --- 307,311 ---- wxAutoBufferedPaintDC = { BaseClass = "wxDC", ! Condition = "(wxLUA_USE_wxDC) && (wxCHECK_VERSION(2,8,0))", DefType = "class", [...1140 lines suppressed...] IsNumber = false, --- 3824,3828 ---- wxWindowDC = { BaseClass = "wxDC", ! Condition = "wxLUA_USE_wxDC", DefType = "class", IsNumber = false, *************** *** 3893,3897 **** wxXPMHandler = { BaseClass = "wxImageHandler", ! Condition = "wxCHECK_VERSION(2,8,0) && wxUSE_TGA", DefType = "class", IsNumber = false, --- 3893,3897 ---- wxXPMHandler = { BaseClass = "wxImageHandler", ! Condition = "wxLUA_USE_wxImage && wxUSE_IMAGE", DefType = "class", IsNumber = false, Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** gdi.i 18 Jun 2007 02:56:24 -0000 1.54 --- gdi.i 18 Jun 2007 21:40:31 -0000 1.55 *************** *** 1045,1049 **** %endenum ! %class %delete wxCursor, wxBitmap // just wxObject in GTK %define_object wxNullCursor %rename wxSTANDARD_CURSOR %define_pointer wxLua_wxSTANDARD_CURSOR // hack for wxWidgets >2.7 --- 1045,1049 ---- %endenum ! %class %delete wxCursor, wxObject // wxObject in gtk, wxGDIImage in msw, wxBitmap in osx %define_object wxNullCursor %rename wxSTANDARD_CURSOR %define_pointer wxLua_wxSTANDARD_CURSOR // hack for wxWidgets >2.7 *************** *** 1052,1060 **** wxCursor() - %win|%mac wxCursor(const wxString& cursorName, long type, int hotSpotX = 0, int hotSpotY = 0) wxCursor(int id) wxCursor(const wxImage& image) - //bool Ok() - see wxBitmap //%win WXHANDLE GetHandle() //%win void SetHandle(WXHANDLE handle) --- 1052,1061 ---- wxCursor() wxCursor(int id) wxCursor(const wxImage& image) + %win|%mac wxCursor(const wxString& cursorName, long type, int hotSpotX = 0, int hotSpotY = 0) + + bool Ok() //%win WXHANDLE GetHandle() //%win void SetHandle(WXHANDLE handle) *************** *** 1062,1069 **** %win int GetHeight() %win int GetDepth() ! %win void SetWidth(int width) ! %win void SetHeight(int height) ! %win void SetDepth(int depth) ! %win void SetSize(const wxSize& size) %endclass --- 1063,1070 ---- %win int GetHeight() %win int GetDepth() ! //%win void SetWidth(int width) ! //%win void SetHeight(int height) ! //%win void SetDepth(int depth) ! //%win void SetSize(const wxSize& size) %endclass Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** controls.i 18 Jun 2007 19:51:26 -0000 1.42 --- controls.i 18 Jun 2007 21:40:29 -0000 1.43 *************** *** 657,662 **** void SetSelection(int n) void SetStringSelection(const wxString& string) ! bool Show(bool show = true) ! bool Show(int item, bool show = true) %endclass --- 657,662 ---- void SetSelection(int n) void SetStringSelection(const wxString& string) ! //bool Show(bool show = true) // see wxWindow ! bool Show(int item, bool show) // must specify both for overload %endclass |