merged fixes for accel and command event non propagation from 2.2

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

diff --git a/wxPython/BUILD.win32.txt b/wxPython/BUILD.win32.txt
index d86ccfa9528b142df59281214b4175d096952d81..64d2c071e1a09e736b03a4c9b6510ec8eeaeb8eb 100644 (file)
--- a/wxPython/BUILD.win32.txt
+++ b/wxPython/BUILD.win32.txt
@@ -76,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,6 +92,13 @@ D. Change to the wx2\include\wx\msw directory and copy setup0.h to
         wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 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 done to 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


@@ -150,7 +156,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