From d7fd3112271a46978fab5a617e724aa7072449ab Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Mon, 22 Nov 2004 20:19:12 +0000 Subject: [PATCH] Added wxWidgets licence line accidentally omitted git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@30707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/xrc/xh_all.h | 1 + contrib/samples/animate/makefile.va | 1 + contrib/samples/gizmos/dynsash/Makefile.in | 1 + contrib/samples/gizmos/dynsash_switch/Makefile.in | 1 + contrib/samples/gizmos/multicell/mtest.cpp | 4 +++- contrib/samples/gizmos/splittree/makefile.va | 1 + contrib/src/applet/makefile | 3 ++- contrib/src/mmedia/sndaiff.cpp | 1 + contrib/src/mmedia/sndbase.cpp | 1 + contrib/src/mmedia/sndcodec.cpp | 1 + contrib/src/mmedia/sndcpcm.cpp | 1 + contrib/src/mmedia/sndesd.cpp | 1 + contrib/src/mmedia/sndfile.cpp | 1 + contrib/src/mmedia/sndg72x.cpp | 1 + contrib/src/mmedia/sndmsad.cpp | 1 + contrib/src/mmedia/sndoss.cpp | 1 + contrib/src/mmedia/sndpcm.cpp | 1 + contrib/src/mmedia/sndulaw.cpp | 1 + contrib/src/mmedia/sndwav.cpp | 1 + contrib/src/mmedia/sndwin.cpp | 1 + contrib/src/ogl/bmpshape.cpp | 2 +- contrib/src/xrc/Makefile.in | 4 ++-- contrib/src/xrc/XrcVC.dsp | 4 ++++ contrib/src/xrc/makefile.b32 | 2 +- contrib/src/xrc/makefile.g95 | 2 +- contrib/src/xrc/makefile.vc | 2 +- contrib/src/xrc/makefile.wat | 1 + contrib/src/xrc/xmlrsall.cpp | 3 +++ 28 files changed, 37 insertions(+), 8 deletions(-) diff --git a/contrib/include/wx/xrc/xh_all.h b/contrib/include/wx/xrc/xh_all.h index fc1d82c439..b807675abc 100644 --- a/contrib/include/wx/xrc/xh_all.h +++ b/contrib/include/wx/xrc/xh_all.h @@ -19,6 +19,7 @@ #include "wx/xrc/xh_dlg.h" #include "wx/xrc/xh_bttn.h" #include "wx/xrc/xh_chckb.h" +#include "wx/xrc/xh_tglbtn.h" #include "wx/xrc/xh_gauge.h" #include "wx/xrc/xh_html.h" #include "wx/xrc/xh_spin.h" diff --git a/contrib/samples/animate/makefile.va b/contrib/samples/animate/makefile.va index d3b737651f..982e8c8fda 100644 --- a/contrib/samples/animate/makefile.va +++ b/contrib/samples/animate/makefile.va @@ -4,6 +4,7 @@ # Created: 1999 # Updated: # Copyright: (c) David Webster +# Licence: wxWindows license # # Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM) # Use FINAL=1 argument to nmake to build final version with no debug info. diff --git a/contrib/samples/gizmos/dynsash/Makefile.in b/contrib/samples/gizmos/dynsash/Makefile.in index 5ec22a79b8..c094a9fdf3 100644 --- a/contrib/samples/gizmos/dynsash/Makefile.in +++ b/contrib/samples/gizmos/dynsash/Makefile.in @@ -4,6 +4,7 @@ # Created: 2001 # Updated: # Copyright: (c) 2001 Matt Kimball +# License: wxWindows license # # "%W% %G%" # diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in index 1c104bba81..c77940f998 100644 --- a/contrib/samples/gizmos/dynsash_switch/Makefile.in +++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in @@ -4,6 +4,7 @@ # Created: 2001 # Updated: # Copyright: (c) 2001 Matt Kimball +# License: wxWindows license # # "%W% %G%" # diff --git a/contrib/samples/gizmos/multicell/mtest.cpp b/contrib/samples/gizmos/multicell/mtest.cpp index ae8280c814..1fda4fa97f 100644 --- a/contrib/samples/gizmos/multicell/mtest.cpp +++ b/contrib/samples/gizmos/multicell/mtest.cpp @@ -4,7 +4,9 @@ * Author: Alex Andruschak * Created: 2000 * Updated: - * Copyright: + * Copyright: + * Licence: wxWindows license + */ static const char sccsid[] = "%W% %G%"; diff --git a/contrib/samples/gizmos/splittree/makefile.va b/contrib/samples/gizmos/splittree/makefile.va index ba7f61ed13..16a49ca2c4 100644 --- a/contrib/samples/gizmos/splittree/makefile.va +++ b/contrib/samples/gizmos/splittree/makefile.va @@ -4,6 +4,7 @@ # Created: 1999 # Updated: # Copyright: (c) David Webster +# Licence: wxWindows license # # Makefile : Builds sample (VisualAgeC++ V3.0, OS/2 PM) # Use FINAL=1 argument to nmake to build final version with no debug info. diff --git a/contrib/src/applet/makefile b/contrib/src/applet/makefile index 69b6155c5c..504b18418e 100644 --- a/contrib/src/applet/makefile +++ b/contrib/src/applet/makefile @@ -3,7 +3,8 @@ # Copyright (C) 1999 SciTech Software # All rights reserved. # -# Descripton: Generic makefile for the SciTech wxApplet library +# Description: Generic makefile for the SciTech wxApplet library +# Licence: wxWindows license # ############################################################################# diff --git a/contrib/src/mmedia/sndaiff.cpp b/contrib/src/mmedia/sndaiff.cpp index f86a81e346..9474a70aa1 100644 --- a/contrib/src/mmedia/sndaiff.cpp +++ b/contrib/src/mmedia/sndaiff.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndaiff.cpp" diff --git a/contrib/src/mmedia/sndbase.cpp b/contrib/src/mmedia/sndbase.cpp index e331e0edce..933476e5c6 100644 --- a/contrib/src/mmedia/sndbase.cpp +++ b/contrib/src/mmedia/sndbase.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999, 2000 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndbase.cpp" diff --git a/contrib/src/mmedia/sndcodec.cpp b/contrib/src/mmedia/sndcodec.cpp index 4c4ab5bdf0..a736c204d9 100644 --- a/contrib/src/mmedia/sndcodec.cpp +++ b/contrib/src/mmedia/sndcodec.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndcodec.cpp" diff --git a/contrib/src/mmedia/sndcpcm.cpp b/contrib/src/mmedia/sndcpcm.cpp index f242772804..062f0156c2 100644 --- a/contrib/src/mmedia/sndcpcm.cpp +++ b/contrib/src/mmedia/sndcpcm.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999, 2000 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndcpcm.cpp" diff --git a/contrib/src/mmedia/sndesd.cpp b/contrib/src/mmedia/sndesd.cpp index 74a55b63c2..35c1365752 100644 --- a/contrib/src/mmedia/sndesd.cpp +++ b/contrib/src/mmedia/sndesd.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndesd.cpp" diff --git a/contrib/src/mmedia/sndfile.cpp b/contrib/src/mmedia/sndfile.cpp index 54e333b6c8..945c49cecd 100644 --- a/contrib/src/mmedia/sndfile.cpp +++ b/contrib/src/mmedia/sndfile.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999, 2000 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #include "wx/wxprec.h" diff --git a/contrib/src/mmedia/sndg72x.cpp b/contrib/src/mmedia/sndg72x.cpp index f9ce3ca810..3842f071ae 100644 --- a/contrib/src/mmedia/sndg72x.cpp +++ b/contrib/src/mmedia/sndg72x.cpp @@ -4,6 +4,7 @@ // Date: 08/26/1999 // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndg72x.cpp" diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp index dbc6505d5b..6798a31280 100644 --- a/contrib/src/mmedia/sndmsad.cpp +++ b/contrib/src/mmedia/sndmsad.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndmsad.cpp" diff --git a/contrib/src/mmedia/sndoss.cpp b/contrib/src/mmedia/sndoss.cpp index 48b35e8017..5fd6d013ea 100644 --- a/contrib/src/mmedia/sndoss.cpp +++ b/contrib/src/mmedia/sndoss.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999, 2000 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndoss.cpp" diff --git a/contrib/src/mmedia/sndpcm.cpp b/contrib/src/mmedia/sndpcm.cpp index a6a5a70080..d08ad384a0 100644 --- a/contrib/src/mmedia/sndpcm.cpp +++ b/contrib/src/mmedia/sndpcm.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndpcm.cpp" diff --git a/contrib/src/mmedia/sndulaw.cpp b/contrib/src/mmedia/sndulaw.cpp index f0ea5cfc66..0aaaa4f421 100644 --- a/contrib/src/mmedia/sndulaw.cpp +++ b/contrib/src/mmedia/sndulaw.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndulaw.cpp" diff --git a/contrib/src/mmedia/sndwav.cpp b/contrib/src/mmedia/sndwav.cpp index a9712d8189..a275942b31 100644 --- a/contrib/src/mmedia/sndwav.cpp +++ b/contrib/src/mmedia/sndwav.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndwav.cpp" diff --git a/contrib/src/mmedia/sndwin.cpp b/contrib/src/mmedia/sndwin.cpp index 538f7e1813..0d662f5b12 100644 --- a/contrib/src/mmedia/sndwin.cpp +++ b/contrib/src/mmedia/sndwin.cpp @@ -4,6 +4,7 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999, 2000 // CVSID: $Id$ +// Licence: wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndwin.cpp" diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp index 82e5edb9e6..bb57c9fed6 100644 --- a/contrib/src/ogl/bmpshape.cpp +++ b/contrib/src/ogl/bmpshape.cpp @@ -37,7 +37,7 @@ * */ -IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxShape) +IMPLEMENT_DYNAMIC_CLASS(wxBitmapShape, wxRectangleShape) wxBitmapShape::wxBitmapShape():wxRectangleShape(100.0, 50.0) { diff --git a/contrib/src/xrc/Makefile.in b/contrib/src/xrc/Makefile.in index 6c7a2a6e60..3aad23ac60 100644 --- a/contrib/src/xrc/Makefile.in +++ b/contrib/src/xrc/Makefile.in @@ -19,7 +19,7 @@ HEADER_SUBDIR=xrc EXPAT_DEFS=-I$(expat_dir)/xmlparse -I$(expat_dir)/xmltok EXPAT_OBJECTS=xmltok.o xmlrole.o xmlparse.o -HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \ +HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_tglbtn.h xh_chckl.h xh_choic.h xh_combo.h \ xh_dlg.h xh_gauge.h xh_html.h xh_menu.h xh_notbk.h xh_panel.h \ xh_radbt.h xh_radbx.h xh_sizer.h xh_slidr.h xh_spin.h xh_stbmp.h \ xh_sttxt.h xh_text.h xh_listb.h xml.h xmlres.h xh_toolb.h \ @@ -29,7 +29,7 @@ HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \ OBJECTS=$(EXPAT_OBJECTS) \ xml.o xmlres.o xmlrsall.o \ - xh_bttn.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o \ + xh_bttn.o xh_chckb.o xh_tglbtn.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o \ xh_gauge.o xh_html.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ diff --git a/contrib/src/xrc/XrcVC.dsp b/contrib/src/xrc/XrcVC.dsp index f52ecfbb40..db286c0ba4 100644 --- a/contrib/src/xrc/XrcVC.dsp +++ b/contrib/src/xrc/XrcVC.dsp @@ -174,6 +174,10 @@ SOURCE=.\xh_chckb.cpp # End Source File # Begin Source File +SOURCE=.\xh_tglbtn.cpp +# End Source File +# Begin Source File + SOURCE=.\xh_chckl.cpp # End Source File # Begin Source File diff --git a/contrib/src/xrc/makefile.b32 b/contrib/src/xrc/makefile.b32 index 2343ab59fc..8723742ee5 100644 --- a/contrib/src/xrc/makefile.b32 +++ b/contrib/src/xrc/makefile.b32 @@ -22,7 +22,7 @@ LIBTARGET=$(WXDIR)\lib\wxxrc.lib OBJECTS=$(EXPAT_OBJECTS) \ xml.obj xmlres.obj xmlrsall.obj \ - xh_bttn.obj xh_chckb.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj \ + xh_bttn.obj xh_chckb.obj xh_tglbtn.obj xh_chckl.obj xh_choic.obj xh_combo.obj xh_dlg.obj \ xh_gauge.obj xh_html.obj xh_menu.obj xh_notbk.obj xh_panel.obj xh_radbt.obj \ xh_radbx.obj xh_sizer.obj xh_slidr.obj xh_spin.obj xh_stbmp.obj xh_sttxt.obj \ xh_text.obj xh_listb.obj xh_toolb.obj xh_stlin.obj xh_bmp.obj \ diff --git a/contrib/src/xrc/makefile.g95 b/contrib/src/xrc/makefile.g95 index 860f6649cc..37408b8deb 100644 --- a/contrib/src/xrc/makefile.g95 +++ b/contrib/src/xrc/makefile.g95 @@ -23,7 +23,7 @@ LIBTARGET=$(WXDIR)/lib/libwxxrc.a OBJECTS= $(XMLPARSEDIR_OBJECTS) $(XMLTOKDIR_OBJECTS) \ xml.o xmlres.o xmlrsall.o \ - xh_bttn.o xh_chckb.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o \ + xh_bttn.o xh_chckb.o xh_tglbtn.o xh_chckl.o xh_choic.o xh_combo.o xh_dlg.o \ xh_gauge.o xh_html.o xh_menu.o xh_notbk.o xh_panel.o xh_radbt.o \ xh_radbx.o xh_sizer.o xh_slidr.o xh_spin.o xh_stbmp.o xh_sttxt.o \ xh_text.o xh_listb.o xh_toolb.o xh_stlin.o xh_bmp.o xh_unkwn.o \ diff --git a/contrib/src/xrc/makefile.vc b/contrib/src/xrc/makefile.vc index 1fc4068976..c491434403 100644 --- a/contrib/src/xrc/makefile.vc +++ b/contrib/src/xrc/makefile.vc @@ -48,7 +48,7 @@ EXTRATARGETS=$(D) OBJECTS=$(EXPAT_OBJS) \ $(D)\xml.obj $(D)\xmlres.obj \ - $(D)\xmlrsall.obj $(D)\xh_bttn.obj $(D)\xh_chckb.obj $(D)\xh_chckl.obj \ + $(D)\xmlrsall.obj $(D)\xh_bttn.obj $(D)\xh_chckb.obj $(D)\xh_tglbtn.obj $(D)\xh_chckl.obj \ $(D)\xh_choic.obj $(D)\xh_combo.obj $(D)\xh_dlg.obj \ $(D)\xh_frame.obj $(D)\xh_gauge.obj $(D)\xh_html.obj $(D)\xh_menu.obj \ $(D)\xh_notbk.obj $(D)\xh_panel.obj $(D)\xh_radbt.obj \ diff --git a/contrib/src/xrc/makefile.wat b/contrib/src/xrc/makefile.wat index 912412ac7a..88f6a31ed6 100644 --- a/contrib/src/xrc/makefile.wat +++ b/contrib/src/xrc/makefile.wat @@ -36,6 +36,7 @@ OBJECTS=& $(OUTPUTDIR)\xh_text.obj & $(OUTPUTDIR)\xh_listb.obj& $(OUTPUTDIR)\xh_toolb.obj & + $(OUTPUTDIR)\xh_tglbtn.obj & $(OUTPUTDIR)\xh_stlin.obj & $(OUTPUTDIR)\xh_bmp.obj & $(OUTPUTDIR)\xh_bmpbt.obj & diff --git a/contrib/src/xrc/xmlrsall.cpp b/contrib/src/xrc/xmlrsall.cpp index 0b180c5cbf..4075660f26 100644 --- a/contrib/src/xrc/xmlrsall.cpp +++ b/contrib/src/xrc/xmlrsall.cpp @@ -102,4 +102,7 @@ void wxXmlResource::InitAllHandlers() #if wxUSE_STATUSBAR AddHandler(new wxStatusBarXmlHandler); #endif +#if wxUSE_TOGGLEBTN + AddHandler(new wxToggleButtonXmlHandler); +#endif }