reduce the number of objects for a quicker startup time

[wxWidgets.git] / wxPython / wx / lib / dialogs.py

diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py
index 7770bb2315857d3fb7d5403add1a44c6429ac1c9..a13f777da93e96d96b1410b9289fe9cab79eda71 100644 (file)
--- 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")
                            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('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()
         ok.SetConstraints(lc)
         self.SetAutoLayout(1)
         self.Layout()


@@ -56,30 +57,27 @@ class MultipleChoiceDialog(wx.Dialog):
         if x == -1 and y == -1:
             self.CenterOnScreen(wx.BOTH)
 
         if x == -1 and y == -1:
             self.CenterOnScreen(wx.BOTH)
 

-        dc = wx.ClientDC(self)
-        height = 0
-        for line in msg.splitlines():
-            height = height + dc.GetTextExtent(line)[1] + 2
-

         stat = wx.StaticText(self, -1, msg)
         self.lbox = wx.ListBox(self, 100, wx.DefaultPosition, wx.DefaultSize, 
                                lst, wx.LB_MULTIPLE)
 
         ok = wx.Button(self, wx.ID_OK, "OK")
         stat = wx.StaticText(self, -1, msg)
         self.lbox = wx.ListBox(self, 100, wx.DefaultPosition, wx.DefaultSize, 
                                lst, wx.LB_MULTIPLE)
 
         ok = wx.Button(self, wx.ID_OK, "OK")

+        ok.SetDefault()

         cancel = wx.Button(self, wx.ID_CANCEL, "Cancel")
         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)

         
         

-        self.SetAutoLayout(1)
+        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.lst = lst
         self.Layout()
 
         self.lst = lst
         self.Layout()
 


@@ -88,11 +86,7 @@ class MultipleChoiceDialog(wx.Dialog):
 
     def GetValueString(self):
         sel = self.lbox.GetSelections()
 
     def GetValueString(self):
         sel = self.lbox.GetSelections()

-        val = []
-
-        for i in sel:
-            val.append(self.lst[i])
-
+        val = [ self.lst[i] for i in sel ]

         return tuple(val)
 
 
         return tuple(val)
 
 


@@ -151,13 +145,14 @@ def returnedString(ret):
 ## this dialog is always modal, while wxFindReplaceDialog is
 ## modeless and so doesn't lend itself to a function wrapper
 def findDialog(parent=None, searchText='', wholeWordsOnly=0, caseSensitive=0):
 ## this dialog is always modal, while wxFindReplaceDialog is
 ## modeless and so doesn't lend itself to a function wrapper
 def findDialog(parent=None, searchText='', wholeWordsOnly=0, caseSensitive=0):

-    dlg = wx.Dialog(parent, -1, "Find", wx.DefaultPosition, (370, 120))
+    dlg = wx.Dialog(parent, -1, "Find", wx.DefaultPosition, (380, 120))

 
     wx.StaticText(dlg, -1, 'Find what:', (7, 10))
 
     wx.StaticText(dlg, -1, 'Find what:', (7, 10))

-    wSearchText = wx.TextCtrl(dlg, -1, searchText, (70, 7), (195, -1))
+    wSearchText = wx.TextCtrl(dlg, -1, searchText, (80, 7), (195, -1))

     wSearchText.SetValue(searchText)
     wSearchText.SetValue(searchText)

-    wx.Button(dlg, wx.ID_OK, "Find Next", (280, 5), wx.DefaultSize).SetDefault()
-    wx.Button(dlg, wx.ID_CANCEL, "Cancel", (280, 35), wx.DefaultSize)
+    wx.Button(dlg, wx.ID_OK, "Find Next", (285, 5), wx.DefaultSize).SetDefault()
+    wx.Button(dlg, wx.ID_CANCEL, "Cancel", (285, 35), wx.DefaultSize)
+

     wWholeWord = wx.CheckBox(dlg, -1, 'Match whole word only',
                             (7, 35), wx.DefaultSize, wx.NO_BORDER)
 
     wWholeWord = wx.CheckBox(dlg, -1, 'Match whole word only',
                             (7, 35), wx.DefaultSize, wx.NO_BORDER)
 


@@ -173,9 +168,9 @@ def findDialog(parent=None, searchText='', wholeWordsOnly=0, caseSensitive=0):
     wSearchText.SetFocus()
 
     result = DialogResults(dlg.ShowModal())
     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
 
     dlg.Destroy()
     return result
 


@@ -223,7 +218,7 @@ def fontDialog(parent=None, fontData=None, font=None):
         fontData.SetInitialFont(wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT))
 
     if font is not 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())
 
     dialog = wx.FontDialog(parent, fontData)
     result = DialogResults(dialog.ShowModal())


@@ -301,7 +296,7 @@ def openFileDialog(parent=None, title='Open', directory='', filename='',
 
 def saveFileDialog(parent=None, title='Save', directory='', filename='',
                    wildcard='All Files (*.*)|*.*',
 
 def saveFileDialog(parent=None, title='Save', directory='', filename='',
                    wildcard='All Files (*.*)|*.*',

-                   style=wx.SAVE | wx.HIDE_READONLY | wx.OVERWRITE_PROMPT):
+                   style=wx.SAVE | wx.OVERWRITE_PROMPT):

     return fileDialog(parent, title, directory, filename, wildcard, style)
 
 
     return fileDialog(parent, title, directory, filename, wildcard, style)
 
 


@@ -322,19 +317,20 @@ directoryDialog = dirDialog
 
 def singleChoiceDialog(parent=None, message='', title='', lst=[], 
                        style=wx.OK | wx.CANCEL | wx.CENTRE):
 
 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()
     return result
 
 
     result = DialogResults(dialog.ShowModal())
     result.selection = dialog.GetStringSelection()
     dialog.Destroy()
     return result
 
 

-def multipleChoiceDialog(parent=None, message='', title='', lst=[], pos=wx.DefaultPosition, 
-                         size=(200,200)):
+def multipleChoiceDialog(parent=None, message='', title='', lst=[],
+                         pos=wx.DefaultPosition, size=wx.DefaultSize):

 
 

-    dialog = MultipleChoiceDialog(parent, message, title, lst, pos, size)
+    dialog = wx.MultiChoiceDialog(parent, message, title, lst,
+                                  wx.CHOICEDLG_STYLE, pos)

     result = DialogResults(dialog.ShowModal())
     result = DialogResults(dialog.ShowModal())

-    result.selection = dialog.GetValueString()
+    result.selection = tuple([lst[i] for i in dialog.GetSelections()])

     dialog.Destroy()
     return result
 
     dialog.Destroy()
     return result
 


@@ -346,7 +342,7 @@ if __name__ == '__main__':
     class MyApp(wx.App):
 
         def OnInit(self):
     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
 
             panel = wx.Panel(frame, -1)
             self.panel = panel