Skip to content

Commit

Permalink
Switched to using KEY event in search panel to make it work with wx…
Browse files Browse the repository at this point in the history
…widgets 3.1+ (#260).
  • Loading branch information
pkulchenko committed Nov 10, 2015
1 parent 1f57363 commit 7def69b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/editor/findreplace.lua
Expand Up @@ -979,7 +979,7 @@ function findReplace:createPanel()
ctrl:Connect(wx.wxEVT_ERASE_BACKGROUND, function() end)

local taborder = {findCtrl, replaceCtrl, scope}
local function charHandle(event)
local function keyHandle(event)
local keycode = event:GetKeyCode()
self.ac[event:GetEventObject():DynamicCast('wxTextCtrl'):GetId()].lastkeycode = keycode
if keycode == wx.WXK_ESCAPE then
Expand Down Expand Up @@ -1033,7 +1033,7 @@ function findReplace:createPanel()
end)
findCtrl:Connect(wx.wxEVT_COMMAND_TEXT_ENTER, findNext)
findCtrl:Connect(wx.wxEVT_COMMAND_TEXT_UPDATED, findIncremental)
findCtrl:Connect(wx.wxEVT_CHAR, charHandle)
findCtrl:Connect(wx.wxEVT_KEY_DOWN, keyHandle)
replaceCtrl:Connect(wx.wxEVT_SET_FOCUS, function(event)
event:Skip()
refreshEditorInfo()
Expand All @@ -1045,7 +1045,7 @@ function findReplace:createPanel()
replaceCtrl:Connect(wx.wxEVT_COMMAND_TEXT_UPDATED, function(event)
self.ac[event:GetEventObject():DynamicCast('wxTextCtrl'):GetId()].needautocomplete = true
end)
replaceCtrl:Connect(wx.wxEVT_CHAR, charHandle)
replaceCtrl:Connect(wx.wxEVT_KEY_DOWN, keyHandle)

-- autocomplete for find/replace can be done from TEXT_UPDATED event,
-- but SetSelection doesn't work from TEXT_UPDATED event on Linux,
Expand All @@ -1055,7 +1055,7 @@ function findReplace:createPanel()
replaceCtrl:Connect(wx.wxEVT_IDLE, autoComplete)

scope:Connect(wx.wxEVT_COMMAND_TEXT_ENTER, findNext)
scope:Connect(wx.wxEVT_CHAR, charHandle)
scope:Connect(wx.wxEVT_KEY_DOWN, keyHandle)

local function notSearching(event) event:Enable(not self.oveditor) end
ctrl:Connect(ID_FINDNEXT, wx.wxEVT_UPDATE_UI, notSearching)
Expand Down

0 comments on commit 7def69b

Please sign in to comment.