mwxlib 0.97.6__py3-none-any.whl → 0.97.7__py3-none-any.whl

mwx/controls.py

@@ -8,7 +8,6 @@ import wx.lib.scrolledpanel as scrolled
 
 from . import images
 from .utilus import SSM
-from .utilus import warn
 from .utilus import funcall as _F
 from .framework import pack, Menu
 

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "0.97.6"
+__version__ = "0.97.7"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -506,15 +506,19 @@ def pack(self, items, orient=wx.HORIZONTAL, style=None, label=None):
                             ALIGN_CENTER_VERTICAL, ALIGN_CENTER_HORIZONTAL
     """
     if style is None:
-        style = (0, wx.EXPAND | wx.ALL, 0)
-    if label is not None:
+        style = (0, wx.EXPAND | wx.ALL, 0) # DEFALT_STYLE (prop, flag, border)
+    if label is None:
+        sizer = wx.BoxSizer(orient)
+    else:
         box = wx.StaticBox(self, -1, label)
         sizer = wx.StaticBoxSizer(box, orient)
-    else:
-        sizer = wx.BoxSizer(orient)
     for item in items:
+        if not isinstance(item, (wx.Object, list, tuple, type(None))):
+            warn(f"pack items must be a wx.Object, tuple or None, not {type(item)}")
         if item is None:
-            item = ((0, 0), 0, 0, 0) # null space
+            item = (0, 0), 0, 0, 0 # null space
+        elif not item:
+            item = (0, 0) # padding space
         try:
             try:
                 sizer.Add(item, *style)
@@ -522,8 +526,7 @@ def pack(self, items, orient=wx.HORIZONTAL, style=None, label=None):
                 sizer.Add(*item) # using item-specific style
         except TypeError as e:
             traceback.print_exc()
-            bmp = wx.StaticBitmap(self,
-                    bitmap=wx.ArtProvider.GetBitmap(wx.ART_ERROR))
+            bmp = wx.StaticBitmap(self, bitmap=wx.ArtProvider.GetBitmap(wx.ART_ERROR))
             bmp.SetToolTip(str(e))
             sizer.Add(bmp, 0, wx.EXPAND | wx.ALL, 0)
             wx.Bell()

{mwxlib-0.97.6.dist-info → mwxlib-0.97.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mwxlib
-Version: 0.97.6
+Version: 0.97.7
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto

{mwxlib-0.97.6.dist-info → mwxlib-0.97.7.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mwx/__init__.py,sha256=nN62CGTWjME7Zz2h-jIRB8MxwuErIkHPGrlBzydkF0o,643
 mwx/bookshelf.py,sha256=Y4xI2SrEO22DrI1hyyfFx7DfFZA8znOzX9RWMPsA2BE,5137
-mwx/controls.py,sha256=LAPGoi_bpiGu6eGhPVHBzv2hx162kWxYBmzlZouMOdk,47582
-mwx/framework.py,sha256=r9nbxrRta0lQat7wWzgBOlHkNay9TYSHHikm1gDRhuk,75209
+mwx/controls.py,sha256=K4GJB81TXv5q0faTELQgbUmtMQBRIM9yINJdTI0xA3g,47556
+mwx/framework.py,sha256=muvp-MrmS8TGwpRx7S18X2u-nhS9YumUHA1K_MRKCwA,75443
 mwx/graphman.py,sha256=Cyhl_Da_HGBfk721gu1r5iwSH9L3yPEG8Fzmc2gx-EU,70462
 mwx/images.py,sha256=_-Eh3xF7Khu42ivkYp97NXIzSNGbjcidqtWjZQFGtqE,47827
 mwx/matplot2.py,sha256=xCJ_ZzdDEWmzctpPaOrzTnwXyHINP4nfFHweoTZa6ug,32899
@@ -21,8 +21,8 @@ mwx/plugins/frame_listview.py,sha256=hbApzZWa9-BmQthu7uZBlBbGbtf4iJ_prO8IhxoGMs8
 mwx/plugins/line_profile.py,sha256=--9NIc3x5EfRB3L59JvD7rzENQHyiYfu7wWJo6AuMkA,820
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-0.97.6.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
-mwxlib-0.97.6.dist-info/METADATA,sha256=j9v4RwJ93aqB5yYTBlE1i0oENtFExZ5GTIoi_rFIo7E,1880
-mwxlib-0.97.6.dist-info/WHEEL,sha256=Rp8gFpivVLXx-k3U95ozHnQw8yDcPxmhOpn_Gx8d5nc,91
-mwxlib-0.97.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-0.97.6.dist-info/RECORD,,
+mwxlib-0.97.7.dist-info/LICENSE,sha256=PGtRKCaTkmUDlBQwpptJAxJtdqxIUtAmdBsaT9nUVkA,1091
+mwxlib-0.97.7.dist-info/METADATA,sha256=ITXJ8FrL_C8Zp4tjs-dwINs4TrpykIZxNe-hot0NIP0,1880
+mwxlib-0.97.7.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+mwxlib-0.97.7.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-0.97.7.dist-info/RECORD,,

{mwxlib-0.97.6.dist-info → mwxlib-0.97.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.0.0)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any