Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-01-06 10:30:12 +00:00
parent 087e4f4a5c
commit ccebc98a67
11 changed files with 94 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
distrib/msw/generic.rsp
View File

@@ -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

1
distrib/msw/makefile.rsp
View File

@@ -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

9
distrib/msw/tiff.rsp Normal file
View File

@@ -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

6
distrib/msw/wisetop.txt
View File

@@ -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%.

9
distrib/msw/zipdist.bat
View File

@@ -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.

17
docs/bugs.txt
View File

@@ -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-------------------------

15
docs/readme.txt
View File

@@ -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

16
docs/release.txt
View File

@@ -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
======

10
src/motif/msgdlg.cpp
View File

@@ -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);

2
src/msw/fontenum.cpp
View File

@@ -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

6
src/msw/thread.cpp
View File

@@ -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