diff options
author | Ian Ward <ian@excess.org> | 2014-04-28 09:58:22 -0400 |
---|---|---|
committer | Ian Ward <ian@excess.org> | 2014-04-28 09:58:22 -0400 |
commit | 0928730d3c637a79b36d0399eb6c9accea94427d (patch) | |
tree | 7cdfa7a65bef4818e7724e9f9acf20b2fd9b39da | |
parent | d68a468d86b4f7ec0385fe7cdf4c0aaf69e1e574 (diff) | |
parent | 337ecd41c8bd984770a85399d10c88cf207b7e90 (diff) | |
download | urwid-0928730d3c637a79b36d0399eb6c9accea94427d.tar.gz |
Merge pull request #64 from ismail-s/patch-1
Correct minor grammar mistakes
-rw-r--r-- | docs/manual/canvascache.rst | 4 | ||||
-rw-r--r-- | docs/manual/widgets.rst | 4 | ||||
-rwxr-xr-x | urwid/wimp.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/manual/canvascache.rst b/docs/manual/canvascache.rst index 0dd4271..bb5f094 100644 --- a/docs/manual/canvascache.rst +++ b/docs/manual/canvascache.rst @@ -12,7 +12,7 @@ visible, unchanged canvases so that not all of the visible widgets need to be rendered for each update. The :class:`Widget` base class uses some metaclass magic to -capture the canvas objects returned :meth:`Widget.render` is called and return +capture the canvas objects returned when :meth:`Widget.render` is called and return them the next time :meth:`Widget.render` is called again with the same parameters. The :meth:`Widget._invalidate` method is provided as a way to remove cached widgets so that changes to the widget are visible the next time the screen is redrawn. @@ -26,7 +26,7 @@ Composite Canvases When container and decoration widgets are rendered, they collect the canvases returned by their children and arrange them into a composite canvas. Composite -canvases may are nested to form a tree with the topmost widget's :meth:`Widget.render` +canvases are nested to form a tree with the topmost widget's :meth:`Widget.render` method returning the root of the tree. That canvas is sent to the display module to be rendered on the screen. diff --git a/docs/manual/widgets.rst b/docs/manual/widgets.rst index 0e42c52..44fe7d3 100644 --- a/docs/manual/widgets.rst +++ b/docs/manual/widgets.rst @@ -29,7 +29,7 @@ screen. When we render the topmost widget: 7. *(a)* possibly modifies the canvas from *(b)* and returns it Widgets *(a)*, *(b)* and *(e)* are called container widgets because they -contain other widgets. Container widgets choose the size and position their +contain other widgets. Container widgets choose the size and position of their contained widgets. Container widgets must also keep track of which one of their contained widgets @@ -315,7 +315,7 @@ or pop-up menus. The Overlay widget always treats the top widget as the one in focus. All keyboard input will be passed to the top widget. -If you want to use a flow flow widget for the top widget, first wrap the flow +If you want to use a flow widget for the top widget, first wrap the flow widget with a :class:`Filler` widget. diff --git a/urwid/wimp.py b/urwid/wimp.py index cd79e44..03a3613 100755 --- a/urwid/wimp.py +++ b/urwid/wimp.py @@ -566,7 +566,7 @@ class PopUpLauncher(delegate_to_widget_mixin('_original_widget'), def create_pop_up(self): """ - Subclass must override this method and have is return a widget + Subclass must override this method and return a widget to be used for the pop-up. This method is called once each time the pop-up is opened. """ |