Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv25542/wxLua/samples
Modified Files:
editor.wx.lua
Log Message:
update stc bindings to 2.6.3
more editor cleanup
Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** editor.wx.lua 25 Sep 2006 22:24:46 -0000 1.25
--- editor.wx.lua 26 Sep 2006 05:05:55 -0000 1.26
***************
*** 56,60 ****
local ID_ABOUT = wx.wxID_ABOUT
-- Watch window menu items
! local ID_WATCH_WINDOW = NewID()
local ID_ADDWATCH = NewID()
local ID_EDITWATCH = NewID()
--- 56,60 ----
local ID_ABOUT = wx.wxID_ABOUT
-- Watch window menu items
! local ID_WATCH_LISTCTRL = NewID()
local ID_ADDWATCH = NewID()
local ID_EDITWATCH = NewID()
***************
*** 621,625 ****
watchWindow:SetMenuBar(watchMenuBar)
! watchListCtrl = wx.wxListCtrl(watchWindow, ID_WATCH_WINDOW,
wx.wxDefaultPosition, wx.wxDefaultSize,
wx.wxLC_REPORT + wx.wxLC_EDIT_LABELS)
--- 621,625 ----
watchWindow:SetMenuBar(watchMenuBar)
! watchListCtrl = wx.wxListCtrl(watchWindow, ID_WATCH_LISTCTRL,
wx.wxDefaultPosition, wx.wxDefaultSize,
wx.wxLC_REPORT + wx.wxLC_EDIT_LABELS)
***************
*** 666,673 ****
watchListCtrl:EditLabel(row)
end)
- watchWindow:Connect(ID_ADDWATCH, wx.wxEVT_UPDATE_UI,
- function (event)
- event:Enable(true)
- end)
watchWindow:Connect(ID_EDITWATCH, wx.wxEVT_COMMAND_MENU_SELECTED,
--- 666,669 ----
***************
*** 695,706 ****
end)
- watchWindow:Connect(ID_EVALUATEWATCH, wx.wxEVT_UPDATE_UI,
- function (event)
- event:Enable(watchListCtrl:GetItemCount() > 0)
- end)
watchWindow:Connect(ID_EVALUATEWATCH, wx.wxEVT_COMMAND_MENU_SELECTED,
function (event)
ProcessWatches()
end)
watchListCtrl:Connect(wx.wxEVT_COMMAND_LIST_END_LABEL_EDIT,
--- 691,702 ----
end)
watchWindow:Connect(ID_EVALUATEWATCH, wx.wxEVT_COMMAND_MENU_SELECTED,
function (event)
ProcessWatches()
end)
+ watchWindow:Connect(ID_EVALUATEWATCH, wx.wxEVT_UPDATE_UI,
+ function (event)
+ event:Enable(watchListCtrl:GetItemCount() > 0)
+ end)
watchListCtrl:Connect(wx.wxEVT_COMMAND_LIST_END_LABEL_EDIT,
***************
*** 774,778 ****
editor:MarkerDeleteAll(BREAKPOINT_MARKER)
editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
! editor:InsertText(0, st)
SetupKeywords(editor, IsLuaFile(filePath))
editor:EmptyUndoBuffer()
--- 770,774 ----
editor:MarkerDeleteAll(BREAKPOINT_MARKER)
editor:MarkerDeleteAll(CURRENT_LINE_MARKER)
! editor:AppendText(st)
SetupKeywords(editor, IsLuaFile(filePath))
editor:EmptyUndoBuffer()
|
