Changeset 015d109 in sasview

Timestamp:

Jan 10, 2011 2:36:38 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

fc292d3

Parents:

2f60121

Message:

use scrolledpanel instead of scrolledwindow

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (3 diffs)
• fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -8 +8 @@
 import math
 import string
+from sans.guiframe.panel_base import PanelBase
 from wx.lib.scrolledpanel import ScrolledPanel
 from sans.guiframe.utils import format_number,check_float
@@ -31 +32 @@
     ON_MAC = True
     
-class BasicPage(wx.ScrolledPanel, PanelBase):
+class BasicPage(ScrolledPanel, PanelBase):
     """
     This class provide general structure of  fitpanel page
@@ -40 +41 @@
     window_caption = "Basic page "
     
-    def __init__(self, parent, page_info):
-        """
-        """
-        wx.ScrolledWindow.__init__(self, parent, 
-                                   style=wx.FULL_REPAINT_ON_RESIZE)
+    def __init__(self, parent, page_info, **kwargs):
+        """
+        """
+        ScrolledPanel.__init__(self, parent, **kwargs)
         PanelBase.__init__(self)
         self.SetupScrolling()

sansview/perspectives/fitting/fitpage.py

@@ -2179 +2179 @@
         if model ==None:
             self.sizer3.Layout()
-            self.SetScrollbars(20,20,25,65)
+            self.SetupScrolling()
             return
         ## the panel is drawn using the current value of the fit engine
@@ -2516 +2516 @@
         self.Layout()
         self.Refresh()
-        self.SetScrollbars(20,20,25,65)
+        #self.SetScrollbars(20,20,25,65)
+        self.SetupScrolling()