@@ -46,10 +46,10 @@ class AutoCompletionDlg(wxDialog): hsizer.Add((1, 1), 1) - cancelBtn = gutil.createStockButton(self, wxID_CANCEL, "Cancel") + cancelBtn = gutil.createStockButton(self, "Cancel") hsizer.Add(cancelBtn, 0, wxLEFT, 10) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") hsizer.Add(okBtn, 0, wxLEFT, 10) vsizer.Add(hsizer, 0, wxEXPAND | wxTOP, 10) autocompletiondlg.py @@ -110,13 +110,13 @@ class CfgDlg(wxDialog): hsizer.Add((1, 1), 1) - applyBtn = gutil.createStockButton(self, wxID_APPLY, "Apply") + applyBtn = gutil.createStockButton(self, "Apply") hsizer.Add(applyBtn, 0, wxALL, 5) - cancelBtn = gutil.createStockButton(self, wxID_CANCEL, "Cancel") + cancelBtn = gutil.createStockButton(self, "Cancel") hsizer.Add(cancelBtn, 0, wxALL, 5) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") hsizer.Add(okBtn, 0, wxALL, 5) vsizer.Add(hsizer, 0, wxEXPAND) cfgdlg.py @@ -35,11 +35,20 @@ def listBoxAdd(lb, name, cdata): lb.Append(name, cdata) -# create stock button. id is wxID_APPLY etc. WX2.6-FIXME: remove this, -# have callers do this directly. -def createStockButton(parent, id, label): +# create stock button. WX2.6-FIXME: remove this, have callers do this +# directly. +def createStockButton(parent, label): if misc.wx26: - return wxButton(parent, id) + ids = { + "OK" : wxID_OK, + "Cancel" : wxID_CANCEL, + "Apply" : wxID_APPLY, + "Add" : wxID_ADD, + "Delete" : wxID_DELETE, + "Preview" : wxID_PREVIEW + } + + return wxButton(parent, ids[label]) else: return wxButton(parent, -1, label) gutil.py @@ -50,11 +50,11 @@ class HeadersDlg(wxDialog): hsizer = wxBoxSizer(wxHORIZONTAL) - self.addBtn = gutil.createStockButton(self, wxID_ADD, "Add") + self.addBtn = gutil.createStockButton(self, "Add") hsizer.Add(self.addBtn) EVT_BUTTON(self, self.addBtn.GetId(), self.OnAddString) - self.delBtn = gutil.createStockButton(self, wxID_DELETE, "Delete") + self.delBtn = gutil.createStockButton(self, "Delete") hsizer.Add(self.delBtn, 0, wxLEFT, 10) EVT_BUTTON(self, self.delBtn.GetId(), self.OnDeleteString) @@ -135,16 +135,16 @@ class HeadersDlg(wxDialog): hsizer.Add((1, 1), 1) - previewBtn = gutil.createStockButton(self, wxID_PREVIEW, "Preview") + previewBtn = gutil.createStockButton(self, "Preview") hsizer.Add(previewBtn) - applyBtn = gutil.createStockButton(self, wxID_APPLY, "Apply") + applyBtn = gutil.createStockButton(self, "Apply") hsizer.Add(applyBtn, 0, wxLEFT, 10) - cancelBtn = gutil.createStockButton(self, wxID_CANCEL, "Cancel") + cancelBtn = gutil.createStockButton(self, "Cancel") hsizer.Add(cancelBtn, 0, wxLEFT, 10) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") hsizer.Add(okBtn, 0, wxLEFT, 10) vsizer.Add(hsizer, 0, wxEXPAND | wxTOP, 20) headersdlg.py @@ -21,11 +21,11 @@ class LocationsDlg(wxDialog): hsizer = wxBoxSizer(wxHORIZONTAL) - self.addBtn = gutil.createStockButton(self, wxID_ADD, "Add") + self.addBtn = gutil.createStockButton(self, "Add") hsizer.Add(self.addBtn) EVT_BUTTON(self, self.addBtn.GetId(), self.OnAdd) - self.delBtn = gutil.createStockButton(self, wxID_DELETE, "Delete") + self.delBtn = gutil.createStockButton(self, "Delete") hsizer.Add(self.delBtn, 0, wxLEFT, 10) EVT_BUTTON(self, self.delBtn.GetId(), self.OnDelete) @@ -42,10 +42,10 @@ class LocationsDlg(wxDialog): hsizer.Add((1, 1), 1) - cancelBtn = gutil.createStockButton(self, wxID_CANCEL, "Cancel") + cancelBtn = gutil.createStockButton(self, "Cancel") hsizer.Add(cancelBtn, 0, wxLEFT, 10) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") hsizer.Add(okBtn, 0, wxLEFT, 10) vsizer.Add(hsizer, 0, wxEXPAND | wxTOP, 10) locationsdlg.py @@ -129,10 +129,10 @@ class ScriptChooserDlg(wxDialog): hsizer.Add((1, 1), 1) - cancelBtn = gutil.createStockButton(self, wxID_CANCEL, "Cancel") + cancelBtn = gutil.createStockButton(self, "Cancel") hsizer.Add(cancelBtn) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") hsizer.Add(okBtn, 0, wxLEFT, 10) vsizer.Add(hsizer, 0, wxEXPAND | wxTOP, 10) @@ -221,10 +221,10 @@ class CheckBoxDlg(wxDialog): hsizer.Add((1, 1), 1) - cancelBtn = gutil.createStockButton(self, wxID_CANCEL, "Cancel") + cancelBtn = gutil.createStockButton(self, "Cancel") hsizer.Add(cancelBtn) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") hsizer.Add(okBtn, 0, wxLEFT, 10) vsizer.Add(hsizer, 0, wxEXPAND | wxTOP, 10) @@ -351,7 +351,7 @@ class TextDlg(wxDialog): vsizer.Add(wxStaticLine(self, -1), 0, wxEXPAND | wxTOP | wxBOTTOM, 5) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") vsizer.Add(okBtn, 0, wxALIGN_CENTER) util.finishWindow(self, vsizer) @@ -392,10 +392,10 @@ class TextInputDlg(wxDialog): hsizer = wxBoxSizer(wxHORIZONTAL) - cancelBtn = gutil.createStockButton(self, wxID_CANCEL, "Cancel") + cancelBtn = gutil.createStockButton(self, "Cancel") hsizer.Add(cancelBtn) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") hsizer.Add(okBtn, 0, wxLEFT, 10) vsizer.Add(hsizer, 0, wxEXPAND | wxTOP, 5) misc.py @@ -28,10 +28,10 @@ class SCDictDlg(wxDialog): hsizer.Add((1, 1), 1) - cancelBtn = gutil.createStockButton(self, wxID_CANCEL, "Cancel") + cancelBtn = gutil.createStockButton(self, "Cancel") hsizer.Add(cancelBtn, 0, wxLEFT, 10) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") hsizer.Add(okBtn, 0, wxLEFT, 10) vsizer.Add(hsizer, 0, wxEXPAND | wxTOP, 10) spellcheckcfgdlg.py @@ -63,11 +63,11 @@ class TitlesDlg(wxDialog): hsizer2 = wxBoxSizer(wxHORIZONTAL) - self.addBtn = gutil.createStockButton(self, wxID_ADD, "Add") + self.addBtn = gutil.createStockButton(self, "Add") hsizer2.Add(self.addBtn) EVT_BUTTON(self, self.addBtn.GetId(), self.OnAddString) - self.delBtn = gutil.createStockButton(self, wxID_DELETE, "Delete") + self.delBtn = gutil.createStockButton(self, "Delete") hsizer2.Add(self.delBtn, 0, wxLEFT, 10) EVT_BUTTON(self, self.delBtn.GetId(), self.OnDeleteString) @@ -171,14 +171,13 @@ class TitlesDlg(wxDialog): hsizer.Add((1, 1), 1) - self.previewBtn = gutil.createStockButton(self, wxID_PREVIEW, - "Preview") + self.previewBtn = gutil.createStockButton(self, "Preview") hsizer.Add(self.previewBtn) - cancelBtn = gutil.createStockButton(self, wxID_CANCEL, "Cancel") + cancelBtn = gutil.createStockButton(self, "Cancel") hsizer.Add(cancelBtn, 0, wxLEFT, 10) - okBtn = gutil.createStockButton(self, wxID_OK, "OK") + okBtn = gutil.createStockButton(self, "OK") hsizer.Add(okBtn, 0, wxLEFT, 10) vsizer.Add(hsizer, 0, wxEXPAND | wxTOP, 20) titlesdlg.py 9cdd416230f8c3d900e4512dcf1e2b7013e7760d Osku Salerma osku@iki.fi http://github.com/oskusalerma/blyte/commit/b2caaa30122f6f95611ef499e4aae8234eec45c7 b2caaa30122f6f95611ef499e4aae8234eec45c7 2006-03-06T12:25:33-08:00 2006-03-06T12:25:33-08:00 Fix bogosities in r476: Redesign stock button creation API so it actually works in wxWidgets 2.4 as well. 7759ce7256013f03621d37ced068dc0c13086739 Osku Salerma osku@iki.fi