Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

- wxPython Phoenix #1995

Closed
wants to merge 10 commits into from
Closed

Conversation

wernerfb
Copy link
Contributor

Changes for wxPython Phoenix compatibility, only tested against 1.2.0 install on Win 32. Tested against wxPython 2.8.12.1, 2.9.5 classic and 2.9.5 phoenix, use a recent snapshot build from http://wxpython.org/Phoenix/snapshot-builds/

It should be compatible with wxPython 2.8+ classic.

@@ -1052,7 +1051,10 @@ def start_event_loop(self, timeout=0):
bind(self, wx.EVT_TIMER, self.stop_event_loop, id=id)

# Event loop handler for start/stop event loop
self._event_loop = wx.EventLoop()
if 'phoenix' in wx.PlatformInfo:
self.event_loop = wx.GUIEventLoop()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be self._event_loop (leading underscore)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I am just testing again against Phoenix and I never get to that line. Do you know when/why start_event_loop method should fire?

@efiring
Copy link
Member

efiring commented May 13, 2013

This replaces #1974, so I am closing that one.

@wernerfb
Copy link
Contributor Author

I'll work on the other embedding_in_wx examples to make them compatible with Phoenix, but don't have much time this week, hopefully by the end of next week, will at that point update this PR

wernerfb and others added 4 commits May 16, 2013 10:02
- additional updates to examples and set them to default to 2.8
A Sage user commented that one couldn't make plots in Sage "sage".  But this is a color.  http://xkcd.com/color/rgb/ recommends the following, and the discussion at https://groups.google.com/forum/#!topic/sage-devel/CnH45Ym4zSk indicates it could be useful as well as fun.
Fix backend_svg.RendererSVG.draw_text to render urls
@tacaswell
Copy link
Member

@wernerfb Any progress on this? In any case, this will need a rebase.

@wernerfb
Copy link
Contributor Author

wernerfb commented Jan 6, 2014

I rebased and updated my Phoenix copy to the snapshot for wxPython Phoenix 3.0 of Jan 5.2014.

I can run all embedding_in_wx?.py and close them if I try to resize the frame I get exceptions "AttributeError: 'MyApp' object has no attribute 'ProcessIdle'" which I will need to research some more. The exception is thrown on different lines when I run the same module - so a bit confusing.

I am still using mpl 1.2.0, so need to update that before I can test this further.

@tacaswell
Copy link
Member

@wernerfb It looks like you did a merge instead of a re-base. By merging the v1.3 branch back into your branch the eventually merge back upstream gets messy. Rebasing basically 're-plays' your commits on top of the current head of the upstream branch (see http://git-scm.com/book/en/Git-Branching-Rebasing). It re-writes history, but is useful in this case to keep the merge history clean(er).

@wernerfb
Copy link
Contributor Author

Hhm, I am pretty sure I did a rebase, but wouldn't put my hand into the fire:), as git is still confusing me.

Will look into this when I get a moment to upgrade my matplot install.

@tacaswell
Copy link
Member

This still needs to be cleaned up. You need to

  1. reset your branch to the commit before you did the merge
  2. rebase onto current master. The text at doc : rebase #2742 might be helpful (and if it is not please tell me why!)
  3. force push to github

@wernerfb
Copy link
Contributor Author

Sorry for delay was away without internet access.

The 'reset' leaves me with un-commited stuff which has nothing to do with what I worked on.
When I find a moment I do a new fork and merge my changes in by hand and do another pull request.
I close this in the mean time.

@wernerfb wernerfb closed this Feb 11, 2014
@wernerfb wernerfb deleted the wxPython-Phoenix branch February 11, 2014 14:47
@wernerfb
Copy link
Contributor Author

This is replaced by PR #2803

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants