Changeset 02098e3 in sasview for src/sas/perspectives/fitting/pagestate.py

Timestamp:

Dec 8, 2015 11:09:13 AM (9 years ago)

Author:

ajj

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:

50a77df

Parents:

12e5cc8 (diff), 1c2bf90 (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:

merging master to integration branch. hopefully successfully this time and with no weird line ending issues

File:

• src/sas/perspectives/fitting/pagestate.py (modified) (2 diffs)

src/sas/perspectives/fitting/pagestate.py

@@ -15 +15 @@
 import os
 import sys
+import wx
 import copy
 import logging
@@ -605 +606 @@
         images = self.set_plot_state(figs, canvases)
         report_list = [report_str, text_str, images]
-        dialog = ReportDialog(report_list, None, -1, "")
+        dialog = ReportDialog(report_list, None, wx.ID_ANY, "")
         dialog.Show()