X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e26b2b2aad3d2cfc35546a8275e8401c518f08d..42f8298f6f42d5d63bb3caf65682b7d9d9f8b702:/wxPython/wx/lib/dialogs.py?ds=sidebyside diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py index 37a0128442..395d36dde8 100644 --- a/wxPython/wx/lib/dialogs.py +++ b/wxPython/wx/lib/dialogs.py @@ -38,10 +38,11 @@ class ScrolledMessageDialog(wx.Dialog): style=wx.TE_MULTILINE | wx.TE_READONLY) ok = wx.Button(self, wx.ID_OK, "OK") + ok.SetDefault() lc = layoutf.Layoutf('t=t5#1;b=t5#2;l=l5#1;r=r5#1', (self,ok)) text.SetConstraints(lc) - lc = layoutf.Layoutf('b=b5#1;x%w50#1;w!80;h!25', (self,)) + lc = layoutf.Layoutf('b=b5#1;x%w50#1;w!80;h*', (self,)) ok.SetConstraints(lc) self.SetAutoLayout(1) self.Layout() @@ -66,18 +67,21 @@ class MultipleChoiceDialog(wx.Dialog): lst, wx.LB_MULTIPLE) ok = wx.Button(self, wx.ID_OK, "OK") + ok.SetDefault() cancel = wx.Button(self, wx.ID_CANCEL, "Cancel") - lc = layoutf.Layoutf('t=t10#1;l=l5#1;r=r5#1;h!%d' % (height,), (self,)) - stat.SetConstraints(lc) - - lc = layoutf.Layoutf('t=b10#2;l=l5#1;r=r5#1;b=t5#3', (self, stat, ok)) - self.lbox.SetConstraints(lc) - - lc = layoutf.Layoutf('b=b5#1;x%w25#1;w!80;h!25', (self,)) - ok.SetConstraints(lc) - - lc = layoutf.Layoutf('b=b5#1;x%w75#1;w!80;h!25', (self,)) - cancel.SetConstraints(lc) + + dlgsizer = wx.BoxSizer(wx.VERTICAL) + dlgsizer.Add(stat, 0, wx.ALL, 4) + dlgsizer.Add(self.lbox, 1, wx.EXPAND | wx.ALL, 4) + + btnsizer = wx.StdDialogButtonSizer() + btnsizer.AddButton(ok) + btnsizer.AddButton(cancel) + btnsizer.Realize() + + dlgsizer.Add(btnsizer, 0, wx.ALL | wx.ALIGN_RIGHT, 4) + + self.SetSizer(dlgsizer) self.SetAutoLayout(1) self.lst = lst @@ -174,9 +178,9 @@ def findDialog(parent=None, searchText='', wholeWordsOnly=0, caseSensitive=0): wSearchText.SetFocus() result = DialogResults(dlg.ShowModal()) - result.text = wSearchText.GetValue() - result.wholeword = wWholeWord.GetValue() - result.casesensitive = wCase.GetValue() + result.searchText = wSearchText.GetValue() + result.wholeWordsOnly = wWholeWord.GetValue() + result.caseSensitive = wCase.GetValue() dlg.Destroy() return result @@ -224,7 +228,7 @@ def fontDialog(parent=None, fontData=None, font=None): fontData.SetInitialFont(wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT)) if font is not None: - aFontData.SetInitialFont(font) + fontData.SetInitialFont(font) dialog = wx.FontDialog(parent, fontData) result = DialogResults(dialog.ShowModal()) @@ -323,7 +327,7 @@ directoryDialog = dirDialog def singleChoiceDialog(parent=None, message='', title='', lst=[], style=wx.OK | wx.CANCEL | wx.CENTRE): - dialog = wx.SingleChoiceDialog(parent, message, title, lst, style) + dialog = wx.SingleChoiceDialog(parent, message, title, list(lst), style | wx.DEFAULT_DIALOG_STYLE) result = DialogResults(dialog.ShowModal()) result.selection = dialog.GetStringSelection() dialog.Destroy() @@ -347,7 +351,7 @@ if __name__ == '__main__': class MyApp(wx.App): def OnInit(self): - self.frame = frame = wx.Frame(None, -1, "Dialogs", size=(400, 200)) + self.frame = frame = wx.Frame(None, -1, "Dialogs", size=(400, 240)) panel = wx.Panel(frame, -1) self.panel = panel