Changeset 572d4be in sasview

Timestamp:

Jul 9, 2008 9:33:36 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2509e86

Parents:

7a2feab

Message:

Mac compatibility

File:

• guitools/PropertyDialog.py (modified) (3 diffs)

guitools/PropertyDialog.py

@@ -7 +7 @@
 class Properties(wx.Dialog):
     def __init__(self, parent, id, title):
-        wx.Dialog.__init__(self, parent, id, "Select the scale of the graph", size=(350, 190))
+        wx.Dialog.__init__(self, parent, id, "Select the scale of the graph")
         """
             for the properties window
         """
         self.parent = parent
-        panel = wx.Panel(self, -1, style=wx.SIMPLE_BORDER)   
         vbox  = wx.BoxSizer(wx.VERTICAL)
-        sizer = wx.GridBagSizer(5,0)
-        vbox.Add(panel, 1, wx.EXPAND | wx.ALL)
+        sizer = wx.GridBagSizer(5,5)
+
+        x_size = 70
 
         ix = 1
         iy = 1
-        sizer.Add(wx.StaticText(panel, -1, 'X'),(iy, ix))
+        sizer.Add(wx.StaticText(self, -1, 'X'),(iy, ix))
         ix += 2
-        sizer.Add(wx.StaticText(panel, -1, 'Y'),(iy, ix))
+        sizer.Add(wx.StaticText(self, -1, 'Y'),(iy, ix))
         ix += 2
-        sizer.Add(wx.StaticText(panel, -1, 'View'),(iy, ix))
+        sizer.Add(wx.StaticText(self, -1, 'View'),(iy, ix))
         iy += 1
         ix = 1
-        self.xvalue = wx.ComboBox(panel, -1)
-        sizer.Add(self.xvalue,(iy,ix))
+        self.xvalue = wx.ComboBox(self, -1)
+        x_size += self.xvalue.GetSize()[0]
+        sizer.Add(self.xvalue,(iy,ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
         ix +=2
-        self.yvalue = wx.ComboBox(panel, -1)
-        sizer.Add( self.yvalue,(iy, ix))
+        self.yvalue = wx.ComboBox(self, -1)
+        x_size += self.yvalue.GetSize()[0]
+        sizer.Add( self.yvalue,(iy, ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+        
         ix +=2
-        self.view =wx.ComboBox(panel, -1)
-        sizer.Add(self.view,(iy,ix))
+        self.view =wx.ComboBox(self, -1)
+        x_size += self.view.GetSize()[0]
+        sizer.Add(self.view,(iy,ix), (1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         
+        self.SetMinSize((x_size,50))
+        
+        vbox.Add(sizer, 0, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
+       
        
         btCancel=wx.Button(self, wx.ID_CANCEL,'Cancel' )
@@ -43 +52 @@
         sizer_button.Add(btOk, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)
         sizer_button.Add(btCancel, 0, wx.LEFT|wx.RIGHT|wx.ADJUST_MINSIZE, 10)        
-        vbox.Add(sizer_button, 0, wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
+        vbox.Add(sizer_button, 0, wx.EXPAND|wx.TOP|wx.BOTTOM|wx.ADJUST_MINSIZE, 10)
  
         
@@ -69 +78 @@
         self.view.Insert("--",0)
         self.view.Insert("Guinier lny vs x^(2)",1)
-        panel.SetSizer(sizer)
+        
         self.SetSizer(vbox)
+        
+        self.Fit()        
         self.Centre()
+        self.CaptureMouse()