Changeset b9f6d83 in sasview for src/sans/guiframe/data_panel.py

Timestamp:

Apr 1, 2014 5:23:29 AM (10 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:

aba5876

Parents:

b099388

Message:

Re #216 Merging wx30 branch

File:

• src/sans/guiframe/data_panel.py (modified) (1 diff)

src/sans/guiframe/data_panel.py

@@ -329 +329 @@
         wx.EVT_BUTTON(self, self.bt_freeze.GetId(), self.on_freeze)
        
-        if sys.platform == 'darwin' and build_options.WXPORT == 'osx_cocoa':
+        if sys.platform == 'darwin':
             self.cb_plotpanel = wx.ComboBox(self, -1, 
                                             style=wx.CB_READONLY)