From: John L. <jr...@us...> - 2007-06-21 03:58:31
|
Update of /cvsroot/wxlua/wxLua/samples In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv15614/wxLua/samples Modified Files: controls.wx.lua Log Message: Add the rest of the events, test using the function string names to call the functions Index: controls.wx.lua =================================================================== RCS file: /cvsroot/wxlua/wxLua/samples/controls.wx.lua,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** controls.wx.lua 20 Jun 2007 22:57:37 -0000 1.2 --- controls.wx.lua 21 Jun 2007 03:58:24 -0000 1.3 *************** *** 46,57 **** --- 46,60 ---- wxEVT_Table = {} wxEVT_List = {} + wxEVT_Funcs = {} wxEVT_Array = wx.wxLuaBinding_wx.GetEventArray for i = 1, #wxEVT_Array do wxEVT_Table[wxEVT_Array[i].eventType] = wxEVT_Array[i] table.insert(wxEVT_List, string.format("%s %s", wxlua.wxlua_typename(wxEVT_Array[i].class_tag), wxEVT_Array[i].name)) + wxEVT_Funcs[wxlua.wxlua_typename(wxEVT_Array[i].class_tag)] = 0 -- we'll check later end table.sort(wxEVT_List) + function wxPtStr(pt) return string.format("%d, %d", pt.x, pt.y) *************** *** 62,215 **** -- --------------------------------------------------------------------------- ! function wxEventToString(event) ! return string.format("wxEvent - GetEventType=%d='%s' GetId=%d GetSkipped=%s GetTimestamp=%d IsCommandEvent=%s ShouldPropagate=%s", ! event:GetEventType(), wxEVT_Names[event:GetEventType()], event:GetId(), tostring(event:GetSkipped()), event:GetTimestamp(), tostring(event:IsCommandEvent()), tostring(event:ShouldPropagate())) end ! function wxActivateEventToString(event) local s = string.format("wxActivateEvent - GetActive=%s", tostring(event:GetActive())) ! return s.."\n\t"..wxEventToString(event) end ! function wxBookCtrlBaseEventToString(event) local s = string.format("wxBookCtrlBaseEvent - GetOldSelection=%d GetOldSelection=%d", event:GetOldSelection(), event:GetSelection()) ! return s.."\n\t"..wxNotifyEventToString(event) end ! function wxCalculateLayoutEventToString(event) local s = string.format("wxCalculateLayoutEvent - GetFlags=%d GetRect=(%d, %d, %d, %d)", event:GetFlags(), event.GetRect():GetX(), event.GetRect():GetY(), event.GetRect():GetWidth(), event.GetRect():GetHeight()) ! return s.."\n\t"..wxEventToString(event) end ! function wxCalendarEventToString(event) local s = string.format("wxCalendarEvent - GetWeekDay=%d", event:GetWeekDay()) ! return s.."\n\t"..wxDateEventToString(event) end ! function wxChildFocusEventEventToString(event) local s = string.format("wxChildFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxChoiceBookEventToString(event) ! local s = string.format("wxChoiceBookEvent - [nothing]") ! return s.."\n\t"..wxBookCtrlBaseEventToString(event) end ! function wxCloseEventToString(event) local s = string.format("wxCloseEvent - CanVeto=%s GetLoggingOff=%s", tostring(event:CanVeto()), tostring(event:GetLoggingOff())) ! return s.."\n\t"..wxEventToString(event) end ! function wxCollapsiblePaneEventToString(event) local s = string.format("wxCollapsiblePaneEvent - GetCollapsed=%s", tostring(event:GetCollapsed())) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxColourPickerEventEventToString(event) local c = event:GetColour() local s = string.format("wxColourPickerEvent - GetColour=(%s)", c:GetAsString()) c:delete() ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxCommandEventToString(event) local s = string.format("wxCommandEvent - GetExtraLong=%d GetInt=%d GetSelection=%d GetString='%s' IsChecked=%s IsSelection=%s", event:GetExtraLong(), event:GetInt(), event:GetSelection(), event:GetString(), tostring(event:IsChecked()), tostring(event:IsSelection())) ! return s.."\n\t"..wxEventToString(event) end ! function wxContextMenuEventEventEventToString(event) local s = string.format("wxContextMenuEvent - GetPosition=(%d, %d)", event:GetPosition().x, event:GetPosition().y) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxDateEventToString(event) local s = string.format("wxDateEvent - GetDate:Format='%s'", event:GetDate():Format()) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxDisplayChangedEventToString(event) local s = string.format("wxDisplayChangedEvent - [No values]") ! return s.."\n\t"..wxEventToString(event) end ! function wxDropfilesEventToString(event) ! local s = string.format("wxDropfilesEvent - GetNumberOfFiles=%d GetPosition=(%s) GetFiles=(%s)", event:GetNumberOfFiles(), wxPtStr(event:GetPosition()), table.concat(event.GetFiles(), ", ")) ! return s.."\n\t"..wxEventToString(event) end ! function wxEraseEventToString(event) local s = string.format("wxEraseEvent - [No values]") ! return s.."\n\t"..wxEventToString(event) end ! function wxFileDirPickerEventEventToString(event) local s = string.format("wxFileDirPickerEvent - GetPath='%s'", event:GetPath()) ! return s.."\n\t"..wxCommandEventToString(event) end ! -- FIXME missing wxFindDialogEvent ! function wxFocusEventToString(event) local s = string.format("wxFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxFontPickerEventToString(event) local f = event:GetFont() local s = string.format("wxFontPickerEvent - GetFont='%s'", f:GetNativeFontInfoDesc()) f:delete() ! return s.."\n\t"..wxCommandEventToString(event) end ! -- FIXME missing wxGridXXX events ! function wxHelpEventToString(event) local s = string.format("wxHelpEvent - GetLink='%s' GetPosition=(%s) GetTarget='%s' GetOrigin=%d", event:GetLink(), wxPtStr(event:GetPosition()), event:GetTarget(), event:GetOrigin()) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxHyperlinkEventToString(event) local s = string.format("wxHyperlinkEvent - GetURL='%s'", event:GetURL()) ! return s.."\n\t"..wxCommandEventToString(event) end ! function wxIconizeEventToString(event) local s = string.format("wxIconizeEvent - Iconized=%s", tostring(event:Iconized())) ! return s.."\n\t"..wxEventToString(event) end ! function wxIdleEventToString(event) local s = string.format("wxIdleEvent - GetMode=%d MoreRequested=%s", event:GetMode(), tostring(event:MoreRequested())) ! return s.."\n\t"..wxEventToString(event) end ! function wxKeyEventToString(event) local s = string.format("wxKeyEvent - AltDown='%s' CmdDown='%s' ControlDown='%s' MetaDown='%s' ShiftDown='%s' HasModifiers='%s' GetModifiers=%d GetKeyCode=%d GetPosition=(%s)", tostring(event:AltDown()), tostring(event:CmdDown()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:HasModifiers()), event:GetModifiers(), event:GetKeyCode(), wxPtStr(event:GetPosition())) ! return s.."\n\t"..wxEventToString(event) end ! function wxNotifyEventToString(event) local s = string.format("wxNotifyEvent - IsAllowed=%s", tostring(event:IsAllowed())) ! return s.."\n\t"..wxCommandEventToString(event) end -- --------------------------------------------------------------------------- -- Handle all wxCommandEvents -- --------------------------------------------------------------------------- ! wxEVT_Funcs = { ! ["wxEvent"] = wxEventToString, ! ["wxCommandEvent"] = wxCommandEventToString, ! ["wxNotifyEvent"] = wxNotifyEventToString, ! ["wxDateEvent"] = wxDateEventToString, ! ["wxCalendarEvent"] = wxCalendarEventToString, ! ["wxBookCtrlBaseEvent"] = wxBookCtrlBaseEventToString, ! ["wxChoiceBookEvent"] = wxChoiceBookEventToString, ! ["wxCollapsiblePaneEvent"] = wxCollapsiblePaneEventToString, ! ["wxHyperlinkEvent"] = wxHyperlinkEventToString, ! } ignoreEVTs = { ["wxEVT_IDLE"] = true, --- 65,420 ---- -- --------------------------------------------------------------------------- ! function FuncsToString(event, funcTable) ! local t = {} ! ! for n = 1, #funcTable do ! local v = event[funcTable[n]](event) ! ! local s = funcTable[n].."=" ! ! local typ = wxlua.wxlua_type(v) ! local typ_name = wxlua.wxlua_typename(typ) ! ! if typ <= 0 then ! s = s..tostring(v) ! elseif typ_name == "wxPoint" then ! s = s..string.format("(%d, %d) ", t:GetX(), t:GetY()) ! elseif typ_name == "wxColour" then ! s = s..v:GetAsString() ! v:delete() ! else ! s = s..tostring(v) ! v:delete() ! print("Unhandled wxLua data type in FuncsToString", typ_name) ! end ! ! table.insert(t, s) ! end ! ! return table.concat(t, ", ") end ! function wxEvent_ToString(event) ! return "wxEvent - "..FuncsToString(event, {"GetEventType", "GetId", "GetSkipped", "GetTimestamp", "IsCommandEvent", "ShouldPropagate"}) ! end ! ! function wxActivateEvent_ToString(event) local s = string.format("wxActivateEvent - GetActive=%s", tostring(event:GetActive())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxBookCtrlBaseEvent_ToString(event) local s = string.format("wxBookCtrlBaseEvent - GetOldSelection=%d GetOldSelection=%d", event:GetOldSelection(), event:GetSelection()) ! return s.."\n\t"..wxNotifyEvent_ToString(event) end ! function wxCalculateLayoutEvent_ToString(event) local s = string.format("wxCalculateLayoutEvent - GetFlags=%d GetRect=(%d, %d, %d, %d)", event:GetFlags(), event.GetRect():GetX(), event.GetRect():GetY(), event.GetRect():GetWidth(), event.GetRect():GetHeight()) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxCalendarEvent_ToString(event) local s = string.format("wxCalendarEvent - GetWeekDay=%d", event:GetWeekDay()) ! return s.."\n\t"..wxDateEvent_ToString(event) end ! function wxChildFocusEvent_ToString(event) local s = string.format("wxChildFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxChoicebookEvent_ToString(event) ! local s = string.format("wxChoicebookEvent - [nothing]") ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) end ! function wxClipboardTextEvent_ToString(event) ! local s = string.format("wxClipboardTextEvent - [nothing]") ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! ! function wxCloseEvent_ToString(event) local s = string.format("wxCloseEvent - CanVeto=%s GetLoggingOff=%s", tostring(event:CanVeto()), tostring(event:GetLoggingOff())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxCollapsiblePaneEvent_ToString(event) local s = string.format("wxCollapsiblePaneEvent - GetCollapsed=%s", tostring(event:GetCollapsed())) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxColourPickerEvent_ToString(event) local c = event:GetColour() local s = string.format("wxColourPickerEvent - GetColour=(%s)", c:GetAsString()) c:delete() ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxCommandEvent_ToString(event) local s = string.format("wxCommandEvent - GetExtraLong=%d GetInt=%d GetSelection=%d GetString='%s' IsChecked=%s IsSelection=%s", event:GetExtraLong(), event:GetInt(), event:GetSelection(), event:GetString(), tostring(event:IsChecked()), tostring(event:IsSelection())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxContextMenuEvent_ToString(event) local s = string.format("wxContextMenuEvent - GetPosition=(%d, %d)", event:GetPosition().x, event:GetPosition().y) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxDateEvent_ToString(event) local s = string.format("wxDateEvent - GetDate:Format='%s'", event:GetDate():Format()) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxDisplayChangedEvent_ToString(event) local s = string.format("wxDisplayChangedEvent - [No values]") ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxDropFilesEvent_ToString(event) ! local s = string.format("wxDropFilesEvent - GetNumberOfFiles=%d GetPosition=(%s) GetFiles=(%s)", event:GetNumberOfFiles(), wxPtStr(event:GetPosition()), table.concat(event.GetFiles(), ", ")) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxEraseEvent_ToString(event) local s = string.format("wxEraseEvent - [No values]") ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxFileDirPickerEvent_ToString(event) local s = string.format("wxFileDirPickerEvent - GetPath='%s'", event:GetPath()) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxFindDialogEvent_ToString(event) ! local s = string.format("wxFindDialogEvent - GetFlags=%d GetFindString='%s' GetReplaceString='%s' GetDialog='%s'", event:GetFlags(), event:GetFindString(), event:GetReplaceString(), tostring(event:GetReplaceString())) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! function wxFocusEvent_ToString(event) local s = string.format("wxFocusEvent - GetWindow='%s'", tostring(event:GetWindow())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxFontPickerEvent_ToString(event) local f = event:GetFont() local s = string.format("wxFontPickerEvent - GetFont='%s'", f:GetNativeFontInfoDesc()) f:delete() ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxGridEditorCreatedEvent_ToString(event) ! local s = string.format("wxGridEditorCreatedEvent - GetRow=%d GetCol=%d GetControl='%s'", event:GetRow(), event:GetCol(), tostring(event:GetControl())) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! function wxGridEvent_ToString(event) ! local s = string.format("wxGridEvent - GetRow=%d GetCol=%d GetPosition=('%s'), Selecting=%s ControlDown=%s MetaDown=%s ShiftDown=%s AltDown=%s", ! event:GetRow(), event:GetCol(), wxPtStr(event:GetPosition()), tostring(event:Selecting()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:AltDown())) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! function wxGridRangeSelectEvent_ToString(event) ! local s = string.format("wxGridRangeSelectEvent - GetTopRow=%d GetBottomRow=%d GetLeftCol=%d GetRightCol=%d Selecting=%s ControlDown=%s MetaDown=%s ShiftDown=%s AltDown=%s", ! event:GetTopRow(), event:GetBottomRow(), event:GetLeftCol(), event:GetRightCol(), tostring(event:Selecting()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:AltDown())) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! function wxGridSizeEvent_ToString(event) ! local s = string.format("wxGridSizeEvent - GetRowOrCol=%d GetPosition=('%s'), ControlDown=%s MetaDown=%s ShiftDown=%s AltDown=%s", ! event:GetRowOrCol(), wxPtStr(event:GetPosition()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:AltDown())) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! function wxHelpEvent_ToString(event) local s = string.format("wxHelpEvent - GetLink='%s' GetPosition=(%s) GetTarget='%s' GetOrigin=%d", event:GetLink(), wxPtStr(event:GetPosition()), event:GetTarget(), event:GetOrigin()) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxHyperlinkEvent_ToString(event) local s = string.format("wxHyperlinkEvent - GetURL='%s'", event:GetURL()) ! return s.."\n\t"..wxCommandEvent_ToString(event) end ! function wxIconizeEvent_ToString(event) local s = string.format("wxIconizeEvent - Iconized=%s", tostring(event:Iconized())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxIdleEvent_ToString(event) local s = string.format("wxIdleEvent - GetMode=%d MoreRequested=%s", event:GetMode(), tostring(event:MoreRequested())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxInitDialogEvent_ToString(event) ! local s = string.format("wxInitDialogEvent - [No values]") ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! -- wxJoystickEvent ! ! function wxKeyEvent_ToString(event) local s = string.format("wxKeyEvent - AltDown='%s' CmdDown='%s' ControlDown='%s' MetaDown='%s' ShiftDown='%s' HasModifiers='%s' GetModifiers=%d GetKeyCode=%d GetPosition=(%s)", tostring(event:AltDown()), tostring(event:CmdDown()), tostring(event:ControlDown()), tostring(event:MetaDown()), tostring(event:ShiftDown()), tostring(event:HasModifiers()), event:GetModifiers(), event:GetKeyCode(), wxPtStr(event:GetPosition())) ! return s.."\n\t"..wxEvent_ToString(event) end ! function wxListbookEvent_ToString(event) ! local s = string.format("wxListbookEvent - [No values]") ! return s.."\n\t"..wxBookCtrlBaseEvent(event) ! end ! ! function wxListEvent_ToString(event) ! local s = string.format("wxListEvent - GetCacheFrom=%d GetCacheTo=%d GetKeyCode=%d GetIndex=%d GetColumn=%d GetPoint=(%s) GetLabel='%s' GetText='%s' GetImage=%d GetData=%d GetMask=%d GetItem=%s IsEditCancelled=%s", ! event:GetCacheFrom(), event:GetCacheTo(), event:GetKeyCode(), event:GetIndex(), event:GetColumn(), wxPtStr(event:GetPoint()), event:GetLabel(), event:GetText(), event:GetImage(), event:GetData(), event:GetMask(), tostring(event:GetItem()), tostring(event:IsEditCancelled())) ! return s.."\n\t"..wxNotifyEvent(event) ! end ! ! -- wxLuaHtmlWinTagEvent ! ! function wxMaximizeEvent_ToString(event) ! local s = string.format("wxMaximizeEvent - [No values]") ! return s.."\n\t"..wxEvent(event) ! end ! ! function wxMenuEvent_ToString(event) ! local s = string.format("wxMenuEvent - GetMenuId=%d IsPopup=%d GetMenu=%s", event:GetMenuId(), tostring(event:IsPopup()), tostring(event:GetMenu())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxMouseCaptureChangedEvent_ToString(event) ! local s = string.format("wxMouseCaptureChangedEvent - GetCapturedWindow=%s", tostring(event:GetCapturedWindow())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxMouseCaptureLostEvent_ToString(event) ! local s = string.format("wxMouseCaptureLostEvent - [No values]") ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxMouseEvent_ToString(event) ! local s = string.format("wxMouseEvent - GetPosition=(%s) AltDown=%s ButtonDClick=%s ButtonDown=%s ButtonUp=%s CmdDown=%s ControlDown=%s Dragging=%s Entering=%s", ! wxPtStr(event:GetPosition()), tostring(event:AltDown()), tostring(event:ButtonDClick()), tostring(event:ButtonDown()), tostring(event:ButtonUp()), tostring(event:CmdDown()), tostring(event:ControlDown()), tostring(event:Dragging()), tostring(event:Entering())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxMoveEvent_ToString(event) ! local s = string.format("wxMoveEvent - GetPosition=(%s)", wxPtStr(event:GetPosition())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxNavigationKeyEvent_ToString(event) ! local s = string.format("wxNavigationKeyEvent - GetDirection=%s IsWindowChange=%s IsFromTab=%s GetCurrentFocus=%s", ! tostring(event:GetDirection()), tostring(event:IsWindowChange()), tostring(event:IsFromTab()), tostring(event:GetCurrentFocus())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! function wxNotebookEvent_ToString(event) ! local s = string.format("wxNotebookEvent [No values]") ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) ! end ! ! function wxNotifyEvent_ToString(event) local s = string.format("wxNotifyEvent - IsAllowed=%s", tostring(event:IsAllowed())) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! ! function wxPaintEvent_ToString(event) ! local s = string.format("wxPaintEvent [No values]") ! return s.."\n\t"..wxEvent_ToString(event) ! end ! function wxPaletteChangedEvent_ToString(event) ! local s = string.format("wxPaletteChangedEvent - GetChangedWindow=%s", tostring(event:GetChangedWindow())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! -- wxProcessEvent ! -- wxQueryLayoutInfoEvent ! -- wxQueryNewPaletteEvent ! -- wxSashEvent ! ! function wxScrollEvent_ToString(event) ! local s = string.format("wxScrollEvent - GetOrientation=%d GetPosition=%d", event:GetOrientation(), event:GetPosition()) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! function wxScrollWinEvent_ToString(event) ! local s = string.format("wxScrollWinEvent - GetOrientation=%d GetPosition=%d", event:GetOrientation(), event:GetPosition()) ! return s.."\n\t"..wxCommandEvent_ToString(event) ! end ! ! function wxSetCursorEvent_ToString(event) ! local s = string.format("wxSetCursorEvent - GetX=%d GetY=%d HasCursor=%s", event:GetX(), event:GetY(), tostring(event:HasCursor())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! function wxShowEvent_ToString(event) ! local s = string.format("wxShowEvent - GetShow=%s", tostring(event:GetShow())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! function wxSizeEvent_ToString(event) ! local s = string.format("wxSizeEvent - GetSize=(%s)", string.format("%d, %d", event:GetSize():GetWidth(), event:GetSize():GetHeight())) ! return s.."\n\t"..wxEvent_ToString(event) ! end ! ! -- wxSocketEvent ! ! function wxSpinEvent_ToString(event) ! local s = string.format("wxSpinEvent - GetPosition=%d", event:GetPosition()) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! ! function wxSplitterEvent_ToString(event) ! local s = string.format("wxSplitterEvent - GetSashPosition=%d GetX=%d GetY=%d GetWindowBeingRemoved=%s", event:GetSashPosition(), event:GetX(), event:GetY(), tostring(event:GetWindowBeingRemoved())) ! return s.."\n\t"..wxNotifyEvent_ToString(event) ! end ! ! --wxSysColourChangedEvent ! --wxTaskBarIconEvent ! --wxTimerEvent ! ! function wxToolbookEvent_ToString(event) ! local s = string.format("wxToolbookEvent [No values]") ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) ! end ! function wxTreebookEvent_ToString(event) ! local s = string.format("wxTreebookEvent [No values]") ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) ! end ! function wxTreeEvent_ToString(event) ! local s = string.format("wxTreeEvent - GetKeyCode=%d GetItem=%s GetOldItem=%s GetLabel=%s GetPoint=(%s) IsEditCancelled=%s", ! event:GetKeyCode(), tostring(event:GetItem()), tostring(event:GetOldItem()), event:GetLabel(), wxPtStr(event:GetPoint()), tostring(event:IsEditCancelled())) ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) ! end ! ! function wxUpdateUIEvent_ToString(event) ! local s = string.format("wxUpdateUIEvent GetText='%s' GetChecked=%s GetEnabled=%s GetShown=%s GetSetChecked=%s GetSetEnabled=%s GetSetShown=%s GetSetText=%s", ! event:GetText(), tostring(event:GetChecked()), tostring(event:GetEnabled()), tostring(event:GetShown()), tostring(event:GetSetChecked()), tostring(event:GetSetEnabled()), tostring(event:GetSetShown()), tostring(event:GetSetText())) ! return s.."\n\t"..wxBookCtrlBaseEvent_ToString(event) end + --[[ + wxWindowCreateEvent + wxWindowDestroyEvent + wxWizardEvent + ]] + -- --------------------------------------------------------------------------- -- Handle all wxCommandEvents -- --------------------------------------------------------------------------- ! do ! for k, v in pairs(_G) do ! if string.find(k, "Event_ToString", 1, 1) then ! local s = string.sub(k, 1, string.find(k, "_", 1, 1)-1) ! if wxEVT_Funcs[s] == 0 then ! wxEVT_Funcs[s] = v ! else ! --For debugging, these events don't have a wxEVT_XXX, wxEvent, wxNotifyEvent, wxBookCtrlBaseEvent ! --print("Oops! Missing a function!", k, v, s) ! end ! end ! end ! ! -- For debugging, these are missing event handlers ! --for k, v in pairs(wxEVT_Funcs) do if v == 0 then print("No handler for the event ", k) end end ! ! end ! ignoreEVTs = { ["wxEVT_IDLE"] = true, *************** *** 237,246 **** end if wxEVT_Funcs[evtClassName] then str = wxEVT_Funcs[evtClassName](event) end - print(evtClassName, wxEVT_Table[event:GetEventType()].name) - local obj_str = "event:GetEventObject()=NULL" if event:GetEventObject() then --- 442,451 ---- end + print(evtClassName, wxEVT_Table[event:GetEventType()].name) + if wxEVT_Funcs[evtClassName] then str = wxEVT_Funcs[evtClassName](event) end local obj_str = "event:GetEventObject()=NULL" if event:GetEventObject() then *************** *** 253,257 **** end ! local s = string.format("%s From: %s Sent - "..evtClassName.." \n\t%s\n\n", wx.wxNow(), obj_str, str) if textCtrl then textCtrl:AppendText(s) --- 458,462 ---- end ! local s = string.format("%s %s(%s) From: %s\n\t%s\n\n", wx.wxNow(), evtClassName, evtTypeStr, obj_str, str) if textCtrl then textCtrl:AppendText(s) *************** *** 455,458 **** --- 660,665 ---- wx.wxDEFAULT_FRAME_STYLE ) -- use default frame styles + frame:Connect(wx.wxEVT_CLOSE_WINDOW, function(event) event:Skip(); textCtrl = nil end) + local fileMenu = wx.wxMenu() fileMenu:Append(wx.wxID_EXIT, "E&xit", "Quit the program") |