From: Robin Dunn <robin@alldunn.com>
Date: Mon, 11 Apr 2005 19:57:02 +0000 (+0000)
Subject: updated coment
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ac3b71524692a19343c93ceb93bf5ef5f344f53c

updated coment


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/wxPython/src/_core_ex.py b/wxPython/src/_core_ex.py
index 0e5a51307b..5ad0d81365 100644
--- a/wxPython/src/_core_ex.py
+++ b/wxPython/src/_core_ex.py
@@ -32,11 +32,15 @@ if RELEASE_VERSION != _core_.RELEASE_VERSION:
 
 #----------------------------------------------------------------------------
 
-# Set the default string<-->unicode conversion encoding from the
-# locale.  This encoding is used when string or unicode objects need
-# to be converted in order to pass them to wxWidgets.  Please be aware
-# that the default encoding within the same locale may be slightly
-# different on different platforms.  For example, please see
+# Set wxPython's default string<-->unicode conversion encoding from
+# the locale, but only if Python's default hasn't been changed.  (We
+# assume that if the user has customized it already then that is the
+# encoding we need to use as well.)
+#
+# The encoding selected here is used when string or unicode objects
+# need to be converted in order to pass them to wxWidgets.  Please be
+# aware that the default encoding within the same locale may be
+# slightly different on different platforms.  For example, please see
 # http://www.alanwood.net/demos/charsetdiffs.html for differences
 # between the common latin/roman encodings.
 
diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i
index 0745aab834..472cd23e74 100644
--- a/wxPython/src/_notebook.i
+++ b/wxPython/src/_notebook.i
@@ -251,7 +251,7 @@ class NotebookPage(wx.Panel):
     """
     There is an old (and apparently unsolvable) bug when placing a
     window with a nonstandard background colour in a wx.Notebook on
-    wxGTK, as the notbooks's background colour would always be used
+    wxGTK1, as the notbooks's background colour would always be used
     when the window is refreshed.  The solution is to place a panel in
     the notbook and the coloured window on the panel, sized to cover
     the panel.  This simple class does that for you, just put an