Menu
▾
▴
[Wxlua-commit] wxLua/bindings/wxwidgets controls.i,1.16,1.17 datetime.i,1.13,1.14 defsutil.i,1.20,1.21 event.i,1.11,1.12 gdi.i,1.21,1.22 windows.i,1.17,1.18 wx_datatypes.lua,1.26,1.27
|
From: John L. <jr...@us...> - 2006-05-16 04:55:36
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26082/wxLua/bindings/wxwidgets Modified Files: controls.i datetime.i defsutil.i event.i gdi.i windows.i wx_datatypes.lua Log Message: add more classes from 2.6.3 Index: wx_datatypes.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wx_datatypes.lua,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** wx_datatypes.lua 15 May 2006 22:57:29 -0000 1.26 --- wx_datatypes.lua 16 May 2006 04:55:32 -0000 1.27 *************** *** 307,310 **** --- 307,329 ---- Name = "wxBrushList", }, + wxBufferedDC = { + BaseClass = "wxMemoryDC", + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxBufferedDC", + }, + wxBufferedPaintDC = { + BaseClass = "wxBufferedDC", + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxBufferedPaintDC", + }, + wxBusyCursor = { + DefType = "class", + Intrinsic = false, + Name = "wxBusyCursor", + }, wxButton = { BaseClass = "wxControl", *************** *** 353,357 **** }, wxCalendarEvent = { ! BaseClass = "wxEvent", Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", --- 372,376 ---- }, wxCalendarEvent = { ! BaseClass = "wxDateEvent", Condition = "wxLUA_USE_wxCalendarCtrl", DefType = "class", *************** *** 603,606 **** --- 622,632 ---- Name = "wxDataObjectSimple", }, + wxDateEvent = { + BaseClass = "wxCommandEvent", + Condition = "wxLUA_USE_wxCalendarCtrl", + DefType = "class", + Intrinsic = false, + Name = "wxDateEvent", + }, wxDateSpan = { Condition = "wxLUA_USE_wxDateSpan", *************** *** 1444,1447 **** --- 1470,1479 ---- Name = "wxIcon", }, + wxIconizeEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxIconizeEvent", + }, wxIdleEvent = { BaseClass = "wxEvent", *************** *** 1744,1747 **** --- 1776,1785 ---- Name = "wxMask", }, + wxMaximizeEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxMaximizeEvent", + }, wxMemoryDC = { BaseClass = "wxDC", *************** *** 1819,1822 **** --- 1857,1873 ---- Name = "wxMiniFrame", }, + wxMirrorDC = { + BaseClass = "wxDC", + Condition = "wxLUA_USE_wxDC", + DefType = "class", + Intrinsic = false, + Name = "wxMirrorDC", + }, + wxMouseCaptureChangedEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxMouseCaptureChangedEvent", + }, wxMouseEvent = { BaseClass = "wxEvent", *************** *** 2279,2282 **** --- 2330,2339 ---- Name = "wxSeekMode", }, + wxSetCursorEvent = { + BaseClass = "wxEvent", + DefType = "class", + Intrinsic = false, + Name = "wxSetCursorEvent", + }, wxSignal = { DefType = "enum", *************** *** 2661,2664 **** --- 2718,2728 ---- Name = "wxTimerEvent", }, + wxToggleButton = { + BaseClass = "wxControl", + Condition = "wxLUA_USE_wxButton", + DefType = "class", + Intrinsic = false, + Name = "wxToggleButton", + }, wxToolBar = { BaseClass = "wxToolBarBase", *************** *** 2835,2838 **** --- 2899,2908 ---- Name = "wxWindow", }, + wxWindowCreateEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + Intrinsic = false, + Name = "wxWindowCreateEvent", + }, wxWindowDC = { BaseClass = "wxDC", *************** *** 2842,2845 **** --- 2912,2926 ---- Name = "wxWindowDC", }, + wxWindowDestroyEvent = { + BaseClass = "wxCommandEvent", + DefType = "class", + Intrinsic = false, + Name = "wxWindowDestroyEvent", + }, + wxWindowDisabler = { + DefType = "class", + Intrinsic = false, + Name = "wxWindowDisabler", + }, wxWindowID = { DefType = "wxtypedef", Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** windows.i 6 May 2006 19:54:31 -0000 1.17 --- windows.i 16 May 2006 04:55:32 -0000 1.18 *************** *** 9,12 **** --- 9,22 ---- /////////////////////////////////////////////////////////////////////////////// + // wxWindowDisabler + + %include "wx/utils.h" + + %class %delete %noclassinfo %encapsulate wxWindowDisabler + // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough + wxWindowDisabler(wxWindow *winToSkip = NULL) + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxWindow %define wxSIMPLE_BORDER Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** gdi.i 16 May 2006 03:32:28 -0000 1.21 --- gdi.i 16 May 2006 04:55:32 -0000 1.22 *************** *** 1086,1089 **** --- 1086,1122 ---- %endclass + /////////////////////////////////////////////////////////////////////////////// + // wxBufferedDC + + %include "wx/dcbuffer.h" + + %class %delete wxBufferedDC, wxMemoryDC + wxBufferedDC() + %constructor wxBufferedDCFromSize(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) + %constructor wxBufferedDCFromBitmap(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) + + void Init(wxDC *dc, const wxSize& area, int style = wxBUFFER_CLIENT_AREA) + %rename InitFromBitmap void Init(wxDC *dc, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxBufferedPaintDC + + %include "wx/dcbuffer.h" + + %class %delete wxBufferedPaintDC, wxBufferedDC + wxBufferedPaintDC(wxWindow *window, int style = wxBUFFER_CLIENT_AREA) + %constructor wxBufferedPaintDCFromBitmap(wxWindow *window, const wxBitmap& buffer, int style = wxBUFFER_CLIENT_AREA) + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxMirrorDC + + %include "wx/dcmirror.h" + + %class %delete wxMirrorDC, wxDC + wxMirrorDC(wxDC& dc, bool mirror) + %endclass + %endif wxLUA_USE_wxDC Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** datetime.i 16 May 2006 03:32:28 -0000 1.13 --- datetime.i 16 May 2006 04:55:32 -0000 1.14 *************** *** 435,443 **** /////////////////////////////////////////////////////////////////////////////// // wxCalendarEvent %include "wx/event.h" ! %class %delete wxCalendarEvent, wxEvent %define %event wxEVT_CALENDAR_SEL_CHANGED %define %event wxEVT_CALENDAR_DAY_CHANGED --- 435,455 ---- /////////////////////////////////////////////////////////////////////////////// + // wxDateEvent + + %class %delete wxDateEvent, wxCommandEvent + wxDateEvent(wxWindow *win, const wxDateTime& dt, wxEventType type) + + const wxDateTime& GetDate() const + void SetDate(const wxDateTime &date) + + %property=Date, read + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxCalendarEvent %include "wx/event.h" ! %class %delete wxCalendarEvent, wxDateEvent %define %event wxEVT_CALENDAR_SEL_CHANGED %define %event wxEVT_CALENDAR_DAY_CHANGED *************** *** 448,456 **** wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type) ! const wxDateTime& GetDate() const wxDateTime::WeekDay GetWeekDay() const ! %property=Date, read ! %property=WeekDay, read %endclass --- 460,468 ---- wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type) ! wxDateTime::WeekDay GetWeekDay() const + void SetWeekDay(const wxDateTime::WeekDay wd) ! %property=WeekDay, read, write %endclass Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** controls.i 7 May 2006 14:27:35 -0000 1.16 --- controls.i 16 May 2006 04:55:32 -0000 1.17 *************** *** 26,37 **** bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton") - wxString GetLabel() const static wxSize GetDefaultSize() - void SetDefault() ! void SetLabel(const wxString& label) %property=DefaultSize, read - %property=Label, read, write %endclass --- 26,36 ---- bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxButton") static wxSize GetDefaultSize() void SetDefault() ! ! //wxString GetLabel() const in wxWindow ! //void SetLabel(const wxString& label) in wxWindow %property=DefaultSize, read %endclass *************** *** 66,69 **** --- 65,88 ---- /////////////////////////////////////////////////////////////////////////////// + // wxToggleButton + + %if wxLUA_USE_wxButton + + %include "wx/tglbtn.h" + + %class wxToggleButton, wxControl + wxToggleButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxToggleButton") + + bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxToggleButton") + void SetValue(bool state) + bool GetValue() const + + //wxString GetLabel() const in wxWindow + //void SetLabel(const wxString& label) in wxWindow + %endclass + + %endif wxLUA_USE_wxButton + + /////////////////////////////////////////////////////////////////////////////// // wxCheckBox Index: defsutil.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/defsutil.i,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** defsutil.i 6 May 2006 16:58:29 -0000 1.20 --- defsutil.i 16 May 2006 04:55:32 -0000 1.21 *************** *** 559,560 **** --- 559,570 ---- wxBG_STYLE_CUSTOM %endenum + + /////////////////////////////////////////////////////////////////////////////// + // wxBusyCursor + + %include "wx/utils.h" + + %class %delete %noclassinfo %encapsulate wxBusyCursor + // NOTE: ALWAYS Delete() this when done since lua's gc may not delete it soon enough + wxBusyCursor(const wxCursor* cursor = wxHOURGLASS_CURSOR) + %endclass Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** event.i 1 May 2006 19:36:30 -0000 1.11 --- event.i 16 May 2006 04:55:32 -0000 1.12 *************** *** 504,507 **** --- 504,520 ---- /////////////////////////////////////////////////////////////////////////////// + // wxMouseCaptureChangedEvent + + %include "wx/event.h" + + %class %delete wxMouseCaptureChangedEvent, wxEvent + %define %event wxEVT_MOUSE_CAPTURE_CHANGED + + wxMouseCaptureChangedEvent(wxWindowID winid = 0, wxWindow* gainedCapture = NULL) + + wxWindow* GetCapturedWindow() const + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxMoveEvent *************** *** 613,616 **** --- 626,676 ---- /////////////////////////////////////////////////////////////////////////////// + // wxIconizeEvent + + %include "wx/event.h" + + %class %delete wxIconizeEvent, wxEvent + %define %event wxEVT_ICONIZE + + wxIconizeEvent(int winid = 0, bool iconized = true) + + bool Iconized() const + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxMaximizeEvent + + %include "wx/event.h" + + %class %delete wxMaximizeEvent, wxEvent + %define %event wxEVT_MAXIMIZE + + wxMaximizeEvent(int winid = 0) + + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxWindowCreateEvent + + %class wxWindowCreateEvent, wxCommandEvent + %define %event wxEVT_CREATE + + wxWindowCreateEvent(wxWindow *win = NULL) + + wxWindow *GetWindow() const + %endclass + + /////////////////////////////////////////////////////////////////////////////// + // wxWindowDestroyEvent + + %class wxWindowDestroyEvent, wxCommandEvent + %define %event wxEVT_DESTROY + + wxWindowDestroyEvent(wxWindow *win = NULL) + + wxWindow *GetWindow() const + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxSysColourChangedEvent *************** *** 624,627 **** --- 684,705 ---- /////////////////////////////////////////////////////////////////////////////// + // wxSetCursorEvent + + %include "wx/event.h" + + %class %delete wxSetCursorEvent, wxEvent + %define %event wxEVT_SET_CURSOR + + wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0) + + wxCoord GetX() const + wxCoord GetY() const + void SetCursor(const wxCursor& cursor) + wxCursor GetCursor() const + bool HasCursor() const + + %endclass + + /////////////////////////////////////////////////////////////////////////////// // wxUpdateUIEvent |
