Assorted fixes from working with examples.

enthought · Jan 21, 2017 · 8a02c38 · 8a02c38
1 parent f615518
commit 8a02c38
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 11 deletions.
diff --git a/examples/tasks/advanced/python_editor_wx.py b/examples/tasks/advanced/python_editor_wx.py
@@ -22,7 +22,7 @@
 # Enthought library imports.
 from traits.api import Bool, Event, Instance, File, Unicode, Property, provides
 from pyface.tasks.api import Editor
-from pyface.util.python_stc import PythonSTC, faces
+from pyface.wx.python_stc import PythonSTC, faces
 
 # Local imports.
 from i_python_editor import IPythonEditor

diff --git a/pyface/ui/wx/expandable_header.py b/pyface/ui/wx/expandable_header.py
@@ -23,9 +23,9 @@
 from traits.api import Instance, Event, Str, Bool
 
 # local imports
+from pyface.wx.util.font_helper import new_font_like
 from .image_resource import ImageResource
 from .widget import Widget
-from pyface.util.font_helper import new_font_like
 
 
 class ExpandableHeader(Widget):

diff --git a/pyface/ui/wx/heading_text.py b/pyface/ui/wx/heading_text.py
@@ -26,7 +26,7 @@
 # Local imports.
 from pyface.i_heading_text import IHeadingText, MHeadingText
 from pyface.image_resource import ImageResource
-from pyface.util.font_helper import new_font_like
+from pyface.wx.util.font_helper import new_font_like
 from .widget import Widget
 
 

diff --git a/pyface/ui/wx/preference/preference_dialog.py b/pyface/ui/wx/preference/preference_dialog.py
@@ -26,8 +26,8 @@
 from pyface.ui.wx.layered_panel import LayeredPanel
 from pyface.ui.wx.split_dialog import SplitDialog
 from pyface.ui.wx.viewer.tree_viewer import TreeViewer
-from pyface.util.font_helper import new_font_like
 from pyface.viewer.default_tree_content_provider import DefaultTreeContentProvider
+from pyface.wx.util.font_helper import new_font_like
 
 
 class PreferenceDialog(SplitDialog):

diff --git a/pyface/ui/wx/python_editor.py b/pyface/ui/wx/python_editor.py
@@ -26,7 +26,7 @@
 # Local imports.
 from pyface.i_python_editor import IPythonEditor, MPythonEditor
 from pyface.key_pressed_event import KeyPressedEvent
-from pyface.util.python_stc import PythonSTC, faces
+from pyface.wx.python_stc import PythonSTC, faces
 from .widget import Widget
 
 

diff --git a/pyface/ui/wx/splash_screen.py b/pyface/ui/wx/splash_screen.py
@@ -28,13 +28,10 @@
 from traits.api import Any, Bool, Font, Instance, Int, provides
 from traits.api import Tuple, Unicode
 
-# Private Enthought library imports.
-# FIXME v3: This should be moved out of pyface.
-from pyface.util.font_helper import new_font_like
-
 # Local imports.
 from pyface.i_splash_screen import ISplashScreen, MSplashScreen
 from pyface.image_resource import ImageResource
+from pyface.wx.util.font_helper import new_font_like
 from .window import Window
 
 

diff --git a/pyface/ui/wx/tree/tree.py b/pyface/ui/wx/tree/tree.py
@@ -32,7 +32,7 @@
 from pyface.tree.tree_model import TreeModel
 from pyface.ui.wx.gui import GUI
 from pyface.ui.wx.image_list import ImageList
-from puface.ui.wx import Widget
+from pyface.ui.wx.widget import Widget
 from pyface.wx.drag_and_drop import PythonDropSource, PythonDropTarget
 
 

diff --git a/pyface/util/font_helper.py b/pyface/util/font_helper.py
@@ -14,4 +14,4 @@
     'DEPRECATED: pyface.util.font_helper, use pyface.wx.utils.font_helper instead. '
     'Will be removed in Pyface 7.')
 
-from pyface.wx.utils.font_helper import *
+from pyface.wx.util.font_helper import *