From b4fe51258d17c1e63c55b2b83c8db83e44b15927 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Thu, 14 Oct 1999 12:37:52 +0000
Subject: [PATCH] makeg95.env edited for Mingw32/gcc 2.95 compilation; _T not
redefined for Mingw32; removed init.cpp from makefile.vc (tmake keeps
generating it); added spinctrl.cpp to MSW section in filelist.txt.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
distrib/msw/makewise.bat | 3 +++
distrib/msw/msw.rsp | 2 ++
distrib/msw/tmake/filelist.txt | 1 +
distrib/msw/wisebott.txt | 10 ++++++++--
distrib/msw/wisetop.txt | 22 +++++-----------------
distrib/msw/wxwin01.bmp | Bin 29158 -> 29158 bytes
docs/html/index.htm | 2 +-
docs/html/standard.htm | 4 ++--
docs/msw/install.txt | 2 +-
include/wx/wxchar.h | 5 ++++-
src/makeg95.env | 22 ++++++++++++----------
src/makeprog.g95 | 12 ++++++------
src/msw/makefile.g95 | 32 ++++++++++++++++----------------
src/msw/makefile.vc | 4 ++--
src/wxvc.dsp | 4 ++++
src/wxvc6.dsp | 4 ++++
src/wxvc_dll.dsp | 4 ++++
utils/dialoged/src/reseditr.cpp | 2 +-
18 files changed, 76 insertions(+), 59 deletions(-)
diff --git a/distrib/msw/makewise.bat b/distrib/msw/makewise.bat
index 42ff01e9a9..dc124c56b7 100755
--- a/distrib/msw/makewise.bat
+++ b/distrib/msw/makewise.bat
@@ -21,6 +21,9 @@ set len=%@LINES[%TEMP\files1.tmp]
erase /Y %TEMP\files2.tmp
+Rem, first add system files
+cat %WXWIN\distrib\msw\wisesys.txt > %temp\files2.tmp
+
do i = 0 to %len by 1
set line=%@LINE[%TEMP\files1.tmp,%i]
Rem Skip directories.
diff --git a/distrib/msw/msw.rsp b/distrib/msw/msw.rsp
index db7b08d23d..10a9d817ed 100644
--- a/distrib/msw/msw.rsp
+++ b/distrib/msw/msw.rsp
@@ -1,3 +1,5 @@
+Mingw32-gcc295.patches
+
docs/licence.txt
docs/msw/*.txt
docs/wine/*.txt
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 5878fd1bb5..ea044999ae 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -254,6 +254,7 @@ settings.cpp M
slider95.cpp M 32
slidrmsw.cpp M 16
spinbutt.cpp M
+spinctrl.cpp M
statbmp.cpp M
statbox.cpp M
statbr95.cpp M 32
diff --git a/distrib/msw/wisebott.txt b/distrib/msw/wisebott.txt
index b36f13710d..e7e87ec855 100644
--- a/distrib/msw/wisebott.txt
+++ b/distrib/msw/wisebott.txt
@@ -137,6 +137,10 @@ end
item: Self-Register OCXs/DLLs
Description=Updating System Configuration, Please Wait...
end
+item: Execute Program
+ Pathname=explorer.exe
+ Command Line=%GROUP%
+end
item: Add to AUTOEXEC.BAT
New Text=SET WXWIN=%MAINDIR%
Search Text=SET WXWIN
@@ -217,9 +221,11 @@ item: Custom Dialog Set
Text Italian=Installazione completata!
end
item: Static
- Rectangle=86 42 256 102
+ Rectangle=86 42 256 124
Create Flags=01010000000000000000000000000000
- Text=The %APPTITLE% source files have been successfully installed. You will need to compile the library and any demo files you wish to run: please see docs\msw\install.txt for details.
+ Text=The %APPTITLE% source files have been successfully installed, with some convenient shortcuts in the "wxWindows 2" program group.
+ Text=
+ Text=You will need to compile the library and any demo files you wish to run: please see docs\msw\install.txt for details.
Text=
Text=Press the Finish button to exit this installation.
Text French=%APPTITLE% est maintenant installé.
diff --git a/distrib/msw/wisetop.txt b/distrib/msw/wisetop.txt
index 27bc859ddb..0fea7e4c38 100644
--- a/distrib/msw/wisetop.txt
+++ b/distrib/msw/wisetop.txt
@@ -61,6 +61,11 @@ item: Set Variable
Variable=MAINDIR
Value=wx2
end
+item: Display Graphic
+ Pathname=D:\wx2\wxWindows\distrib\msw\wxwin01.bmp
+ X Position=16
+ Y Position=16
+end
item: Check Configuration
Flags=10111011
end
@@ -140,22 +145,6 @@ item: Wizard Block
X Position=9
Y Position=10
Filler Color=8421440
- Dialog=Select Program Manager Group
- Dialog=Select Backup Directory
- Dialog=Display Registration Information
- Dialog=Get Registration Information
- Variable=EXPLORER
- Variable=DOBACKUP
- Variable=DOBRAND
- Variable=DOBRAND
- Value=1
- Value=A
- Value=1
- Value=1
- Compare=0
- Compare=1
- Compare=0
- Compare=1
Flags=00000011
end
item: Custom Dialog Set
@@ -601,4 +590,3 @@ end
item: Check Disk Space
Component=COMPONENTS
end
-
diff --git a/distrib/msw/wxwin01.bmp b/distrib/msw/wxwin01.bmp
index 19decec48e13db5c2823964b961b91d7ab555857..8a350658388c5ef6ca0f040368dd46e4cbf4149c 100644
GIT binary patch
delta 138
zcmaF%nDN<T#tqFPlNYedPp;$E-F#l8gAvM+-#k^UiE;966_d&J+_IZ9B<dI^r*c{V
zmC0_lma2zwWH$53v@lN2<TL@wNN;{9+r~IKi_;j)*(wj@Kn#%D+^IMPV)TD~w#jPz
T(wk$IH!?CUS+ZF`^_mX=>O?W(
delta 400
zcmXw#yGlbr5Qf<p5V43w5b+jcjD;5vEbXi<j<ChfWqY3@f&tM|j`q95z#*No*!l`~
zzCa+);hdlg!?OQBA2a_h=58@}@6&!)0HuCe-Ki(*=jFTq<hsmEf6Ab|Z9cfu<UwLZ
z3d&J|6Xi?-z7iE*u~HS)S`;O5z27@7cUu#8k=X1YIe`*;VN#C~V-Cd9k|N$Th{3G3
zj2xG%?R$4gAew`!kxWLicw$TmLRK%T;E`C7f_1c{s@AvHho!eWb!QS({y|!THWHQ~
zQ<4_spb<l6DqnjucS?wvFh~_bMYbJOND;txi~%VFqL`h{Zqtp*=it$u2xk>bm}9id
vPGVcwMAg^^w`%N_BiDKDs5}o}T_-L-dZlS*^{{tP;^@P5npxQx|J?in<$<ge
diff --git a/docs/html/index.htm b/docs/html/index.htm
index df239201a4..b9410f8706 100644
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -134,7 +134,7 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
</td>
<td align=center>
-<a href="../winhelp/proplist.hlp">Propert List Classes</a>
+<a href="../winhelp/proplist.hlp">Property List Classes</a>
</td>
<td align=center>
diff --git a/docs/html/standard.htm b/docs/html/standard.htm
index 8cb5aab68b..fa5270c36e 100644
--- a/docs/html/standard.htm
+++ b/docs/html/standard.htm
@@ -24,7 +24,7 @@ wxWindows Programmer Style Guide
by <A HREF=mailto:zeitlin@dptmaths.ens-cachan.fr>Vadim Zeitlin</A><P>
This guide is intended for people who are (or intending to start) writing code
-for <A HREF="http://web.ukonline.co.uk/julian.smart/wxwin/" target=_top>wxWindows</A> class library.
+for <A HREF="http://www.wxwindows.org" target=_top>wxWindows</A> class library.
<P>
The guide is separated into two parts: the first one addresses the general
@@ -35,7 +35,7 @@ its goal it to make wxWindows as uniform as possible without imposing too
many restrictions on the programmer.
<P>
Acknowledgements: This guide is partly based on <A
-HREF=http://www.mozilla.org/docs/tplist/catBuild/portable-cpp.html target=_top>
+HREF="http://www.mozilla.org/hacking/portable-cpp.html" target=_top>
C++ portability guide</A> by David Williams.
<P>
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 9c6f823038..83a3776267 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -402,7 +402,7 @@ References:
- The GNU-WIN32 site is at
http://www.cygnus.com/gnu-win32/
- Mingw32 is available at:
- http://agnes.dida.physik.uni-essen.de/~janjaap/mingw32/index.html
+ ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/gcc-2.95/
- See also http://web.ukonline.co.uk/julian.smart/wxwin/gnuwin32.htm
TWIN32 and gcc on Linux
diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 4b7da77b41..2b6ba272fb 100644
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -303,7 +303,10 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
# ifdef __FreeBSD__
# undef _T
# endif
-# define _T(x) x
+
+# if !defined(__MINGW32__) || !defined(_T)
+# define _T(x) x
+# endif
// ctype.h functions
# define wxIsalnum isalnum
diff --git a/src/makeg95.env b/src/makeg95.env
index 208820ed01..9e8cef2a5e 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -20,7 +20,7 @@
# For AIX/CSet++: use CC = xlC
# For IRIX: use CC = CC
# CC = gcc-2.6.2
-CC = gcc
+CC = gcc --pipe -fvtable-thunks
# C compiler for pure C programs
# Typical: CC=g++ , CCC=gcc
@@ -55,8 +55,7 @@ RESFLAGS=$(RCINCSWITCH) $(WXDIR)/include $(RCDEFSWITCH) __WIN32__ $(RCDEFSWITCH)
# Miscellaneous compiler options
# GRG: The __EGCS__ symbol is not needed anymore!
-OPTIONS= -D__MINGW32__ -DSTRICT # -D__EGCS__
-
+OPTIONS= -DSTRICT # -D__MINGW32__ # -D__EGCS__
# Debugging information
# AIX: comment out.
@@ -106,27 +105,30 @@ OPT = -fno-pcc-struct-return -O2 -fno-rtti -fno-exceptions
AROPTIONS = ruv
RANLIB = ranlib
-# Compiler libraries: defaults to GCC libraries
-#COMPLIBS=-lg++
-#for win95
-#COMPLIBS=-lgcc
+# Extra compiler libraries
+COMPLIBS=
# Compiler or system-specific include paths
COMPPATHS=
########################## Directories ###############################
-
WINLIBS=-lstdc++ -lgcc \
-lwinspool -lwinmm -lshell32 \
- -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -loldnames
+ -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \
+ -lole32 -loleaut32 -luuid \
+ -lodbc32 -lwsock32# -loldnames
+
+#WINLIBS=-lstdc++ -lgcc \
+# -lwinspool -lwinmm -lshell32 \
+# -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 -lwsock32 # -loldnames
# Shouldn't need to change these...
WXSRC=$(WXDIR)/src/msw
WXINC=$(WXDIR)/include
WXBASESRC=$(WXDIR)/src/common
WXLIB=$(WXDIR)/lib/$(LIBPREFIX)wx.$(LIBSUFF)
-INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/include/wx/msw/gnuwin32 -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS)
+INC = -I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib $(EXTRAINC) $(COMPPATHS) # -I$(WXDIR)/include/wx/msw/gnuwin32
RCLFLAGS=-cpp "cpp -lang-c++ -DWIN32 -D_WIN32 -DRCL_INVOKED -I$(WXWIN)/include"
#LIBS = -lctl3d32 $(WXLIB) $(WINLIBS) $(COMPLIBS)
diff --git a/src/makeprog.g95 b/src/makeprog.g95
index ca4f6009ce..fbe21342f6 100644
--- a/src/makeprog.g95
+++ b/src/makeprog.g95
@@ -20,9 +20,9 @@ $(TARGET)_resources.o: $(TARGET).rc
$(RESCOMP) $(RCINPUTSWITCH) $(TARGET).rc $(RCOUTPUTSWITCH) $(TARGET)_resources.o $(RESFLAGS)
clean:
- erase *.o
- erase $(TARGET)_resources.o
- erase $(TARGET).exe
- erase core
- erase *.rsc
- erase *.res
+ rm -f *.o
+ rm -f $(TARGET)_resources.o
+ rm -f $(TARGET).exe
+ rm -f core
+ rm -f *.rsc
+ rm -f *.res
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 4446c9fbf7..ea2c448976 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -399,21 +399,21 @@ $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c
# mv y.tab.c $(COMMDIR)/y_tab.c
clean:
- -erase *.o
- -erase *.bak
- -erase core
- -erase ..\common\y_tab.c
- -erase ..\common\lex_yy.c
- -erase ..\common\*.o
- -erase ..\common\*.bak
- -erase ..\generic\*.o
- -erase ..\generic\*.bak
- -erase ..\html\*.o
- -erase ..\png\*.o
- -erase ..\png\*.bak
- -erase ..\zlib\*.o
- -erase ..\zlib\*.bak
- -erase ..\jpeg\*.o
- -erase ..\..\lib\libwx.a
+ rm -f *.o
+ rm -f *.bak
+ rm -f core
+ rm -f ..\common\y_tab.c
+ rm -f ..\common\lex_yy.c
+ rm -f ..\common\*.o
+ rm -f ..\common\*.bak
+ rm -f ..\generic\*.o
+ rm -f ..\generic\*.bak
+ rm -f ..\html\*.o
+ rm -f ..\png\*.o
+ rm -f ..\png\*.bak
+ rm -f ..\zlib\*.o
+ rm -f ..\zlib\*.bak
+ rm -f ..\jpeg\*.o
+ rm -f ..\..\lib\libwx.a
cleanall: clean
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index d2034a804e..8af82bc42d 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 15:31, 1999/10/14
+# This file was automatically generated by tmake at 11:44, 1999/10/14
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
# File: makefile.vc
@@ -164,7 +164,6 @@ COMMONOBJS = \
..\common\$D\imagpcx.obj \
..\common\$D\imagpng.obj \
..\common\$D\imagpnm.obj \
- ..\common\$D\init.obj \
..\common\$D\intl.obj \
..\common\$D\ipcbase.obj \
..\common\$D\layout.obj \
@@ -286,6 +285,7 @@ MSWOBJS = ..\msw\$D\accel.obj \
..\msw\$D\settings.obj \
..\msw\$D\slider95.obj \
..\msw\$D\spinbutt.obj \
+ ..\msw\$D\spinctrl.obj \
..\msw\$D\statbmp.obj \
..\msw\$D\statbox.obj \
..\msw\$D\statbr95.obj \
diff --git a/src/wxvc.dsp b/src/wxvc.dsp
index 1d9d5a7df7..8bd26d3c34 100644
--- a/src/wxvc.dsp
+++ b/src/wxvc.dsp
@@ -904,6 +904,10 @@ SOURCE=.\msw\spinbutt.cpp
# End Source File
# Begin Source File
+SOURCE=.\msw\spinctrl.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\msw\statbmp.cpp
# End Source File
# Begin Source File
diff --git a/src/wxvc6.dsp b/src/wxvc6.dsp
index ad7d3b4ff7..043c132fc2 100644
--- a/src/wxvc6.dsp
+++ b/src/wxvc6.dsp
@@ -919,6 +919,10 @@ SOURCE=.\msw\spinbutt.cpp
# End Source File
# Begin Source File
+SOURCE=.\msw\spinctrl.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\msw\statbmp.cpp
# End Source File
# Begin Source File
diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp
index 6b03ee9c84..e1ec62776f 100644
--- a/src/wxvc_dll.dsp
+++ b/src/wxvc_dll.dsp
@@ -902,6 +902,10 @@ SOURCE=.\msw\spinbutt.cpp
# End Source File
# Begin Source File
+SOURCE=.\msw\spinctrl.cpp
+# End Source File
+# Begin Source File
+
SOURCE=.\msw\statbmp.cpp
# End Source File
# Begin Source File
diff --git a/utils/dialoged/src/reseditr.cpp b/utils/dialoged/src/reseditr.cpp
index e6157c5e82..a45bc0ddd0 100644
--- a/utils/dialoged/src/reseditr.cpp
+++ b/utils/dialoged/src/reseditr.cpp
@@ -2114,7 +2114,7 @@ void wxResourceEditorFrame::OnExit(wxCommandEvent& WXUNUSED(event))
void wxResourceEditorFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{
char buf[300];
- sprintf(buf, "wxWindows Dialog Editor %.1f\nAuthor: Julian Smart J.Smart@ed.ac.uk\nJulian Smart (c) 1996", wxDIALOG_EDITOR_VERSION);
+ sprintf(buf, "wxWindows Dialog Editor %.1f\nAuthor: Julian Smart <julian.smart@ukonline.co.uk>\nJulian Smart (c) 1996-1999", wxDIALOG_EDITOR_VERSION);
wxMessageBox(buf, "About Dialog Editor", wxOK|wxCENTRE);
}
--
2.49.0