Changeset 31f3222b in sasview


Ignore:
Timestamp:
Dec 6, 2011 2:36:16 PM (13 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:
a41034c
Parents:
cb8a972
Message:

Re #5 OSX Cocoa port of wx doesn't allow wx.CB_SORT

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sansguiframe/src/sans/guiframe/data_panel.py

    re4d790f r31f3222b  
    1313import os 
    1414import wx 
     15from wx.build import build_options 
    1516# Check version 
    1617toks = wx.__version__.split('.') 
     
    294295        #wx.EVT_BUTTON(self, self.bt_close_plot.GetId(), self.on_close_plot) 
    295296        
    296         self.cb_plotpanel = wx.ComboBox(self, -1,  
    297                                 style=wx.CB_READONLY|wx.CB_SORT) 
     297        if sys.platform == 'darwin' and build_options.WXPORT == 'osx_cocoa': 
     298            self.cb_plotpanel = wx.ComboBox(self, -1,  
     299                                            style=wx.CB_READONLY) 
     300        else: 
     301            self.cb_plotpanel = wx.ComboBox(self, -1,  
     302                                            style=wx.CB_READONLY|wx.CB_SORT) 
    298303        #self.cb_plotpanel.SetMinSize((BUTTON_WIDTH*2, -1)) 
    299304        wx.EVT_COMBOBOX(self.cb_plotpanel,-1, self._on_plot_selection) 
Note: See TracChangeset for help on using the changeset viewer.