AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Name and version changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2004-05-23 14:56:36 +00:00
parent c829d62b69
commit 77ffb5937e
1979 changed files with 3443 additions and 3463 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/bakefiles/Bakefiles.bkgen
View File

@ -29,7 +29,7 @@
<disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
<!-- These wildcards match all .bkl files in wxWindows tree: -->
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
<input>
wx.bkl
../../contrib/build/*/*.bkl
@ -139,7 +139,7 @@
<add-formats files="wx.bkl">wx24dsp</add-formats>
<add-flags formats="wx24dsp">
-DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
-DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWidgets.dsp
</add-flags>
<add-formats files="wx.bkl">rpmspec</add-formats>

4
build/bakefiles/README
View File

@ -1,6 +1,6 @@
This directory contains Bakefile (see http://bakefile.sourceforge.net)
files needed to generate native makefiles for wxWindows library, contrib and
files needed to generate native makefiles for wxWidgets library, contrib and
samples.
Use the bakefile_gen utility to regenerate the makefiles (run it in this
@ -36,7 +36,7 @@ Note: the following files are generated using bakefile_gen:
that contain "This makefile was generated by Bakefile" banner and
VC++ project files in samples, demos and utils directories (inc. contrib
ones)
* src/wxWindows.dsp
* src/wxWidgets.dsp
* {wxGTK,wxMotif,wxX11}.spec (only wxBase headers list)
* autoconf_inc.m4
* all Makefile.in files

10
build/bakefiles/common.bkl
View File

@ -16,7 +16,7 @@
<include file="plugins_deps.bkl"/>
<!-- ================================================================== -->
<!-- wxWindows version numbers: -->
<!-- wxWidgets version numbers: -->
<!-- ================================================================== -->
<set var="WXVER_MAJOR">$(wxwin.getVersionMajor())</set>
@ -260,7 +260,7 @@
<libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
<!--
we want to install 3rd party libs system-wide only with static
version of wxWindows; otherwise they are embedded in shared libs:
version of wxWidgets; otherwise they are embedded in shared libs:
-->
<install-if>SHARED=='0'</install-if>
<pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
@ -323,7 +323,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
<!-- =============================================================== -->
<!-- Templates for wxWindows libs: -->
<!-- Templates for wxWidgets libs: -->
<!-- =============================================================== -->
<template id="wx" template="common_settings">
@ -493,7 +493,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</template>
<!-- =============================================================== -->
<!-- Templates for building wxWindows plugins: -->
<!-- Templates for building wxWidgets plugins: -->
<!-- =============================================================== -->
<if cond="WX_STABLE_BRANCH=='1'">
@ -555,7 +555,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</define-rule>
<!-- =============================================================== -->
<!-- Support for wxWindows samples and contrib: -->
<!-- Support for wxWidgets samples and contrib: -->
<!-- =============================================================== -->
<!-- Link against one wxWin library. Value must be literal! -->

2
build/bakefiles/common_samples.bkl
View File

@ -7,7 +7,7 @@
<set var="file_common_samples_included">1</set>
<!-- =============================================================== -->
<!-- Template for wxWindows samples: -->
<!-- Template for wxWidgets samples: -->
<!-- =============================================================== -->
<if cond="FORMAT=='autoconf'">

4
build/bakefiles/config.bkl
View File

@ -28,7 +28,7 @@
<values-description>,Unicode</values-description>
<default-value>0</default-value>
<description>
Compile Unicode build of wxWindows?
Compile Unicode build of wxWidgets?
</description>
</option>
@ -159,7 +159,7 @@ Acts according to DEBUG_INFO by default.
<values>0,1</values>
<default-value>0</default-value>
<description>
Is this official build by wxWindows developers?
Is this official build by wxWidgets developers?
</description>
</option>
<option name="VENDOR">

4
build/bakefiles/formats/FORMATS.bkmanifest
View File

@ -4,9 +4,9 @@
<format id="wx24dsp">
<description>
src/wxWindows.dsp which makes same files as 2.4 version
src/wxWidgets.dsp which makes same files as 2.4 version
</description>
<default-filename>wxWindows.dsp</default-filename>
<default-filename>wxWidgets.dsp</default-filename>
</format>
<format id="rpmspec">

4
build/bakefiles/formats/README
View File

@ -1,6 +1,6 @@
This directory contains misc Bakefile backends that are wxWindows-specific:
This directory contains misc Bakefile backends that are wxWidgets-specific:
wx24dsp - generates wx2.4-compatible VC++ project file (src/wxWindows.dsp)
wx24dsp - generates wx2.4-compatible VC++ project file (src/wxWidgets.dsp)
rpmspec - generates part of .spec files with list of wxBase headers
cbx_unix - Borland C++BuilderX project files for configure-based build

84
build/bakefiles/formats/wx24dsp.empy
View File

@ -28,35 +28,35 @@ commonHdrs.sort()
HEADERS.insert(0, ('Common', commonHdrs))
}@
# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
# Microsoft Developer Studio Project File - Name="wxWidgets" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxWindows - Win32 Debug
CFG=wxWidgets - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wxWindows.mak".
!MESSAGE NMAKE /f "wxWidgets.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
!MESSAGE NMAKE /f "wxWidgets.mak" CFG="wxWidgets - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWidgets - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWidgets - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWidgets - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWidgets - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWidgets - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWidgets - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWidgets - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWidgets - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWidgets - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
@ -64,7 +64,7 @@ CFG=wxWindows - Win32 Debug
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
!IF "$(CFG)" == "wxWidgets - Win32 Release Unicode DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@ -93,7 +93,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Debug Unicode DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@ -122,7 +122,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Release Unicode"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@ -147,7 +147,7 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Debug Unicode"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@ -172,7 +172,7 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmswud.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Release DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@ -201,7 +201,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Debug DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@ -230,7 +230,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@ -255,7 +255,7 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@ -280,12 +280,12 @@ LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Release With Debug Info"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info"
# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info"
# PROP BASE Output_Dir "wxWidgets___Win32_Release_With_Debug_Info"
# PROP BASE Intermediate_Dir "wxWidgets___Win32_Release_With_Debug_Info"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
@ -309,15 +309,15 @@ LIB32=link.exe -lib
# Begin Target
# Name "wxWindows - Win32 Release Unicode DLL"
# Name "wxWindows - Win32 Debug Unicode DLL"
# Name "wxWindows - Win32 Release Unicode"
# Name "wxWindows - Win32 Debug Unicode"
# Name "wxWindows - Win32 Release DLL"
# Name "wxWindows - Win32 Debug DLL"
# Name "wxWindows - Win32 Release"
# Name "wxWindows - Win32 Debug"
# Name "wxWindows - Win32 Release With Debug Info"
# Name "wxWidgets - Win32 Release Unicode DLL"
# Name "wxWidgets - Win32 Debug Unicode DLL"
# Name "wxWidgets - Win32 Release Unicode"
# Name "wxWidgets - Win32 Debug Unicode"
# Name "wxWidgets - Win32 Release DLL"
# Name "wxWidgets - Win32 Debug DLL"
# Name "wxWidgets - Win32 Release"
# Name "wxWidgets - Win32 Debug"
# Name "wxWidgets - Win32 Release With Debug Info"
# Begin Source File
SOURCE="This project is deprecated, please see install.txt"
@ -350,7 +350,7 @@ SOURCE=.\@src[4:].replace('/','\\')
SOURCE=..\include\wx\msw\setup.h
!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
!IF "$(CFG)" == "wxWidgets - Win32 Release Unicode DLL"
# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@ -360,7 +360,7 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Debug Unicode DLL"
# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@ -370,7 +370,7 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Release Unicode"
# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@ -380,7 +380,7 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Debug Unicode"
# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@ -390,7 +390,7 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Release DLL"
# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@ -400,7 +400,7 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Debug DLL"
# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@ -410,7 +410,7 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Release"
# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@ -420,7 +420,7 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Debug"
# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
@ -430,7 +430,7 @@ InputPath=..\include\wx\msw\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
!ELSEIF "$(CFG)" == "wxWidgets - Win32 Release With Debug Info"
# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h

4
build/bakefiles/mac_bundles.bkl
View File

@ -4,7 +4,7 @@
<makefile>
<!--
Support for application bundles, for wxWindows samples.
Support for application bundles, for wxWidgets samples.
-->
<!--
@ -61,7 +61,7 @@
<!-- make a hardlink to the binary: -->
ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
<!-- ditto wxWindows resources and icons: -->
<!-- ditto wxWidgets resources and icons: -->
cp -f $(BUNDLE_RESOURCE) $(BUNDLE)/Resources/$(id).rsrc
cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
</command>

10
build/bakefiles/make_dist.mk
View File

@ -992,7 +992,7 @@ distrib_clean:
# VZ: the -only targets allow to do "make dist bzip-dist-only" without copying
# the files twice
dist-only:
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
@cd _dist_dir && tar ch $(DISTDIRNAME) | gzip -f9 > ../$(WXARCHIVE);
@if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \
@ -1007,7 +1007,7 @@ dist-only:
fi
dist: @GUIDIST@
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
@# now prune away a lot of the crap included by using cp -R
@# in other dist targets.
find $(DISTDIR) \( -name "CVS" -o -name ".cvsignore" -o -name "*.dsp" -o -name "*.dsw" -o -name "*.hh*" -o \
@ -1027,7 +1027,7 @@ dist: @GUIDIST@
fi
bzip-dist-only:
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP);
@if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \
@ -1042,7 +1042,7 @@ bzip-dist-only:
fi
bzip-dist: @GUIDIST@
@echo "*** Creating wxWindows distribution in $(DISTDIR)..."
@echo "*** Creating wxWidgets distribution in $(DISTDIR)..."
@cd _dist_dir && tar ch $(DISTDIRNAME) | bzip2 -f9 > ../$(WXARCHIVE_BZIP)
@if test "$(USE_GUI)" = 1; then \
cd $(DISTDIR); \
@ -1056,7 +1056,7 @@ bzip-dist: @GUIDIST@
# RR: Copy text and binary data separatly
win-dist: MSW_ZIP_TEXT_DIST
@echo "*** Creating wxWindows ZIP distribution in $(DISTDIR)..."
@echo "*** Creating wxWidgets ZIP distribution in $(DISTDIR)..."
@cd _dist_dir && mv $(DISTDIRNAME) wxMSW
@cd _dist_dir && zip -r -l ../$(WXARCHIVE_ZIP) *
cp $(INCDIR)/wx/msw/*.cur _dist_dir/wxMSW/include/wx/msw

10
build/bakefiles/wx.bkl
View File

@ -2,7 +2,7 @@
<!-- $Id$ -->
<!-- Master bakefile for wxWindows -->
<!-- Master bakefile for wxWidgets -->
<makefile>
@ -19,7 +19,7 @@
<!-- list of files sorted into categories: -->
<include file="files.bkl"/>
<!-- wxWindows variant where everything is in one library: -->
<!-- wxWidgets variant where everything is in one library: -->
<include file="monolithic.bkl"/>
<!-- ...and when there are multiple libraries: -->
<include file="multilib.bkl"/>
@ -175,15 +175,15 @@
@echo " "
@echo " ------------------------------------------------------"
@echo " "
@echo " The installation of wxWindows is finished. On certain"
@echo " The installation of wxWidgets is finished. On certain"
@echo " platforms (e.g. Linux) you'll now have to run ldconfig"
@echo " if you installed a shared library and also modify the"
@echo " LD_LIBRARY_PATH (or equivalent) environment variable."
@echo " "
@echo " wxWindows comes with no guarantees and doesn't claim"
@echo " wxWidgets comes with no guarantees and doesn't claim"
@echo " to be suitable for any purpose."
@echo " "
@echo " Read the wxWindows Licence on licencing conditions."
@echo " Read the wxWidgets Licence on licencing conditions."
@echo " "
@echo " ------------------------------------------------------"
@echo " "

6
build/bakefiles/wxwin.py
View File

@ -1,5 +1,5 @@
#
# Helper functions for wxWindows bakefiles
# Helper functions for wxWidgets bakefiles
#
# $Id$
#
@ -20,7 +20,7 @@ utils.addSubstituteCallback('OBJS', __noopSubst)
def mk_wxid(id):
"""Creates wxWindows library identifier from bakefile target ID that
"""Creates wxWidgets library identifier from bakefile target ID that
follows this convention: DLLs end with 'dll', static libraries
end with 'lib'. If withPrefix=1, then _wxid is returned instead
of wxid."""
@ -93,7 +93,7 @@ wxVersion = None
VERSION_FILE = '../../include/wx/version.h'
def getVersion():
"""Returns wxWindows version as a tuple: (major,minor,release)."""
"""Returns wxWidgets version as a tuple: (major,minor,release)."""
global wxVersion
if wxVersion == None:
f = open(VERSION_FILE, 'rt')

124
configure vendored
View File

@ -1,9 +1,9 @@
#! /bin/sh
# From configure.in Id: configure.in.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for wxWindows 2.5.1.
# Generated by GNU Autoconf 2.59 for wxWidgets 2.5.2.
#
# Report bugs to <wx-dev@lists.wxwindows.org>.
# Report bugs to <wx-dev@lists.wxwidgets.org>.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@ -268,11 +268,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
: ${ac_max_here_lines=38}
# Identity of this package.
PACKAGE_NAME='wxWindows'
PACKAGE_TARNAME='wxwindows'
PACKAGE_VERSION='2.5.1'
PACKAGE_STRING='wxWindows 2.5.1'
PACKAGE_BUGREPORT='wx-dev@lists.wxwindows.org'
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
PACKAGE_VERSION='2.5.2'
PACKAGE_STRING='wxWidgets 2.5.2'
PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
ac_unique_file="wx-config.in"
# Factoring default headers for most tests.
@ -794,7 +794,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures wxWindows 2.5.1 to adapt to many kinds of systems.
\`configure' configures wxWidgets 2.5.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -860,7 +860,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of wxWindows 2.5.1:";;
short | recursive ) echo "Configuration of wxWidgets 2.5.2:";;
esac
cat <<\_ACEOF
@ -868,9 +868,9 @@ Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-gui use GUI classes
--enable-monolithic build wxWindows as single library
--enable-plugins build parts of wxWindows as loadable components
--enable-universal use wxWindows GUI controls instead of native ones
--enable-monolithic build wxWidgets as single library
--enable-plugins build parts of wxWidgets as loadable components
--enable-universal use wxWidgets GUI controls instead of native ones
--enable-nanox use NanoX
--enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)
--enable-gpe use GNOME PDA Environment features if possible
@ -889,8 +889,8 @@ Optional Features:
--enable-no_exceptions create code without C++ exceptions handling
--enable-permissive compile code disregarding strict ANSI
--enable-no_deps create code without dependency information
--enable-compat22 enable wxWindows 2.2 compatibility
--disable-compat24 disable wxWindows 2.4 compatibility
--enable-compat22 enable wxWidgets 2.2 compatibility
--disable-compat24 disable wxWidgets 2.4 compatibility
--enable-rpath=DIR output the rpath flag from wx-config
--enable-intl use internationalization system
--enable-config use wxConfig (and derived) classes
@ -931,7 +931,7 @@ Optional Features:
--enable-timer use wxTimer class
--enable-unicode compile wxString with Unicode support
--enable-sound use wxSound class
--enable-wxprintfv use wxWindows implementation of vprintf()
--enable-wxprintfv use wxWidgets implementation of vprintf()
--enable-zipstream use wxZipInputStream
--enable-url use wxURL class
--enable-protocol use wxProtocol class
@ -1029,7 +1029,7 @@ Optional Features:
--enable-pnm use pnm images (PNM file format)
--enable-xpm use xpm images (XPM file format)
--enable-icocur use Windows ICO and CUR formats
--enable-official_build official build of wxWindows (win32 DLL only)
--enable-official_build official build of wxWidgets (win32 DLL only)
--enable-vendor=VENDOR vendor name (win32 DLL only)
--disable-largefile omit support for large files
--disable-gtktest do not try to compile and run a test GTK+ program
@ -1087,7 +1087,7 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <wx-dev@lists.wxwindows.org>.
Report bugs to <wx-dev@lists.wxwidgets.org>.
_ACEOF
fi
@ -1183,7 +1183,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
wxWindows configure 2.5.1
wxWidgets configure 2.5.2
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -1197,7 +1197,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by wxWindows $as_me 2.5.1, which was
It was created by wxWidgets $as_me 2.5.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -11866,8 +11866,8 @@ echo "${ECHO_T}no" >&6
fi
if test "x$AR" = "x" ; then
{ { echo "$as_me:$LINENO: error: ar is needed to build wxWindows" >&5
echo "$as_me: error: ar is needed to build wxWindows" >&2;}
{ { echo "$as_me:$LINENO: error: ar is needed to build wxWidgets" >&5
echo "$as_me: error: ar is needed to build wxWidgets" >&2;}
{ (exit 1); exit 1; }; }
fi
@ -12842,7 +12842,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -12992,7 +12992,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -13142,7 +13142,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -13292,7 +13292,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -13444,7 +13444,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -13596,7 +13596,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -13852,7 +13852,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -14013,7 +14013,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -18806,7 +18806,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -19540,7 +19540,7 @@ echo "$as_me: WARNING: hash_map: in the future, the compiler will take precedenc
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -19742,7 +19742,7 @@ echo "$as_me: WARNING: ext/hash_map: in the future, the compiler will take prece
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -20173,7 +20173,7 @@ echo "$as_me: WARNING: regex.h: in the future, the compiler will take precedence
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -20507,7 +20507,7 @@ echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence"
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -20814,7 +20814,7 @@ echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence"
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -21226,7 +21226,7 @@ echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedenc
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -21468,7 +21468,7 @@ echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -21779,7 +21779,7 @@ echo "$as_me: WARNING: mspack.h: in the future, the compiler will take precedenc
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -22015,7 +22015,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -22161,7 +22161,7 @@ echo "$as_me: WARNING: windows.h: in the future, the compiler will take preceden
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -27456,7 +27456,7 @@ echo "$as_me: WARNING: sql.h: in the future, the compiler will take precedence"
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -27984,7 +27984,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -28177,7 +28177,7 @@ echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -32459,7 +32459,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -33023,7 +33023,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -34873,7 +34873,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -36696,7 +36696,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -37075,7 +37075,7 @@ echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precede
(
cat <<\_ASBOX
## ----------------------------------------- ##
## Report this to wx-dev@lists.wxwindows.org ##
## Report this to wx-dev@lists.wxwidgets.org ##
## ----------------------------------------- ##
_ASBOX
) |
@ -37212,8 +37212,8 @@ fi
if test "$wxUSE_IPC" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
{ echo "$as_me:$LINENO: WARNING: wxWindows IPC classes require sockets... disabled" >&5
echo "$as_me: WARNING: wxWindows IPC classes require sockets... disabled" >&2;}
{ echo "$as_me:$LINENO: WARNING: wxWidgets IPC classes require sockets... disabled" >&5
echo "$as_me: WARNING: wxWidgets IPC classes require sockets... disabled" >&2;}
fi
cat >>confdefs.h <<\_ACEOF
@ -42380,7 +42380,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by wxWindows $as_me 2.5.1, which was
This file was extended by wxWidgets $as_me 2.5.2, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -42443,7 +42443,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
wxWindows config.status 2.5.1
wxWidgets config.status 2.5.2
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@ -43772,20 +43772,20 @@ fi
echo
echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
echo ""
echo " Which GUI toolkit should wxWindows use? ${TOOLKIT_LOWERCASE:-base only}"
echo " Should wxWindows be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_LOWERCASE:-base only}"
echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-no}"
echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}"
echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
echo " Should wxWidgets be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " What level of wxWindows compatibility should be enabled?"
echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}"
echo " wxWindows 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}"
echo " What level of wxWidgets compatibility should be enabled?"
echo " wxWidgets 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}"
echo " wxWidgets 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}"
echo " Which libraries should wxWindows use?"
echo " Which libraries should wxWidgets use?"
echo " jpeg ${wxUSE_LIBJPEG-none}"
echo " png ${wxUSE_LIBPNG-none}"
echo " regex ${wxUSE_REGEX}"

54
configure.in
View File

@ -5,10 +5,10 @@ AC_PREREQ(2.57)
dnl ---------------------------------------------------------------------------
dnl
dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker,
dnl Top-level configure.in for wxWidgets by Robert Roebling, Phil Blecker,
dnl Vadim Zeitlin and Ron Lee
dnl
dnl This script is under the wxWindows licence.
dnl This script is under the wxWidgets licence.
dnl
dnl Version: $Id$
dnl ---------------------------------------------------------------------------
@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
dnl initialization
dnl ---------------------------------------------------------------------------
AC_INIT([wxWindows], [2.5.1], [wx-dev@lists.wxwindows.org])
AC_INIT([wxWidgets], [2.5.2], [wx-dev@lists.wxwidgets.org])
dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
AC_CONFIG_SRCDIR([wx-config.in])
@ -745,7 +745,7 @@ for toolkit in `echo $ALL_TOOLKITS`; do
done
dnl ---------------------------------------------------------------------------
dnl --disable-gui will build only non-GUI part of wxWindows: check for this
dnl --disable-gui will build only non-GUI part of wxWidgets: check for this
dnl first to disable many other switches if it's given
dnl
dnl NB: this is still in testing stage, don't use if you don't know what you're
@ -753,12 +753,12 @@ dnl doing
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GUI)
WX_ARG_ENABLE(monolithic, [ --enable-monolithic build wxWindows as single library], wxUSE_MONOLITHIC)
WX_ARG_ENABLE(plugins, [ --enable-plugins build parts of wxWindows as loadable components], wxUSE_PLUGINS)
WX_ARG_ENABLE(monolithic, [ --enable-monolithic build wxWidgets as single library], wxUSE_MONOLITHIC)
WX_ARG_ENABLE(plugins, [ --enable-plugins build parts of wxWidgets as loadable components], wxUSE_PLUGINS)
if test "$wxUSE_GUI" = "yes"; then
WX_ARG_ENABLE(universal, [ --enable-universal use wxWindows GUI controls instead of native ones], wxUSE_UNIVERSAL)
WX_ARG_ENABLE(universal, [ --enable-universal use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)
AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mac, [ --with-mac use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
@ -824,8 +824,8 @@ WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without C++
WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS)
WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWindows 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
AC_ARG_ENABLE(rpath, [ --enable-rpath=DIR output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])
@ -881,7 +881,7 @@ WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile class], w
WX_ARG_ENABLE(timer, [ --enable-timer use wxTimer class], wxUSE_TIMER)
WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE)
WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND)
WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWidgets implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM)
WX_ARG_ENABLE(url, [ --enable-url use wxURL class], wxUSE_URL)
@ -1133,7 +1133,7 @@ dnl ---------------------------------------------------------------------------
dnl some win32 settings
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(official_build, [ --enable-official_build official build of wxWindows (win32 DLL only)], wxUSE_OFFICIAL_BUILD)
WX_ARG_ENABLE(official_build, [ --enable-official_build official build of wxWidgets (win32 DLL only)], wxUSE_OFFICIAL_BUILD)
AC_ARG_ENABLE(vendor, [ --enable-vendor=VENDOR vendor name (win32 DLL only)], [VENDOR="$enableval"])
if test "x$VENDOR" = "x"; then
VENDOR="custom"
@ -1370,7 +1370,7 @@ dnl ar command
dnl defines AR with the appropriate command
AC_CHECK_PROG(AR, ar, ar)
if test "x$AR" = "x" ; then
AC_MSG_ERROR([ar is needed to build wxWindows])
AC_MSG_ERROR([ar is needed to build wxWidgets])
fi
dnl install checks
@ -3659,7 +3659,7 @@ dnl
dnl the trouble here is that on some systems (notable HP-UX) this function is
dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which,
dnl stupidly, provides a dummy function declaration inside its extension)
dnl succeeds, even with C++ compiler, but the compilation of wxWindows fails
dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails
dnl
dnl so we first check if the function is in the library
AC_CHECK_FUNCS(vsnprintf)
@ -5249,7 +5249,7 @@ fi
if test "$wxUSE_IPC" = "yes"; then
if test "$wxUSE_SOCKETS" != "yes"; then
AC_MSG_WARN(wxWindows IPC classes require sockets... disabled)
AC_MSG_WARN(wxWidgets IPC classes require sockets... disabled)
fi
AC_DEFINE(wxUSE_IPC)
@ -5818,7 +5818,7 @@ dnl ---------------------------------------------------------------------------
dnl Output the makefiles and such from the results found above
dnl ---------------------------------------------------------------------------
dnl all additional libraries (except wxWindows itself) we link with
dnl all additional libraries (except wxWidgets itself) we link with
dnl note that we always link with -lm except for Mac OS X
dnl extended.c uses floor() and is always linked in
@ -5898,14 +5898,14 @@ fi
dnl all -I options we must pass to the compiler
dnl
dnl note that the order is somewhat important: wxWindows headers should
dnl note that the order is somewhat important: wxWidgets headers should
dnl come first and the one with setup.h should be before $(top_srcdir)/include
dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g.
dnl CodeWarrior):
INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \
-I\${top_srcdir}/include $TOOLKIT_INCLUDE"
dnl C/C++ compiler options used to compile wxWindows
dnl C/C++ compiler options used to compile wxWidgets
if test "$GXX" = yes ; then
dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
CXXWARNINGS="-Wall"
@ -6316,20 +6316,20 @@ AC_OUTPUT
dnl report on what we decided to do
echo
echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
echo "Configured wxWidgets ${WX_VERSION} for \`${host}'"
echo ""
echo " Which GUI toolkit should wxWindows use? ${TOOLKIT_LOWERCASE:-base only}"
echo " Should wxWindows be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_LOWERCASE:-base only}"
echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-no}"
echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}"
echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
echo " Should wxWidgets be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " What level of wxWindows compatibility should be enabled?"
echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}"
echo " wxWindows 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}"
echo " What level of wxWidgets compatibility should be enabled?"
echo " wxWidgets 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}"
echo " wxWidgets 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}"
echo " Which libraries should wxWindows use?"
echo " Which libraries should wxWidgets use?"
echo " jpeg ${wxUSE_LIBJPEG-none}"
echo " png ${wxUSE_LIBPNG-none}"
echo " regex ${wxUSE_REGEX}"

4
contrib/build/gizmos/gizmos.bkl
View File

@ -12,7 +12,7 @@
multicell.cpp
splittree.cpp
statpict.cpp
<!-- treelistctrl.cpp -->
treelistctrl.cpp
</set>
<headers template="wx_contrib_headers">
@ -24,7 +24,7 @@
wx/gizmos/splittree.h
wx/gizmos/statpict.h
wx/gizmos/gizmos.h
<!-- wx/gizmos/treelistctrl.h -->
wx/gizmos/treelistctrl.h
</files>
</headers>

4
distrib/msw/dsp2dos.bat
View File

@ -1,7 +1,7 @@
echo "dsp2dos [ver. 1.1]"
echo "Convert wxWindows workspaces from Unix to Dos format"
echo "Convert wxWidgets workspaces from Unix to Dos format"
echo " Author : Marco Cavallini (www.koansoftware.com)"
echo "You need to build wxWindows/distrib/msw/unix2dos.c for using it"
echo "You need to build wxWidgets/distrib/msw/unix2dos.c for using it"
unix2dos --unix2dos $WXWIN/src/wxBase.dsp
unix2dos --unix2dos $WXWIN/src/wxBase.dsw
unix2dos --unix2dos $WXWIN/src/wxUniv.dsp

29
distrib/msw/generic.rsp
View File

@ -17,12 +17,12 @@ regen
build/bakefiles/*.bkl
build/bakefiles/Bakefiles.bkgen
build/bakefiles/README
build/bakefiles/*.py
build/bakefiles/*.py*
build/bakefiles/*.mk
build/bakefiles/compat/FORMATS.bkmanifest
build/bakefiles/compat/README
build/bakefiles/compat/wx24dsp.bkl
build/bakefiles/compat/wx24dsp.empy
build/bakefiles/formats/*.bkl
build/bakefiles/formats/*.empy
build/bakefiles/formats/README
build/bakefiles/formats/*.bkmanifest
distrib/msw/*.rsp
distrib/msw/*.bat
@ -1376,30 +1376,21 @@ tests/makefile*.*
tests/test.dsp
tests/test.dsw
tests/*.cpp
tests/*.fc
tests/arrays/*.cpp
tests/filesys/*.cpp
tests/filesys/*.h
tests/filesys/*.bkl
tests/filesys/*.inc
tests/formatconverter/*.pl
tests/formatconverter/*.cpp
tests/formatconverter/*.txt
tests/longlong/*.cpp
tests/mbconv/*.cpp
tests/mbconv/*.h
tests/mbconv/*.bkl
tests/mbconv/*.inc
tests/regex/*.cpp
tests/regex/*.h
tests/regex/*.bkl
tests/regex/*.inc
tests/regex/*.pl
tests/regex/*.test
tests/streams/*.cpp
tests/streams/*.h
tests/streams/*.bkl
tests/streams/*.inc
tests/strings/*.cpp

10
distrib/msw/innobott.txt
View File

@ -4,12 +4,12 @@
Name: {group}\Tex2rtf Help; Filename: {app}\bin\tex2rtf.chm; WorkingDir: {app}\bin; IconIndex: 0; Flags: useapppaths
Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\Compiling wxWindows; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\wxWindows Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\Compiling wxWidgets; Filename: {app}\docs\msw\install.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
; Name: {group}\Tutorial; Filename: {app}\docs\pdf\wxTutorial.pdf; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\Document Index; Filename: {app}\docs\html\index.htm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
Name: {group}\Widgets Sample; Filename: {app}\bin\widgets.exe; WorkingDir: {app}\bin; IconFilename: {app}\bin\widgets.exe; IconIndex: 0
Name: "{group}\Uninstall wxWindows %VERSION%"; Filename: "{uninstallexe}"
Name: "{group}\Uninstall wxWidgets %VERSION%"; Filename: "{uninstallexe}"
[INI]
@ -35,6 +35,6 @@
;InnoVer=1.3
;AddVerTo=AppVerName
;SetupFilename=setup.exe
;OutputFolder=C:\wx2dev\wxWindows\deliver
;CopyrightText=Copyright © The wxWindows Team
;OutputFolder=C:\wx2dev\wxWidgets\deliver
;CopyrightText=Copyright © The wxWidgets Team

16
distrib/msw/makeall.bat
View File

@ -1,5 +1,5 @@
Rem @echo off
Rem This script compiles wxWindows and some samples/demos with
Rem This script compiles wxWidgets and some samples/demos with
Rem a range of compilers.
Rem Note that it currently uses batch scripts local to Julian Smart's machine,
Rem to set up the environment correctly.
@ -19,7 +19,7 @@ Rem The following line is for a specific environment -- edit, or comment out
Rem Not working in 4NT?
Rem if not %@INDEX["%WXDIR%","wx2stable"] == "-1" set FATWXWIN=c:\wx2sta~1\wxwind~1
echo Full wxWindows path is %FULLWXWIN%, FAT path is %FATWXWIN%
echo Full wxWidgets path is %FULLWXWIN%, FAT path is %FATWXWIN%
set BUILDDEST=%TEMP%\wxWinBuild
Rem Only carry on if we haven't specified a single target
set CARRYON=0
@ -50,7 +50,7 @@ erase /S *.exe
cd %WXDIR%\utils\tex2rtf\src
erase /S *.exe
echo Starting wxWindows build at %_TIME, %_DATE
echo Starting wxWidgets build at %_TIME, %_DATE
Rem First, VC++ 6.
@ -490,7 +490,7 @@ echo ===================
Rem Set up the environment
call msvc1
Rem Needs full wxWindows path for making libraries
Rem Needs full wxWidgets path for making libraries
set WXWIN=%FULLWXWIN%
echo *** VC++ Debug ***
@ -504,7 +504,7 @@ erase /F /Y %BUILDDEST%\VC1Debug
Rem Make one sample, just to make sure Debug mode is OK
cd %WXDIR%\samples\minimal
nmake -f makefile.dos clean
Rem Needs FAT wxWindows path for making executables
Rem Needs FAT wxWidgets path for making executables
set WXWIN=%FATWXWIN%
nmake -f makefile.dos
@ -514,7 +514,7 @@ nmake -f makefile.dos clean
cd %WXDIR%\src\msw
nmake -f makefile.dos cleanall
Rem Needs full wxWindows path for making libraries
Rem Needs full wxWidgets path for making libraries
set WXWIN=%FULLWXWIN%
echo *** VC++ Release ***
@ -529,7 +529,7 @@ Rem Make one sample, just to make sure Release mode is OK
cd %WXDIR%\samples\minimal
nmake -f makefile.dos clean
nmake -f makefile.dos FINAL=1
Rem Needs FAT wxWindows path for making executables
Rem Needs FAT wxWidgets path for making executables
set WXWIN=%FATWXWIN%
nmake -f makefile.dos FINAL=1
copy minimal.exe /S %BUILDDEST%\VC1Release
@ -591,5 +591,5 @@ make -f makefile.bcc cleanall FINAL=1
:end
echo Finished wxWindows build at %_TIME, %_DATE
echo Finished wxWidgets build at %_TIME, %_DATE

14
distrib/msw/makedist.sh
View File

@ -1,7 +1,7 @@
#! /bin/bash
# makedist.sh
#
# Build wxWindows 2 for Windows distribution.
# Build wxWidgets 2 for Windows distribution.
# This builds all required binaries and documents before calling
# zipdist.sh to make the archives.
#
@ -19,7 +19,7 @@
# - update the readmes, change log, manual version etc.
# - update version.h
# - update distrib/msw/wisetop.txt, wisebott.txt with the correct version
# number, plus any hard-wired wxWindows paths
# number, plus any hard-wired wxWidgets paths
# - test on a variety of compilers
#
# TODO:
@ -96,7 +96,7 @@ check_files() {
build_docs() {
cd "$SRC/src/msw"
echo "---------------------------------"
echo "Building wxWindows documents"
echo "Building wxWidgets documents"
nmake -f makefile.vc cleandocs docs
cd "$SRC/utils/tex2rtf/src"
@ -113,7 +113,7 @@ build_docs() {
# This has to be interactive at present.
build_pdf() {
echo "---------------------------------"
echo "Building wxWindows PDF documents"
echo "Building wxWidgets PDF documents"
if [ -e "$WORDEXE" ]; then
"$WORDEXE" "$WXWIN\\docs\\pdf\\wx.rtf"
"$WORDEXE" "$WXWIN\\docs\\pdf\\tex2rtf.rtf"
@ -124,12 +124,12 @@ build_pdf() {
fi
}
# Build wxWindows
# Build wxWidgets
build_wxwin_vc() {
echo "---------------------------------"
echo "Building wxWindows using VC++"
echo "Building wxWidgets using VC++"
cd "$SRC/src"
echo Building wxWindows Release library in `pwd`
echo Building wxWidgets Release library in `pwd`
echo Command: msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild
msdev wxvc.dsw /useenv /make "wxvc - Win32 Release" /rebuild | egrep -v "$WARNINGS"
}

4
distrib/msw/makefile.vc
View File

@ -6,7 +6,7 @@
#
# "%W% %G%"
#
# Makefile : Builds wxWindows library wx.lib for VC++ (32-bit)
# Makefile : Builds wxWidgets library wx.lib for VC++ (32-bit)
# Arguments:
#
# FINAL=1 argument to nmake to build version with no debugging info.
@ -198,7 +198,7 @@ cleandocs:
# Start Word, running the GeneratePDF macro. MakeManual.dot should be in the
# Office StartUp folder, and PDFMaker should be installed.
updatepdf: # touchmanual pdfrtf
start $(WAITFLAG) "winword d:\wx2\wxWindows\docs\latex\pdf\wx.rtf /mGeneratePDF"
start $(WAITFLAG) "winword d:\wx2\wxWidgets\docs\latex\pdf\wx.rtf /mGeneratePDF"
MFTYPE=vc

4
distrib/msw/makerpm
View File

@ -1,5 +1,5 @@
#!/bin/sh
# Makes the wxWindows RPMs
# Makes the wxWidgets RPMs
doupdatecvs()
{
@ -442,7 +442,7 @@ for i in "$@"; do
esac
done
echo About to make wxWindows RPMs:
echo About to make wxWidgets RPMs:
echo From $WXSRC
echo To $WXDEST
echo Version $WXVER

188
distrib/msw/makesetup.sh
View File

@ -115,13 +115,13 @@ dospinos2()
zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/deprecated.rsp
zip $ZIPFLAGS -u -@ $DESTDIR/wxOS2-$VERSION.zip < $APPDIR/distrib/msw/makefile.rsp
# Rearchive under wxWindows-$VERSION
if [ -d $DESTDIR/wxWindows-$VERSION ]; then
rm -f -r $DESTDIR/wxWindows-$VERSION
# Rearchive under wxWidgets-$VERSION
if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
rm -f -r $DESTDIR/wxWidgets-$VERSION
fi
mkdir $DESTDIR/wxWindows-$VERSION
cd $DESTDIR/wxWindows-$VERSION
mkdir $DESTDIR/wxWidgets-$VERSION
cd $DESTDIR/wxWidgets-$VERSION
unzip $ZIPFLAGS ../wxOS2-$VERSION.zip
# No longer do this, configure should be OK
# echo Overwriting with OS2-specific versions of configure files...
@ -145,7 +145,7 @@ dospinos2()
cd $DESTDIR
rm -f wxOS2-$VERSION.zip
zip $ZIPFLAGS -r wxOS2-$VERSION.zip wxWindows-$VERSION/*
zip $ZIPFLAGS -r wxOS2-$VERSION.zip wxWidgets-$VERSION/*
}
dospinmac()
@ -170,16 +170,16 @@ dospinmac()
zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/deprecated.rsp
zip $ZIPFLAGS -u -@ $DESTDIR/wxMac-$VERSION.zip < $APPDIR/distrib/msw/makefile.rsp
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-CW-Mac.zip < $APPDIR/distrib/msw/cw_mac.rsp
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-CW-Mac.zip < $APPDIR/distrib/msw/cw_mac.rsp
rm -f $APPDIR/include/wx/setup.h
if [ -d $DESTDIR/wxWindows-$VERSION ]; then
rm -f -r $DESTDIR/wxWindows-$VERSION
if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
rm -f -r $DESTDIR/wxWidgets-$VERSION
fi
mkdir $DESTDIR/wxWindows-$VERSION
cd $DESTDIR/wxWindows-$VERSION
mkdir $DESTDIR/wxWidgets-$VERSION
cd $DESTDIR/wxWidgets-$VERSION
unzip $ZIPFLAGS ../wxMac-$VERSION.zip
rm -f src/gtk/descrip.mms src/motif/descrip.mms docs/pdf/*.pdf
rm -f -r docs/html/tex2rtf docs/htmlhelp
@ -195,40 +195,40 @@ dospinmac()
cd $DESTDIR
rm -f wxMac-$VERSION.zip
zip $ZIPFLAGS -r wxMac-$VERSION.zip wxWindows-$VERSION/*
zip $ZIPFLAGS -r wxMac-$VERSION.zip wxWidgets-$VERSION/*
}
dospinmsw()
{
cd $APPDIR
# Create wxWindows-$VERSION-win.zip which is used to create wxMSW
# Create wxWidgets-$VERSION-win.zip which is used to create wxMSW
echo Zipping individual components
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/generic.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/makefile.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/msw.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/ogl.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/mmedia.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/stc.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tex2rtf.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/jpeg.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/tiff.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/xml.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/contrib.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/deprecated.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utils.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/utilmake.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-win.zip < $APPDIR/distrib/msw/univ.rsp
# rearchive wxWindows-$VERSION-win.zip wxWindows-$VERSION $DESTDIR
# rearchive wxWidgets-$VERSION-win.zip wxWidgets-$VERSION $DESTDIR
if [ -d $DESTDIR/wxWindows-$VERSION ]; then
rm -f -r $DESTDIR/wxWindows-$VERSION
if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
rm -f -r $DESTDIR/wxWidgets-$VERSION
fi
mkdir $DESTDIR/wxWindows-$VERSION
cd $DESTDIR/wxWindows-$VERSION
unzip $ZIPFLAGS ../wxWindows-$VERSION-win.zip
mkdir $DESTDIR/wxWidgets-$VERSION
cd $DESTDIR/wxWidgets-$VERSION
unzip $ZIPFLAGS ../wxWidgets-$VERSION-win.zip
echo Removing .mms files
rm -f src/gtk/descrip.mms src/motif/descrip.mms
@ -243,53 +243,53 @@ dospinmsw()
cd $DESTDIR
rm -f wxWindows-$VERSION-win.zip
zip $ZIPFLAGS -r wxWindows-$VERSION-win.zip wxWindows-$VERSION/*
rm -f wxWidgets-$VERSION-win.zip
zip $ZIPFLAGS -r wxWidgets-$VERSION-win.zip wxWidgets-$VERSION/*
}
dospindocs()
{
cd $APPDIR
echo Creating $DESTDIR/wxWindows-$VERSION-DocSource.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-DocSource.zip < $APPDIR/distrib/msw/docsrc.rsp
rearchive wxWindows-$VERSION-DocSource.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-DocSource.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-DocSource.zip < $APPDIR/distrib/msw/docsrc.rsp
rearchive wxWidgets-$VERSION-DocSource.zip wxWidgets-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWindows-$VERSION-WinHelp.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-WinHelp.zip < $APPDIR/distrib/msw/wx_hlp.rsp
rearchive wxWindows-$VERSION-WinHelp.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-WinHelp.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-WinHelp.zip < $APPDIR/distrib/msw/wx_hlp.rsp
rearchive wxWidgets-$VERSION-WinHelp.zip wxWidgets-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWindows-$VERSION-HTML.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTML.zip < $APPDIR/distrib/msw/wx_html.rsp
rearchive wxWindows-$VERSION-HTML.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-HTML.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTML.zip < $APPDIR/distrib/msw/wx_html.rsp
rearchive wxWidgets-$VERSION-HTML.zip wxWidgets-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWindows-$VERSION-PDF.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-PDF.zip < $APPDIR/distrib/msw/wx_pdf.rsp
rearchive wxWindows-$VERSION-PDF.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-PDF.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-PDF.zip < $APPDIR/distrib/msw/wx_pdf.rsp
rearchive wxWidgets-$VERSION-PDF.zip wxWidgets-$VERSION $DESTDIR
# zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-Word.zip < $APPDIR/distrib/msw/wx_word.rsp
# rearchive wxWindows-$VERSION-Word.zip wxWindows-$VERSION $DESTDIR
# zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-Word.zip < $APPDIR/distrib/msw/wx_word.rsp
# rearchive wxWidgets-$VERSION-Word.zip wxWidgets-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWindows-$VERSION-HTB.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTB.zip < $APPDIR/distrib/msw/wx_htb.rsp
rearchive wxWindows-$VERSION-HTB.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-HTB.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTB.zip < $APPDIR/distrib/msw/wx_htb.rsp
rearchive wxWidgets-$VERSION-HTB.zip wxWidgets-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWindows-$VERSION-HTMLHelp.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-HTMLHelp.zip < $APPDIR/distrib/msw/wx_chm.rsp
rearchive wxWindows-$VERSION-HTMLHelp.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-HTMLHelp.zip < $APPDIR/distrib/msw/wx_chm.rsp
rearchive wxWidgets-$VERSION-HTMLHelp.zip wxWidgets-$VERSION $DESTDIR
# Add Linuxy docs to a separate archive to be transported to Linux for the
# Linux-based releases
echo Creating $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_html.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_pdf.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWindows-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_htb.rsp
echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_html.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_pdf.rsp
zip $ZIPFLAGS -@ -u $DESTDIR/wxWidgets-$VERSION-LinuxDocs.zip < $APPDIR/distrib/msw/wx_htb.rsp
# PDF/HTML docs that should go into the Windows setup because
# there are no WinHelp equivalents
echo Creating $DESTDIR/wxWindows-$VERSION-ExtraDoc.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-ExtraDoc.zip < $APPDIR/distrib/msw/extradoc.rsp
rearchive wxWindows-$VERSION-ExtraDoc.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-ExtraDoc.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-ExtraDoc.zip < $APPDIR/distrib/msw/extradoc.rsp
rearchive wxWidgets-$VERSION-ExtraDoc.zip wxWidgets-$VERSION $DESTDIR
}
dospinmisc()
@ -297,24 +297,24 @@ dospinmisc()
cd $APPDIR
# zip up Univ-specific files
echo Creating $DESTDIR/wxWindows-$VERSION-Univ.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-Univ.zip < $APPDIR/distrib/msw/univ.rsp
rearchive wxWindows-$VERSION-Univ.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-Univ.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-Univ.zip < $APPDIR/distrib/msw/univ.rsp
rearchive wxWidgets-$VERSION-Univ.zip wxWidgets-$VERSION $DESTDIR
# VC++ project files
echo Creating $DESTDIR/wxWindows-$VERSION-VC.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-VC.zip < $APPDIR/distrib/msw/vc.rsp
# rearchive wxWindows-$VERSION-VC.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-VC.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-VC.zip < $APPDIR/distrib/msw/vc.rsp
# rearchive wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION $DESTDIR
# BC++ project files
echo Creating $DESTDIR/wxWindows-$VERSION-BC.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-BC.zip < $APPDIR/distrib/msw/bc.rsp
# rearchive wxWindows-$VERSION-BC.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-BC.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-BC.zip < $APPDIR/distrib/msw/bc.rsp
# rearchive wxWidgets-$VERSION-BC.zip wxWidgets-$VERSION $DESTDIR
# CodeWarrior project files
echo Creating $DESTDIR/wxWindows-$VERSION-CW.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWindows-$VERSION-CW.zip < $APPDIR/distrib/msw/cw.rsp
# rearchive wxWindows-$VERSION-CW.zip wxWindows-$VERSION $DESTDIR
echo Creating $DESTDIR/wxWidgets-$VERSION-CW.zip
zip $ZIPFLAGS -@ $DESTDIR/wxWidgets-$VERSION-CW.zip < $APPDIR/distrib/msw/cw.rsp
# rearchive wxWidgets-$VERSION-CW.zip wxWidgets-$VERSION $DESTDIR
}
dospinsetup()
@ -322,23 +322,23 @@ dospinsetup()
cd $DESTDIR
# Put all archives for transit to Linux in a zip file
echo Creating $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip
rm -f $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip
zip $ZIPFLAGS $DESTDIR/wxWindows-$VERSION-LinuxTransit.zip wxWindows-$VERSION-LinuxDocs.zip wxWindows-$VERSION-VC.zip wxWindows-$VERSION-CW-Mac.zip
echo Creating $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
rm -f $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip
zip $ZIPFLAGS $DESTDIR/wxWidgets-$VERSION-LinuxTransit.zip wxWidgets-$VERSION-LinuxDocs.zip wxWidgets-$VERSION-VC.zip wxWidgets-$VERSION-CW-Mac.zip
echo Unzipping the Windows files into wxWindows-$VERSION
echo Unzipping the Windows files into wxWidgets-$VERSION
unzip $ZIPFLAGS -o wxWindows-$VERSION-win.zip
unzip $ZIPFLAGS -o wxWindows-$VERSION-VC.zip -d wxWindows-$VERSION
unzip $ZIPFLAGS -o wxWindows-$VERSION-BC.zip -d wxWindows-$VERSION
unzip $ZIPFLAGS -o wxWindows-$VERSION-CW.zip -d wxWindows-$VERSION
unzip $ZIPFLAGS -o wxWindows-$VERSION-HTMLHelp.zip
unzip $ZIPFLAGS -o wxWindows-$VERSION-ExtraDoc.zip
unzip $ZIPFLAGS -o wxWidgets-$VERSION-win.zip
unzip $ZIPFLAGS -o wxWidgets-$VERSION-VC.zip -d wxWidgets-$VERSION
unzip $ZIPFLAGS -o wxWidgets-$VERSION-BC.zip -d wxWidgets-$VERSION
unzip $ZIPFLAGS -o wxWidgets-$VERSION-CW.zip -d wxWidgets-$VERSION
unzip $ZIPFLAGS -o wxWidgets-$VERSION-HTMLHelp.zip
unzip $ZIPFLAGS -o wxWidgets-$VERSION-ExtraDoc.zip
# After this change of directory, we're in the
# temporary 'wx' directory and not acting on
# the source wxWindows directory.
cd $DESTDIR/wxWindows-$VERSION
# the source wxWidgets directory.
cd $DESTDIR/wxWidgets-$VERSION
# Now delete a few files that are unnecessary
#attrib -R *
@ -369,8 +369,8 @@ dospinsetup()
# Make wxMSW-xxx.zip
cd $DESTDIR
zip $ZIPFLAGS -r wxMSW-$VERSION.zip wxWindows-$VERSION/*
cd wxWindows-$VERSION
zip $ZIPFLAGS -r wxMSW-$VERSION.zip wxWidgets-$VERSION/*
cd wxWidgets-$VERSION
echo Generating $SETUPSCRIPTNAME
rm -f $SETUPSCRIPTNAME
@ -448,8 +448,8 @@ dospinsetup()
echo Putting all the setup files into a single zip archive
zip wxMSW-$VERSION-setup.zip readme-$VERSION.txt setup*.*
rm -f wxWindows-$VERSION-win.zip
rm -f wxWindows-$VERSION-ExtraDoc.zip
rm -f wxWidgets-$VERSION-win.zip
rm -f wxWidgets-$VERSION-ExtraDoc.zip
echo If you saw no warnings or errors, $APPTITLE was successfully spun.
echo
@ -514,8 +514,8 @@ makesetup()
if [ ! -d $DESTDIR ]; then
mkdir $DESTDIR
fi
if [ -d $DESTDIR/wxWindows-$VERSION ]; then
rm -f -r $DESTDIR/wxWindows-$VERSION
if [ -d $DESTDIR/wxWidgets-$VERSION ]; then
rm -f -r $DESTDIR/wxWidgets-$VERSION
fi
# Copy FAQ from wxWebSite CVS
@ -587,7 +587,7 @@ makesetup()
}
# We can't use e.g. this:
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
# because there's not enough space on the command line, plus we need to ignore the
# blank lines.
# So if we need to (not in this script so far) we do something like this instead:

4
distrib/msw/maketarballs
View File

@ -1,5 +1,5 @@
#!/bin/sh
# Makes the wxWindows tarballs with 'make dist'
# Makes the wxWidgets tarballs with 'make dist'
doupdatecvs()
{
@ -224,7 +224,7 @@ for i in "$@"; do
esac
done
echo About to make wxWindows RPMs:
echo About to make wxWidgets RPMs:
echo From $WXSRC
echo To $WXDEST
echo Version $WXVER

6
distrib/msw/setup.var
View File

@ -11,13 +11,13 @@ APPNAME=wxwin
# The application title
#-------------------------------------------------------------------------
APPTITLE="wxWindows"
APPTITLE="wxWidgets"
#-------------------------------------------------------------------------
# The application author (copyright holder)
#-------------------------------------------------------------------------
AUTHOR="The wxWindows Team"
AUTHOR="The wxWidgets Team"
#-------------------------------------------------------------------------
# The application vendor (organisation)
@ -53,7 +53,7 @@ DESTDIR=$APPDIR/deliver
# The temporary image directory to use when preparing the setup
#-------------------------------------------------------------------------
SETUPIMAGEDIR=$APPDIR/deliver/wxWindows-$VERSION
SETUPIMAGEDIR=$APPDIR/deliver/wxWidgets-$VERSION
#-------------------------------------------------------------------------
# The name of the file with $VERSIONSYMBOL in it

2
distrib/msw/splitwise.cpp
View File

@ -22,7 +22,7 @@
// Created: 13/10/99
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////

176
distrib/msw/tardist
View File

@ -1,9 +1,9 @@
#!/bin/sh
# tardist: make up a tar.gz distribution of wxWindows 2
# tardist: make up a tar.gz distribution of wxWidgets 2
# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
# We can't use e.g. this:
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
# because there's not enough space on the command line, plus we need to ignore the
# blank lines.
@ -178,10 +178,10 @@ cd wxMac-${WXVER}
# If we have the full set of Mac CW project files,
# get them
if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
if [ -f $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip ]; then
unzip -o $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip
else
echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
fi
$TAR xf ../wxMac-${WXVER}.tar
@ -204,18 +204,18 @@ gzip $WXDEST/wxMac-${WXVER}.tar
#cd $WXSRC
#cat $WXSRC/distrib/msw/univ.rsp > /tmp/wxuniv_in.txt
#expandlines /tmp/wxuniv_in.txt /tmp/wxuniv.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
#$TAR cf $WXDEST/wxWidgets-${WXVER}-Univ.tar -T /tmp/wxuniv.txt
#
#echo Re-tarring wxUniversal in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-Univ.tar
#mkdir wxWidgets-${WXVER}
#cd wxWidgets-${WXVER}
#$TAR xf ../wxWidgets-${WXVER}-Univ.tar
#cd ..
#rm -f wxWindows-${WXVER}-Univ.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-Univ.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-Univ.tar
#rm -f wxWidgets-${WXVER}-Univ.tar
#$TAR cf $WXDEST/wxWidgets-${WXVER}-Univ.tar wxWidgets-${WXVER}/*
#rm -f -r wxWidgets-${WXVER}
#gzip $WXDEST/wxWidgets-${WXVER}-Univ.tar
dospinwxall()
{
@ -229,24 +229,24 @@ $TAR cf $WXDEST/wxAll-${WXVER}.tar -T /tmp/wxall.txt
echo Re-tarring wxAll in a subdirectory...
cd $WXDEST
mkdir wxWindows-${WXVER}
mkdir wxWidgets-${WXVER}
cd wxWindows-${WXVER}
cd wxWidgets-${WXVER}
# If we have the full set of VC++ project files,
# get them
if [ -f $WXDEST/extra/wxWindows-${WXVER}-VC.zip ]; then
unzip -o $WXDEST/extra/wxWindows-${WXVER}-VC.zip
if [ -f $WXDEST/extra/wxWidgets-${WXVER}-VC.zip ]; then
unzip -o $WXDEST/extra/wxWidgets-${WXVER}-VC.zip
else
echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-VC.zip"
echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-VC.zip"
fi
# If we have the full set of Mac CW project files,
# get them
if [ -f $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip ]; then
unzip -o $WXDEST/extra/wxWindows-${WXVER}-CW-Mac.zip
if [ -f $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip ]; then
unzip -o $WXDEST/extra/wxWidgets-${WXVER}-CW-Mac.zip
else
echo "Warning - did not find $WXDEST/deliver/extra/wxWindows-${WXVER}-CW-Mac.zip"
echo "Warning - did not find $WXDEST/deliver/extra/wxWidgets-${WXVER}-CW-Mac.zip"
fi
$TAR xf ../wxAll-${WXVER}.tar
@ -272,8 +272,8 @@ cp $WXSRC/docs/os2/install.txt INSTALL-OS2.txt
cd ..
rm -f wxAll-${WXVER}.tar
$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
$TAR cf $WXDEST/wxAll-${WXVER}.tar wxWidgets-${WXVER}/*
rm -f -r wxWidgets-${WXVER}
gzip $WXDEST/wxAll-${WXVER}.tar
}
@ -285,138 +285,138 @@ echo Tarring wxDocs...
#cd $WXSRC
#cat $WXSRC/distrib/msw/docsrc.rsp > /tmp/docsrc_in.txt
#expandlines /tmp/docsrc_in.txt /tmp/docsrc.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar -T /tmp/docsrc.txt
#$TAR cf $WXDEST/wxWidgets-${WXVER}-doc.tar -T /tmp/docsrc.txt
#
#echo Re-tarring docs in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-doc.tar
#mkdir wxWidgets-${WXVER}
#cd wxWidgets-${WXVER}
#$TAR xf ../wxWidgets-${WXVER}-doc.tar
#cd ..
#rm -f wxWindows-${WXVER}-doc.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-doc.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-doc.tar
#rm -f wxWidgets-${WXVER}-doc.tar
#$TAR cf $WXDEST/wxWidgets-${WXVER}-doc.tar wxWidgets-${WXVER}/*
#rm -f -r wxWidgets-${WXVER}
#gzip $WXDEST/wxWidgets-${WXVER}-doc.tar
### HTML docs
cd $WXSRC
cat $WXSRC/distrib/msw/wx_html.rsp > /tmp/html_in.txt
expandlines /tmp/html_in.txt /tmp/html.txt
$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
$TAR cf $WXDEST/wxWidgets-${WXVER}-HTML.tar -T /tmp/html.txt
echo Re-tarring HTML in a subdirectory...
cd $WXDEST
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-HTML.tar
mkdir wxWidgets-${WXVER}
cd wxWidgets-${WXVER}
$TAR xf ../wxWidgets-${WXVER}-HTML.tar
cd ..
rm -f wxWindows-${WXVER}-HTML.tar
$TAR cf $WXDEST/wxWindows-${WXVER}-HTML.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $WXDEST/wxWindows-${WXVER}-HTML.tar
rm -f wxWidgets-${WXVER}-HTML.tar
$TAR cf $WXDEST/wxWidgets-${WXVER}-HTML.tar wxWidgets-${WXVER}/*
rm -f -r wxWidgets-${WXVER}
gzip $WXDEST/wxWidgets-${WXVER}-HTML.tar
### HTB docs
cd $WXSRC
cat $WXSRC/distrib/msw/wx_htb.rsp > /tmp/htb_in.txt
expandlines /tmp/htb_in.txt /tmp/htb.txt
$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
$TAR cf $WXDEST/wxWidgets-${WXVER}-HTB.tar -T /tmp/htb.txt
echo Re-tarring HTB in a subdirectory...
cd $WXDEST
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-HTB.tar
mkdir wxWidgets-${WXVER}
cd wxWidgets-${WXVER}
$TAR xf ../wxWidgets-${WXVER}-HTB.tar
cd ..
rm -f wxWindows-${WXVER}-HTB.tar
$TAR cf $WXDEST/wxWindows-${WXVER}-HTB.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $WXDEST/wxWindows-${WXVER}-HTB.tar
rm -f wxWidgets-${WXVER}-HTB.tar
$TAR cf $WXDEST/wxWidgets-${WXVER}-HTB.tar wxWidgets-${WXVER}/*
rm -f -r wxWidgets-${WXVER}
gzip $WXDEST/wxWidgets-${WXVER}-HTB.tar
### PDF docs
cd $WXSRC
cat $WXSRC/distrib/msw/wx_pdf.rsp > /tmp/pdf_in.txt
expandlines /tmp/pdf_in.txt /tmp/pdf.txt
$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
$TAR cf $WXDEST/wxWidgets-${WXVER}-PDF.tar -T /tmp/pdf.txt
echo Re-tarring PDF in a subdirectory...
cd $WXDEST
mkdir wxWindows-${WXVER}
cd wxWindows-${WXVER}
$TAR xf ../wxWindows-${WXVER}-PDF.tar
mkdir wxWidgets-${WXVER}
cd wxWidgets-${WXVER}
$TAR xf ../wxWidgets-${WXVER}-PDF.tar
cd ..
rm -f wxWindows-${WXVER}-PDF.tar
$TAR cf $WXDEST/wxWindows-${WXVER}-PDF.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
gzip $WXDEST/wxWindows-${WXVER}-PDF.tar
rm -f wxWidgets-${WXVER}-PDF.tar
$TAR cf $WXDEST/wxWidgets-${WXVER}-PDF.tar wxWidgets-${WXVER}/*
rm -f -r wxWidgets-${WXVER}
gzip $WXDEST/wxWidgets-${WXVER}-PDF.tar
}
### Tex2RTF
#cd $WXSRC
#cat $WXSRC/distrib/msw/tex2rtf.rsp > /tmp/tex2rtf_in.txt
#expandlines /tmp/tex2rtf_in.txt /tmp/tex2rtf.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
#$TAR cf $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar -T /tmp/tex2rtf.txt
#
#echo Re-tarring Tex2RTF in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-tex2rtf.tar
#mkdir wxWidgets-${WXVER}
#cd wxWidgets-${WXVER}
#$TAR xf ../wxWidgets-${WXVER}-tex2rtf.tar
#cd ..
#rm -f wxWindows-${WXVER}-tex2rtf.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-tex2rtf.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-tex2rtf.tar
#rm -f wxWidgets-${WXVER}-tex2rtf.tar
#$TAR cf $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar wxWidgets-${WXVER}/*
#rm -f -r wxWidgets-${WXVER}
#gzip $WXDEST/wxWidgets-${WXVER}-tex2rtf.tar
### OGL
#cd $WXSRC
#cat $WXSRC/distrib/msw/ogl.rsp > /tmp/ogl_in.txt
#expandlines /tmp/ogl_in.txt /tmp/ogl.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar -T /tmp/ogl.txt
#$TAR cf $WXDEST/wxWidgets-${WXVER}-ogl.tar -T /tmp/ogl.txt
#
#echo Re-tarring OGL in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-ogl.tar
#mkdir wxWidgets-${WXVER}
#cd wxWidgets-${WXVER}
#$TAR xf ../wxWidgets-${WXVER}-ogl.tar
#cd ..
#rm -f wxWindows-${WXVER}-ogl.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-ogl.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-ogl.tar
#rm -f wxWidgets-${WXVER}-ogl.tar
#$TAR cf $WXDEST/wxWidgets-${WXVER}-ogl.tar wxWidgets-${WXVER}/*
#rm -f -r wxWidgets-${WXVER}
#gzip $WXDEST/wxWidgets-${WXVER}-ogl.tar
### JPEG
#cd $WXSRC
#cat $WXSRC/distrib/msw/jpeg.rsp > /tmp/jpeg_in.txt
#expandlines /tmp/jpeg_in.txt /tmp/jpeg.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
#$TAR cf $WXDEST/wxWidgets-${WXVER}-jpeg.tar -T /tmp/jpeg.txt
#
#echo Re-tarring jpeg in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-jpeg.tar
#mkdir wxWidgets-${WXVER}
#cd wxWidgets-${WXVER}
#$TAR xf ../wxWidgets-${WXVER}-jpeg.tar
#cd ..
#rm -f wxWindows-${WXVER}-jpeg.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-jpeg.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-jpeg.tar
#rm -f wxWidgets-${WXVER}-jpeg.tar
#$TAR cf $WXDEST/wxWidgets-${WXVER}-jpeg.tar wxWidgets-${WXVER}/*
#rm -f -r wxWidgets-${WXVER}
#gzip $WXDEST/wxWidgets-${WXVER}-jpeg.tar
### TIFF
#cd $WXSRC
#cat $WXSRC/distrib/msw/tiff.rsp > /tmp/tiff_in.txt
#expandlines /tmp/tiff_in.txt /tmp/tiff.txt
#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar -T /tmp/tiff.txt
#$TAR cf $WXDEST/wxWidgets-${WXVER}-tiff.tar -T /tmp/tiff.txt
#
#echo Re-tarring docs in a subdirectory...
#cd $WXDEST
#mkdir wxWindows-${WXVER}
#cd wxWindows-${WXVER}
#$TAR xf ../wxWindows-${WXVER}-tiff.tar
#mkdir wxWidgets-${WXVER}
#cd wxWidgets-${WXVER}
#$TAR xf ../wxWidgets-${WXVER}-tiff.tar
#cd ..
#rm -f wxWindows-${WXVER}-tiff.tar
#$TAR cf $WXDEST/wxWindows-${WXVER}-tiff.tar wxWindows-${WXVER}/*
#rm -f -r wxWindows-${WXVER}
#gzip $WXDEST/wxWindows-${WXVER}-tiff.tar
#rm -f wxWidgets-${WXVER}-tiff.tar
#$TAR cf $WXDEST/wxWidgets-${WXVER}-tiff.tar wxWidgets-${WXVER}/*
#rm -f -r wxWidgets-${WXVER}
#gzip $WXDEST/wxWidgets-${WXVER}-tiff.tar
init=""
if [ "$1" = "" ]
@ -484,7 +484,7 @@ for i in "$@"; do
esac
done
echo About to archive wxWindows:
echo About to archive wxWidgets:
echo From $WXSRC
echo To $WXDEST
echo Version $WXVER

8
distrib/msw/tardist.bat
View File

@ -1,5 +1,5 @@
@echo off
rem Tar up an external distribution of wxWindows 2.0: but
rem Tar up an external distribution of wxWidgets 2.0: but
rem putting in separate ASCII and binary files
rem This seems to be the one that works, using
rem separate tar programs for conversion/non-conversion
@ -7,7 +7,7 @@ rem of ASCII/binary files.
if "%1" == "" goto usage
if "%2" == "" goto usage
echo About to archive an external wxWindows 2.0 distribution:
echo About to archive an external wxWidgets 2.0 distribution:
echo From %1
echo To %2\wx200_1.tgz, %2\wx200_2.tgz, %2\wx200hlp.tgz, %2\wx200ps.tgz, %2\wx200htm.tgz
echo CTRL-C if this is not correct.
@ -104,11 +104,11 @@ gzip32 %2\wx200pdf.tar
ren %2\wx200pdf.tar.gz %2\wx200pdf.tgz
cd %2
echo wxWindows archived.
echo wxWidgets archived.
goto end
:usage
echo Tar/gzip wxWindows distribution under DOS, making an ASCII and binary file
echo Tar/gzip wxWidgets distribution under DOS, making an ASCII and binary file
echo Usage: tardist source destination
echo e.g. tardist d:\wx d:\wx\deliver

2
distrib/msw/tarmicrowin.sh
View File

@ -22,7 +22,7 @@ fi
WXVER=$3
echo About to archive wxWindows:
echo About to archive wxWidgets:
echo From $1
echo To $2
echo CTRL-C if this is not correct.

18
distrib/msw/tarwxall
View File

@ -3,7 +3,7 @@
# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
# We can't use e.g. this:
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
# because there's not enough space on the command line, plus we need to ignore the
# blank lines.
@ -72,18 +72,18 @@ $TAR cf $2/wxAll-${WXVER}.tar -T /tmp/wxall.txt
echo Re-tarring wxAll in a subdirectory...
cd $2
rm -f -r wxWindows-${WXVER}
mkdir wxWindows-${WXVER}
rm -f -r wxWidgets-${WXVER}
mkdir wxWidgets-${WXVER}
# If we have the full set of VC++ project files,
# get them
if [ -f $2/extra/wxWindows-${WXVER}-VC.zip ]; then
unzip -o $2/extra/wxWindows-${WXVER}-VC.zip
if [ -f $2/extra/wxWidgets-${WXVER}-VC.zip ]; then
unzip -o $2/extra/wxWidgets-${WXVER}-VC.zip
else
echo "Warning - did not find $2/deliver/extra/wxWindows-${WXVER}-VC.zip"
echo "Warning - did not find $2/deliver/extra/wxWidgets-${WXVER}-VC.zip"
fi
cd wxWindows-${WXVER}
cd wxWidgets-${WXVER}
$TAR xf ../wxAll-${WXVER}.tar
# Translate all .dsp and .dsw files to DOS format
@ -105,7 +105,7 @@ $1/distrib/msw/namedown src/os2/*.CPP src/os2/*.I
cd ..
rm -f wxAll-${WXVER}.tar
$TAR cf $2/wxAll-${WXVER}.tar wxWindows-${WXVER}/*
rm -f -r wxWindows-${WXVER}
$TAR cf $2/wxAll-${WXVER}.tar wxWidgets-${WXVER}/*
rm -f -r wxWidgets-${WXVER}
gzip $2/wxAll-${WXVER}.tar

2
distrib/msw/tarwxmac
View File

@ -3,7 +3,7 @@
# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
# We can't use e.g. this:
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
# because there's not enough space on the command line, plus we need to ignore the
# blank lines.

30
distrib/msw/tarwxmotif
View File

@ -1,5 +1,5 @@
#!/bin/sh
# tardist: make up a tar.gz distribution of wxWindows 2
# tardist: make up a tar.gz distribution of wxWidgets 2
# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
init=""
@ -14,7 +14,7 @@ then
exit
fi
echo About to archive wxWindows:
echo About to archive wxWidgets:
echo From $1
echo To $2
echo CTRL-C if this is not correct.
@ -29,7 +29,7 @@ echo Setting permissions...
chmod a+x $1/configure $1/config.sub $1/config.guess $1/samples/configure $1/demos/configure $1/contrib/configure
rm -f $2/wxMotif-${WXVER}*.tgz
rm -f $2/wxWindows*.tgz
rm -f $2/wxWidgets*.tgz
rm -f $2/tex2rtf2.tgz
rm -f $2/ogl3.tgz
rm -f $2/jpeg.tgz
@ -45,27 +45,27 @@ mv $2/wxMotif-${WXVER}.tar.gz $2/wxMotif-${WXVER}.tgz
### HTML docs
ls `cat $1/distrib/msw/wx_html.rsp` > /tmp/html.txt
tar cvf $2/wxWindows-${WXVER}-HTML.tar -T /tmp/html.txt
gzip $2/wxWindows-${WXVER}-HTML.tar
mv $2/wxWindows-${WXVER}-HTML.tar.gz $2/wxWindows-${WXVER}-HTML.tgz
tar cvf $2/wxWidgets-${WXVER}-HTML.tar -T /tmp/html.txt
gzip $2/wxWidgets-${WXVER}-HTML.tar
mv $2/wxWidgets-${WXVER}-HTML.tar.gz $2/wxWidgets-${WXVER}-HTML.tgz
### HTB (wxHTML Help) docs
ls `cat $1/distrib/msw/wx_htb.rsp` > /tmp/htb.txt
tar cvf $2/wxWindows-${WXVER}-HTB.tar -T /tmp/htb.txt
gzip $2/wxWindows-${WXVER}-HTB.tar
mv $2/wxWindows-${WXVER}-HTB.tar.gz $2/wxWindows-${WXVER}-HTB.tgz
tar cvf $2/wxWidgets-${WXVER}-HTB.tar -T /tmp/htb.txt
gzip $2/wxWidgets-${WXVER}-HTB.tar
mv $2/wxWidgets-${WXVER}-HTB.tar.gz $2/wxWidgets-${WXVER}-HTB.tgz
### PDF docs
ls `cat $1/distrib/msw/wx_pdf.rsp` > /tmp/pdf.txt
tar cvf $2/wxWindows-${WXVER}-PDF.tar -T /tmp/pdf.txt
gzip $2/wxWindows-${WXVER}-PDF.tar
mv $2/wxWindows-${WXVER}-PDF.tar.gz $2/wxWindows-${WXVER}-PDF.tgz
tar cvf $2/wxWidgets-${WXVER}-PDF.tar -T /tmp/pdf.txt
gzip $2/wxWidgets-${WXVER}-PDF.tar
mv $2/wxWidgets-${WXVER}-PDF.tar.gz $2/wxWidgets-${WXVER}-PDF.tgz
### Stubs files
#ls `cat $1/distrib/msw/stubs.rsp` > /tmp/stubs.txt
#tar cvf $2/wxWindows-${WXVER}-stubs.tar -T /tmp/stubs.txt
#gzip $2/wxWindows-${WXVER}-stubs.tar
#mv $2/wxWindows-${WXVER}-stubs.tar.gz $2/wxWindows-${WXVER}-stubs.tgz
#tar cvf $2/wxWidgets-${WXVER}-stubs.tar -T /tmp/stubs.txt
#gzip $2/wxWidgets-${WXVER}-stubs.tar
#mv $2/wxWidgets-${WXVER}-stubs.tar.gz $2/wxWidgets-${WXVER}-stubs.tgz
### Tex2RTF
ls `cat $1/distrib/msw/tex2rtf.rsp` > /tmp/tex2rtf.txt

2
distrib/msw/tarwxx11
View File

@ -3,7 +3,7 @@
# Supply a source (e.g. ~/wx2) and destination (e.g. ~/wx2/deliver)
# We can't use e.g. this:
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
# because there's not enough space on the command line, plus we need to ignore the
# blank lines.

552
distrib/msw/wince.rsp
View File

@ -1,380 +1,368 @@
src/msw/wince/wxWindowsCE.vcp
src/msw/wince/wxWindowsCE.vcw
build/wince/wx.vcw
build/wince/wx_gl.vcp
build/wince/wx_mono.vcp
build/wince/wx_wxexpat.vcp
build/wince/wx_wxjpeg.vcp
build/wince/wx_wxpng.vcp
build/wince/wx_wxzlib.vcp
src/jpeg/jpegCE.vcp
src/jpeg/jpegCE.vcw
samples/access/access.vcp
samples/access/access.vcw
src/tiff/tiffCE.vcp
src/tiff/tiffCE.vcw
samples/artprov/artprov.vcp
samples/artprov/artprov.vcw
src/zlib/zlibCE.vcp
src/zlib/zlibCE.vcw
samples/calendar/arttest.vcp
samples/calendar/arttest.vcw
src/png/pngCE.vcp
src/png/pngCE.vcw
samples/calendar/calendar.vcp
samples/calendar/calendar.vcw
src/regex/regexCE.vcp
src/regex/regexCE.vcw
samples/caret/caret.vcp
samples/caret/caret.vcw
samples/samplesCE.vcw
samples/checklst/checklst.vcp
samples/checklst/checklst.vcw
samples/access/accessCE.vcp
samples/access/accessCE.vcw
samples/config/config.vcp
samples/config/config.vcw
samples/artprov/artprovCE.vcp
samples/artprov/artprovCE.vcw
samples/console/console.vcp
samples/console/console.vcw
samples/calendar/arttestCE.vcp
samples/calendar/arttestCE.vcw
samples/controls/controls.vcp
samples/controls/controls.vcw
samples/calendar/calendarCE.vcp
samples/calendar/calendarCE.vcw
samples/db/db.vcp
samples/db/db.vcw
samples/caret/caretCE.vcp
samples/caret/caretCE.vcw
samples/dialogs/dialogs.vcp
samples/dialogs/dialogs.vcw
samples/checklst/checklstCE.vcp
samples/checklst/checklstCE.vcw
samples/dialup/dialup.vcp
samples/dialup/dialup.vcw
samples/config/configCE.vcp
samples/config/configCE.vcw
samples/display/display.vcp
samples/display/display.vcw
samples/console/consoleCE.vcp
samples/console/consoleCE.vcw
samples/dnd/dnd.vcp
samples/dnd/dnd.vcw
samples/controls/controlsCE.vcp
samples/controls/controlsCE.vcw
samples/dragimag/dragimag.vcp
samples/dragimag/dragimag.vcw
samples/db/dbCE.vcp
samples/db/dbCE.vcw
samples/docview/docview.vcp
samples/docview/docview.vcw
samples/dialogs/dialogsCE.vcp
samples/dialogs/dialogsCE.vcw
samples/docvwmdi/docvwmdi.vcp
samples/docvwmdi/docvwmdi.vcw
samples/dialup/dialupCE.vcp
samples/dialup/dialupCE.vcw
samples/drawing/drawing.vcp
samples/drawing/drawing.vcw
samples/display/displayCE.vcp
samples/display/displayCE.vcw
samples/dynamic/dynamic.vcp
samples/dynamic/dynamic.vcw
samples/dnd/dndCE.vcp
samples/dnd/dndCE.vcw
samples/erase/erase.vcp
samples/erase/erase.vcw
samples/dragimag/dragimagCE.vcp
samples/dragimag/dragimagCE.vcw
samples/event/event.vcp
samples/event/event.vcw
samples/docview/docviewCE.vcp
samples/docview/docviewCE.vcw
samples/exec/exec.vcp
samples/exec/exec.vcw
samples/docvwmdi/docvwmdiCE.vcp
samples/docvwmdi/docvwmdiCE.vcw
samples/font/font.vcp
samples/font/font.vcw
samples/drawing/drawingCE.vcp
samples/drawing/drawingCE.vcw
samples/grid/griddemo.vcp
samples/grid/griddemo.vcw
samples/dynamic/dynamicCE.vcp
samples/dynamic/dynamicCE.vcw
samples/help/help.vcp
samples/help/help.vcw
samples/erase/eraseCE.vcp
samples/erase/eraseCE.vcw
samples/htlbox/htlbox.vcp
samples/htlbox/htlbox.vcw
samples/event/eventCE.vcp
samples/event/eventCE.vcw
samples/html/about/about.vcp
samples/html/about/about.vcw
samples/html/help/help.vcp
samples/html/help/help.vcw
samples/html/helpview/helpview.vcp
samples/html/helpview/helpview.vcw
samples/html/printing/printing.vcp
samples/html/printing/printing.vcw
samples/html/test/test.vcp
samples/html/test/test.vcw
samples/html/virtual/virtual.vcp
samples/html/virtual/virtual.vcw
samples/html/widget/widget.vcp
samples/html/widget/widget.vcw
samples/html/zip/zip.vcp
samples/html/zip/zip.vcw
samples/exec/execCE.vcp
samples/exec/execCE.vcw
samples/image/image.vcp
samples/image/image.vcw
samples/font/fontCE.vcp
samples/font/fontCE.vcw
samples/internat/internat.vcp
samples/internat/internat.vcw
samples/grid/griddemoCE.vcp
samples/grid/griddemoCE.vcw
samples/keyboard/keyboard.vcp
samples/keyboard/keyboard.vcw
samples/help/helpCE.vcp
samples/help/helpCE.vcw
samples/ipc/client.vcp
samples/ipc/client.vcw
samples/ipc/server.vcp
samples/ipc/server.vcw
samples/htlbox/htlboxCE.vcp
samples/htlbox/htlboxCE.vcw
samples/joytest/joytest.vcp
samples/joytest/joytest.vcw
samples/html/about/aboutCE.vcp
samples/html/about/aboutCE.vcw
samples/html/help/helpCE.vcp
samples/html/help/helpCE.vcw
samples/html/helpview/helpviewCE.vcp
samples/html/helpview/helpviewCE.vcw
samples/html/printing/printingCE.vcp
samples/html/printing/printingCE.vcw
samples/html/test/testCE.vcp
samples/html/test/testCE.vcw
samples/html/virtual/virtualCE.vcp
samples/html/virtual/virtualCE.vcw
samples/html/widget/widgetCE.vcp
samples/html/widget/widgetCE.vcw
samples/html/zip/zipCE.vcp
samples/html/zip/zipCE.vcw
samples/layout/layout.vcp
samples/layout/layout.vcw
samples/image/imageCE.vcp
samples/image/imageCE.vcw
samples/listbox/lboxtest.vcp
samples/listbox/lboxtest.vcw
samples/internat/internatCE.vcp
samples/internat/internatCE.vcw
samples/listctrl/listctrl.vcp
samples/listctrl/listctrl.vcw
samples/keyboard/keyboardCE.vcp
samples/keyboard/keyboardCE.vcw
samples/mdi/mdi.vcp
samples/mdi/mdi.vcw
samples/ipc/clientCE.vcp
samples/ipc/clientCE.vcw
samples/ipc/serverCE.vcp
samples/ipc/serverCE.vcw
samples/memcheck/memcheck.vcp
samples/memcheck/memcheck.vcw
samples/joytest/joytestCE.vcp
samples/joytest/joytestCE.vcw
samples/menu/menu.vcp
samples/menu/menu.vcw
samples/layout/layoutCE.vcp
samples/layout/layoutCE.vcw
samples/mfc/mfc.vcp
samples/mfc/mfc.vcw
samples/listbox/lboxtestCE.vcp
samples/listbox/lboxtestCE.vcw
samples/minimal/minimal.vcp
samples/minimal/minimal.vcw
samples/listctrl/listctrlCE.vcp
samples/listctrl/listctrlCE.vcw
samples/minifram/minifram.vcp
samples/minifram/minifram.vcw
samples/mdi/mdiCE.vcp
samples/mdi/mdiCE.vcw
samples/mobile/styles/styles.vcp
samples/mobile/wxedit/wxedit.vcw
samples/memcheck/memcheckCE.vcp
samples/memcheck/memcheckCE.vcw
samples/multimon/multimon_test.vcp
samples/multimon/multimon_test.vcw
samples/menu/menuCE.vcp
samples/menu/menuCE.vcw
samples/nativdlg/nativdlg.vcp
samples/nativdlg/nativdlg.vcw
samples/mfc/mfcCE.vcp
samples/mfc/mfcCE.vcw
samples/notebook/notebook.vcp
samples/notebook/notebook.vcw
samples/minimal/minimalCE.vcp
samples/minimal/minimalCE.vcw
samples/oleauto/oleauto.vcp
samples/oleauto/oleauto.vcw
samples/minifram/miniframCE.vcp
samples/minifram/miniframCE.vcw
samples/ownerdrw/ownerDrw.vcp
samples/ownerdrw/ownerDrw.vcw
samples/mobile/styles/stylesCE.vcp
samples/mobile/wxedit/wxeditCE.vcw
samples/png/png.vcp
samples/png/png.vcw
samples/multimon/multimon_testCE.vcp
samples/multimon/multimon_testCE.vcw
samples/printing/printing.vcp
samples/printing/printing.vcw
samples/nativdlg/nativdlgCE.vcp
samples/nativdlg/nativdlgCE.vcw
samples/propsize/propsize.vcp
samples/propsize/propsize.vcw
samples/notebook/notebookCE.vcp
samples/notebook/notebookCE.vcw
samples/regtest/regtest.vcp
samples/regtest/regtest.vcw
samples/oleauto/oleautoCE.vcp
samples/oleauto/oleautoCE.vcw
samples/rotate/rotate.vcp
samples/rotate/rotate.vcw
samples/ownerdrw/ownerDrwCE.vcp
samples/ownerdrw/ownerDrwCE.vcw
samples/sashtest/sashtest.vcp
samples/sashtest/sashtest.vcw
samples/png/pngCE.vcp
samples/png/pngCE.vcw
samples/scroll/scroll.vcp
samples/scroll/scroll.vcw
samples/printing/printingCE.vcp
samples/printing/printingCE.vcw
samples/scrollsub/scrollsub.vcp
samples/scrollsub/scrollsub.vcw
samples/propsize/propsizeCE.vcp
samples/propsize/propsizeCE.vcw
samples/shaped/shaped.vcp
samples/shaped/shaped.vcw
samples/regtest/regtestCE.vcp
samples/regtest/regtestCE.vcw
samples/sockets/client.vcp
samples/sockets/server.vcp
samples/sockets/client.vcw
samples/sockets/server.vcw
samples/rotate/rotateCE.vcp
samples/rotate/rotateCE.vcw
samples/splitter/splitter.vcp
samples/splitter/splitter.vcw
samples/sashtest/sashtestCE.vcp
samples/sashtest/sashtestCE.vcw
samples/statbar/statbar.vcp
samples/statbar/statbar.vcw
samples/scroll/scrollCE.vcp
samples/scroll/scrollCE.vcw
samples/taskbar/taskbar.vcp
samples/taskbar/taskbar.vcw
samples/scrollsub/scrollsubCE.vcp
samples/scrollsub/scrollsubCE.vcw
samples/text/text.vcp
samples/text/text.vcw
samples/shaped/shapedCE.vcp
samples/shaped/shapedCE.vcw
samples/thread/thread.vcp
samples/thread/thread.vcw
samples/sockets/clientCE.vcp
samples/sockets/serverCE.vcp
samples/sockets/clientCE.vcw
samples/sockets/serverCE.vcw
samples/toolbar/toolbar.vcp
samples/toolbar/toolbar.vcw
samples/splitter/splitterCE.vcp
samples/splitter/splitterCE.vcw
samples/treectrl/treetest.vcp
samples/treectrl/treetest.vcw
samples/statbar/statbarCE.vcp
samples/statbar/statbarCE.vcw
samples/typetest/typetest.vcp
samples/typetest/typetest.vcw
samples/taskbar/taskbarCE.vcp
samples/taskbar/taskbarCE.vcw
samples/validate/validate.vcp
samples/validate/validate.vcw
samples/text/textCE.vcp
samples/text/textCE.vcw
samples/vscroll/vscroll.vcp
samples/vscroll/vscroll.vcw
samples/thread/threadCE.vcp
samples/thread/threadCE.vcw
samples/wizard/wizard.vcp
samples/wizard/wizard.vcw
samples/toolbar/toolbarCE.vcp
samples/toolbar/toolbarCE.vcw
samples/wxtest/wxtest.vcp
samples/wxtest/wxtest.vcw
samples/treectrl/treetestCE.vcp
samples/treectrl/treetestCE.vcw
samples/widgets/widgets.vcp
samples/widgets/widgets.vcw
samples/typetest/typetestCE.vcp
samples/typetest/typetestCE.vcw
samples/opengl/cube/cube.vcp
samples/opengl/cube/cube.vcw
samples/opengl/isosurf/isosurf.vcp
samples/opengl/isosurf/isosurf.vcw
samples/opengl/penguin/penguin.vcp
samples/opengl/penguin/penguin.vcw
samples/validate/validateCE.vcp
samples/validate/validateCE.vcw
demos/bombs/bombs.vcp
demos/bombs/bombs.vcw
samples/vscroll/vscrollCE.vcp
samples/vscroll/vscrollCE.vcw
demos/dbbrowse/dbbrowse.vcp
demos/dbbrowse/dbbrowse.vcw
samples/wizard/wizardCE.vcp
samples/wizard/wizardCE.vcw
demos/forty/forty.vcp
demos/forty/forty.vcw
samples/wxtest/wxtestCE.vcp
samples/wxtest/wxtestCE.vcw
demos/fractal/fractal.vcp
demos/fractal/fractal.vcw
samples/widgets/widgetsCE.vcp
samples/widgets/widgetsCE.vcw
demos/life/life.vcp
demos/life/life.vcw
samples/opengl/cube/cubeCE.vcp
samples/opengl/cube/cubeCE.vcw
samples/opengl/isosurf/isosurfCE.vcp
samples/opengl/isosurf/isosurfCE.vcw
samples/opengl/penguin/penguinCE.vcp
samples/opengl/penguin/penguinCE.vcw
demos/poem/poem.vcp
demos/poem/poem.vcw
demos/bombs/bombsCE.vcp
demos/bombs/bombsCE.vcw
utils/tex2rtf/src/Tex2RTF.vcp
utils/tex2rtf/src/Tex2RTF.vcw
demos/dbbrowse/dbbrowseCE.vcp
demos/dbbrowse/dbbrowseCE.vcw
utils/hhp2cached/hhp2cached.vcp
utils/hhp2cached/hhp2cached.vcw
demos/forty/fortyCE.vcp
demos/forty/fortyCE.vcw
utils/helpgen/src/HelpGen.vcp
utils/helpgen/src/HelpGen.vcw
demos/fractal/fractalCE.vcp
demos/fractal/fractalCE.vcw
utils/helpview/src/helpview.vcp
utils/helpview/src/helpview.vcw
utils/helpview/src/client.vcp
utils/helpview/src/client.vcw
demos/life/lifeCE.vcp
demos/life/lifeCE.vcw
contrib/src/ogl/Ogl.vcp
contrib/src/ogl/Ogl.vcw
demos/poem/poemCE.vcp
demos/poem/poemCE.vcw
contrib/samples/ogl/ogledit/Ogledit.vcp
contrib/samples/ogl/ogledit/Ogledit.vcw
contrib/samples/ogl/studio/Studio.vcp
contrib/samples/ogl/studio/Studio.vcw
utils/tex2rtf/src/Tex2RTFCE.vcp
utils/tex2rtf/src/Tex2RTFCE.vcw
contrib/src/xrc/Xrc.vcp
contrib/src/xrc/Xrc.vcw
utils/hhp2cached/hhp2cachedCE.vcp
utils/hhp2cached/hhp2cachedCE.vcw
contrib/samples/xrc/XrcDemo.vcp
contrib/samples/xrc/XrcDemo.vcw
utils/helpgen/src/HelpGenCE.vcp
utils/helpgen/src/HelpGenCE.vcw
contrib/src/mmedia/Mmedia.vcp
contrib/src/mmedia/MMedia.vcw
utils/helpview/src/helpviewCE.vcp
utils/helpview/src/helpviewCE.vcw
utils/helpview/src/clientCE.vcp
utils/helpview/src/clientCE.vcw
contrib/samples/mmedia/Mmboard.vcp
contrib/samples/mmedia/Mmboard.vcw
contrib/src/ogl/OglCE.vcp
contrib/src/ogl/OglCE.vcw
contrib/src/stc/Stc.vcp
contrib/src/stc/Stc.vcw
contrib/samples/ogl/ogledit/OgleditCE.vcp
contrib/samples/ogl/ogledit/OgleditCE.vcw
contrib/samples/ogl/studio/StudioCE.vcp
contrib/samples/ogl/studio/StudioCE.vcw
contrib/samples/stc/StcTest.vcp
contrib/samples/stc/StcTest.vcw
contrib/src/xrc/XrcCE.vcp
contrib/src/xrc/XrcCE.vcw
contrib/utils/wxrc/wxrc.vcp
contrib/utils/wxrc/wxrc.vcw
contrib/samples/xrc/XrcDemoCE.vcp
contrib/samples/xrc/XrcDemoCE.vcw
contrib/utils/convertrc/Convert.vcp
contrib/utils/convertrc/Convert.vcw
contrib/src/mmedia/MmediaCE.vcp
contrib/src/mmedia/MMediaCE.vcw
contrib/utils/wxrcedit/wxRcEdit.vcp
contrib/utils/wxrcedit/wxRcEdit.vcw
contrib/samples/mmedia/MmboardCE.vcp
contrib/samples/mmedia/MmboardCE.vcw
contrib/src/canvas/Canvas.vcp
contrib/src/canvas/Canvas.vcw
contrib/samples/canvas/simple/Simple.vcp
contrib/samples/canvas/simple/Simple.vcw
contrib/samples/canvas/test/Test.vcp
contrib/samples/canvas/test/Test.vcw
contrib/src/stc/StcCE.vcp
contrib/src/stc/StcCE.vcw
contrib/src/plot/Plot.vcp
contrib/src/plot/Plot.vcw
contrib/samples/plot/Plot.vcp
contrib/samples/plot/Plot.vcw
contrib/samples/stc/StcTestCE.vcp
contrib/samples/stc/StcTestCE.vcw
contrib/src/gizmos/Gizmos.vcp
contrib/src/gizmos/Gizmos.vcw
contrib/samples/gizmos/dynsash/dynsash.vcp
contrib/samples/gizmos/dynsash/dynsash.vcw
contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcp
contrib/samples/gizmos/dynsash_switch/dynsash_switch.vcw
contrib/samples/gizmos/editlbox/editlbox.vcp
contrib/samples/gizmos/editlbox/editlbox.vcw
contrib/samples/gizmos/multicell/multicell.vcp
contrib/samples/gizmos/multicell/multicell.vcw
contrib/samples/gizmos/splittree/Tree.vcp
contrib/samples/gizmos/splittree/Tree.vcw
contrib/src/animate/Animate.vcp
contrib/src/animate/Animate.vcw
contrib/samples/animate/AniTest.vcp
contrib/samples/animate/AniTest.vcw
contrib/utils/wxrc/wxrcCE.vcp
contrib/utils/wxrc/wxrcCE.vcw
contrib/utils/convertrc/ConvertCE.vcp
contrib/utils/convertrc/ConvertCE.vcw
contrib/utils/wxrcedit/wxRcEditCE.vcp
contrib/utils/wxrcedit/wxRcEditCE.vcw
contrib/src/canvas/CanvasCE.vcp
contrib/src/canvas/CanvasCE.vcw
contrib/samples/canvas/simple/SimpleCE.vcp
contrib/samples/canvas/simple/SimpleCE.vcw
contrib/samples/canvas/test/TestCE.vcp
contrib/samples/canvas/test/TestCE.vcw
contrib/src/plot/PlotCE.vcp
contrib/src/plot/PlotCE.vcw
contrib/samples/plot/PlotCE.vcp
contrib/samples/plot/PlotCE.vcw
contrib/src/gizmos/GizmosCE.vcp
contrib/src/gizmos/GizmosCE.vcw
contrib/samples/gizmos/dynsash/dynsashCE.vcp
contrib/samples/gizmos/dynsash/dynsashCE.vcw
contrib/samples/gizmos/dynsash_switch/dynsash_switchCE.vcp
contrib/samples/gizmos/dynsash_switch/dynsash_switchCE.vcw
contrib/samples/gizmos/editlbox/editlboxCE.vcp
contrib/samples/gizmos/editlbox/editlboxCE.vcw
contrib/samples/gizmos/multicell/multicellCE.vcp
contrib/samples/gizmos/multicell/multicellCE.vcw
contrib/samples/gizmos/splittree/TreeCE.vcp
contrib/samples/gizmos/splittree/TreeCE.vcw
contrib/src/animate/AnimateCE.vcp
contrib/src/animate/AnimateCE.vcw
contrib/samples/animate/AniTestCE.vcp
contrib/samples/animate/AniTestCE.vcw
contrib/src/fl/flCE.vcp
contrib/src/fl/flCE.vcw
contrib/samples/fl/fl_demo1/fl_demoCE.vcp
contrib/samples/fl/fl_demo1/fl_demoCE.vcw
contrib/samples/fl/fl_demo2/fl_demoCE.vcp
contrib/samples/fl/fl_demo2/fl_demoCE.vcw
contrib/samples/fl/fl_sample1/fl_demoCE.vcp
contrib/samples/fl/fl_sample1/fl_demoCE.vcw
contrib/samples/fl/fl_sample2/fl_demoCE.vcp
contrib/samples/fl/fl_sample2/fl_demoCE.vcw
contrib/samples/fl/fl_sample3/fl_demoCE.vcp
contrib/samples/fl/fl_sample3/fl_demoCE.vcw
contrib/src/net/NetCE.vcp
contrib/src/net/NetCE.vcw
contrib/src/deprecated/deprecatedCE.vcp
contrib/samples/deprecated/proplist/proplistCE.vcp
contrib/samples/deprecated/proplist/proplistCE.vcw
contrib/samples/deprecated/resource/resourceCE.vcp
contrib/samples/deprecated/resource/resourceCE.vcw
contrib/samples/deprecated/treelay/treelayCE.vcp
contrib/samples/deprecated/treelay/treelayCE.vcw
contrib/src/fl/fl.vcp
contrib/src/fl/fl.vcw
contrib/samples/fl/fl_demo1/fl_demo.vcp
contrib/samples/fl/fl_demo1/fl_demo.vcw
contrib/samples/fl/fl_demo2/fl_demo.vcp
contrib/samples/fl/fl_demo2/fl_demo.vcw
contrib/samples/fl/fl_sample1/fl_demo.vcp
contrib/samples/fl/fl_sample1/fl_demo.vcw
contrib/samples/fl/fl_sample2/fl_demo.vcp
contrib/samples/fl/fl_sample2/fl_demo.vcw
contrib/samples/fl/fl_sample3/fl_demo.vcp
contrib/samples/fl/fl_sample3/fl_demo.vcw
contrib/src/net/Net.vcp
contrib/src/net/Net.vcw
contrib/src/deprecated/deprecated.vcp
contrib/samples/deprecated/proplist/proplist.vcp
contrib/samples/deprecated/proplist/proplist.vcw
contrib/samples/deprecated/resource/resource.vcp
contrib/samples/deprecated/resource/resource.vcw
contrib/samples/deprecated/treelay/treelay.vcp
contrib/samples/deprecated/treelay/treelay.vcw

60
distrib/msw/zipdist.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Zip up an external, generic + Windows distribution of wxWindows 2
# Zip up an external, generic + Windows distribution of wxWidgets 2
SRC=`cygpath -u $WXWIN`
DEST=$SRC/deliver
WISE=0
@ -22,16 +22,16 @@ dowise()
# After this change of directory, we're in the
# temporary 'wx' directory and not acting on
# the source wxWindows directory.
# the source wxWidgets directory.
cd $DEST/wx
unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-msw.zip`
unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-gen.zip`
unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-vc.zip`
unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-bc.zip`
unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-HTMLHelp.zip`
unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-msw.zip`
unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-gen.zip`
unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-vc.zip`
unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-bc.zip`
unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-HTMLHelp.zip`
unzip -o `$CYGPATHPROG -w ../extradoc.zip`
# Need Word file, for Remstar DB classes
unzip -o `$CYGPATHPROG -w ../wxWindows-$VERSION-Word.zip`
unzip -o `$CYGPATHPROG -w ../wxWidgets-$VERSION-Word.zip`
unzip -o `$CYGPATHPROG -w ../ogl3.zip`
unzip -o `$CYGPATHPROG -w ../jpeg.zip`
unzip -o `$CYGPATHPROG -w ../tiff.zip`
@ -75,7 +75,7 @@ dowise()
# Now invoke WISE install on the new wxwin2.wse
echo Invoking WISE...
/c/progra~1/wise/wise32.exe /C $WXWIN\\distrib\\msw\\wxwin2.wse
echo Press return to continue with the wxWindows distribution...
echo Press return to continue with the wxWidgets distribution...
read dummy
cd $DEST
@ -183,58 +183,58 @@ echo Zipping...
# for local use, and for creating wxMSW-xxx.zip.
# We can't use e.g. this:
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWindows-$VERSION-gen.zip
# ls `cat $SRC/distrib/msw/makefile.rsp` zip -@ -u $DEST/wxWidgets-$VERSION-gen.zip
# because there's not enough space on the command line, plus we need to ignore the
# blank lines.
expandlines $SRC/distrib/msw/generic.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gen.zip` < temp.txt
expandlines $SRC/distrib/msw/makefile.rsp temp.txt
zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gen.zip` < temp.txt
zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gen.zip` < temp.txt
expandlines $SRC/distrib/msw/msw.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-msw.zip` < temp.txt
expandlines $SRC/distrib/msw/makefile.rsp temp.txt
zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-msw.zip` < temp.txt
zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-msw.zip` < temp.txt
expandlines $SRC/distrib/msw/gtk.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gtk.zip` < temp.txt
expandlines $SRC/distrib/msw/makefile.rsp temp.txt
zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-gtk.zip` < temp.txt
zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-gtk.zip` < temp.txt
expandlines $SRC/distrib/msw/stubs.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-stubs.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-stubs.zip` < temp.txt
expandlines $SRC/distrib/msw/motif.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-mot.zip` < temp.txt
expandlines $SRC/distrib/msw/makefile.rsp temp.txt
zip -@ -u `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-mot.zip` < temp.txt
zip -@ -u `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-mot.zip` < temp.txt
expandlines $SRC/distrib/msw/docsrc.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-DocSource.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-DocSource.zip` < temp.txt
expandlines $SRC/distrib/msw/wx_hlp.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-WinHelp.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-WinHelp.zip` < temp.txt
expandlines $SRC/distrib/msw/wx_html.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTML.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTML.zip` < temp.txt
expandlines $SRC/distrib/msw/wx_pdf.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-PDF.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-PDF.zip` < temp.txt
expandlines $SRC/distrib/msw/wx_word.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-Word.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-Word.zip` < temp.txt
expandlines $SRC/distrib/msw/wx_htb.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTB.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTB.zip` < temp.txt
expandlines $SRC/distrib/msw/wx_chm.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-HTMLHelp.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-HTMLHelp.zip` < temp.txt
# PDF/HTML docs that should go into the Windows setup because
# there are no WinHelp equivalents
@ -243,15 +243,15 @@ zip -@ `$CYGPATHPROG -w $DEST/extradoc.zip` < temp.txt
# VC++ project files
expandlines $SRC/distrib/msw/vc.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-vc.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-vc.zip` < temp.txt
# BC++ project files
expandlines $SRC/distrib/msw/bc.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-bc.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-bc.zip` < temp.txt
# CodeWarrior project files
expandlines $SRC/distrib/msw/cw.rsp temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWindows-$VERSION-cw.zip` < temp.txt
zip -@ `$CYGPATHPROG -w $DEST/wxWidgets-$VERSION-cw.zip` < temp.txt
# OGL 3
expandlines $SRC/distrib/msw/ogl.rsp temp.txt
@ -306,5 +306,5 @@ if [ "$WISE" = "1" ]; then
dowise
fi
echo wxWindows archived.
echo wxWidgets archived.

6
distrib/msw/zipmac.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# Zip up an external, generic + Windows distribution of wxWindows 2
# Zip up an external, generic + Windows distribution of wxWidgets 2
# Usage: zipmac.sh dest-dir
# (set the WXWIN variable first so it knows where to take the sources from)
@ -83,9 +83,9 @@ expandlines $SRC/distrib/msw/xml.rsp temp.txt
zip -u -@ `$CYGPATHPROGW $DEST/wxMac-$VERSION.zip` < temp.txt
expandlines $SRC/distrib/msw/wx_html.rsp temp.txt
zip -@ `$CYGPATHPROGW $DEST/wxWindows-$VERSION-HTML.zip` < temp.txt
zip -@ `$CYGPATHPROGW $DEST/wxWidgets-$VERSION-HTML.zip` < temp.txt
rm -f temp.txt
echo wxWindows archived.
echo wxWidgets archived.

10
distrib/msw/zippatch.bat
View File

@ -6,12 +6,12 @@ if "%wxwin%" == "" goto usage
set src=%wxwin%
set dest=%src%\deliver
Rem Set this to the required wxWindows version
Rem Set this to the required wxWidgets version
set wxversion=2.3.3
Rem Set this to the required patch version
set version=01
set patchname=wxWindows-%wxversion%-patch-%version%.zip
set patchname=wxWidgets-%wxversion%-patch-%version%.zip
if "%src" == "" goto usage
if "%dest" == "" goto usage
@ -21,20 +21,20 @@ echo To %dest
echo CTRL-C if this is not correct.
pause
erase /Q /E %dest%\wxWindows-*-patch*.zip
erase /Q /E %dest%\wxWidgets-*-patch*.zip
cd %src%
echo Zipping...
zip32 -@ %dest%\%patchname% < %src%\distrib\msw\patch.rsp
echo wxWindows patch archived.
echo wxWidgets patch archived.
cd %dest
goto end
:usage
echo wxWindows patch distribution.
echo wxWidgets patch distribution.
echo.
echo Usage: zippatch
echo You must set WXWIN appropriately before calling this script.

12
distrib/msw/zipwinminimal.bat
View File

@ -21,7 +21,7 @@ pause
erase %dest\wxMSW-%VERSION%-Minimal*.zip
if not direxist %dest mkdir %dest
if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
if direxist %dest%\wxWidgets-%version% erase /sxyz %dest%\wxWidgets-%version%
echo Zipping wxMSW-Minimal distribution
@ -33,10 +33,10 @@ zip32 -u -@ %dest%\wxMSW-%version%-Minimal.zip < %src%\distrib\msw\png.rsp
zip32 -u -@ %dest%\wxMSW-%version%-Minimal.zip < %src%\distrib\msw\zlib.rsp
zip32 -u -@ %dest%\wxMSW-%version%-Minimal.zip < %src%\distrib\msw\tiff.rsp
if direxist %dest%\wxWindows-%version% erase /sxyz %dest%\wxWindows-%version%
if direxist %dest%\wxWidgets-%version% erase /sxyz %dest%\wxWidgets-%version%
mkdir %dest%\wxWindows-%version%
cd %dest%\wxWindows-%version%
mkdir %dest%\wxWidgets-%version%
cd %dest%\wxWidgets-%version%
unzip32 ..\wxMSW-%version%-Minimal.zip
erase /Y src\gtk\descrip.mms src\motif\descrip.mms docs\pdf\*.pdf
@ -54,7 +54,7 @@ erase /XY include\wx\*cw*.h
cd %dest%
erase wxMSW-%version%-Minimal.zip
zip32 -r wxMSW-%version%-Minimal.zip wxWindows-%version%/*
zip32 -r wxMSW-%version%-Minimal.zip wxWidgets-%version%/*
echo wxMSW-Minimal archived.
@ -63,7 +63,7 @@ cd %src%\distrib\msw
goto end
:usage
echo DOS wxWindows distribution. Zips up wxMSW-Minimal.
echo DOS wxWidgets distribution. Zips up wxMSW-Minimal.
echo.
echo "Usage: zipwinminimal.bat"

2
distrib/msw/zipxml.bat
View File

@ -23,7 +23,7 @@ goto end
:usage
echo DOS wxXML distribution.
echo Usage: zipxml source destination
echo e.g. zipxml d:\wx2\wxWindows d:\wx2\wxWindows\deliver
echo e.g. zipxml d:\wx2\wxWidgets d:\wx2\wxWidgets\deliver
:end

2
docs/mgl/install.txt
View File

@ -11,7 +11,7 @@ IMPORTANT NOTE:
When sending bug reports tell us what version of wxWidgets you are
using (including the beta) and what compiler on what system. One
example: wxMGL 2.5.1, gcc 2.95.3, Redhat 7.0
example: wxMGL 2.5.2, gcc 2.95.3, Redhat 7.0
First steps
-----------

2
docs/motif/install.txt
View File

@ -11,7 +11,7 @@ IMPORTANT NOTE:
When sending bug reports tell us what version of wxWidgets you are
using (including the beta) and what compiler on what system. One
example: wxMotif 2.5.1, gcc 2.95.4, Redhat 6.1
example: wxMotif 2.5.2, gcc 2.95.4, Redhat 6.1
First steps
-----------

4
docs/motif/readme.txt
View File

@ -1,7 +1,7 @@
Welcome to wxWidgets/Motif 2.5.1
Welcome to wxWidgets/Motif 2.5.2
You have downloaded version 2.5.1 of the Motif port of
You have downloaded version 2.5.2 of the Motif port of
the wxWidgets GUI library.
More information about the wxWidgets project as a whole

6
docs/msw/install.txt
View File

@ -1,7 +1,7 @@
Installing wxWidgets 2.5.1
Installing wxWidgets 2.5.2
--------------------------
This is wxWidgets 2.5.1 for Microsoft Windows 9x/ME, Windows NT, Windows 2000
This is wxWidgets 2.5.2 for Microsoft Windows 9x/ME, Windows NT, Windows 2000
and Windows XP. This is an unstable development release. Note that unstable in
this context doesn't mean that it crashes a lot, just that the library API may
change in backwards incompatible way during the 2.5 branch lifetime.
@ -263,7 +263,7 @@ Metrowerks CodeWarrior compilation
----------------------------------
1. CodeWarrior Pro7 project files in XML format are already
included in wxMSW-2.5.1.zip and the setup version.
included in wxMSW-2.5.2.zip and the setup version.
2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if
you are working from the CVS version) to make sure the settings reflect

4
docs/msw/wince/readme.txt
View File

@ -1,9 +1,9 @@
=================================================
Welcome to wxWidgets/CE 2.5.1
Welcome to wxWidgets/CE 2.5.2
=================================================
You have downloaded version 2.5.1 of the Windows CE port of
You have downloaded version 2.5.2 of the Windows CE port of
the wxWidgets GUI library. This runs on PocketPC 2002,
SmartPhone 2002, and Windows CE .NET 4.x.

48
docs/os2/install.txt
View File

@ -1,7 +1,7 @@
Installing wxWidgets 2.5.1
Installing wxWidgets 2.5.2
--------------------------
This is wxWidgets 2.5.1 for IBM OS/2 Warp3 and Warp4. This is an unstable
This is wxWidgets 2.5.2 for IBM OS/2 Warp3 and Warp4. This is an unstable
development release and OS/2 is considered to be in beta.
IMPORTANT NOTE: If you experience problems installing, please
@ -17,7 +17,7 @@ Unarchiving
At this time there is no comprehensive setup.exe type installation program.
wxWidgets for OS/2 requires you download various .zip files and unpack them
to your desired location on your system. Pick a location say,
C:\wx\wxWidgets-2.5.1, copy the .zip files to there and unzip them ensuring you
C:\wx\wxWidgets-2.5.2, copy the .zip files to there and unzip them ensuring you
unzip the subdirectories as well. You will need:
- All common, generic and OS2-specific wxWidgets source;
@ -30,7 +30,7 @@ unzip the subdirectories as well. You will need:
- PNG library source;
- ZLIB library source;
All but the documentation is included in wxOS2-2.5.1.zip, documentation
All but the documentation is included in wxOS2-2.5.2.zip, documentation
must be downloaded separately from the wxWidgets Web site.
Other add-on packages are available from the wxWidgets Web site, such as:
@ -46,27 +46,27 @@ General installation notes
After unzipping everything your directory tree should look something like
this:
x:\wx\wxWidgets-2.5.1\docs (your HTML reference manual)
x:\wx\wxWidgets-2.5.1\include\wx
x:\wx\wxWidgets-2.5.1\include\wx\generic
x:\wx\wxWidgets-2.5.1\include\wx\html
x:\wx\wxWidgets-2.5.1\include\wx\os2
x:\wx\wxWidgets-2.5.1\samples\.... (all the sample directories)
x:\wx\wxWidgets-2.5.1\src
x:\wx\wxWidgets-2.5.1\src\common
x:\wx\wxWidgets-2.5.1\src\generic
x:\wx\wxWidgets-2.5.1\src\html
x:\wx\wxWidgets-2.5.1\src\jpeg
x:\wx\wxWidgets-2.5.1\src\os2
x:\wx\wxWidgets-2.5.1\src\png
x:\wx\wxWidgets-2.5.1\src\tiff
x:\wx\wxWidgets-2.5.1\src\zlib
x:\wx\wxWidgets-2.5.2\docs (your HTML reference manual)
x:\wx\wxWidgets-2.5.2\include\wx
x:\wx\wxWidgets-2.5.2\include\wx\generic
x:\wx\wxWidgets-2.5.2\include\wx\html
x:\wx\wxWidgets-2.5.2\include\wx\os2
x:\wx\wxWidgets-2.5.2\samples\.... (all the sample directories)
x:\wx\wxWidgets-2.5.2\src
x:\wx\wxWidgets-2.5.2\src\common
x:\wx\wxWidgets-2.5.2\src\generic
x:\wx\wxWidgets-2.5.2\src\html
x:\wx\wxWidgets-2.5.2\src\jpeg
x:\wx\wxWidgets-2.5.2\src\os2
x:\wx\wxWidgets-2.5.2\src\png
x:\wx\wxWidgets-2.5.2\src\tiff
x:\wx\wxWidgets-2.5.2\src\zlib
If you are using VisualAge, you will also need to ensure you have a
\lib directory as well, x:\wx\wxWidgets-2.5.1\lib
\lib directory as well, x:\wx\wxWidgets-2.5.2\lib
and you will have to set a WXWIN environment variable in your
config.sys,
SET WXWIN=X:\WX\WXWINDOWS-2.5.1;
SET WXWIN=X:\WX\WXWINDOWS-2.5.2;
Compilation
-----------
@ -176,13 +176,13 @@ developping cross-platform applications you might want to compile (and
update) e.g. wxGTK or wxX11 as well.
In the following, let's assume you decided to build in
\wx\wxWidgets-2.5.1\build\pm. Now we need to set some environment
\wx\wxWidgets-2.5.2\build\pm. Now we need to set some environment
variables, namely MAKESHELL (to a Unix like shell, let's assume ash)
and INSTALL (to point to the install script. If you omit this, configure
might find something like the system's tcpip\pcomos\install.exe which will
not do the thing you want), e.g.
SET MAKESHELL=ash
SET INSTALL=/wx/wxWidgets-2.5.1/install-sh -c
SET INSTALL=/wx/wxWidgets-2.5.2/install-sh -c
Be warned that depending on the precise version of your make, the
variable that needs to be set might be MAKE_SHELL instead of MAKESHELL.
@ -225,7 +225,7 @@ Finally, if you also want to build a different port, e.g. wxGTK, you
essentially have to use the procedure described above, the only difference
being that you have to pass a switch to configure indicating which port
to build. If you do not do this in a separate build directory (e.g.
\wxWidgets-2.5.1\build\gtk), you'll have to do a `make clean' first.
\wxWidgets-2.5.2\build\gtk), you'll have to do a `make clean' first.
The magical switches that have to be passed to configure for the various
ports are --with-gtk (wxGTK), --with-motif (wxMotif), --with-x11 (wxX11),
and --disable-gui (wxBase). Note that contrary to the native, PM based

2
docs/publicity/announce.txt
View File

@ -1,4 +1,4 @@
Announcing wxWidgets 2.5.1: a cross-platform GUI toolkit
Announcing wxWidgets 2.5.2: a cross-platform GUI toolkit
----------------------------------------------------------------
February 24th, 2004 -- the wxWidgets team is pleased to announce

9
docs/readme.txt
View File

@ -1,4 +1,4 @@
wxWidgets 2.5.1
wxWidgets 2.5.2
---------------
*** Please note that this is an UNSTABLE DEVELOPMENT SNAPSHOT.
@ -37,11 +37,12 @@ Platforms supported
wxWidgets currently supports the following platforms:
- Windows 95/98/ME, Windows NT, Windows 2000, Windows XP
- Windows 95/98/ME, Windows NT, Windows 2000, Windows XP, Pocket PC
- Most Unix variants with GTK+
- Most Unix variants with X11
- Most Unix variants with Motif/Lesstif
- MacOS 9.x and 10.x
- MacOS 9.x and 10.x using Carbon (10.4 and above preferred)
- MacOS 10.x using Cocoa
- OS/2 (alpha)
Most popular C++ compilers are supported; see the install.txt
@ -210,5 +211,5 @@ web site.
Have fun!
The wxWidgets Team, February 2004
The wxWidgets Team, May 2004

6
docs/tech/tn0005.txt
View File

@ -3,7 +3,7 @@
Here are some different kinds of contribution:
1. Bug fixes. You can send these to the wx-devel list.
1. Bug fixes. You can send these to the wx-dev list.
2. New classes. New classes normally go in the contrib hierarchy:
please see below for more details. They may be promoted to
the main wxWidgets hierarchy if they are deemed to be 'core'.
@ -14,7 +14,7 @@ Here are some different kinds of contribution:
You may or may not wish to add your code to the main wxWidgets CVS
archive. Whether your code is appropriate for this archive
should first be ascertained by discussing it on wx-devel@wxwindows.org.
should first be ascertained by discussing it on wx-dev@wxwidgets.org.
The contrib hierarchy
---------------------
@ -59,7 +59,7 @@ site in the 'Backroom' section. Include bakefile and generated makefiles
Your archive can be in .tgz or .zip format. For inclusion on
the wxWidgets ftp site and CD-ROM, please send your submission to
Julian Smart <julian@wxwindows.org> as a binary attachment.
Julian Smart <julian@wxwidgets.org> as a binary attachment.
An entry will be added to the Contributions web page.
Author: Julian Smart

2
docs/tech/tn0007.txt
View File

@ -2,7 +2,7 @@ Using and modifying the BC++ IDE files
======================================
Please use wxWidgets 2.4.x - this is not currently supported in wxWidgets 2.5.1
Please use wxWidgets 2.4.x - this is not currently supported in wxWidgets 2.5.2

6
docs/tech/tn0008.htm
View File

@ -27,12 +27,12 @@ The following is a response by Edward Ream to a common question,
Date: Sun, 04 Jun 2000 14:37:06 -0500<BR>
From: "Edward K. Ream" <edream@tds.net> <BR>
To: wx-users@wxwindows.org<BR>
To: wx-users@wxwidgets.org<BR>
Subject: Re: [wx-users] How to learn using wx-windows <BR>
Reply-To: wx-users@wxwindows.org<P>
Reply-To: wx-users@wxwidgets.org<P>
&gt; Reading the Linux Journal article on wxpython, and having used wxclips<BR>
&gt; I got interested in wxwindows as a development interface. However, the<BR>
&gt; I got interested in wxwidgets as a development interface. However, the<BR>
&gt; programming experience I got is old, and from a former generation (For-<BR>
&gt; tran). I'd like to refresh my experience and start in C++. Will<BR>
&gt; wx-windows be a very high step to take?<P>

6
docs/tech/tn0013.txt
View File

@ -16,7 +16,7 @@ below.
a) Do a fresh checkout using the command
cvs -d :pserver:anoncvs@cvs.wxwindows.org:/packs/cvsroots/wxwindows co wxGTK
cvs -d :pserver:anoncvs@cvs.wxwidgets.org:/packs/cvsroots/wxwidgets co wxGTK
NB: if you realize later that some needed files were not checked out
by this command, please modify CVSROOT/modules to include the missing
@ -129,12 +129,12 @@ b) ftp://biolpc22.york.ac.uk/pub (Julian has the password)
-------------------------
a) FreshMeat:
- http://freshmeat.net/projects/wxwindowsgtk/
- http://freshmeat.net/projects/wxwidgetsgtk/
- username and password are "wxgtk" for logging in
- hit "new release" at the top
- follow the step by step
b) wx-announce mailing list: mailto:wx-announce@lists.wxwindows.org
b) wx-announce mailing list: mailto:wx-announce@lists.wxwidgets.org
[where is the announcement text? TODO]

2
docs/univ/readme.txt
View File

@ -57,7 +57,7 @@ b) Cygwin
Please refer to the Unix section below
** the instructions may be out of date as for wxWidgets 2.5.1+ **
** the instructions may be out of date as for wxWidgets 2.5.2+ **
c) Other compilers
Borland:

2
docs/x11/install.txt
View File

@ -11,7 +11,7 @@ IMPORTANT NOTE:
When sending bug reports tell us what version of wxWidgets you are
using (including the beta) and what compiler on what system. One
example: wxX11 2.5.1, gcc 2.95.4, Redhat 6.2
example: wxX11 2.5.2, gcc 2.95.4, Redhat 6.2
First steps
-----------

4
docs/x11/readme.txt
View File

@ -1,7 +1,7 @@
Welcome to wxWidgets/X11 2.5.1
Welcome to wxWidgets/X11 2.5.2
You have downloaded version 2.5.1 of the X11 port of
You have downloaded version 2.5.2 of the X11 port of
the wxWidgets GUI library. This runs on X11 with no
Motif, Xt, GTK+ or any other standard widget set --
instead it uses the wxUniversal widgets. The intention

4
include/wx/accel.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 31.05.01 (extracted from other files)
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows licence
// Copyright: (c) wxWidgets team
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ACCEL_H_BASE_

2
include/wx/access.h
View File

@ -6,7 +6,7 @@
// Created: 2003-02-12
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ACCESSBASE_H_

2
include/wx/afterstd.h
View File

@ -6,7 +6,7 @@
// Created: 07/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
/**

2
include/wx/app.h
View File

@ -7,7 +7,7 @@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_APP_H_BASE_

4
include/wx/apptrait.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 19.06.2003
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_APPTRAIT_H_

2
include/wx/arrimpl.cpp
View File

@ -6,7 +6,7 @@
// Created: 16.10.97
// RCS-ID: $Id$
// Copyright: (c) 1997 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows license
// Licence: wxWidgets license
///////////////////////////////////////////////////////////////////////////////
/*****************************************************************************

2
include/wx/arrstr.h
View File

@ -6,7 +6,7 @@
// Created: 07/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ARRSTR_H

2
include/wx/artprov.h
View File

@ -6,7 +6,7 @@
// Created: 18/03/2002
// RCS-ID: $Id$
// Copyright: (c) Vaclav Slavik
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_ARTPROV_H_

2
include/wx/beforestd.h
View File

@ -6,7 +6,7 @@
// Created: 07/07/03
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
/**

4
include/wx/bitmap.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 22.04.01
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows licence
// Copyright: (c) wxWidgets team
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BITMAP_H_BASE_

2
include/wx/bmpbuttn.h
View File

@ -6,7 +6,7 @@
// Created: 25.08.00
// RCS-ID: $Id$
// Copyright: (c) 2000 Vadim Zeitlin
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BMPBUTTON_H_BASE_

4
include/wx/bookctrl.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 19.08.03
// RCS-ID: $Id$
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
// Copyright: (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BOOKCTRL_H_

2
include/wx/buffer.h
View File

@ -6,7 +6,7 @@
// Created: 12.04.99
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
// these classes are for private use only for now, they're not documented

4
include/wx/build.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 07.05.02
// RCS-ID: $Id$
// Copyright: (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
// Licence: wxWindows licence
// Copyright: (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BUILD_H_

2
include/wx/busyinfo.h
View File

@ -4,7 +4,7 @@
// Author: Vaclav Slavik
// Copyright: (c) 1999 Vaclav Slavik
// RCS-ID: $Id$
// Licence: wxWindows Licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __INFOWIN_H__

2
include/wx/button.h
View File

@ -6,7 +6,7 @@
// Created: 15.08.00
// RCS-ID: $Id$
// Copyright: (c) Vadim Zetlin
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_BUTTON_H_BASE_

2
include/wx/calctrl.h
View File

@ -6,7 +6,7 @@
// Created: 29.12.99
// RCS-ID: $Id$
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
/*

4
include/wx/caret.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 23.05.99
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows licence
// Copyright: (c) wxWidgets team
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CARET_H_BASE_

4
include/wx/checkbox.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 07.09.00
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows licence
// Copyright: (c) wxWidgets team
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHECKBOX_H_BASE_

2
include/wx/checklst.h
View File

@ -6,7 +6,7 @@
// Created: 12.09.00
// RCS-ID: $Id$
// Copyright: (c) Vadim Zeitlin
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHECKLST_H_BASE_

4
include/wx/chkconf.h
View File

@ -5,8 +5,8 @@
* Modified by:
* Created: 09.08.00
* RCS-ID: $Id$
* Copyright: (c) 2000 Vadim Zeitlin <vadim@wxwindows.org>
* Licence: wxWindows licence
* Copyright: (c) 2000 Vadim Zeitlin <vadim@wxwidgets.org>
* Licence: wxWidgets licence
*/
/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */

4
include/wx/choice.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 26.07.99
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows licence
// Copyright: (c) wxWidgets team
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CHOICE_H_BASE_

4
include/wx/clipbrd.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 19.10.99
// RCS-ID: $Id$
// Copyright: (c) wxWindows Team
// Licence: wxWindows licence
// Copyright: (c) wxWidgets Team
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CLIPBRD_H_BASE_

4
include/wx/clntdata.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 9-Oct-2001
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows licence
// Copyright: (c) wxWidgets team
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CLNTDATAH__

2
include/wx/cmdline.h
View File

@ -7,7 +7,7 @@
// Created: 04.01.00
// RCS-ID: $Id$
// Copyright: (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CMDLINE_H_

4
include/wx/cmdproc.h
View File

@ -5,8 +5,8 @@
// Modified by:
// Created: 05.11.00
// RCS-ID: $Id$
// Copyright: (c) wxWindows team
// Licence: wxWindows licence
// Copyright: (c) wxWidgets team
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CMDPROC_H_

2
include/wx/cmndata.h
View File

@ -6,7 +6,7 @@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c)
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_CMNDATA_H_BASE_

2
include/wx/cocoa/NSApplication.h
View File

@ -6,7 +6,7 @@
// Created: 2004/01/26
// RCS-ID: $Id$
// Copyright: (c) 2003,2004 David Elliott
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_NSAPPLICATION_H__

2
include/wx/cocoa/NSBox.h
View File

@ -6,7 +6,7 @@
// Created: 2003/03/19
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows license
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSBOX_H__

2
include/wx/cocoa/NSButton.h
View File

@ -6,7 +6,7 @@
// Created: 2002/12/09
// RCS-ID: $Id:
// Copyright: (c) 2002 David Elliott
// Licence: wxWindows license
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSBUTTON_H__

2
include/wx/cocoa/NSControl.h
View File

@ -6,7 +6,7 @@
// Created: 2003/02/15
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows license
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSCONTROL_H__

2
include/wx/cocoa/NSMenu.h
View File

@ -6,7 +6,7 @@
// Created: 2002/12/09
// RCS-ID: $Id$
// Copyright: (c) 2002 David Elliott
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSMENU_H__

2
include/wx/cocoa/NSPanel.h
View File

@ -6,7 +6,7 @@
// Created: 2003/03/16
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows license
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSPANEL_H__

2
include/wx/cocoa/NSTabView.h
View File

@ -6,7 +6,7 @@
// Created: 2004/04/08
// RCS-ID: $Id$
// Copyright: (c) 2004 David Elliott
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_NSTABVIEW_H__

2
include/wx/cocoa/NSTableDataSource.h
View File

@ -6,7 +6,7 @@
// Created: 2003/08/05
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSTABLEDATASOURCE_H__

2
include/wx/cocoa/NSTableView.h
View File

@ -6,7 +6,7 @@
// Created: 2003/08/05
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSTABLEVIEW_H__

2
include/wx/cocoa/NSTextField.h
View File

@ -6,7 +6,7 @@
// Created: 2002/12/09
// RCS-ID: $Id:
// Copyright: (c) 2002 David Elliott
// Licence: wxWindows license
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSTEXTFIELD_H__

2
include/wx/cocoa/NSView.h
View File

@ -6,7 +6,7 @@
// Created: 2003/02/15
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows license
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSVIEW_H__

2
include/wx/cocoa/NSWindow.h
View File

@ -6,7 +6,7 @@
// Created: 2003/03/16
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows license
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_NSWINDOW_H__

4
include/wx/cocoa/ObjcAssociate.h
View File

@ -6,7 +6,7 @@
// Created: 2002/12/03
// RCS-ID: $Id:
// Copyright: (c) 2002 David Elliott <dfe@cox.net>
// Licence: wxWindows license
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_OBJC_ASSOCIATE_H__
@ -58,7 +58,7 @@ public: \
WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass)
/*-------------------------------------------------------------------------
Stuff to be used by the wxWindows class (not the Cocoa interface)
Stuff to be used by the wxWidgets class (not the Cocoa interface)
-------------------------------------------------------------------------*/
#define WX_DECLARE_COCOA_OWNER(ObjcClass,ObjcBase,ObjcRoot) \
public: \

2
include/wx/cocoa/ObjcPose.h
View File

@ -6,7 +6,7 @@
// Created: 2002/12/03
// RCS-ID: $Id:
// Copyright: (c) 2002 David Elliott <dfe@cox.net>
// Licence: wxWindows license
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_PRIVATE_POSER_H__

2
include/wx/cocoa/ObjcRef.h
View File

@ -6,7 +6,7 @@
// Created: 2004/03/28
// RCS-ID: $Id$
// Copyright: (c) 2004 David Elliott <dfe@cox.net>
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_OBJCREF_H__

2
include/wx/cocoa/app.h
View File

@ -6,7 +6,7 @@
// Created: 2002/11/27
// RCS-ID: $Id$
// Copyright: (c) 2002 David Elliott
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_COCOA_APP_H_

2
include/wx/cocoa/autorelease.h
View File

@ -6,7 +6,7 @@
// Created: 2003/07/11
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott <dfe@cox.net>
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_AUTORELEASE_H__

2
include/wx/cocoa/bitmap.h
View File

@ -6,7 +6,7 @@
// Created: 2003/07/19
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_BITMAP_H__

2
include/wx/cocoa/bmpbuttn.h
View File

@ -6,7 +6,7 @@
// Created: 2003/03/16
// RCS-ID: $Id:
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows license
// Licence: wxWidgets licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __WX_COCOA_BMPBUTTN_H__

Some files were not shown because too many files have changed in this diff Show More