From 44cf9b50eef370cc94a6c1f249693dee3776d619 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 8 Jun 2003 17:49:49 +0000 Subject: [PATCH] Added shaped sample copying git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 7 +++++++ distrib/msw/generic.rsp | 9 +++++++++ distrib/msw/makefile.rsp | 1 + docs/latex/wx/timer.tex | 2 +- include/wx/msw/setup0.h | 6 +++--- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index ca89da08c6..498bc446f7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1282,6 +1282,13 @@ SAMPLES_DIST: ALL_GUI_DIST cp $(SAMPDIR)/scrollsub/makefile.unx $(DISTDIR)/samples/scrollsub cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub + mkdir $(DISTDIR)/samples/shaped + cp $(SAMPDIR)/shaped/Makefile.in $(DISTDIR)/samples/shaped + cp $(SAMPDIR)/shaped/makefile.unx $(DISTDIR)/samples/shaped + cp $(SAMPDIR)/shaped/*.cpp $(DISTDIR)/samples/shaped + cp $(SAMPDIR)/shaped/*.h $(DISTDIR)/samples/shaped + cp $(SAMPDIR)/shaped/*.png $(DISTDIR)/samples/shaped + mkdir $(DISTDIR)/samples/sockets cp $(SAMPDIR)/sockets/Makefile.in $(DISTDIR)/samples/sockets cp $(SAMPDIR)/sockets/makefile.unx $(DISTDIR)/samples/sockets diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 4fc4d49ee6..6a8b71e517 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -502,6 +502,15 @@ samples/help/doc/*.tex samples/help/doc/*.gif samples/help/doc/*.map +samples/htlbox/*.cpp +samples/htlbox/*.h +samples/htlbox/*.def +samples/htlbox/makefile* +samples/htlbox/*.xpm +samples/htlbox/*.ico +samples/htlbox/*.bmp +samples/htlbox/*.rc + samples/html/makefile* samples/html/*.txt diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index 7c3945fbbe..0113038e6c 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -24,6 +24,7 @@ samples/event/Makefile.in samples/grid/Makefile.in samples/keyboard/Makefile.in samples/help/Makefile.in +samples/htlbox/Makefile.in samples/internat/Makefile.in samples/ipc/Makefile.in samples/png/Makefile.in diff --git a/docs/latex/wx/timer.tex b/docs/latex/wx/timer.tex index 98c0f22c4a..1648196884 100644 --- a/docs/latex/wx/timer.tex +++ b/docs/latex/wx/timer.tex @@ -55,7 +55,7 @@ Creates a timer and associates it with {\it owner}. Please see Destructor. Stops the timer if it is running. -\membersection{wxTimer::GetInterval}{wxtimergetinterval} +\membersection{wxTimer::GetInterval}\label{wxtimergetinterval} \constfunc{int}{GetInterval}{\void} diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index ab50ac6dc6..761624b7d1 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -45,14 +45,14 @@ #define WXWIN_COMPATIBILITY_2 0 // This setting determines the compatibility with 2.2 API: set it to 1 to -// enable it but please consider to update your code instead of doing it. +// enable it but please consider updating your code instead. // // Default is 0 // // Recommended setting: 0 (please update your code) #define WXWIN_COMPATIBILITY_2_2 1 -// This setting determines the compatibility with 2.2 API: set it to 0 to +// This setting determines the compatibility with 2.4 API: set it to 0 to // flag all cases of using deprecated functions. // // Default is 1 but please try building your code with 0 as the default will @@ -160,7 +160,7 @@ // // Unicode is currently only fully supported under Windows NT/2000/XP // (Windows 9x doesn't support it and the programs compiled in Unicode mode -// will not run under 9x -- but see wxUSE_UNICODE_MSLU bellow). +// will not run under 9x -- but see wxUSE_UNICODE_MSLU below). // // Default is 0 //