Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-07 12:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,643 Commits 8 Branches 23 Tags
59f43fd818e0c49ee72943ff0c6dddb2370eeeda
Commit Graph

1643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Werner F Bruhin
59f43fd818 - the crash cause for Sphinx build 2015-02-11 14:27:17 +01:00
Werner F Bruhin
384af619b5 - format changes to doc 
- commented or removed a few print statements
 2015-02-11 14:05:06 +01:00
Robin Dunn
76cf83468a Merge branch 'patch-1' of https://github.com/MichaelHipp/Phoenix into MichaelHipp-patch-1 
Conflicts:
	wx/tools/img2img.py
 2015-02-10 20:20:57 -08:00
Robin Dunn
263ea749d5 Fix syntax error on build.py --python parameter evaluation 2015-02-10 20:15:19 -08:00
Robin Dunn
4502562142 update wxWidgets submodule 2015-02-09 20:10:45 -08:00
Robin Dunn
f9fa22b71d Merge pull request #78 from wernerfb/may 
FloatCanvas and sized_controls
 2015-02-09 17:24:49 -08:00
Robin Dunn
8878c918e5 Merge pull request #95 from Metallicow/shortcuteditor-fixes-feb-2015 
shortcuteditor fixes
 2015-02-09 15:41:17 -08:00
Robin Dunn
4f366aba80 Merge pull request #94 from wernerfb/15Feb-olg-doc 
- make Sphinx links in module doc work
 2015-02-07 13:01:43 -08:00
Metallicow
efa6f6fab6 ensure all bmps in tree are 16x16 
menus can have 24 or 32 size bitmaps and still look right in the menus.
but they get cut off in the tree and dont look right. so check first and
scale the bitmap if not 16 so as to prevent ugliness and possible errors
with the imagelist.
 2015-02-06 15:27:22 -06:00
Metallicow
5be7162109 return the dialog returncode, not None 
Makes the OK and Cancel buttons actually work now in the demo and other
apps derived of the samples.
TODO: Classic wxpy needs these fixes pushed also.
 2015-02-06 15:21:59 -06:00
Robin Dunn
dba10ef333 * Make the git hash be the "local version label" (see PEP 440) by separating it with a '+'. 
* Change the name template for the docs tarball so pip will not think it is part of the local version label and is the package's source code.

* Use version3 for the docset filenames.
 2015-02-06 10:31:09 -08:00
Werner F Bruhin
42df586ecd - make Sphinx links in module doc work 2015-02-06 10:17:02 +01:00
Robin Dunn
62faf1f13c Update wxWidgets submodule 2015-02-05 21:36:23 -08:00
Robin Dunn
7f86b9eb54 It's not a subversion revision anymore. Also a bit of text tweaking. 2015-02-05 21:33:16 -08:00
Robin Dunn
87b92b66f0 Remove unnecessary #! lines from files that will never be executed standalone. 2015-02-05 21:19:32 -08:00
Robin Dunn
8fdb90b961 Adding the wx folder to the sys.path is a bad idea, as then it will have potential problems with name clashes with modules in the stdlib or site-packages (like xml). 2015-02-05 21:19:31 -08:00
Robin Dunn
d8004872a9 "#" inside of strings can confuse our Sphinx builder tools. Workaround and add a TODO. 2015-02-05 21:19:31 -08:00
Robin Dunn
b864ef4c4a Add TODO 2015-02-05 21:19:31 -08:00
Robin Dunn
03ae139fb8 Merge pull request #93 from wernerfb/june_ogl_rework-autopep8 
OGL rework
 2015-02-05 21:18:10 -08:00
Robin Dunn
6e0ef1b9df Merge pull request #92 from wernerfb/15Feb-combotree 
Prevent DeadObject error
 2015-02-05 21:02:42 -08:00
Werner F Bruhin
8e3feae598 Merge branch 'master' of https://github.com/RobinD42/Phoenix into june_ogl_rework-autopep8 2015-02-05 11:37:54 +01:00
Werner F Bruhin
2461989aa8 - added 'documented' flag, also could still do with some editing 2015-02-05 11:23:44 +01:00
Werner F Bruhin
0b0d7f3d89 - added additional tests per shape 2015-02-05 11:23:19 +01:00
Werner F Bruhin
f081eb9ba7 - remove -#!/usr/bin/env python 2015-02-05 11:08:10 +01:00
Werner F Bruhin
f8de460123 - prevent "wrapped C/C++ object of type MSWComboTreeBox has 
been deleted"
 2015-02-05 10:27:45 +01:00
Robin Dunn
964e224a75 We need a _focusColour for Mac too. 2015-02-04 19:11:16 -08:00
Robin Dunn
0ecc26455a Merge branch 'may-aquab' of git://github.com/wernerfb/Phoenix into wernerfb-may-aquab 2015-02-04 18:36:15 -08:00
Robin Dunn
fbde42b498 Merge pull request #71 from Metallicow/Add-ResizeWidget-Changeable-Options 
Allow RW colors & dimension to be customizable
 2015-02-04 17:57:41 -08:00
Robin Dunn
65559a65a1 Add TODO 2015-02-04 17:40:24 -08:00
Robin Dunn
0d529e07e3 Merge branch 'wernerfb-june-agw' into wip 
This is a modified version of PR #80
 2015-02-04 14:45:53 -08:00
Robin Dunn
91d1f5c4c3 Fix coding lines in agw. 
Remove #! lines. (It's only needed for files intended to be run from the command line.)
 2015-02-04 14:44:20 -08:00
Robin Dunn
fb07b42f22 fix spelling of ribbon in filename 2015-02-04 14:33:39 -08:00
Robin Dunn
30d645fcda Merge branch 'june-agw' of git://github.com/wernerfb/Phoenix into wernerfb-june-agw 2015-02-04 14:30:07 -08:00
Robin Dunn
5e55360242 Update six.py to 1.9.0 2015-02-04 14:18:06 -08:00
Robin Dunn
26ceb9f067 We don't have DoEraseBackground yet... 2015-02-04 14:18:01 -08:00
Robin Dunn
1a75ede097 Add DoEraseBackground from Classic, but leave it commented out for now 2015-02-04 14:18:00 -08:00
Robin Dunn
8d6d907e41 Double the timeout for Git. 
The OSX builders sometimes take too long fetching the wxWidgets submodule.
 2015-02-04 14:17:59 -08:00
Robin Dunn
a75e5adb71 fix another getSvnRev 2015-02-04 14:17:58 -08:00
Robin Dunn
21ea5db38e Merge pull request #83 from wernerfb/june_fixtests 
some unittest corrections for Py3
 2015-02-04 13:44:47 -08:00
Robin Dunn
d2d6b24e52 Merge pull request #88 from wernerfb/june-docs 
- sphinx didn't like the text formatting
 2015-02-04 12:20:30 -08:00
Robin Dunn
dd828ba8a5 Merge pull request #90 from wernerfb/july-img2py 
Img2Py update, note that second change is not tested
 2015-02-04 11:55:54 -08:00
Robin Dunn
053e75b625 Merge pull request #91 from fhoech/patch-1 
Prevent TabFrame being visible
 2015-02-04 11:53:10 -08:00
Robin Dunn
ecc26b1578 Add a few more notes 2015-02-03 15:04:55 -08:00
Robin Dunn
24bae664a3 Update the build numbers to match the new scheme 2015-02-03 15:04:25 -08:00
Robin Dunn
74dd179ef2 specify which branch the submodule should track 2015-02-03 15:02:02 -08:00
Robin Dunn
611417f509 Ensure the pathnames being uploaded are using forward slashes. 
A little refactoring
 2015-02-03 15:01:10 -08:00
Robin Dunn
fa6f31fc17 More buildbot tweaks. 
Fix the fullclean command and turn off environment logging for the Git step.
 2015-02-03 11:51:32 -08:00
Robin Dunn
57741846ed Oops, remove the windb import 2015-02-03 01:01:51 -08:00
Robin Dunn
efb63bd342 wxWidgets is a submodule of Phoenix now, so we only need to have the one Git build step, and the branch filter is much easier (normal) too. 2015-02-03 00:49:10 -08:00
Robin Dunn
27fbae8524 Adapt the build to the new relative location of the wx source 2015-02-03 00:40:14 -08:00