Makefiles and .rsp file edited for demos/samples

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

demos/makefile.vc

@@ -0,0 +1,59 @@
+#
+# File:		makefile.vc
+# Author:	Julian Smart
+# Created:	1993
+# Updated:	
+# Copyright:	(c) 1993, AIAI, University of Edinburgh
+#
+# "%W% %G%"
+#
+# Makefile : Builds demos for Win95, MSVC++ 16-bit
+# Use FINAL=1 argument to nmake to build final version with no debugging
+# info
+
+# Set WXDIR for your system
+WXDIR = $(WXWIN)
+
+THISDIR=$(WXDIR)\demos
+
+#
+# Indicates kind of pb with demos
+#
+# No makefile.vc file
+NOMAKE=1
+# No 16 bit version
+#ONLY32=1
+# Misc. compilation errors
+COMPIL=1
+# Need PNG
+PNGSETUP=
+
+!include $(WXDIR)\src\makemsc.env
+
+#
+# Please keep demos list up-to-date, in alphabetical order
+#
+all:
+        cd $(WXDIR)\demos\bombs
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\demos\forty
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\demos\fractal
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\demos\life
+        nmake -f makefile.vc FINAL=$(FINAL)
+        cd $(WXDIR)\demos\poem
+        nmake -f makefile.vc FINAL=$(FINAL)
+
+clean:
+        cd $(WXDIR)\demos\bombs
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\demos\forty
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\demos\fractal
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\demos\life
+        nmake -f makefile.vc clean
+        cd $(WXDIR)\demos\poem
+        nmake -f makefile.vc clean
+

distrib/msw/generic.rsp

@@ -290,24 +290,24 @@ samples/dynamic/*.bmp
 samples/dynamic/*.rc
 samples/dynamic/*.wav
 
-samples/wxsocket/*.cpp
+samples/sockets/*.cpp
-samples/wxsocket/*.h
+samples/sockets/*.h
-samples/wxsocket/*.def
+samples/sockets/*.def
-samples/wxsocket/makefile*
+samples/sockets/makefile*
-samples/wxsocket/client.wat
+samples/sockets/client.wat
-samples/wxsocket/server.wat
+samples/sockets/server.wat
-samples/wxsocket/client.vc
+samples/sockets/client.vc
-samples/wxsocket/server.vc
+samples/sockets/server.vc
-samples/wxsocket/client.dos
+samples/sockets/client.dos
-samples/wxsocket/server.dos
+samples/sockets/server.dos
-samples/wxsocket/client.b32
+samples/sockets/client.b32
-samples/wxsocket/server.b32
+samples/sockets/server.b32
-samples/wxsocket/client.bcc
+samples/sockets/client.bcc
-samples/wxsocket/server.bcc
+samples/sockets/server.bcc
-samples/wxsocket/*.xbm
+samples/sockets/*.xbm
-samples/wxsocket/*.xpm
+samples/sockets/*.xpm
-samples/wxsocket/*.ico
+samples/sockets/*.ico
-samples/wxsocket/*.rc
+samples/sockets/*.rc
 
 samples/help/*.cpp
 samples/help/*.h
@@ -325,17 +325,6 @@ samples/help/doc/*.tex
 samples/help/doc/*.gif
 samples/help/doc/*.map
 
-samples/bombs/*.cpp
-samples/bombs/*.h
-samples/bombs/*.def
-samples/bombs/makefile*
-samples/bombs/*.xbm
-samples/bombs/*.xpm
-samples/bombs/*.txt
-samples/bombs/*.ico
-samples/bombs/*.bmp
-samples/bombs/*.rc
-
 samples/ipc/*.cpp
 samples/ipc/*.h
 samples/ipc/*.def
@@ -420,15 +409,6 @@ samples/controls/icons/*.bmp
 samples/controls/icons/*.ico
 samples/controls/icons/*.xpm
 
-samples/fractal/*.cpp
-samples/fractal/*.h
-samples/fractal/*.def
-samples/fractal/makefile*
-samples/fractal/*.xbm
-samples/fractal/*.xpm
-samples/fractal/*.ico
-samples/fractal/*.rc
-
 samples/proplist/*.cpp
 samples/proplist/*.h
 samples/proplist/*.def
@@ -545,32 +525,6 @@ samples/dialogs/*.txt
 samples/dialogs/*.bmp
 samples/dialogs/*.ico
 
-samples/wxpoem/*.cpp
-samples/wxpoem/*.h
-samples/wxpoem/*.def
-samples/wxpoem/*.rc
-samples/wxpoem/*.inf
-samples/wxpoem/*.txt
-samples/wxpoem/makefile*
-samples/wxpoem/*.xbm
-samples/wxpoem/*.xpm
-samples/wxpoem/*.ico
-samples/wxpoem/*.bmp
-samples/wxpoem/*.dat
-
-samples/pressup/*.cpp
-samples/pressup/*.c
-samples/pressup/*.h
-samples/pressup/*.def
-samples/pressup/*.rc
-samples/pressup/*.inf
-samples/pressup/*.txt
-samples/pressup/makefile*
-samples/pressup/*.xbm
-samples/pressup/*.xpm
-samples/pressup/*.ico
-samples/pressup/*.bmp
-
 samples/validate/*.cpp
 samples/validate/*.h
 samples/validate/*.def
@@ -760,39 +714,27 @@ samples/thread/*.png
 samples/thread/*.ico
 samples/thread/*.txt
 
-samples/forty/*.cpp
+samples/ipc/*.cpp
-samples/forty/*.h
+samples/ipc/*.h
-samples/forty/makefile*
+samples/ipc/makefile*
-samples/forty/*.rc
+samples/ipc/client.vc
-samples/forty/*.def
+samples/ipc/server.vc
-samples/forty/*.bmp
+samples/ipc/client.wat
-samples/forty/*.xpm
+samples/ipc/server.wat
-samples/forty/*.xbm
+samples/ipc/client.b32
-samples/forty/*.png
+samples/ipc/server.b32
-samples/forty/*.ico
+samples/ipc/client.bcc
-samples/forty/*.txt
+samples/ipc/server.bcc
-
+samples/ipc/client.dos
-samples/dde/*.cpp
+samples/ipc/server.dos
-samples/dde/*.h
+samples/ipc/*.rc
-samples/dde/makefile*
+samples/ipc/*.def
-samples/dde/client.vc
+samples/ipc/*.bmp
-samples/dde/server.vc
+samples/ipc/*.xpm
-samples/dde/client.wat
+samples/ipc/*.xbm
-samples/dde/server.wat
+samples/ipc/*.png
-samples/dde/client.b32
+samples/ipc/*.ico
-samples/dde/server.b32
+samples/ipc/*.txt
-samples/dde/client.bcc
-samples/dde/server.bcc
-samples/dde/client.dos
-samples/dde/server.dos
-samples/dde/*.rc
-samples/dde/*.def
-samples/dde/*.bmp
-samples/dde/*.xpm
-samples/dde/*.xbm
-samples/dde/*.png
-samples/dde/*.ico
-samples/dde/*.txt
 
 samples/scroll/*.cpp
 samples/scroll/*.h
@@ -1004,17 +946,17 @@ samples/font/*.png
 samples/font/*.ico
 samples/font/*.txt
 
-samples/nettest/*.cpp
+samples/dialup/*.cpp
-samples/nettest/*.h
+samples/dialup/*.h
-samples/nettest/makefile*
+samples/dialup/makefile*
-samples/nettest/*.rc
+samples/dialup/*.rc
-samples/nettest/*.def
+samples/dialup/*.def
-samples/nettest/*.bmp
+samples/dialup/*.bmp
-samples/nettest/*.xpm
+samples/dialup/*.xpm
-samples/nettest/*.xbm
+samples/dialup/*.xbm
-samples/nettest/*.png
+samples/dialup/*.png
-samples/nettest/*.ico
+samples/dialup/*.ico
-samples/nettest/*.txt
+samples/dialup/*.txt
 
 samples/scrollsub/*.cpp
 samples/scrollsub/*.h
@@ -1040,17 +982,6 @@ samples/menu/*.png
 samples/menu/*.ico
 samples/menu/*.txt
 
-samples/life/*.cpp
-samples/life/*.h
-samples/life/makefile*
-samples/life/*.rc
-samples/life/*.def
-samples/life/*.ico
-samples/life/*.xpm
-samples/life/*.txt
-samples/life/bitmaps/*.xpm
-samples/life/bitmaps/*.bmp
-
 samples/calendar/*.cpp
 samples/calendar/*.h
 samples/calendar/makefile*
@@ -1060,3 +991,59 @@ samples/calendar/*.ico
 samples/calendar/*.xpm
 samples/calendar/*.txt
 
+demos/bombs/*.cpp
+demos/bombs/*.h
+demos/bombs/*.def
+demos/bombs/makefile*
+demos/bombs/*.xbm
+demos/bombs/*.xpm
+demos/bombs/*.txt
+demos/bombs/*.ico
+demos/bombs/*.bmp
+demos/bombs/*.rc
+
+demos/forty/*.cpp
+demos/forty/*.h
+demos/forty/makefile*
+demos/forty/*.rc
+demos/forty/*.def
+demos/forty/*.bmp
+demos/forty/*.xpm
+demos/forty/*.xbm
+demos/forty/*.png
+demos/forty/*.ico
+demos/forty/*.txt
+
+demos/fractal/*.cpp
+demos/fractal/*.h
+demos/fractal/*.def
+demos/fractal/makefile*
+demos/fractal/*.xbm
+demos/fractal/*.xpm
+demos/fractal/*.ico
+demos/fractal/*.rc
+
+demos/life/*.cpp
+demos/life/*.h
+demos/life/makefile*
+demos/life/*.rc
+demos/life/*.def
+demos/life/*.ico
+demos/life/*.xpm
+demos/life/*.txt
+demos/life/bitmaps/*.xpm
+demos/life/bitmaps/*.bmp
+
+demos/poem/*.cpp
+demos/poem/*.h
+demos/poem/*.def
+demos/poem/*.rc
+demos/poem/*.inf
+demos/poem/*.txt
+demos/poem/makefile*
+demos/poem/*.xbm
+demos/poem/*.xpm
+demos/poem/*.ico
+demos/poem/*.bmp
+demos/poem/*.dat
+

docs/html/index.htm

@@ -35,6 +35,7 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 [<a href="#manuals">Manuals</a>]
 [<a href="#thirdparty">3rd party tools</a>] 
 [<a href="#samples">Samples</a>]
+[<a href="#demos">Demos</a>]
 </FONT>
 </CENTER>
 
@@ -101,20 +102,6 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 </td>
 </tr>
 
-<tr>
-<td align=center>
-<a href="porting/port.htm">Porting Guide</a>
-</td>
-
-<td align=center>
-<a href="../winhelp/porting.hlp">Porting Guide</a>
-</td>
-
-<td align=center>
-<a href="../pdf/porting.pdf">Porting Guide</a>
-</td>
-</tr>
-
 <tr>
 <td align=center>
 <a href="dialoged/dlged.htm">Dialog Editor Manual</a>
@@ -129,20 +116,6 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 </td>
 </tr>
 
-<tr>
-<td align=center>
-<a href="proplist/prop.htm">Property List Classes</a>
-</td>
-
-<td align=center>
-<a href="../winhelp/proplist.hlp">Property List Classes</a>
-</td>
-
-<td align=center>
-<a href="../pdf/proplist.pdf">Property List Classes</a>
-</td>
-</tr>
-
 <tr>
 <td align=center>
 <a href="wxtree/tree.htm">wxTreeLayout Class</a>
@@ -185,7 +158,7 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
 <h3 align=center><a name="samples"><hr>Samples<hr></a></h3>
 
 <ul>
-<li><a href="../../samples/bombs">bombs</a>: minesweeper-like game.
+<li><a href="../../samples/calendar">calendar</a>: a sample to test the wxCalendarCtrl class.
 <li><a href="../../samples/caret">caret</a>: a sample to test the wxCaret class.
 <li><a href="../../samples/checklst">checklst</a>: demonstrates wxCheckListBox on
 supported platforms (currently Windows and GTK only).
@@ -196,9 +169,9 @@ console-mode (no-GUI) compilation of wxWindows.
 <li><a href="../../samples/controls">controls</a>: sample showing a variety of controls, including
 wxNotebook.
 <li><a href="../../samples/db">db</a>: wxDB ODBC sample.
-<li><a href="../../samples/dde">dde</a>: shows the DDE protocol in action, both using real
+<li><a href="../../samples/ipc">ipc</a>: shows the DDE-like protocol in action, both using real
-DDE on Windows, and TCP/IP on all platforms. Edit <a href="../../samples/dde/ddesetup.h">ddesetup.h</a>
+DDE on Windows, and TCP/IP on all platforms. Edit <a href="../../samples/ipc/ddesetup.h">ddesetup.h</a>
-to switch between compilation modes. Currently the TCP/IP mode needs a bit of work.
+to switch between compilation modes.
 <li><a href="../../samples/dialogs">dialogs</a>: shows some of the common dialogs available -- wxFontDialog,
 wxColourDialog, wxFileDialog, wxDirDialog, wxMessageBox, wxTextEntryDialog, wxSingleChoiceDialog.
 For printing-related dialogs, see the printing sample.
@@ -210,10 +183,7 @@ using wxMDIParentFrame, wxMDIChildFrame.
 <li><a href="../../samples/drawing">drawing</a>: tests device context drawing.
 <li><a href="../../samples/dynamic">dynamic</a>: shows how to connect events to member functions
 dynamically.
-<li><a href="../../samples/forty">forty</a>: a great little card game by Chris Breeze. A
-fully-fledged application!
 <li><a href="../../samples/font">font</a>: tests fonts, font enumerator, font encodings.
-<li><a href="../../samples/fractal">fractal</a>: fractal mountains by Andrew Davison.
 <li><a href="../../samples/grid">grid</a>: demonstrates the wxGrid class.
 <li><a href="../../samples/help">help</a>: shows how to use wxHelpController.
 <li><a href="../../samples/html">html</a>: a number of demos for the wxHTML class library, used inside
@@ -247,7 +217,7 @@ platforms that don't support it, a normal-sized title bar is displayed.
 small a wxWindows application as you can get.
 <li><a href="../../samples/nativdlg">nativdlg</a>: shows how wxWindows can load a standard Windows
 dialog resource, translating the controls into wxWindows controls (Windows only).
-<li><a href="../../samples/nettest">nettest</a>: wxDialUpManager demo.
+<li><a href="../../samples/dialup">dialup</a>: wxDialUpManager demo.
 <li><a href="../../samples/newgrid">newgrid</a>: demonstrates the new wxGrid implementation, by Michael Bedward.
 <li><a href="../../samples/notebook">notebook</a>: shows the wxNotebook (tabbed window) control.
 <li><a href="../../samples/oleauto">oleauto</a>: a little OLE automation controller (Windows only; requires
@@ -265,6 +235,7 @@ the user to resize subwindows.
 <li><a href="../../samples/scroll">scroll</a>: demonstrates wxScrolledWindow.
 <li><a href="../../samples/scrollsub">scrollsub</a>: demonstrates the use of wxScrolledWindow to scroll
 an embedded window.
+<li><a href="../../samples/sockets">sockets</a>: demonstrates the TCP/IP family of classes.
 <li><a href="../../samples/splitter">splitter</a>: demonstrates the wxSplitterWindow class.
 <li><a href="../../samples/tab">tab</a>: demonstrates the generic tab window class. You should
 normally use wxNotebook instead, but the generic code is sometimes useful, for example for
@@ -282,8 +253,17 @@ programming.
 wxTime, wxDate and wxVariant.
 <li><a href="../../samples/validate">validate</a>: shows simple use of validation.
 <li><a href="../../samples/wizard">wizard</a>: demonstrates the wxWizard class.
-<li><a href="../../samples/wxpoem">wxpoem</a>: a little poetry display program.
+</ul>
-<li><a href="../../samples/wxsocket">wxsocket</a>: demonstrates the TCP/IP family of classes.
+
+<h3 align=center><a name="demos"><hr>Demos<hr></a></h3>
+
+<ul>
+<li><a href="../../demos/bombs">bombs</a>: minesweeper-like game.
+<li><a href="../../demos/forty">forty</a>: a great little card game by Chris Breeze. A
+fully-fledged application!
+<li><a href="../../demos/fractal">fractal</a>: fractal mountains by Andrew Davison.
+<li><a href="../../demos/life">life</a>: the game of Life by J. H. Conway, implemented in wxWindows by Guillermo Rodriguez Garcia.
+<li><a href="../../demos/poem">poem</a>: a little poetry display program.
 </ul>
 
 <hr>

docs/latex/wx/fildrptg.tex

@@ -23,20 +23,6 @@
 
 Constructor.
 
-\membersection{wxFileDropTarget::GetFormatCount}\label{wxfiledroptargetgetformatcount}
-
-\func{virtual size\_t}{GetFormatCount}{\void}
-
-See \helpref{wxDropTarget::GetFormatCount}{wxdroptargetgetformatcount}. This function is implemented
-appropriately for files.
-
-\membersection{wxFileDropTarget::GetFormat}\label{wxfiledroptargetgetformat}
-
-\constfunc{virtual wxDataFormat}{GetFormat}{\param{size\_t }{n}}
-
-See \helpref{wxDropTarget::GetFormat}{wxdroptargetgetformat}. This function is implemented
-appropriately for files.
-
 \membersection{wxFileDropTarget::OnDrop}\label{wxfiledroptargetondrop}
 
 \func{virtual bool}{OnDrop}{\param{long }{x}, \param{long }{y}, \param{const void }{*data}, \param{size\_t }{size}}

docs/latex/wx/txtdrptg.tex

@@ -23,20 +23,6 @@ A predefined drop target for dealing with text data.
 
 Constructor.
 
-\membersection{wxTextDropTarget::GetFormatCount}\label{wxtextdroptargetgetformatcount}
-
-\constfunc{virtual size\_t}{GetFormatCount}{\void}
-
-See \helpref{wxDropTarget::GetFormatCount}{wxdroptargetgetformatcount}. This function is implemented
-appropriately for text.
-
-\membersection{wxTextDropTarget::GetFormat}\label{wxtextdroptargetgetformat}
-
-\constfunc{virtual wxDataFormat}{GetFormat}{\param{size\_t }{n}}
-
-See \helpref{wxDropTarget::GetFormat}{wxdroptargetgetformat}. This function is implemented
-appropriately for text.
-
 \membersection{wxTextDropTarget::OnDrop}\label{wxtextdroptargetondrop}
 
 \func{virtual bool}{OnDrop}{\param{long }{x}, \param{long }{y}, \param{const void }{*data}, \param{size\_t }{size}}

samples/makefile.vc

@@ -34,7 +34,7 @@ PNGSETUP=
 # Please keep samples list up-to-date, in alphabetical order
 #
 all:
-        cd $(WXDIR)\samples\bombs
+        cd $(WXDIR)\samples\calendar
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\caret
         nmake -f makefile.vc FINAL=$(FINAL)
@@ -46,7 +46,7 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\db
         nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\dde
+        cd $(WXDIR)\samples\ipc
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\dialogs
         nmake -f makefile.vc FINAL=$(FINAL)
@@ -62,10 +62,6 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\font
         nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\forty
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\fractal
-        nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\grid
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\newgrid
@@ -106,7 +102,7 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\nativdlg
         nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\nettest
+        cd $(WXDIR)\samples\dialup
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\notebook
         nmake -f makefile.vc FINAL=$(FINAL)
@@ -154,13 +150,11 @@ all:
         nmake -f makefile.vc FINAL=$(FINAL)
         cd $(WXDIR)\samples\wizard
         nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\wxpoem
+        cd $(WXDIR)\samples\sockets
-        nmake -f makefile.vc FINAL=$(FINAL)
-        cd $(WXDIR)\samples\wxsocket
         nmake -f makefile.vc FINAL=$(FINAL)
 
 clean:
-        cd $(WXDIR)\samples\bombs
+        cd $(WXDIR)\samples\calendar
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\caret
         nmake -f makefile.vc clean
@@ -172,7 +166,7 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\db
         nmake -f makefile.vc clean
-        cd $(WXDIR)\samples\dde
+        cd $(WXDIR)\samples\ipc
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\dialogs
         nmake -f makefile.vc clean
@@ -188,10 +182,6 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\font
         nmake -f makefile.vc clean
-        cd $(WXDIR)\samples\forty
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\samples\fractal
-        nmake -f makefile.vc clean
         cd $(WXDIR)\samples\grid
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\newgrid
@@ -226,7 +216,7 @@ clean:
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\nativdlg
         nmake -f makefile.vc clean
-        cd $(WXDIR)\samples\nettest
+        cd $(WXDIR)\samples\dialup
         nmake -f makefile.vc clean
         cd $(WXDIR)\samples\notebook
         nmake -f makefile.vc clean
@@ -274,8 +264,6 @@ clean:
         cd $(WXDIR)\samples\wizard
         nmake -f makefile.vc clean
 !endif
-        cd $(WXDIR)\samples\wxpoem
+        cd $(WXDIR)\samples\sockets
-        nmake -f makefile.vc clean
-        cd $(WXDIR)\samples\wxsocket
         nmake -f makefile.vc clean