Changeset f994d7cd in sasview

Timestamp:

Mar 24, 2015 6:49:01 AM (10 years ago)

Author:

Doucet, Mathieu <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:

df9492d

Parents:

9dea723 (diff), e10ba48 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview

Files:

• .gitattributes (added)
• src/sas/perspectives/pr/explore_dialog.py (modified) (1 diff)

src/sas/perspectives/pr/explore_dialog.py

@@ -329 +329 @@
         # Ouput selection box
         selection_msg = wx.StaticText(self, -1, "Select a dependent variable:")
-        self.output_box = wx.ComboBox(self, -1)
+        self.output_box = wx.ComboBox(self, -1, style=wx.CB_DROPDOWN)
         for item in self.results.outputs.keys():
             self.output_box.Append(item, "")
         self.output_box.SetStringSelection(DEFAULT_OUTPUT)
+        self.output_box.SetEditable(False)
 
         output_sizer = wx.GridBagSizer(5, 5)