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)