From cb35465eeca59c2025e754cb1a361ee081dcece3 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 17 Jun 2001 13:32:53 +0000
Subject: [PATCH] Canvas lib precompiled header fix; doc typos fixes;
 makefile.vc dbtable.cpp addition

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 contrib/src/canvas/liner.cpp |  7 +++++++
 docs/changes.txt             | 15 ++++++++++++---
 docs/latex/wx/function.tex   |  2 +-
 docs/latex/wx/process.tex    |  4 ++--
 docs/latex/wx/wx.hpj         |  2 +-
 src/msw/makefile.dos         |  5 +++++
 src/msw/makefile.vc          |  1 +
 7 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/contrib/src/canvas/liner.cpp b/contrib/src/canvas/liner.cpp
index 9ee4607099..f52059971e 100644
--- a/contrib/src/canvas/liner.cpp
+++ b/contrib/src/canvas/liner.cpp
@@ -8,6 +8,13 @@ Last Update 05-12-1995
 #pragma implementation "liner.cpp"
 #endif
 
+// For compilers that support precompilation, includes "wx/wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
 #include <math.h>
 
 #include <stdlib.h>
diff --git a/docs/changes.txt b/docs/changes.txt
index 92f4252a7d..d7f0413045 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -10,8 +10,11 @@ wxBase:
 - Fixed new charset detection code (langinfo.h not included in intl.cpp;
   langinfo.h not neccessary in strconv.cpp)
 - ODBC Informix fixes (submitted by Roger Gammans)
+- Added ODBC date support to wxVariant
 - Added wxDbGrid class for displaying ODBC tables
 - Added wxDir::Traverse
+- Removed redundant wxDebugContext functions using C++ streams,
+  so now standard stream usage should be unnecessary
 
 All (GUI):
 
@@ -32,13 +35,14 @@ All (GUI):
 - Fixed calendar sample bug with using wxCommandEvent::GetInt()
   instead of GetId()
 - Added wxDbGrid combining wxODBC classes with wxGrid
+- Added more makefiles and project files for contrib hierarchy
 
 wxMSW:
 
 - Fixed wxApp::ProcessMessage so controls don't lose their
   accelerators when the accelerators are redefined elsewhere
 - Accelerators consisting of simple keystrokes (without control,
-  alt or shift) are now possible
+  alt or shift) now work
 - Compile fixes for Watcom C++ added
 - Compile fixes for Cygwin 1.0 added
 - Use SetForegroundWindow() in wxWindow::Raise() instead of BringWindowToTop()
@@ -50,6 +54,11 @@ wxMSW:
 - We now send iconize events
 - Fixed wxFrame::SetClientSize() with toolbar bug
 - Added mousewheel processing
+- Added wxSystemSettings::Get/SetOption so we can configure
+  wxWindows at run time; used this to implement no-maskblt option
+  in wxDC
+- Fixed bug when using MDIS_ALLCHILDSTYLES style: so now MDI
+  child frame styles are honoured
 
 wxGTK:
 
@@ -97,8 +106,8 @@ wxMSW:
 
 - threads: bug in wxCondition::Broadcast fixed (Pieter van der Meulen)
 - fixed bug in MDI children flags (mis)handling
-- it is possible to compile wxCHMHelpController with other compilers than VisualC++
-  now and hhctrl.ocx is loaded at runtime.
+- it is possible to compile wxCHMHelpController with compilers
+  other than Visual C++ now and hhctrl.ocx is loaded at runtime
 
 wxGTK:
 
diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index e35b960e45..09ba843d9f 100644
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -1804,7 +1804,7 @@ enum wxKillError
 
 \helpref{wxProcess::Kill}{wxprocesskill},\rtfsp
 \helpref{wxProcess::Exists}{wxprocessexists},\rtfsp
-\helpref{Exec sample}{sampleexex}
+\helpref{Exec sample}{sampleexec}
 
 \wxheading{Include files}
 
diff --git a/docs/latex/wx/process.tex b/docs/latex/wx/process.tex
index 4f7777e6eb..2994063100 100644
--- a/docs/latex/wx/process.tex
+++ b/docs/latex/wx/process.tex
@@ -157,7 +157,7 @@ enum wxKillError
 
 \helpref{wxProcess::Exists}{wxprocessexists},\rtfsp
 \helpref{wxKill}{wxkill},\rtfsp
-\helpref{Exec sample}{sampleexex}
+\helpref{Exec sample}{sampleexec}
 
 \membersection{wxProcess::Kill}\label{wxprocessexists}
 
@@ -168,7 +168,7 @@ Returns {\tt TRUE} if the given process exists in the system.
 \wxheading{See also}
 
 \helpref{wxProcess::Kill}{wxprocesskill},\rtfsp
-\helpref{Exec sample}{sampleexex}
+\helpref{Exec sample}{sampleexec}
 
 \membersection{wxProcess::OnTerminate}\label{wxprocessonterminate}
 
diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index 07caa08bae..8660c32a67 100644
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=c:\wx2dev\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
+BMROOT=x:\docs/latex/wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index cf89990a7d..daddd24345 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1372,6 +1372,11 @@ $(GENDIR)/wizard.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+test.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 
 
 $(COMMDIR)/y_tab.obj:     $*.c $(COMMDIR)/lex_yy.c
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index ca0d981bd7..fbe2600a9d 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -150,6 +150,7 @@ COMMONOBJS = \
 		..\common\$D\datetime.obj \
 		..\common\$D\datstrm.obj \
 		..\common\$D\db.obj \
+		..\common\$D\dbgrid.obj \
 		..\common\$D\dbtable.obj \
 		..\common\$D\dcbase.obj \
 		..\common\$D\dircmn.obj \
-- 
2.50.0

