BC++ IDE compile mod to thread.cpp; other small stuff

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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index b70a1f16798df1394ae6417ee6a3dfe09b9c8e7c..cddedc6017a5feb9fef8c78eb02ff36a229d9c3a 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -54,6 +54,9 @@ docs/*.htm
 docs/html/*.htm
 docs/html/*.gif
 docs/html/*.png
+docs/html/icons/*.gif
+docs/html/icons/*.png
+docs/html/icons/*.jpg
 
 src/makeenvs/*.env
 src/make.env
@@ -141,7 +144,8 @@ bitmaps/bmp/16x15/*.*
 bitmaps/bmp/10x8/*.*
 bitmaps/ico/32x32/*.*
 
-afm/*.*
+misc/afm/*.afm
+misc/gs_afm/*.afm
 
 utils/*.txt
 utils/make*
@@ -1036,3 +1040,14 @@ samples/menu/*.png
 samples/menu/*.ico
 samples/menu/*.txt
 
+samples/life/*.cpp
+samples/life/*.h
+samples/life/makefile*
+samples/life/*.rc
+samples/life/*.def
+samples/life/*.ico
+samples/life/*.xpm
+samples/life/*.txt
+samples/life/bitmaps/*.xpm
+samples/life/bitmaps/*.bmp
+

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index 4c9a3f729c62646d754ef23e3e04c6dc4c2173dd..5947966a6e3a2a8d20aae5f7ad008dc40eac4d84 100644 (file)
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -49,6 +49,7 @@ samples/nettest/Makefile.in
 samples/font/Makefile.in
 samples/menu/Makefile.in
 samples/console/Makefile.in
+samples/life/Makefile.in
 utils/glcanvas/motif/Makefile.in
 utils/Makefile.in
 utils/wxMMedia2/Makefile.in

diff --git a/distrib/msw/tiff.rsp b/distrib/msw/tiff.rsp
new file mode 100644 (file)
index 0000000..5fb9219
--- /dev/null
+++ b/distrib/msw/tiff.rsp
@@ -0,0 +1,9 @@
+src/tiff/make*
+src/tiff/tiff.dsp
+src/tiff/tiff.dsw
+src/tiff/*.c
+src/tiff/*.h
+src/tiff/README
+src/tiff/COPYRIGHT
+src/tiff/VERSION
+src/tiff/TODO

diff --git a/distrib/msw/wisetop.txt b/distrib/msw/wisetop.txt
index 713df8169bbb0eff041b503344b499b82d1eff0f..0332990c1024241fba061b84c440122dfc51d1dd 100644 (file)
--- a/distrib/msw/wisetop.txt
+++ b/distrib/msw/wisetop.txt
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=5.0
-  Title=wxWindows 2.1.11 Installation
+  Title=wxWindows 2.1.12 Installation
   Flags=00000100
   Split=1420
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -47,7 +47,7 @@ item: End Block
 end
 item: Set Variable
   Variable=APPTITLE
-  Value=wxWindows 2.1.11
+  Value=wxWindows 2.1.12
 end
 item: Set Variable
   Variable=GROUP
@@ -207,7 +207,7 @@ item: Custom Dialog Set
     item: Static
       Rectangle=86 41 256 130
       Create Flags=01010000000000000000000000000000
-      Text=This installation program will install %APPTITLE%. It will need about 18 MB of hard disk space.
+      Text=This installation program will install %APPTITLE%. It will need about 25 MB of hard disk space.
       Text=
       Text=Press the Next button to start the installation. You can press the Cancel button now if you do not want to install %APPTITLE% at this time.
       Text French=Ce programme d'installation va installer %APPTITLE%.

diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat
index 929f4a05984bd6a9d569fa5ff8ea24720c1f459a..f2aca66c01931321b62c90279722b5081fac03b1 100755 (executable)
--- a/distrib/msw/zipdist.bat
+++ b/distrib/msw/zipdist.bat
@@ -26,6 +26,7 @@ erase %dest\glcanvas.zip
 erase %dest\ogl3.zip
 erase %dest\tex2rtf2.zip
 erase %dest\jpeg.zip
+erase %dest\tiff.zip
 
 if direxist %dest\wx deltree /Y %dest\wx
 
@@ -73,6 +74,9 @@ zip32 -@ %dest\treedraw.zip < %src\distrib\msw\wxtree.rsp
 rem JPEG source
 zip32 -@ %dest\jpeg.zip < %src\distrib\msw\jpeg.rsp
 
+rem TIFF source
+zip32 -@ %dest\tiff.zip < %src\distrib\msw\tiff.rsp
+
 copy %src\docs\changes.txt %dest
 copy %src\docs\msw\install.txt %dest\install_msw.txt
 copy %src\docs\motif\install.txt %dest\install_motif.txt
@@ -107,6 +111,7 @@ unzip32 -o ..\glcanvas.zip
 unzip32 -o ..\treedraw.zip
 unzip32 -o ..\ogl3.zip
 unzip32 -o ..\jpeg.zip
+unzip32 -o ..\tiff.zip
 unzip32 -o ..\tex2rtf2.zip
 
 rem Now delete a few files that are unnecessary
@@ -126,7 +131,7 @@ rem from within distrib\msw, to split off wisetop.txt and wisebott.txt.
 echo Calling 'makewise' to generate wxwin2.wse...
 call %WXWIN\distrib\msw\makewise.bat
 
-erase /Y setup.*
+erase /Y *setup.*
 
 rem Now invoke WISE install on the new wxwin2.wse
 set wisecmd="c:\Program Files\wise\wise32.exe" /C %WXWIN\distrib\msw\wxwin2.wse
@@ -156,7 +161,7 @@ ren setup.w06 s
 ren s setup.w06
 
 rem Put all the setup files into a single zip archive.
-zip32 setup.zip readme.txt setup.*
+zip32 wx%version%_setup.zip readme.txt setup.*
 
 echo wxWindows archived.
 

diff --git a/docs/bugs.txt b/docs/bugs.txt
index 5cfc5f67d9e774d1941ddedc5cbae868616f37a2..4352dc858795935c3b94e810bd33092b8ff9ca74 100644 (file)
--- a/docs/bugs.txt
+++ b/docs/bugs.txt
@@ -310,6 +310,23 @@ WORKAROUND:
 visitor_email_address: 
 wxWINDOWS+VERSION: 2.1.11
 
+DATE+FIXED: 05/01/2000
+DATE+IDENTIFIED: 04/01/2000
+DETAILS: The various message callback members of
+wxMessageDialog pass the client_data variable
+as in "int" which are later used a pointers. On a 64-bit 
+system they must be passed as pointers or
+as "long" variables.
+FIXED+BY: JACS
+IDENTIFIED+BY: Ray Lanza
+PLATFORMS: motif
+SHORT+DESCRIPTION: wxMessageDialog is not 64bit safe
+Submit: Submit
+WORKAROUND: Change the declaration to void * or long
+visitor_email_address: rjl@zk3.dec.com
+wxWINDOWS+VERSION: 2.1.10
+
+
 ---------------------------END OF BUGLIST-------------------------
 
 

diff --git a/docs/readme.txt b/docs/readme.txt
index 8a5a31f112322d9d1b91ab5238cd5518a2465145..296b19d2a8f1f2cdbc09c85ddf0f29917863c963 100644 (file)
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWindows 2.1.11
+wxWindows 2.1.12
 ----------------
 
 Welcome to wxWindows 2, a sophisticated cross-platform C++
@@ -23,6 +23,16 @@ Changes in this release
 
 These are some of the major improvements:
 
+wxWindows 2.1.12
+================
+
+- New wxDateTime class to replace millenium-uncompliant wxTime
+  and wxDate classes.
+- New wxCalendarCtrl class and sample.
+- New wxCmdLineParser class.
+- Further bug fixes.
+- TIFF support added to wxImage.
+
 wxWindows 2.1.11
 ================
 
@@ -97,6 +107,7 @@ wx2_x_y_vc.zip             MS VC++ 5/6 project files
 wx2_x_y_bc.zip             Borland C++ 5 project files
 wx2_x_y_cw.zip             Metrowerks CodeWarrior 4.1 project files
 jpeg.zip                   Optional JPEG library
+tiff.zip                   Optional TIFF library
 ogl3.zip                   Optional Object Graphics Library
 glcanvas.zip               Optional wxGLCanvas class (Motif, GTK, MSW)
 tex2rtf2.zip               Tex2RTF documentation tool
@@ -204,5 +215,5 @@ web site) or contact Julian Smart <julian.smart@ukonline.co.uk>.
 
 Good luck!
 
-The wxWindows Team, November 1999
+The wxWindows Team, Janurary 2000
 

diff --git a/docs/release.txt b/docs/release.txt
index 390473d269d779b4e43f3268f86de66d3bdf2b1b..a2f5a7ac49d33b60e32df6f88143f7c23d2b2d61 100644 (file)
--- a/docs/release.txt
+++ b/docs/release.txt
@@ -1,6 +1,22 @@
 wxWindows Release Notes
 -----------------------
 
+2.1.12
+======
+
+- New wxDateTime class to replace millenium-uncompliant wxTime
+  and wxDate classes.
+
+- New wxCalendarCtrl class and sample.
+
+- New wxCmdLineParser class.
+
+- wxHTML printing and other improvements.
+
+- Life sample added.
+
+- TIFF support added to wxImage.
+
 2.1.11
 ======
 

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index 90bf77844c2406d1b1228ba59cdf2c70c65c653a..a6fe3c311ff6f52182fc092d67d55d137c84c034 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -52,7 +52,7 @@
 // ----------------------------------------------------------------------------
 
 // the common part
-static void msgboxCallBack(Widget w, int client_data, int id)
+static void msgboxCallBack(Widget w, void* client_data, int id)
 {
     // close the dialog
     XtUnmanageChild(w);
@@ -62,28 +62,28 @@ static void msgboxCallBack(Widget w, int client_data, int id)
 }
 
 static void msgboxCallBackOk(Widget w,
-                             int client_data,
+                             void* client_data,
                              XmAnyCallbackStruct *WXUNUSED(call_data))
 {
     msgboxCallBack(w, client_data, wxID_OK);
 }
 
 static void msgboxCallBackCancel(Widget w,
-                                 int client_data,
+                                 void* client_data,
                                  XmAnyCallbackStruct *WXUNUSED(call_data))
 {
     msgboxCallBack(w, client_data, wxID_CANCEL);
 }
 
 static void msgboxCallBackHelp(Widget w,
-                               int client_data,
+                               void* client_data,
                                XmAnyCallbackStruct *WXUNUSED(call_data))
 {
     msgboxCallBack(w, client_data, wxID_HELP);
 }
 
 static void msgboxCallBackClose(Widget w,
-                                int client_data,
+                                void* client_data,
                                 XmAnyCallbackStruct *WXUNUSED(call_data))
 {
     msgboxCallBack(w, client_data, wxID_CANCEL);

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 49c26ef9aea4b00ed19b327135bfb2bf1499af32..d8faa72bb0da5a35db8ef58715965c88adff96fe 100644 (file)
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -112,7 +112,7 @@ bool wxFontEnumeratorHelper::SetEncoding(wxFontEncoding encoding)
 
 #if defined(__GNUWIN32__)
     #if defined(__MINGW32__)
-        #define wxFONTENUMPROC FONTENUMEXPROC
+        #define wxFONTENUMPROC FONTENUMPROC
     #else
         #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM)
     #endif

diff --git a/src/msw/thread.cpp b/src/msw/thread.cpp
index a7aff134f26274642516379f652b072668492c72..21682d45a5cd0312edaeff403796c7e08df81448 100644 (file)
--- a/src/msw/thread.cpp
+++ b/src/msw/thread.cpp
@@ -42,6 +42,12 @@
 #endif
 
 #if defined(__VISUALC__) || (defined(__BORLANDC__) && (__BORLANDC__ >= 0x500))
+
+#if defined(__BORLANDC__) && !defined(__MT__)
+// I can't set -tWM in the IDE (anyone?) so have to do this
+#define __MT__
+#endif
+
     #include <process.h>
 #endif