Commit Graph

19 Commits

Author SHA1 Message Date
Robin Dunn
9f2cc54b48 Update copyright years 2020-03-10 11:41:39 -07:00
Paul Kienzle
092bb845d5 Fix wx/tools/pywxrc for py2/3 compatibility. Refs 1156. 2019-04-14 13:45:08 -04:00
Éric Piel
1b46085c97 pywxrc: fix showing the success message at the end
When generating a file, it should show a success message like "Resources written to...".
However, the print() failed, which made it sound like the whole generation failed.
2018-08-22 13:56:01 +02:00
Éric Piel
96ed353b34 pywxrc: fix Menu with variable name and label defined after sub-menus
If the XRC looked like:
<object class="wxMenu" name="menu_file">
  <object class="wxMenuItem" name="menu_item_open">
    <label>Save</label>
  </object>
  <label>File</label>
</object>

The generated code would fail, because it would try to look for a main menu called "Save"
instead of looking for "File".

=> Make the XML parsing more clever to not look for the first "label" tag,
but the first _direct_ child with tag "label".
2018-08-22 13:51:16 +02:00
Éric Piel
984a036d34 pywxrc: remove old comments
It's not using the 2 stages creation anymore.
2018-08-22 13:50:33 +02:00
Robin Dunn
b77c88a280 Merge tag 'wxPython-4.0.2' into wxPy-4.0.x
(cherry picked from commit 4c56c39e52)
2018-06-17 22:04:22 -07:00
André Colomb
c655b09012 Remove obsolete argument from PreCreate().
With the `pre` object magic gone, there is no need to pass another
argument to the PreCreate() method, which can now just use `self`.

Note that this is will probably lead to incompatibilities for users of
the generated class who override this method, as advised in the
template.
2018-02-05 09:35:05 +01:00
André Colomb
6883afe8ce Simplify two stage creation process.
Remove "pre" object magic and use the parent class constructor
instead.  Remove deprecated PostCreate() call.  See
https://docs.wxpython.org/MigrationGuide.html#phase-create.

Load the XmlResource contents directly onto self.  See
https://docs.wxpython.org/MigrationGuide.html#xrc.
2018-02-02 17:37:01 +01:00
André Colomb
e17a8a907a Avoid deprecated class EmptyXmlResource.
According to the deprecation warning in wxPython Phoenix.
2018-02-02 17:29:07 +01:00
Robin Dunn
a0604d128c Update copyright in wx/tools 2017-02-13 17:07:39 -08:00
Metallicow
576cf1d966 Trim Whitespace tools directory 2016-10-12 22:15:25 -05:00
Robin Dunn
ed4756b902 Remove wx.lib.six and use the stock six module instead,
and add it as an installation dependency.
2016-06-30 20:07:57 -07:00
Robin Dunn
ea4b9b8fc5 updates for fullnames in the docstrings 2016-06-07 16:44:52 -07:00
Robin Dunn
bcbdcd9631 Remove more CVS $Id$ and $Revision$ tags, and a bit of code that uses them.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-11 03:35:32 +00:00
Robin Dunn
9d5238fa33 Fix print statements that use the file= arg to use the print_ function from wx.lib.six instead.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-14 03:09:25 +00:00
Robin Dunn
7d3e2b7c2e PR 40 from Metallicow. Py3 and Phoenix updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-11 23:12:43 +00:00
Robin Dunn
b4bb3dd746 Fix print statement errors
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-12-31 07:47:53 +00:00
Robin Dunn
9f24505715 Merge of PR 11 with the whitespace-only changes omitted.
See https://github.com/RobinD42/Phoenix/pull/11

Mostly phoenix-port changes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@74463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-10 01:15:34 +00:00
Robin Dunn
247673201b Copy (branch) wx.lib, wx.py and wx.tools from Classic, and include subpackages branched from 3rdParty
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-07-13 01:36:07 +00:00