mwxlib 1.4.6__py3-none-any.whl → 1.4.11__py3-none-any.whl

mwx/controls.py

@@ -2,6 +2,7 @@
 """mwxlib param controller and wx custom controls.
 """
 from itertools import chain
+import inspect
 import wx
 import wx.lib.platebtn as pb
 import wx.lib.scrolledpanel as scrolled
@@ -68,7 +69,8 @@ class Param:
            'overflow' : [],
           'underflow' : [],
         })
-        self._tooltip = _Tip(handler.__doc__, updater.__doc__)
+        self._tooltip = _Tip(handler.__doc__,
+                             updater.__doc__)
     
     def __str__(self, v=None):
         if v is None:
@@ -137,6 +139,10 @@ class Param:
             for knob in self.knobs:
                 knob.update_ctrl(None)
             return
+        elif v == self.__value:
+            for knob in self.knobs:
+                knob.update_ctrl()
+            return
         
         ## If the value is out of range, it will be modified.
         valid = (self.min <= v <= self.max)
@@ -293,7 +299,6 @@ class Knob(wx.Panel):
         style   : style of label
                   None -> static text (default)
                   button -> label with flat button
-                  chkbox -> label with checkbox
                   checkbox -> label with checkbox
         cw      : width of control
         lw      : width of label
@@ -313,6 +318,15 @@ class Knob(wx.Panel):
         self.update_range()
         self.update_ctrl()
     
+    @property
+    def button(self):
+        if isinstance(self._label, pb.PlateButton):
+            return self._label
+    
+    @property
+    def control(self):
+        return self._ctrl
+    
     def __init__(self, parent, param, type=None,
                  style=None, cw=-1, lw=-1, tw=-1, h=22, **kwargs):
         wx.Panel.__init__(self, parent, **kwargs)
@@ -335,9 +349,11 @@ class Knob(wx.Panel):
         label = self.__par.name + '  '
         
         if style == 'chkbox' or style == 'checkbox':
+            ## Keep margin for the checkbox: lw += 16
             self._label = wx.CheckBox(self, label=label, size=(lw,-1))
             self._label.Bind(wx.EVT_CHECKBOX, self.OnCheck)
         elif style == 'button':
+            ## Keep margin for the button: lw += 16
             self._label = pb.PlateButton(self, label=label, size=(lw,-1),
                                          style=pb.PB_STYLE_DEFAULT|pb.PB_STYLE_SQUARE)
             self._label.Bind(wx.EVT_BUTTON, self.OnPress)
@@ -668,17 +684,18 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
         
         self.Sizer.Add(sizer, expand>1, p | wx.ALL, border)
         
-        ## Register object and parameter groups
-        def _flatiter(a):
-            for c in a:
+        ## Register objects and parameter groups
+        def _flatiter(objects):
+            for c in objects:
                 if isinstance(c, tuple):
                     yield from _flatiter(c)
                 elif isinstance(c, wx.Object):
                     yield c
         self.__groups.append(list(_flatiter(objs)))
         
-        def _variter(a):
-            for c in a:
+        ## Parameters : Knob.param or widgets that have a `value`.
+        def _variter(objects):
+            for c in objects:
                 if isinstance(c, Knob):
                     yield c.param
                 elif hasattr(c, 'value'):
@@ -689,6 +706,8 @@ class KnobCtrlPanel(scrolled.ScrolledPanel):
         self.show(-1, visible)
         self.fold(-1, not show)
         self.Sizer.Fit(self)
+        
+        return self.__groups[-1]
     
     ## --------------------------------
     ## 外部入出力／クリップボード通信
@@ -836,7 +855,7 @@ class Icon(wx.Bitmap):
     If the key is empty it returns a transparent bitmap, otherwise NullBitmap.
     
     Note:
-        A null (0-shaped) bitmap fails with AssertionError from 4.1.1
+        A null (0-shaped) bitmap fails with AssertionError from wx ver 4.1.1.
     """
     provided_arts = {
             'cut' : wx.ART_CUT,
@@ -860,8 +879,8 @@ class Icon(wx.Bitmap):
             '!!!' : wx.ART_ERROR,
               '+' : wx.ART_PLUS,
               '-' : wx.ART_MINUS,
-              'x' : wx.ART_DELETE,
-              't' : wx.ART_TICK_MARK,
+              ## 'x' : wx.ART_DELETE,
+              ## 't' : wx.ART_TICK_MARK,
               '~' : wx.ART_GO_HOME,
            'undo' : wx.ART_UNDO,
            'redo' : wx.ART_REDO,
@@ -901,18 +920,17 @@ class Icon(wx.Bitmap):
             except Exception:
                 art = Icon.provided_arts.get(key)
                 bmp = wx.ArtProvider.GetBitmap(art or key, wx.ART_OTHER, size)
+            ## Note: The result could be a zero-shaped bitmap.
             return bmp
-        
-        ## Note: null (0-shaped) bitmap fails with AssertionError from 4.1.1
         elif key == '':
+            ## Note: A zero-shaped bitmap fails with AssertionError since wx ver 4.1.1.
             bmp = wx.Bitmap(size)
             with wx.MemoryDC(bmp) as dc:
                 dc.SetBackground(wx.Brush('black'))
                 dc.Clear()
             bmp.SetMaskColour('black') # return dummy-sized blank bitmap
             return bmp
-        
-        return wx.NullBitmap # The standard wx controls accept this,
+        return wx.NullBitmap # The standard wx controls accept this.
 
     @staticmethod
     def _getBitmap2(back, fore, size=None, subsize=3/4):
@@ -922,6 +940,8 @@ class Icon(wx.Bitmap):
             subsize = wx.Size(size) * subsize
         back = Icon._getBitmap1(back, size)
         fore = Icon._getBitmap1(fore, subsize)
+        if back.Size == (0, 0) or fore.Size == (0, 0):
+            return back
         x = size[0] - subsize[0]
         y = size[1] - subsize[1]
         with wx.MemoryDC(back) as dc:
@@ -975,8 +995,7 @@ class ClassicButton(wx.Button):
         
         if handler:
             self.Bind(wx.EVT_BUTTON, _F(handler))
-        
-        self.SetToolTip(_Tip(handler.__doc__))
+            self.SetToolTip(_Tip(handler.__doc__))
         if icon:
             self.SetBitmap(Icon(icon))
 
@@ -996,8 +1015,7 @@ class Button(pb.PlateButton):
         
         if handler:
             self.Bind(wx.EVT_BUTTON, _F(handler))
-        
-        self.SetToolTip(_Tip(handler.__doc__))
+            self.SetToolTip(_Tip(handler.__doc__))
         if icon:
             self.SetBitmap(Icon(icon))
     
@@ -1029,8 +1047,7 @@ class ToggleButton(wx.ToggleButton):
         
         if handler:
             self.Bind(wx.EVT_TOGGLEBUTTON, _F(handler))
-        
-        self.SetToolTip(_Tip(handler.__doc__))
+            self.SetToolTip(_Tip(handler.__doc__))
         if icon:
             try:
                 self.SetBitmap(Icon(icon[0]))
@@ -1058,19 +1075,20 @@ class TextBox(wx.Control):
     
     value = Value #: internal use only
     
+    button = property(lambda self: self._btn)
+    control = property(lambda self: self._ctrl)
+    
     def __init__(self, parent, label='', handler=None, updater=None,
                  icon=None, readonly=False, size=(-1,-1), **kwargs):
         wx.Control.__init__(self, parent, size=size, style=wx.BORDER_NONE)
         
         kwargs['style'] = (kwargs.get('style', 0)
-                            | wx.TE_PROCESS_ENTER
-                            | (wx.TE_READONLY if readonly else 0))
+                                    | wx.TE_PROCESS_ENTER
+                                    | (wx.TE_READONLY if readonly else 0))
         
         self._ctrl = wx.TextCtrl(self, **kwargs)
         self._btn = Button(self, label, None, icon,
                            size=(-1,-1) if label or icon else (0,0))
-        self._ctrl.SetToolTip(_Tip(handler.__doc__))
-        self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.SetSizer(
             pack(self, (
@@ -1081,9 +1099,11 @@ class TextBox(wx.Control):
         if handler:
             self._handler = _F(handler)
             self._ctrl.Bind(wx.EVT_TEXT_ENTER, lambda v: self._handler(self))
+            self._ctrl.SetToolTip(_Tip(handler.__doc__))
         if updater:
             self._updater = _F(updater)
             self._btn.Bind(wx.EVT_BUTTON, lambda v: self._updater(self))
+            self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.Bind(wx.EVT_NAVIGATION_KEY, self.OnNavKey)
     
@@ -1134,19 +1154,20 @@ class Choice(wx.Control):
         lambda self,v: self._ctrl.SetItems(v),
         doc="combobox items:list")
     
+    button = property(lambda self: self._btn)
+    control = property(lambda self: self._ctrl)
+    
     def __init__(self, parent, label='', handler=None, updater=None,
                  icon=None, readonly=False, size=(-1,-1), **kwargs):
         wx.Control.__init__(self, parent, size=size, style=wx.BORDER_NONE)
         
         kwargs['style'] = (kwargs.get('style', 0)
-                            | wx.TE_PROCESS_ENTER
-                            | (wx.CB_READONLY if readonly else 0))
+                                    | wx.TE_PROCESS_ENTER
+                                    | (wx.CB_READONLY if readonly else 0))
         
         self._ctrl = wx.ComboBox(self, **kwargs)
         self._btn = Button(self, label, None, icon,
                            size=(-1,-1) if label or icon else (0,0))
-        self._ctrl.SetToolTip(_Tip(handler.__doc__))
-        self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.SetSizer(
             pack(self, (
@@ -1158,10 +1179,12 @@ class Choice(wx.Control):
             self._handler = _F(handler)
             self._ctrl.Bind(wx.EVT_TEXT_ENTER, lambda v: self._handler(self))
             self._ctrl.Bind(wx.EVT_COMBOBOX, lambda v: self._handler(self))
+            self._ctrl.SetToolTip(_Tip(handler.__doc__))
         self._ctrl.Bind(wx.EVT_TEXT_ENTER, self.OnTextEnter)
         if updater:
             self._updater = _F(updater)
             self._btn.Bind(wx.EVT_BUTTON, lambda v: self._updater(self))
+            self._btn.SetToolTip(_Tip(updater.__doc__))
         
         self.Bind(wx.EVT_NAVIGATION_KEY, self.OnNavKey)
     

mwx/framework.py

@@ -1,7 +1,7 @@
 #! python3
 """mwxlib framework.
 """
-__version__ = "1.4.6"
+__version__ = "1.4.11"
 __author__ = "Kazuya O'moto <komoto@jeol.co.jp>"
 
 from contextlib import contextmanager
@@ -290,7 +290,7 @@ class KeyCtrlInterfaceMixin:
         evt.Skip()
     post_command_hook.__name__ = str('exit')
     
-    def define_key(self, keymap, action=None, *args, **kwargs):
+    def define_key(self, keymap, action=None, /, *args, **kwargs):
         """Define [map key (pressed)] action.
         
         If no action, it invalidates the key and returns @decor(binder).
@@ -1594,7 +1594,7 @@ class ShellFrame(MiniFrame):
         
         ## Modify the floating position of the pane when displayed.
         ## Note: This is a known bug in wxWidgets 3.17 -- 3.20,
-        ##       and will be fixed in wxPython 4.2.1.
+        ##       and will be fixed in wx ver 4.2.1.
         if wx.Display.GetFromWindow(pane.window) == -1:
             pane.floating_pos = wx.GetMousePosition()
         

mwx/graphman.py

@@ -6,7 +6,6 @@ from importlib import reload, import_module
 from contextlib import contextmanager
 from bdb import BdbQuit
 from pprint import pformat
-from subprocess import Popen
 import threading
 import traceback
 import inspect
@@ -257,7 +256,6 @@ class LayerInterface(CtrlInterface):
     caption = True
     category = None
     dockable = True
-    editable = True # deprecated
     reloadable = True
     unloadable = True
     
@@ -381,10 +379,6 @@ class LayerInterface(CtrlInterface):
                 lambda v: reset_params(v, checked_only=wx.GetKeyState(wx.WXK_SHIFT)),
                 lambda v: v.Enable(bool(self.parameters))),
             (),
-            (wx.ID_EDIT, "&Edit module", "Edit module", Icon('pen'),
-                lambda v: self.parent.edit_plug(self.__module__),
-                lambda v: v.Enable(self.editable)),
-                
             (mwx.ID_(201), "&Reload module", "Reload module", Icon('load'),
                 lambda v: self.parent.reload_plug(self.__module__),
                 lambda v: v.Enable(self.reloadable
@@ -843,9 +837,6 @@ class Frame(mwx.Frame):
         
         ## Accepts DnD
         self.SetDropTarget(MyFileDropLoader(self.graph, self))
-        
-    ## Script editor for plugins (external call)
-    EDITOR = "notepad"
     
     SYNC_SWITCH = True
     
@@ -983,7 +974,7 @@ class Frame(mwx.Frame):
         
         ## Modify the floating position of the pane when displayed.
         ## Note: This is a known bug in wxWidgets 3.17 -- 3.20,
-        ##       and will be fixed in wxPython 4.2.1.
+        ##       and will be fixed in wx ver 4.2.1.
         if wx.Display.GetFromWindow(pane.window) == -1:
             pane.floating_pos = wx.GetMousePosition()
         
@@ -1339,14 +1330,6 @@ class Frame(mwx.Frame):
             if shell.target is plug:
                 shell.handler('shell_activated', shell)
     
-    @ignore(ResourceWarning)
-    def edit_plug(self, name):
-        plug = self.get_plug(name)
-        if not plug:
-            return
-        
-        Popen([self.EDITOR, inspect.getmodule(plug).__file__])
-    
     def inspect_plug(self, name):
         """Dive into the process to inspect plugs in the shell.
         """

mwx/images.py

@@ -652,6 +652,22 @@ w = PyEmbeddedImage(
     b'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWfIwBngDGCYAAAAASUVO'
     b'RK5CYII=')
 
+#----------------------------------------------------------------------
+x = PyEmbeddedImage(
+    b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0'
+    b'RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIhSURBVDjLlZPrThNRFIWJicmJ'
+    b'z6BWiYbIkYDEG0JbBiitDQgm0PuFXqSAtKXtpE2hNuoPTXwSnwtExd6w0pl2OtPlrphKLSXh'
+    b'x07OZM769qy19wwAGLhM1ddC184+d18QMzoq3lfsD3LZ7Y3XbE5DL6Atzuyilc5Ciyd7IHVf'
+    b'gNcDYTQ2tvDr5crn6uLSvX+Av2Lk36FFpSVENDe3OxDZu8apO5rROJDLo30+Nlvj5RnTlVNA'
+    b'Ks1aCVFr7b4BPn6Cls21AWgEQlz2+Dl1h7IdA+i97A/geP65WhbmrnZZ0GIJpr6OqZqYAd5/'
+    b'gJpKox4Mg7pD2YoC2b0/54rJQuJZdm6Izcgma4TW1WZ0h+y8BfbyJMwBmSxkjw+VObNanp5h'
+    b'/adwGhaTXF4NWbLj9gEONyCmUZmd10pGgf1/vwcgOT3tUQE0DdicwIod2EmSbwsKE1P8QoDk'
+    b'cHPJ5YESjgBJkYQpIEZ2KEB51Y6y3ojvY+P8XEDN7uKS0w0ltA7QGCWHCxSWWpwyaCeLy0Bk'
+    b'A7UXyyg8fIzDoWHeBaDN4tQdSvAVdU1Aok+nsNTipIEVnkywo/FHatVkBoIhnFisOBoZxcGt'
+    b'Qd4B0GYJNZsDSiAEadUBCkstPtN3Avs2Msa+Dt9XfxoFSNYF/Bh9gP0bOqHLAm2WUF1YQskw'
+    b'rVFYPWkf3h1iXwbvqGfFPSGW9Eah8HSS9fuZDnS32f71m8KFY7xs/QZyu6TH2+2+FAAAAABJ'
+    b'RU5ErkJggg==')
+
 #----------------------------------------------------------------------
 xo = PyEmbeddedImage(
     b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEWywNxcVlwcHhwUEhQE'

mwx/matplot2.py

@@ -178,12 +178,10 @@ class MatplotPanel(wx.Panel):
                    'axes_enter' : [ None, ],
                    'axes_leave' : [ None, ],
                  'home pressed' : [ None, self.OnHomePosition ],
-            'backspace pressed' : [ None, self.OnBackPosition ],
-          'M-backspace pressed' : [ None, self.OnForwardPosition ],
+                 'left pressed' : [ None, self.OnBackPosition ],
+                'right pressed' : [ None, self.OnForwardPosition ],
              'Xbutton1 pressed' : [ None, self.OnBackPosition ],
              'Xbutton2 pressed' : [ None, self.OnForwardPosition ],
-                  'M-p pressed' : [ None, self.OnBackPosition ],
-                  'M-n pressed' : [ None, self.OnForwardPosition ],
                 },
                 NORMAL : {
                    'art_picked' : (NORMAL, ),

mwx/matplot2g.py

@@ -419,6 +419,8 @@ class GraphPlot(MatplotPanel):
                'M-down pressed' : [ None, self.OnPageDown ],
                'pageup pressed' : [ None, self.OnPageUp ],
              'pagedown pressed' : [ None, self.OnPageDown ],
+                 'home pressed' : [ None, _F(self.select, 0) ],
+                  'end pressed' : [ None, _F(self.select, -1) ],
                   'M-a pressed' : [ None, _F(self.fit_to_canvas) ],
                   'C-a pressed' : [ None, _F(self.fit_to_axes) ],
                   'C-i pressed' : [ None, _F(self.invert_cmap) ],
@@ -681,7 +683,7 @@ class GraphPlot(MatplotPanel):
         if j != self.__index and self.__index is not None:
             self.handler('frame_hidden', self.frame)
         
-        if j is not None:
+        if j is not None and self.__Arts:
             art = self.__Arts[j]
             art.set_visible(1)
             self.__index = j % len(self)
@@ -692,7 +694,6 @@ class GraphPlot(MatplotPanel):
         self.draw()
         self.writeln()
         self.trace_point(*self.selector)
-        
         return self.frame
     
     def __iter__(self):

mwx/nutshell.py

@@ -138,7 +138,7 @@ def skip(evt):
     evt.Skip()
 
 
-def can_edit(f):
+def editable(f):
     @wraps(f)
     def _f(self, *v, **kw):
         if self.CanEdit():
@@ -404,6 +404,7 @@ class AutoCompInterfaceMixin:
         try:
             text, sep, hint = self._get_words_hint()
             obj = self.eval(text)
+            ## dir = introspect.getAttributeNames @TODO in wx ver 4.2.3
             
             P = re.compile(hint)
             p = re.compile(hint, re.I)
@@ -431,6 +432,7 @@ class AutoCompInterfaceMixin:
         try:
             text, sep, hint = self._get_words_hint()
             obj = self.eval(text)
+            ## dir = introspect.getAttributeNames @TODO in wx ver 4.2.3.
             
             P = re.compile(hint)
             p = re.compile(hint, re.I)
@@ -498,8 +500,10 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                 'C-S-f pressed' : (0, _F(self.set_mark)), # overrides mark
               'C-space pressed' : (0, _F(self.set_mark)),
             'C-S-space pressed' : (0, _F(self.set_pointer)),
-          'C-backspace pressed' : (0, skip),
+          'C-backspace pressed' : (0, _F(self.backward_kill_word)),
           'S-backspace pressed' : (0, _F(self.backward_kill_line)),
+             'C-delete pressed' : (0, _F(self.kill_word)),
+             'S-delete pressed' : (0, _F(self.kill_line)),
                 'C-tab pressed' : (0, _F(self.insert_space_like_tab)),
               'C-S-tab pressed' : (0, _F(self.delete_backward_space_like_tab)),
                   'tab pressed' : (0, self.on_indent_line),
@@ -564,7 +568,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         self.AutoCompSetMaxHeight(10)
         
         ## To prevent @filling crash (Never access to DropTarget)
-        ## [BUG 4.1.1] Don't allow DnD of text, file, whatever.
+        ## [BUG ver 4.1.1] Don't allow DnD of text, file, whatever.
         ## self.SetDropTarget(None)
         
         self.Bind(stc.EVT_STC_START_DRAG, self.OnDrag)
@@ -912,15 +916,15 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     def expr_at_caret(self):
         """A syntax unit (expression) at the caret-line."""
         p = q = self.cpos
-        lsty = self.get_style(p-1)
-        rsty = self.get_style(p)
-        if lsty == rsty == 'moji': # inside string
+        lst = self.get_style(p-1)
+        rst = self.get_style(p)
+        if lst == rst == 'moji': # inside string
             ## styles = {'moji'}
             return ''
-        elif lsty == 'suji' or rsty == 'suji':
+        elif lst == 'suji' or rst == 'suji':
             styles = {'suji'}
-        elif lsty in ('word', 'dot', 'moji', 'rparen')\
-          or rsty in ('word', 'dot', 'moji', 'lparen'):
+        elif lst in ('word', 'dot', 'moji', 'rparen')\
+          or rst in ('word', 'dot', 'moji', 'lparen'):
             styles = {'word', 'dot', 'moji', 'paren'}
         else:
             return ''
@@ -970,7 +974,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         else:
             self.py_outdent_line()
     
-    @can_edit
+    @editable
     def py_indent_line(self):
         """Indent the current line."""
         text = self.line_at_caret # w/ no-prompt
@@ -982,7 +986,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             self.Replace(self.bol, p, ' '*indent)
             self.goto_char(self.bol + indent + offset)
     
-    @can_edit
+    @editable
     def py_outdent_line(self):
         """Outdent the current line."""
         text = self.line_at_caret # w/ no-prompt
@@ -1006,7 +1010,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     
     def py_electric_indent(self):
         """Calculate indent spaces for the following line."""
-        ## [BUG 4.2.0] The last char is replaced with b'\x00'.
+        ## [BUG ver 4.2.0] The last char is replaced with b'\x00'.
         ## text, lp = self.CurLineRaw
         ## return self.py_calc_indentation(text[:lp].decode())
         text, lp = self.CurLine
@@ -1605,7 +1609,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
     ## --------------------------------
     comment_prefix = "## "
     
-    @can_edit
+    @editable
     def comment_out_selection(self, from_=None, to_=None):
         """Comment out the selected text."""
         if from_ is not None: self.anchor = from_
@@ -1619,7 +1623,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
                 text = text[:-len(prefix)]
             self.ReplaceSelection(text)
     
-    @can_edit
+    @editable
     def uncomment_selection(self, from_=None, to_=None):
         """Uncomment the selected text."""
         if from_ is not None: self.anchor = from_
@@ -1629,7 +1633,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             if text != self.SelectedText:
                 self.ReplaceSelection(text)
     
-    @can_edit
+    @editable
     def comment_out_line(self):
         if self.SelectedText:
             self.comment_out_selection()
@@ -1645,7 +1649,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             self.comment_out_selection(self.cpos, self.eol)
             self.LineDown()
     
-    @can_edit
+    @editable
     def uncomment_line(self):
         if self.SelectedText:
             self.uncomment_selection()
@@ -1654,35 +1658,49 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
             self.uncomment_selection(self.cpos, self.eol)
             self.LineDown()
     
-    @can_edit
+    @editable
     def eat_white_forward(self):
         p = self.cpos
         self.skip_chars_forward(' \t')
         self.Replace(p, self.cpos, '')
     
-    @can_edit
+    @editable
     def eat_white_backward(self):
         p = self.cpos
         self.skip_chars_backward(' \t')
         self.Replace(max(self.cpos, self.bol), p, '')
     
-    @can_edit
+    @editable
+    def kill_word(self):
+        if not self.SelectedText:
+            self.WordRightEndExtend()
+        self.ReplaceSelection('')
+    
+    @editable
+    def backward_kill_word(self):
+        if not self.SelectedText:
+            self.WordLeftExtend()
+        self.ReplaceSelection('')
+    
+    @editable
     def kill_line(self):
-        p = self.eol
-        if p == self.cpos: # caret at end of line
-            if self.get_char(p) == '\r': p += 1
-            if self.get_char(p) == '\n': p += 1
-        self.Replace(self.cpos, p, '')
+        if not self.SelectedText:
+            if self.cpos == self.eol:
+                self.WordRightEndExtend() # Select cr/lf
+            else:
+                self.cpos = self.eol
+        self.ReplaceSelection('')
     
-    @can_edit
+    @editable
     def backward_kill_line(self):
-        p = self.bol
-        if p == self.cpos > 0: # caret at beginning of line
-            if self.get_char(p-1) == '\n': p -= 1
-            if self.get_char(p-1) == '\r': p -= 1
-        self.Replace(p, self.cpos, '')
+        if not self.SelectedText:
+            if self.cpos == self.bol:
+                self.WordLeftExtend() # Select cr/lf
+            else:
+                self.cpos = self.bol
+        self.ReplaceSelection('')
     
-    @can_edit
+    @editable
     def insert_space_like_tab(self):
         """Insert half-width spaces forward as if feeling like [tab].
         タブの気持ちになって半角スペースを入力する
@@ -1691,7 +1709,7 @@ class EditorInterface(AutoCompInterfaceMixin, CtrlInterface):
         _text, lp = self.CurLine
         self.WriteText(' ' * (4 - lp % 4))
     
-    @can_edit
+    @editable
     def delete_backward_space_like_tab(self):
         """Delete half-width spaces backward as if feeling like [S-tab].
         シフト+タブの気持ちになって半角スペースを消す
@@ -1833,7 +1851,7 @@ class Buffer(EditorInterface, EditWindow):
             ## *do not* clear autocomp, so that the event can skip to AutoComp properly.
             if self.CanEdit():
                 with self.off_undocollection():
-                    self.ReplaceSelection("")
+                    self.ReplaceSelection('')
             self.message("")
         
         def clear_autocomp(evt):
@@ -1874,6 +1892,8 @@ class Buffer(EditorInterface, EditWindow):
                'escape pressed' : (-1, self.on_enter_escmap),
                   'C-h pressed' : (0, self.call_helpTip),
                     '. pressed' : (2, self.OnEnterDot),
+                  'C-. pressed' : (2, self.call_word_autocomp),
+                  'C-/ pressed' : (3, self.call_apropos_autocomp),
                   'M-. pressed' : (2, self.call_word_autocomp),
                   'M-/ pressed' : (3, self.call_apropos_autocomp),
             },
@@ -1967,7 +1987,7 @@ class Buffer(EditorInterface, EditWindow):
             return
         
         pos = evt.Position
-        self.goto_char(pos) # Clear selection
+        self.goto_char(pos)
         i = 2
         if self.IndicatorValueAt(i, pos): # [C-indic click]
             p = self.IndicatorStart(i, pos)
@@ -1998,9 +2018,9 @@ class Buffer(EditorInterface, EditWindow):
     
     def OnEnterDot(self, evt):
         p = self.cpos
-        st = self.get_style(p-1)
+        lst = self.get_style(p-1)
         rst = self.get_style(p)
-        if st not in ('moji', 'word', 'rparen') or rst == 'word':
+        if lst not in ('moji', 'word', 'rparen') or rst == 'word':
             self.handler('quit', evt) # don't enter autocomp
         evt.Skip()
     
@@ -2657,14 +2677,14 @@ class Nautilus(EditorInterface, Shell):
         C-up        : [0] retrieve previous history
         C-down      : [0] retrieve next history
         C-j         : [0] tooltip of eval (for the selected or focused word)
-        C-h, M-h    : [0] calltip of help (for the selected or focused func)
+        C-h  M-h    : [0] calltip of help (for the selected or focused func)
         TAB         : [1] history-comp
         M-p         : [1] retrieve previous history in history-comp mode
         M-n         : [1] retrieve next history in history-comp mode
-        M-.         : [2] word-comp
-        M-/         : [3] apropos-comp
-        M-,         : [4] text-comp
-        M-m         : [5] module-comp
+        M-.  C-.    : [2] word-comp
+        M-/  C-/    : [3] apropos-comp
+        M-,  C-,    : [4] text-comp
+        M-m  C-m    : [5] module-comp
         
         Autocomps are incremental when pressed any alnums,
                   and decremental when backspace.
@@ -2784,7 +2804,7 @@ class Nautilus(EditorInterface, Shell):
             ## *do not* clear autocomp, so that the event can skip to AutoComp properly.
             if self.CanEdit():
                 with self.off_undocollection():
-                    self.ReplaceSelection("")
+                    self.ReplaceSelection('')
             self.message("")
         
         def clear_autocomp(evt):
@@ -2827,8 +2847,6 @@ class Nautilus(EditorInterface, Shell):
                'escape pressed' : (-1, self.on_enter_escmap),
                 'space pressed' : (0, self.OnSpace),
            '*backspace pressed' : (0, self.OnBackspace),
-          'C-backspace pressed' : (0, _F(self.backward_kill_word)),
-          'S-backspace pressed' : (0, _F(self.backward_kill_line)),
                 'enter pressed' : (0, self.OnEnter),
               'C-enter pressed' : (0, _F(self.insertLineBreak)),
             'C-S-enter pressed' : (0, _F(self.insertLineBreak)),
@@ -2853,6 +2871,10 @@ class Nautilus(EditorInterface, Shell):
                   'tab pressed' : (1, self.call_history_comp),
                   'M-p pressed' : (1, self.call_history_comp),
                   'M-n pressed' : (1, self.call_history_comp),
+                  'C-. pressed' : (2, self.call_word_autocomp),
+                  'C-/ pressed' : (3, self.call_apropos_autocomp),
+                  'C-, pressed' : (4, self.call_text_autocomp),
+                  'C-m pressed' : (5, self.call_module_autocomp),
                   'M-. pressed' : (2, self.call_word_autocomp),
                   'M-/ pressed' : (3, self.call_apropos_autocomp),
                   'M-, pressed' : (4, self.call_text_autocomp),
@@ -3059,29 +3081,36 @@ class Nautilus(EditorInterface, Shell):
             return
         evt.Skip()
     
-    @can_edit
-    def backward_kill_line(self):
-        p = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
-        text, lp = self.CurLine
-        if text[:lp] == sys.ps2:
-            self.Replace(p - lp, p, '') # eats ps2:prompt
-            return
-        if p == self.cpos > 0: # caret at beginning of line
-            if self.get_char(p-1) == '\n': p -= 1
-            if self.get_char(p-1) == '\r': p -= 1
-        self.Replace(p, self.cpos, '')
+    @editable
+    def backward_kill_word(self): # (override)
+        if not self.SelectedText:
+            text, lp = self.CurLine
+            if text[:lp] == sys.ps2:
+                self.cpos -= lp       # Select ps2:prompt
+                self.WordLeftExtend() # Select cr/lf
+            else:
+                q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
+                self.WordLeftExtend()
+                if self.cpos < q:
+                    self.cpos = q # Don't skip back prompt
+        self.ReplaceSelection('')
     
-    @can_edit
-    def backward_kill_word(self):
-        p = self.cpos
-        text, lp = self.CurLine
-        if text[:lp] == sys.ps2:
-            self.goto_char(p - lp) # skips ps2:prompt
-        self.WordLeft()
-        q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
-        if self.cpos < q:
-            self.goto_char(q) # Don't skip back prompt
-        self.Replace(self.cpos, p, '')
+    @editable
+    def backward_kill_line(self): # (override)
+        if not self.SelectedText:
+            text, lp = self.CurLine
+            if text[:lp] == sys.ps2:
+                self.cpos -= lp       # Select ps2:prompt
+                self.WordLeftExtend() # Select cr/lf
+            else: 
+                q = max(self.bol, self.bolc) # for debugger mode: bol <= bolc
+                if self.cpos <= self.bolc:
+                    return
+                elif self.cpos > q:
+                    self.cpos = q
+                else:
+                    self.WordLeftExtend() # Select cr/lf
+        self.ReplaceSelection('')
     
     def OnEnter(self, evt):
         """Called when enter pressed."""
@@ -3119,13 +3148,13 @@ class Nautilus(EditorInterface, Shell):
             self.handler('quit', evt)
             return
         p = self.cpos
-        st = self.get_style(p-1)
+        lst = self.get_style(p-1)
         rst = self.get_style(p)
         if p == self.bolc:
             self.ReplaceSelection('self') # replace [.] --> [self.]
-        elif st in ('space', 'sep', 'lparen'):
+        elif lst in ('space', 'sep', 'lparen'):
             self.ReplaceSelection('self')
-        elif st not in ('moji', 'word', 'rparen') or rst == 'word':
+        elif lst not in ('moji', 'word', 'rparen') or rst == 'word':
             self.handler('quit', evt) # don't enter autocomp
         evt.Skip()
     
@@ -3363,7 +3392,7 @@ class Nautilus(EditorInterface, Shell):
     
     ## cf. getCommand() -> caret-line that starts with a prompt
     ## cf. getMultilineCommand() -> caret-multi-line that starts with a prompt
-    ##     [BUG 4.1.1] Don't use for current prompt --> Fixed in 4.2.0.
+    ##     [BUG ver 4.1.1] Don't use for current prompt --> Fixed in wx ver 4.2.0.
     
     def getMultilineCommand(self, rstrip=True):
         """Extract a multi-line command which starts with a prompt.
@@ -3466,7 +3495,7 @@ class Nautilus(EditorInterface, Shell):
         
         (override) Remove ps1 and ps2 from the multi-line command to paste.
                    Add offset in paste-rectangle mode.
-                   Don't relplace the last crlf to ps.
+                   Don't relplace the last cr/lf to ps.
         """
         if self.CanPaste() and wx.TheClipboard.Open():
             data = wx.TextDataObject()

{mwxlib-1.4.6.dist-info → mwxlib-1.4.11.dist-info}/METADATA

@@ -1,12 +1,11 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: mwxlib
-Version: 1.4.6
+Version: 1.4.11
 Summary: A wrapper of matplotlib and wxPython (phoenix)
 Home-page: https://github.com/komoto48g/mwxlib
 Author: Kazuya O'moto
 Author-email: komoto@jeol.co.jp
 License: MIT
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9

{mwxlib-1.4.6.dist-info → mwxlib-1.4.11.dist-info}/RECORD

@@ -1,14 +1,14 @@
 mwx/__init__.py,sha256=pS7ZG8QKRypiFFiaWAq_opBB6I_1viZ0zUMk2TbjzE0,667
 mwx/bookshelf.py,sha256=MXjrm_ryRGHvOFKu8wb10qz_oka70xW2yFbYjBMYfns,8140
-mwx/controls.py,sha256=RssTROprNfgnRMiWVOoSSd8Fy0qwZ8DCrYM2f5Wgr4E,48610
-mwx/framework.py,sha256=hP2mhnYPOrSVFvA3CgoOR9-axWx_WLd83aXioUHodEk,76830
-mwx/graphman.py,sha256=_8_DaG3qhhZByoh5wboyYQlAsm7GlPoR8wT-RNMx4Cw,70627
-mwx/images.py,sha256=oxCn0P-emiWujSS2gUgU5TUnr5cPjix2jBcjOBDr24I,48701
-mwx/matplot2.py,sha256=Htwegq6N5G7oKSRCuajik5Dixd93i8PKVbkL7Azy99M,33150
-mwx/matplot2g.py,sha256=4BBHlvfhg1796hu1nTCsTA82YRkZhwUnfcHCBf5ZGO8,65083
+mwx/controls.py,sha256=1zLWlPy0RTLHYlvxjz3ulDoTx3-uPUD3TqK7dGRA4wg,49563
+mwx/framework.py,sha256=1p24_snigDnU-9CwjQJdQeEsS44z27IwvC67reS6zX8,76832
+mwx/graphman.py,sha256=4hS3zBH1Ob9CcsWBsnPo5Tw6RTiE0vKjKpcjeZ5RSrU,70049
+mwx/images.py,sha256=Kkfy9QI_hMtwShSjUS4-ZpC_EkVuah_XhpBOR4wAKkM,49792
+mwx/matplot2.py,sha256=A2PbHI5UcuAvINfnm6GG7CXpbexhzvtyVLQOwcbRqnc,33015
+mwx/matplot2g.py,sha256=HTSh0vd06-HhiwEZbhwFD6HGjfnwGQ7H6QQzTucOx3c,65220
 mwx/matplot2lg.py,sha256=cb0EZXivccDQu4oFj5ddSUF9pEE4f5UuFJJK2ELItww,27404
 mwx/mgplt.py,sha256=8mXbHpCmm7lz3XbAxOg7IVC7DaSGBEby1UfTlMl9kjk,5604
-mwx/nutshell.py,sha256=TNaZbMQcvSKDSHDnw3P8rpMM2yNG0HbVOej52L0EZgY,141903
+mwx/nutshell.py,sha256=aZSXcWMsVF_til2ZCASwGwK1Jqq3qfGFJ6KJjK7TX6A,143091
 mwx/testsuite.py,sha256=Zk75onPSEn2tf0swS3l-vIn6yTXGB7allIyvJsPHj20,1229
 mwx/utilus.py,sha256=ObXYWsDVn5DmjvwVQgP2HGAhrdxlDrwL7g9pMCDbU7U,38127
 mwx/wxmon.py,sha256=yzWqrbY6LzpfRwQeytYUeqFhFuLVm_XEvrVAL_k0HBQ,12756
@@ -22,7 +22,7 @@ mwx/plugins/frame_listview.py,sha256=gowjQ-ARNonMkDSXkQgPKq4U9YBJ-vQ0jK2krBVOdCs
 mwx/plugins/line_profile.py,sha256=zzm6_7lnAnNepLbh07ordp3nRWDFQJtu719ZVjrVf8s,819
 mwx/py/__init__.py,sha256=xykgfOytOwNuvXsfkLoumFZSTN-iBsHOjczYXngjmUE,12
 mwx/py/filling.py,sha256=fumUG1F5M9TL-Dfqni4G85uk7TmvnUunTbdcPDV0vfo,16857
-mwxlib-1.4.6.dist-info/METADATA,sha256=hqiNPf-eNSU1H6H5huSCCToKcRvpXYWipmwzJc1r_xw,7433
-mwxlib-1.4.6.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-mwxlib-1.4.6.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
-mwxlib-1.4.6.dist-info/RECORD,,
+mwxlib-1.4.11.dist-info/METADATA,sha256=IZXZTnCIPRB-B1eTwiGW6uD5IYtlmaNzMdgOs89Qpko,7382
+mwxlib-1.4.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+mwxlib-1.4.11.dist-info/top_level.txt,sha256=SI1Mh118AstnUFGPNq5aMNKiAnVNmZk1S9Ij-OwAEpY,4
+mwxlib-1.4.11.dist-info/RECORD,,

{mwxlib-1.4.6.dist-info → mwxlib-1.4.11.dist-info}/WHEEL

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