From fbda4deb28bd4c7c5f5591f38cf186d912e0ff37 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 10 Jan 2014 05:39:16 +0000
Subject: [PATCH] Fix some "wxPython" package names --> "wx" in comments, etc.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@75580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 wx/lib/masked/ctrl.py | 4 ++--
 wx/tools/dbg.py       | 5 ++---
 wx/tools/img2img.py   | 2 +-
 wx/tools/img2png.py   | 2 +-
 wx/tools/img2py.py    | 2 +-
 wx/tools/img2xpm.py   | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/wx/lib/masked/ctrl.py b/wx/lib/masked/ctrl.py
index 254db9af..d6e9296f 100644
--- a/wx/lib/masked/ctrl.py
+++ b/wx/lib/masked/ctrl.py
@@ -43,8 +43,8 @@ controlType can be one of::
 These constants are also available individually, ie, you can
 use either of the following::
 
-    from wxPython.wx.lib.masked import Ctrl, COMBO, TEXT, NUMBER, TIME
-    from wxPython.wx.lib.masked import Ctrl, controlTypes
+    from wx.lib.masked import Ctrl, COMBO, TEXT, NUMBER, TIME
+    from wx.lib.masked import Ctrl, controlTypes
 
 If not specified as a keyword argument, the default controlType is
 controlTypes.TEXT.
diff --git a/wx/tools/dbg.py b/wx/tools/dbg.py
index b9a1015f..c05b6cb7 100644
--- a/wx/tools/dbg.py
+++ b/wx/tools/dbg.py
@@ -78,7 +78,7 @@ stream
 You can also call the log function implicitly on the Logger
 instance, ie. you can type::
 
-    from wxPython.tools.dbg import Logger
+    from wx.tools.dbg import Logger
     dbg = Logger()
     dbg('something to print')
 
@@ -162,8 +162,7 @@ class Logger:
             output = ' ' * 3 * self._indent + output
 
             if self._wxLog:
-                from wxPython.wx import wxLogMessage    # (if not already imported)
-                wxLogMessage(output)
+                wx.LogMessage(output)
             else:
                 self._outstream.write(output + '\n')
                 self._outstream.flush()
diff --git a/wx/tools/img2img.py b/wx/tools/img2img.py
index 8a4b9ff5..88a5ef96 100644
--- a/wx/tools/img2img.py
+++ b/wx/tools/img2img.py
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------
-# Name:        wxPython.tools.img2img
+# Name:        wx.tools.img2img
 # Purpose:     Common routines for the image converter utilities.
 #
 # Author:      Robin Dunn
diff --git a/wx/tools/img2png.py b/wx/tools/img2png.py
index 69fa69c1..76b5fc57 100644
--- a/wx/tools/img2png.py
+++ b/wx/tools/img2png.py
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------
-# Name:        wxPython.tools.img2png
+# Name:        wx.tools.img2png
 # Purpose:     Convert an image to PNG format
 #
 # Author:      Robin Dunn
diff --git a/wx/tools/img2py.py b/wx/tools/img2py.py
index 090aeb20..091a34a9 100644
--- a/wx/tools/img2py.py
+++ b/wx/tools/img2py.py
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------
-# Name:        wxPython.tools.img2py
+# Name:        wx.tools.img2py
 # Purpose:     Convert an image to Python code.
 #
 # Author:      Robin Dunn
diff --git a/wx/tools/img2xpm.py b/wx/tools/img2xpm.py
index 9907d1d6..53e9fcba 100644
--- a/wx/tools/img2xpm.py
+++ b/wx/tools/img2xpm.py
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------
-# Name:        wxPython.tools.img2xpm
+# Name:        wx.tools.img2xpm
 # Purpose:     Convert an image to XPM format
 #
 # Author:      Robin Dunn