From bc00e7155e50add264599856a39e0ceb2db19541 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sat, 9 Jun 2001 17:43:16 +0000
Subject: [PATCH] Updates for 2.3.1; fixed syntax error in makefile.b32 but
 this probably means that the 'version' fix for BC++ doesn't work
 (misapplied?)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/innobott.txt    |  2 +-
 distrib/msw/innotop.txt     | 12 +++++-----
 distrib/msw/tmake/b32.t     |  5 ++--
 distrib/msw/zipdistinno.bat |  2 +-
 docs/changes.txt            | 47 ++++++++++++++++++++++++++++++++++---
 docs/latex/wx/snglinst.tex  |  2 +-
 docs/readme.txt             |  9 +++----
 src/generic/gridctrl.cpp    |  8 +++----
 src/msw/makefile.b32        |  5 ++--
 src/msw/textctrl.cpp        |  4 ++++
 src/wxvc.dsp                |  8 +++++++
 src/wxvc_dll.dsp            |  8 +++++++
 12 files changed, 86 insertions(+), 26 deletions(-)

diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt
index ee50041d17..85e1e66cd6 100644
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -31,7 +31,7 @@
 ; DO NOT DELETE THEM or you may be unable to reload the script
 
 ;[ScriptSetup]
-;VerNum=2.3.0
+;VerNum=2.3.1
 ;InnoVer=1.3
 ;AddVerTo=AppVerName
 ;SetupFilename=setup.exe
diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt
index d06b554379..68cce278ed 100644
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -4,13 +4,13 @@
 
 [Setup]
     MinVersion=4.0,4.0
-    AppName=wxWindows 2.3.0
+    AppName=wxWindows 2.3.1
     AppId=wxWindows
     CreateUninstallRegKey=1
     UsePreviousAppDir=1
     UsePreviousGroup=1
-    AppVersion=2.3.0
-    AppVerName=wxWindows 2.3.0
+    AppVersion=2.3.1
+    AppVerName=wxWindows 2.3.1
     AppCopyright=Copyright © The wxWindows Team
     BackColor=$FF0000
     BackColor2=$000000
@@ -19,7 +19,7 @@
     WindowStartMaximized=1
     WindowVisible=1
     WindowResizable=1
-    UninstallDisplayName=wxWindows 2.3.0
+    UninstallDisplayName=wxWindows 2.3.1
     UninstallLogMode=Append
     DirExistsWarning=auto
     UninstallFilesDir={app}
@@ -28,10 +28,10 @@
     CreateAppDir=1
     DisableProgramGroupPage=0
     AlwaysCreateUninstallIcon=1
-    UninstallIconName=Uninstall wxWindows 2.3.0
+    UninstallIconName=Uninstall wxWindows 2.3.1
     Uninstallable=1
     DefaultDirName=c:\wx230
-    DefaultGroupName=wxWindows 2.3.0
+    DefaultGroupName=wxWindows 2.3.1
     LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
     InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt
     InfoAfterFile=C:\wx2dev\wxWindows\docs\msw\install.txt
diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 3544db6ba5..4f48d2e4cc 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -159,7 +159,7 @@ default:	wx
 
 wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
-all:	all_libs all_execs
+all:	wx
 
 !if "$(DLL)" == "0"
 
@@ -189,7 +189,8 @@ wxb32
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
-version.res
+
+#version.res
 
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index dea59e0e1d..18b2237bdf 100755
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -6,7 +6,7 @@ set dest=%src\deliver
 set inno=0
 
 Rem Set this to the required version
-set version=2.3.0
+set version=2.3.1
 
 if "%src" == "" goto usage
 if "%dest" == "" goto usage
diff --git a/docs/changes.txt b/docs/changes.txt
index 122b60b42b..43672a8637 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -4,16 +4,58 @@ wxWindows 2 Change Log
 2.3.1
 -----
 
+wxBase:
+
+- Fixes for gcc 3.0
+- 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 wxDir::Traverse
+
 All (GUI):
 
 - Added EVT_GRID_EDITOR_CREATED and wxGridEditorCreatedEvent so the
   user code can get access to the edit control when it is created, (to
-  push on a custom event handler for example.)
+  push on a custom event handler for example)
 - Added wxTextAttr class and SetStyle, SetDefaultStyle and
-  GetDefaultStyle methods to wxTextCtrl.
+  GetDefaultStyle methods to wxTextCtrl
+- Added wxSingleInstanceChecker
+- Improvements to Tex2RTF
+- Added Paul and Roger Gammans' grid controls
+- Bug in wxDocument::Save logic corrected, whereby Save didn't save when not
+  first-time saved
+- Fixed memory leak in textcmn.cpp
+- Various wxXML enhancements
+- Removed wxCLIP_CHILDREN style from wxSplitterWindow
+- Fixed memory leak in DoPrint, htmprint.cpp
+- Fixed calendar sample bug with using wxCommandEvent::GetInt()
+  instead of GetId()
 
+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
+- Compile fixes for Watcom C++ added
+- Compile fixes for Cygwin 1.0 added
+- Replaced wxYield() call in PopupMenu() by a much safer
+  wxYieldForCommandsOnly() - fixes tree ctrl bug
+- Enter processing in wxSpinCtrl fixed
+- Fixed bug in determining the best listbox size
+- Fix for wxFrame's last focus bug
+- We now send iconize events
+- Fixed wxFrame::SetClientSize() with toolbar bug
+- Added mousewheel processing
 
+wxGTK:
+
+- Fixed slider rounding bug
+- Added code to set wxFont's default encoding to
+  wxLocale::GetSystemEncoding()
+- We now send iconize events
+- Fix for discrepancies between wxNotebookEvent and wxNotebook
+  GetSelection() results
 
 2.3.0
 -----
@@ -49,7 +91,6 @@ All (GUI):
 - ODBC NULL column support completed (Roger/Paul Gammans)
 - ODBC All "char *" and char arrays removed and replaced with wxString use
 
-
 wxMSW:
 
 - threads: bug in wxCondition::Broadcast fixed (Pieter van der Meulen)
diff --git a/docs/latex/wx/snglinst.tex b/docs/latex/wx/snglinst.tex
index 4e4f3cce62..10f4535c7e 100644
--- a/docs/latex/wx/snglinst.tex
+++ b/docs/latex/wx/snglinst.tex
@@ -80,7 +80,7 @@ had been used is an error.
 
 \wxheading{Parameters}
 
-\docparam{name}{must be given and be as unique as possible, it is used as the
+\docparam{name}{must be given and be as unique as possible. It is used as the
 mutex name under Win32 and the lock file name under Unix. 
 \helpref{GetAppName()}{wxappgetappname} may be a good value for this parameter}
 
diff --git a/docs/readme.txt b/docs/readme.txt
index a3e6d1cfd8..6168e21a45 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWindows 2.3.0
+wxWindows 2.3.1
 ---------------
 
 *** Please note that this is an UNSTABLE DEVELOPMENT SNAPSHOT.
@@ -182,9 +182,6 @@ the Independent JPEG Group". See src/jpeg/README for details.
 Documentation
 -------------
 
-See docs/bugs.txt for a bug list: this file is new and will initially
-  be edited by hand, later generated from a web-based bug database.
-
 See docs/html/index.htm for an HTML index of the major documents.
 
 See docs/changes.txt for a summary of changes to wxWindows 2.
@@ -215,7 +212,7 @@ front-end and hundreds of MB of compilers, utilities and other
 material may be ordered from the CD-ROM page: see the wxWindows
 web site.
 
-Good luck!
+Have fun!
 
-The wxWindows Team, 12th May, 2001
+The wxWindows Team, 10th June, 2001
 
diff --git a/src/generic/gridctrl.cpp b/src/generic/gridctrl.cpp
index 6a6076ace6..a6f8f58b80 100644
--- a/src/generic/gridctrl.cpp
+++ b/src/generic/gridctrl.cpp
@@ -115,7 +115,7 @@ wxSize wxGridCellDateTimeRenderer::GetBestSize(wxGrid& grid,
 }
 
 void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
-    if(params)
+    if (!params.IsEmpty())
         m_oformat=params;
 }
 
@@ -128,7 +128,7 @@ void wxGridCellDateTimeRenderer::SetParameters(const wxString& params){
 
 wxGridCellEnumRenderer::wxGridCellEnumRenderer(const wxString& choices)
 {
-    if(choices)
+    if (!choices.IsEmpty())
         SetParameters(choices);
 }
 
@@ -215,7 +215,7 @@ void wxGridCellEnumRenderer::SetParameters(const wxString& params)
 wxGridCellEnumEditor::wxGridCellEnumEditor(const wxString& choices)
                     : wxGridCellChoiceEditor()
 {
-    if(choices)
+    if (!choices.IsEmpty())
         SetParameters(choices);
 }
 
@@ -363,7 +363,7 @@ wxGridCellAutoWrapStringRenderer::GetBestSize(wxGrid& grid,
                                               wxDC& dc,
                                               int row, int col)
 {
-    int x,y, height , width = grid.GetColSize(col) -10;
+    wxCoord x,y, height , width = grid.GetColSize(col) -10;
     int count = 250; //Limit iterations..
 
     wxRect rect(0,0,width,10);
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index d641cf2cea..edae379db6 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -351,7 +351,7 @@ default:	wx
 
 wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
-all:	all_libs all_execs
+all:	wx
 
 !if "$(DLL)" == "0"
 
@@ -381,7 +381,8 @@ wxb32
 
 dummy.obj: dummy.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
 dummydll.obj: dummydll.$(SRCSUFF) $(LOCALHEADERS) $(BASEHEADERS) $(WXDIR)\include\wx\wx.h
-version.res
+
+#version.res
 
 $(MSWDIR)\y_tab.obj:     $(COMMDIR)\y_tab.c $(COMMDIR)\lex_yy.c
 
diff --git a/src/msw/textctrl.cpp b/src/msw/textctrl.cpp
index 9d68d44fc6..0676f10f0d 100644
--- a/src/msw/textctrl.cpp
+++ b/src/msw/textctrl.cpp
@@ -1313,6 +1313,10 @@ bool wxTextCtrl::SetStyle(long start, long end, const wxTextAttr& style)
     }
 
 #if wxUSE_RICHEDIT2
+#ifndef CFM_BACKCOLOR
+#define CFM_BACKCOLOR 0x04000000
+#endif
+
     if ( wxRichEditModule::GetLoadedVersion() > 1 && style.HasBackgroundColour() )
     {
         cf.dwMask |= CFM_BACKCOLOR;
diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index bfca38b300..94a009a11f 100644
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -560,6 +560,10 @@ SOURCE=.\generic\grid.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\gridctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\gridsel.cpp
 # End Source File
 # Begin Source File
@@ -1067,6 +1071,10 @@ SOURCE=.\msw\slidrmsw.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\snglinst.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 9fe23cf9c1..cfead83e22 100644
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -558,6 +558,10 @@ SOURCE=.\generic\grid.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\generic\gridctrl.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\generic\gridsel.cpp
 # End Source File
 # Begin Source File
@@ -1065,6 +1069,10 @@ SOURCE=.\msw\slidrmsw.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\msw\snglinst.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
-- 
2.50.0

