Menu
▾
▴
wxlua-commit
|
From: John L. <jr...@us...> - 2007-06-11 03:58:34
|
Update of /cvsroot/wxlua/wxLua/bindings/wxwidgets In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19140/wxLua/bindings/wxwidgets Modified Files: appframe.i clipdrag.i controls.i data.i datetime.i dialogs.i event.i file.i gdi.i grid.i html.i menutool.i override.hpp socket.i wave.i windows.i wxlua.i Log Message: Remove wxArrayString_FromLuaTable and wxArrayInt_FromLuaTable binding tag since we convert from wxArrayInt/String automatically Fix listctrl sorting Fix validator code using wxLuaObject Rename wxLuaState::LuaCall to LuaPCall since that what it calls Lots more cleanup and shuffling of code to more appropriate places Index: wave.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wave.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wave.i 31 May 2007 17:18:47 -0000 1.17 --- wave.i 11 Jun 2007 03:57:59 -0000 1.18 *************** *** 123,132 **** %class %delete wxMediaEvent, wxNotifyEvent ! %define_event wxEVT_MEDIA_FINISHED ! %define_event wxEVT_MEDIA_STOP ! %define_event wxEVT_MEDIA_LOADED ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_STATECHANGED ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_PLAY ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_PAUSE wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) --- 123,132 ---- %class %delete wxMediaEvent, wxNotifyEvent ! %define_event wxEVT_MEDIA_FINISHED // EVT_MEDIA_FINISHED(winid, fn) ! %define_event wxEVT_MEDIA_STOP // EVT_MEDIA_STOP(winid, fn) ! %define_event wxEVT_MEDIA_LOADED // EVT_MEDIA_LOADED(winid, fn) ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_STATECHANGED // EVT_MEDIA_STATECHANGED(winid, fn) ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_PLAY // EVT_MEDIA_PLAY(winid, fn) ! %wxchkver_2_6_4 %define_event wxEVT_MEDIA_PAUSE // EVT_MEDIA_PAUSE(winid, fn) wxMediaEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) *************** *** 208,215 **** %class %delete wxJoystickEvent, wxEvent ! %define_event wxEVT_JOY_BUTTON_DOWN ! %define_event wxEVT_JOY_BUTTON_UP ! %define_event wxEVT_JOY_MOVE ! %define_event wxEVT_JOY_ZMOVE wxJoystickEvent(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0) --- 208,215 ---- %class %delete wxJoystickEvent, wxEvent ! %define_event wxEVT_JOY_BUTTON_DOWN // EVT_JOY_BUTTON_DOWN(func) ! %define_event wxEVT_JOY_BUTTON_UP // EVT_JOY_BUTTON_UP(func) ! %define_event wxEVT_JOY_MOVE // EVT_JOY_MOVE(func) ! %define_event wxEVT_JOY_ZMOVE // EVT_JOY_ZMOVE(func) wxJoystickEvent(wxEventType eventType = wxEVT_NULL, int state = 0, int joystick = wxJOYSTICK1, int change = 0) Index: html.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/html.i,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** html.i 1 Jun 2007 18:19:46 -0000 1.19 --- html.i 11 Jun 2007 03:57:59 -0000 1.20 *************** *** 306,312 **** %class wxSimpleHtmlListBox, wxHtmlWindowInterface //: public wxHtmlListBox, public wxItemContainer wxSimpleHtmlListBox() ! wxSimpleHtmlListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, const wxArrayString_FromLuaTable& choices, long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSimpleHtmlListBox") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, const wxArrayString_FromLuaTable& choices, long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSimpleHtmlListBox") void SetSelection(int n) int GetSelection() const --- 306,312 ---- %class wxSimpleHtmlListBox, wxHtmlWindowInterface //: public wxHtmlListBox, public wxItemContainer wxSimpleHtmlListBox() ! wxSimpleHtmlListBox(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, const wxArrayString& choices, long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSimpleHtmlListBox") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, const wxArrayString& choices, long style = wxHLB_DEFAULT_STYLE, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxSimpleHtmlListBox") void SetSelection(int n) int GetSelection() const *************** *** 317,321 **** virtual void Clear() virtual void Delete(unsigned int n) ! void Append(const wxArrayString_FromLuaTable& strings) int Append(const wxString& item) //int Append(const wxString& item, void *clientData) --- 317,321 ---- virtual void Clear() virtual void Delete(unsigned int n) ! void Append(const wxArrayString& strings) int Append(const wxString& item) //int Append(const wxString& item, void *clientData) Index: dialogs.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/dialogs.i,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** dialogs.i 1 Jun 2007 18:19:46 -0000 1.30 --- dialogs.i 11 Jun 2007 03:57:58 -0000 1.31 *************** *** 70,75 **** wxUSE_TEXTDLG %function wxString wxGetTextFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true) // int wxGetMultipleChoice(const wxString& message, const wxString& caption, int n, const wxString& choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! wxUSE_CHOICEDLG %function wxString wxGetSingleChoice(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT) ! wxUSE_CHOICEDLG %function int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT) %function bool wxIsBusy() %function int wxMessageBox(const wxString& message, const wxString& caption = "Message", int style = wxOK | wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1) --- 70,75 ---- wxUSE_TEXTDLG %function wxString wxGetTextFromUser(const wxString& message, const wxString& caption = "Input text", const wxString& default_value = "", wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true) // int wxGetMultipleChoice(const wxString& message, const wxString& caption, int n, const wxString& choices[], int nsel, int *selection, wxWindow *parent = NULL, int x = -1, int y = -1, bool centre = true, int width=150, int height=200) ! wxUSE_CHOICEDLG %function wxString wxGetSingleChoice(const wxString& message, const wxString& caption, const wxArrayString& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT) ! wxUSE_CHOICEDLG %function int wxGetSingleChoiceIndex(const wxString& message, const wxString& caption, const wxArrayString& choices, wxWindow *parent = NULL, int x = wxDefaultCoord, int y = wxDefaultCoord, bool centre = true, int width = wxCHOICE_WIDTH, int height = wxCHOICE_HEIGHT) %function bool wxIsBusy() %function int wxMessageBox(const wxString& message, const wxString& caption = "Message", int style = wxOK | wxCENTRE, wxWindow *parent = NULL, int x = -1, int y = -1) *************** *** 160,179 **** wxString GetWebSiteDescription() const ! void SetDevelopers(const wxArrayString_FromLuaTable& developers) void AddDeveloper(const wxString& developer) bool HasDevelopers() const const wxArrayString& GetDevelopers() const ! void SetDocWriters(const wxArrayString_FromLuaTable& docwriters) void AddDocWriter(const wxString& docwriter) bool HasDocWriters() const wxArrayString GetDocWriters() const ! void SetArtists(const wxArrayString_FromLuaTable& artists) void AddArtist(const wxString& artist) bool HasArtists() const wxArrayString GetArtists() const ! void SetTranslators(const wxArrayString_FromLuaTable& translators) void AddTranslator(const wxString& translator) bool HasTranslators() const --- 160,179 ---- wxString GetWebSiteDescription() const ! void SetDevelopers(const wxArrayString& developers) void AddDeveloper(const wxString& developer) bool HasDevelopers() const const wxArrayString& GetDevelopers() const ! void SetDocWriters(const wxArrayString& docwriters) void AddDocWriter(const wxString& docwriter) bool HasDocWriters() const wxArrayString GetDocWriters() const ! void SetArtists(const wxArrayString& artists) void AddArtist(const wxString& artist) bool HasArtists() const wxArrayString GetArtists() const ! void SetTranslators(const wxArrayString& translators) void AddTranslator(const wxString& translator) bool HasTranslators() const *************** *** 315,319 **** %class wxMultiChoiceDialog, wxDialog ! wxMultiChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) wxArrayInt GetSelections() const // FIXME --- 315,319 ---- %class wxMultiChoiceDialog, wxDialog ! wxMultiChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) wxArrayInt GetSelections() const // FIXME *************** *** 330,336 **** %class wxSingleChoiceDialog, wxDialog ! // %override wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! // C++ Func: wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString_FromLuaTable& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) int GetSelection() const --- 330,336 ---- %class wxSingleChoiceDialog, wxDialog ! // %override wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! // C++ Func: wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) ! wxSingleChoiceDialog(wxWindow* parent, const wxString& message, const wxString& caption, const wxArrayString& choices, void** clientData = NULL, long style = wxCHOICEDLG_STYLE, const wxPoint& pos = wxDefaultPosition) int GetSelection() const *************** *** 454,462 **** %class %delete wxFindDialogEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_FIND ! %define_event wxEVT_COMMAND_FIND_NEXT ! %define_event wxEVT_COMMAND_FIND_REPLACE ! %define_event wxEVT_COMMAND_FIND_REPLACE_ALL ! %define_event wxEVT_COMMAND_FIND_CLOSE wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0) --- 454,462 ---- %class %delete wxFindDialogEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_FIND // EVT_FIND(id, fn) ! %define_event wxEVT_COMMAND_FIND_NEXT // EVT_FIND_NEXT(id, fn) ! %define_event wxEVT_COMMAND_FIND_REPLACE // EVT_FIND_REPLACE(id, fn) ! %define_event wxEVT_COMMAND_FIND_REPLACE_ALL // EVT_FIND_REPLACE_ALL(id, fn) ! %define_event wxEVT_COMMAND_FIND_CLOSE // EVT_FIND_CLOSE(id, fn) wxFindDialogEvent(wxEventType commandType = wxEVT_NULL, int id = 0) *************** *** 596,604 **** %class %delete wxWizardEvent, wxNotifyEvent ! %define_event wxEVT_WIZARD_CANCEL ! %define_event wxEVT_WIZARD_PAGE_CHANGED ! %define_event wxEVT_WIZARD_PAGE_CHANGING ! %define_event wxEVT_WIZARD_HELP ! %define_event wxEVT_WIZARD_FINISHED wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1, bool direction = true) --- 596,604 ---- %class %delete wxWizardEvent, wxNotifyEvent ! %define_event wxEVT_WIZARD_CANCEL // EVT_WIZARD_CANCEL(id, fn) ! %define_event wxEVT_WIZARD_PAGE_CHANGED // EVT_WIZARD_PAGE_CHANGED(id, fn) ! %define_event wxEVT_WIZARD_PAGE_CHANGING // EVT_WIZARD_PAGE_CHANGING(id, fn) ! %define_event wxEVT_WIZARD_HELP // EVT_WIZARD_HELP(id, fn) ! %define_event wxEVT_WIZARD_FINISHED // EVT_WIZARD_FINISHED(id, fn) wxWizardEvent(wxEventType type = wxEVT_NULL, int id = -1, bool direction = true) Index: file.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/file.i,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** file.i 1 Jun 2007 18:19:46 -0000 1.23 --- file.i 11 Jun 2007 03:57:59 -0000 1.24 *************** *** 90,94 **** !%wxchkver_2_8 void Add(const wxString& path) %wxchkver_2_8 bool Add(const wxString& path) ! %wxchkver_2_8 void Add(const wxArrayString_FromLuaTable& paths) // Find the first full path for which the file exists wxString FindValidPath(const wxString& filename) const --- 90,94 ---- !%wxchkver_2_8 void Add(const wxString& path) %wxchkver_2_8 bool Add(const wxString& path) ! %wxchkver_2_8 void Add(const wxArrayString& paths) // Find the first full path for which the file exists wxString FindValidPath(const wxString& filename) const Index: windows.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/windows.i,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** windows.i 6 Jun 2007 15:20:15 -0000 1.37 --- windows.i 11 Jun 2007 03:57:59 -0000 1.38 *************** *** 153,157 **** virtual wxWindow* GetParent() const ! // %override [int x, int y] GetPosition(int x, int y) const // C++ Func: virtual void GetPosition(int* x, int* y) const %override_name wxLua_wxWindow_GetPositionXY %rename GetPositionXY virtual void GetPosition() const --- 153,157 ---- virtual wxWindow* GetParent() const ! // %override [int x, int y] GetPosition() const // C++ Func: virtual void GetPosition(int* x, int* y) const %override_name wxLua_wxWindow_GetPositionXY %rename GetPositionXY virtual void GetPosition() const *************** *** 159,162 **** --- 159,169 ---- wxPoint GetPosition() const virtual wxRect GetRect() const + + // %override [int x, int y] GetScreenPosition() const + // C++ Func: virtual void GetScreenPosition(int* x, int* y) const + %override_name wxLua_wxWindow_GetScreenPositionXY %rename GetScreenPositionXY virtual void GetScreenPosition() const + + virtual wxPoint GetScreenPosition() + virtual wxRect GetScreenRect() const virtual int GetScrollPos(int orientation) virtual int GetScrollRange(int orientation) *************** *** 496,501 **** %class %delete wxNotebookEvent, wxBookCtrlBaseEvent ! %define_event wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED ! %define_event wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING wxNotebookEvent(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1) --- 503,508 ---- %class %delete wxNotebookEvent, wxBookCtrlBaseEvent ! %define_event wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED // EVT_NOTEBOOK_PAGE_CHANGED(winid, fn) ! %define_event wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING // EVT_NOTEBOOK_PAGE_CHANGING(winid, fn) wxNotebookEvent(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1) *************** *** 540,545 **** %class %delete wxListbookEvent, wxBookCtrlBaseEvent ! %define_event wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED ! %define_event wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING wxListbookEvent(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1) --- 547,552 ---- %class %delete wxListbookEvent, wxBookCtrlBaseEvent ! %define_event wxEVT_COMMAND_LISTBOOK_PAGE_CHANGED // EVT_LISTBOOK_PAGE_CHANGED(winid, fn) ! %define_event wxEVT_COMMAND_LISTBOOK_PAGE_CHANGING // EVT_LISTBOOK_PAGE_CHANGING(winid, fn) wxListbookEvent(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1) *************** *** 584,589 **** %class %delete wxChoicebookEvent, wxBookCtrlBaseEvent ! %define_event wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED ! %define_event wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING wxChoicebookEvent(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1) --- 591,596 ---- %class %delete wxChoicebookEvent, wxBookCtrlBaseEvent ! %define_event wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGED // EVT_CHOICEBOOK_PAGE_CHANGED(winid, fn) ! %define_event wxEVT_COMMAND_CHOICEBOOK_PAGE_CHANGING // EVT_CHOICEBOOK_PAGE_CHANGING(winid, fn) wxChoicebookEvent(wxEventType eventType = wxEVT_NULL, int id = 0, int sel = -1, int oldSel = -1) *************** *** 644,649 **** %class %delete wxTabEvent, wxCommandEvent ! %win %define_event wxEVT_COMMAND_TAB_SEL_CHANGED ! %win %define_event wxEVT_COMMAND_TAB_SEL_CHANGING wxTabEvent(wxEventType commandType = 0, int id = 0) --- 651,656 ---- %class %delete wxTabEvent, wxCommandEvent ! %win %define_event wxEVT_COMMAND_TAB_SEL_CHANGED // EVT_TAB_SEL_CHANGED(id, fn) ! %win %define_event wxEVT_COMMAND_TAB_SEL_CHANGING // EVT_TAB_SEL_CHANGING(id, fn) wxTabEvent(wxEventType commandType = 0, int id = 0) *************** *** 747,752 **** %class %delete wxQueryLayoutInfoEvent, wxEvent ! %define_event wxEVT_QUERY_LAYOUT_INFO ! %define_event wxEVT_CALCULATE_LAYOUT wxQueryLayoutInfoEvent(wxWindowID id = 0) --- 754,758 ---- %class %delete wxQueryLayoutInfoEvent, wxEvent ! %define_event wxEVT_QUERY_LAYOUT_INFO // EVT_QUERY_LAYOUT_INFO(func) wxQueryLayoutInfoEvent(wxWindowID id = 0) *************** *** 770,774 **** %class %delete wxCalculateLayoutEvent, wxEvent ! %define_event wxEVT_CALCULATE_LAYOUT wxCalculateLayoutEvent(wxWindowID id = 0) --- 776,780 ---- %class %delete wxCalculateLayoutEvent, wxEvent ! %define_event wxEVT_CALCULATE_LAYOUT // EVT_CALCULATE_LAYOUT(func) wxCalculateLayoutEvent(wxWindowID id = 0) *************** *** 784,788 **** %class %delete wxSashEvent, wxCommandEvent ! %define_event wxEVT_SASH_DRAGGED wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) --- 790,794 ---- %class %delete wxSashEvent, wxCommandEvent ! %define_event wxEVT_SASH_DRAGGED // EVT_SASH_DRAGGED(id, fn) EVT_SASH_DRAGGED_RANGE(id1, id2, fn) wxSashEvent(int id = 0, wxSashEdgePosition edge = wxSASH_NONE) *************** *** 890,897 **** %class %delete wxSplitterEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING ! %define_event wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED ! %define_event wxEVT_COMMAND_SPLITTER_DOUBLECLICKED ! %define_event wxEVT_COMMAND_SPLITTER_UNSPLIT wxSplitterEvent(wxEventType type = wxEVT_NULL, wxSplitterWindow *splitter = NULL) --- 896,903 ---- %class %delete wxSplitterEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING // EVT_SPLITTER_SASH_POS_CHANGING(id, fn) ! %define_event wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED // EVT_SPLITTER_SASH_POS_CHANGED(id, fn) ! %define_event wxEVT_COMMAND_SPLITTER_DOUBLECLICKED // EVT_SPLITTER_DCLICK(id, fn) ! %define_event wxEVT_COMMAND_SPLITTER_UNSPLIT // EVT_SPLITTER_UNSPLIT(id, fn) wxSplitterEvent(wxEventType type = wxEVT_NULL, wxSplitterWindow *splitter = NULL) Index: gdi.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/gdi.i,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** gdi.i 8 Jun 2007 01:36:22 -0000 1.49 --- gdi.i 11 Jun 2007 03:57:59 -0000 1.50 *************** *** 478,482 **** // first valid facename returned by wxFontEnumerator::GetFacenames(). // Does not return a bool since it cannot fail. ! %wxchkver_2_8 void SetFaceName(const wxArrayString_FromLuaTable& facenames) // it is important to be able to serialize wxNativeFontInfo objects to be --- 478,482 ---- // first valid facename returned by wxFontEnumerator::GetFacenames(). // Does not return a bool since it cannot fail. ! %wxchkver_2_8 void SetFaceName(const wxArrayString& facenames) // it is important to be able to serialize wxNativeFontInfo objects to be Index: menutool.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/menutool.i,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** menutool.i 1 Jun 2007 18:19:46 -0000 1.17 --- menutool.i 11 Jun 2007 03:57:59 -0000 1.18 *************** *** 168,174 **** %class %delete wxMenuEvent, wxEvent ! %define_event wxEVT_MENU_HIGHLIGHT ! %define_event wxEVT_MENU_OPEN ! %define_event wxEVT_MENU_CLOSE wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0, wxMenu* menu = NULL) --- 168,174 ---- %class %delete wxMenuEvent, wxEvent ! %define_event wxEVT_MENU_HIGHLIGHT // EVT_MENU_HIGHLIGHT(winid, func) EVT_MENU_HIGHLIGHT_ALL(func) ! %define_event wxEVT_MENU_OPEN // EVT_MENU_OPEN(func) ! %define_event wxEVT_MENU_CLOSE // EVT_MENU_CLOSE(func) wxMenuEvent(wxEventType type = wxEVT_NULL, int id = 0, wxMenu* menu = NULL) Index: data.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/data.i,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** data.i 31 May 2007 21:38:38 -0000 1.28 --- data.i 11 Jun 2007 03:57:58 -0000 1.29 *************** *** 106,109 **** --- 106,112 ---- %define_object wxDefaultValidator + // No constructor as this is a base class + + static bool IsSilent() wxWindow* GetWindow() const static void SetBellOnError(bool doIt = true) *************** *** 132,137 **** %class %delete wxTextValidator, wxValidator ! // %override wxTextValidator constructor use as is ! wxTextValidator(long style = wxFILTER_NONE, wxString *valPtr = NULL) %wxchkver_2_5 wxArrayString& GetExcludes() --- 135,141 ---- %class %delete wxTextValidator, wxValidator ! // %override wxTextValidator(long style = wxFILTER_NONE, wxLuaObject* obj) ! // C++ Func: wxTextValidator(long style = wxFILTER_NONE, wxString *valPtr = NULL) ! wxTextValidator(long style = wxFILTER_NONE, wxLuaObject* stringObj = NULL) %wxchkver_2_5 wxArrayString& GetExcludes() *************** *** 157,172 **** %include "wx/valgen.h" ! %class %delete %noclassinfo wxGenericValidator, wxValidator // FIXME test this ! // %override wxGenericValidatorBool for wxCheckBox and wxRadioButton, input is wxLuaObject ? ! %rename wxGenericValidatorBool wxGenericValidator(bool *boolPtr) // for wxButton and wxComboBox, wxStaticText and wxTextCtrl ! %rename wxGenericValidatorString wxGenericValidator(wxString *valPtr) // for wxGauge, wxScrollBar, wxRadioBox, wxSpinButton, wxChoice ! %rename wxGenericValidatorInt wxGenericValidator(int *valPtr) // for wxListBox and wxCheckListBox ! %rename wxGenericValidatorArray wxGenericValidator(wxArrayInt *valPtr) %endclass --- 161,186 ---- %include "wx/valgen.h" ! %class %delete %noclassinfo wxGenericValidator, wxValidator ! // See the validator.wx.lua sample for usage of this class + // %override wxGenericValidatorBool(wxLuaObject* boolObj) + // C++ Func: wxGenericValidator(bool *boolPtr) + // for wxCheckBox and wxRadioButton + %rename wxGenericValidatorBool wxGenericValidator(wxLuaObject* boolObj) + + // %override wxGenericValidatorString(wxLuaObject* stringObj) + // C++ Func: wxGenericValidator(wxString *valPtr) // for wxButton and wxComboBox, wxStaticText and wxTextCtrl ! %rename wxGenericValidatorString wxGenericValidator(wxLuaObject* stringObj) + // %override wxGenericValidatorInt(wxLuaObject* intObj) + // C++ Func: wxGenericValidator(int *valPtr) // for wxGauge, wxScrollBar, wxRadioBox, wxSpinButton, wxChoice ! %rename wxGenericValidatorInt wxGenericValidator(wxLuaObject* intObj) + // %override wxGenericValidatorArrayInt(wxLuaObject* intTableObj) + // C++ Func: wxGenericValidator(wxArrayInt *valPtr) // for wxListBox and wxCheckListBox ! %rename wxGenericValidatorArrayInt wxGenericValidator(wxLuaObject* intTableObj) %endclass *************** *** 254,258 **** wxArrayInt() wxArrayInt(const wxArrayInt& array) - wxArrayInt(const wxArrayInt_FromLuaTable& array) // %override [lua table] wxArrayInt::ToLuaTable() const --- 268,271 ---- *************** *** 285,289 **** wxArrayString() wxArrayString(const wxArrayString& array) - wxArrayString(const wxArrayString_FromLuaTable& array) // %override [lua table] wxArrayString::ToLuaTable() const --- 298,301 ---- *************** *** 315,319 **** wxSortedArrayString() wxSortedArrayString(const wxSortedArrayString& src) - wxSortedArrayString(const wxArrayString_FromLuaTable& array) %endclass --- 327,330 ---- Index: datetime.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/datetime.i,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** datetime.i 1 Jun 2007 18:19:46 -0000 1.27 --- datetime.i 11 Jun 2007 03:57:58 -0000 1.28 *************** *** 365,369 **** %class %delete wxTimerEvent, wxEvent ! %define_event wxEVT_TIMER int GetInterval() const --- 365,369 ---- %class %delete wxTimerEvent, wxEvent ! %define_event wxEVT_TIMER // EVT_TIMER(id, fn) int GetInterval() const *************** *** 466,470 **** %class %delete wxDateEvent, wxCommandEvent ! %define_event wxEVT_DATE_CHANGED wxDateEvent(wxWindow *win, const wxDateTime& dt, wxEventType type) --- 466,470 ---- %class %delete wxDateEvent, wxCommandEvent ! %define_event wxEVT_DATE_CHANGED // EVT_DATE_CHANGED(id, fn) wxDateEvent(wxWindow *win, const wxDateTime& dt, wxEventType type) *************** *** 480,489 **** %class %delete wxCalendarEvent, wxDateEvent ! %define_event wxEVT_CALENDAR_SEL_CHANGED ! %define_event wxEVT_CALENDAR_DAY_CHANGED ! %define_event wxEVT_CALENDAR_MONTH_CHANGED ! %define_event wxEVT_CALENDAR_YEAR_CHANGED ! %define_event wxEVT_CALENDAR_DOUBLECLICKED ! %define_event wxEVT_CALENDAR_WEEKDAY_CLICKED wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type) --- 480,489 ---- %class %delete wxCalendarEvent, wxDateEvent ! %define_event wxEVT_CALENDAR_SEL_CHANGED // EVT_CALENDAR_SEL_CHANGED(id, fn) ! %define_event wxEVT_CALENDAR_DAY_CHANGED // EVT_CALENDAR_DAY(id, fn) ! %define_event wxEVT_CALENDAR_MONTH_CHANGED // EVT_CALENDAR_MONTH(id, fn) ! %define_event wxEVT_CALENDAR_YEAR_CHANGED // EVT_CALENDAR_YEAR(id, fn) ! %define_event wxEVT_CALENDAR_DOUBLECLICKED // EVT_CALENDAR(id, fn) ! %define_event wxEVT_CALENDAR_WEEKDAY_CLICKED // EVT_CALENDAR_WEEKDAY_CLICKED(id, fn) wxCalendarEvent(wxCalendarCtrl *cal, wxEventType type) Index: socket.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/socket.i,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** socket.i 1 Jun 2007 18:19:46 -0000 1.13 --- socket.i 11 Jun 2007 03:57:59 -0000 1.14 *************** *** 141,145 **** %class %delete wxSocketEvent, wxEvent ! %define_event wxEVT_SOCKET wxSocketEvent(int id = 0) --- 141,145 ---- %class %delete wxSocketEvent, wxEvent ! %define_event wxEVT_SOCKET // EVT_SOCKET(id, func) wxSocketEvent(int id = 0) Index: wxlua.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/wxlua.i,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wxlua.i 8 Jun 2007 22:50:09 -0000 1.22 --- wxlua.i 11 Jun 2007 03:57:59 -0000 1.23 *************** *** 32,35 **** --- 32,48 ---- %endenum + %define WXLUAARG_None + %define WXLUAARG_Nil + %define WXLUAARG_Boolean + %define WXLUAARG_LightUserData + %define WXLUAARG_Number + %define WXLUAARG_String + %define WXLUAARG_LuaTable + %define WXLUAARG_LuaFunction + %define WXLUAARG_UserData + %define WXLUAARG_LuaThread + %define WXLUAARG_Enum + + // Is this lua_type() (or in lua type()) considered %function int wxlua_iswxluatype(int luatype, int wxluaarg_tag) *************** *** 164,170 **** %class %delete wxLuaObject, wxObject ! wxLuaObject() // the wxLuaState is the calling lua_State ! void SetObject(int iParam = 1) // the stack index to make the object for ! void GetObject() const // get the object, note C++ returns bool, this "returns" the object on the stack int GetAllocationFlags() const --- 177,200 ---- %class %delete wxLuaObject, wxObject ! // %override wxLuaObject(any value type) ! // C++ Func: wxLuaObject(const wxLuaState& wxlState, int stack_idx = 1) ! // Wrap the single value passed in with a wxLuaObject ! wxLuaObject() ! ! // %override void wxLuaObject::SetObject(any value type) ! // C++ Func: void SetObject(int stack_idx = 1) ! // Discard the old reference and create a new one for the item passed in ! void SetObject() ! ! // %override [any value type] wxLuaObject::GetObject() ! // C++ Func: bool GetObject() ! // get the object, note C++ returns bool, this "returns" the referenced object ! void GetObject() const ! ! // these are used to verify that things are working ! //bool *GetBoolPtr(); ! //int *GetIntPtr(); ! //wxString *GetStringPtr(); ! //wxArrayInt *GetArrayPtr(); int GetAllocationFlags() const *************** *** 226,230 **** %class %delete wxLuaHtmlWinTagEvent, wxEvent ! %define_event wxEVT_HTML_TAG_HANDLER const wxHtmlTag *GetHtmlTag() const --- 256,260 ---- %class %delete wxLuaHtmlWinTagEvent, wxEvent ! %define_event wxEVT_HTML_TAG_HANDLER // EVT_HTML_TAG_HANDLER(id, fn) const wxHtmlTag *GetHtmlTag() const Index: controls.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/controls.i,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** controls.i 1 Jun 2007 18:19:46 -0000 1.36 --- controls.i 11 Jun 2007 03:57:58 -0000 1.37 *************** *** 165,171 **** %class wxChoice, wxControlWithItems wxChoice() ! wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") int GetCurrentSelection() const //int GetColumns() const // Motif only but returns 1 otherwise --- 165,171 ---- %class wxChoice, wxControlWithItems wxChoice() ! wxChoice(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") ! bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxChoice") int GetCurrentSelection() const //int GetColumns() const // Motif only but returns 1 otherwise *************** *** 189,195 **** %class wxComboBox, wxControlWithItems wxComboBox() ! wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") bool CanCopy() const bool CanCut() const --- 189,195 ---- %class wxComboBox, wxControlWithItems wxComboBox() ! wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxComboBox") bool CanCopy() const bool CanCut() const *************** *** 265,271 **** %class wxListBox, wxControlWithItems wxListBox() ! wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") void Deselect(int n) --- 265,271 ---- %class wxListBox, wxControlWithItems wxListBox() ! wxListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxListBox") void Deselect(int n) *************** *** 276,283 **** %wxchkver_2_8 int HitTest(const wxPoint& point) const //void InsertItems(int nItems, const wxString items[], int pos) ! void InsertItems(const wxArrayString_FromLuaTable& items, int pos) bool IsSelected(int n) const //void Set(int n, const wxString* choices) ! void Set(const wxArrayString_FromLuaTable& choices) void SetFirstItem(int n) void SetSelection(int n, bool select = true) --- 276,283 ---- %wxchkver_2_8 int HitTest(const wxPoint& point) const //void InsertItems(int nItems, const wxString items[], int pos) ! void InsertItems(const wxArrayString& items, int pos) bool IsSelected(int n) const //void Set(int n, const wxString* choices) ! void Set(const wxArrayString& choices) void SetFirstItem(int n) void SetSelection(int n, bool select = true) *************** *** 294,300 **** %class wxCheckListBox, wxListBox wxCheckListBox() ! wxCheckListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") void Check(int item, bool check = true) bool IsChecked(int item) const --- 294,300 ---- %class wxCheckListBox, wxListBox wxCheckListBox() ! wxCheckListBox(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") ! bool Create(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxCheckListBox") void Check(int item, bool check = true) bool IsChecked(int item) const *************** *** 437,440 **** --- 437,441 ---- long SetItem(long index, int col, const wxString& label, int imageId = -1) void SetItemBackgroundColour(long item, const wxColour& col) + bool SetItemColumnImage(long item, long column, int image) //void SetItemCount(long count) bool SetItemData(long item, long data) *************** *** 447,452 **** void SetTextColour(const wxColour& col) void SetWindowStyleFlag(long style) ! // bool SortItems(lua function(long item1, long item2, long sortData) returning int, long data) ! //bool SortItems(wxListCtrlCompare fnSortCallBack, long data) bool SortItems(LuaFunction fnSortCallBack, long data) %endclass --- 448,462 ---- void SetTextColour(const wxColour& col) void SetWindowStyleFlag(long style) ! ! ! // %override bool SortItems(lua function(long item1, long item2, long data) returning int, long data) ! // C++ Func: bool SortItems(wxListCtrlCompare fnSortCallBack, long data) ! // Note: the data can only be a number, but you can create a table where the data is ! // an index of it if you need more information. ! // Also, the item1 and item2 are NOT the indexes in the wxListCtrl, but are the ! // client data associated with the item. see SetItemData(item, data) and again ! // you may want to make this "data" equal to an index in a table where you ! // store more information needed for sorting. ! // Your lua function should return 1, 0, -1 for item1 > item2, item1 == item2, item1 < item2 bool SortItems(LuaFunction fnSortCallBack, long data) %endclass *************** *** 519,544 **** %class %delete wxListEvent, wxNotifyEvent ! %define_event wxEVT_COMMAND_LIST_BEGIN_DRAG ! %define_event wxEVT_COMMAND_LIST_BEGIN_RDRAG ! %define_event wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT ! %define_event wxEVT_COMMAND_LIST_COL_CLICK ! %define_event wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS ! %define_event wxEVT_COMMAND_LIST_DELETE_ITEM ! %define_event wxEVT_COMMAND_LIST_END_LABEL_EDIT ! !%wxchkver_2_5 %define_event wxEVT_COMMAND_LIST_GET_INFO ! !%wxchkver_2_5 %define_event wxEVT_COMMAND_LIST_SET_INFO ! %define_event wxEVT_COMMAND_LIST_INSERT_ITEM ! %define_event wxEVT_COMMAND_LIST_ITEM_ACTIVATED ! %define_event wxEVT_COMMAND_LIST_ITEM_DESELECTED ! %define_event wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK ! %define_event wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK ! %define_event wxEVT_COMMAND_LIST_ITEM_SELECTED ! %define_event wxEVT_COMMAND_LIST_KEY_DOWN ! %define_event wxEVT_COMMAND_LIST_CACHE_HINT ! %define_event wxEVT_COMMAND_LIST_COL_RIGHT_CLICK ! %define_event wxEVT_COMMAND_LIST_COL_BEGIN_DRAG ! %define_event wxEVT_COMMAND_LIST_COL_DRAGGING ! %define_event wxEVT_COMMAND_LIST_COL_END_DRAG ! %define_event wxEVT_COMMAND_LIST_ITEM_FOCUSED wxListEvent(wxEventType commandType = 0, int id = 0) --- 529,554 ---- %class %delete wxListEvent, wxNotifyEvent ! %define_event wxEVT_COMMAND_LIST_BEGIN_DRAG // EVT_LIST_BEGIN_DRAG(id, fn) ! %define_event wxEVT_COMMAND_LIST_BEGIN_RDRAG // EVT_LIST_BEGIN_RDRAG(id, fn) ! %define_event wxEVT_COMMAND_LIST_BEGIN_LABEL_EDIT // EVT_LIST_BEGIN_LABEL_EDIT(id, fn) ! %define_event wxEVT_COMMAND_LIST_COL_CLICK // EVT_LIST_COL_CLICK(id, fn) ! %define_event wxEVT_COMMAND_LIST_DELETE_ALL_ITEMS // EVT_LIST_DELETE_ALL_ITEMS(id, fn) ! %define_event wxEVT_COMMAND_LIST_DELETE_ITEM // EVT_LIST_DELETE_ITEM(id, fn) ! %define_event wxEVT_COMMAND_LIST_END_LABEL_EDIT // EVT_LIST_END_LABEL_EDIT(id, fn) ! !%wxchkver_2_5 %define_event wxEVT_COMMAND_LIST_GET_INFO // EVT_LIST_GET_INFO(id, fn) ! !%wxchkver_2_5 %define_event wxEVT_COMMAND_LIST_SET_INFO // EVT_LIST_SET_INFO(id, fn) ! %define_event wxEVT_COMMAND_LIST_INSERT_ITEM // EVT_LIST_INSERT_ITEM(id, fn) ! %define_event wxEVT_COMMAND_LIST_ITEM_ACTIVATED // EVT_LIST_ITEM_ACTIVATED(id, fn) ! %define_event wxEVT_COMMAND_LIST_ITEM_DESELECTED // EVT_LIST_ITEM_DESELECTED(id, fn) ! %define_event wxEVT_COMMAND_LIST_ITEM_MIDDLE_CLICK // EVT_LIST_ITEM_MIDDLE_CLICK(id, fn) ! %define_event wxEVT_COMMAND_LIST_ITEM_RIGHT_CLICK // EVT_LIST_ITEM_RIGHT_CLICK(id, fn) ! %define_event wxEVT_COMMAND_LIST_ITEM_SELECTED // EVT_LIST_ITEM_SELECTED(id, fn) ! %define_event wxEVT_COMMAND_LIST_KEY_DOWN // EVT_LIST_KEY_DOWN(id, fn) ! %define_event wxEVT_COMMAND_LIST_CACHE_HINT // EVT_LIST_CACHE_HINT(id, fn) ! %define_event wxEVT_COMMAND_LIST_COL_RIGHT_CLICK // EVT_LIST_COL_RIGHT_CLICK(id, fn) ! %define_event wxEVT_COMMAND_LIST_COL_BEGIN_DRAG // EVT_LIST_COL_BEGIN_DRAG(id, fn) ! %define_event wxEVT_COMMAND_LIST_COL_DRAGGING // EVT_LIST_COL_DRAGGING(id, fn) ! %define_event wxEVT_COMMAND_LIST_COL_END_DRAG // EVT_LIST_COL_END_DRAG(id, fn) ! %define_event wxEVT_COMMAND_LIST_ITEM_FOCUSED // EVT_LIST_ITEM_FOCUSED(id, fn) wxListEvent(wxEventType commandType = 0, int id = 0) *************** *** 594,598 **** %class wxRadioBox, wxControl wxRadioBox() ! wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") // these are marked deprecated in 2.6, use wxControl::Get/SetLabel/String --- 604,608 ---- %class wxRadioBox, wxControl wxRadioBox() ! wxRadioBox(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") // these are marked deprecated in 2.6, use wxControl::Get/SetLabel/String *************** *** 602,606 **** //void SetLabel(int n, const wxString& label) ! bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString_FromLuaTable& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") void Enable(bool enable) void Enable(int n, bool enable) --- 612,616 ---- //void SetLabel(int n, const wxString& label) ! bool Create(wxWindow* parent, wxWindowID id, const wxString& label, const wxPoint& point = wxDefaultPosition, const wxSize& size = wxDefaultSize, const wxArrayString& choices, int majorDimension = 0, long style = wxRA_SPECIFY_COLS, const wxValidator& validator = wxDefaultValidator, const wxString& name = "wxRadioBox") void Enable(bool enable) void Enable(int n, bool enable) *************** *** 744,750 **** %class %delete wxSpinEvent, wxNotifyEvent ! %define_event wxEVT_SCROLL_LINEUP // EVT_SPIN_UP ! %define_event wxEVT_SCROLL_LINEDOWN // EVT_SPIN_DOWN ! %define_event wxEVT_SCROLL_THUMBTRACK // EVT_SPIN //%define_event wxEVT_COMMAND_SPINCTRL_UPDATED - actually a wxCommandEvent is sent --- 754,760 ---- %class %delete wxSpinEvent, wxNotifyEvent ! %define_event wxEVT_SCROLL_LINEUP // EVT_SPIN_UP(winid, func) ! %define_event wxEVT_SCROLL_LINEDOWN // EVT_SPIN_DOWN(winid, func) ! %define_event wxEVT_SCROLL_THUMBTRACK // EVT_SPIN(winid, func) //%define_event wxEVT_COMMAND_SPINCTRL_UPDATED - actually a wxCommandEvent is sent *************** *** 1149,1155 **** wxArrayTreeItemIds(const wxArrayTreeItemIds& array) - // %override [lua table] wxArrayString::ToLuaTable() const - //int ToLuaTable() const - void Add(const wxTreeItemId& id) void Alloc(size_t nCount) --- 1159,1162 ---- *************** *** 1181,1202 **** %class %delete wxTreeEvent, wxNotifyEvent ! %define_event wxEVT_COMMAND_TREE_BEGIN_DRAG ! %define_event wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT ! %define_event wxEVT_COMMAND_TREE_BEGIN_RDRAG ! %define_event wxEVT_COMMAND_TREE_DELETE_ITEM ! %define_event wxEVT_COMMAND_TREE_END_DRAG ! %define_event wxEVT_COMMAND_TREE_END_LABEL_EDIT ! %define_event wxEVT_COMMAND_TREE_GET_INFO ! %define_event wxEVT_COMMAND_TREE_ITEM_ACTIVATED ! %define_event wxEVT_COMMAND_TREE_ITEM_COLLAPSED ! %define_event wxEVT_COMMAND_TREE_ITEM_COLLAPSING ! %define_event wxEVT_COMMAND_TREE_ITEM_EXPANDED ! %define_event wxEVT_COMMAND_TREE_ITEM_EXPANDING ! %define_event wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK ! %define_event wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK ! %define_event wxEVT_COMMAND_TREE_KEY_DOWN ! %define_event wxEVT_COMMAND_TREE_SEL_CHANGED ! %define_event wxEVT_COMMAND_TREE_SEL_CHANGING ! %define_event wxEVT_COMMAND_TREE_SET_INFO wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0) --- 1188,1212 ---- %class %delete wxTreeEvent, wxNotifyEvent ! %define_event wxEVT_COMMAND_TREE_BEGIN_DRAG // EVT_TREE_BEGIN_DRAG(id, fn) ! %define_event wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT // EVT_TREE_BEGIN_LABEL_EDIT(id, fn) ! %define_event wxEVT_COMMAND_TREE_BEGIN_RDRAG // EVT_TREE_BEGIN_RDRAG(id, fn) ! %define_event wxEVT_COMMAND_TREE_DELETE_ITEM // EVT_TREE_DELETE_ITEM(id, fn) ! %define_event wxEVT_COMMAND_TREE_END_DRAG // EVT_TREE_END_DRAG(id, fn) ! %define_event wxEVT_COMMAND_TREE_END_LABEL_EDIT // EVT_TREE_END_LABEL_EDIT(id, fn) ! %define_event wxEVT_COMMAND_TREE_GET_INFO // EVT_TREE_GET_INFO(id, fn) ! %define_event wxEVT_COMMAND_TREE_ITEM_ACTIVATED // EVT_TREE_ITEM_ACTIVATED(id, fn) ! %define_event wxEVT_COMMAND_TREE_ITEM_COLLAPSED // EVT_TREE_ITEM_COLLAPSED(id, fn) ! %define_event wxEVT_COMMAND_TREE_ITEM_COLLAPSING // EVT_TREE_ITEM_COLLAPSING(id, fn) ! %define_event wxEVT_COMMAND_TREE_ITEM_EXPANDED // EVT_TREE_ITEM_EXPANDED(id, fn) ! %define_event wxEVT_COMMAND_TREE_ITEM_EXPANDING // EVT_TREE_ITEM_EXPANDING(id, fn) ! %define_event wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK // EVT_TREE_ITEM_MIDDLE_CLICK(id, fn) ! %define_event wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK // EVT_TREE_ITEM_RIGHT_CLICK(id, fn) ! %define_event wxEVT_COMMAND_TREE_KEY_DOWN // EVT_TREE_KEY_DOWN(id, fn) ! %define_event wxEVT_COMMAND_TREE_SEL_CHANGED // EVT_TREE_SEL_CHANGED(id, fn) ! %define_event wxEVT_COMMAND_TREE_SEL_CHANGING // EVT_TREE_SEL_CHANGING(id, fn) ! %define_event wxEVT_COMMAND_TREE_SET_INFO // EVT_TREE_SET_INFO(id, fn) ! %define_event wxEVT_COMMAND_TREE_ITEM_MENU // EVT_TREE_ITEM_MENU(id, fn) ! %define_event wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK // EVT_TREE_STATE_IMAGE_CLICK(id, fn) ! %define_event wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP // EVT_TREE_ITEM_GETTOOLTIP(id, fn) wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0) Index: clipdrag.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/clipdrag.i,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** clipdrag.i 1 Jun 2007 18:19:46 -0000 1.26 --- clipdrag.i 11 Jun 2007 03:57:58 -0000 1.27 *************** *** 48,54 **** %class %delete wxClipboardTextEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_TEXT_COPY ! %define_event wxEVT_COMMAND_TEXT_CUT ! %define_event wxEVT_COMMAND_TEXT_PASTE wxClipboardTextEvent(wxEventType type = wxEVT_NULL, wxWindowID winid = 0) --- 48,54 ---- %class %delete wxClipboardTextEvent, wxCommandEvent ! %define_event wxEVT_COMMAND_TEXT_COPY // EVT_TEXT_CUT(winid, func) ! %define_event wxEVT_COMMAND_TEXT_CUT // EVT_TEXT_COPY(winid, func) ! %define_event wxEVT_COMMAND_TEXT_PASTE // EVT_TEXT_PASTE(winid, func) wxClipboardTextEvent(wxEventType type = wxEVT_NULL, wxWindowID winid = 0) *************** *** 303,307 **** %class %delete wxDropFilesEvent, wxEvent ! %define_event wxEVT_DROP_FILES // wxDropFilesEvent(WXTYPE id = 0, int noFiles = 0, wxString* files = NULL) only handle this event --- 303,307 ---- %class %delete wxDropFilesEvent, wxEvent ! %define_event wxEVT_DROP_FILES // EVT_DROP_FILES(func) // wxDropFilesEvent(WXTYPE id = 0, int noFiles = 0, wxString* files = NULL) only handle this event Index: event.i =================================================================== RCS file: /cvsroot/wxlua/wxLua/bindings/wxwidgets/event.i,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** event.i 1 Jun 2007 18:19:46 -0000 1.23 --- event.i 11 Jun 2007 03:57:59 -0000 1.24 *************** *** 106,144 **** %class %delete wxCommandEvent, wxEvent ! %define_event wxEVT_NULL // dummy placeholder ! %define_event wxEVT_COMMAND_ENTER ! %define_event wxEVT_COMMAND_KILL_FOCUS ! %define_event wxEVT_COMMAND_LEFT_CLICK ! %define_event wxEVT_COMMAND_LEFT_DCLICK ! %define_event wxEVT_COMMAND_RIGHT_CLICK ! %define_event wxEVT_COMMAND_RIGHT_DCLICK ! //%define_event wxEVT_COMMAND_SCROLLBAR_UPDATED // obsolete use wxEVT_SCROLL... ! %define_event wxEVT_COMMAND_SET_FOCUS ! //%define_event wxEVT_COMMAND_VLBOX_SELECTED // unused? ! %define_event wxEVT_COMMAND_MENU_SELECTED ! %define_event wxEVT_COMMAND_TOOL_CLICKED ! %define_event wxEVT_COMMAND_TOOL_ENTER ! %define_event wxEVT_COMMAND_TOOL_RCLICKED ! %define_event wxEVT_COMMAND_TEXT_ENTER ! %define_event wxEVT_COMMAND_TEXT_UPDATED ! %define_event wxEVT_COMMAND_TEXT_URL ! %define_event wxEVT_COMMAND_TEXT_MAXLEN ! %define_event wxEVT_COMMAND_SPINCTRL_UPDATED ! %define_event wxEVT_COMMAND_SLIDER_UPDATED ! %define_event wxEVT_COMMAND_RADIOBUTTON_SELECTED ! %define_event wxEVT_COMMAND_RADIOBOX_SELECTED ! %define_event wxEVT_COMMAND_CHECKLISTBOX_TOGGLED ! %define_event wxEVT_COMMAND_LISTBOX_DOUBLECLICKED ! %define_event wxEVT_COMMAND_LISTBOX_SELECTED ! %define_event wxEVT_COMMAND_COMBOBOX_SELECTED ! %define_event wxEVT_COMMAND_CHOICE_SELECTED ! %define_event wxEVT_COMMAND_CHECKBOX_CLICKED ! %define_event wxEVT_COMMAND_BUTTON_CLICKED ! %wxchkver_2_4 %define_event wxEVT_COMMAND_TOGGLEBUTTON_CLICKED wxCommandEvent(wxEventType commandEventType = wxEVT_NULL, int id = 0) --- 106,144 ---- %class %delete wxCommandEvent, wxEvent ! %define_event wxEVT_NULL // dummy placeholder nobody sends this event ! %define_event wxEVT_COMMAND_ENTER // EVT_COMMAND_ENTER(winid, func) ! %define_event wxEVT_COMMAND_KILL_FOCUS // EVT_COMMAND_KILL_FOCUS(winid, func) ! %define_event wxEVT_COMMAND_LEFT_CLICK // EVT_COMMAND_LEFT_CLICK(winid, func) ! %define_event wxEVT_COMMAND_LEFT_DCLICK // EVT_COMMAND_LEFT_DCLICK(winid, func) ! %define_event wxEVT_COMMAND_RIGHT_CLICK // EVT_COMMAND_RIGHT_CLICK(winid, func) ! %define_event wxEVT_COMMAND_RIGHT_DCLICK // EVT_COMMAND_RIGHT_DCLICK(winid, func) ! //%define_event wxEVT_COMMAND_SCROLLBAR_UPDATED // EVT_SCROLLBAR(winid, func) obsolete use wxEVT_SCROLL... ! %define_event wxEVT_COMMAND_SET_FOCUS // EVT_COMMAND_SET_FOCUS(winid, func) ! //%define_event wxEVT_COMMAND_VLBOX_SELECTED // EVT_VLBOX(winid, func) unused? ! %define_event wxEVT_COMMAND_MENU_SELECTED // EVT_MENU(winid, func) EVT_MENU_RANGE(id1, id2, func) ! %define_event wxEVT_COMMAND_TOOL_CLICKED // EVT_TOOL(winid, func) EVT_TOOL_RANGE(id1, id2, func) ! %define_event wxEVT_COMMAND_TOOL_ENTER // EVT_TOOL_ENTER(winid, func) ! %define_event wxEVT_COMMAND_TOOL_RCLICKED // EVT_TOOL_RCLICKED(winid, func) EVT_TOOL_RCLICKED_RANGE(id1, id2, func) ! %define_event wxEVT_COMMAND_TEXT_ENTER // EVT_TEXT_ENTER(id, fn) ! %define_event wxEVT_COMMAND_TEXT_UPDATED // EVT_TEXT(id, fn) ! %define_event wxEVT_COMMAND_TEXT_URL // EVT_TEXT_URL(id, fn) ! %define_event wxEVT_COMMAND_TEXT_MAXLEN // EVT_TEXT_MAXLEN(id, fn) ! %define_event wxEVT_COMMAND_SPINCTRL_UPDATED // EVT_SPINCTRL(id, fn) ! %define_event wxEVT_COMMAND_SLIDER_UPDATED // EVT_SLIDER(winid, func) ! %define_event wxEVT_COMMAND_RADIOBUTTON_SELECTED // EVT_RADIOBUTTON(winid, func) ! %define_event wxEVT_COMMAND_RADIOBOX_SELECTED // EVT_RADIOBOX(winid, func) ! %define_event wxEVT_COMMAND_CHECKLISTBOX_TOGGLED // EVT_CHECKLISTBOX(winid, func) ! %define_event wxEVT_COMMAND_LISTBOX_DOUBLECLICKED // EVT_LISTBOX_DCLICK(winid, func) ! %define_event wxEVT_COMMAND_LISTBOX_SELECTED // EVT_LISTBOX(winid, func) ! %define_event wxEVT_COMMAND_COMBOBOX_SELECTED // EVT_COMBOBOX(winid, func) ! %define_event wxEVT_COMMAND_CHOICE_SELECTED // EVT_CHOICE(winid, func) ! %define_event wxEVT_COMMAND_CHECKBOX_CLICKED // EVT_CHECKBOX(winid, func) ! %define_event wxEVT_COMMAND_BUTTON_CLICKED // EVT_BUTTON(winid, func) ! %wxchkver_2_4 %define_event wxEVT_COMMAND_TOGGLEBUTTON_CLICKED // EVT_TOGGLEBUTTON(id, fn) wxCommandEvent(wxEventType commandEventType = wxEVT_NULL, int id = 0) *************** *** 178,184 **** %class %delete wxActivateEvent, wxEvent ! %define_event wxEVT_ACTIVATE ! %define_event wxEVT_ACTIVATE_APP ! %define_event wxEVT_HIBERNATE wxActivateEvent(wxEventType eventType = wxEVT_NULL, bool active = true, int id = 0) --- 178,184 ---- %class %delete wxActivateEvent, wxEvent ! %define_event wxEVT_ACTIVATE // EVT_ACTIVATE(func) ! %define_event wxEVT_ACTIVATE_APP // EVT_ACTIVATE_APP(func) ! %define_event wxEVT_HIBERNATE // EVT_HIBERNATE(func) wxActivateEvent(wxEventType eventType = wxEVT_NULL, bool active = true, int id = 0) *************** *** 193,199 **** %class %delete wxCloseEvent, wxEvent ! %define_event wxEVT_CLOSE_WINDOW ! %define_event wxEVT_QUERY_END_SESSION ! %define_event wxEVT_END_SESSION wxCloseEvent(wxEventType commandEventType = wxEVT_NULL, int id = 0) --- 193,199 ---- %class %delete wxCloseEvent, wxEvent ! %define_event wxEVT_CLOSE_WINDOW // EVT_CLOSE(func) ! %define_event wxEVT_QUERY_END_SESSION // EVT_QUERY_END_SESSION(func) ! %define_event wxEVT_END_SESSION // EVT_END_SESSION(func) wxCloseEvent(wxEventType commandEventType = wxEVT_NULL, int id = 0) *************** *** 213,218 **** //%class %noclassinfo wxDialUpEvent, wxCommandEvent ! // %define_event wxEVT_DIALUP_CONNECTED ! // %define_event wxEVT_DIALUP_DISCONNECTED // wxDialUpEvent(bool isConnected, bool isOwnEvent) --- 213,218 ---- //%class %noclassinfo wxDialUpEvent, wxCommandEvent ! // %define_event wxEVT_DIALUP_CONNECTED // EVT_DIALUP_CONNECTED(func) ! // %define_event wxEVT_DIALUP_DISCONNECTED // EVT_DIALUP_DISCONNECTED(func) // wxDialUpEvent(bool isConnected, bool isOwnEvent) *************** *** 228,234 **** %class %delete wxEraseEvent, wxEvent ! %define_event wxEVT_ERASE_BACKGROUND wxEraseEvent(int id = 0, wxDC* dc = NULL) wxDC* GetDC() const %endclass --- 228,235 ---- %class %delete wxEraseEvent, wxEvent ! %define_event wxEVT_ERASE_BACKGROUND // EVT_ERASE_BACKGROUND(func) wxEraseEvent(int id = 0, wxDC* dc = NULL) + wxDC* GetDC() const %endclass *************** *** 240,245 **** %class %delete wxFocusEvent, wxEvent ! %define_event wxEVT_SET_FOCUS ! %define_event wxEVT_KILL_FOCUS wxFocusEvent(wxEventType eventType = wxEVT_NULL, int id = 0) --- 241,246 ---- %class %delete wxFocusEvent, wxEvent ! %define_event wxEVT_SET_FOCUS // EVT_SET_FOCUS(func) ! %define_event wxEVT_KILL_FOCUS // EVT_KILL_FOCUS(func) wxFocusEvent(wxEventType eventType = wxEVT_NULL, int id = 0) *************** *** 255,259 **** %class %delete wxChildFocusEvent, wxCommandEvent ! %define_event wxEVT_CHILD_FOCUS wxChildFocusEvent(wxWindow *win = NULL) --- 256,260 ---- %class %delete wxChildFocusEvent, wxCommandEvent ! %define_event wxEVT_CHILD_FOCUS // EVT_CHILD_FOCUS(func) wxChildFocusEvent(wxWindow *win = NULL) *************** *** 268,272 **** %class %delete wxQueryNewPaletteEvent, wxEvent ! %define_event wxEVT_QUERY_NEW_PALETTE wxQueryNewPaletteEvent(wxWindowID winid = 0) --- 269,273 ---- %class %delete wxQueryNewPaletteEvent, wxEvent ! %define_event wxEVT_QUERY_NEW_PALETTE // EVT_QUERY_NEW_PALETTE(func) wxQueryNewPaletteEvent(wxWindowID winid = 0) *************** *** 282,288 **** %class %delete wxPaletteChangedEvent, wxEvent ! %define_event wxEVT_PALETTE_CHANGED ! wxPaletteChangedEvent(wxWindowID winid = 0) void SetChangedWindow(wxWindow* win) --- 283,289 ---- %class %delete wxPaletteChangedEvent, wxEvent ! %define_event wxEVT_PALETTE_CHANGED // EVT_PALETTE_CHANGED(func) + wxPaletteChangedEvent(wxWindowID winid = 0) void SetChangedWindow(wxWindow* win) *************** *** 402,410 **** %class %delete wxKeyEvent, wxEvent ! %define_event wxEVT_KEY_DOWN ! %define_event wxEVT_KEY_UP ! %define_event wxEVT_CHAR ! %define_event wxEVT_CHAR_HOOK ! wxUSE_HOTKEY %define_event wxEVT_HOTKEY wxKeyEvent(wxEventType keyEventType) --- 403,411 ---- %class %delete wxKeyEvent, wxEvent ! %define_event wxEVT_KEY_DOWN // EVT_KEY_DOWN(func) ! %define_event wxEVT_KEY_UP ... [truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X