accept files in wxHtmlEasyPrinting::{Print,Preview}File, not only URLs

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

diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py
index 304ae1ccbe7f295f14fbc94274cce0d8b21b0395..37a0128442dfce57ee050c8a74b0af177f13f021 100644 (file)
--- a/wxPython/wx/lib/dialogs.py
+++ b/wxPython/wx/lib/dialogs.py
@@ -26,15 +26,16 @@ import  layoutf
 #----------------------------------------------------------------------
 
 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)
 
-        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")
         lc = layoutf.Layoutf('t=t5#1;b=t5#2;l=l5#1;r=r5#1', (self,ok)) 
@@ -150,13 +151,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):
-    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))
-    wSearchText = wx.TextCtrl(dlg, -1, searchText, (70, 7), (195, -1))
+    wSearchText = wx.TextCtrl(dlg, -1, searchText, (80, 7), (195, -1))
     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)