From 9be9d2f53d7b838111bb8276a055954229de5368 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 15 Jun 2000 14:10:18 +0000
Subject: [PATCH] Small mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/html/news.htm     |  6 +++---
 docs/tech/tn0004.htm   |  2 +-
 src/generic/laywin.cpp | 11 +++++++----
 src/png/PngVC.dsp      |  6 +++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/docs/html/news.htm b/docs/html/news.htm
index ccc451b57a..515685d396 100644
--- a/docs/html/news.htm
+++ b/docs/html/news.htm
@@ -8,10 +8,10 @@
 
 <font face="Arial, Lucida Sans, Helvetica">
 
-<table width=100% border=4 cellpadding=5 cellspacing=0>
+<table width=100% border=0 cellpadding=5 cellspacing=0>
 <tr>
-<td bgcolor="#660000">
-<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#FFFFFF">
+<td bgcolor="#C4ECF9">
+<font size=+1 face="Arial, Lucida Sans, Helvetica" color="#000000">
 News
 </font>
 </td>
diff --git a/docs/tech/tn0004.htm b/docs/tech/tn0004.htm
index acf43fcaef..59fd68658e 100644
--- a/docs/tech/tn0004.htm
+++ b/docs/tech/tn0004.htm
@@ -168,7 +168,7 @@ Solution 3</h3>
 
 <ul>
 <li>
-download the wxWindows-2.1.15-bc.zip file,</li>
+download the wxWindows-2.1.15-bcb.zip file,</li>
 
 <li>
 extract it</li>
diff --git a/src/generic/laywin.cpp b/src/generic/laywin.cpp
index e4e6bf6efa..409814e682 100644
--- a/src/generic/laywin.cpp
+++ b/src/generic/laywin.cpp
@@ -254,11 +254,14 @@ bool wxLayoutAlgorithm::LayoutWindow(wxWindow* parent, wxWindow* mainWindow)
     {
         wxWindow* win = (wxWindow*) node->Data();
 
-        event.SetId(win->GetId());
-        event.SetEventObject(win);
-        event.SetFlags(0); // ??
+        if (win != mainWindow)
+        {
+            event.SetId(win->GetId());
+            event.SetEventObject(win);
+            event.SetFlags(0); // ??
 
-        win->GetEventHandler()->ProcessEvent(event);
+            win->GetEventHandler()->ProcessEvent(event);
+        }
 
         node = node->Next();
     }
diff --git a/src/png/PngVC.dsp b/src/png/PngVC.dsp
index dfa963dfdf..6c43ab7b18 100644
--- a/src/png/PngVC.dsp
+++ b/src/png/PngVC.dsp
@@ -8,12 +8,12 @@ CFG=png - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "png.mak".
+!MESSAGE NMAKE /f "PngVC.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "png.mak" CFG="png - Win32 Debug"
+!MESSAGE NMAKE /f "PngVC.mak" CFG="png - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "..\zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe