minor tweaks and discuss unicode build in win32 build instructions

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

diff --git a/wxPython/BUILD.win32.txt b/wxPython/BUILD.win32.txt
index 75395e3e41ad42823d667481a3a1512186ddfe13..21837237c120b5d9f7539fc4829cf88df9362033 100644 (file)
--- a/wxPython/BUILD.win32.txt
+++ b/wxPython/BUILD.win32.txt
@@ -41,10 +41,32 @@ the free mingw32 or Borland compilers, but I havn't tried them yet.
 If anybody wants to try it I'll take any required patches for the
 setup script and for these instructions.
 
+
+UNICODE
+-------
+
+To build the version of wxWindows/wxPython that uses the unicode
+version of the Win32 APIs, just follow the steps below with these
+changes:
+
+    a. You'll need the MSLU lib and dll, which is part of the new
+       Platform SDK from Microsoft.  See MSDN.microsoft.com for
+       details.
+
+    b. Add "UNICODE=1 MSLU=1" to the nmake command line when building
+       wxWindows.
+
+    c. Add "UNICODE=1" to the setup.py commandline when building
+       wxPython.
+
+    d. See the notes in CHANGES.txt about unicode.
+
+
 And now on to the fun stuff...
 
 
 
+
 1. Get the wxWindows sources
 ----------------------------
 

diff --git a/wxPython/CHANGES.txt b/wxPython/CHANGES.txt
index 5dc34dafae221cfc68b2327002d928684ccd9f54..6e94c00e6aa398ac187d077963850743bf48ed90 100644 (file)
--- a/wxPython/CHANGES.txt
+++ b/wxPython/CHANGES.txt
@@ -36,7 +36,6 @@ Added wxBufferedDC.
 Upgraded wxSTC from Scintilla 1.40 to Scintilla 1.45
 
 UNICODE!
-
     wxWindows/wxPython can be compiled with unicode support enabled or
     disabled.  Previous to wxPython 2.3.3 non-unicode mode was always
     used.  Starting with 2.3.3 either mode is supported, but only if
@@ -124,6 +123,7 @@ DoGetBestSize and AcceptsFocus.
 
 
 
+
 2.3.2.1
 -------
 Changed (again) how the Python global interpreter lock is handled as

diff --git a/wxPython/setup.py b/wxPython/setup.py
index c384c2038f5c63f06205b771efc97616f43dd526..ecd5a4a8700ad86904451b01f78c33f04c06f0ef 100755 (executable)
--- a/wxPython/setup.py
+++ b/wxPython/setup.py
@@ -341,8 +341,8 @@ else:
 # Check if the version file needs updated
 #----------------------------------------------------------------------
 
-if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
-    open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)
+#if IN_CVS_TREE and newer('setup.py', 'src/__version__.py'):
+open('src/__version__.py', 'w').write("ver = '%s'\n" % VERSION)