Changeset 11b48fb in sasview


Ignore:
Timestamp:
Mar 25, 2017 5:51:21 PM (7 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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
b61bd57
Parents:
74c8cd0 (diff), e76cf11 (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 'ajj-4.1-acknowl-2' of https://www.github.com/sasview/sasview into ajj-4.1-acknowl-2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/acknowledgebox.py

    re11ee1d r74c8cd0  
    7171        self.SetTitle("Acknowledging SasView") 
    7272        #Increased size of box from (525, 225), SMK, 04/10/16 
    73         self.SetSize((600, 320)) 
     73        self.SetClientSize((600, 320)) 
    7474        # end wxGlade 
    7575 
     
    9494        self.Layout() 
    9595        self.Centre() 
     96        #self.SetClientSize(sizer_main.GetSize()) 
    9697        # end wxGlade 
    9798 
Note: See TracChangeset for help on using the changeset viewer.