Skip to content
This repository has been archived by the owner on May 24, 2021. It is now read-only.

Sync enaml with chaco #230

Merged
merged 13 commits into from
Jan 7, 2013
Merged

Sync enaml with chaco #230

merged 13 commits into from
Jan 7, 2013

Conversation

itziakos
Copy link
Member

This pr re-introduces the logic to overcome issue #168

With this enaml-run will behave as follows.

  • If ETS_TOOLKIT is set and the --toolkit option is not enaml-run will respect ETS_TOOLKIT value and use the related backed.
  • if ETS_TOOLKIT is set and the --toolkit option is set to an incompatible backend then a warning is
    raised, but enaml-run will still honor the --toolkit option.
  • if ETS_TOOLKIT is not set then enaml-run with temporarily set the compatible backend in os.environ so that chaco and enaml components are in sync.

enaml_toolkit = 'wx' if toolkit_option == 'wx' else 'qt'
os.environ['ETS_TOOLKIT'] = 'wx' if enaml_toolkit == 'wx' else 'qt4'
else:
if enaml_toolkit != 'default':
Copy link
Contributor

Choose a reason for hiding this comment

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

enaml_toolkit appear to be an undefined local if this else block executes.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

sccolbert added a commit that referenced this pull request Jan 7, 2013
@sccolbert sccolbert merged commit f864975 into master Jan 7, 2013
@sccolbert sccolbert deleted the sync-enaml-with-chaco branch January 7, 2013 15:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants