Minor tweaks to get up to date with wx CVS

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

diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py
index 0800864987b3f0413666b5dad00d95281fd39658..a13f777da93e96d96b1410b9289fe9cab79eda71 100644 (file)
--- a/wxPython/wx/lib/dialogs.py
+++ b/wxPython/wx/lib/dialogs.py
@@ -57,11 +57,6 @@ 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)
         stat = wx.StaticText(self, -1, msg)
         self.lbox = wx.ListBox(self, 100, wx.DefaultPosition, wx.DefaultSize, 
                                lst, wx.LB_MULTIPLE)


@@ -91,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)
 
 


@@ -305,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)
 
 


@@ -333,12 +324,13 @@ def singleChoiceDialog(parent=None, message='', title='', lst=[],
     return result
 
 
     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