Small changes

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

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 9df13cefdc279963dfbcb986878d57115a4646d3..6feb6de6072631857be7f52f693c136390c1d7f5 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -149,6 +149,9 @@ strong optimization, so long as the application is not strongly
 optimized. For example, in wxWindows project, set to 'Minimum
 Size'. In Dialog Editor project, set to 'Customize: Favor Small
 Code' (and no others). This will then work.
 optimized. For example, in wxWindows project, set to 'Minimum
 Size'. In Dialog Editor project, set to 'Customize: Favor Small
 Code' (and no others). This will then work.

+Note also that a bug in the compiler, even without optimization,
+causes dobjcmn.cpp to produce an internal error, so setup.h
+switches off drag and drop for VC++ 5.

 
 Similarly, in VC++ 4, optimization can cause internal compiler
 errors, so edit src\makevc.env and change /O1 to /Od before
 
 Similarly, in VC++ 4, optimization can cause internal compiler
 errors, so edit src\makevc.env and change /O1 to /Od before

diff --git a/docs/readme.txt b/docs/readme.txt
index 6665ca3a1d7827050f68d1e2cd7913df87c93da3..35b57e4e97f7de911f5320824884f21adce094f0 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -46,6 +46,9 @@ wxWindows 2.1.11
 - Text alignment options in wxStaticText.
 - wxImage class extended to read PCX and GIF files.
 - Documentation improvements.
 - Text alignment options in wxStaticText.
 - wxImage class extended to read PCX and GIF files.
 - Documentation improvements.

+- Revised configure system for wxGTK and wxMotif; tmake-based
+  system for generating wxMSW makefiles.
+- Installer for Windows as alternative to zip archives.

 
 Platforms supported
 -------------------
 
 Platforms supported
 -------------------

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index a9e132d600afe2d334961fe6afdf13ea730190f1..31e03b64321dc451a3299929c586bcfdb37391f1 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -32,7 +32,8 @@
 
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp
 
 #define wxUSE_CONFIG           1
                                 // Use wxConfig, with CreateConfig in wxApp

-
+#define wxUSE_DIALUP_MANAGER   1
+                                // Use wxDialUpManager class

 #define wxUSE_POSTSCRIPT  0
                                 // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0
 #define wxUSE_POSTSCRIPT  0
                                 // 0 for no PostScript device context
 #define wxUSE_AFM_FOR_POSTSCRIPT 0


@@ -451,5 +452,12 @@
 
 #endif
 
 
 #endif
 

+// Problem with VC++ 5 and dobjcmn.cpp
+
+#if defined(_MSC_VER) && (_MSC_VER > 1020) && (_MSC_VER < 1200)
+#undef wxUSE_DRAG_AND_DROP
+#define wxUSE_DRAG_AND_DROP 0
+#endif
+

 #endif
     // _WX_SETUP_H_
 #endif
     // _WX_SETUP_H_

diff --git a/src/msw/dialup.cpp b/src/msw/dialup.cpp
index fad3b9aac2ca7823a73169f26c247a8131377cff..64542d048ccbe683f1bf19bb248021ad3d3cdc15 100644 (file)
--- a/src/msw/dialup.cpp
+++ b/src/msw/dialup.cpp
@@ -40,6 +40,9 @@
 
 #include "wx/dialup.h"
 
 
 #include "wx/dialup.h"
 

+// Doesn't yet compile under BC++: no wininet.h
+#ifndef __BORLANDC__
+

 #include <ras.h>
 #include <raserror.h>
 
 #include <ras.h>
 #include <raserror.h>
 


@@ -1273,4 +1276,6 @@ static void WINAPI wxRasDialFunc(UINT unMsg,
                 rasconnstate, dwError);
 }
 
                 rasconnstate, dwError);
 }
 

+#endif
+  // __BORLANDC__

 #endif // wxUSE_DIALUP_MANAGER
 #endif // wxUSE_DIALUP_MANAGER