Changeset 34f23c8 in sasview for src/sas/sasgui/guiframe/gui_manager.py

Timestamp:

Mar 20, 2019 8:06:22 AM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket-1249

Children:

9305b46

Parents:

09d7021

Message:

py3/wx4 compatibility changes for gui. Refs #1249

File:

• src/sas/sasgui/guiframe/gui_manager.py (modified) (5 diffs)

src/sas/sasgui/guiframe/gui_manager.py

@@ -282 +282 @@
         toolbar = self.GetToolBar()
         if toolbar is not None:
-            _, tb_h = toolbar.GetSizeTuple()
+            _, tb_h = toolbar.GetSize()
             height -= tb_h
         return width, height
@@ -948 +948 @@
                 if panel_class.CENTER_PANE:
                     self.panels[str(wx_id)] = panel_class
-                    _, pos_y = frame.GetPositionTuple()
+                    _, pos_y = frame.GetPosition()
                     frame.SetPosition((d_panel_width + 1, pos_y))
                     frame.SetSize((w, h))
@@ -1116 +1116 @@
         if not IS_WIN:
             p.frame.Center()
-            x_pos, _ = p.frame.GetPositionTuple()
+            x_pos, _ = p.frame.GetPosition()
             p.frame.SetPosition((x_pos, 112))
         p.frame.Show(True)
@@ -3011 +3011 @@
         if self.GetToolBar() is not None and self.GetToolBar().IsShown():
             if not IS_LINUX:
-                _, size_y = self.GetToolBar().GetSizeTuple()
+                _, size_y = self.GetToolBar().GetSize()
         return size_y
 
@@ -3130 +3130 @@
         :rtype: tuple
         """
-        width, height = self.GetSizeTuple()
+        width, height = self.GetSize()
         if not IS_WIN:
             # Subtract toolbar height to get real window side