Changeset d0923a3 in sasview for sansguiframe/src/sans/guiframe/gui_manager.py

Timestamp:

Apr 25, 2013 2:16:58 PM (11 years ago)

Author:

Jae Cho <jhjcho@…>

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:

523f828

Parents:

8833c77

Message:

Instead of mdi, use wxframe on linux

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (6 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -194 +194 @@
 CLOSE_SHOW = True
 TIME_FACTOR = 2
+MDI_STYLE = wx.DEFAULT_FRAME_STYLE
 NOT_SO_GRAPH_LIST = ["BoxSum"]
-if sys.platform.count("darwin") > 0:
+PARENT_FRAME = wx.MDIParentFrame
+CHILD_FRAME = wx.MDIChildFrame
+if sys.platform.count("win32") < 1:
     IS_WIN = False
     TIME_FACTOR = 2
@@ -201 +204 @@
         if int(str(wx.__version__).split('.')[1]) < 9:
             CLOSE_SHOW = False
-    
-class ViewerFrame(wx.MDIParentFrame):
+    if sys.platform.count("darwin") < 1:
+        PARENT_FRAME = wx.Frame
+        CHILD_FRAME = wx.Frame
+    
+class ViewerFrame(PARENT_FRAME):
     """
     Main application frame
@@ -216 +222 @@
         """
 
-        wx.MDIParentFrame.__init__(self, parent=parent, title=title, pos=pos, size=size)
+        PARENT_FRAME.__init__(self, parent=parent, title=title, pos=pos, size=size)
         # title
         self.title = title
@@ -1176 +1182 @@
         p.window_name = windowname + str(self.graph_num)
         
-        style1 = self.__gui_style & GUIFRAME.FIXED_PANEL
-        style2 = self.__gui_style & GUIFRAME.FLOATING_PANEL
+        #style1 = self.__gui_style & GUIFRAME.FIXED_PANEL
+        #style2 = self.__gui_style & GUIFRAME.FLOATING_PANEL
         
         p.frame.SetTitle(p.window_caption)
@@ -3406 +3412 @@
 
 
-class MDIFrame(wx.MDIChildFrame):
+class MDIFrame(CHILD_FRAME):
     """
     Frame for panels
@@ -3418 +3424 @@
         kwds['size']= size
         kwds['title']= title
+        kwds['style'] = MDI_STYLE
         # Initialize the Frame object
-        wx.MDIChildFrame.__init__(self, parent, *args, **kwds)
+        CHILD_FRAME.__init__(self, parent, *args, **kwds)
         self.parent = parent
         self.name = "Untitled"