Use default heights on the buttons

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/lib/dialogs.py b/wxPython/wx/lib/dialogs.py
index 6cf2f1e6d6a5d7d0cdc6530bc4d2f67ad3d01f66..f41541f9dc5937f0b6b3147120de7e2fdfc7a170 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")
+        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,6 +67,7 @@ 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)
@@ -73,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('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)
 
-        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)

diff --git a/wxPython/wx/lib/imagebrowser.py b/wxPython/wx/lib/imagebrowser.py
index d284562058265f9f9f5dbcbeb11a12d0c6ee2ffe..1ff10ca13890c1319e734d1d6c549833e1268b0a 100644 (file)
--- a/wxPython/wx/lib/imagebrowser.py
+++ b/wxPython/wx/lib/imagebrowser.py
@@ -124,7 +124,7 @@ class ImageDialog(wx.Dialog):
         self.y_pos = 20
         self.delta = 20
 
-        size = wx.Size(80, 25)
+        size = wx.Size(80, -1)
 
         self.set_dir = os.getcwd()
         self.set_file = None