Changeset 0f815f9 in sasview

Timestamp:

Jun 22, 2011 1:35:11 PM (14 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:

09a9660

Parents:

889e9f8

Message:

try wx2.9 oriented(MAC)

Location:

guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (2 diffs)
• plotting.py (modified) (2 diffs)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -142 +142 @@
         # It was found that wx >= 2.9.3 sends an event even if no size changed.
         # So manually recode the size (=x_size) and compare here.
-        """
+
+        if event != None: 
+                event.Skip() 
         if self.x_size != None:
             if self.x_size == self.GetSize():
@@ -149 +151 @@
                 return
         self.x_size = self.GetSize()
-        """
+
         # Ready for another event
         # Do not remove this Skip. Otherwise it will get runtime error on wx>=2.9.

guiframe/local_perspectives/plotting/plotting.py

@@ -159 +159 @@
         self.menu.AppendCheckItem(event_id, new_panel.window_caption, 
                          "Show %s plot panel" % new_panel.window_caption)
-        self.menu.Check(event_id, IS_WIN)
+        self.menu.Check(event_id, True)#IS_WIN)
         wx.EVT_MENU(self.parent, event_id, self._on_check_menu)
 
@@ -308 +308 @@
         if self.menu.IsChecked(event_id):
             self.parent.on_view(event)
-            self.menu.Check(event_id, IS_WIN)
+            self.menu.Check(event_id, True)#IS_WIN)
         else:
             self.parent.hide_panel(event_id)