Changeset 156a0b2 in sasview for sansview

Timestamp:

Oct 20, 2009 4:44:53 PM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

7ef319e

Parents:

6c13861

Message:

Removed Layout onSetFocus and re- bind evt_set and evt_kill.
Need look at highlight evnts

File:

• sansview/perspectives/fitting/basepage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -158 +158 @@
             wx.TextCtrl.__init__(self, parent, id, value, pos, size, style, validator, name)
             
-            #On Mac, wx.evt.set_focus not work, so skip it.
-            if sys.platform.count("darwin") <= 0:
-                # Bind appropriate events
-                self._on_set_focus_callback = parent.onSetFocus \
-                          if set_focus_callback is None else set_focus_callback
-                self.Bind(wx.EVT_SET_FOCUS, self._on_set_focus)
-                self.Bind(wx.EVT_KILL_FOCUS, parent._onparamEnter \
-                          if kill_focus_callback is None else kill_focus_callback)
-                
+            # Bind appropriate events
+            self._on_set_focus_callback = parent.onSetFocus \
+                      if set_focus_callback is None else set_focus_callback
+            self.Bind(wx.EVT_SET_FOCUS, self._on_set_focus)
+            self.Bind(wx.EVT_KILL_FOCUS, parent._onparamEnter \
+                      if kill_focus_callback is None else kill_focus_callback)                
             self.Bind(wx.EVT_TEXT_ENTER, parent._onparamEnter \
                       if text_enter_callback is None else text_enter_callback)
@@ -545 +542 @@
                     item[4].Clear()
                     item[4].Hide()
-        self.Layout()
+        ##Is this layout necessary? Had a problem w/MAC.
+        #self.Layout()
         return