From 92f8cd2d5509cfad0c5ebc1e1ce38d18f8d8f44f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 14 Jul 2020 11:38:32 -0700 Subject: [PATCH 1/3] Fix lots of misspelled words --- CHANGES.rst | 126 +++++++++++------------ build.py | 4 +- docker/gui/ubuntu-18.04/Dockerfile | 2 +- etg/animate.py | 2 +- etg/bmpcbox.py | 2 +- etg/brush.py | 2 +- etg/colour.py | 2 +- etg/cursor.py | 2 +- etg/dataobj.py | 2 +- etg/dataview.py | 2 +- etg/grid.py | 2 +- etg/intl.py | 2 +- etg/listctrl.py | 2 +- etg/mdi.py | 2 +- etg/menuitem.py | 2 +- etg/pen.py | 2 +- etg/region.py | 2 +- etg/richtextbuffer.py | 2 +- etg/sizer.py | 6 +- etg/srchctrl.py | 2 +- etg/window.py | 2 +- etg/windowid.py | 2 +- etg/wxdatetime.py | 2 +- etgtools/extractors.py | 6 +- etgtools/pi_generator.py | 2 +- etgtools/sip_generator.py | 2 +- etgtools/sphinx_generator.py | 2 +- etgtools/tweaker_tools.py | 2 +- packaging/README-bdist.txt | 2 +- samples/combo/combo1.py | 2 +- samples/dataview/DataViewModel.py | 8 +- samples/dataview/IndexListModel.py | 2 +- samples/dataview/data.py | 2 +- samples/doodle/superdoodle.py | 2 +- samples/embedded/embedded.cpp | 2 +- samples/floatcanvas/Animation.py | 6 +- samples/floatcanvas/BB_HitTest.py | 2 +- samples/floatcanvas/MicroDemo.py | 2 +- samples/floatcanvas/MovingTriangle.py | 2 +- samples/floatcanvas/OverlayDemo.py | 2 +- samples/floatcanvas/PixelBitmap.py | 2 +- samples/floatcanvas/PolyEditor.py | 2 +- samples/floatcanvas/SubClassNavCanvas.py | 2 +- samples/mainloop/mainloop.py | 2 +- samples/roses/wxroses.py | 2 +- samples/simple/simple.py | 2 +- 46 files changed, 118 insertions(+), 118 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index d8161400..e4728000 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -30,7 +30,7 @@ New and improved in this release: * DataViewModel.HasValue can be overridden and will inform the DataViewCtrl whether or not an item and column has data. If HasValue returns False, then GetValue for that item/col will not be called. This allows a distinction - between a truely empty cell, and one that has a value even if it is an empty + between a truly empty cell, and one that has a value even if it is an empty string. (#1600) * Added flag that allows blocking of item dragging in the UltimateListControl @@ -155,7 +155,7 @@ New and improved in this release: * DataViewModel.HasValue can be overridden and will inform the DataViewCtrl whether or not an item and column has data. If HasValue returns False, then GetValue for that item/col will not be called. This allows a distinction - between a truely empty cell, and one that has a value even if it is an empty + between a truly empty cell, and one that has a value even if it is an empty string. (#1600) * Added wrappers for the wx.grid.GridBlockCoords, wx.grid.GridBlocks, and @@ -1049,7 +1049,7 @@ methods related to handling App Events, like open-files or reopen-app, from being handled correctly. NOTE: It appears that wxPython applications on OSX will now always be -getting an initial Apple Event(s) sent to `MacOpenFiles` coresponding to +getting an initial Apple Event(s) sent to `MacOpenFiles` corresponding to the name of the script and args on the python command-line. Added patch #15142 which adds support for building with and using GTK3 @@ -1089,7 +1089,7 @@ Fixed "wxPyHtmlWinTagHandler, no destructor found." error. * 6-Sept-2014 Turned on a workaround for a bug that caused crashes on Windows XP. -This was due to a Micorsoft bug in optimizing access to TLS when a +This was due to a Microsoft bug in optimizing access to TLS when a DLL is dynamically loaded at runtime with LoadLibrary, such as how Python extension modules are loaded. See http://trac.wxwidgets.org/ticket/13116 @@ -1130,7 +1130,7 @@ Printing triggered from a Javascript window.print() statement will now work on OSX when using the old wx.webkit or the new wx.html2 browser controls. -Updated Scintilla code to verison 3.21 +Updated Scintilla code to version 3.21 Lots of fixes and improvements in the wxWidgets code. @@ -1212,7 +1212,7 @@ Fixed several other minor bugs discovered in the last release. * 26-Dec-2011 wx.ListCtrl: Added a static method named HasColumnOrderSupport which -returns a boolen value indicating if the column ordering APIs (see +returns a boolean value indicating if the column ordering APIs (see next item) are implemented for the current platform. Added methods for querying and manipulating the ordering of the @@ -1234,10 +1234,10 @@ implementations. The GTK version requires at least version 1.3.1 of libwebkitgtk-dev, which is the default on most of the recent Linux distributions. Please note that although these new classes and libraries are using names based on "WebView" I have put the wxPython -verison of them in the wx.html2 module because the wxWebKit project +version of them in the wx.html2 module because the wxWebKit project already produces a wx.webview module for wxPython. -The wx.lib.pubsub package has been updated to the latest verison and +The wx.lib.pubsub package has been updated to the latest version and several examples have been added to the samples folder. @@ -1296,7 +1296,7 @@ will be returned, so be sure to check the return values. Using Cairo on Windows is usually faster and seems to be of better quality than using the GDI+ backend. -The wx.GCDC class can now be constructed with an already exisiting +The wx.GCDC class can now be constructed with an already existing wx.GraphicsContext. The wx.lib.softwareupdate module has been added. It implements a @@ -1345,7 +1345,7 @@ other platforms it is a generic implementation using wx.Button. Added wx.lib.itemspicker. This class allows items to be selected from a list by moving them to another list. -Added wx.UIActionSimulator, which is able to programatically generate +Added wx.UIActionSimulator, which is able to programmatically generate platform specific keyboard and mouse events, (with varying degrees of success depending on the platform.) @@ -1373,7 +1373,7 @@ wx.ToggleButtons are now part of the new common button class hierarchy and so they can now have bitmaps instead of or in addition to their text labels. -Udpates from the AGW and Editra projects. +Updates from the AGW and Editra projects. @@ -1404,7 +1404,7 @@ the other.) wx.BitmapButton is pretty much redundant and will likely be phased out sometime in the future. (The OSX Carbon build does not support this new feature, but the Cocoa build does.) -wx.ComboBox: Added Popup and Dismiss methods for programatically +wx.ComboBox: Added Popup and Dismiss methods for programmatically showing and hiding the popup, although they are not implemented for all platforms yet. @@ -1427,7 +1427,7 @@ wx.wizard.Wizard: Add a new EVT_WIZARD_PAGE_SHOWN event. Added wx.InfoBar, which is similar to the message bar used in some web browser windows that is shown above or below the content window to -display messages and/or buttons in a way that doesn't interupt the +display messages and/or buttons in a way that doesn't interrupt the user's workflow like a modal message dialog does, but is much more noticeble than simply putting some text in the status bar. @@ -1440,7 +1440,7 @@ wx.lib.graphics to help maintain compatibility between the two. Added the wx.lib.pdfviewer package which is a contribution from David Hughes. It implements a simple cross-platform PDF viewer widget using -the 3rd party pyPdf package for parseing the PDF file. It's not super +the 3rd party pyPdf package for parsing the PDF file. It's not super fast nor is it feature complete, but for simple and small PDF files (such as those produced by ReportLab) it works well. @@ -1558,7 +1558,7 @@ the items proportions to return to the old behaviour. Added support for toolbar buttons with dropdown menus. -Added support for mouse events from two auxillary mouse buttons. +Added support for mouse events from two auxiliary mouse buttons. The methods that wx.TextCtrl and wx.ComboBox have in common have been factored out into a new base class that they share, wx.TextEntry. @@ -1635,7 +1635,7 @@ Added wx.lib.msgpanel, which provides a class derived from wx.Panel that can look and feel much like a wx.MessageDialog. Added wx.lib.progressindicator which is a simple class with a label -and a guage that can be used to show either specific or indeterminate +and a gauge that can be used to show either specific or indeterminate (pulsed) progress of some sort. It works well in status bars, and can be set to hide itself when not active. @@ -1717,7 +1717,7 @@ wx.FrozenWindow. It will freeze the window passed to it upon entry to the context, and will thaw the window upon exit from the context. Applied the final version of patch #10959 to the PyCrust code. It -adds many enhancements to the Py suite, inlcuding the ability to edit +adds many enhancements to the Py suite, including the ability to edit blocks of code (called slices) as a whole before executing them, and also the ability to execute some simple shell commands. @@ -1733,7 +1733,7 @@ Added Python 2.7 builds for Windows and Mac. Added Debian package builds for Ubuntu 9.10 and 10.4. -Many fixes and enhancements for the wx.lib.agw pacakge, including the +Many fixes and enhancements for the wx.lib.agw package, including the addition of pybusyinfo, ribbon, ultimatelistctrl and zoombar. @@ -1753,7 +1753,7 @@ of label renderers for Grids that work like the cell renderers do. See the demo for a simple sample. Solved the manifests problem with Python 2.6 on Windows. wxPython now -programatically creates its own activation context and loads a +programmatically creates its own activation context and loads a manifest in that context that specifies the use of the themable common controls on Windows XP and beyond. This also means that the external manifest files are no longer needed for the other versions of Python. @@ -1777,7 +1777,7 @@ http://wxpython.org/cairo/ ------- * 16-Feb-2009 -Added the wx.lib.agw package, which contiains most of the widgets from +Added the wx.lib.agw package, which contains most of the widgets from http://xoomer.alice.it/infinity77/main/freeware.html written by Andrea Gavana. Andrea's widgets that were already in wx.lib were also moved to the wx.lib.agw package, with a small stub module left in wx.lib. @@ -1791,7 +1791,7 @@ uses a wx.BitmapButton instead of a normal wx.Button. This makes the color picker look and behave lots better on Mac than before. You can now pass the handler function to the Unbind method. If it is -given then Unbind will only disconenct the event handler that uses the +given then Unbind will only disconnect the event handler that uses the same handler function, so if there are multiple bindings for the same event type you'll now be able to selectively unbind specific instances. @@ -1878,7 +1878,7 @@ Make it easier to replace the check box images used in the CheckListCtrlMixin class. Fixed bug in wx.ScrolledWindow when child focus events caused -unneccessary or incorrect scrolling. +unnecessary or incorrect scrolling. Fixed a bug in wx.GridBagSizer where hidden items were not ignored in part of the layout algorithm. @@ -2021,7 +2021,7 @@ Leopard. wxMac: Fixed assertion errors dealing with toolbars on Leopard. wxMac: Multiline textcontrols now support attributes for margins and -alignement; only a single tab distance can be set though. +alignment; only a single tab distance can be set though. Added the wx.Image.AdjustChannels method. This function muliplies all 4 channels (red, green, blue, alpha) with a factor (around @@ -2075,7 +2075,7 @@ wxGTK: Add wx.Window.GetGtkWidget. All: Undprecated wx.ListCtrl.[G|S]etItemSpacing -All: Fixed wx.Palette constructor wrapper. It takes three seqences of +All: Fixed wx.Palette constructor wrapper. It takes three sequences of integers to specify the R, G, and B values for each color in the palette, which must all be the same length and which must contain integer values in the range of 0..255 inclusive. @@ -2228,7 +2228,7 @@ existed. wx.aui.PyAuiDocArt and wx.aui.PyAuiTabArt can now be derived from in wxPython and plugged in to wx.AUI. -XRCed has a new experimental feature to add controls by draging icons +XRCed has a new experimental feature to add controls by dragging icons from the tool palette to the test window. Mouse position is tracked to highlight the future parent of the new item. @@ -2283,7 +2283,7 @@ Add wx.lib.mixins.treemixin from Frank Niessink. Added the wx.SizerFlags class, and also added AddF, InsertF and PrependF methods to wx.Sizer. The wxSizerFlags class provides a -convienient and easier to read way to add items to a sizer. It was +convenient and easier to read way to add items to a sizer. It was added as a new set of methods of the wx.Sizer class so as to not disturb existing code. For example, instead of writing:: @@ -2337,7 +2337,7 @@ Lots of changes to XRCed from Roman Rolinsky: is a special comment starting with '%' character, followed by a line of python code. It is executed using 'exec' when the resource file is opened. This is useful to import plugin modules containing custom - handlers which are specific to the resource file, hovewer this is of + handlers which are specific to the resource file, however this is of course a security hole if you use foreign XRC files. A warning is displayed if the preference option 'ask' is selected (by default). @@ -2376,7 +2376,7 @@ use, for example, wx.EVT_BUTTON.typeId instead of wx.wxEVT_COMMAND_BUTTON_CLICKED. Note that there are a few composite events, such as EVT_MOUSE and EVT_SCROLL, that will actually bind multiple event types at once, and in these cases the typeId property -may not give you what you want. You should use te component events in +may not give you what you want. You should use the component events in these cases. PyCrust now has an option for showing/hiding the notebook. @@ -2451,7 +2451,7 @@ classes. These classes allow you to implement a wx.ComboBox-like widget where the popup can be nearly any kind of widget, and where you have a lot of control over other aspects of the combo widget as well. It works very well on GTK and MSW, using native renderers for drawing -the combo button, but is unfortunatly still a bit klunky on OSX... +the combo button, but is unfortunately still a bit klunky on OSX... Use system default paper size for printing instead of A4 by default. @@ -2565,8 +2565,8 @@ Fixed name errors in the old wxPython package namespace. As a reminder, use of this package is deprecated and you are encouraged to switch your programs over to the wx package. -Fixed wx.glcanvas.GLCanvas.SetCurrent to be compatible with prevoius -versons. +Fixed wx.glcanvas.GLCanvas.SetCurrent to be compatible with previous +versions. Added wx.StandardPaths.GetTmpDir. @@ -2730,7 +2730,7 @@ Added GetResourcesDir and GetLocalizedResourcesDir to wx.StandardPaths. Added a GetReceivedFormat method to wx.DataObjectComposite. You can -use this to find out what format of data object was recieved from the +use this to find out what format of data object was received from the source of the clipboard or DnD operation, and then you'll know which of the component data objects to use to access the data. @@ -2845,7 +2845,7 @@ what-not will still use the emulated toolbar because of platform restrictions in how/where the native toolbar can be used. Added Python properties for many of the getter/setter methods of wx -classes. In order for the names to be predicatble for somebody +classes. In order for the names to be predictable for somebody already familiar with wxPython the property names are simply the name of the getter with the "Get" dropped. For example, wx.Window has a property named "Size" that maps to GetSize and SetSize. So far there @@ -2922,7 +2922,7 @@ The first parts of a new 2D drawing API has been added with the wx.GraphicsPath and wx.GraphicsContext classes. They wrap GDI+ on Windows, Cairo on wxGTK and CoreGraphics on OS X. They allow path-based drawing with alpha-blending and anti-aliasing, and use a floating -point cooridnate system. Currently they can only target drawing to +point coordinate system. Currently they can only target drawing to windows, but other wx.DC backends are forthcoming. The APIs may evolve a bit more before they are finalaized with the 2.8 release, but there is enough there now to get a good feel for how things will work. @@ -3078,7 +3078,7 @@ wxGTK: Fix RequestMore for idle events. wxGTK: Implement user dashes for PS and GNOME printing. wxGTK: Correct update region code. Don't always invalidate the whole -window upon resize. Reenable support for thewx.NO_FULL_REPAINT_ON_RESIZE +window upon resize. Re-enable support for thewx.NO_FULL_REPAINT_ON_RESIZE flag. Also disable refreshing custom controls when focusing in and out. wx.lib.pubsub: Publisher is now able to parse a dotted notation string @@ -3222,7 +3222,7 @@ workaround a bug in MSLU! wxMSW: wx.lib.iewin.IEHtmlWindow now properly handles tabbing, return and other special keys properly. -Lots of PyCrust enhancments started by Franz Steinaeusler, Adi Sieker, +Lots of PyCrust enhancements started by Franz Steinaeusler, Adi Sieker, and Sebastian Haase, and which in turn were further enhanced, fixed tweaked and finished up by me. The changes include the following: @@ -3710,7 +3710,7 @@ Some XRC changes: wxMSW: fix for [ 1052989 ] TextCtrl.SetBackgroundColour(wx.NullColour) bug. -Added wx.PasswordEntryDialog analagous to wx.TextEntryDialog, allows +Added wx.PasswordEntryDialog analogous to wx.TextEntryDialog, allows detecting entering an empty string vs. cancel unlike the wx.GetPasswordFromUser dialog function. @@ -3734,7 +3734,7 @@ OGL patch from Shane Holloway: Causes many problems when it's not. ;) Fixed GetSaveData and SetSaveData in wx.lib.multisash to not depend on -the default way that class objectss are converted to strings. +the default way that class objects are converted to strings. Fixed problem in StyledTextCtrl.Set[HV]ScrollBar that could leave the internal scrollbar visible. @@ -3790,7 +3790,7 @@ reference to the timer and then del the reference when you are finished with the timer. Updated to 1.3.24 of SWIG. All of my big patches have been applied to -the main SWIG source tree, but unfortunatly there were also some bugs +the main SWIG source tree, but unfortunately there were also some bugs added that affected the wxPython build and a few details in my original patch were changed/removed, so we are still not free of patches. A new patch for SWIG is located in the wxPython/SWIG @@ -3845,7 +3845,7 @@ lots of surplus events) wxGTK: Applied patch for proper menu highlight colour detection in wx.SystemSettings. -wxGTK: Commited scrollbar patch #1093339 which sends lineup, linedown +wxGTK: Committed scrollbar patch #1093339 which sends lineup, linedown events based on intercepting the mouse down events. wxGTK: Applied patch #1102789 which solved conflicts between wxWidgets @@ -4018,7 +4018,7 @@ in the source tree if you need to use SWIG when building your own copy of wxPython, or other extension modules that need to integrate with the wxPython modules. -Added wx.Frame.RequestUserAttention which, if the platform suports it, +Added wx.Frame.RequestUserAttention which, if the platform supports it, will do something (such as flash the task bar item) to suggest to the user that they should look at that window. @@ -4044,7 +4044,7 @@ wxMSW: added AssociateHandle and DissociateHandle to wx.Window wxMac: fix for toolbar tooltips wx.Sizer.Show (and Hide) now take an optional parameter specifying if -the item to be shown should be searched for recursivly in subsizers, +the item to be shown should be searched for recursively in subsizers, and return a boolean value indicating if the item was found. wxMSW: fixed MaximizeEvent generation in wx.Frame @@ -4093,7 +4093,7 @@ merged with the normal dock popup menu. See the MigrationGuide for more details and a warning. Added wx.TopLevelWindow.IsActive() which tells you if the frame or -dialog is or containts the active window with the keyboard focus. +dialog is or contains the active window with the keyboard focus. Added ability to create a font based on pixel size rather than point size via the FontFromPixelSize constructor. @@ -4223,7 +4223,7 @@ now locaed in their own sub-package, wx.lib.masked. Demos updated. The changes that implemented the incompatible wx.DC methods in 2.5.1.5 have been reverted. The wx.DC methods are now compatible with the 2.4 -implemetation. In addition a set of renamed methods have been added +implementation. In addition a set of renamed methods have been added that take wx.Point and/or wx.Size objects instead of individual parameters. @@ -4247,7 +4247,7 @@ wx.InitAllImageHandlers is now an empty function that does nothing but exist for backwards compatibility. The C++ version is now called automatically when wxPython is initialized. Since all the handlers are included in the wxWidgets shared library anyway, this imposes only -a very small amount of overhead and removes several unneccessary +a very small amount of overhead and removes several unnecessary problems. Replaced wx/lib/pubsub.py with a version that uses weak references to @@ -4359,9 +4359,9 @@ from wxBookCtrl. Added Gordon Williams' PyPlot module to the library, available as the wx.lib.plot module. -I made a small but important change in the code that aquires the +I made a small but important change in the code that acquires the Python Global Interpreter Lock to try and prevent deadlocks that can -happen when there are nested attempts to aquire the GIL. +happen when there are nested attempts to acquire the GIL. The RPMs will now install menu items on Mandrake Linux in Applications/Development/Tools for PyCrust, XRCed, etc. The RPMs are @@ -4442,7 +4442,7 @@ Floats are allowed again as function parameters where ints are expected. ------- * 1-Oct-2003 -Use wxSTC in the demo for displaying the soucre code of the samples. +Use wxSTC in the demo for displaying the source code of the samples. Lots of bug fixes and such from the wxWindows folks. @@ -4487,7 +4487,7 @@ worked out how to do proper clipping of child windows on wxGTK. Patrick O'Brien's PyCrust package has been renamed to Py and now includes several new tools. As part of the change the location of the -pacakge has changed as well, it is now accessible as "from wxPython +package has changed as well, it is now accessible as "from wxPython import py" (or "from wx import py" using the new namespace.) There are still some transition modules in the wxPython.lib.PyCrust package that will issue a warning and then import what is needed from the new @@ -4731,7 +4731,7 @@ You can now overload OnInitGui, OnExit and OnAssert in your classes derived from wxApp. Added GetSelectedCells, GetSelectionBlockTopLeft, -GetSelectionBlockBottomRight, GetSelectedRows, GetSelectedCols nethods +GetSelectionBlockBottomRight, GetSelectedRows, GetSelectedCols methods to wxGrid. Added Python == and != operators for some basic classes @@ -4753,7 +4753,7 @@ Added wxPython.lib.evtmgr by Robb Shecter, which is an easier, more events using the Publish/Subscribe pattern. Added wxPython.lib.popupctl by Gerrit van Dyk which is a combobox-like -gizmo for poping up arbitrary controls. It is currently using +gizmo for popping up arbitrary controls. It is currently using wxDialog because of some issues with wxPopupWindow... Added wxPython.lib.gridmovers by Gerrit van Dyk which facilitates the @@ -5326,7 +5326,7 @@ Added wxInputStream and the wxFileSystem family of classes, contributed by Joerg Baumann. Added wxProcess and support for it to wxExecute. wxProcess lets you -get notified when an asyncronous child process terminates, and also to +get notified when an asynchronous child process terminates, and also to get input/output streams for the child process's stdout, stderr and stdin. @@ -5450,7 +5450,7 @@ on the fly that derives from wxWindow, the COM CoClass and others needed to make it all work. The resulting class can be instantiated just like wxWindow, used in sizers, etc. It also responds to all COM method calls, properties, etc., and if the class or a mix-in has -matching method names, then the COM events will be propogated back to +matching method names, then the COM events will be propagated back to them. Created a typemap that allows a string to be used for parameters @@ -5463,7 +5463,7 @@ wxStyledTextCtrl is finally in wxPython!! (And the crowd goes wild...) There's no documentaTion yet (the crowd boos and hisses...) but I've included a very readable source file in the wxPython/demo/data directory, a couple fairly good examples, and you -can also refer to the Scintilla documentaion at +can also refer to the Scintilla documentation at http://www.scintilla.org/ScintillaDoc.html to help fill in the gaps until the docs are done. (The croud murmers contentedly as the tool provider smiles convincingly and removes his flame-proof suit.) @@ -5563,7 +5563,7 @@ What's new in 2.1.11 * 13-Nov-1999 Skipped a few version numbers so wxMSW, wxGTK and wxPython are all -syncronized. +synchronized. wxImage.SetData now makes a copy of the image data before giving it to wxImage. I mistakenly thought that wxImage would copy the data @@ -5627,7 +5627,7 @@ What's new in 2.1.4 ------------------- * 7-Oct-1999 -This release is NOT syncronized with a snapshot release of wxGTK or +This release is NOT synchronized with a snapshot release of wxGTK or wxMSW. For MSW this isn't much of a problem since you can get the binaries from the web site. For other platforms you'll have to build wxGTK from CVS. (See http://web.ukonline.co.uk/julian.smart/wxwin/cvs.htm) @@ -5686,7 +5686,7 @@ Added wxPyEvent and wxPyCommandEvent classes, derived from wxEvent and wxCommandEvent. Each of them has SetPyData and GetPyData methods that accept or return a single Python object. You can use these classes directly or derive from them to create your own types of event objects -that can pass through the wxWindows event system without loosing their +that can pass through the wxWindows event system without losing their Python parts (as long as they are stored with SetPyData.) Stay tuned for more info and examples in future releases. @@ -5744,7 +5744,7 @@ Added wxCaret. Unfortunately it's author has still not documented it in the wxWindows docs... Some new 3rd party contributions in wxPython.lib. PyShell, in -shell.py is an interesting implementaion of an interactive Python +shell.py is an interesting implementation of an interactive Python shell in wxWindows. floatbar.py has a class derived from wxToolBar that can sense mouse drags and then reparent itself into another frame. Moving the new frame close to where it came from puts the tool @@ -5759,7 +5759,7 @@ What's new in 2.1b3 -------------------- * 1-Sep-1999 -This release is syncronized with release 2.1 snapshot 9 of wxWindows. +This release is synchronized with release 2.1 snapshot 9 of wxWindows. Switched to using SWIG from CVS (see http://swig.cs.uchicago.edu/cvs.html) for some of the new features and such. Also they have encorporated my @@ -5819,7 +5819,7 @@ wxWindow.PopupMenuXY to be consistent with some other methods. Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace. You can now provide your own app.MainLoop method. See -wxPython/demo/demoMainLoop.py for an example and some explaination. +wxPython/demo/demoMainLoop.py for an example and some explanation. Got the in-place-edit for the wxTreeCtrl fixed and added some demo code to show how to use it. @@ -5880,7 +5880,7 @@ Fixed a bug with attaching objects to tree items. Actually was a symptom of a larger problem with not obtaining the interpreter lock when doing any Py_DECREFs. -wxSizer and friends. Sizers are layout tools that manage a colection +wxSizer and friends. Sizers are layout tools that manage a collection of windows and sizers. Different types of sizers apply different types of layout algorithms. You saw it here first! These classes are not even in the wxWindows C++ library yet! @@ -5893,7 +5893,7 @@ What's new in 2.0b9 Bug fix for ListCtrl in test4.py (Was a missing file... DSM!) -Bug fix for occassional GPF on Win32 systems upon termination of a +Bug fix for occasional GPF on Win32 systems upon termination of a wxPython application. Added wxListBox.GetSelections returning selections as a Tuple. @@ -5940,7 +5940,7 @@ What's new in 2.0b7 ------------------- * 15-Mar-1999 -Added DLG_PNT and DLG_SZE convienience methods to wxWindow class. +Added DLG_PNT and DLG_SZE convenience methods to wxWindow class. Added missing constructor and other methods for wxMenuItem. diff --git a/build.py b/build.py index 87b1b765..aa2f2e18 100755 --- a/build.py +++ b/build.py @@ -1446,7 +1446,7 @@ def cmd_build_wx(options, args): build_options.append('--gtk3') # Change to what will be the wxWidgets build folder - # (Note, this needs to be after any testing for file/path existance, etc. + # (Note, this needs to be after any testing for file/path existence, etc. # because they may be specified as relative paths.) pwd = pushDir(BUILD_DIR) @@ -1699,7 +1699,7 @@ def cmd_build_docker(options, args): def cmd_build_others(options, args): - # Build other stuff that may have their own seprarate build commands instead + # Build other stuff that may have their own separate build commands instead # of the (ab)normal etg/tweak/generate/sip/compile sequence that the rest of # wxPython uses. So far, it's just the wx.svg package cmdTimer = CommandTimer('build_others') diff --git a/docker/gui/ubuntu-18.04/Dockerfile b/docker/gui/ubuntu-18.04/Dockerfile index 86bad24d..3ae33774 100644 --- a/docker/gui/ubuntu-18.04/Dockerfile +++ b/docker/gui/ubuntu-18.04/Dockerfile @@ -19,7 +19,7 @@ RUN touch ~/.Xauthority; \ mkdir ~/.vnc; \ echo "password" | vncpasswd -f >> ~/.vnc/passwd; \ chmod 600 ~/.vnc/passwd; \ -# And a coresponding one of these: +# And a corresponding one of these: # echo "exec /usr/bin/startlxde" > ~/.vnc/xstartup; echo "exec lxsession -e LXDE -s Lubuntu" > ~/.vnc/xstartup; # echo "exec mate-session" > ~/.vnc/xstartup; diff --git a/etg/animate.py b/etg/animate.py index bbd32ac3..f65bbed2 100644 --- a/etg/animate.py +++ b/etg/animate.py @@ -65,7 +65,7 @@ def run(): tools.fixWindowClass(c) # Insert a copy of the base class Play into this class. It's not in the - # inteface docs, but sip needs to see it there, since the one that is there + # interface docs, but sip needs to see it there, since the one that is there # has a different signature. c.find('Play').overloads.append(play) diff --git a/etg/bmpcbox.py b/etg/bmpcbox.py index 64394cf0..c10fae2c 100644 --- a/etg/bmpcbox.py +++ b/etg/bmpcbox.py @@ -57,7 +57,7 @@ def run(): #print([i.name for i in items]) c.find('GetCurrentSelection').ignore() - # Ignore the old C array verison of the ctor and Create methods, and + # Ignore the old C array version of the ctor and Create methods, and # fixup the remaining ctor and Create with the typical default values for # the args c.find('wxBitmapComboBox').findOverload('wxString choices').ignore() diff --git a/etg/brush.py b/etg/brush.py index ab86a1b9..7b5c492d 100644 --- a/etg/brush.py +++ b/etg/brush.py @@ -66,7 +66,7 @@ def run(): # created. That messes up the code that SIP generates for them, so we need # to come up with another solution. So instead we will just create # uninitialized brush in a block of Python code, that will then be - # intialized later when the wx.App is created. + # initialized later when the wx.App is created. c.addCppMethod('void', '_copyFrom', '(const wxBrush* other)', "*self = *other;", briefDoc="For internal use only.") # ?? diff --git a/etg/colour.py b/etg/colour.py index f84369ab..ae4a66ac 100644 --- a/etg/colour.py +++ b/etg/colour.py @@ -47,7 +47,7 @@ def run(): """, factory=True) - # Change this macro into a value so we wont have problems when SIP takes its + # Change this macro into a value so we won't have problems when SIP takes its # address module.addCppCode("""\ #undef wxTransparentColour diff --git a/etg/cursor.py b/etg/cursor.py index d2feba64..67338561 100644 --- a/etg/cursor.py +++ b/etg/cursor.py @@ -71,7 +71,7 @@ def run(): # created. That messes up the code that SIP generates for them, so we need # to come up with another solution. So instead we will just create # uninitialized cursor in a block of Python code, that will then be - # intialized later when the wx.App is created. + # initialized later when the wx.App is created. c.addCppMethod('void', '_copyFrom', '(const wxCursor* other)', "*self = *other;", briefDoc="For internal use only.") # ?? diff --git a/etg/dataobj.py b/etg/dataobj.py index 24201d25..e59632df 100644 --- a/etg/dataobj.py +++ b/etg/dataobj.py @@ -67,7 +67,7 @@ def addGetAllFormats(klass, pureVirtual=False): """, # This code will be used in the function that calls a Python implementation - # of this method. So we need to translate between the real C++ siganture + # of this method. So we need to translate between the real C++ signature # and the Python signature. virtualCatcherCode="""\ // VirtualCatcherCode for wx.DataObject.GetAllFormats diff --git a/etg/dataview.py b/etg/dataview.py index f6b828b2..c00f736d 100644 --- a/etg/dataview.py +++ b/etg/dataview.py @@ -125,7 +125,7 @@ def run(): By default a regular dictionary is used to implement the ID to object mapping. Optionally a WeakValueDictionary can be useful when there will be - a high turnover of objects and mantaining an extra reference to the + a high turnover of objects and maintaining an extra reference to the objects would be unwise. If weak references are used then the objects associated with data items must be weak-referenceable. (Things like stock lists and dictionaries are not.) See :meth:`UseWeakRefs`. diff --git a/etg/grid.py b/etg/grid.py index ecf6e759..61bd0cfb 100644 --- a/etg/grid.py +++ b/etg/grid.py @@ -191,7 +191,7 @@ def run(): c.addPyMethod('__iter__', '(self)', 'return PyGridBlocksIterator(self)', - "Returns a Python iterator for acessing the collection of grid blocks.") + "Returns a Python iterator for accessing the collection of grid blocks.") # This class is the Python iterator that knows how to fetch blocks from the # wxGridBlocks object diff --git a/etg/intl.py b/etg/intl.py index 40b6b75e..09a231d4 100644 --- a/etg/intl.py +++ b/etg/intl.py @@ -57,7 +57,7 @@ def run(): module.addPyCode("""\ #---------------------------------------------------------------------------- # Add the directory where the wxWidgets catalogs were installed - # to the default catalog path, if they were put in the pacakge dir. + # to the default catalog path, if they were put in the package dir. import os _localedir = os.path.join(os.path.dirname(__file__), "locale") if os.path.exists(_localedir): diff --git a/etg/listctrl.py b/etg/listctrl.py index 164d8afd..d50debd3 100644 --- a/etg/listctrl.py +++ b/etg/listctrl.py @@ -208,7 +208,7 @@ def run(): c.addPyCode('ListCtrl.SetStringItem = wx.deprecated(ListCtrl.SetItem, "Use SetItem instead.")') - # Provide a way to determine if column ordering is possble + # Provide a way to determine if column ordering is possible c.addCppMethod('bool', 'HasColumnOrderSupport', '()', """\ #ifdef wxHAS_LISTCTRL_COLUMN_ORDER diff --git a/etg/mdi.py b/etg/mdi.py index f87ec05b..8c63cf75 100644 --- a/etg/mdi.py +++ b/etg/mdi.py @@ -34,7 +34,7 @@ def run(): # customizing the generated code and docstrings. # Let the generator know about these intermediate classes even though they - # are undocumented. wxTDIChildFrame is used elsewhere in the class hiearchy + # are undocumented. wxTDIChildFrame is used elsewhere in the class hierarchy # so it needs to be available. module.insertItemBefore(module.find('wxMDIClientWindow'), etgtools.WigCode("""\ class wxMDIChildFrameBase : wxFrame diff --git a/etg/menuitem.py b/etg/menuitem.py index 2421ea96..b2f620b4 100644 --- a/etg/menuitem.py +++ b/etg/menuitem.py @@ -153,7 +153,7 @@ def run(): c.addItem(etgtools.PropertyDef('Enabled', 'IsEnabled', 'Enable')) c.find('GetAccel').factory = True - c.find('GetAccelFromString').ignore() # Not implemented anywere? + c.find('GetAccelFromString').ignore() # Not implemented anywhere? module.addItem(tools.wxListWrapperTemplate('wxMenuItemList', 'wxMenuItem', module)) diff --git a/etg/pen.py b/etg/pen.py index a6e175e5..9ee72ca8 100644 --- a/etg/pen.py +++ b/etg/pen.py @@ -93,7 +93,7 @@ def run(): # created. That messes up the code that SIP generates for them, so we need # to come up with another solution. So instead we will just create # uninitialized pens in a block of Python code, that will then be - # intialized later when the wx.App is created. + # initialized later when the wx.App is created. c.addCppMethod('void', '_copyFrom', '(const wxPen* other)', "*self = *other;", briefDoc="For internal use only.") # ?? diff --git a/etg/region.py b/etg/region.py index 431006df..4297e5bc 100644 --- a/etg/region.py +++ b/etg/region.py @@ -64,7 +64,7 @@ def run(): # Iterator stuff c.addPyMethod('__iter__', '(self)', 'return PyRegionIterator(self)', """\ - Returns a rectangle interator conforming to the Python iterator + Returns a rectangle iterator conforming to the Python iterator protocol.""") c.addPyCode("""\ class PyRegionIterator(object): diff --git a/etg/richtextbuffer.py b/etg/richtextbuffer.py index a8322fdd..aaaba858 100644 --- a/etg/richtextbuffer.py +++ b/etg/richtextbuffer.py @@ -436,7 +436,7 @@ def run(): #------------------------------------------------------- # Ignore all Dump() methods since we don't wrap wxTextOutputStream. - # TODO: try swithcing the parameter type to wxOutputStream and then in + # TODO: try switching the parameter type to wxOutputStream and then in # the wrapper code create a wxTextOutputStream from that to pass on to # Dump. diff --git a/etg/sizer.py b/etg/sizer.py index 0eef738d..9f5bd2cd 100644 --- a/etg/sizer.py +++ b/etg/sizer.py @@ -63,9 +63,9 @@ def run(): m.find('userData').transfer = True m.find('userData').type = 'wxPyUserData*' - gud = c.find('GetUserData') - gud.type = 'wxPyUserData*' - gud.setCppCode('return dynamic_cast(self->GetUserData());') + good = c.find('GetUserData') + good.type = 'wxPyUserData*' + good.setCppCode('return dynamic_cast(self->GetUserData());') # these have been deprecated for a while so go ahead and get rid of them c.find('SetWindow').ignore() diff --git a/etg/srchctrl.py b/etg/srchctrl.py index ca0b4463..30de0dde 100644 --- a/etg/srchctrl.py +++ b/etg/srchctrl.py @@ -65,7 +65,7 @@ def run(): searchCtrl = c - # The safest way to reconcile the differences in the class hierachy + # The safest way to reconcile the differences in the class hierarchy # between the native wxSearchCtrl on Mac and the generic one on the other # platforms is to just say that this class derives directly from # wxControl (the first common ancestor) instead of wxTextCtrl, and then diff --git a/etg/window.py b/etg/window.py index 3522077f..c388df76 100644 --- a/etg/window.py +++ b/etg/window.py @@ -37,7 +37,7 @@ def run(): c = module.find('wxVisualAttributes') assert isinstance(c, etgtools.ClassDef) - # Mark the stucture memebers as read-only, and make copies of the values + # Mark the structure members as read-only, and make copies of the values # when fetching them. This is to protect against cases where the # VisualAttributes object is transient and may be GC'd while we still are # using a reference to a C++ member value. diff --git a/etg/windowid.py b/etg/windowid.py index e701ac72..70420a40 100644 --- a/etg/windowid.py +++ b/etg/windowid.py @@ -41,7 +41,7 @@ def run(): # allows them to be reused and be also be protected from conflicts from # other auto allocated IDs. - # First, add defintions of the existing C++ class and its elements + # First, add definitions of the existing C++ class and its elements klass = ClassDef(name='wxWindowIDRef', bases = [], briefDoc="""\ A wxWindowIDRef object wraps an ID value and marks it as being in-use until all references to that ID are gone. diff --git a/etg/wxdatetime.py b/etg/wxdatetime.py index a3ef6c56..709f60f6 100644 --- a/etg/wxdatetime.py +++ b/etg/wxdatetime.py @@ -71,7 +71,7 @@ def run(): tools.ignoreAllOperators(c) # Ignore ctors with unknown types or that have overload conflicts that - # can't be distingished in Python + # can't be distinguished in Python ctor = c.find('wxDateTime') ctor.findOverload('time_t').ignore() ctor.findOverload('struct tm').ignore() diff --git a/etgtools/extractors.py b/etgtools/extractors.py index dc84fa62..757ec61b 100644 --- a/etgtools/extractors.py +++ b/etgtools/extractors.py @@ -288,7 +288,7 @@ class FunctionDef(BaseDef, FixWxPrefix): self.pyInt = False # treat char types as integers self.transfer = False # transfer ownership of return value to C++? self.transferBack = False # transfer ownership of return value from C++ to Python? - self.transferThis = False # ownership of 'this' pointer transfered to C++ + self.transferThis = False # ownership of 'this' pointer transferred to C++ self.cppCode = None # Use this code instead of the default wrapper self.noArgParser = False # set the NoargParser annotation self.preMethodCode = None @@ -486,7 +486,7 @@ class FunctionDef(BaseDef, FixWxPrefix): 'wxArrayInt()' : '[]', } if isinstance(self, CppMethodDef): - # rip appart the argsString instead of using the (empty) list of parameters + # rip apart the argsString instead of using the (empty) list of parameters lastP = self.argsString.rfind(')') args = self.argsString[:lastP].strip('()').split(',') for arg in args: @@ -672,7 +672,7 @@ class ClassDef(BaseDef): self.abstract = False # is it an abstract base class? self.external = False # class is in another module self.noDefCtor = False # do not generate a default constructor - self.singlton = False # class is a singleton so don't call the dtor until the interpreter exits + self.singleton = False # class is a singleton so don't call the dtor until the interpreter exits self.allowAutoProperties = True self.headerCode = [] self.cppCode = [] diff --git a/etgtools/pi_generator.py b/etgtools/pi_generator.py index 419a405c..42a540f3 100644 --- a/etgtools/pi_generator.py +++ b/etgtools/pi_generator.py @@ -269,7 +269,7 @@ class PiWrapperGenerator(generators.WrapperGeneratorBase, FixWxPrefix): # Now write the Python equivalent class for the typedef if not bases: - bases = ['object'] # this should not happpen, but just in case... + bases = ['object'] # this should not happen, but just in case... stream.write('%sclass %s(%s):\n' % (indent, name, ', '.join(bases))) indent2 = indent + ' '*4 if typedef.briefDoc: diff --git a/etgtools/sip_generator.py b/etgtools/sip_generator.py index d3ff60fc..4fd119ac 100644 --- a/etgtools/sip_generator.py +++ b/etgtools/sip_generator.py @@ -1041,7 +1041,7 @@ from .%s import * annotations.append('External') if item.noDefCtor: annotations.append('NoDefaultCtors') - if item.singlton: + if item.singleton: annotations.append('DelayDtor') if annotations: diff --git a/etgtools/sphinx_generator.py b/etgtools/sphinx_generator.py index b8757e00..1897ab25 100644 --- a/etgtools/sphinx_generator.py +++ b/etgtools/sphinx_generator.py @@ -205,7 +205,7 @@ class Node(object): This method returns ``True`` if this node contains a specific class into its descendants. - :param `klass`: can be any of the classes definied in this script except :class:`XMLDocString`. + :param `klass`: can be any of the classes defined in this script except :class:`XMLDocString`. :param `node`: another `Node` instance or ``None`` if this is the first invocation of this function. diff --git a/etgtools/tweaker_tools.py b/etgtools/tweaker_tools.py index c07fdfa6..179df91a 100644 --- a/etgtools/tweaker_tools.py +++ b/etgtools/tweaker_tools.py @@ -1403,7 +1403,7 @@ def generateStubs(cppFlag, module, excludes=[], typeValMap={}, # A simple class for holding lists of code snippets for the header and -# possibily the C++ file. +# possibly the C++ file. class _StubCodeHolder: def __init__(self, flag): self.flag = flag diff --git a/packaging/README-bdist.txt b/packaging/README-bdist.txt index 67efe49b..8839be9a 100644 --- a/packaging/README-bdist.txt +++ b/packaging/README-bdist.txt @@ -45,7 +45,7 @@ shared libraries. This will work for Windows and Mac, and should also work for any unix-like system based on ELF binaries, and if the expected objdump utility was found on the build system. -For those cases where the build was not able to perform the neccesary magic +For those cases where the build was not able to perform the necessary magic required to be able to make and use relocatable shared libraries, you may need to do a little extra to help wxPython find the wxWidgets libraries. Check your platform's documentation for details, but it may be as simple as diff --git a/samples/combo/combo1.py b/samples/combo/combo1.py index 6f1b6249..63493bbe 100644 --- a/samples/combo/combo1.py +++ b/samples/combo/combo1.py @@ -23,7 +23,7 @@ class NullLog: #---------------------------------------------------------------------- # This class is used to provide an interface between a ComboCtrl and the -# ListCtrl that is used as the popoup for the combo widget. +# ListCtrl that is used as the popup for the combo widget. class ListCtrlComboPopup(wx.ComboPopup): diff --git a/samples/dataview/DataViewModel.py b/samples/dataview/DataViewModel.py index 949cd504..dddc5603 100644 --- a/samples/dataview/DataViewModel.py +++ b/samples/dataview/DataViewModel.py @@ -17,8 +17,8 @@ def makeBlank(self): return empty #---------------------------------------------------------------------- -# We'll use instaces of these classes to hold our music data. Items in the -# tree will get associated back to the coresponding Song or Genre object. +# We'll use instances of these classes to hold our music data. Items in the +# tree will get associated back to the corresponding Song or Genre object. class Song(object): def __init__(self, id, artist, title, genre): @@ -57,7 +57,7 @@ class Genre(object): # 1. Artist: string # 2. Title: string # 3. id: integer -# 4. Aquired: date +# 4. Acquired: date # 5. Liked: bool # @@ -87,7 +87,7 @@ class MyTreeListModel(dv.PyDataViewModel): # item(s) should be reported as children of this node. A List view # simply provides all items as children of this hidden root. A Tree # view adds additional items as children of the other items, as needed, - # to provide the tree hierachy. + # to provide the tree hierarchy. # If the parent item is invalid then it represents the hidden root # item, so we'll use the genre objects as its children and they will diff --git a/samples/dataview/IndexListModel.py b/samples/dataview/IndexListModel.py index 5603a0d1..a3410e3e 100644 --- a/samples/dataview/IndexListModel.py +++ b/samples/dataview/IndexListModel.py @@ -5,7 +5,7 @@ import wx.dataview as dv #---------------------------------------------------------------------- # This model class provides the data to the view when it is asked for. -# Since it is a list-only model (no hierachical data) then it is able +# Since it is a list-only model (no hierarchical data) then it is able # to be referenced by row rather than by item object, so in this way # it is easier to comprehend and use than other model types. In this # example we also provide a Compare function to assist with sorting of diff --git a/samples/dataview/data.py b/samples/dataview/data.py index af58c235..d0054e91 100644 --- a/samples/dataview/data.py +++ b/samples/dataview/data.py @@ -46,7 +46,7 @@ musicdata = [ [44, "Blue Man Group", "Endless Column", "New Age"], [45, "Blue Man Group", "Klein Mandelbrot", "New Age"], [46, "Kenny G", "Silhouette", "Jazz"], - [47, "Sade", "Smooth Operator", "Jazz"], + [47, "Sad", "Smooth Operator", "Jazz"], [48, "David Arkenstone", "Papillon (On The Wings Of The Butterfly)", "New Age"], [49, "David Arkenstone", "Stepping Stars", "New Age"], [50, "David Arkenstone", "Carnation Lily Lily Rose", "New Age"], diff --git a/samples/doodle/superdoodle.py b/samples/doodle/superdoodle.py index 0a5a211e..a0196e37 100644 --- a/samples/doodle/superdoodle.py +++ b/samples/doodle/superdoodle.py @@ -6,7 +6,7 @@ intelligent Frame. This one has a menu and a statusbar, is able to save and reload doodles, clear the workspace, and has a simple control panel for setting color and line thickness in addition to the popup menu that DoodleWindow provides. There is also a nice About dialog -implmented using an wx.html.HtmlWindow. +implemented using an wx.html.HtmlWindow. """ import sys diff --git a/samples/embedded/embedded.cpp b/samples/embedded/embedded.cpp index 6e270e3f..8299c63d 100644 --- a/samples/embedded/embedded.cpp +++ b/samples/embedded/embedded.cpp @@ -185,7 +185,7 @@ void MyFrame::OnPyFrame(wxCommandEvent& event) // First, whenever you do anything with Python objects or code, you - // *MUST* aquire the Global Interpreter Lock and block other + // *MUST* acquire the Global Interpreter Lock and block other // Python threads from running. wxPyBlock_t blocked = wxPyBeginBlockThreads(); diff --git a/samples/floatcanvas/Animation.py b/samples/floatcanvas/Animation.py index d6f63c3c..86321b9e 100644 --- a/samples/floatcanvas/Animation.py +++ b/samples/floatcanvas/Animation.py @@ -226,7 +226,7 @@ class DemoApp(wx.App): I'd like the cursor to change as you change tools, but the stock wx.Cursors didn't include anything I liked, so I stuck with the - pointer. Pleae let me know if you have any nice cursor images for me to + pointer. Please let me know if you have any nice cursor images for me to use. @@ -254,7 +254,7 @@ def Read_MapGen(filename,stats = False): Each NumPy array in the list is an NX2 array of Python Floats. The demo should have come with a file, "world.dat" that is the - shorelines of the whole worls, in MapGen format. + shorelines of the whole world, in MapGen format. """ from numpy import array @@ -264,7 +264,7 @@ def Read_MapGen(filename,stats = False): Shorelines = [] segment = [] for line in data: - if line == "# -b": #New segment begining + if line == "# -b": #New segment beginning if segment: Shorelines.append(array(segment)) segment = [] else: diff --git a/samples/floatcanvas/BB_HitTest.py b/samples/floatcanvas/BB_HitTest.py index 46cc52b7..a78d292f 100644 --- a/samples/floatcanvas/BB_HitTest.py +++ b/samples/floatcanvas/BB_HitTest.py @@ -1,6 +1,6 @@ #!/usr/bin/env python """ -Test of an alternaive hit test methoid that used the bounding boxes of teh objects instead. +Test of an alternative hit test methoid that used the bounding boxes of the objects instead. Poorly tested! diff --git a/samples/floatcanvas/MicroDemo.py b/samples/floatcanvas/MicroDemo.py index 3af16134..ed007ea9 100644 --- a/samples/floatcanvas/MicroDemo.py +++ b/samples/floatcanvas/MicroDemo.py @@ -52,7 +52,7 @@ class DrawFrame(wx.Frame): Rect = Canvas.AddRectangle((50, 20), (40,10), FillColor="Red", LineStyle = None) Rect.MinSize = 4 # default is 1 - Rect.DisappearWhenSmall = False # defualt is True + Rect.DisappearWhenSmall = False # default is True self.Show() Canvas.ZoomToBB() diff --git a/samples/floatcanvas/MovingTriangle.py b/samples/floatcanvas/MovingTriangle.py index f7caab80..f3277f21 100644 --- a/samples/floatcanvas/MovingTriangle.py +++ b/samples/floatcanvas/MovingTriangle.py @@ -160,7 +160,7 @@ class DrawFrame(wx.Frame): if self.MoveTri is not None: dxy = event.GetPosition() - self.StartPoint dxy = self.Canvas.ScalePixelToWorld(dxy) - self.MovingTri.Move(dxy) ## The Move function has jsut been added + self.MovingTri.Move(dxy) ## The Move function has just been added ## to the FloatCanvas PointsObject ## It does the next three lines for you. #self.Tri.Points += dxy diff --git a/samples/floatcanvas/OverlayDemo.py b/samples/floatcanvas/OverlayDemo.py index f57a5dca..26faa983 100644 --- a/samples/floatcanvas/OverlayDemo.py +++ b/samples/floatcanvas/OverlayDemo.py @@ -6,7 +6,7 @@ on top of eveything else on the Canvas, relative to window coords, rather than screen coords. This method uses the "GridOver" object in the FloatCanvas - - it was orginally dsigend for girds, graticule,s etc. that + - it was originally dsigend for grids, graticule,s etc. that are always drawn regardless of zoom, pan, etc, but it works for overlays too. diff --git a/samples/floatcanvas/PixelBitmap.py b/samples/floatcanvas/PixelBitmap.py index e6302c7b..0e14cf03 100644 --- a/samples/floatcanvas/PixelBitmap.py +++ b/samples/floatcanvas/PixelBitmap.py @@ -24,7 +24,7 @@ class PixelBitmap: Canvas.GridOver = MyPixelBitmap It will always be drawn on top of everything else, and be positioned - according to pixel coordinates on teh screen, regardless of zoom and + according to pixel coordinates on the screen, regardless of zoom and pan position. """ diff --git a/samples/floatcanvas/PolyEditor.py b/samples/floatcanvas/PolyEditor.py index d7ec7faa..55b1af42 100644 --- a/samples/floatcanvas/PolyEditor.py +++ b/samples/floatcanvas/PolyEditor.py @@ -145,7 +145,7 @@ class DrawFrame(wx.Frame): self.Canvas.Draw() def Setup(self, event = None): - "Seting up with some random polygons" + "Setting up with some random polygons" wx.GetApp().Yield() self.ResetSelections() self.Canvas.ClearAll() diff --git a/samples/floatcanvas/SubClassNavCanvas.py b/samples/floatcanvas/SubClassNavCanvas.py index 56e35bb4..e9922cb3 100644 --- a/samples/floatcanvas/SubClassNavCanvas.py +++ b/samples/floatcanvas/SubClassNavCanvas.py @@ -3,7 +3,7 @@ """ A simple example of sub-classing the Navcanvas --- an alternative to simply putting a NavCanvas on your yoru oen panle or whatever +-- an alternative to simply putting a NavCanvas on your your own panel or whatever """ import wx diff --git a/samples/mainloop/mainloop.py b/samples/mainloop/mainloop.py index 7231f590..4173f524 100755 --- a/samples/mainloop/mainloop.py +++ b/samples/mainloop/mainloop.py @@ -118,7 +118,7 @@ class MyEventLoop(wx.GUIEventLoop): if 'wxOSX' in wx.PlatformInfo: self.ProcessIdle() - # Proces remaining queued messages, if any + # Process remaining queued messages, if any while True: checkAgain = False if wx.GetApp() and wx.GetApp().HasPendingEvents(): diff --git a/samples/roses/wxroses.py b/samples/roses/wxroses.py index f18931aa..7f8e3a7e 100644 --- a/samples/roses/wxroses.py +++ b/samples/roses/wxroses.py @@ -19,7 +19,7 @@ # but the best reference should be at http://WermeNH.com/roses/index.html . # There are a number of enhancements that could be done to wxRoses, and -# contributions are welcome as long as you don't destory the general +# contributions are welcome as long as you don't destroy the general # structure, flavor, and all that. The following list is in the order # I'd like to see done. Some are easy, some aren't, some are easy if # you have experience in the right parts of external code. diff --git a/samples/simple/simple.py b/samples/simple/simple.py index 287863ea..eea243b1 100644 --- a/samples/simple/simple.py +++ b/samples/simple/simple.py @@ -92,7 +92,7 @@ class MyApp(AppBaseClass): print("Print statements go to this stdout window by default.") if USE_WIT: - print("Press Ctrl-Alt-I (Cmd-Opt-I on Mac) to launch the WIT.") + print("Press Ctrl-Alt-I (Cmd-Opt-I on Mac) to launch the WITH.") self.InitInspection() frame.Show(True) From d265d13f6ca36115316edfe7c856b44c24ea6df1 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 14 Jul 2020 12:00:55 -0700 Subject: [PATCH 2/3] Spelling fixes in the demo --- demo/ActivityIndicator.py | 2 +- demo/AnimationCtrl.py | 2 +- demo/CollapsibleHeaderCtrl.py | 2 +- demo/CollapsiblePane.py | 2 +- demo/ColourDB.py | 2 +- demo/ComboCtrl.py | 2 +- demo/Cursor.py | 2 +- demo/CustomDragAndDrop.py | 4 ++-- demo/DVC_DataViewModel.py | 2 +- demo/ExpandoTextCtrl.py | 2 +- demo/FileDialog.py | 4 ++-- demo/FloatCanvas.py | 4 ++-- demo/Gauge.py | 2 +- demo/GenericButtons.py | 4 ++-- demo/Grid.py | 2 +- demo/I18N.py | 2 +- demo/Joystick.py | 14 +++++++------- demo/LEDNumberCtrl.py | 2 +- demo/ListCtrl.py | 2 +- demo/Main.py | 6 +++--- demo/MediaCtrl.py | 2 +- demo/PlateButton.py | 2 +- demo/Process.py | 4 ++-- demo/PropertyGrid.py | 2 +- demo/RawBitmapAccess.py | 2 +- demo/RendererNative.py | 2 +- demo/ScrolledPanel.py | 2 +- demo/Sizers.py | 2 +- demo/Sound.py | 2 +- demo/StandardPaths.py | 2 +- demo/Threads.py | 2 +- demo/Throbber.py | 6 +++--- demo/TimeCtrl.py | 2 +- demo/Timer.py | 10 +++++----- demo/ToolBar.py | 2 +- demo/agw/AUI.py | 4 ++-- demo/agw/BalloonTip.py | 2 +- demo/agw/ButtonPanel.py | 2 +- demo/agw/FlatMenu.py | 2 +- demo/agw/FlatNotebook.py | 2 +- demo/agw/FoldPanelBar.py | 2 +- demo/agw/FourWaySplitter.py | 2 +- demo/agw/HyperTreeList.py | 4 ++-- demo/agw/LabelBook.py | 2 +- demo/agw/RulerCtrl.py | 2 +- demo/agw/ShapedButton.py | 2 +- demo/agw/SpeedMeter.py | 2 +- demo/agw/ThumbnailCtrl.py | 2 +- demo/data/proclamation.txt | 2 +- 49 files changed, 70 insertions(+), 70 deletions(-) diff --git a/demo/ActivityIndicator.py b/demo/ActivityIndicator.py index 54635087..6e800262 100644 --- a/demo/ActivityIndicator.py +++ b/demo/ActivityIndicator.py @@ -23,7 +23,7 @@ class TestPanel(wx.Panel): sizer.Add(startBtn, wx.SizerFlags().Border(wx.LEFT, 40)) sizer.Add(stopBtn, wx.SizerFlags().Border(wx.LEFT, 10)) - # Put it all in an outter box with a border + # Put it all in an outer box with a border box = wx.BoxSizer() box.Add(sizer, wx.SizerFlags(1).Border(wx.ALL, 30)) self.SetSizer(box) diff --git a/demo/AnimationCtrl.py b/demo/AnimationCtrl.py index 72b4c017..1886d5b0 100644 --- a/demo/AnimationCtrl.py +++ b/demo/AnimationCtrl.py @@ -32,7 +32,7 @@ class TestPanel(wx.Panel): sizer = wx.FlexGridSizer(cols=3, hgap=5, vgap=5) for name in GIFNames: - # There are a few usage pattens for creating the control and the + # There are a few usage patterns for creating the control and the # animation object. They're more-or-less equivalent, but if you have # non-standard needs in your application then one pattern may make # more sense for you to use. diff --git a/demo/CollapsibleHeaderCtrl.py b/demo/CollapsibleHeaderCtrl.py index 151b2d19..98257b86 100644 --- a/demo/CollapsibleHeaderCtrl.py +++ b/demo/CollapsibleHeaderCtrl.py @@ -22,7 +22,7 @@ class TestPanel(wx.Panel): sizer.Add(setBtn, wx.SizerFlags().Border(wx.LEFT, 40)) sizer.Add(unsetBtn, wx.SizerFlags().Border(wx.LEFT, 10)) - # Put it all in an outter box with a border + # Put it all in an outer box with a border box = wx.BoxSizer() box.Add(sizer, wx.SizerFlags(1).Border(wx.ALL, 30)) self.SetSizer(box) diff --git a/demo/CollapsiblePane.py b/demo/CollapsiblePane.py index 68ec6f2e..fae12ee7 100644 --- a/demo/CollapsiblePane.py +++ b/demo/CollapsiblePane.py @@ -110,7 +110,7 @@ def runTest(frame, nb, log): overview = """

wx.CollapsiblePane

-A collapsable panel is a container with an embedded button-like +A collapsible panel is a container with an embedded button-like control which can be used by the user to collapse or expand the pane's contents. diff --git a/demo/ColourDB.py b/demo/ColourDB.py index d3802b21..5f779d2a 100644 --- a/demo/ColourDB.py +++ b/demo/ColourDB.py @@ -29,7 +29,7 @@ class TestWindow(wx.ScrolledWindow): # Using GetFullTextExtent(), we calculate a basic 'building block' # that will be used to draw a depiction of the color list. We're - # using 'Wy' as the model becuase 'W' is a wide character and 'y' + # using 'Wy' as the model because 'W' is a wide character and 'y' # has a descender. This constitutes a 'worst case' scenario, which means # that no matter what we draw later, text-wise, we'll have room for it w,h,d,e = dc.GetFullTextExtent("Wy") diff --git a/demo/ComboCtrl.py b/demo/ComboCtrl.py index 23074c98..63bca63c 100644 --- a/demo/ComboCtrl.py +++ b/demo/ComboCtrl.py @@ -8,7 +8,7 @@ import os #---------------------------------------------------------------------- # This class is used to provide an interface between a ComboCtrl and the -# ListCtrl that is used as the popoup for the combo widget. +# ListCtrl that is used as the popup for the combo widget. class ListCtrlComboPopup(wx.ComboPopup): diff --git a/demo/Cursor.py b/demo/Cursor.py index 9e18d55c..fdbd88ee 100644 --- a/demo/Cursor.py +++ b/demo/Cursor.py @@ -246,7 +246,7 @@ NOTE: not all stock cursors have a specific representation on all platforms. self.SetSizer(vbSizer) - wx.CallAfter(self.cb.SetFocus) # Convienience start for mousewheel switching. + wx.CallAfter(self.cb.SetFocus) # Convenience start for mousewheel switching. def OnChooseCursor(self, evt): # Clear the dots. diff --git a/demo/CustomDragAndDrop.py b/demo/CustomDragAndDrop.py index 74324a5f..7759b77a 100644 --- a/demo/CustomDragAndDrop.py +++ b/demo/CustomDragAndDrop.py @@ -337,8 +337,8 @@ if __name__ == '__main__': overview = """ This demo shows Drag and Drop using a custom data type and a custom data object. A type called "DoodleLines" is created and a Python -Pickle of a list is actually transfered in the drag and drop -opperation. +Pickle of a list is actually transferred in the drag and drop +operation. A second data object is also created containing a bitmap of the image and is made available to any drop target that accepts bitmaps, such as diff --git a/demo/DVC_DataViewModel.py b/demo/DVC_DataViewModel.py index 59909851..a5406b87 100644 --- a/demo/DVC_DataViewModel.py +++ b/demo/DVC_DataViewModel.py @@ -102,7 +102,7 @@ class MyTreeListModel(dv.PyDataViewModel): # item(s) should be reported as children of this node. A List view # simply provides all items as children of this hidden root. A Tree # view adds additional items as children of the other items, as needed, - # to provide the tree hierachy. + # to provide the tree hierarchy. ##self.log.write("GetChildren\n") # If the parent item is invalid then it represents the hidden root diff --git a/demo/ExpandoTextCtrl.py b/demo/ExpandoTextCtrl.py index d6dc8b37..dad42816 100644 --- a/demo/ExpandoTextCtrl.py +++ b/demo/ExpandoTextCtrl.py @@ -145,7 +145,7 @@ overview = """

ExpandoTextCtrl

The ExpandoTextCtrl is a multi-line wx.TextCtrl that will -adjust its height on the fly as needed to accomodate the number of +adjust its height on the fly as needed to accommodate the number of lines needed to display the current content of the control. It is assumed that the width of the control will be a fixed value and that only the height will be adjusted automatically. If the diff --git a/demo/FileDialog.py b/demo/FileDialog.py index fa4e82e0..3170fa1f 100644 --- a/demo/FileDialog.py +++ b/demo/FileDialog.py @@ -31,7 +31,7 @@ class TestPanel(wx.Panel): self.log.WriteText("CWD: %s\n" % os.getcwd()) # Create the dialog. In this case the current directory is forced as the starting - # directory for the dialog, and no default file name is forced. This can easilly + # directory for the dialog, and no default file name is forced. This can easily # be changed in your program. This is an 'open' dialog, and allows multitple # file selections as well. # @@ -70,7 +70,7 @@ class TestPanel(wx.Panel): self.log.WriteText("CWD: %s\n" % os.getcwd()) # Create the dialog. In this case the current directory is forced as the starting - # directory for the dialog, and no default file name is forced. This can easilly + # directory for the dialog, and no default file name is forced. This can easily # be changed in your program. This is an 'save' dialog. # # Unlike the 'open dialog' example found elsewhere, this example does NOT diff --git a/demo/FloatCanvas.py b/demo/FloatCanvas.py index be7e9d30..48d971cf 100644 --- a/demo/FloatCanvas.py +++ b/demo/FloatCanvas.py @@ -1560,7 +1560,7 @@ def BuildDrawFrame(): # this gets called when needed, rather than on import Arrow.HitLineWidth = 6 Arrow.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.ArrowClicked) - Canvas.AddText("Changable Arrow: try clicking it", (16,4), Position = "tc") + Canvas.AddText("Changeable Arrow: try clicking it", (16,4), Position = "tc") self.RotArrow = Canvas.AddArrow((16,4), 80, Direction = 0 ,LineWidth = 3, LineColor = "Green", ArrowHeadAngle = 30) self.RotArrow.HitLineWidth = 6 self.RotArrow.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RotateArrow) @@ -1892,7 +1892,7 @@ if __name__ == "__main__": else: # It's not running stand-alone, set up for wxPython demo. - # don't neeed wxversion here. + # don't need wxversion here. import wx if not haveNumpy: ## TestPanel and runTest used for integration into wxPython Demo diff --git a/demo/Gauge.py b/demo/Gauge.py index c567bcf1..2e04933f 100644 --- a/demo/Gauge.py +++ b/demo/Gauge.py @@ -55,7 +55,7 @@ When the Gauge is initialized, its "complete" value is usually set; at any rate, before using the Gauge, the maximum value of the control must be set. As the task progresses, the Gauge is updated by the program via the SetValue method. -This control is for use within a GUI; there is a seperate ProgressDialog class +This control is for use within a GUI; there is a separate ProgressDialog class to present the same sort of control as a dialog to the user. """ diff --git a/demo/GenericButtons.py b/demo/GenericButtons.py index 96dae9bf..86668df9 100644 --- a/demo/GenericButtons.py +++ b/demo/GenericButtons.py @@ -38,7 +38,7 @@ class TestPanel(wx.Panel): b.Enable(False) sizer.Add(b) - # This time, we let the botton be as big as it can be. + # This time, we let the button be as big as it can be. # Also, this one is fancier, with custom colors and bezel size. b = buttons.GenButton(self, -1, 'bigger') self.Bind(wx.EVT_BUTTON, self.OnBiggerButton, b) @@ -65,7 +65,7 @@ class TestPanel(wx.Panel): b.Enable(False) # An image button, using a mask to get rid of the - # undesireable part of the image + # undesirable part of the image b = buttons.GenBitmapButton(self, -1, None) self.Bind(wx.EVT_BUTTON, self.OnButton, b) bmp = images.Bulb1.GetBitmap() diff --git a/demo/Grid.py b/demo/Grid.py index 0eb2a48d..2d896486 100644 --- a/demo/Grid.py +++ b/demo/Grid.py @@ -11,7 +11,7 @@ buttonDefs = { 817 : ('GridCustTable', ' wx.Grid using a custom Table, with non-string data '), 819 : ('GridEnterHandler',' Remapping keys to behave differently '), 820 : ('GridCustEditor', ' Shows how to create a custom Cell Editor '), - 821 : ('GridDragable', ' A wx.Grid with dragable rows and columns '), + 821 : ('GridDragable', ' A wx.Grid with draggable rows and columns '), 822 : ('GridDragAndDrop', ' Shows how to make a grid a drop target for files'), } diff --git a/demo/I18N.py b/demo/I18N.py index 456b7d33..9c6f5c2c 100644 --- a/demo/I18N.py +++ b/demo/I18N.py @@ -10,7 +10,7 @@ from Main import opj # Normally you would just set _ to be a reference to the # wx.GetTranslation function, and then wrap all you literal strings in -# _() function calls. Then everytime you use one of your literals, it +# _() function calls. Then every time you use one of your literals, it # would first pass through the translation function and try to load a # translated version of the string from the current message catalogs. # For this example, since we are changinb language on the fly, and diff --git a/demo/Joystick.py b/demo/Joystick.py index 2c3758b5..9cfef5d8 100644 --- a/demo/Joystick.py +++ b/demo/Joystick.py @@ -77,7 +77,7 @@ class JoyGauge(wx.Panel): dc = wx.BufferedPaintDC(self, self.buffer) def DrawJoystick(self, dc): - # draw the guage as a maxed square in the center of this window. + # draw the gauge as a maxed square in the center of this window. w, h = self.GetClientSize() edgeSize = min(w, h) @@ -176,7 +176,7 @@ class JoyPanel(wx.Panel): class POVGauge(wx.Panel): # - # Display the current postion of the POV control + # Display the current position of the POV control # def __init__(self, parent, stick): @@ -219,7 +219,7 @@ class POVGauge(wx.Panel): dc = wx.BufferedPaintDC(self, self.buffer) def DrawPOV(self, dc): - # draw the guage as a maxed circle in the center of this window. + # draw the gauge as a maxed circle in the center of this window. w, h = self.GetClientSize() diameter = min(w, h) @@ -608,7 +608,7 @@ class InfoPanel(wx.Panel): class AxisBar(wx.Gauge): # # This class allows us to use a wx.Gauge to display the axis value - # with a fancy label overlayed onto the guage itself. Two values are + # with a fancy label overlaid onto the gauge itself. Two values are # used to do things: first of all, since the gauge is limited to # positive numbers, the scale is fixed at 0 to 1000. We will receive # an adjusted value to use to render the gauge itself. The other value @@ -837,7 +837,7 @@ class AxisPanel(wx.Panel): self.stick = stick # Defines labels and 'tokens' to identify each - # supporte axis. + # supported axis. axesList = [ ('X Axis ', 'X'), ('Y Axis ', 'Y'), ('Z Axis ', 'Z'), ('Rudder ', 'Rudder'), @@ -997,7 +997,7 @@ you can get from the wx.adv.Joystick control.

Getting data from the joystick can be event-driven thanks to four event types associated -with wx.JoystickEvent, or the joystick can be polled programatically to get data on +with wx.JoystickEvent, or the joystick can be polled programmatically to get data on a regular basis.

Data types

@@ -1055,7 +1055,7 @@ versus a four-way hat. The wx.adv.Joystick control is in many ways incomplete at the C++ library level, but it is not insurmountable. In short, while the joystick interface can be event-driven, the wx.JoystickEvent class lacks event binders for all event types. Thus, you cannot -rely on wx.JoystickEvents to tell you when something has changed, necessarilly. +rely on wx.JoystickEvents to tell you when something has changed, necessarily.
  • There are no events associated with the POV control. diff --git a/demo/LEDNumberCtrl.py b/demo/LEDNumberCtrl.py index 4fcb20b2..308c386d 100644 --- a/demo/LEDNumberCtrl.py +++ b/demo/LEDNumberCtrl.py @@ -57,7 +57,7 @@ overview = """\ The following was gleaned as best I could from the wxWindows -source, which was a bit reluctant to reveal its secrets. My appologies if +source, which was a bit reluctant to reveal its secrets. My apologies if I missed anything - jmg

    LEDNumberCtrl( parent, id=-1, pos=wx.DefaultPosition, diff --git a/demo/ListCtrl.py b/demo/ListCtrl.py index f2983d49..176ac001 100644 --- a/demo/ListCtrl.py +++ b/demo/ListCtrl.py @@ -420,7 +420,7 @@ This example demonstrates how to use mixins. The following mixins are available.

    A mixin class that handles sorting of a wxListCtrl in REPORT mode when the column header is clicked on. -

    There are a few requirments needed in order for this to work genericly: +

    There are a few requirements needed in order for this to work genericly:

    1. The combined class must have a GetListCtrl method that returns the ListCtrl to be sorted, and the list control must exist at the time the diff --git a/demo/Main.py b/demo/Main.py index 3b513506..a3a4ec9d 100644 --- a/demo/Main.py +++ b/demo/Main.py @@ -526,7 +526,7 @@ try: def SetUpEditor(self): """ This method carries out the work of setting up the demo editor. - It's seperate so as not to clutter up the init code. + It's separate so as not to clutter up the init code. """ import keyword @@ -1374,7 +1374,7 @@ class DemoTaskBarIcon(TaskBarIcon): img = img.Scale(16, 16) elif "wxGTK" in wx.PlatformInfo: img = img.Scale(22, 22) - # wxMac can be any size upto 128x128, so leave the source img alone.... + # wxMac can be any size up to 128x128, so leave the source img alone.... icon = wx.Icon(img.ConvertToBitmap()) return icon @@ -2684,7 +2684,7 @@ class MyApp(wx.App, wx.lib.mixins.inspection.InspectionMixin): self.InitInspection() # for the InspectionMixin base class - # Now that we've warned the user about possibile problems, + # Now that we've warned the user about possible problems, # lets import images import images as i global images diff --git a/demo/MediaCtrl.py b/demo/MediaCtrl.py index 3eb164a0..ff88c1db 100644 --- a/demo/MediaCtrl.py +++ b/demo/MediaCtrl.py @@ -166,7 +166,7 @@ def runTest(frame, nb, log): overview = """

      wx.MediaCtrl

      -wx.MediaCtrl is a class that allows a way to convieniently display +wx.MediaCtrl is a class that allows a way to conveniently display various types of media, such as videos, audio files, natively through native codecs. Several different formats of audio and video files are supported, but some formats may not be playable on all platforms or diff --git a/demo/PlateButton.py b/demo/PlateButton.py index 589a7256..c80dfc05 100644 --- a/demo/PlateButton.py +++ b/demo/PlateButton.py @@ -129,7 +129,7 @@ class TestPanel(scrolled.ScrolledPanel): # set when the background is not a solid color. On wxMac # it is a no-op as this type of transparency is achieved # without any help needed. On wxGtk it doesn't hurt to - # set but also unfortunatly doesn't help at all. + # set but also unfortunately doesn't help at all. bstyle = btn[2] | platebtn.PB_STYLE_NOBG else: bstyle = btn[2] diff --git a/demo/Process.py b/demo/Process.py index 3241f839..aa93c1d8 100644 --- a/demo/Process.py +++ b/demo/Process.py @@ -144,14 +144,14 @@ overview = """\

      wx.Process

      -wx.Process lets you get notified when an asyncronous child process +wx.Process lets you get notified when an asynchronous child process started by wxExecute terminates, and also to get input/output streams for the child process's stdout, stderr and stdin.

      This demo launches a simple python script that echos back on stdout lines that it reads from stdin. You can send text to the echo -process' stdin by typing in the lower textctrl and clicking Send. +process's stdin by typing in the lower textctrl and clicking Send.

      Clicking the Close Stream button will close the demo's end of the diff --git a/demo/PropertyGrid.py b/demo/PropertyGrid.py index 3d9265e4..7c25849c 100644 --- a/demo/PropertyGrid.py +++ b/demo/PropertyGrid.py @@ -593,7 +593,7 @@ class LargeImageEditor(wxpg.PGEditor): def GetValueFromControl(self, property, ctrl): """ Return tuple (wasSuccess, newValue), where wasSuccess is True if - different value was acquired succesfully. + different value was acquired successfully. """ textVal = self.tc.GetValue() diff --git a/demo/RawBitmapAccess.py b/demo/RawBitmapAccess.py index dc168bd0..59c03e85 100644 --- a/demo/RawBitmapAccess.py +++ b/demo/RawBitmapAccess.py @@ -175,7 +175,7 @@ wx.NativePixelData and wx.AlphaPixelData provide a cross-platform way to access the platform-specific pixel buffer within a wx.Bitmap. They provide both a random access method, and an iterator interface. -

      Unfortunately, although these classes are convienient ways to access +

      Unfortunately, although these classes are convenient ways to access and update the contents of a wx.Bitmap, we lose most of the efficiency of the C++ classes by requiring one or more Python-to-C++ transitions for each pixel. In fact it can be much slower than the other diff --git a/demo/RendererNative.py b/demo/RendererNative.py index 55ce4a5f..cd68c521 100644 --- a/demo/RendererNative.py +++ b/demo/RendererNative.py @@ -142,7 +142,7 @@ overview = """

      wx.RendererNative

      wx.RendererNative is a class which virtualizes drawing. It abstracts the operations of drawing controls and allows you to draw say, a button, without -caring about exactly how it is done, in a native and platform independant way. +caring about exactly how it is done, in a native and platform independent way.

      All drawing functions take some standard parameters:

      diff --git a/demo/ScrolledPanel.py b/demo/ScrolledPanel.py index 9b8a5910..c3f30af2 100644 --- a/demo/ScrolledPanel.py +++ b/demo/ScrolledPanel.py @@ -113,7 +113,7 @@ def runTest(frame, nb, log): overview = """ ScrolledPanel fills a "hole" in the implementation of wx.ScrolledWindow, providing automatic scrollbar and scrolling behavior and the tab traversal -mangement that wx.ScrolledWindow lacks. +management that wx.ScrolledWindow lacks. """ diff --git a/demo/Sizers.py b/demo/Sizers.py index 6d06b3ca..4f2fddfc 100644 --- a/demo/Sizers.py +++ b/demo/Sizers.py @@ -431,7 +431,7 @@ theTests = [ ), ("Edge Affinity", makeSimpleBox6, - "For items that don't completly fill their allotted space, and don't " + "For items that don't completely fill their allotted space, and don't " "stretch, you can specify which side (or the center) they should stay " "attached to." ), diff --git a/demo/Sound.py b/demo/Sound.py index 1212019a..1836a6a4 100644 --- a/demo/Sound.py +++ b/demo/Sound.py @@ -43,7 +43,7 @@ class TestPanel(wx.Panel): self.log.write("before Play...\n") sound.Play(wx.adv.SOUND_ASYNC) - self.sound = sound # save a reference (This shoudln't be needed, but there seems to be a bug...) + self.sound = sound # save a reference (This shouldn't be needed, but there seems to be a bug...) # wx.YieldIfNeeded() self.log.write("...after Play\n") except NotImplementedError as v: diff --git a/demo/StandardPaths.py b/demo/StandardPaths.py index 7b49ee95..5ee13bbc 100644 --- a/demo/StandardPaths.py +++ b/demo/StandardPaths.py @@ -26,7 +26,7 @@ class TestPanel(wx.Panel): # StandardPaths will use the value of wx.App().GetAppName() # for some of the stnadard path components. Let's set it to # something that makes that obvious for the demo. In your own - # apps you'll set it in to something more meaningfull for your + # apps you'll set it in to something more meaningful for your # app in your OnInit, (or just let it default.) wx.GetApp().SetAppName("AppName") diff --git a/demo/Threads.py b/demo/Threads.py index 79fb6cb9..9dff2970 100644 --- a/demo/Threads.py +++ b/demo/Threads.py @@ -230,7 +230,7 @@ def runTest(frame, nb, log): overview = """\ -The main issue with multi-threaded GUI programming is the thread safty +The main issue with multi-threaded GUI programming is the thread safety of the GUI itself. On most platforms the GUI is not thread safe and so any cross platform GUI Toolkit and applications written with it need to take that into account. diff --git a/demo/Throbber.py b/demo/Throbber.py index d4ad41fd..dbde9236 100644 --- a/demo/Throbber.py +++ b/demo/Throbber.py @@ -25,9 +25,9 @@ class TestPanel(wx.Panel): 'label': { 'throbber': None, 'text': "With a label." }, 'overlay': { 'throbber': None, - 'text': "With an overlayed image." }, + 'text': "With an overlaid image." }, 'overlay+text': { 'throbber': None, - 'text': "With a label and an overlayed image." }, + 'text': "With a label and an overlaid image." }, } images = [throbImages.catalog[i].GetBitmap() @@ -129,7 +129,7 @@ class TestPanel(wx.Panel): buttonBox, (len(self.throbbers) + 2, 0), (1, 3), flag = wx.ALIGN_CENTER ) - # Buttoms for the custom throbber. + # Buttons for the custom throbber. nextButton = wx.Button(self, -1, "Next") self.Bind(wx.EVT_BUTTON, self.OnNext, nextButton) diff --git a/demo/TimeCtrl.py b/demo/TimeCtrl.py index 402f72ae..580e99b5 100644 --- a/demo/TimeCtrl.py +++ b/demo/TimeCtrl.py @@ -2,7 +2,7 @@ # 11/21/2003 - Jeff Grimmett (grimmtooth@softhome.net) # -# o presense of spin control causing probs (see spin ctrl demo for details) +# o presence of spin control causing probs (see spin ctrl demo for details) import wx diff --git a/demo/Timer.py b/demo/Timer.py index fb84fb72..3ca95bb5 100644 --- a/demo/Timer.py +++ b/demo/Timer.py @@ -17,7 +17,7 @@ timer until you are completely finished with it. """ doc1 = """\ Binding an event handler to the wx.EVT_TIMER event is the -prefered way to use the wx.Timer class directly. It makes +preferred way to use the wx.Timer class directly. It makes handling timer events work just like normal window events. You just need to specify the window that is to receive the event in the wx.Timer constructor. If that window needs to be able to @@ -139,7 +139,7 @@ class TestPanel(sp.ScrolledPanel): def OnTest1Stop(self, evt): self.t1.Stop() - self.log.write("EVT_TIMER timer stoped\n") + self.log.write("EVT_TIMER timer stopped\n") del self.t1 self.t1b2.Disable() @@ -176,7 +176,7 @@ class TestPanel(sp.ScrolledPanel): self.t2.Restart(1500, "restarted") # The return value of this function is saved and can be - # retrived later. See OnTest2Stop above. + # retrieved later. See OnTest2Stop above. return "This is my return value" @@ -192,7 +192,7 @@ class TestPanel(sp.ScrolledPanel): def OnTest3Stop(self, evt): self.t3.Stop() - self.log.write("NotifyTimer timer stoped\n") + self.log.write("NotifyTimer timer stopped\n") del self.t3 self.t3b2.Disable() @@ -211,7 +211,7 @@ class TestPanel(sp.ScrolledPanel): def OnTest4Stop(self, evt): self.t4.Stop() - self.log.write("wx.PyTimer timer stoped\n") + self.log.write("wx.PyTimer timer stopped\n") del self.t4 self.t4b2.Disable() diff --git a/demo/ToolBar.py b/demo/ToolBar.py index d23ab478..be62549f 100644 --- a/demo/ToolBar.py +++ b/demo/ToolBar.py @@ -222,7 +222,7 @@ Toolbar creation is a two-step process. First, the toolbar is defined using the various Add* methods of wx.ToolBar. Once all is set up, then wx.Toolbar.Realize() must be called to render it. -wx.Toolbar events are also propogated as Menu events; this is especially handy when +wx.Toolbar events are also propagated as Menu events; this is especially handy when you have a menu bar that contains items that carry out the same function. For example, it is not uncommon to have a little 'floppy' toolbar icon to 'save' the current file (whatever it is) as well as a FILE/SAVE menu item that does the same thing. In this diff --git a/demo/agw/AUI.py b/demo/agw/AUI.py index cb6eeb07..7c219686 100644 --- a/demo/agw/AUI.py +++ b/demo/agw/AUI.py @@ -2507,7 +2507,7 @@ class AuiFrame(wx.Frame): msg = "This Is The About Dialog Of The Pure Python Version Of AUI.\n\n" + \ "Author: Andrea Gavana @ 23 Dec 2005\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ - "To Me At The Following Adresses:\n\n" + \ + "To Me At The Following Addresses:\n\n" + \ "andrea.gavana@maerskoil.com\n" + "andrea.gavana@gmail.com\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" @@ -2809,7 +2809,7 @@ def GetIntroText(): "http://trac.wxwidgets.org/ticket/9911

      2. " \ "
    2. Serious layout bugs in wxAUI: " \ "http://trac.wxwidgets.org/ticket/10620
      3. " \ - "
    3. wAuiDefaultTabArt::Clone() should just use copy contructor: " \ + "
    4. wAuiDefaultTabArt::Clone() should just use copy constructor: " \ "http://trac.wxwidgets.org/ticket/11388
      5. " \ "
    5. Drop down button for check tool on wxAuiToolbar: " \ "http://trac.wxwidgets.org/ticket/11139
      6. " \ diff --git a/demo/agw/BalloonTip.py b/demo/agw/BalloonTip.py index d18e0b5d..0e51ed85 100644 --- a/demo/agw/BalloonTip.py +++ b/demo/agw/BalloonTip.py @@ -316,7 +316,7 @@ class BalloonTipDemo(wx.Frame): msg = "This is the about dialog of the BalloonTip demo.\n\n" + \ "Author: Andrea Gavana @ 29 May 2005\n\n" + \ "Please report any bug/requests or improvements\n" + \ - "to me at the following adresses:\n\n" + \ + "to me at the following addresses:\n\n" + \ "andrea.gavana@agip.it\n" + "andrea_gavana@tin.it\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" diff --git a/demo/agw/ButtonPanel.py b/demo/agw/ButtonPanel.py index 7a88b856..ef46769e 100644 --- a/demo/agw/ButtonPanel.py +++ b/demo/agw/ButtonPanel.py @@ -843,7 +843,7 @@ class ButtonPanelDemo(wx.Frame): msg = "This Is The About Dialog Of The ButtonPanel Demo.\n\n" + \ "Author: Andrea Gavana @ 02 Oct 2006\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ - "To Me At The Following Adresses:\n\n" + \ + "To Me At The Following Addresses:\n\n" + \ "andrea.gavana@gmail.com\n" + "andrea.gavana@maerskoil.com\n\n" + \ "Based On Eran C++ Implementation (wxWidgets Forum).\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" diff --git a/demo/agw/FlatMenu.py b/demo/agw/FlatMenu.py index 529fc1e1..739883bb 100644 --- a/demo/agw/FlatMenu.py +++ b/demo/agw/FlatMenu.py @@ -571,7 +571,7 @@ class FlatMenuDemo(wx.Frame): # Create the popup menu self.CreateLongPopupMenu() - # Postion the menu: + # Position the menu: # The menu should be positioned at the bottom left corner of the button. btnSize = btn.GetSize() diff --git a/demo/agw/FlatNotebook.py b/demo/agw/FlatNotebook.py index e57b1907..500ad953 100644 --- a/demo/agw/FlatNotebook.py +++ b/demo/agw/FlatNotebook.py @@ -878,7 +878,7 @@ class FlatNotebookDemo(wx.Frame): msg = "This Is The About Dialog Of The FlatNotebook Demo.\n\n" + \ "Author: Andrea Gavana @ 02 Oct 2006\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ - "To Me At The Following Adresses:\n\n" + \ + "To Me At The Following Addresses:\n\n" + \ "andrea.gavana@gmail.com\n" + "andrea.gavana@maerskoil.com\n\n" + \ "Based On Eran C++ Implementation (wxWidgets Forum).\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" diff --git a/demo/agw/FoldPanelBar.py b/demo/agw/FoldPanelBar.py index 9a3ae559..7d191bc5 100644 --- a/demo/agw/FoldPanelBar.py +++ b/demo/agw/FoldPanelBar.py @@ -184,7 +184,7 @@ class Extended(wx.Frame): msg = "This is the about dialog of the FoldPanelBar demo.\n\n" + \ "Author: Andrea Gavana @ 23 Mar 2005\n\n" + \ "Please report any bug/requests or improvements\n" + \ - "To me at the following adresses:\n\n" + \ + "To me at the following addresses:\n\n" + \ "andrea.gavana@agip.it\n" + "andrea_gavana@tin.it\n\n" + \ "Based On Jorgen Bodde C++ demo implementation.\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" diff --git a/demo/agw/FourWaySplitter.py b/demo/agw/FourWaySplitter.py index 19919ed6..4b04deb9 100644 --- a/demo/agw/FourWaySplitter.py +++ b/demo/agw/FourWaySplitter.py @@ -255,7 +255,7 @@ class FourWaySplitterDemo(wx.Frame): msg = "This Is The About Dialog Of The FourWaySplitter Demo.\n\n" + \ "Author: Andrea Gavana @ 03 Nov 2006\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ - "To Me At The Following Adresses:\n\n" + \ + "To Me At The Following Addresses:\n\n" + \ "andrea.gavana@gmail.com\n" + "andrea.gavana@maerskoil.com\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" diff --git a/demo/agw/HyperTreeList.py b/demo/agw/HyperTreeList.py index deb089db..77cb2ec1 100644 --- a/demo/agw/HyperTreeList.py +++ b/demo/agw/HyperTreeList.py @@ -1093,7 +1093,7 @@ class HyperTreeListDemo(wx.Frame): msg = "This Is The About Dialog Of The HyperTreeList Demo.\n\n" + \ "Author: Andrea Gavana @ 08 May 2007\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ - "To Me At The Following Adresses:\n\n" + \ + "To Me At The Following AdresAddresseses:\n\n" + \ "andrea.gavana@maerskoil.com\n" + "andrea.gavana@gmail.com\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" @@ -2479,7 +2479,7 @@ class HyperTreeList(HTL.HyperTreeList): def OnItemCheck(self, event): item = event.GetItem() - self.log.write("Item " + self.GetItemText(item) + " Has Been Cheched!\n") + self.log.write("Item " + self.GetItemText(item) + " Has Been Checked!\n") event.Skip() diff --git a/demo/agw/LabelBook.py b/demo/agw/LabelBook.py index a009cac9..57f4e853 100644 --- a/demo/agw/LabelBook.py +++ b/demo/agw/LabelBook.py @@ -522,7 +522,7 @@ class LabelBookDemo(wx.Frame): msg = "This Is The About Dialog Of The LabelBook & FlatImageBook Demo.\n\n" + \ "Author: Andrea Gavana @ 03 Nov 2006\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ - "To Me At The Following Adresses:\n\n" + \ + "To Me At The Following Addresses:\n\n" + \ "andrea.gavana@gmail.com\n" + "andrea.gavana@maerskoil.com\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" diff --git a/demo/agw/RulerCtrl.py b/demo/agw/RulerCtrl.py index afd114f0..29aabb6e 100644 --- a/demo/agw/RulerCtrl.py +++ b/demo/agw/RulerCtrl.py @@ -409,7 +409,7 @@ class RulerCtrlDemo(wx.Frame): msg = "This Is The About Dialog Of The RulerCtrl Demo.\n\n" + \ "Author: Andrea Gavana @ 03 Nov 2006\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ - "To Me At The Following Adresses:\n\n" + \ + "To Me At The Following Addresses:\n\n" + \ "andrea.gavana@gmail.com\n" + "andrea.gavana@maerskoil.com\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" diff --git a/demo/agw/ShapedButton.py b/demo/agw/ShapedButton.py index c909325d..f3c109f6 100644 --- a/demo/agw/ShapedButton.py +++ b/demo/agw/ShapedButton.py @@ -368,7 +368,7 @@ class ShapedButtonDemo(wx.Frame): msg = "This Is The About Dialog Of The ShapedButton Demo.\n\n" + \ "Author: Andrea Gavana @ 18 Oct 2005\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ - "To Me At The Following Adresses:\n\n" + \ + "To Me At The Following Addresses:\n\n" + \ "andrea.gavana@agip.it\n" + "andrea_gavana@tin.it\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" diff --git a/demo/agw/SpeedMeter.py b/demo/agw/SpeedMeter.py index 43955984..2297aa80 100644 --- a/demo/agw/SpeedMeter.py +++ b/demo/agw/SpeedMeter.py @@ -211,7 +211,7 @@ class SpeedMeterDemo(wx.Panel): # SM_DRAW_MIDDLE_ICON: We Draw An Icon In The Center Of SpeedMeter # # NOTE: We Use The Mouse Style mousestyle=SM_MOUSE_TRACK. In This Way, Mouse - # Events Are Catched (Mainly Left Clicks/Drags) And You Can Change The Speed + # Events Are Caught (Mainly Left Clicks/Drags) And You Can Change The Speed # Value Using The Mouse self.SpeedWindow4 = SM.SpeedMeter(panel4, diff --git a/demo/agw/ThumbnailCtrl.py b/demo/agw/ThumbnailCtrl.py index 34da890d..7ab5f8f3 100644 --- a/demo/agw/ThumbnailCtrl.py +++ b/demo/agw/ThumbnailCtrl.py @@ -194,7 +194,7 @@ class ThumbnailCtrlDemo(wx.Frame): msg = "This Is The About Dialog Of The ThumbnailCtrl Demo.\n\n" + \ "Author: Andrea Gavana @ 10 Dec 2005\n\n" + \ "Please Report Any Bug/Requests Of Improvements\n" + \ - "To Me At The Following Adresses:\n\n" + \ + "To Me At The Following Addresses:\n\n" + \ "andrea.gavana@agip.it\n" + "andrea_gavana@tin.it\n\n" + \ "Welcome To wxPython " + wx.VERSION_STRING + "!!" diff --git a/demo/data/proclamation.txt b/demo/data/proclamation.txt index 1723e23e..66de23eb 100644 --- a/demo/data/proclamation.txt +++ b/demo/data/proclamation.txt @@ -31,7 +31,7 @@ in rebellion against the United States." States, by virtue of the power in me vested as Commander-In-Chief of the Army and Navy of the United States in time of actual armed rebellion against the authority and government of the United States, -and as a fit and necessary war measure for supressing said +and as a fit and necessary war measure for suppressing said rebellion, do, on this 1st day of January, A.D. 1863, and in accordance with my purpose so to do, publicly proclaimed for the full period of one hundred days from the first day above mentioned, From c00b8950da7736c67ee27b7a8006d6cf4a1ef613 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 14 Jul 2020 12:53:31 -0700 Subject: [PATCH 3/3] Spelling fixes in wx.lib --- samples/doodle/superdoodle.py | 2 +- wx/lib/agw/advancedsplash.py | 2 +- wx/lib/agw/artmanager.py | 32 ++++++++-------- wx/lib/agw/aui/__init__.py | 4 +- wx/lib/agw/aui/aui_utilities.py | 2 +- wx/lib/agw/aui/auibar.py | 8 ++-- wx/lib/agw/aui/auibook.py | 12 +++--- wx/lib/agw/aui/dockart.py | 4 +- wx/lib/agw/aui/framemanager.py | 12 +++--- wx/lib/agw/aui/tabart.py | 8 ++-- wx/lib/agw/aui/tabmdi.py | 2 +- wx/lib/agw/buttonpanel.py | 10 ++--- wx/lib/agw/customtreectrl.py | 12 +++--- wx/lib/agw/flatmenu.py | 22 +++++------ wx/lib/agw/flatnotebook.py | 40 ++++++++++---------- wx/lib/agw/floatspin.py | 4 +- wx/lib/agw/fmcustomizedlg.py | 8 ++-- wx/lib/agw/foldpanelbar.py | 10 ++--- wx/lib/agw/genericmessagedialog.py | 2 +- wx/lib/agw/hyperlink.py | 6 +-- wx/lib/agw/hypertreelist.py | 6 +-- wx/lib/agw/labelbook.py | 14 +++---- wx/lib/agw/multidirdialog.py | 4 +- wx/lib/agw/pycollapsiblepane.py | 2 +- wx/lib/agw/pyprogress.py | 4 +- wx/lib/agw/ribbon/art_aui.py | 2 +- wx/lib/agw/ribbon/art_msw.py | 10 ++--- wx/lib/agw/ribbon/buttonbar.py | 2 +- wx/lib/agw/ribbon/page.py | 6 +-- wx/lib/agw/ribbon/panel.py | 6 +-- wx/lib/agw/ribbon/toolbar.py | 6 +-- wx/lib/agw/rulerctrl.py | 2 +- wx/lib/agw/shapedbutton.py | 2 +- wx/lib/agw/shortcuteditor.py | 6 +-- wx/lib/agw/speedmeter.py | 12 +++--- wx/lib/agw/supertooltip.py | 6 +-- wx/lib/agw/thumbnailctrl.py | 2 +- wx/lib/agw/ultimatelistctrl.py | 20 +++++----- wx/lib/agw/xlsgrid.py | 4 +- wx/lib/analogclock/analogclock.py | 8 ++-- wx/lib/busy.py | 2 +- wx/lib/buttons.py | 2 +- wx/lib/calendar.py | 18 ++++----- wx/lib/colourchooser/canvas.py | 4 +- wx/lib/combotreebox.py | 2 +- wx/lib/delayedresult.py | 2 +- wx/lib/docview.py | 4 +- wx/lib/eventwatcher.py | 2 +- wx/lib/evtmgr.py | 2 +- wx/lib/expando.py | 4 +- wx/lib/fancytext.py | 2 +- wx/lib/floatcanvas/FCObjects.py | 16 ++++---- wx/lib/floatcanvas/FloatCanvas.py | 8 ++-- wx/lib/floatcanvas/ScreenShot.py | 2 +- wx/lib/floatcanvas/__init__.py | 2 +- wx/lib/gestures.py | 4 +- wx/lib/graphics.py | 4 +- wx/lib/imagebrowser.py | 2 +- wx/lib/infoframe.py | 4 +- wx/lib/inspection.py | 4 +- wx/lib/layoutf.py | 4 +- wx/lib/masked/ipaddrctrl.py | 2 +- wx/lib/masked/maskededit.py | 20 +++++----- wx/lib/masked/numctrl.py | 12 +++--- wx/lib/masked/textctrl.py | 4 +- wx/lib/masked/timectrl.py | 10 ++--- wx/lib/mixins/inspection.py | 2 +- wx/lib/mixins/listctrl.py | 8 ++-- wx/lib/mixins/rubberband.py | 8 ++-- wx/lib/mixins/treemixin.py | 2 +- wx/lib/ogl/__init__.py | 2 +- wx/lib/ogl/basic.py | 14 +++---- wx/lib/ogl/bmpshape.py | 2 +- wx/lib/ogl/canvas.py | 2 +- wx/lib/ogl/composit.py | 26 ++++++------- wx/lib/ogl/divided.py | 58 ++++++++++++++--------------- wx/lib/ogl/drawn.py | 2 +- wx/lib/ogl/lines.py | 8 ++-- wx/lib/ogl/oglmisc.py | 8 ++-- wx/lib/pdfwin_old.py | 2 +- wx/lib/platebtn.py | 6 +-- wx/lib/plot/CHANGELOG.md | 4 +- wx/lib/plot/examples/demo.py | 2 +- wx/lib/plot/plotcanvas.py | 4 +- wx/lib/plot/polyobjects.py | 14 +++---- wx/lib/plot/utils.py | 2 +- wx/lib/printout.py | 6 +-- wx/lib/pubsub/__init__.py | 2 +- wx/lib/pubsub/core/topicmgr.py | 2 +- wx/lib/pubsub/core/topicobj.py | 4 +- wx/lib/pubsub/setuparg1.py | 2 +- wx/lib/pubsub/setupkwargs.py | 2 +- wx/lib/pubsub/utils/notification.py | 2 +- wx/lib/pydocview.py | 4 +- wx/lib/resizewidget.py | 4 +- wx/lib/softwareupdate.py | 14 +++---- wx/lib/splitter.py | 2 +- wx/lib/stattext.py | 2 +- wx/lib/utils.py | 2 +- wx/lib/wxpTag.py | 4 +- wx/py/CHANGES.txt | 4 +- wx/py/editwindow.py | 2 +- wx/py/filling.py | 2 +- wx/py/frame.py | 4 +- wx/py/introspect.py | 2 +- wx/py/path.py | 2 +- wx/py/shell.py | 2 +- wx/py/sliceshell.py | 4 +- 108 files changed, 359 insertions(+), 359 deletions(-) diff --git a/samples/doodle/superdoodle.py b/samples/doodle/superdoodle.py index a0196e37..34c2263f 100644 --- a/samples/doodle/superdoodle.py +++ b/samples/doodle/superdoodle.py @@ -238,7 +238,7 @@ class ControlPanel(wx.Panel): self.thknsBtns[x] = b self.thknsBtns[1].SetToggle(True) - # Make a colour indicator window, it is registerd as a listener + # Make a colour indicator window, it is registered as a listener # with the doodle window so it will be notified when the settings # change ci = ColourIndicator(self) diff --git a/wx/lib/agw/advancedsplash.py b/wx/lib/agw/advancedsplash.py index 1f8c32df..4d3cdfde 100644 --- a/wx/lib/agw/advancedsplash.py +++ b/wx/lib/agw/advancedsplash.py @@ -335,7 +335,7 @@ class AdvancedSplash(wx.Frame): # Here We Redraw The Bitmap Over The Frame dc.DrawBitmap(self.bmp, 0, 0, True) - # We Draw The Text Anyway, Wheter It Is Empty ("") Or Not + # We Draw The Text Anyway, Whether It Is Empty ("") Or Not textcolour = self.GetTextColour() textfont = self.GetTextFont() textpos = self.GetTextPosition() diff --git a/wx/lib/agw/artmanager.py b/wx/lib/agw/artmanager.py index 1728d22d..fb8f0e93 100644 --- a/wx/lib/agw/artmanager.py +++ b/wx/lib/agw/artmanager.py @@ -752,7 +752,7 @@ class ArtManager(wx.EvtHandler): :param string `name`: the bitmap name. :return: The stock bitmap, if `name` was found in the stock bitmap dictionary. - Othewise, :class:`NullBitmap` is returned. + Otherwise, :class:`NullBitmap` is returned. """ return self._bitmaps.get(name, wx.NullBitmap) @@ -1160,9 +1160,9 @@ class ArtManager(wx.EvtHandler): :return: An instance of :class:`wx.Colour`. """ - r = random.randint(0, 255) # Random value betweem 0-255 - g = random.randint(0, 255) # Random value betweem 0-255 - b = random.randint(0, 255) # Random value betweem 0-255 + r = random.randint(0, 255) # Random value between 0-255 + g = random.randint(0, 255) # Random value between 0-255 + b = random.randint(0, 255) # Random value between 0-255 return wx.Colour(r, g, b) @@ -1194,7 +1194,7 @@ class ArtManager(wx.EvtHandler): :param string `text`: the text to be (eventually) truncated; :param integer `maxWidth`: the maximum width allowed for the text. - :return: A new string containining the (possibly) truncated text. + :return: A new string containing the (possibly) truncated text. """ textLen = len(text) @@ -1447,7 +1447,7 @@ class ArtManager(wx.EvtHandler): def GetBitmapStartLocation(self, dc, rect, bitmap, text="", style=0): """ - Returns the top left `x` and `y` cordinates of the bitmap drawing. + Returns the top left `x` and `y` coordinates of the bitmap drawing. :param `dc`: an instance of :class:`wx.DC`; :param wx.Rect `rect`: the bitmap's client rectangle; @@ -1466,7 +1466,7 @@ class ArtManager(wx.EvtHandler): ``BU_EXT_RIGHT_TO_LEFT_STYLE`` 32 A button suitable for right-to-left languages ============================== ======= ================================ - :return: A tuple containining the top left `x` and `y` cordinates of the bitmap drawing. + :return: A tuple containing the top left `x` and `y` coordinates of the bitmap drawing. """ alignmentBuffer = self.GetAlignBuffer() @@ -1495,7 +1495,7 @@ class ArtManager(wx.EvtHandler): # get the truncated text. The text may stay as is, it is not a must that is will be trancated fixedText = self.TruncateText(dc, text, maxWidth) - # get the fixed text dimentions + # get the fixed text dimensions fixedTextWidth, fixedTextHeight = dc.GetTextExtent(fixedText) # calculate the start location @@ -1513,7 +1513,7 @@ class ArtManager(wx.EvtHandler): # get the truncated text. The text may stay as is, it is not a must that is will be trancated fixedText = self.TruncateText(dc, text, maxWidth) - # get the fixed text dimentions + # get the fixed text dimensions fixedTextWidth, fixedTextHeight = dc.GetTextExtent(fixedText) if maxWidth > fixedTextWidth: @@ -1535,7 +1535,7 @@ class ArtManager(wx.EvtHandler): def GetTextStartLocation(self, dc, rect, bitmap, text, style=0): """ - Returns the top left `x` and `y` cordinates of the text drawing. + Returns the top left `x` and `y` coordinates of the text drawing. In case the text is too long, the text is being fixed (the text is cut and a '...' mark is added in the end). @@ -1545,7 +1545,7 @@ class ArtManager(wx.EvtHandler): :param string `text`: the button label; :param integer `style`: the button style. - :return: A tuple containining the top left `x` and `y` cordinates of the text drawing, plus + :return: A tuple containing the top left `x` and `y` coordinates of the text drawing, plus the truncated version of the input `text`. :see: :meth:`~ArtManager.GetBitmapStartLocation` for a list of valid button styles. @@ -1563,7 +1563,7 @@ class ArtManager(wx.EvtHandler): fixedText = self.TruncateText(dc, text, maxWidth) - # get the fixed text dimentions + # get the fixed text dimensions fixedTextWidth, fixedTextHeight = dc.GetTextExtent(fixedText) startLocationY = (rect.height - fixedTextHeight) / 2 + rect.y @@ -1648,7 +1648,7 @@ class ArtManager(wx.EvtHandler): location, labelOnly = self.GetAccelIndex(text) startLocationX, startLocationY, fixedText = self.GetTextStartLocation(dc, rect, bitmap, labelOnly, style) - # after all the caculations are finished, it is time to draw the text + # after all the calculations are finished, it is time to draw the text # underline the first letter that is marked with a '&' if location == -1 or font.GetUnderlined() or location >= len(fixedText): # draw the text @@ -1781,9 +1781,9 @@ class ArtManager(wx.EvtHandler): Returns the mnemonic index of the label and the label stripped of the ampersand mnemonic (e.g. 'lab&el' ==> will result in 3 and labelOnly = label). - :param string `label`: a string containining an ampersand. + :param string `label`: a string containing an ampersand. - :return: A tuple containining the mnemonic index of the label and the label + :return: A tuple containing the mnemonic index of the label and the label stripped of the ampersand mnemonic. """ @@ -1843,7 +1843,7 @@ class ArtManager(wx.EvtHandler): """ Returns the currently used menu theme. - :return: A string containining the currently used theme for the menu. + :return: A string containing the currently used theme for the menu. """ return self._menuTheme diff --git a/wx/lib/agw/aui/__init__.py b/wx/lib/agw/aui/__init__.py index abf1e574..096a4ad5 100644 --- a/wx/lib/agw/aui/__init__.py +++ b/wx/lib/agw/aui/__init__.py @@ -127,7 +127,7 @@ missing features (the list is not exhaustive): - wxAuiManager & wxToolBar - ToolBar Of Size Zero: http://trac.wxwidgets.org/ticket/9724 - wxAuiNotebook doesn't behave properly like a container as far as...: http://trac.wxwidgets.org/ticket/9911 - Serious layout bugs in wxAUI: http://trac.wxwidgets.org/ticket/10620 -- wAuiDefaultTabArt::Clone() should just use copy contructor: http://trac.wxwidgets.org/ticket/11388 +- wAuiDefaultTabArt::Clone() should just use copy constructor: http://trac.wxwidgets.org/ticket/11388 - Drop down button for check tool on wxAuiToolbar: http://trac.wxwidgets.org/ticket/11139 Plus the following features: @@ -201,7 +201,7 @@ Plus the following features: enough outside of the notebook to become floating pages; (k) Implementation of the style ``AUI_NB_DRAW_DND_TAB`` (on by default), which draws an image representation of a tab while dragging; - (l) Implementation of the `AuiNotebook` unsplit functionality, which unsplit a splitted AuiNotebook + (l) Implementation of the `AuiNotebook` unsplit functionality, which unsplit a split AuiNotebook when double-clicking on a sash; (m) Possibility to hide all the tabs by calling `HideAllTAbs`; (n) wxPython controls can now be added inside page tabs by calling `AddControlToPage`, and they can be diff --git a/wx/lib/agw/aui/aui_utilities.py b/wx/lib/agw/aui/aui_utilities.py index dfcf66e6..18a0358d 100644 --- a/wx/lib/agw/aui/aui_utilities.py +++ b/wx/lib/agw/aui/aui_utilities.py @@ -463,7 +463,7 @@ class TabDragImage(wx.DragImage): memory.SelectObject(wx.NullBitmap) - # Gtk and Windows unfortunatly don't do so well with transparent + # Gtk and Windows unfortunately don't do so well with transparent # drawing so this hack corrects the image to have a transparent # background. if wx.Platform != '__WXMAC__': diff --git a/wx/lib/agw/aui/auibar.py b/wx/lib/agw/aui/auibar.py index 6fa51051..f8dd5fc6 100644 --- a/wx/lib/agw/aui/auibar.py +++ b/wx/lib/agw/aui/auibar.py @@ -739,7 +739,7 @@ class AuiToolBarItem(object): class AuiDefaultToolBarArt(object): """ Toolbar art provider code - a tab provider provides all drawing functionality to the :class:`AuiToolBar`. - This allows the :class:`AuiToolBar` to have a plugable look-and-feel. + This allows the :class:`AuiToolBar` to have a pluggable look-and-feel. By default, a :class:`AuiToolBar` uses an instance of this class called :class:`AuiDefaultToolBarArt` which provides bitmap art and a colour scheme that is adapted to the major platforms' @@ -1028,7 +1028,7 @@ class AuiDefaultToolBarArt(object): elif item_state & AUI_BUTTON_STATE_CHECKED: - # it's important to put this code in an else statment after the + # it's important to put this code in an else statement after the # hover, otherwise hovers won't draw properly for checked items dc.SetPen(wx.Pen(self._highlight_colour)) dc.SetBrush(wx.Brush(StepColour(self._highlight_colour, 170))) @@ -1107,7 +1107,7 @@ class AuiDefaultToolBarArt(object): dc.DrawRectangle(dropdown_rect) elif item_state & AUI_BUTTON_STATE_CHECKED: - # it's important to put this code in an else statment after the + # it's important to put this code in an else statement after the # hover, otherwise hovers won't draw properly for checked items dc.SetPen(wx.Pen(self._highlight_colour)) dc.SetBrush(wx.Brush(StepColour(self._highlight_colour, 170))) @@ -1705,7 +1705,7 @@ class AuiToolBar(wx.Control): def SetArtProvider(self, art): """ Instructs :class:`AuiToolBar` to use art provider specified by parameter `art` - for all drawing calls. This allows plugable look-and-feel features. + for all drawing calls. This allows pluggable look-and-feel features. :param `art`: an art provider. diff --git a/wx/lib/agw/aui/auibook.py b/wx/lib/agw/aui/auibook.py index 2095ab6f..3df30ca5 100644 --- a/wx/lib/agw/aui/auibook.py +++ b/wx/lib/agw/aui/auibook.py @@ -939,7 +939,7 @@ class AuiTabContainer(object): def SetArtProvider(self, art): """ Instructs :class:`AuiTabContainer` to use art provider specified by parameter `art` - for all drawing calls. This allows plugable look-and-feel features. + for all drawing calls. This allows pluggable look-and-feel features. :param `art`: an art provider. @@ -2490,7 +2490,7 @@ class AuiTabCtrl(wx.Control, AuiTabContainer): def OnEnterWindow(self, event): """ - Handles the ``wx.EVT_ENTER_WINDOW`` event fof :class:`AuiTabCtrl`. + Handles the ``wx.EVT_ENTER_WINDOW`` event of :class:`AuiTabCtrl`. :param `event`: a :class:`MouseEvent` event to be processed. """ @@ -3390,7 +3390,7 @@ class AuiNotebook(wx.Panel): def UpdateTabCtrlHeight(self, force=False): """ :meth:`UpdateTabCtrlHeight` does the actual tab resizing. It's meant - to be used interally. + to be used internally. :param bool `force`: ``True`` to force the tab art to repaint. """ @@ -3843,7 +3843,7 @@ class AuiNotebook(wx.Panel): def SetSashDClickUnsplit(self, unsplit=True): """ - Sets whether to unsplit a splitted :class:`AuiNotebook` when double-clicking on a sash. + Sets whether to unsplit a split :class:`AuiNotebook` when double-clicking on a sash. :param bool `unsplit`: ``True`` to unsplit on sash double-clicking, ``False`` otherwise. """ @@ -3853,7 +3853,7 @@ class AuiNotebook(wx.Panel): def GetSashDClickUnsplit(self): """ - Returns whether a splitted :class:`AuiNotebook` can be unsplitted by double-clicking + Returns whether a split :class:`AuiNotebook` can be unsplitted by double-clicking on the splitter sash. """ @@ -4716,7 +4716,7 @@ class AuiNotebook(wx.Panel): self.RemovePage(idx) # re-add in the same position so it will tab self.InsertPage(idx, win, title, False, bmp) - # restore orignial selected tab + # restore original selected tab self.SetSelection(nowSelected) self.Thaw() diff --git a/wx/lib/agw/aui/dockart.py b/wx/lib/agw/aui/dockart.py index f6757092..c3a7dded 100644 --- a/wx/lib/agw/aui/dockart.py +++ b/wx/lib/agw/aui/dockart.py @@ -13,7 +13,7 @@ #---------------------------------------------------------------------------- """ Dock art provider code - a dock provider provides all drawing functionality to -the AUI dock manager. This allows the dock manager to have a plugable look-and-feel. +the AUI dock manager. This allows the dock manager to have a pluggable look-and-feel. By default, a :class:`~wx.lib.agw.aui.framemanager` uses an instance of this class called :mod:`~wx.lib.agw.aui.dockart` which provides bitmap art and a colour scheme that is adapted to the major platforms' @@ -52,7 +52,7 @@ if wx.Platform == "__WXMSW__": class AuiDefaultDockArt(object): """ Dock art provider code - a dock provider provides all drawing functionality to the AUI dock manager. - This allows the dock manager to have a plugable look-and-feel. + This allows the dock manager to have a pluggable look-and-feel. By default, a :class:`~wx.lib.agw.aui.framemanager.AuiManager` uses an instance of this class called :class:`AuiDefaultDockArt` which provides bitmap art and a colour scheme that is adapted to the major diff --git a/wx/lib/agw/aui/framemanager.py b/wx/lib/agw/aui/framemanager.py index 8f6ddb54..427b8e2b 100644 --- a/wx/lib/agw/aui/framemanager.py +++ b/wx/lib/agw/aui/framemanager.py @@ -4674,7 +4674,7 @@ class AuiManager(wx.EvtHandler): def SetArtProvider(self, art_provider): """ Instructs :class:`AuiManager` to use art provider specified by the parameter - `art_provider` for all drawing calls. This allows plugable look-and-feel + `art_provider` for all drawing calls. This allows pluggable look-and-feel features. :param `art_provider`: a AUI dock art provider. @@ -4697,7 +4697,7 @@ class AuiManager(wx.EvtHandler): def AddPane(self, window, arg1=None, arg2=None, target=None): """ Tells the frame manager to start managing a child window. There - are four versions of this function. The first verison allows the full spectrum + are four versions of this function. The first version allows the full spectrum of pane parameter possibilities (:meth:`AddPane1`). The second version is used for simpler user interfaces which do not require as much configuration (:meth:`AddPane2`). The :meth:`AddPane3` version allows a drop position to be specified, which will determine @@ -4809,7 +4809,7 @@ class AuiManager(wx.EvtHandler): # so use GetBestSize() pinfo.best_size = pinfo.window.GetBestSize() - # this is needed for Win2000 to correctly fill toolbar backround + # this is needed for Win2000 to correctly fill toolbar background # it should probably be repeated once system colour change happens if wx.Platform == "__WXMSW__" and pinfo.window.UseBgCol(): pinfo.window.SetBackgroundColour(self.GetArtProvider().GetColour(AUI_DOCKART_BACKGROUND_COLOUR)) @@ -6343,7 +6343,7 @@ class AuiManager(wx.EvtHandler): def SetDockSizeConstraint(self, width_pct, height_pct): """ When a user creates a new dock by dragging a window into a docked position, - often times the large size of the window will create a dock that is unwieldly + often times the large size of the window will create a dock that is unwieldy large. :class:`AuiManager` by default limits the size of any new dock to 1/3 of the window @@ -10309,7 +10309,7 @@ class AuiManager(wx.EvtHandler): self.GetPane(notebook).CaptionVisible(False).PaneBorder(False) self.Update() - # it seems the notebook isnt created by this stage, so remove + # it seems the notebook isn't created by this stage, so remove # the caption a moment later wx.CallAfter(RemoveCaption) return True @@ -10744,7 +10744,7 @@ class AuiManager_DCP(AuiManager): not pane.IsFloating() and pane.IsShown() for pane in self.GetAllPanes()) if haveCenterPane: if self.hasDummyPane: - # there's our dummy pane and also another center pane, therefor let's remove our dummy + # there's our dummy pane and also another center pane, therefore let's remove our dummy def do(): self._destroyDummyPane() self.Update() diff --git a/wx/lib/agw/aui/tabart.py b/wx/lib/agw/aui/tabart.py index 3df56354..77791173 100644 --- a/wx/lib/agw/aui/tabart.py +++ b/wx/lib/agw/aui/tabart.py @@ -14,7 +14,7 @@ """ Tab art provider code - a tab provider provides all drawing functionality to the :class:`~wx.lib.agw.aui.auibook.AuiNotebook`. This allows the -:class:`~wx.lib.agw.aui.auibook.AuiNotebook` to have a plugable look-and-feel. +:class:`~wx.lib.agw.aui.auibook.AuiNotebook` to have a pluggable look-and-feel. By default, a :class:`~wx.lib.agw.aui.auibook.AuiNotebook` uses an instance of this class called :class:`AuiDefaultTabArt` which provides bitmap art and a colour scheme that is @@ -113,7 +113,7 @@ class AuiCommandCapture(wx.EvtHandler): class AuiDefaultTabArt(object): """ Tab art provider code - a tab provider provides all drawing functionality to the :class:`~wx.lib.agw.aui.auibook.AuiNotebook`. - This allows the :class:`~wx.lib.agw.aui.auibook.AuiNotebook` to have a plugable look-and-feel. + This allows the :class:`~wx.lib.agw.aui.auibook.AuiNotebook` to have a pluggable look-and-feel. By default, a :class:`~wx.lib.agw.aui.auibook.AuiNotebook` uses an instance of this class called :class:`AuiDefaultTabArt` which provides bitmap art and a colour scheme that is adapted to the major platforms' @@ -2115,7 +2115,7 @@ class FF2TabArt(AuiDefaultTabArt): bottomStartColour = topEndColour bottomEndColour = topEndColour - # Incase we use bottom tabs, switch the colours + # In case we use bottom tabs, switch the colours if upperTabs: if focus: dc.GradientFillLinear(top, topStartColour, topEndColour, wx.SOUTH) @@ -2289,7 +2289,7 @@ class VC8TabArt(AuiDefaultTabArt): dc.DrawPolygon(tabPoints) if page.active: - # Delete the bottom line (or the upper one, incase we use wxBOTTOM) + # Delete the bottom line (or the upper one, in case we use wxBOTTOM) dc.SetPen(wx.WHITE_PEN) dc.DrawLine(tabPoints[0].x, tabPoints[0].y, tabPoints[6].x, tabPoints[6].y) diff --git a/wx/lib/agw/aui/tabmdi.py b/wx/lib/agw/aui/tabmdi.py index 7b07410d..e6c93d53 100644 --- a/wx/lib/agw/aui/tabmdi.py +++ b/wx/lib/agw/aui/tabmdi.py @@ -320,7 +320,7 @@ class AuiMDIChildFrame(wx.Panel): # before Create() (as is customary on some ports with wxFrame-type # windows), or wx.MINIMIZE can be passed in the style flags. Note that # AuiMDIChildFrame is not really derived from wxFrame, as MDIChildFrame - # is, but those are the expected symantics. No style flag is passed + # is, but those are the expected semantics. No style flag is passed # onto the panel underneath. self._activate_on_create = True diff --git a/wx/lib/agw/buttonpanel.py b/wx/lib/agw/buttonpanel.py index 4f45e9d0..7dbacbb1 100644 --- a/wx/lib/agw/buttonpanel.py +++ b/wx/lib/agw/buttonpanel.py @@ -50,7 +50,7 @@ code using the usual:: method. The control is generic, and support theming (well, I tested it under -Windows with the three defauls themes: grey, blue, silver and the +Windows with the three default themes: grey, blue, silver and the classic look). @@ -758,7 +758,7 @@ class BPArt(object): """ if style & BP_USE_GRADIENT: - # Draw gradient colour in the backgroud of the panel + # Draw gradient colour in the background of the panel self.FillGradientColour(dc, rect) # Draw a rectangle around the panel @@ -939,7 +939,7 @@ class Control(wx.EvtHandler): done, i.e. if the window had already been in the specified state. :note: Note that when a parent window is disabled, all of its children are disabled as - well and they are reenabled again when the parent is. + well and they are re-enabled again when the parent is. """ self.disabled = not enable @@ -2287,7 +2287,7 @@ class ButtonPanel(wx.Panel): def LayoutItems(self): """ - Layout the items using a different algorithms depending on the existance + Layout the items using a different algorithms depending on the existence of the main caption. """ @@ -2728,7 +2728,7 @@ class ButtonPanel(wx.Panel): def Freeze(self): """ Freezes the window or, in other words, prevents any updates from taking place - on screen, the window is not redrawn at all. :meth:`~ButtonPanel.Thaw` must be called to reenable + on screen, the window is not redrawn at all. :meth:`~ButtonPanel.Thaw` must be called to re-enable window redrawing. Calls to these two functions may be nested. :note: This method is useful for visual appearance optimization. diff --git a/wx/lib/agw/customtreectrl.py b/wx/lib/agw/customtreectrl.py index 713d5e59..99f91725 100644 --- a/wx/lib/agw/customtreectrl.py +++ b/wx/lib/agw/customtreectrl.py @@ -804,7 +804,7 @@ class DragImage(wx.DragImage): memory.SelectObject(wx.NullBitmap) - # Gtk and Windows unfortunatly don't do so well with transparent + # Gtk and Windows unfortunately don't do so well with transparent # drawing so this hack corrects the image to have a transparent # background. if wx.Platform != '__WXMAC__': @@ -1608,7 +1608,7 @@ class GenericTreeItem(object): """ - # since there can be very many of these, we save size by chosing + # since there can be very many of these, we save size by choosing # the smallest representation for the elements and by ordering # the members to avoid padding. self._text = text # label to be rendered for item @@ -3406,7 +3406,7 @@ class CustomTreeCtrl(wx.ScrolledWindow): def CheckChilds(self, item, checked=True): """ - Programatically check/uncheck item children. + Programmatically check/uncheck item children. :param `item`: an instance of :class:`GenericTreeItem`; :param bool `checked`: ``True`` to check an item, ``False`` to uncheck it. @@ -5812,7 +5812,7 @@ class CustomTreeCtrl(wx.ScrolledWindow): select = True # the default - # Check if we need to toggle hilight (ctrl mode) + # Check if we need to toggle highlight (ctrl mode) if not unselect_others: select = not item.IsSelected() @@ -7064,7 +7064,7 @@ class CustomTreeCtrl(wx.ScrolledWindow): yOrigin = abs(yOrigin) width, height = self.GetClientSize() - # Move end points to the begining/end of the view? + # Move end points to the beginning/end of the view? if y_mid < yOrigin: y_mid = yOrigin if oldY > yOrigin + height: @@ -8491,7 +8491,7 @@ class CustomTreeCtrl(wx.ScrolledWindow): Freeze :class:`CustomTreeCtrl`. Freezes the window or, in other words, prevents any updates from taking place - on screen, the window is not redrawn at all. :meth:`~Thaw` must be called to reenable + on screen, the window is not redrawn at all. :meth:`~Thaw` must be called to re-enable window redrawing. Calls to these two functions may be nested. :note: This method is useful for visual appearance optimization (for example, diff --git a/wx/lib/agw/flatmenu.py b/wx/lib/agw/flatmenu.py index 715d76f7..956fbcaa 100644 --- a/wx/lib/agw/flatmenu.py +++ b/wx/lib/agw/flatmenu.py @@ -305,7 +305,7 @@ def GetAccelIndex(label): Returns the mnemonic index of the label and the label stripped of the ampersand mnemonic (e.g. 'lab&el' ==> will result in 3 and labelOnly = label). - :param string `label`: a string possibly containining an ampersand. + :param string `label`: a string possibly containing an ampersand. """ indexAccel = 0 @@ -760,7 +760,7 @@ class FMRenderer(object): the menu border; :param integer `textX`: the menu item label x position; :param integer `rightMarginX`: the right margin between the text and the menu border; - :param bool `selected`: ``True`` if this menu item is currentl hovered by the mouse, + :param bool `selected`: ``True`` if this menu item is currently hovered by the mouse, ``False`` otherwise. :param `backgroundImage`: if not ``None``, an instance of :class:`wx.Bitmap` which will become the background image for this :class:`FlatMenu`. @@ -812,7 +812,7 @@ class FMRenderer(object): if bmp.IsOk(): - # Calculate the postion to place the image + # Calculate the position to place the image imgHeight = bmp.GetHeight() imgWidth = bmp.GetWidth() @@ -3649,7 +3649,7 @@ class FlatMenuBar(wx.Panel): if not self._dlg: self._dlg = FMCustomizeDlg(self) else: - # intialize the dialog + # initialize the dialog self._dlg.Initialise() if self._dlg.ShowModal() == wx.ID_OK: @@ -3907,7 +3907,7 @@ class ShadowPopupWindow(wx.PopupWindow): """ Default class constructor. - :param `parent`: the :class:`ShadowPopupWindow` parent (tipically your main frame). + :param `parent`: the :class:`ShadowPopupWindow` parent (typically your main frame). """ if not parent: @@ -4422,7 +4422,7 @@ class FlatMenuBase(ShadowPopupWindow): owner menu, ``False`` otherwise. """ - # Check if child menu is poped, if so, dismiss it + # Check if child menu is popped, if so, dismiss it if self._openedSubMenu: self._openedSubMenu.Dismiss(False, resetOwner) @@ -5620,7 +5620,7 @@ class FlatMenu(FlatMenuBase): dc.SetFont(font) - accelFiller = "XXXX" # 4 spaces betweem text and accel column + accelFiller = "XXXX" # 4 spaces between text and accel column # Calc text length/height dummy, itemHeight = dc.GetTextExtent("Tp") @@ -5836,7 +5836,7 @@ class FlatMenu(FlatMenuBase): from this. """ - # Draw all childs menus of self menu as well + # Draw all child menus of self menu as well child = self._openedSubMenu while child: dc = wx.ClientDC(child) @@ -5958,7 +5958,7 @@ class FlatMenu(FlatMenuBase): itemIdx = i # We keep the index of only - # the first occurence + # the first occurrence occur += 1 @@ -6735,7 +6735,7 @@ class FlatMenu(FlatMenuBase): if item.IsRadioItem(): - # Udpate radio groups in case this item is a radio item + # Update radio groups in case this item is a radio item sibling = self.GetSiblingGroupItem(item) if sibling: @@ -7256,7 +7256,7 @@ class MenuKbdRedirector(wx.EvtHandler): def ProcessEvent(self, event): """ - Processes the inout event. + Processes the input event. :param `event`: any kind of keyboard-generated events. """ diff --git a/wx/lib/agw/flatnotebook.py b/wx/lib/agw/flatnotebook.py index 81102d40..760e753c 100644 --- a/wx/lib/agw/flatnotebook.py +++ b/wx/lib/agw/flatnotebook.py @@ -947,7 +947,7 @@ def DrawButton(dc, rect, focus, upperTabs): bottomStartColour = topEndColour bottomEndColour = topEndColour - # Incase we use bottom tabs, switch the colours + # In case we use bottom tabs, switch the colours if upperTabs: if focus: PaintStraightGradientBox(dc, top, topStartColour, topEndColour) @@ -2230,7 +2230,7 @@ class FNBRenderer(object): pc.Hide() return - # Get the text hight + # Get the text height tabHeight = self.CalcTabHeight(pageContainer) agwStyle = pc.GetParent().GetAGWWindowStyleFlag() @@ -2289,7 +2289,7 @@ class FNBRenderer(object): pen = wx.Pen(wx.SystemSettings.GetColour(wx.SYS_COLOUR_3DFACE)) dc.SetPen(pen) - # Draw thik grey line between the windows area and + # Draw thick grey line between the windows area and # the tab area for num in range(3): dc.DrawLine(0, greyLineYVal + num, size.x, greyLineYVal + num) @@ -2359,7 +2359,7 @@ class FNBRenderer(object): x1 = posx x2 = posx + tabWidth + 2 - # Restore the text forground + # Restore the text foreground dc.SetTextForeground(pc._activeTextColour) # Update the tab position & size @@ -2832,8 +2832,8 @@ class FNBRendererVC71(FNBRenderer): dc.DrawLine(posx + tabWidth, blackLineY1, posx + tabWidth, blackLineY2) # To give the tab more 3D look we do the following - # Incase the tab is on top, - # Draw a thik white line on topof the rectangle + # In case the tab is on top, + # Draw a thick white line on topof the rectangle # Otherwise, draw a thin (1 pixel) black line at the bottom pen = wx.Pen((pc.HasAGWFlag(FNB_BOTTOM) and [wx.BLACK] or [wx.WHITE])[0]) @@ -3056,7 +3056,7 @@ class FNBRendererVC8(FNBRenderer): pc.Hide() return - # Get the text hight + # Get the text height tabHeight = self.CalcTabHeight(pageContainer) # Set the font for measuring the tab height @@ -3141,7 +3141,7 @@ class FNBRendererVC8(FNBRenderer): posx = vTabsInfo[cur].x # By default we clean the tab region - # incase we use the VC8 style which requires + # in case we use the VC8 style which requires # the region, it will be filled by the function # drawVc8Tab pc._pagesInfoVec[i].GetRegion().Clear() @@ -3152,7 +3152,7 @@ class FNBRendererVC8(FNBRenderer): pc._pagesInfoVec[i].GetXRect().SetSize(wx.Size(-1, -1)) # Draw the tab - # Incase we are drawing the active tab + # In case we are drawing the active tab # we need to redraw so it will appear on top # of all other tabs @@ -3167,14 +3167,14 @@ class FNBRendererVC8(FNBRenderer): self.DrawTab(pc, dc, posx, i, tabWidth, tabHeight, pc._nTabXButtonStatus) - # Restore the text forground + # Restore the text foreground dc.SetTextForeground(pc._activeTextColour) # Update the tab position & size pc._pagesInfoVec[i].SetPosition(wx.Point(posx, VERTICAL_BORDER_PADDING)) pc._pagesInfoVec[i].SetSize(wx.Size(tabWidth, tabHeight)) - # Incase we are in VC8 style, redraw the active tab (incase it is visible) + # In case we are in VC8 style, redraw the active tab (in case it is visible) if pc.GetSelection() >= pc._nFrom and pc.GetSelection() < pc._nFrom + len(vTabsInfo): self.DrawTab(pc, dc, activeTabPosx, pc.GetSelection(), activeTabWidth, activeTabHeight, pc._nTabXButtonStatus) @@ -3268,8 +3268,8 @@ class FNBRendererVC8(FNBRenderer): dc.SetPen(curPen) dc.DrawLine(posx, lineY, posx+rect.width, lineY) - # Incase we are drawing the selected tab, we draw the border of it as well - # but without the bottom (upper line incase of wxBOTTOM) + # In case we are drawing the selected tab, we draw the border of it as well + # but without the bottom (upper line in case of wxBOTTOM) if tabIdx == pc.GetSelection(): borderPen = wx.Pen(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNSHADOW)) @@ -3277,7 +3277,7 @@ class FNBRendererVC8(FNBRenderer): dc.SetBrush(wx.TRANSPARENT_BRUSH) dc.DrawPolygon(tabPoints) - # Delete the bottom line (or the upper one, incase we use wxBOTTOM) + # Delete the bottom line (or the upper one, in case we use wxBOTTOM) dc.SetPen(wx.WHITE_PEN) dc.DrawLine(tabPoints[0].x, tabPoints[0].y, tabPoints[6].x, tabPoints[6].y) @@ -3393,7 +3393,7 @@ class FNBRendererVC8(FNBRenderer): # If we are drawing the selected tab, we need also to draw a line # from 0.tabPoints[0].x and tabPoints[6].x . end, we achieve this # by drawing the rectangle with transparent brush - # the line under the selected tab will be deleted by the drwaing loop + # the line under the selected tab will be deleted by the drawing loop if bSelectedTab: self.DrawTabsLine(pc, dc) @@ -3615,7 +3615,7 @@ class FNBRendererRibbonTabs(FNBRenderer): self._first = True self._factor = 1 - # definte this because we don't want to use the bold font + # define this because we don't want to use the bold font def CalcTabWidth(self, pageContainer, tabIdx, tabHeight): """ Calculates the width of the input tab. @@ -3847,7 +3847,7 @@ class FNBRendererRibbonTabs(FNBRenderer): # Draw the tab (border, text, image & 'x' on tab) self.DrawTab(pc, dc, posx, i, tabWidth, tabHeight, pc._nTabXButtonStatus) - # Restore the text forground + # Restore the text foreground dc.SetTextForeground(pc._activeTextColour) # Update the tab position & size @@ -3968,7 +3968,7 @@ class FlatNotebook(wx.Panel): if "__WXGTK__" in wx.PlatformInfo: # For GTK it seems that we must do this steps in order # for the tabs will get the proper height on initialization - # on MSW, preforming these steps yields wierd results + # on MSW, preforming these steps yields weird results boldFont = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT) boldFont.SetWeight(wx.FONTWEIGHT_BOLD) dc.SetFont(boldFont) @@ -6206,12 +6206,12 @@ class PageContainer(wx.Panel): def CanFitToScreen(self, page): """ - Returns wheter a tab can fit in the left space in the screen or not. + Returns whether a tab can fit in the left space in the screen or not. :param `page`: an integer specifying the page index. """ - # Incase the from is greater than page, + # In case the from is greater than page, # we need to reset the self._nFrom, so in order # to force the caller to do so, we return false if self._nFrom > page: diff --git a/wx/lib/agw/floatspin.py b/wx/lib/agw/floatspin.py index 5e99b04e..f7e34c45 100644 --- a/wx/lib/agw/floatspin.py +++ b/wx/lib/agw/floatspin.py @@ -1285,7 +1285,7 @@ class FixedPoint(object): >>> - The string produced by `str(x)` (implictly invoked by `print`) always + The string produced by `str(x)` (implicitly invoked by `print`) always contains at least one digit before the decimal point, followed by a decimal point, followed by exactly `x.get_precision()` digits. If `x` is negative, `str(x)[0] == "-"`. @@ -1434,7 +1434,7 @@ class FixedPoint(object): try: p = int(precision) except: - raise TypeError("precision not convertable to int: " + + raise TypeError("precision not convertible to int: " + repr(precision)) if p < 0: raise ValueError("precision must be >= 0: " + repr(precision)) diff --git a/wx/lib/agw/fmcustomizedlg.py b/wx/lib/agw/fmcustomizedlg.py index c4078529..09ebcb9b 100644 --- a/wx/lib/agw/fmcustomizedlg.py +++ b/wx/lib/agw/fmcustomizedlg.py @@ -225,7 +225,7 @@ class FMCustomizeDlg(wx.Dialog): def Initialise(self): - """ Initialzes the :class:`~wx.lib.agw.labelbook.LabelBook` pages. """ + """ Initializes the :class:`~wx.lib.agw.labelbook.LabelBook` pages. """ self._book.DeleteAllPages() self._book.AddPage(self.CreateMenusPage(), _("Menus"), True) @@ -307,10 +307,10 @@ class FMCustomizeDlg(wx.Dialog): def CreateShortcutsPage(self): - """ Creates the :class:`~wx.lib.agw.labelbook.LabelBook` shorcuts page. """ + """ Creates the :class:`~wx.lib.agw.labelbook.LabelBook` shortcuts page. """ - shorcuts = wx.Panel(self._book, wx.ID_ANY, wx.DefaultPosition, wx.Size(300, 300)) - return shorcuts + shortcuts = wx.Panel(self._book, wx.ID_ANY, wx.DefaultPosition, wx.Size(300, 300)) + return shortcuts def CreateOptionsPage(self): diff --git a/wx/lib/agw/foldpanelbar.py b/wx/lib/agw/foldpanelbar.py index 8f2ce5f5..31da9c6c 100644 --- a/wx/lib/agw/foldpanelbar.py +++ b/wx/lib/agw/foldpanelbar.py @@ -27,7 +27,7 @@ # Don't Know What It Means. Probably Is My Poor English... # # 4. OnSizePanel Function In FoldPanelBar Class: -# TODO: A Smart Way To Check Wether The Old - New Width Of The +# TODO: A Smart Way To Check whether The Old - New Width Of The # Panel Changed, If So No Need To Resize The Fold Panel Items # # @@ -736,7 +736,7 @@ class CaptionBar(wx.Window): def IsCollapsed(self): - """ Returns wether the status of the bar is expanded or collapsed. """ + """ Returns whether the status of the bar is expanded or collapsed. """ return self._collapsed @@ -796,7 +796,7 @@ class CaptionBar(wx.Window): def IsVertical(self): """ - Returns wether the :class:`CaptionBar` has a default orientation or not. + Returns whether the :class:`CaptionBar` has a default orientation or not. Default is vertical. """ @@ -1425,7 +1425,7 @@ class FoldPanelBar(wx.Panel): if vertical and rect.GetHeight() > 0 or not vertical and rect.GetWidth() > 0: self.RefreshRect(rect) - # TODO: A smart way to check wether the old - new width of the + # TODO: A smart way to check whether the old - new width of the # panel changed, if so no need to resize the fold panel items self.RedisplayFoldPanelItems() @@ -1509,7 +1509,7 @@ class FoldPanelBar(wx.Panel): value = wx.Rect(0,0,0,0) vertical = self.IsVertical() - # determine wether the number of panels left + # determine whether the number of panels left # times the size of their captions is enough # to be placed in the left over space diff --git a/wx/lib/agw/genericmessagedialog.py b/wx/lib/agw/genericmessagedialog.py index 826c43ae..319a2ddf 100644 --- a/wx/lib/agw/genericmessagedialog.py +++ b/wx/lib/agw/genericmessagedialog.py @@ -1422,7 +1422,7 @@ class GenericMessageDialog(wx.Dialog): :return: a new message wrapped at maximum `wrap` pixels wide. - :todo: Estabilish if wrapping all messages by default is a better idea than + :todo: Establish if wrapping all messages by default is a better idea than provide a keyword parameter to :class:`GenericMessageDialog`. A default maximum line width might be the wxMac one, at 360 pixels. """ diff --git a/wx/lib/agw/hyperlink.py b/wx/lib/agw/hyperlink.py index fb6262c9..2215827f 100644 --- a/wx/lib/agw/hyperlink.py +++ b/wx/lib/agw/hyperlink.py @@ -283,7 +283,7 @@ class HyperLinkCtrl(StaticText): :param `URL`: the url link we wish to navigate; :param `ReportErrors`: Use ``True`` to display error dialog if an error - occurrs navigating to the URL; + occurs navigating to the URL; :param `NotSameWinIfPossible`: Use ``True`` to attempt to open the URL in new browser window. """ @@ -435,7 +435,7 @@ class HyperLinkCtrl(StaticText): :class:`MessageBox`. :param `ErrorMessage`: a string representing the error to display; - :param `ReportErrors`: ``True`` to display error dialog if an error occurrs + :param `ReportErrors`: ``True`` to display error dialog if an error occurs navigating to the URL. """ @@ -592,7 +592,7 @@ class HyperLinkCtrl(StaticText): Set whether to report browser errors or not. :param `ReportErrors`: Use ``True`` to display error dialog if an error - occurrs navigating to the URL; + occurs navigating to the URL; """ self._ReportErrors = ReportErrors diff --git a/wx/lib/agw/hypertreelist.py b/wx/lib/agw/hypertreelist.py index 43d91081..3938f12d 100644 --- a/wx/lib/agw/hypertreelist.py +++ b/wx/lib/agw/hypertreelist.py @@ -1065,7 +1065,7 @@ class TreeListHeaderWindow(wx.Window): # end of the current column xpos = 0 - # find the column where this event occured + # find the column where this event occurred countCol = self.GetColumnCount() for column in range(countCol): @@ -3953,7 +3953,7 @@ class TreeListMainWindow(CustomTreeCtrl): header.Update() # Update the header window after this scroll event has fully finished - # processing, and the scoll action is complete. + # processing, and the scroll action is complete. if event.GetOrientation() == wx.HORIZONTAL: wx.CallAfter(_updateHeaderWindow, self._owner.GetHeaderWindow()) event.Skip() @@ -4323,7 +4323,7 @@ class HyperTreeList(wx.Control): :class:`TreeListHeaderWindow` :class:`TreeListMainWindow` based off :class:`CustomTreeCtrl` These widgets can be obtained by the :meth:`~HyperTreeList.GetHeaderWindow` - and :meth:`~HyperTreeList.GetMainWindow` methods respectively althought this + and :meth:`~HyperTreeList.GetMainWindow` methods respectively although this shouldn't be needed in normal usage. Please note that although the methods are not explicitly defined or diff --git a/wx/lib/agw/labelbook.py b/wx/lib/agw/labelbook.py index 93f6503c..8f527bf1 100644 --- a/wx/lib/agw/labelbook.py +++ b/wx/lib/agw/labelbook.py @@ -875,7 +875,7 @@ class ImageContainerBase(wx.Panel): self.DrawPin(dc, self._pinBtnRect, not self._bCollapsed) return - # Incase panel is collapsed, there is nothing + # In case panel is collapsed, there is nothing # to check if self._bCollapsed: return @@ -902,7 +902,7 @@ class ImageContainerBase(wx.Panel): self._nHoveredImgIdx = -1 # Make sure the pin button status is NONE - # incase we were in pin button style + # in case we were in pin button style style = self.GetParent().GetAGWWindowStyleFlag() if style & INB_USE_PIN_BUTTON: @@ -1247,7 +1247,7 @@ class ImageContainer(ImageContainerBase): # We reserver 20 pixels for the 'pin' button # The drawing of the images start position. This is - # depenedent of the style, especially when Pin button + # dependent on the style, especially when Pin button # style is requested if bUsePin: @@ -1270,9 +1270,9 @@ class ImageContainer(ImageContainerBase): count = count + 1 - # incase the 'fit button' style is applied, we set the rectangle width to the + # in case the 'fit button' style is applied, we set the rectangle width to the # text width plus padding - # Incase the style IS applied, but the style is either LEFT or RIGHT + # In case the style IS applied, but the style is either LEFT or RIGHT # we ignore it dc.SetFont(normalFont) @@ -1300,7 +1300,7 @@ class ImageContainer(ImageContainerBase): rectWidth += 1 # Check that we have enough space to draw the button - # If Pin button is used, consider its space as well (applicable for top/botton style) + # If Pin button is used, consider its space as well (applicable for top/bottom style) # since in the left/right, its size is already considered in 'pos' pinBtnSize = (bUsePin and [20] or [0])[0] @@ -1360,7 +1360,7 @@ class ImageContainer(ImageContainerBase): else: rect = wx.Rect(pos, 0, rectWidth, rectWidth) - # Incase user set both flags: + # In case user set both flags: # INB_SHOW_ONLY_TEXT and INB_SHOW_ONLY_IMAGES # We override them to display both diff --git a/wx/lib/agw/multidirdialog.py b/wx/lib/agw/multidirdialog.py index 09f86252..fcf383d0 100644 --- a/wx/lib/agw/multidirdialog.py +++ b/wx/lib/agw/multidirdialog.py @@ -39,7 +39,7 @@ ability of selecting multiple folders at once. It may be useful when you wish to present to the user a directory browser which allows multiple folder selections. :class:`MultiDirDialog` sports the following features: -* Ability to select a single or mutliple folders, depending on the style passed; +* Ability to select a single or multiple folders, depending on the style passed; * More colourful and eye-catching buttons; * Good old Python code :-D . @@ -468,7 +468,7 @@ class MultiDirDialog(wx.Dialog): """ Recurse a directory tree to include the parent-folder. - :param `treeCtrl`: the tree control associated with teh internal :class:`GenericDirCtrl`; + :param `treeCtrl`: the tree control associated with the internal :class:`GenericDirCtrl`; :param `item`: the selected tree control item; :param `itemText`: the selected tree control item text. """ diff --git a/wx/lib/agw/pycollapsiblepane.py b/wx/lib/agw/pycollapsiblepane.py index 5d932726..9352eb89 100644 --- a/wx/lib/agw/pycollapsiblepane.py +++ b/wx/lib/agw/pycollapsiblepane.py @@ -484,7 +484,7 @@ class PyCollapsiblePane(wx.Panel): self.SetSize(sz) if self.HasAGWFlag(wx.CP_NO_TLW_RESIZE): - # the user asked to explicitely handle the resizing itself... + # the user asked to explicitly handle the resizing itself... return # NB: the following block of code has been accurately designed to diff --git a/wx/lib/agw/pyprogress.py b/wx/lib/agw/pyprogress.py index 28205cba..4d50a71b 100644 --- a/wx/lib/agw/pyprogress.py +++ b/wx/lib/agw/pyprogress.py @@ -613,7 +613,7 @@ class PyProgress(wx.Dialog): return False else: - # reenable other windows before hiding this one because otherwise + # re-enable other windows before hiding this one because otherwise # Windows wouldn't give the focus back to the window which had # been previously focused because it would still be disabled self.ReenableOtherWindows() @@ -724,7 +724,7 @@ class PyProgress(wx.Dialog): ``False`` otherwise. """ - # reenable other windows before hiding this one because otherwise + # re-enable other windows before hiding this one because otherwise # Windows wouldn't give the focus back to the window which had # been previously focused because it would still be disabled if not show: diff --git a/wx/lib/agw/ribbon/art_aui.py b/wx/lib/agw/ribbon/art_aui.py index a1d25584..9b5321e8 100644 --- a/wx/lib/agw/ribbon/art_aui.py +++ b/wx/lib/agw/ribbon/art_aui.py @@ -954,7 +954,7 @@ class RibbonAUIArtProvider(RibbonMSWArtProvider): """ Draw the background and chrome for a :class:`~wx.lib.agw.ribbon.gallery.RibbonGallery` control. - This should draw the border, brackground, scroll buttons, extension button, and + This should draw the border, background, scroll buttons, extension button, and any other UI elements which are not attached to a specific gallery item. :param `dc`: The device context to draw onto; diff --git a/wx/lib/agw/ribbon/art_msw.py b/wx/lib/agw/ribbon/art_msw.py index d000d47c..df061a14 100644 --- a/wx/lib/agw/ribbon/art_msw.py +++ b/wx/lib/agw/ribbon/art_msw.py @@ -129,7 +129,7 @@ class RibbonMSWArtProvider(object): in a colour scheme similar to, if not identical to, the default colours of the art provider. Note that if :meth:`~RibbonMSWArtProvider.SetColour` is called, then :meth:`~RibbonMSWArtProvider.GetColourScheme` does not try and return a colour scheme similar to colours being used - it's return - values are dependant upon the last values given to :meth:`~RibbonMSWArtProvider.SetColourScheme`, as + values are dependent upon the last values given to :meth:`~RibbonMSWArtProvider.SetColourScheme`, as described above. :param `primary`: Pointer to a location to store the primary colour, or ``None``; @@ -1135,7 +1135,7 @@ class RibbonMSWArtProvider(object): background = page.AdjustRectToIncludeScrollButtons(background) background.height -= 2 - # Page background isn't dependant upon the width of the page + # Page background isn't dependent upon the width of the page # (at least not the part of it intended to be painted by this # function). Set to wider than the page itself for when externally # expanded panels need a background - the expanded panel can be wider @@ -1144,7 +1144,7 @@ class RibbonMSWArtProvider(object): background.x = 0 background.width = 10000 - # upper_rect, lower_rect, paint_rect are all in page co-ordinates + # upper_rect, lower_rect, paint_rect are all in page coordinates upper_rect = wx.Rect(*background) upper_rect.height /= 5 @@ -1536,7 +1536,7 @@ class RibbonMSWArtProvider(object): """ Draw the background and chrome for a :class:`~wx.lib.agw.ribbon.gallery.RibbonGallery` control. - This should draw the border, brackground, scroll buttons, extension button, and + This should draw the border, background, scroll buttons, extension button, and any other UI elements which are not attached to a specific gallery item. :param `dc`: The device context to draw onto; @@ -2517,7 +2517,7 @@ class RibbonMSWArtProvider(object): is resized. To optimise the drawing of page backgrounds, as small an area as possible should - be returned. Of couse, if the way in which a background is drawn means that the + be returned. Of course, if the way in which a background is drawn means that the entire background needs to be repainted on resize, then the entire new size should be returned. diff --git a/wx/lib/agw/ribbon/buttonbar.py b/wx/lib/agw/ribbon/buttonbar.py index 25ee49a8..697cef7b 100644 --- a/wx/lib/agw/ribbon/buttonbar.py +++ b/wx/lib/agw/ribbon/buttonbar.py @@ -1093,7 +1093,7 @@ class RibbonButtonBar(RibbonControl): # If height isn't preserved (i.e. it is reduced), then the minimum # size for the button bar will decrease, preventing the original # layout from being used (in some cases). - # It may be a good idea to always preverse the height, but for now + # It may be a good idea to always perverse the height, but for now # it is only done when the first button is involved in a collapse. preserve_height = True diff --git a/wx/lib/agw/ribbon/page.py b/wx/lib/agw/ribbon/page.py index 9f3469fa..1099058e 100644 --- a/wx/lib/agw/ribbon/page.py +++ b/wx/lib/agw/ribbon/page.py @@ -261,7 +261,7 @@ class RibbonPage(RibbonControl): Scroll the page by some amount up / down / left / right. When the page's children are too big to fit in the onscreen area given to the - page, scroll buttons will appear, and the page can be programatically scrolled. + page, scroll buttons will appear, and the page can be programmatically scrolled. Positive values of will scroll right or down, while negative values will scroll up or left (depending on the direction in which panels are stacked). A line is equivalent to a constant number of pixels. @@ -284,7 +284,7 @@ class RibbonPage(RibbonControl): Scroll the page by a set number of pixels up / down / left / right. When the page's children are too big to fit in the onscreen area given to the - page, scroll buttons will appear, and the page can be programatically scrolled. + page, scroll buttons will appear, and the page can be programmatically scrolled. Positive values of will scroll right or down, while negative values will scroll up or left (depending on the direction in which panels are stacked). @@ -418,7 +418,7 @@ class RibbonPage(RibbonControl): # When a resize triggers the scroll buttons to become visible, the page is resized. # This resize from within a resize event can cause (MSW) wxWidgets some confusion, # and report the 1st size to the 2nd size event. Hence the most recent size is - # remembered internally and used in Layout() where appropiate. + # remembered internally and used in Layout() where appropriate. if self.GetMajorAxis() == wx.HORIZONTAL: self._size_in_major_axis_for_children = width diff --git a/wx/lib/agw/ribbon/panel.py b/wx/lib/agw/ribbon/panel.py index 79fd9bc5..f09bceeb 100644 --- a/wx/lib/agw/ribbon/panel.py +++ b/wx/lib/agw/ribbon/panel.py @@ -901,13 +901,13 @@ class RibbonPanel(RibbonControl): Show the panel externally expanded. When a panel is minimised, it can be shown full-size in a pop-out window, which - is refered to as being (externally) expanded. + is referred to as being (externally) expanded. :returns: ``True`` if the panel was expanded, ``False`` if it was not (possibly due to it not being minimised, or already being expanded). :note: When a panel is expanded, there exist two panels - the original panel - (which is refered to as the dummy panel) and the expanded panel. The original + (which is referred to as the dummy panel) and the expanded panel. The original is termed a dummy as it sits in the ribbon bar doing nothing, while the expanded panel holds the panel children. @@ -1020,7 +1020,7 @@ class RibbonPanel(RibbonControl): self.HideExpanded() # Do not skip event, as the panel has been de-expanded, causing the # child with focus to be reparented (and hidden). If the event - # continues propogation then bad things happen. + # continues propagation then bad things happen. else: event.Skip() diff --git a/wx/lib/agw/ribbon/toolbar.py b/wx/lib/agw/ribbon/toolbar.py index 1771c650..e50ba60f 100644 --- a/wx/lib/agw/ribbon/toolbar.py +++ b/wx/lib/agw/ribbon/toolbar.py @@ -393,7 +393,7 @@ class RibbonToolBar(RibbonControl): Adds a separator to the tool bar. Separators are used to separate tools into groups. As such, a separator is not - explicity drawn, but is visually seen as the gap between tool groups. + explicitly drawn, but is visually seen as the gap between tool groups. """ if not self._groups[-1].tools: @@ -408,7 +408,7 @@ class RibbonToolBar(RibbonControl): Inserts a separator into the tool bar at the position specified by `pos`. Separators are used to separate tools into groups. As such, a separator is not - explicity drawn, but is visually seen as the gap between tool groups. + explicitly drawn, but is visually seen as the gap between tool groups. :param `pos`: the position of the new tool in the toolbar (zero-based). @@ -944,7 +944,7 @@ class RibbonToolBar(RibbonControl): Set the number of rows to distribute tool groups over. Tool groups can be distributed over a variable number of rows. The way in which - groups are assigned to rows is not specificed, and the order of groups may + groups are assigned to rows is not specified, and the order of groups may change, but they will be distributed in such a way as to minimise the overall size of the tool bar. diff --git a/wx/lib/agw/rulerctrl.py b/wx/lib/agw/rulerctrl.py index baad2bc8..b13ae51a 100644 --- a/wx/lib/agw/rulerctrl.py +++ b/wx/lib/agw/rulerctrl.py @@ -344,7 +344,7 @@ class RulerCtrlEvent(wx.CommandEvent): class Label(object): """ - Auxilary class. Just holds information about a label in :class:`RulerCtrl`. + Auxiliary class. Just holds information about a label in :class:`RulerCtrl`. """ def __init__(self, pos=-1, lx=-1, ly=-1, text=""): diff --git a/wx/lib/agw/shapedbutton.py b/wx/lib/agw/shapedbutton.py index f015d4e3..10505953 100644 --- a/wx/lib/agw/shapedbutton.py +++ b/wx/lib/agw/shapedbutton.py @@ -463,7 +463,7 @@ class SButton(wx.Window): def IsEnabled(self): - """ Returns wheter the button is enabled or not. """ + """ Returns whether the button is enabled or not. """ return self._enabled diff --git a/wx/lib/agw/shortcuteditor.py b/wx/lib/agw/shortcuteditor.py index 88def298..4311add3 100644 --- a/wx/lib/agw/shortcuteditor.py +++ b/wx/lib/agw/shortcuteditor.py @@ -1370,7 +1370,7 @@ class Shortcut(object): the `filter` string to look for a match. :return: An instance of :class:`Shortcut` if the `filter` string is contained in - the `item` lable, ``None`` otherwise. + the `item` label, ``None`` otherwise. :note: The string-matching is case-insensitive. """ @@ -1391,7 +1391,7 @@ class Shortcut(object): def ShowHierarchy(self, item): """ - Set the status of this :class:`Shortcut` ans its parent as `shown` in the + Set the status of this :class:`Shortcut` and its parent as `shown` in the :class:`ListShortcut` tree hierarchy. :param `item`: an instance of :class:`Shortcut`. @@ -1951,7 +1951,7 @@ class ListShortcut(HTL.HyperTreeList, treemixin.ExpansionState): keyCode = event.GetKeyCode() modifiers = event.GetModifiers() - # If we press backspace with no modifers down, *and* the current text is + # If we press backspace with no modifiers down, *and* the current text is # "New accelerator..." then we reset the accelerator to "Disabled" if keyCode == wx.WXK_BACK and modifiers == 0 and currentText in [NEW_ACCEL_STRING, DISABLED_STRING]: diff --git a/wx/lib/agw/speedmeter.py b/wx/lib/agw/speedmeter.py index f196b51f..07a175e6 100644 --- a/wx/lib/agw/speedmeter.py +++ b/wx/lib/agw/speedmeter.py @@ -161,7 +161,7 @@ This class supports the following window styles: Window Styles Hex Value Description =========================== =========== ================================================== ``SM_ROTATE_TEXT`` 0x1 Draws the ticks rotated: the ticks are rotated accordingly to the tick marks positions. -``SM_DRAW_SECTORS`` 0x2 Different intervals are painted in differend colours (every sector of the circle has its own colour). +``SM_DRAW_SECTORS`` 0x2 Different intervals are painted in different colours (every sector of the circle has its own colour). ``SM_DRAW_PARTIAL_SECTORS`` 0x4 Every interval has its own colour, but only a circle corona is painted near the ticks. ``SM_DRAW_HAND`` 0x8 The hand (arrow indicator) is drawn. ``SM_DRAW_SHADOW`` 0x10 A shadow for the hand is drawn. @@ -217,7 +217,7 @@ SM_BUFFERED_DC = 1 #---------------------------------------------------------------------- # SM_ROTATE_TEXT: Draws The Ticks Rotated: The Ticks Are Rotated # Accordingly To The Tick Marks Positions -# SM_DRAW_SECTORS: Different Intervals Are Painted In Differend Colours +# SM_DRAW_SECTORS: Different Intervals Are Painted In Different Colours # (Every Sector Of The Circle Has Its Own Colour) # SM_DRAW_PARTIAL_SECTORS: Every Interval Has Its Own Colour, But Only # A Circle Corona Is Painted Near The Ticks @@ -239,7 +239,7 @@ SM_BUFFERED_DC = 1 SM_ROTATE_TEXT = 1 """ Draws the ticks rotated: the ticks are rotated accordingly to the tick marks positions. """ SM_DRAW_SECTORS = 2 -""" Different intervals are painted in differend colours (every sector of the circle has its own colour). """ +""" Different intervals are painted in different colours (every sector of the circle has its own colour). """ SM_DRAW_PARTIAL_SECTORS = 4 """ Every interval has its own colour, but only a circle corona is painted near the ticks. """ SM_DRAW_HAND = 8 @@ -455,7 +455,7 @@ class SpeedMeter(BufferedWindow): Window Styles Hex Value Description =========================== =========== ================================================== ``SM_ROTATE_TEXT`` 0x1 Draws the ticks rotated: the ticks are rotated accordingly to the tick marks positions. - ``SM_DRAW_SECTORS`` 0x2 Different intervals are painted in differend colours (every sector of the circle has its own colour). + ``SM_DRAW_SECTORS`` 0x2 Different intervals are painted in different colours (every sector of the circle has its own colour). ``SM_DRAW_PARTIAL_SECTORS`` 0x4 Every interval has its own colour, but only a circle corona is painted near the ticks. ``SM_DRAW_HAND`` 0x8 The hand (arrow indicator) is drawn. ``SM_DRAW_SHADOW`` 0x10 A shadow for the hand is drawn. @@ -592,7 +592,7 @@ class SpeedMeter(BufferedWindow): self.Radius = radius self.Radius = radius - # Get The Angle Of Existance Of The Sector + # Get The Angle Of Existence Of The Sector anglerange = self.GetAngleRange() startangle = anglerange[1] endangle = anglerange[0] @@ -1689,7 +1689,7 @@ class SpeedMeter(BufferedWindow): def DrawExternalArc(self, draw=True): """ - Specify wheter or not you wish to draw the external (thicker) arc. + Specify whether or not you wish to draw the external (thicker) arc. :param `draw`: ``True`` to draw the external arc, ``False`` otherwise. """ diff --git a/wx/lib/agw/supertooltip.py b/wx/lib/agw/supertooltip.py index e5bc2d87..c9f6cbc1 100644 --- a/wx/lib/agw/supertooltip.py +++ b/wx/lib/agw/supertooltip.py @@ -43,8 +43,8 @@ windows, although it is a custom-drawn widget. This class supports: * Blended triple-gradient for the tooltip background; -* Header text and header image, with possibility to set the header font indipendently; -* Footer text and footer image, with possibility to set the footer font indipendently; +* Header text and header image, with possibility to set the header font independently; +* Footer text and footer image, with possibility to set the footer font independently; * Multiline text message in the tooltip body, plus an optional image as "body image"; * Bold lines and hyperlink lines in the tooltip body; * A wide set of predefined drawing styles for the tooltip background; @@ -1258,7 +1258,7 @@ class SuperToolTip(object): def InitFont(self): - """ Initalizes the fonts for :class:`SuperToolTip`. """ + """ Initializes the fonts for :class:`SuperToolTip`. """ self._messageFont = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT) self._headerFont = wx.SystemSettings.GetFont(wx.SYS_DEFAULT_GUI_FONT) diff --git a/wx/lib/agw/thumbnailctrl.py b/wx/lib/agw/thumbnailctrl.py index f31f4102..1dd5e1c8 100644 --- a/wx/lib/agw/thumbnailctrl.py +++ b/wx/lib/agw/thumbnailctrl.py @@ -2515,7 +2515,7 @@ class ScrolledThumbnail(wx.ScrolledWindow): strs = strs + "\n" strs = strs + "Please check your privileges and file permissions." dlg = wx.MessageDialog(self, strs, - 'Error in removing files', + "Error in removing files", wx.OK | wx.ICON_ERROR) dlg.ShowModal() dlg.Destroy() diff --git a/wx/lib/agw/ultimatelistctrl.py b/wx/lib/agw/ultimatelistctrl.py index 7750bb93..509ca455 100644 --- a/wx/lib/agw/ultimatelistctrl.py +++ b/wx/lib/agw/ultimatelistctrl.py @@ -163,7 +163,7 @@ Window Styles Hex Value Description ``ULC_AUTO_CHECK_PARENT`` 0x1000000 Only meaningful foe checkbox-type items: when an item is checked/unchecked its column header item is checked/unchecked as well. ``ULC_SHOW_TOOLTIPS`` 0x2000000 Show tooltips for ellipsized items/subitems (text too long to be shown in the available space) containing the full item/subitem text. ``ULC_HOT_TRACKING`` 0x4000000 Enable hot tracking of items on mouse motion. -``ULC_BORDER_SELECT`` 0x8000000 Changes border colour whan an item is selected, instead of highlighting the item. +``ULC_BORDER_SELECT`` 0x8000000 Changes border colour when an item is selected, instead of highlighting the item. ``ULC_TRACK_SELECT`` 0x10000000 Enables hot-track selection in a list control. Hot track selection means that an item is automatically selected when the cursor remains over the item for a certain period of time. The delay is retrieved on Windows using the `win32api` call `win32gui.SystemParametersInfo(win32con.SPI_GETMOUSEHOVERTIME)`, and is defaulted to 400ms on other platforms. This style applies to all views of `UltimateListCtrl`. ``ULC_HEADER_IN_ALL_VIEWS`` 0x20000000 Show column headers in all view modes. ``ULC_NO_FULL_ROW_SELECT`` 0x40000000 When an item is selected, the only the item in the first column is highlighted. @@ -286,7 +286,7 @@ ULC_AUTO_TOGGLE_CHILD = 0x800000 # only meaningful for checkboxes ULC_AUTO_CHECK_PARENT = 0x1000000 # only meaningful for checkboxes ULC_SHOW_TOOLTIPS = 0x2000000 # shows tooltips on items with ellipsis (...) ULC_HOT_TRACKING = 0x4000000 # enable hot tracking on mouse motion -ULC_BORDER_SELECT = 0x8000000 # changes border colour whan an item is selected, instead of highlighting the item +ULC_BORDER_SELECT = 0x8000000 # changes border colour when an item is selected, instead of highlighting the item ULC_TRACK_SELECT = 0x10000000 # Enables hot-track selection in a list control. Hot track selection means that an item # is automatically selected when the cursor remains over the item for a certain period # of time. The delay is retrieved on Windows using the win32api call @@ -4288,7 +4288,7 @@ class UltimateListLineData(object): # fg colour # don't use foreground colour for drawing highlighted items - this might # make them completely invisible (and there is no way to do bit - # arithmetics on wxColour, unfortunately) + # arithmetic on wxColour, unfortunately) if not self._owner.HasAGWFlag(ULC_BORDER_SELECT) and not self._owner.HasAGWFlag(ULC_NO_FULL_ROW_SELECT): if highlighted: @@ -5991,7 +5991,7 @@ class UltimateListMainWindow(wx.ScrolledWindow): ``ULC_AUTO_CHECK_PARENT`` 0x1000000 Only meaningful foe checkbox-type items: when an item is checked/unchecked its column header item is checked/unchecked as well. ``ULC_SHOW_TOOLTIPS`` 0x2000000 Show tooltips for ellipsized items/subitems (text too long to be shown in the available space) containing the full item/subitem text. ``ULC_HOT_TRACKING`` 0x4000000 Enable hot tracking of items on mouse motion. - ``ULC_BORDER_SELECT`` 0x8000000 Changes border colour whan an item is selected, instead of highlighting the item. + ``ULC_BORDER_SELECT`` 0x8000000 Changes border colour when an item is selected, instead of highlighting the item. ``ULC_TRACK_SELECT`` 0x10000000 Enables hot-track selection in a list control. Hot track selection means that an item is automatically selected when the cursor remains over the item for a certain period of time. The delay is retrieved on Windows using the `win32api` call `win32gui.SystemParametersInfo(win32con.SPI_GETMOUSEHOVERTIME)`, and is defaulted to 400ms on other platforms. This style applies to all views of `UltimateListCtrl`. ``ULC_HEADER_IN_ALL_VIEWS`` 0x20000000 Show column headers in all view modes. ``ULC_NO_FULL_ROW_SELECT`` 0x40000000 When an item is selected, the only the item in the first column is highlighted. @@ -6309,7 +6309,7 @@ class UltimateListMainWindow(wx.ScrolledWindow): # bring the current item into view def MoveToFocus(self): - """ Brings tyhe current item into view. """ + """ Brings the current item into view. """ self.MoveToItem(self._current) @@ -8851,8 +8851,8 @@ class UltimateListMainWindow(wx.ScrolledWindow): if self.HasCurrent() and state == 0 and stateMask & ULC_STATE_FOCUSED: - # unfocus all: only one item can be focussed, so clearing focus for - # all items is simply clearing focus of the focussed item. + # unfocus all: only one item can be focused, so clearing focus for + # all items is simply clearing focus of the focused item. self.SetItemState(self._current, state, stateMask) #(setting focus to all items makes no sense, so it is not handled here.) @@ -10839,7 +10839,7 @@ class UltimateListCtrl(wx.Control): ``ULC_AUTO_CHECK_PARENT`` 0x1000000 Only meaningful foe checkbox-type items: when an item is checked/unchecked its column header item is checked/unchecked as well. ``ULC_SHOW_TOOLTIPS`` 0x2000000 Show tooltips for ellipsized items/subitems (text too long to be shown in the available space) containing the full item/subitem text. ``ULC_HOT_TRACKING`` 0x4000000 Enable hot tracking of items on mouse motion. - ``ULC_BORDER_SELECT`` 0x8000000 Changes border colour whan an item is selected, instead of highlighting the item. + ``ULC_BORDER_SELECT`` 0x8000000 Changes border colour when an item is selected, instead of highlighting the item. ``ULC_TRACK_SELECT`` 0x10000000 Enables hot-track selection in a list control. Hot track selection means that an item is automatically selected when the cursor remains over the item for a certain period of time. The delay is retrieved on Windows using the `win32api` call `win32gui.SystemParametersInfo(win32con.SPI_GETMOUSEHOVERTIME)`, and is defaulted to 400ms on other platforms. This style applies to all views of `UltimateListCtrl`. ``ULC_HEADER_IN_ALL_VIEWS`` 0x20000000 Show column headers in all view modes. ``ULC_NO_FULL_ROW_SELECT`` 0x40000000 When an item is selected, the only the item in the first column is highlighted. @@ -11036,7 +11036,7 @@ class UltimateListCtrl(wx.Control): ``ULC_AUTO_CHECK_PARENT`` 0x1000000 Only meaningful foe checkbox-type items: when an item is checked/unchecked its column header item is checked/unchecked as well. ``ULC_SHOW_TOOLTIPS`` 0x2000000 Show tooltips for ellipsized items/subitems (text too long to be shown in the available space) containing the full item/subitem text. ``ULC_HOT_TRACKING`` 0x4000000 Enable hot tracking of items on mouse motion. - ``ULC_BORDER_SELECT`` 0x8000000 Changes border colour whan an item is selected, instead of highlighting the item. + ``ULC_BORDER_SELECT`` 0x8000000 Changes border colour when an item is selected, instead of highlighting the item. ``ULC_TRACK_SELECT`` 0x10000000 Enables hot-track selection in a list control. Hot track selection means that an item is automatically selected when the cursor remains over the item for a certain period of time. The delay is retrieved on Windows using the `win32api` call `win32gui.SystemParametersInfo(win32con.SPI_GETMOUSEHOVERTIME)`, and is defaulted to 400ms on other platforms. This style applies to all views of `UltimateListCtrl`. ``ULC_HEADER_IN_ALL_VIEWS`` 0x20000000 Show column headers in all view modes. ``ULC_NO_FULL_ROW_SELECT`` 0x40000000 When an item is selected, the only the item in the first column is highlighted. @@ -11123,7 +11123,7 @@ class UltimateListCtrl(wx.Control): ``ULC_AUTO_CHECK_PARENT`` 0x1000000 Only meaningful foe checkbox-type items: when an item is checked/unchecked its column header item is checked/unchecked as well. ``ULC_SHOW_TOOLTIPS`` 0x2000000 Show tooltips for ellipsized items/subitems (text too long to be shown in the available space) containing the full item/subitem text. ``ULC_HOT_TRACKING`` 0x4000000 Enable hot tracking of items on mouse motion. - ``ULC_BORDER_SELECT`` 0x8000000 Changes border colour whan an item is selected, instead of highlighting the item. + ``ULC_BORDER_SELECT`` 0x8000000 Changes border colour when an item is selected, instead of highlighting the item. ``ULC_TRACK_SELECT`` 0x10000000 Enables hot-track selection in a list control. Hot track selection means that an item is automatically selected when the cursor remains over the item for a certain period of time. The delay is retrieved on Windows using the `win32api` call `win32gui.SystemParametersInfo(win32con.SPI_GETMOUSEHOVERTIME)`, and is defaulted to 400ms on other platforms. This style applies to all views of `UltimateListCtrl`. ``ULC_HEADER_IN_ALL_VIEWS`` 0x20000000 Show column headers in all view modes. ``ULC_NO_FULL_ROW_SELECT`` 0x40000000 When an item is selected, the only the item in the first column is highlighted. diff --git a/wx/lib/agw/xlsgrid.py b/wx/lib/agw/xlsgrid.py index b505aebb..59642ed4 100644 --- a/wx/lib/agw/xlsgrid.py +++ b/wx/lib/agw/xlsgrid.py @@ -97,7 +97,7 @@ the following formatting features already implemented: gradient shading inside a cell as `xlrd` doesn't report this information. * Cell borders: support for all the border types and colours exposed by Excel - (left, top, bottom, right and diagonal borders, thin, double, thick, ect... + (left, top, bottom, right and diagonal borders, thin, double, thick, etc... line styles). * Cell text: support for all kind of fonts (except strikethrough, but this is @@ -2069,7 +2069,7 @@ class XLSGrid(gridlib.Grid): class TransientPopup(STT.SuperToolTip): """ - This is a sublass of :class:`SuperToolTip` and it is used to display a + This is a subclass of :class:`SuperToolTip` and it is used to display a "comment-window" on the cells containing a comment (a note). :note: If Mark Hammonds' `pywin32` package is not available, this class is diff --git a/wx/lib/analogclock/analogclock.py b/wx/lib/analogclock/analogclock.py index 7c4b1897..25508a9c 100644 --- a/wx/lib/analogclock/analogclock.py +++ b/wx/lib/analogclock/analogclock.py @@ -496,7 +496,7 @@ class AnalogClock(wx.Window): def SetBackgroundColour(self, colour): - """Overriden base wx.Window method.""" + """Overridden base wx.Window method.""" wx.Window.SetBackgroundColour(self, colour) self.Reset() @@ -504,7 +504,7 @@ class AnalogClock(wx.Window): def SetForegroundColour(self, colour): """ - Overriden base wx.Window method. This method sets a colour for + Overridden base wx.Window method. This method sets a colour for all hands and ticks at once. """ @@ -517,7 +517,7 @@ class AnalogClock(wx.Window): def SetWindowStyle(self, *args, **kwargs): - """Overriden base wx.Window method.""" + """Overridden base wx.Window method.""" size = self.GetSize() self.Freeze() @@ -528,7 +528,7 @@ class AnalogClock(wx.Window): def SetWindowStyleFlag(self, *args, **kwargs): - """Overriden base wx.Window method.""" + """Overridden base wx.Window method.""" self.SetWindowStyle(*args, **kwargs) diff --git a/wx/lib/busy.py b/wx/lib/busy.py index 0f4167ac..49e7a26c 100644 --- a/wx/lib/busy.py +++ b/wx/lib/busy.py @@ -26,7 +26,7 @@ class BusyInfo(object): size) and the background and foreground colors of the message box can be set. - Creating an instace of the class will create and show a window with the + Creating an instance of the class will create and show a window with the given message, and when the instance is deleted then that window will be closed. This class also implements the context manager magic methods, so it can be used with Python's `with` statement, like this:: diff --git a/wx/lib/buttons.py b/wx/lib/buttons.py index 46d1b874..83c8f511 100644 --- a/wx/lib/buttons.py +++ b/wx/lib/buttons.py @@ -535,7 +535,7 @@ class GenButton(wx.Control): colBg = self.GetParent().GetBackgroundColour() brush = wx.Brush(colBg) else: - # this line assumes that a pressed button should be hilighted with + # this line assumes that a pressed button should be highlighted with # a solid colour even if the background is supposed to be transparent brush = wx.Brush(self.faceDnClr) return brush diff --git a/wx/lib/calendar.py b/wx/lib/calendar.py index fe1c4c17..27701a46 100644 --- a/wx/lib/calendar.py +++ b/wx/lib/calendar.py @@ -44,7 +44,7 @@ # 06/02/2004 - Joerg "Adi" Sieker adi@sieker.info # # o Changed color handling, use dictionary instead of members. -# This causes all color changes to be ignored if they manipluate the members directly. +# This causes all color changes to be ignored if they manipulate the members directly. # SetWeekColor and other method color methods were adapted to use the new dictionary. # o Added COLOR_* constants # o Added SetColor method for Calendar class @@ -440,7 +440,7 @@ class CalDraw: date = date + 7 def GetRect(self): - """Get the display rectange list of the day grid.""" + """Get the display rectangle list of the day grid.""" cnt = 0 h = 0 w = 0 @@ -575,12 +575,12 @@ class CalDraw: pen = wx.Pen(MakeColor(self.colors[COLOR_3D_LIGHT]), 1, wx.PENSTYLE_SOLID) DC.SetPen(pen) - # draw the horizontal hilight + # draw the horizontal highlight startPoint = wx.Point(x + 1, y + 1) endPoint = wx.Point(x + width - 1, y + 1) DC.DrawLine(startPoint, endPoint) - # draw the vertical hilight + # draw the vertical highlight startPoint = wx.Point(x + 1, y + 1) endPoint = wx.Point(x + 1, y + height - 2) DC.DrawLine(startPoint, endPoint) @@ -759,7 +759,7 @@ class CalDraw: self.gridy = [] self.x_st = self.cx_st + self.x_mrg - # start postion of draw + # start position of draw self.y_st = self.cy_st + self.y_mrg + self.title_offset x1 = self.x_st @@ -1218,7 +1218,7 @@ class Calendar(wx.Control): Find the clicked area rectangle. :param `mx`: the x position - :param `my`: the y positon + :param `my`: the y position """ for key in self.rg: @@ -1244,10 +1244,10 @@ class Calendar(wx.Control): def SetTextAlign(self, vert, horz): """ - Set the text allignment. + Set the text alignment. - :param `vert`: the vertical allignment - :param `horz`: the horizontal allignment + :param `vert`: the vertical alignment + :param `horz`: the horizontal alignment """ self.num_align_horz = horz diff --git a/wx/lib/colourchooser/canvas.py b/wx/lib/colourchooser/canvas.py index f7367b85..86543142 100644 --- a/wx/lib/colourchooser/canvas.py +++ b/wx/lib/colourchooser/canvas.py @@ -91,7 +91,7 @@ class Canvas(wx.Window): self.SetMaxClientSize(forceClientSize) self.SetMinClientSize(forceClientSize) - # Perform an intial sizing + # Perform an initial sizing self.ReDraw() # Register event handlers @@ -132,7 +132,7 @@ class Canvas(wx.Window): dc.Blit(0, 0, width, height, self.buffer, 0, 0) def GetBoundingRect(self): - """Returns a tuple that contains the co-ordinates of the + """Returns a tuple that contains the coordinates of the top-left and bottom-right corners of the canvas.""" x, y = self.GetPosition() w, h = self.GetSize() diff --git a/wx/lib/combotreebox.py b/wx/lib/combotreebox.py index 5a4c61cc..2bdfb8fc 100644 --- a/wx/lib/combotreebox.py +++ b/wx/lib/combotreebox.py @@ -661,7 +661,7 @@ class BaseComboTreeBox(object): :rtype: integer """ - # Note: We don't need to substract 1 for the hidden root item, + # Note: We don't need to subtract 1 for the hidden root item, # because the TreeCtrl does that for us return self._tree.GetCount() diff --git a/wx/lib/delayedresult.py b/wx/lib/delayedresult.py index e94374bf..df404ffc 100644 --- a/wx/lib/delayedresult.py +++ b/wx/lib/delayedresult.py @@ -86,7 +86,7 @@ class Handler: class Sender: """ Base class for various kinds of senders. A sender sends a result - produced by a worker funtion to a result handler (listener). Note + produced by a worker function to a result handler (listener). Note that each sender can be given a "job id". This can be anything (number, string, id, and object, etc) and is not used, it is simply added as attribute whenever a DelayedResult is created. diff --git a/wx/lib/docview.py b/wx/lib/docview.py index 080f762c..6d3e8d28 100644 --- a/wx/lib/docview.py +++ b/wx/lib/docview.py @@ -320,7 +320,7 @@ class Document(wx.EvtHandler): Calls :meth:`View.Close` and deletes each view. Deleting the final view will implicitly delete the document itself, because the wxView destructor calls RemoveView. This in turn calls :meth:`Document.OnChangedViewList`, - whose default implemention is to save and delete the document if no + whose default implementation is to save and delete the document if no views exist. """ manager = self.GetDocumentManager() @@ -2112,7 +2112,7 @@ class DocManager(wx.EvtHandler): only an approximate method of finding a template for creating a document. - Note this wxPython verson looks for and returns a default template + Note this wxPython version looks for and returns a default template if no specific template is found. """ default = None diff --git a/wx/lib/eventwatcher.py b/wx/lib/eventwatcher.py index da5da315..35772e9d 100644 --- a/wx/lib/eventwatcher.py +++ b/wx/lib/eventwatcher.py @@ -375,7 +375,7 @@ class EventWatcher(wx.Frame): def buildWatchList(self, exclusions): # This is a list of (PyEventBinder, flag) tuples where the flag indicates # whether to bind that event or not. By default all execpt those in - # the _noWatchList wil be set to be watched. + # the _noWatchList will be set to be watched. self._watchedEvents = list() for item in _eventBinders: self._watchedEvents.append( (item, item not in exclusions) ) diff --git a/wx/lib/evtmgr.py b/wx/lib/evtmgr.py index 222f303f..77db9f59 100644 --- a/wx/lib/evtmgr.py +++ b/wx/lib/evtmgr.py @@ -306,7 +306,7 @@ class EventManager: #--------------------------------------------------------------------------- -# From here down is implementaion and support classes, although you may +# From here down is implementation and support classes, although you may # find some of them useful in other contexts. #--------------------------------------------------------------------------- diff --git a/wx/lib/expando.py b/wx/lib/expando.py index 888fb5c4..6c664ad0 100644 --- a/wx/lib/expando.py +++ b/wx/lib/expando.py @@ -22,7 +22,7 @@ Description =========== The :class:`ExpandoTextCtrl` is a multi-line :class:`TextCtrl` that will -adjust its height on the fly as needed to accomodate the number of +adjust its height on the fly as needed to accommodate the number of lines needed to display the current content of the control. It is assumed that the width of the control will be a fixed value and that only the height will be adjusted automatically. If the @@ -121,7 +121,7 @@ EVT_ETC_LAYOUT_NEEDED = wx.PyEventBinder(wxEVT_ETC_LAYOUT_NEEDED, 1) class ExpandoTextCtrl(wx.TextCtrl): """ The ExpandoTextCtrl is a multi-line wx.TextCtrl that will - adjust its height on the fly as needed to accomodate the number of + adjust its height on the fly as needed to accommodate the number of lines needed to display the current content of the control. It is assumed that the width of the control will be a fixed value and that only the height will be adjusted automatically. If the diff --git a/wx/lib/fancytext.py b/wx/lib/fancytext.py index 921cfe81..ee78f2a6 100644 --- a/wx/lib/fancytext.py +++ b/wx/lib/fancytext.py @@ -393,7 +393,7 @@ def GetFullExtent(str, dc=None, enclose=True): def RenderToBitmap(str, background=None, enclose=1): - "Return str rendered on a minumum size bitmap" + "Return str rendered on a minimum size bitmap" dc = wx.MemoryDC() # Chicken and egg problem, we need a bitmap in the DC in order to # measure how big the bitmap should be... diff --git a/wx/lib/floatcanvas/FCObjects.py b/wx/lib/floatcanvas/FCObjects.py index 58becd38..134c7b4f 100644 --- a/wx/lib/floatcanvas/FCObjects.py +++ b/wx/lib/floatcanvas/FCObjects.py @@ -461,7 +461,7 @@ class ColorOnlyMixin: self.SetPen(Color,"Solid",1) self.SetBrush(Color,"Solid") - SetFillColor = SetColor # Just to provide a consistant interface + SetFillColor = SetColor # Just to provide a consistent interface class LineOnlyMixin: @@ -847,7 +847,7 @@ class Arrow(XYObjectMixin, LineOnlyMixin, DrawObject): def SetLengthDirection(self, Length, Direction): """ - Set the lenght and direction + Set the length and direction :param integer `Length`: length of arrow in pixels :param integer `Direction`: angle of arrow in degrees, zero is straight @@ -996,7 +996,7 @@ class PointSet(PointsObjectMixin, ColorOnlyMixin, DrawObject): Each point will be drawn the same color and Diameter. The Diameter is in screen pixels, not world coordinates. - The hit-test code does not distingish between the points, you will + The hit-test code does not distinguish between the points, you will only know that one of the points got hit, not which one. You can use PointSet.FindClosestPoint(WorldPoint) to find out which one @@ -1559,11 +1559,11 @@ class Text(TextObjectMixin, DrawObject): class ScaledText(TextObjectMixin, DrawObject): """ - ##fixme: this can be depricated and jsut use ScaledTextBox with different defaults. + ##fixme: this can be deprecated and just use ScaledTextBox with different defaults. This class creates a text object that is scaled when zoomed. It is placed at the coordinates, x,y. the "Position" argument is a two - charactor string, indicating where in relation to the coordinates + character string, indicating where in relation to the coordinates the string should be oriented. The first letter is: t, c, or b, for top, center and bottom The @@ -1600,7 +1600,7 @@ class ScaledText(TextObjectMixin, DrawObject): Bugs/Limitations: As fonts are scaled, the do end up a little different, so you don't - get exactly the same picture as you scale up and doen, but it's + get exactly the same picture as you scale up and down, but it's pretty darn close. On wxGTK1 on my Linux system, at least, using a font of over about @@ -1710,7 +1710,7 @@ class ScaledText(TextObjectMixin, DrawObject): else: dc.SetBackgroundMode(wx.TRANSPARENT) (w,h) = dc.GetTextExtent(self.String) - # compute the shift, and adjust the coordinates, if neccesary + # compute the shift, and adjust the coordinates, if necessary # This had to be put in here, because it changes with Zoom, as # fonts don't scale exactly. xy = self.ShiftFun(X, Y, w, h) @@ -2589,7 +2589,7 @@ class PieChart(XYObjectMixin, LineOnlyMixin, DrawObject): Default class constructor. :param `XY`: The (x,y) coords of the center of the chart - :param `Diameter`: The diamter of the chart in worls coords, unless you + :param `Diameter`: The diamter of the chart in world coords, unless you set "Scaled" to False, in which case it's in pixel coords. :param `Values`: sequence of values you want to make the chart of. :param `FillColors`: sequence of colors you want the slices. If diff --git a/wx/lib/floatcanvas/FloatCanvas.py b/wx/lib/floatcanvas/FloatCanvas.py index 5c5ac104..46ec1e6b 100644 --- a/wx/lib/floatcanvas/FloatCanvas.py +++ b/wx/lib/floatcanvas/FloatCanvas.py @@ -280,7 +280,7 @@ class FloatCanvas(wx.Panel): self.SetCursor(self.GUIMode.Cursor) def MakeHitDict(self): - """Initialize the Hit dictonary.""" + """Initialize the Hit dictionary.""" ##fixme: Should this just be None if nothing has been bound? self.HitDict = {EVT_FC_LEFT_DOWN: {}, EVT_FC_LEFT_UP: {}, @@ -531,9 +531,9 @@ class FloatCanvas(wx.Panel): depth=self.HitTestBitmapDepth) def MakeNewForegroundHTBitmap(self): - ## Note: the foreground and backround HT bitmaps are in separate functions + ## Note: the foreground and background HT bitmaps are in separate functions ## so that they can be created separate --i.e. when a foreground is - ## added after the backgound is drawn + ## added after the background is drawn """ Off screen Bitmap used for Hit tests on foreground objects @@ -553,7 +553,7 @@ class FloatCanvas(wx.Panel): self.Draw() def InitializePanel(self): - """Intialize the panel.""" + """Initialize the panel.""" PanelSize = N.array(self.GetClientSize(), N.int32) self.PanelSize = N.maximum(PanelSize, (2,2)) ## OS-X sometimes gives a Size event when the panel is size (0,0) self.HalfPanelSize = self.PanelSize / 2 # lrk: added for speed in WorldToPixel diff --git a/wx/lib/floatcanvas/ScreenShot.py b/wx/lib/floatcanvas/ScreenShot.py index e26d856a..ed4be4bd 100644 --- a/wx/lib/floatcanvas/ScreenShot.py +++ b/wx/lib/floatcanvas/ScreenShot.py @@ -928,7 +928,7 @@ Y\xac\'h\xe5\xb6~\x01\x00\x02Z\xb72\xed[\x95"\x9e\x98\xdf\xb5\xf0.\xc1\xf5\ \x99\x1c\xfb\x8e\x85\xd4\xfb\x83\x8dP\xcfp\x86\xed\x0bB\xa0\xb4\xfc\xe7J\xbc\ \xfb#\x16\xe6\xb6r\xe8{i#@L\xbc\x01``\x80~\xfe\x10\x01\x1dl\x87jd\x19\x1fJ\ \xc2\xcd\xf4\xff`\xf63\xb2]\xe5;k\xe5\xcdv\xc9vF\xb5\x05\xceE\xeb\xa5-r\xb2\ -\xb5\x12\x9e\xcaVA\x17\x1a\x00\x04-n\x0cL\xdd\x0b\xfb\xde:IIF!\x81\xe2\x0f\ +\xb5\x12\x9e\xcaVA\x17\x1a\x00\x04-n\x0cL\xdd\x0b\xfb\xde:IF!\x81\xe2\x0f\ \x04\xa9\x917G2\xc5P\x9a\x10B67\x82f7H\xb3\x0f\xa4\xde\x0fR\x1f\x00\xa5\r\ \xd1\x0f\x18\r\xc0X\x8a\xc3Q!L*R\xa7\xa7\x91&\xaf\xe0\xfa\x90\xd9\x03_\xb1@#\ \x8b\xc3\xaf\x82\x9a;\x19\x00\x90{\xf8\x00\x06\x03\xfc\xdf\x81\xdb\xe8\x12t\ diff --git a/wx/lib/floatcanvas/__init__.py b/wx/lib/floatcanvas/__init__.py index f439fc2f..a8a13395 100644 --- a/wx/lib/floatcanvas/__init__.py +++ b/wx/lib/floatcanvas/__init__.py @@ -53,7 +53,7 @@ Bugs and Limitations: Lots: patches, fixes welcome For Map drawing: It ignores the fact that the world is, in fact, a sphere, so it will do strange things if you are looking at stuff near the poles or the date line. so far I don't have a need to do that, so I -havn't bothered to add any checks for that yet. +haven't bothered to add any checks for that yet. Zooming: I have set no zoom limits. What this means is that if you zoom in really far, you can get integer overflows, and get weird results. It diff --git a/wx/lib/gestures.py b/wx/lib/gestures.py index d24671b6..e394802a 100644 --- a/wx/lib/gestures.py +++ b/wx/lib/gestures.py @@ -28,7 +28,7 @@ and set the pop up as the parent). Start() starts recording mouse movement. End() stops the recording, compiles all the gestures into a list, and looks through the registered gestures to find a match. -The first matchs associated action is then run. +The first matches associated action is then run. The marginoferror is how much to forgive when calculating movement: If the margin is 25, then movement less than 25 pixels will not be detected. @@ -148,7 +148,7 @@ class MouseGestures: and creates the mouse gesture, returns the result as a string.''' self.recording = False - #Figure out the gestures (Look for occurances of 5 in a row or more): + #Figure out the gestures (Look for occurrences of 5 in a row or more): tempstring = '0' possiblechange = '0' diff --git a/wx/lib/graphics.py b/wx/lib/graphics.py index eee48746..f57f016f 100644 --- a/wx/lib/graphics.py +++ b/wx/lib/graphics.py @@ -1326,7 +1326,7 @@ class GraphicsContext(GraphicsObject): def CreatePath(self): """ - Create a new path obejct. + Create a new path object. """ return GraphicsPath() @@ -1754,7 +1754,7 @@ class GraphicsContext(GraphicsObject): def DrawEllipse(self, x, y, w, h): """ - Stroke and fill an elipse that fits in the given rectangle, + Stroke and fill an ellipse that fits in the given rectangle, using the current pen and current brush. """ path = GraphicsPath() diff --git a/wx/lib/imagebrowser.py b/wx/lib/imagebrowser.py index 795e90dc..511df583 100644 --- a/wx/lib/imagebrowser.py +++ b/wx/lib/imagebrowser.py @@ -595,7 +595,7 @@ class ImageDialog(wx.Dialog): if self.fl_ext == "All": all_files = [] - if self.fl_types[-1] == 'All Files': + if self.fl_types[-1] == "All Files": allTypes = self.fl_types[-1:] else: allTypes = self.fl_types[1:] diff --git a/wx/lib/infoframe.py b/wx/lib/infoframe.py index f5108004..b15cd14d 100644 --- a/wx/lib/infoframe.py +++ b/wx/lib/infoframe.py @@ -8,7 +8,7 @@ infoframe.py Released under wxWindows license etc. -This is a fairly rudimentary, but slightly fancier tha +This is a fairly rudimentary, but slightly fancier than wxPyOnDemandOutputWindow (on which it's based; thanks Robin), version of the same sort of thing: a file-like class called wxInformationalMessagesFrame. This window also has a status bar with a @@ -256,7 +256,7 @@ class PyInformationalMessagesFrame(object): def write(self, string): if not wx.Thread_IsMain(): - # Aquire the GUI mutex before making GUI calls. Mutex is released + # Acquire the GUI mutex before making GUI calls. Mutex is released # when locker is deleted at the end of this function. # # TODO: This should be updated to use wx.CallAfter similarly to how diff --git a/wx/lib/inspection.py b/wx/lib/inspection.py index d435c946..820c0cfa 100644 --- a/wx/lib/inspection.py +++ b/wx/lib/inspection.py @@ -88,7 +88,7 @@ class InspectionTool: def Show(self, selectObj=None, refreshTree=False): """ Creates the inspection frame if it hasn't been already, and - raises it if neccessary. + raises it if necessary. :param `selectObj`: Pass a widget or sizer to have that object be preselected in widget tree. @@ -1052,7 +1052,7 @@ class _InspectionHighlighter(object): def FlickerTLW(self, tlw): """ - Use a timer to alternate a TLW between shown and hidded state a + Use a timer to alternate a TLW between shown and hidden state a few times. Use to highlight a TLW since drawing and clearing an outline is trickier. """ diff --git a/wx/lib/layoutf.py b/wx/lib/layoutf.py index a046af90..5cfaf0c3 100644 --- a/wx/lib/layoutf.py +++ b/wx/lib/layoutf.py @@ -14,7 +14,7 @@ import wx class Layoutf(wx.LayoutConstraints): """ The class Layoutf(wxLayoutConstraints) presents a simplification - of the wxLayoutConstraints syntax. The name Layoutf is choosen + of the wxLayoutConstraints syntax. The name Layoutf is chosen because of the similarity with C's printf function. Quick Example:: @@ -105,7 +105,7 @@ class Layoutf(wx.LayoutConstraints): Note that these are the same letters as used for , so you'll only need to remember one set. Finally, the object - whose attribute is refered to, is specified by #, where is the 1-based (stupid, I know, but I've gotten used to it) index of the object in the objects_tuple argument. diff --git a/wx/lib/masked/ipaddrctrl.py b/wx/lib/masked/ipaddrctrl.py index 14e6c0fa..4eaaa938 100644 --- a/wx/lib/masked/ipaddrctrl.py +++ b/wx/lib/masked/ipaddrctrl.py @@ -155,7 +155,7 @@ class IpAddrCtrl( BaseMaskedTextCtrl, IpAddrCtrlAccessorsMixin ): if not event.ShiftDown(): if pos > edit_start and pos < edit_end: # clip data in field to the right of pos, if adjusting fields - # when not at delimeter; (assumption == they hit '.') + # when not at delimiter; (assumption == they hit '.') newvalue = oldvalue[:pos] + ' ' * (edit_end - pos) + oldvalue[edit_end:] self._SetValue(newvalue) self._SetInsertionPoint(pos) diff --git a/wx/lib/masked/maskededit.py b/wx/lib/masked/maskededit.py index 648403bb..7d36f942 100644 --- a/wx/lib/masked/maskededit.py +++ b/wx/lib/masked/maskededit.py @@ -235,7 +235,7 @@ formatcodes 0 integer fields get leading zeros D Date[/time] field T Time field - F Auto-Fit: the control calulates its size from + F Auto-Fit: the control calculates its size from the length of the template mask V validate entered chars against validRegex before allowing them to be entered vs. being allowed by basic mask and then having @@ -993,7 +993,7 @@ masktags = { 'excludeChars': am_pm_exclude, 'formatcodes': 'DF!', 'validRegex': '^' + months + '-' + days + '-' + '\d{4} ' + hours + ':' + minutes + ':' + seconds + ' (A|P)M', - 'description': "US Date + Time\n(w/hypens)" + 'description': "US Date + Time\n(w/hyphens)" }, "USDATE24HRTIMEMMDDYYYY/HHMMSS": { 'mask': "##/##/#### ##:##:##", @@ -1005,7 +1005,7 @@ masktags = { 'mask': "##-##-#### ##:##:##", 'formatcodes': 'DF', 'validRegex': '^' + months + '-' + days + '-' + '\d{4} ' + milhours + ':' + minutes + ':' + seconds, - 'description': "US Date + 24Hr Time\n(w/hypens)" + 'description': "US Date + 24Hr Time\n(w/hyphens)" }, "USDATETIMEMMDDYYYY/HHMM": { 'mask': "##/##/#### ##:## AM", @@ -1025,7 +1025,7 @@ masktags = { 'excludeChars': am_pm_exclude, 'formatcodes': 'DF!', 'validRegex': '^' + months + '-' + days + '-' + '\d{4} ' + hours + ':' + minutes + ' (A|P)M', - 'description': "US Date + Time\n(w/hypens and w/o secs)" + 'description': "US Date + Time\n(w/hyphens and w/o secs)" }, "USDATE24HRTIMEMMDDYYYY-HHMM": { 'mask': "##-##-#### ##:##", @@ -1316,7 +1316,7 @@ class Field: 'choiceRequired': False, ## If choices supplied this specifies if valid value must be in the list 'compareNoCase': False, ## Optional flag to indicate whether or not to use case-insensitive list search 'autoSelect': False, ## Set to True to try auto-completion on each keystroke: - 'validFunc': None, ## Optional function for defining additional, possibly dynamic validation constraints on contrl + 'validFunc': None, ## Optional function for defining additional, possibly dynamic validation constraints on control 'validRequired': False, ## Set to True to disallow input that results in an invalid value 'emptyInvalid': False, ## Set to True to make EMPTY = INVALID 'description': "", ## primarily for autoformats, but could be useful elsewhere @@ -4180,7 +4180,7 @@ class MaskedEditMixin: self._SetValue(newvalue) self._SetInsertionPoint(min(edit_end, len(newvalue.rstrip()))) self._OnAutoSelect(field, match_index) - self._CheckValid() # recolor as appopriate + self._CheckValid() # recolor as appropriate if keycode in (wx.WXK_UP, wx.WXK_DOWN, wx.WXK_LEFT, wx.WXK_RIGHT, @@ -4774,7 +4774,7 @@ class MaskedEditMixin: def _applyFormatting(self): """ Apply formatting depending on the control's state. Need to find a way to call this whenever the value changes, in case the control's - value has been changed or set programatically. + value has been changed or set programmatically. """ ## dbg(suspend=1) ## dbg('MaskedEditMixin::_applyFormatting', indent=1) @@ -5591,7 +5591,7 @@ class MaskedEditMixin: The trouble is that, a priori, there's no explicit notification of why the focus event we received. However, the whole reason we need to - do this is because the default behavior on TAB traveral in a wx.TextCtrl is + do this is because the default behavior on TAB traversal in a wx.TextCtrl is now to select the entire contents of the window, something we don't want. So we can *now* test the selection range, and if it's "the whole text" we can assume the cause, change the insertion point to the start of @@ -7041,7 +7041,7 @@ __i=0 ## ## Version 1.0 ## 1. Decimal point behavior restored for decimal and integer type controls: -## decimal point now trucates the portion > 0. +## decimal point now truncates the portion > 0. ## 2. Return key now works like the tab character and moves to the next field, ## provided no default button is set for the form panel on which the control ## resides. @@ -7227,7 +7227,7 @@ __i=0 ## 5. Decimal values now collapse to decimal with '.00' on losefocus if the user never ## presses the decimal point. ## 6. Cursor now goes to the beginning of the field if the user clicks in an -## "empty" field intead of leaving the insertion point in the middle of the +## "empty" field instead of leaving the insertion point in the middle of the ## field. ## 7. New "N" mask type includes upper and lower chars plus digits. a-zA-Z0-9. ## 8. New formatcodes init parameter replaces other init params and adds functions. diff --git a/wx/lib/masked/numctrl.py b/wx/lib/masked/numctrl.py index 32d7e1d1..67764b25 100644 --- a/wx/lib/masked/numctrl.py +++ b/wx/lib/masked/numctrl.py @@ -929,7 +929,7 @@ class NumCtrl(BaseMaskedTextCtrl, NumCtrlAccessorsMixin): def _GetNumValue(self, value): """ This function attempts to "clean up" a text value, providing a regularized - convertable string, via atol() or atof(), for any well-formed numeric text value. + convertible string, via atol() or atof(), for any well-formed numeric text value. """ return value.replace(self._groupChar, '').replace(self._decimalChar, '.').replace('(', '-').replace(')','').strip() @@ -1012,7 +1012,7 @@ class NumCtrl(BaseMaskedTextCtrl, NumCtrlAccessorsMixin): def _SetValue(self, value): """ This routine supersedes the base masked control _SetValue(). It is - needed to ensure that the value of the control is always representable/convertable + needed to ensure that the value of the control is always representable/convertible to a numeric return value (via GetValue().) This routine also handles automatic adjustment and grouping of the value without explicit intervention by the user. @@ -1369,7 +1369,7 @@ class NumCtrl(BaseMaskedTextCtrl, NumCtrlAccessorsMixin): If min > the max value allowed by the width of the control, the function will return False, and the min will not be set. - :param `min`: Minium value for the control + :param `min`: Minimum value for the control :type `min`: integer or None """ @@ -1410,7 +1410,7 @@ class NumCtrl(BaseMaskedTextCtrl, NumCtrlAccessorsMixin): If max > the max value allowed by the width of the control, the function will return False, and the max will not be set. - :param `max`: Minium value for the control + :param `max`: Minimum value for the control :type `max`: integer or None """ @@ -1443,9 +1443,9 @@ class NumCtrl(BaseMaskedTextCtrl, NumCtrlAccessorsMixin): .. note:: leaving out an argument will remove the corresponding bound. - :param `min`: Minium value for the control + :param `min`: Minimum value for the control :type `min`: integer or None - :param `max`: Minium value for the control + :param `max`: Minimum value for the control :type `max`: integer or None """ diff --git a/wx/lib/masked/textctrl.py b/wx/lib/masked/textctrl.py index 1c93625e..e6c6f54d 100644 --- a/wx/lib/masked/textctrl.py +++ b/wx/lib/masked/textctrl.py @@ -212,7 +212,7 @@ class BaseMaskedTextCtrl( wx.TextCtrl, MaskedEditMixin ): def ChangeValue(self, value): """ - Provided to accomodate similar functionality added to base + Provided to accommodate similar functionality added to base control in wxPython 2.7.1.1. :param string `value`: new value for control, this will not fire an event @@ -298,7 +298,7 @@ class BaseMaskedTextCtrl( wx.TextCtrl, MaskedEditMixin ): """ Set the font, then recalculate control size, if appropriate. - see :meth:`TextCtrl.SetFont` for valid arguements + see :meth:`TextCtrl.SetFont` for valid arguments """ wx.TextCtrl.SetFont(self, *args, **kwargs) if self._autofit: diff --git a/wx/lib/masked/timectrl.py b/wx/lib/masked/timectrl.py index 3feb50b3..4c04ceb4 100644 --- a/wx/lib/masked/timectrl.py +++ b/wx/lib/masked/timectrl.py @@ -414,7 +414,7 @@ class TimeCtrl(BaseMaskedTextCtrl): max = self.__max limited = self.__limited self.__posCurrent = 0 - # handle deprecated keword argument name: + # handle deprecated keyword argument name: if 'display_seconds' in kwargs: kwargs['displaySeconds'] = kwargs['display_seconds'] del kwargs['display_seconds'] @@ -851,7 +851,7 @@ class TimeCtrl(BaseMaskedTextCtrl): adjusted to the new minimum value; if not limited, the value in the control will be colored as invalid. - :param `min`: Minium value for the control + :param `min`: Minimum value for the control :type `min`: integer or None """ @@ -915,7 +915,7 @@ class TimeCtrl(BaseMaskedTextCtrl): adjusted to this maximum value; if not limited, the value in the control will be colored as invalid. - :param `max`: Minium value for the control + :param `max`: Minimum value for the control :type `max`: integer or None """ @@ -975,9 +975,9 @@ class TimeCtrl(BaseMaskedTextCtrl): .. note:: Leaving out an argument will remove the corresponding bound. - :param `min`: Minium value for the control + :param `min`: Minimum value for the control :type `min`: integer or None - :param `max`: Minium value for the control + :param `max`: Minimum value for the control :type `max`: integer or None """ diff --git a/wx/lib/mixins/inspection.py b/wx/lib/mixins/inspection.py index 3fdc1f03..3a87c32f 100644 --- a/wx/lib/mixins/inspection.py +++ b/wx/lib/mixins/inspection.py @@ -160,7 +160,7 @@ class InspectionMixin(object): def ShowInspectionTool(self): """ - Show the Inspection tool, creating it if neccesary, setting it + Show the Inspection tool, creating it if necessary, setting it to display the widget under the cursor. """ # get the current widget under the mouse diff --git a/wx/lib/mixins/listctrl.py b/wx/lib/mixins/listctrl.py index 95ac8fbe..4fe525d4 100644 --- a/wx/lib/mixins/listctrl.py +++ b/wx/lib/mixins/listctrl.py @@ -47,7 +47,7 @@ class ColumnSorterMixin: A mixin class that handles sorting of a wx.ListCtrl in REPORT mode when the column header is clicked on. - There are a few requirments needed in order for this to work genericly: + There are a few requirements needed in order for this to work genericly: 1. The combined class must have a GetListCtrl method that returns the wx.ListCtrl to be sorted, and the list control @@ -106,7 +106,7 @@ class ColumnSorterMixin: Returns a tuple of image list indexesthe indexes in the image list for an image to be put on the column header when sorting in descending order. """ - return (-1, -1) # (decending, ascending) image IDs + return (-1, -1) # (descending, ascending) image IDs def GetColumnSorter(self): @@ -584,7 +584,7 @@ class TextEditMixin: # don't start scrolling unless we really need to offset = x0+x1-self.GetSize()[0]-scrolloffset # scroll a bit more than what is minimum required - # so we don't have to scroll everytime the user presses TAB + # so we don't have to scroll every time the user presses TAB # which is very tireing to the eye addoffset = self.GetSize()[0]/4 # but be careful at the end of the list @@ -642,7 +642,7 @@ class TextEditMixin: ret = self.GetEventHandler().ProcessEvent(evt) if not ret or evt.IsAllowed(): if self.IsVirtual(): - # replace by whather you use to populate the virtual ListCtrl + # replace by whether you use to populate the virtual ListCtrl # data source self.SetVirtualData(self.curRow, self.curCol, text) else: diff --git a/wx/lib/mixins/rubberband.py b/wx/lib/mixins/rubberband.py index c3f0ad78..32198c77 100644 --- a/wx/lib/mixins/rubberband.py +++ b/wx/lib/mixins/rubberband.py @@ -27,12 +27,12 @@ import wx # Some miscellaneous mathematical and geometrical functions # -def isNegative(aNumber): +def isNegative(a number): """ x < 0: 1 else: 0 """ - return aNumber < 0 + return a number < 0 def normalizeBox(box): @@ -53,7 +53,7 @@ def normalizeBox(box): def boxToExtent(box): """ Convert a box specification to an extent specification. - I put this into a seperate function after I realized that + I put this into a separate function after I realized that I had been implementing it wrong in several places. """ b = normalizeBox(box) @@ -74,7 +74,7 @@ def pointOnBox(x, y, box, thickness=1): of the box. The thickness defines how thick the edge should be. This is necessary for HCI reasons: For example, it's normally very difficult for a user - to manuever the mouse onto a one pixel border. + to maneuver the mouse onto a one pixel border. """ outerBox = box innerBox = (box[0]+thickness, box[1]+thickness, box[2]-(thickness*2), box[3]-(thickness*2)) diff --git a/wx/lib/mixins/treemixin.py b/wx/lib/mixins/treemixin.py index d6680c68..3aca5693 100644 --- a/wx/lib/mixins/treemixin.py +++ b/wx/lib/mixins/treemixin.py @@ -108,7 +108,7 @@ class TreeAPIHarmonizer(object): def GetItemImage(self, item, which=wx.TreeItemIcon_Normal, column=-1): # CustomTreeCtrl always wants the which argument, so provide it # TreeListCtr.GetItemImage has a different order of arguments than - # the other tree controls. Hide the differenes. + # the other tree controls. Hide the differences. if self.GetColumnCount(): args = (item, column, which) else: diff --git a/wx/lib/ogl/__init__.py b/wx/lib/ogl/__init__.py index e4112462..81a2fe4c 100644 --- a/wx/lib/ogl/__init__.py +++ b/wx/lib/ogl/__init__.py @@ -9,5 +9,5 @@ from .canvas import * from .lines import * from .bmpshape import * from .divided import * -from .composit import * +from .composite import * from .drawn import * diff --git a/wx/lib/ogl/basic.py b/wx/lib/ogl/basic.py index 52655709..0f68a94a 100644 --- a/wx/lib/ogl/basic.py +++ b/wx/lib/ogl/basic.py @@ -305,7 +305,7 @@ class Shape(ShapeEvtHandler): The :class:`Shape` is the top-level, abstract object that all other objects are derived from. All common functionality is represented by :class:`Shape` - members, and overriden members that appear in derived classes and have + members, and overridden members that appear in derived classes and have behaviour as documented for :class:`Shape`, are not documented separately. """ GraphicsInSizeToContents = False @@ -703,7 +703,7 @@ class Shape(ShapeEvtHandler): actualW = w actualH = h # Don't try to resize an object with more than one image (this - # case should be dealt with by overriden handlers) + # case should be dealt with by overridden handlers) if (region.GetFormatMode() & FORMAT_SIZE_TO_CONTENTS) and \ len(region.GetFormattedText()) and \ len(self._regions) == 1 and \ @@ -1901,7 +1901,7 @@ class Shape(ShapeEvtHandler): Assuming the attachment lies along a vertical or horizontal line, calculate the position on that point. - :param `pt1`: The first point of the line repesenting the edge of + :param `pt1`: The first point of the line representing the edge of the shape :param `pt2`: The second point of the line representing the edge of the shape @@ -2839,9 +2839,9 @@ class RectangleShape(Shape): def SetHeight(self, h): """ - Set the heigth. + Set the height. - :param `h`: heigth to be set + :param `h`: height to be set """ self._height = h @@ -3645,7 +3645,7 @@ class ShapeRegion(object): def SetMinSize(self, w, h): """ - Set the minumum size. + Set the minimum size. :param `w`: the minimum width :Param `h`: the minimum height @@ -3986,4 +3986,4 @@ class PolygonControlPoint(ControlPoint): from .canvas import * from .lines import * -from .composit import * +from .composite import * diff --git a/wx/lib/ogl/bmpshape.py b/wx/lib/ogl/bmpshape.py index ee285952..a75d45e4 100644 --- a/wx/lib/ogl/bmpshape.py +++ b/wx/lib/ogl/bmpshape.py @@ -39,7 +39,7 @@ class BitmapShape(RectangleShape): Set the size. :param `w`: the width - :param `h`: the heigth + :param `h`: the height :param `recursive`: not used """ diff --git a/wx/lib/ogl/canvas.py b/wx/lib/ogl/canvas.py index add5a9a5..b7c828ec 100644 --- a/wx/lib/ogl/canvas.py +++ b/wx/lib/ogl/canvas.py @@ -15,7 +15,7 @@ The :class:`~lib.ogl.canvas.ShapeCanvas` class. """ import wx from .lines import LineShape -from .composit import * +from .composite import * from .oglmisc import * NoDragging, StartDraggingLeft, ContinueDraggingLeft, StartDraggingRight, ContinueDraggingRight = 0, 1, 2, 3, 4 diff --git a/wx/lib/ogl/composit.py b/wx/lib/ogl/composit.py index 8eb25831..2b27146c 100644 --- a/wx/lib/ogl/composit.py +++ b/wx/lib/ogl/composit.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- #---------------------------------------------------------------------------- -# Name: composit.py +# Name: composite.py # Purpose: Composite class # # Author: Pierre Hjälm (from C++ original by Julian Smart) @@ -11,7 +11,7 @@ # Tags: phoenix-port, unittest, py3-port, documented #---------------------------------------------------------------------------- """ -The :class:`~lib.ogl.composit.CompositeShape` class. +The :class:`~lib.ogl.composite.CompositeShape` class. """ import sys import wx @@ -48,7 +48,7 @@ class ConstraintType(object): """ Default class constructor. - :param `theType`: one of the folowing + :param `theType`: one of the following ====================================== ================================ Constraint type Description ====================================== ================================ @@ -542,7 +542,7 @@ class CompositeShape(RectangleShape): Set the size. :param `w`: the width - :param `h`: the heigth + :param `h`: the height :param `recursive`: size the children recursively """ @@ -689,7 +689,7 @@ class CompositeShape(RectangleShape): :returns: None or a tuple of the constraint and the actual composite the constraint was in, in case that composite was a descendant of - this composit. + this composite. """ for constraint in self._constraints: @@ -765,7 +765,7 @@ class CompositeShape(RectangleShape): """ Constrain the children. - :returns: True if constained otherwise False + :returns: True if constrained otherwise False """ self.CalculateSize() @@ -820,7 +820,7 @@ class CompositeShape(RectangleShape): """ Check if division is descendant. - :param `division`: divison to check + :param `division`: division to check :returns: `True` if division is a descendant of this container. """ @@ -849,7 +849,7 @@ DIVISION_SIDE_RIGHT =3 DIVISION_SIDE_BOTTOM =4 originalX = 0.0 -originalY = 0.0 +originally = 0.0 originalW = 0.0 originalH = 0.0 @@ -865,10 +865,10 @@ class DivisionControlPoint(ControlPoint): ControlPoint.OnDragLeft(self, draw, x, y, keys, attachment) def OnBeginDragLeft(self, x, y, keys = 0, attachment = 0): - global originalX, originalY, originalW, originalH + global originalX, originally, originalW, originalH originalX = self._shape.GetX() - originalY = self._shape.GetY() + originally = self._shape.GetY() originalW = self._shape.GetWidth() originalH = self._shape.GetHeight() @@ -930,7 +930,7 @@ class DivisionControlPoint(ControlPoint): if not success: division.SetSize(originalW, originalH) - division.Move(dc, originalX, originalY) + division.Move(dc, originalX, originally) divisionParent.Draw(dc) division.GetEventHandler().OnDrawControlPoints(dc) @@ -1143,7 +1143,7 @@ class DivisionShape(CompositeShape): #dc.DrawRectangle(x1, y1, self.GetWidth(), self.GetHeight()) def OnDrawContents(self, dc): - """The draw contens handler.""" + """The draw contents handler.""" CompositeShape.OnDrawContents(self, dc) def OnMovePre(self, dc, x, y, oldx, oldy, display = True): @@ -1210,7 +1210,7 @@ class DivisionShape(CompositeShape): Set the size. :param `w`: the width - :param `h`: the heigth + :param `h`: the height :param `recursive`: `True` recurse all children """ diff --git a/wx/lib/ogl/divided.py b/wx/lib/ogl/divided.py index 3683283f..0f5a0d62 100644 --- a/wx/lib/ogl/divided.py +++ b/wx/lib/ogl/divided.py @@ -107,7 +107,7 @@ class DividedShapeControlPoint(ControlPoint): # Find the old top and bottom of this region, # and calculate the new proportion for this region # if legal. - currentY = dividedObject.GetY() - dividedObject.GetHeight() / 2.0 + currently = dividedObject.GetY() - dividedObject.GetHeight() / 2.0 maxY = dividedObject.GetY() + dividedObject.GetHeight() / 2.0 # Save values @@ -117,18 +117,18 @@ class DividedShapeControlPoint(ControlPoint): for i in range(len(dividedObject.GetRegions())): region = dividedObject.GetRegions()[i] proportion = region._regionProportionY - yy = currentY + dividedObject.GetHeight() * proportion - actualY = min(maxY, yy) + yy = currently + dividedObject.GetHeight() * proportion + actually = min(maxY, yy) if region == thisRegion: - thisRegionTop = currentY + thisRegionTop = currently if i + 1 < len(dividedObject.GetRegions()): nextRegion = dividedObject.GetRegions()[i + 1] if region == nextRegion: - nextRegionBottom = actualY + nextRegionBottom = actually - currentY = actualY + currently = actually if not nextRegion: return @@ -170,7 +170,7 @@ class DividedShape(RectangleShape): Default class constructor. :param `w`: width of rectangle - :param `h`: heigth of rectangle + :param `h`: height of rectangle """ RectangleShape.__init__(self, w, h) @@ -186,7 +186,7 @@ class DividedShape(RectangleShape): defaultProportion = 1.0 / len(self.GetRegions()) else: defaultProportion = 0.0 - currentY = self._ypos - self._height / 2.0 + currently = self._ypos - self._height / 2.0 maxY = self._ypos + self._height / 2.0 leftX = self._xpos - self._width / 2.0 @@ -219,13 +219,13 @@ class DividedShape(RectangleShape): else: proportion = region._regionProportionY - y = currentY + self._height * proportion - actualY = min(maxY, y) + y = currently + self._height * proportion + actually = min(maxY, y) centreX = self._xpos - centreY = currentY + (actualY - currentY) / 2.0 + centreY = currently + (actually - currently) / 2.0 - DrawFormattedText(dc, region._formattedText, centreX, centreY, self._width - 2 * xMargin, actualY - currentY - 2 * yMargin, region._formatMode) + DrawFormattedText(dc, region._formattedText, centreX, centreY, self._width - 2 * xMargin, actually - currently - 2 * yMargin, region._formatMode) if y <= maxY and region != self.GetRegions()[-1]: regionPen = region.GetActualPen() @@ -233,14 +233,14 @@ class DividedShape(RectangleShape): dc.SetPen(regionPen) dc.DrawLine(leftX, y, rightX, y) - currentY = actualY + currently = actually def SetSize(self, w, h, recursive = True): """ Set the size. :param `w`: width of rectangle - :param `h`: heigth of rectangle + :param `h`: height of rectangle :param `recursive`: not implemented """ @@ -261,7 +261,7 @@ class DividedShape(RectangleShape): defaultProportion = 1.0 / len(self.GetRegions()) else: defaultProportion = 0.0 - currentY = self._ypos - self._height / 2.0 + currently = self._ypos - self._height / 2.0 maxY = self._ypos + self._height / 2.0 for region in self.GetRegions(): @@ -271,15 +271,15 @@ class DividedShape(RectangleShape): proportion = region._regionProportionY sizeY = proportion * self._height - y = currentY + sizeY - actualY = min(maxY, y) + y = currently + sizeY + actually = min(maxY, y) - centreY = currentY + (actualY - currentY) / 2.0 + centreY = currently + (actually - currently) / 2.0 region.SetSize(self._width, sizeY) region.SetPosition(0, centreY - self._ypos) - currentY = actualY + currently = actually def GetAttachmentPosition(self, attachment, nth = 0, no_arcs = 1, line = None): """ @@ -416,21 +416,21 @@ class DividedShape(RectangleShape): """ Make the mandatory control points. """ - currentY = self.GetY() - self._height / 2.0 + currently = self.GetY() - self._height / 2.0 maxY = self.GetY() + self._height / 2.0 for i, region in enumerate(self.GetRegions()): proportion = region._regionProportionY - y = currentY + self._height * proportion - actualY = min(maxY, y) + y = currently + self._height * proportion + actually = min(maxY, y) if region != self.GetRegions()[-1]: - controlPoint = DividedShapeControlPoint(self._canvas, self, i, CONTROL_POINT_SIZE, 0, actualY - self.GetY(), 0) + controlPoint = DividedShapeControlPoint(self._canvas, self, i, CONTROL_POINT_SIZE, 0, actually - self.GetY(), 0) self._canvas.AddShape(controlPoint) self._controlPoints.append(controlPoint) - currentY = actualY + currently = actually def ResetControlPoints(self): """ @@ -449,7 +449,7 @@ class DividedShape(RectangleShape): """ Reset the mandatory control points. """ - currentY = self.GetY() - self._height / 2.0 + currently = self.GetY() - self._height / 2.0 maxY = self.GetY() + self._height / 2.0 i = 0 @@ -458,13 +458,13 @@ class DividedShape(RectangleShape): region = self.GetRegions()[i] proportion = region._regionProportionY - y = currentY + self._height * proportion - actualY = min(maxY, y) + y = currently + self._height * proportion + actually = min(maxY, y) controlPoint._xoffset = 0 - controlPoint._yoffset = actualY - self.GetY() + controlPoint._yoffset = actually - self.GetY() - currentY = actualY + currently = actually i += 1 diff --git a/wx/lib/ogl/drawn.py b/wx/lib/ogl/drawn.py index d50c8133..17a2992c 100644 --- a/wx/lib/ogl/drawn.py +++ b/wx/lib/ogl/drawn.py @@ -807,7 +807,7 @@ class DrawnShape(RectangleShape): if flags and METAFLAGS_ATTACHMENTS: self.ClearAttachments() for i in range(len(pts)): - # TODO: AttachmentPoint does not excist as per PyLint, what should it be??? + # TODO: AttachmentPoint does not exist as per PyLint, what should it be??? self._attachmentPoints.append(AttachmentPoint(i,pts[i][0],pts[i][1])) self._metafiles[self._currentAngle].DrawPolygon(pts, flags) diff --git a/wx/lib/ogl/lines.py b/wx/lib/ogl/lines.py index 68de5e61..f955443a 100644 --- a/wx/lib/ogl/lines.py +++ b/wx/lib/ogl/lines.py @@ -225,7 +225,7 @@ class LabelShape(RectangleShape): :param `parent`: the parent an instance of :class:`Line` :param `region`: the shape region an instance of :class:`~lib.ogl.ShapeRegion` :param `w`: width in points - :param `h`: heigth in points + :param `h`: height in points """ RectangleShape.__init__(self, w, h) @@ -440,7 +440,7 @@ class LineShape(Shape): self._lineControlPoints.insert(len(self._lineControlPoints)-1, point) def DeleteLineControlPoint(self): - """Delete an arbitary point on the line.""" + """Delete an arbitrary point on the line.""" if len(self._lineControlPoints) < 3: return False @@ -1090,7 +1090,7 @@ class LineShape(Shape): return True def OnMoveLink(self, dc, moveControlPoints = True): - """The move linke handler, called when a connected object has moved, to move the link to + """The move link handler, called when a connected object has moved, to move the link to correct position. """ if not self._from or not self._to: @@ -1487,7 +1487,7 @@ class LineShape(Shape): `ARROW_POSITION_START` arrow appears at the start ======================================== ================================== - :param `size`: specifies the lenght of the arrow + :param `size`: specifies the length of the arrow :param `xOffset`: specifies the offset from the end of the line :param `name`: specifies a name :param `mf`: mf can be a wxPseduoMetaFile, perhaps loaded from a simple Windows diff --git a/wx/lib/ogl/oglmisc.py b/wx/lib/ogl/oglmisc.py index 8588a72b..3729a9cf 100644 --- a/wx/lib/ogl/oglmisc.py +++ b/wx/lib/ogl/oglmisc.py @@ -76,7 +76,7 @@ LINE_ALIGNMENT_VERT = 0 LINE_ALIGNMENT_TO_NEXT_HANDLE = 2 LINE_ALIGNMENT_NONE = 0 -# was defined in canvas and in composit +# was defined in canvas and in composite KEY_SHIFT = 1 KEY_CTRL = 2 @@ -269,7 +269,7 @@ def CentreText(dc, text_list, xpos, ypos, width, height, formatMode): def DrawFormattedText(dc, text_list, xpos, ypos, width, height, formatMode): """ - Draw formated text + Draw formatted text :param `dc`: the :class:`wx.MemoryDC` :param `text_list`: a list of texts @@ -310,7 +310,7 @@ def DrawFormattedText(dc, text_list, xpos, ypos, width, height, formatMode): def RoughlyEqual(val1, val2, tol=0.00001): """ - Check if values are roughtly equal + Check if values are roughly equal :param `val1`: the first value to check :param `val2`: the second value to check @@ -356,7 +356,7 @@ def CheckLineIntersection(x1, y1, x2, y2, x3, y3, x4, y4): :param `x4`: x4 position :param `y4`: y4 position - :returns: a lenght ratio and a k line??? + :returns: a length ratio and a k line??? """ denominator_term = (y4 - y3) * (x2 - x1) - (y2 - y1) * (x4 - x3) diff --git a/wx/lib/pdfwin_old.py b/wx/lib/pdfwin_old.py index 987748d3..1a5ddc72 100644 --- a/wx/lib/pdfwin_old.py +++ b/wx/lib/pdfwin_old.py @@ -61,7 +61,7 @@ def get_acroversion(): # http://partners.adobe.com/public/developer/en/acrobat/sdk/pdf/iac/IACOverview.pdf # http://partners.adobe.com/public/developer/en/acrobat/sdk/pdf/iac/IACReference.pdf # -# Co-ordinates passed as parameters are in points (1/72 inch). +# Coordinates passed as parameters are in points (1/72 inch). if get_acroversion() >= 7.0: diff --git a/wx/lib/platebtn.py b/wx/lib/platebtn.py index 3e56c90d..cf27fc53 100644 --- a/wx/lib/platebtn.py +++ b/wx/lib/platebtn.py @@ -23,7 +23,7 @@ keyword parameter. PB_STYLE_DEFAULT: Creates a flat label button with rounded corners, the highlight for mouse over -and press states is based off of the hightlight color from the systems current +and press states is based off of the highlight color from the systems current theme. PB_STYLE_GRADIENT: @@ -177,7 +177,7 @@ class PlateButton(wx.Control): """Draw the bitmap if one has been set :param wx.GCDC `gc`: :class:`wx.GCDC` to draw with - :return: x cordinate to draw text at + :return: x coordinate to draw text at """ if self.IsEnabled(): @@ -264,7 +264,7 @@ class PlateButton(wx.Control): """Draw the button""" # TODO using a buffered paintdc on windows with the nobg style # causes lots of weird drawing. So currently the use of a - # buffered dc is dissabled for this style. + # buffered dc is disabled for this style. if PB_STYLE_NOBG & self._style: dc = wx.PaintDC(self) else: diff --git a/wx/lib/plot/CHANGELOG.md b/wx/lib/plot/CHANGELOG.md index eaa601bf..2c1873c6 100644 --- a/wx/lib/plot/CHANGELOG.md +++ b/wx/lib/plot/CHANGELOG.md @@ -80,7 +80,7 @@ on 2016-07-05 and finished on [insert date here]. tick marks) + Added support for background and foreground colours (enabled via SetBackgroundColour/SetForegroundColour on a PlotCanvas instance) -+ Changed PlotCanvas printing initialization from occuring in __init__ to ++ Changed PlotCanvas printing initialization from occurring in __init__ to occur on access. This will postpone any IPP and / or CUPS warnings which appear on stderr on some Linux systems until printing functionality is actually used. @@ -108,7 +108,7 @@ on 2016-07-05 and finished on [insert date here]. ## 2003-12-15 - Jeff Grimmett (grimmtooth@softhome.net) -+ 2.5 compatability update. ++ 2.5 compatibility update. + Renamed to plot.py in the wx.lib directory. + Reworked test frame to work with wx demo framework. This saves a bit of tedious cut and paste, and the test app is excellent. diff --git a/wx/lib/plot/examples/demo.py b/wx/lib/plot/examples/demo.py index 98fbaad3..02d74800 100644 --- a/wx/lib/plot/examples/demo.py +++ b/wx/lib/plot/examples/demo.py @@ -968,7 +968,7 @@ class PlotDemoMainFrame(wx.Frame): def DrawPointLabel(self, dc, mDataDict): """ - This is the fuction that defines how the pointLabels are plotted + This is the function that defines how the pointLabels are plotted :param dc: DC that will be passed :param mDataDict: Dictionary of data that you want to use diff --git a/wx/lib/plot/plotcanvas.py b/wx/lib/plot/plotcanvas.py index dd3f77d5..07e4e2ba 100644 --- a/wx/lib/plot/plotcanvas.py +++ b/wx/lib/plot/plotcanvas.py @@ -86,7 +86,7 @@ class PlotCanvas(wx.Panel): self.Bind(wx.EVT_SCROLL_LINEUP, self.OnScroll) self.Bind(wx.EVT_SCROLL_LINEDOWN, self.OnScroll) - # set curser as cross-hairs + # set cursor as cross-hairs self.defaultCursor = wx.Cursor(wx.CURSOR_ARROW) self.HandCursor = wx.Cursor(wx.CURSOR_SIZING) self.GrabHandCursor = wx.Cursor(wx.CURSOR_SIZING) @@ -325,7 +325,7 @@ class PlotCanvas(wx.Panel): """ Saves the file to the type specified in the extension. If no file name is specified a dialog box is provided. Returns True if - sucessful, otherwise False. + successful, otherwise False. .bmp Save a Windows bitmap file. .xbm Save an X bitmap file. diff --git a/wx/lib/plot/polyobjects.py b/wx/lib/plot/polyobjects.py index 26a54f8f..24dad9ec 100644 --- a/wx/lib/plot/polyobjects.py +++ b/wx/lib/plot/polyobjects.py @@ -272,7 +272,7 @@ class PolyPoints(object): def boundingBox(self): """ - Returns the bouding box for the entire dataset as a tuple with this + Returns the bounding box for the entire dataset as a tuple with this format:: ((minX, minY), (maxX, maxY)) @@ -305,7 +305,7 @@ class PolyPoints(object): # no curves to draw return - # TODO: Can we remove the if statement alltogether? Does + # TODO: Can we remove the if statement altogether? Does # scaleAndShift ever get called when the current value equals # the new value? @@ -679,7 +679,7 @@ class PolyBarsBase(PolyPoints): PolyPoints.__init__(self, points, attr) def _scaleAndShift(self, data, scale=(1, 1), shift=(0, 0)): - """same as override method, but retuns a value.""" + """same as override method, but returns a value.""" scaled = scale * data + shift return scaled @@ -975,7 +975,7 @@ class PolyBoxPlot(PolyPoints): p = self._points pxy = np.array(pntXY) - # determine distnace for each point + # determine distance for each point d = np.sqrt(np.add.reduce((p - pxy) ** 2, 1)) # sqrt(dx^2+dy^2) pntIndex = np.argmin(d) dist = d[pntIndex] @@ -1050,7 +1050,7 @@ class PolyBoxPlot(PolyPoints): return outliers def _scaleAndShift(self, data, scale=(1, 1), shift=(0, 0)): - """same as override method, but retuns a value.""" + """same as override method, but returns a value.""" scaled = scale * data + shift return scaled @@ -1070,7 +1070,7 @@ class PolyBoxPlot(PolyPoints): This is because + The whiskers are drawn as single line rather than two lines - + The median line must be visable over the box if the box has a fill. + + The median line must be visible over the box if the box has a fill. Other than that, the draw order can be changed. """ @@ -1460,7 +1460,7 @@ class PlotPrintout(wx.Printout): # print("DC GetSize", dc.GetSize()) # print("GetPageSizePixels", self.GetPageSizePixels()) # Note PPIScreen does not give the correct number - # Calulate everything for printer and then scale for preview + # Calculate everything for printer and then scale for preview PPIPrinter = self.GetPPIPrinter() # printer dots/inch (w,h) # PPIScreen= self.GetPPIScreen() # screen dots/inch (w,h) dcSize = dc.GetSize() # DC size diff --git a/wx/lib/plot/utils.py b/wx/lib/plot/utils.py index c535239d..202bcfa6 100644 --- a/wx/lib/plot/utils.py +++ b/wx/lib/plot/utils.py @@ -32,7 +32,7 @@ class DisplaySide(object): Used for fine-tuning the axis, ticks, and values of a graph. This class somewhat mimics a collections.namedtuple factory function in - that it is an iterable and can have indiviual elements accessible by name. + that it is an iterable and can have individual elements accessible by name. It differs from a namedtuple in a few ways: - it's mutable diff --git a/wx/lib/printout.py b/wx/lib/printout.py index 43c73324..a698ad2d 100644 --- a/wx/lib/printout.py +++ b/wx/lib/printout.py @@ -288,7 +288,7 @@ class PrintTableDraw(wx.ScrolledWindow, PrintBase): for x in self.data: #becomes one column data.append([x]) else: - data = [self.data] #becames one row + data = [self.data] #becomes one row self.data = data first_value = data[0] try: @@ -609,7 +609,7 @@ class PrintTableDraw(wx.ScrolledWindow, PrintBase): def DrawGridLine(self): if self.draw == True \ - and len(self.column) > 2: #supress grid lines if only one column + and len(self.column) > 2: #suppress grid lines if only one column try: size = self.row_line_size[self.data_cnt] except: @@ -630,7 +630,7 @@ class PrintTableDraw(wx.ScrolledWindow, PrintBase): def DrawColumns(self): if self.draw == True \ - and len(self.column) > 2: #surpress grid line if only one column + and len(self.column) > 2: #suppress grid line if only one column col = 0 for val in self.column: try: diff --git a/wx/lib/pubsub/__init__.py b/wx/lib/pubsub/__init__.py index 8eb2d1ae..064afac7 100644 --- a/wx/lib/pubsub/__init__.py +++ b/wx/lib/pubsub/__init__.py @@ -20,6 +20,6 @@ __all__ = [ import wx import warnings -warnings.warn('wx.lib.pubsub has been deprecated, plese migrate your ' +warnings.warn('wx.lib.pubsub has been deprecated, please migrate your ' 'code to use pypubsub, available on PyPI.', wx.wxPyDeprecationWarning) diff --git a/wx/lib/pubsub/core/topicmgr.py b/wx/lib/pubsub/core/topicmgr.py index 3d080c0f..10342a48 100644 --- a/wx/lib/pubsub/core/topicmgr.py +++ b/wx/lib/pubsub/core/topicmgr.py @@ -237,7 +237,7 @@ class TopicManager: return self.getTopic(name, okIfNone=True) is not None def hasTopicDefinition(self, name): - """Determine if there is a definition avaiable for topic 'name'. Return + """Determine if there is a definition available for topic 'name'. Return true if there is, false otherwise. Note: a topic may have a definition without being in use, and vice versa.""" # in already existing Topic object: diff --git a/wx/lib/pubsub/core/topicobj.py b/wx/lib/pubsub/core/topicobj.py index c4303421..edff9584 100644 --- a/wx/lib/pubsub/core/topicobj.py +++ b/wx/lib/pubsub/core/topicobj.py @@ -172,7 +172,7 @@ class Topic(PublisherMixin): return self.__validator is not None def filterMsgArgs(self, msgKwargs, check=False): - """Get the MDS docstrings for each of the spedified kwargs.""" + """Get the MDS docstrings for each of the specified kwargs.""" filteredArgs = self.__msgArgs.filterArgs(msgKwargs) # if no check of args yet, do it now: if check: @@ -356,7 +356,7 @@ class Topic(PublisherMixin): ############################################################# # - # Impementation + # Implementation # ############################################################# diff --git a/wx/lib/pubsub/setuparg1.py b/wx/lib/pubsub/setuparg1.py index df85780c..d255951f 100644 --- a/wx/lib/pubsub/setuparg1.py +++ b/wx/lib/pubsub/setuparg1.py @@ -42,6 +42,6 @@ to minimize the chance of introducing bugs in your application. def enforceArgName(commonName): """This will configure pubsub to require that all listeners use the same argument name (*commonName*) as first parameter. This - is a ueful first step in migrating an application that has been + is a useful first step in migrating an application that has been using *arg1* protocol to the more powerful *kwargs* protocol. """ policies.setMsgDataArgName(1, commonName) diff --git a/wx/lib/pubsub/setupkwargs.py b/wx/lib/pubsub/setupkwargs.py index 7230d34e..6288992c 100644 --- a/wx/lib/pubsub/setupkwargs.py +++ b/wx/lib/pubsub/setupkwargs.py @@ -24,6 +24,6 @@ def transitionFromArg1(commonName): """Utility function to assist migrating an application from using the arg1 messaging protocol to using the kwargs protocol. Call this after having run and debugged your application with ``setuparg1.enforceArgName(commonName)``. See the migration docs - for more detais. + for more details. """ policies.setMsgDataArgName(2, commonName) diff --git a/wx/lib/pubsub/utils/notification.py b/wx/lib/pubsub/utils/notification.py index 8f785c87..e2bd20ba 100644 --- a/wx/lib/pubsub/utils/notification.py +++ b/wx/lib/pubsub/utils/notification.py @@ -288,7 +288,7 @@ def useNotifyByPubsubMessage(publisher=None, all=True, **kwargs): The publisher is rarely needed: - * The publisher must be specfied if pubsub is not installed + * The publisher must be specified if pubsub is not installed on the system search path (ie from pubsub import ... would fail or import wrong pubsub -- such as if pubsub is within wxPython's wx.lib package). Then pbuModule is the pub module to use:: diff --git a/wx/lib/pydocview.py b/wx/lib/pydocview.py index 404cb965..d4cf8a3f 100644 --- a/wx/lib/pydocview.py +++ b/wx/lib/pydocview.py @@ -557,7 +557,7 @@ class DocMDIParentFrameMixIn: window.SetDefaultSize((window._sizeBeforeHidden[0], window._sizeBeforeHidden[0] - self.GetEmbeddedWindow(EMBEDDED_WINDOW_BOTTOMRIGHT).GetSize()[1])) else: window.SetDefaultSize(window._sizeBeforeHidden) - # If it is not the size of the full parent sashwindow set the other window's size so that if it gets shown it will have a cooresponding size + # If it is not the size of the full parent sashwindow set the other window's size so that if it gets shown it will have a corresponding size if window._sizeBeforeHidden[1] < parentSashWindow.GetClientSize()[1]: otherWindowSize = (-1, parentSashWindow.GetClientSize()[1] - window._sizeBeforeHidden[1]) if window == self.GetEmbeddedWindow(EMBEDDED_WINDOW_BOTTOMLEFT): @@ -1863,7 +1863,7 @@ class DocApp(wx.App): """ Returns the instance of a particular type of service that has been installed into the DocApp. For example, "wx.GetApp().GetService(pydocview.OptionsService)" - returns the isntance of the OptionsService that is running within the DocApp. + returns the instance of the OptionsService that is running within the DocApp. """ for service in self._services: if isinstance(service, type): diff --git a/wx/lib/resizewidget.py b/wx/lib/resizewidget.py index efcd0822..e1416917 100644 --- a/wx/lib/resizewidget.py +++ b/wx/lib/resizewidget.py @@ -39,7 +39,7 @@ _RWLayoutNeededEvent, EVT_RW_LAYOUT_NEEDED = wx.lib.newevent.NewCommandEvent() # TODO: Add a style flag that indicates that the ResizeWidget should # try to adjust the layout itself by looking up the sizer and -# containment hierachy. Maybe also a style that says that it is okay +# containment hierarchy. Maybe also a style that says that it is okay # to adjust the size of top-level windows too. #----------------------------------------------------------------------------- @@ -309,7 +309,7 @@ class ResizeWidget(wx.Panel): return False - #=== Overriden virtuals from the base class === + #=== Overridden virtuals from the base class === def AddChild(self, child): """ Add the child to manage. diff --git a/wx/lib/softwareupdate.py b/wx/lib/softwareupdate.py index 30218231..55906334 100644 --- a/wx/lib/softwareupdate.py +++ b/wx/lib/softwareupdate.py @@ -85,7 +85,7 @@ class SoftwareUpdate(object): base URL (with a trailing '/') for the location of the update packages, or an instance of a class derived from the esky.finder.VersionFinder class is required. A custom VersionFinder - can be used to find and fetch the newer verison of the software in + can be used to find and fetch the newer version of the software in some other way, if desired. Call this method from the app's OnInit method. @@ -188,7 +188,7 @@ class SoftwareUpdate(object): newest, chLogTxt = result if newest is None: if not silentUnlessUpdate: - MultiMessageBox("You are already running the newest verison of %s." % + MultiMessageBox("You are already running the newest version of %s." % self.GetAppDisplayName(), self._caption, parent=parentWindow, icon=self._icon, style=wx.OK|SOT) @@ -196,7 +196,7 @@ class SoftwareUpdate(object): self._parentWindow = parentWindow resp = MultiMessageBox("A new version of %s is available.\n\n" - "You are currently running verison %s; version %s is now " + "You are currently running version %s; version %s is now " "available for download. Do you wish to install it now?" % (self.GetAppDisplayName(), active, newest), self._caption, msg2=chLogTxt, style=wx.YES_NO|SOT, @@ -226,9 +226,9 @@ class SoftwareUpdate(object): try: # Let Esky handle all the rest of the update process so we can - # take advantage of the error checking and priviledge elevation - # (if neccessary) that they have done so we don't have to worry - # about that ourselves like we would if we broke down the proccess + # take advantage of the error checking and privilege elevation + # (if necessary) that they have done so we don't have to worry + # about that ourselves like we would if we broke down the process # into component steps. self._esky.auto_update(self._updateProgress) @@ -268,7 +268,7 @@ class SoftwareUpdate(object): info.exe = exe # Make sure the CWD not in the current version's appdir, so it can - # hopefully be cleaned up either as we exit or as the next verison + # hopefully be cleaned up either as we exit or as the next version # is starting. os.chdir(os.path.dirname(exe)) diff --git a/wx/lib/splitter.py b/wx/lib/splitter.py index 5d19396e..c44c308c 100644 --- a/wx/lib/splitter.py +++ b/wx/lib/splitter.py @@ -31,7 +31,7 @@ class MultiSplitterWindow(wx.Panel): that deal with the child windows managed by the splitter, and also those that deal with the sash positions. In most cases you will need to pass an index value to tell the class which window or sash - you are refering to. + you are referring to. The concept of the sash position is also different than in wx.SplitterWindow. Since the wx.Splitterwindow has only one sash diff --git a/wx/lib/stattext.py b/wx/lib/stattext.py index 2cfb6e65..df192cfd 100644 --- a/wx/lib/stattext.py +++ b/wx/lib/stattext.py @@ -196,7 +196,7 @@ class GenStaticText(wx.Control): in the specified state. .. note:: Note that when a parent window is disabled, all of its - children are disabled as well and they are reenabled again when + children are disabled as well and they are re-enabled again when the parent is. .. note:: Overridden from :class:`wx.Control`. diff --git a/wx/lib/utils.py b/wx/lib/utils.py index 55f563db..817817e4 100644 --- a/wx/lib/utils.py +++ b/wx/lib/utils.py @@ -1,6 +1,6 @@ #---------------------------------------------------------------------- # Name: wx.lib.utils -# Purpose: Miscelaneous utility functions +# Purpose: Miscellaneous utility functions # # Author: Robin Dunn # diff --git a/wx/lib/wxpTag.py b/wx/lib/wxpTag.py index bd37ca0a..baf7240d 100644 --- a/wx/lib/wxpTag.py +++ b/wx/lib/wxpTag.py @@ -58,13 +58,13 @@ be converted from strings to alternate datatypes. They are: colours Any value of the form "#123ABC" will automatically be converted to a wxColour object. - Py Types Any value begining with "(", "[" or "{" are expected to + Py Types Any value beginning with "(", "[" or "{" are expected to be a Python tuple, list, or dictionary and eval() will be used to convert them to that type. If the eval() fails then the original string value will be preserved. - wx Types Any value begining with "wx" is expected to be an attempt + wx Types Any value beginning with "wx" is expected to be an attempt to create a wxPython object, such as a wxSize, etc. The eval() will be used to try and construct the object and if it fails then the original string value diff --git a/wx/py/CHANGES.txt b/wx/py/CHANGES.txt index dc171e2d..8afa9a36 100644 --- a/wx/py/CHANGES.txt +++ b/wx/py/CHANGES.txt @@ -102,7 +102,7 @@ Modified crust.py to use a switch so it can load either a Shell or a Slices_Shel 0.9.5 (12/23/2005) ------------------ -Applied a series of enhancments by Franz Steinaeusler, Adi Sieker, and +Applied a series of enhancements by Franz Steinaeusler, Adi Sieker, and Sebastian Haase, up until their 7-31-2005 version. (Their next version broke some existing functionality, and added some confusing hacks, and I didn't feel that the incremental gains were worth the @@ -624,7 +624,7 @@ Changed default font size under Linux to:: 'lnsize' : 10, Changed ``Shell`` to expect a parameter referencing an Interpreter -class, rather than an intepreter instance, to facilitate subclassing +class, rather than an interpreter instance, to facilitate subclassing of Interpreter, which effectively broke when the Editor class was eliminated. diff --git a/wx/py/editwindow.py b/wx/py/editwindow.py index da086cab..99b0279e 100644 --- a/wx/py/editwindow.py +++ b/wx/py/editwindow.py @@ -271,7 +271,7 @@ class EditWindow(stc.StyledTextCtrl): start = self.GetSelection()[1] loc = textstring.find(findstring, start) - # if it wasn't found then restart at begining + # if it wasn't found then restart at beginning if loc == -1 and start != 0: if backward: start = end diff --git a/wx/py/filling.py b/wx/py/filling.py index 7ce8fbf3..d57f07b7 100644 --- a/wx/py/filling.py +++ b/wx/py/filling.py @@ -207,7 +207,7 @@ class FillingTree(wx.TreeCtrl): parent = self.GetItemParent(item) obj = self.GetItemData(parent) # Apply dictionary syntax to dictionary items, except the root - # and first level children of a namepace. + # and first level children of a namespace. if ((isinstance(obj, dict) or 'BTrees' in six.text_type(type(obj)) and hasattr(obj, 'keys')) diff --git a/wx/py/frame.py b/wx/py/frame.py index e3c7aaf1..1cb0b105 100644 --- a/wx/py/frame.py +++ b/wx/py/frame.py @@ -178,9 +178,9 @@ class Frame(wx.Frame): 'Include attributes visible to __getattr__ and __setattr__', wx.ITEM_CHECK) m.Append(ID_AUTOCOMP_SINGLE, 'Include Single &Underscores\tCtrl+Shift+U', - 'Include attibutes prefixed by a single underscore', wx.ITEM_CHECK) + 'Include attributes prefixed by a single underscore', wx.ITEM_CHECK) m.Append(ID_AUTOCOMP_DOUBLE, 'Include &Double Underscores\tCtrl+Shift+D', - 'Include attibutes prefixed by a double underscore', wx.ITEM_CHECK) + 'Include attributes prefixed by a double underscore', wx.ITEM_CHECK) m = self.calltipsMenu = wx.Menu() m.Append(ID_CALLTIPS_SHOW, 'Show Call &Tips\tCtrl+Shift+T', 'Show call tips with argument signature and docstring', wx.ITEM_CHECK) diff --git a/wx/py/introspect.py b/wx/py/introspect.py index 892f8474..0bd1a5ca 100644 --- a/wx/py/introspect.py +++ b/wx/py/introspect.py @@ -281,7 +281,7 @@ def getRoot(command, terminator=None): # start represents the last known good point in the line. start = token[2][1] elif len(tokenstring) == 1 and tokenstring in ('[({])}'): - # Remember, we're working backwords. + # Remember, we're working backwards. # So prefix += tokenstring would be wrong. if prefix in emptyTypes and tokenstring in ('[({'): # We've already got an empty type identified so now we diff --git a/wx/py/path.py b/wx/py/path.py index 28abddd9..c0cf6e61 100644 --- a/wx/py/path.py +++ b/wx/py/path.py @@ -26,7 +26,7 @@ def ls(str='*',fullpath=False): # This prints the results of running a command in the GUI shell but be warned! # This is a blocking call, and if you open any kind of interactive -# command-line program like python or bash, the shell will permanantly +# command-line program like python or bash, the shell will permanently # freeze! # If you want this kind of behavior to be available, please use ipython # This is NOT a feature or goal of the Py project! diff --git a/wx/py/shell.py b/wx/py/shell.py index fb319393..32a73de5 100755 --- a/wx/py/shell.py +++ b/wx/py/shell.py @@ -1569,7 +1569,7 @@ class Shell(editwindow.EditWindow): ## self.GetData() ## if self.textdo.GetTextLength() > 1: ## text = self.textdo.GetText() -## # *** Do somethign with the dragged text here... +## # *** Do something with the dragged text here... ## self.textdo.SetText('') ## else: ## filenames = str(self.filename.GetFilenames()) diff --git a/wx/py/sliceshell.py b/wx/py/sliceshell.py index 5fe49c3a..4d3bf448 100755 --- a/wx/py/sliceshell.py +++ b/wx/py/sliceshell.py @@ -1237,7 +1237,7 @@ class SlicesShell(editwindow.EditWindow): #print('You can only run "DeleteOutputSlicesAfter" from an Input slice!') return - startIn,endIn=self.GetIOSlice(line_num) + starting,endIn=self.GetIOSlice(line_num) startGrouping,endGrouping=self.GetGroupingSlice(line_num) if endIn 1: ## text = self.textdo.GetText() -## # *** Do somethign with the dragged text here... +## # *** Do something with the dragged text here... ## self.textdo.SetText('') ## else: ## filenames = str(self.filename.GetFilenames())