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

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

distrib/msw/msw.rsp

@@ -1,3 +1,5 @@
+Mingw32-gcc295.patches
+
 docs/licence.txt
 docs/msw/*.txt
 docs/wine/*.txt

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

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<6C>.

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
-

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>

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>

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

include/wx/wxchar.h

@@ -303,7 +303,10 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #   ifdef __FreeBSD__
 #     undef _T
 #   endif
+
+#   if !defined(__MINGW32__) || !defined(_T)
 #     define _T(x)           x
+#   endif
 
      // ctype.h functions
 #   define  wxIsalnum   isalnum

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
+# Extra compiler libraries
-#COMPLIBS=-lg++
+COMPLIBS=
-#for win95
-#COMPLIBS=-lgcc
 
 # 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)

src/makeprog.g95

@@ -20,9 +20,9 @@ $(TARGET)_resources.o:  $(TARGET).rc
 	$(RESCOMP) $(RCINPUTSWITCH) $(TARGET).rc $(RCOUTPUTSWITCH) $(TARGET)_resources.o $(RESFLAGS)
 
 clean:
-	erase *.o
+	rm -f *.o
-	erase $(TARGET)_resources.o
+	rm -f $(TARGET)_resources.o
-	erase $(TARGET).exe 
+	rm -f $(TARGET).exe 
-	erase core 
+	rm -f core 
-	erase *.rsc
+	rm -f *.rsc
-	erase *.res
+	rm -f *.res

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
+	rm -f *.o
-	-erase *.bak
+	rm -f *.bak
-	-erase core
+	rm -f core
-	-erase ..\common\y_tab.c
+	rm -f ..\common\y_tab.c
-	-erase ..\common\lex_yy.c
+	rm -f ..\common\lex_yy.c
-	-erase ..\common\*.o
+	rm -f ..\common\*.o
-	-erase ..\common\*.bak
+	rm -f ..\common\*.bak
-	-erase ..\generic\*.o
+	rm -f ..\generic\*.o
-	-erase ..\generic\*.bak
+	rm -f ..\generic\*.bak
-	-erase ..\html\*.o
+	rm -f ..\html\*.o
-	-erase ..\png\*.o
+	rm -f ..\png\*.o
-	-erase ..\png\*.bak
+	rm -f ..\png\*.bak
-	-erase ..\zlib\*.o
+	rm -f ..\zlib\*.o
-	-erase ..\zlib\*.bak
+	rm -f ..\zlib\*.bak
-	-erase ..\jpeg\*.o
+	rm -f ..\jpeg\*.o
-	-erase ..\..\lib\libwx.a
+	rm -f ..\..\lib\libwx.a
 
 cleanall: clean

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 \

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

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

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

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