Minor changes

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

diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 279b02954ec9c8b0a32792789294ade141964dbf..6659a1680ee179cd73f9f88b0b9fb9c97bd3cde9 100644 (file)
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -332,15 +332,29 @@ Here are the steps required:
 All targets have 'clean' targets to allow removal of object files
 and other intermediate compiler files.
 
-Gotchas:
+Notes:
 
 - libwx.a is 48 MB or more - but much less if compiled with no
   debug info (-g0) and level 4 optimization (-O4).
+
 - install.exe doesn't have built-in decompression because lzexpand.lib
   isn't available with Cygwin. However, you can use it with external
   decompression utilities.
+
 - Doesn't compile src/msw/ole files, so no drag and drop.
 
+- There's a bug in the Mingw32 headers for some distributions.
+
+  in include/windows32/defines.h, where it says:
+
+  #define LPSTR_TEXTCALLBACKA (LPSTR)-1L)
+
+  it should say:
+
+  #define LPSTR_TEXTCALLBACKA ((LPSTR)-1L)
+
+  (a missing bracket).
+
 References:
 
  - The GNU-WIN32 site is at

diff --git a/docs/todo.txt b/docs/todo.txt
index 625f23e2fa82891b7af7f942876b8a9bea7fd172..87bcd223f193770d1380be81256433d3dfec0854 100644 (file)
--- a/docs/todo.txt
+++ b/docs/todo.txt
@@ -30,7 +30,8 @@ Please see also:
 
 - Add all makefiles/documentation for utils/serialize.
 
-- Complete this ToDo list :-)
+- Implement wxScrolledWindow::OnChar to scroll the window using
+  the keyboard.
 
 For 2.1: small changes not involving rewriting anything
 -------------------------------------------------------
@@ -48,3 +49,4 @@ For 2.2: major new additions
 - Unicode support (Win32 only probably)
 
 - DnD and OLE clipboard, uniform DnD/clipboard handling
+

diff --git a/src/msw/ole/automtn.cpp b/src/msw/ole/automtn.cpp
index f72ecea359d7aded0b2b75b2dbdd82ff617d518e..108c2948b0a47cf246d54ef0a8bb19b6a095e922 100644 (file)
--- a/src/msw/ole/automtn.cpp
+++ b/src/msw/ole/automtn.cpp
@@ -539,7 +539,8 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
     else if (type == "bool")
     {
         oleVariant.vt = VT_BOOL;
-#ifdef __WATCOMC__
+        // 'bool' required for VC++ 4 apparently
+#if defined(__WATCOMC__) || (defined(_MSC_VER) && (_MSC_VER <= 1000))
         oleVariant.bool = variant.GetBool();
 #else
         oleVariant.boolVal = variant.GetBool();

diff --git a/src/png/makefile.vc b/src/png/makefile.vc
index 6351a94e85e1256ddb30f06fc56b449d5c6441cf..cd9345debc1bd960141c51a8ef521de41f3aa733 100644 (file)
--- a/src/png/makefile.vc
+++ b/src/png/makefile.vc
@@ -47,7 +47,7 @@ OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj \
 all:    $(WINPNGLIB)
 
 $(WINPNGLIB):      $(OBJECTS)
-        erase $(WINPNGLIB)
+        -erase $(WINPNGLIB)
         lib @<<
 -out:$(WINPNGLIB)
 $(OBJECTS)