@@ -1,3 +1,4 @@ +import gutil import misc import util @@ -17,6 +18,7 @@ class CharMapDlg(wxDialog): self.insertButton = wxButton(self, -1, " Insert character ") hsizer.Add(self.insertButton, 0, wxALL, 10) EVT_BUTTON(self, self.insertButton.GetId(), self.OnInsert) + gutil.btnDblClick(self.insertButton, self.OnInsert) util.finishWindow(self, hsizer, 0) charmapdlg.py @@ -1,4 +1,5 @@ import config +import gutil import misc import util @@ -95,6 +96,9 @@ class FindDlg(wxDialog): EVT_BUTTON(self, replaceAll.GetId(), self.OnReplaceAll) EVT_BUTTON(self, self.moreButton.GetId(), self.OnMore) + gutil.btnDblClick(find, self.OnFind) + gutil.btnDblClick(replace, self.OnReplace) + EVT_TEXT(self, self.findEntry.GetId(), self.OnText) EVT_TEXT_ENTER(self, self.findEntry.GetId(), self.OnFind) finddlg.py @@ -54,6 +54,16 @@ def createStockButton(parent, label): return wxButton(parent, ids[label]) else: return wxButton(parent, -1, label) + +# wxWidgets has a bug in 2.6 on wxGTK2 where double clicking on a button +# does not send two EVT_BUTTON events, only one. since the wxWidgets +# maintainers do not seem interested in fixing this +# (http://sourceforge.net/tracker/index.php?func=detail&aid=1449838&group_id=9863&atid=109863), +# we work around it ourselves by binding the left mouse button double +# click event to the same callback function on the buggy platforms. +def btnDblClick(btn, func): + if misc.wx26 and misc.isUnix: + EVT_LEFT_DCLICK(btn, func) # show PDF document 'pdfData' in an external viewer program. writes out a # temporary file, first deleting all old temporary files, then opens PDF gutil.py @@ -53,10 +53,12 @@ class HeadersDlg(wxDialog): self.addBtn = gutil.createStockButton(self, "Add") hsizer.Add(self.addBtn) EVT_BUTTON(self, self.addBtn.GetId(), self.OnAddString) + gutil.btnDblClick(self.addBtn, self.OnAddString) self.delBtn = gutil.createStockButton(self, "Delete") hsizer.Add(self.delBtn, 0, wxLEFT, 10) EVT_BUTTON(self, self.delBtn.GetId(), self.OnDeleteString) + gutil.btnDblClick(self.delBtn, self.OnDeleteString) vsizer.Add(hsizer, 0, wxTOP, 5) headersdlg.py @@ -33,18 +33,22 @@ class TitlesDlg(wxDialog): tmp = wxButton(self, -1, "Add") hsizer.Add(tmp) EVT_BUTTON(self, tmp.GetId(), self.OnAddPage) + gutil.btnDblClick(tmp, self.OnAddPage) self.delPageBtn = wxButton(self, -1, "Delete") hsizer.Add(self.delPageBtn, 0, wxLEFT, 10) EVT_BUTTON(self, self.delPageBtn.GetId(), self.OnDeletePage) + gutil.btnDblClick(self.delPageBtn, self.OnDeletePage) self.moveBtn = wxButton(self, -1, "Move") hsizer.Add(self.moveBtn, 0, wxLEFT, 10) EVT_BUTTON(self, self.moveBtn.GetId(), self.OnMovePage) + gutil.btnDblClick(self.moveBtn, self.OnMovePage) self.nextBtn = wxButton(self, -1, "Next") hsizer.Add(self.nextBtn, 0, wxLEFT, 10) EVT_BUTTON(self, self.nextBtn.GetId(), self.OnNextPage) + gutil.btnDblClick(self.nextBtn, self.OnNextPage) vsizer.Add(hsizer, 0, wxTOP, 5) @@ -66,10 +70,12 @@ class TitlesDlg(wxDialog): self.addBtn = gutil.createStockButton(self, "Add") hsizer2.Add(self.addBtn) EVT_BUTTON(self, self.addBtn.GetId(), self.OnAddString) + gutil.btnDblClick(self.addBtn, self.OnAddString) self.delBtn = gutil.createStockButton(self, "Delete") hsizer2.Add(self.delBtn, 0, wxLEFT, 10) EVT_BUTTON(self, self.delBtn.GetId(), self.OnDeleteString) + gutil.btnDblClick(self.delBtn, self.OnDeleteString) vsizer2.Add(hsizer2, 0, wxTOP, 5) titlesdlg.py 3ce096ad47608828b273d2fcc41bcbcd334fafcb Osku Salerma osku@iki.fi http://github.com/oskusalerma/blyte/commit/c7ad032afe6d06904d8c49dea9ca940f4678737a c7ad032afe6d06904d8c49dea9ca940f4678737a 2006-04-09T01:27:34-07:00 2006-04-09T01:27:34-07:00 Work around a wxWidgets bug on wxGTK2 where double clicks on buttons are lost. 2f2a66ad9addcf37144322a9ce475eb5bbc1875d Osku Salerma osku@iki.fi