Corrected some typos and quaint English

[wxWidgets.git] / wxPython / BUILD.win32.txt

diff --git a/wxPython/BUILD.win32.txt b/wxPython/BUILD.win32.txt
index 4944ecebe2cb09fe97e82d61df6863e3c2bf280b..a23b4270e019d1bfacd138cadfadd47103c7d9b6 100644 (file)
--- a/wxPython/BUILD.win32.txt
+++ b/wxPython/BUILD.win32.txt
@@ -55,10 +55,6 @@ B. You'll usually want to use wxWindows sources that have the same
    version number as the wxPython sources you are using.  (Another
    advantage of using CVS is that you'll get both at the same time.)
 
    version number as the wxPython sources you are using.  (Another
    advantage of using CVS is that you'll get both at the same time.)
 

-   NOTE:  There probably isn't going to be an official 2.2.2 release
-   for wxMSW so I have taken a snapshot of my workspace and made it
-   available at http://alldunn.com/wxPython/dist/others/
-

 C. Once you get the sources be sure to put them in a path without a
    space in it (i.e., NOT c:\Program Files\wx) and set an environment
    variable named WXWIN to this directory.  For example:
 C. Once you get the sources be sure to put them in a path without a
    space in it (i.e., NOT c:\Program Files\wx) and set an environment
    variable named WXWIN to this directory.  For example:


@@ -80,7 +76,6 @@ D. Change to the wx2\include\wx\msw directory and copy setup0.h to
         wxUSE_NEW_GRID                     1
         wxUSE_GLOBAL_MEMORY_OPERATORS      0
         wxUSE_LIBTIFF                      1
         wxUSE_NEW_GRID                     1
         wxUSE_GLOBAL_MEMORY_OPERATORS      0
         wxUSE_LIBTIFF                      1

-        wxUSE_GLCANVAS                     1

         wxDIALOG_UNIT_COMPATIBILITY        0
 
     I also turn off the following as they are not currently used in
         wxDIALOG_UNIT_COMPATIBILITY        0
 
     I also turn off the following as they are not currently used in


@@ -93,11 +88,16 @@ D. Change to the wx2\include\wx\msw directory and copy setup0.h to
         wxUSE_DIALUP_MANAGER               0
         wxUSE_DYNLIB_CLASS                 0
         wxUSE_DOC_VIEW_ARCHITECTURE        0
         wxUSE_DIALUP_MANAGER               0
         wxUSE_DYNLIB_CLASS                 0
         wxUSE_DOC_VIEW_ARCHITECTURE        0

-        wxUSE_MDI_ARCHITECTURE             0

         wxUSE_PLOT                         0
         wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
 
 
         wxUSE_PLOT                         0
         wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0
 
 

+    ** NEW **
+    Be sure that wxUSE_GLCANVAS is defined to be 0 as wxPython now
+    keeps its own copy of the glcanvas sources and expects that it is
+    not in the main library.  This is reduce the number of dependant
+    DLLs on the core library and therefore help reduce startup time.
+

 
 
 2. Build the wxWindows DLL
 
 
 2. Build the wxWindows DLL


@@ -155,7 +155,7 @@ B. There are three different types of wxWindows DLLs that can be
 C. Change to the wx2\src\msw directory and type the following command,
    using the value for FINAL that you want:
 
 C. Change to the wx2\src\msw directory and type the following command,
    using the value for FINAL that you want:
 

-        nmake -f makefile.vc dll pch USE_GLCANVAS=1 FINAL=hybrid
+        nmake -f makefile.vc dll pch FINAL=hybrid

 
    Your machine will then crunch away for possibly a long time,
    depending on your hardware, and when it's done you should have a
 
    Your machine will then crunch away for possibly a long time,
    depending on your hardware, and when it's done you should have a