added a test to check how exception handling works with Win32 SEH; corrected copyright

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

diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py
index 7d79bb51a40cc9f16aa278c2e0ddad0d24198c68..f41541f9dc5937f0b6b3147120de7e2fdfc7a170 100644 (file)
--- a/wxPython/wx/lib/dialogs.py
+++ b/wxPython/wx/lib/dialogs.py
@@ -1,6 +1,6 @@
 #----------------------------------------------------------------------
 #----------------------------------------------------------------------

-# Name:        wxPython.lib.dialogs
-# Purpose:     wxScrolledMessageDialog, wxMultipleChoiceDialog and
+# Name:        wx.lib.dialogs
+# Purpose:     ScrolledMessageDialog, MultipleChoiceDialog and

 #              function wrappers for the common dialogs by Kevin Altis.
 #
 # Author:      Various
 #              function wrappers for the common dialogs by Kevin Altis.
 #
 # Author:      Various


@@ -26,21 +26,23 @@ import  layoutf
 #----------------------------------------------------------------------
 
 class ScrolledMessageDialog(wx.Dialog):
 #----------------------------------------------------------------------
 
 class ScrolledMessageDialog(wx.Dialog):

-    def __init__(self, parent, msg, caption, pos = wx.DefaultPosition, 
-                 size = (500,300)):
-        wx.Dialog.__init__(self, parent, -1, caption, pos, size)
+    def __init__(self, parent, msg, caption,
+                 pos=wx.DefaultPosition, size=(500,300),
+                 style=wx.DEFAULT_DIALOG_STYLE):
+        wx.Dialog.__init__(self, parent, -1, caption, pos, size, style)

         x, y = pos
         if x == -1 and y == -1:
             self.CenterOnScreen(wx.BOTH)
 
         x, y = pos
         if x == -1 and y == -1:
             self.CenterOnScreen(wx.BOTH)
 

-        text = wx.TextCtrl(self, -1, msg, wx.DefaultPosition, wx.DefaultSize,
-                           wx.TE_MULTILINE | wx.TE_READONLY)
+        text = wx.TextCtrl(self, -1, msg, 
+                           style=wx.TE_MULTILINE | wx.TE_READONLY)

 
         ok = wx.Button(self, wx.ID_OK, "OK")
 
         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()


@@ -65,6 +67,7 @@ class MultipleChoiceDialog(wx.Dialog):
                                lst, wx.LB_MULTIPLE)
 
         ok = wx.Button(self, wx.ID_OK, "OK")
                                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)
         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)


@@ -72,10 +75,10 @@ class MultipleChoiceDialog(wx.Dialog):
         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('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,))
+        lc = layoutf.Layoutf('b=b5#1;x%w25#1;w!80;h*', (self,))

         ok.SetConstraints(lc)
 
         ok.SetConstraints(lc)
 

-        lc = layoutf.Layoutf('b=b5#1;x%w75#1;w!80;h!25', (self,))
+        lc = layoutf.Layoutf('b=b5#1;x%w75#1;w!80;h*', (self,))

         cancel.SetConstraints(lc)
         
         self.SetAutoLayout(1)
         cancel.SetConstraints(lc)
         
         self.SetAutoLayout(1)


@@ -150,13 +153,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.wxButton(dlg, wx.ID_OK, "Find Next", (280, 5), wx.DefaultSize).SetDefault()
-    wx.wxButton(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)
 


@@ -172,9 +176,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
 


@@ -218,9 +222,11 @@ def colourDialog(parent=None, colourData=None, colour=None):
 def fontDialog(parent=None, fontData=None, font=None):
     if fontData is None:
         fontData = wx.FontData()
 def fontDialog(parent=None, fontData=None, font=None):
     if fontData is None:
         fontData = wx.FontData()

+        fontData.SetColour(wx.BLACK)
+        fontData.SetInitialFont(wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT))

 
     if font is not None:
 
     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())


@@ -319,7 +325,7 @@ 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()
     result = DialogResults(dialog.ShowModal())
     result.selection = dialog.GetStringSelection()
     dialog.Destroy()


@@ -337,14 +343,16 @@ def multipleChoiceDialog(parent=None, message='', title='', lst=[], pos=wx.Defau
 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':

+    #import os
+    #print os.getpid()
+    

     class MyApp(wx.App):
 
         def OnInit(self):
     class MyApp(wx.App):
 
         def OnInit(self):

-            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
 

-            frame.Show(1)

 
             dialogNames = [
                 'alertDialog',
 
             dialogNames = [
                 'alertDialog',


@@ -361,16 +369,27 @@ if __name__ == '__main__':
                 'singleChoiceDialog',
                 'textEntryDialog',
             ]
                 'singleChoiceDialog',
                 'textEntryDialog',
             ]

-            self.nameList = wx.ListBox(panel, -1, (0, 0), (130, 180), dialogNames, style=wx.LB_SINGLE)
-            self.Bind(wx.EVT_LISTBOX, self.OnNameListSelected, id=self.nameList.GetId())
+
+            self.nameList = wx.ListBox(panel, -1,
+                                       size=(130, 180),
+                                       choices=dialogNames,
+                                       style=wx.LB_SINGLE)
+            self.Bind(wx.EVT_LISTBOX, self.OnNameListSelected, self.nameList)

 
             tstyle = wx.TE_RICH2 | wx.TE_PROCESS_TAB | wx.TE_MULTILINE
 
             tstyle = wx.TE_RICH2 | wx.TE_PROCESS_TAB | wx.TE_MULTILINE

-            self.text1 = wx.TextCtrl(panel, -1, pos=(150, 0), size=(200, 180), style=tstyle)
+            self.text1 = wx.TextCtrl(panel, -1, size=(200, 180), style=tstyle)

 
 

-            self.SetTopWindow(frame)
+            sizer = wx.BoxSizer(wx.HORIZONTAL)
+            sizer.Add(self.nameList, 0, wx.EXPAND|wx.ALL, 20)
+            sizer.Add(self.text1, 1,  wx.EXPAND|wx.ALL, 20)

 
 

+            panel.SetSizer(sizer)
+
+            self.SetTopWindow(frame)
+            frame.Show(1)

             return 1
 
             return 1
 

+

         def OnNameListSelected(self, evt):
             import pprint
             sel = evt.GetString()
         def OnNameListSelected(self, evt):
             import pprint
             sel = evt.GetString()


@@ -390,8 +409,8 @@ if __name__ == '__main__':
                 result = fontDialog()
             elif sel == 'messageDialog':
                 result = messageDialog(None, 'Hello from Python and wxPython!',
                 result = fontDialog()
             elif sel == 'messageDialog':
                 result = messageDialog(None, 'Hello from Python and wxPython!',

-                          'A Message Box', wx.wxOK | wx.wxICON_INFORMATION)
-                          #wx.wxYES_NO | wx.wxNO_DEFAULT | wx.wxCANCEL | wx.wxICON_INFORMATION)
+                          'A Message Box', wx.OK | wx.ICON_INFORMATION)
+                          #wx.YES_NO | wx.NO_DEFAULT | wx.CANCEL | wx.ICON_INFORMATION)

                 #result = messageDialog(None, 'message', 'title')
             elif sel == 'multipleChoiceDialog':
                 result = multipleChoiceDialog(None, "message", "title", ['one', 'two', 'three'])
                 #result = messageDialog(None, 'message', 'title')
             elif sel == 'multipleChoiceDialog':
                 result = multipleChoiceDialog(None, "message", "title", ['one', 'two', 'three'])