diff --git a/demos/makefile.vc b/demos/makefile.vc
new file mode 100644
index 0000000000..a55147eb5f
--- /dev/null
+++ b/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
+
diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index dba7156668..968c227926 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -290,24 +290,24 @@ samples/dynamic/*.bmp
samples/dynamic/*.rc
samples/dynamic/*.wav
-samples/wxsocket/*.cpp
-samples/wxsocket/*.h
-samples/wxsocket/*.def
-samples/wxsocket/makefile*
-samples/wxsocket/client.wat
-samples/wxsocket/server.wat
-samples/wxsocket/client.vc
-samples/wxsocket/server.vc
-samples/wxsocket/client.dos
-samples/wxsocket/server.dos
-samples/wxsocket/client.b32
-samples/wxsocket/server.b32
-samples/wxsocket/client.bcc
-samples/wxsocket/server.bcc
-samples/wxsocket/*.xbm
-samples/wxsocket/*.xpm
-samples/wxsocket/*.ico
-samples/wxsocket/*.rc
+samples/sockets/*.cpp
+samples/sockets/*.h
+samples/sockets/*.def
+samples/sockets/makefile*
+samples/sockets/client.wat
+samples/sockets/server.wat
+samples/sockets/client.vc
+samples/sockets/server.vc
+samples/sockets/client.dos
+samples/sockets/server.dos
+samples/sockets/client.b32
+samples/sockets/server.b32
+samples/sockets/client.bcc
+samples/sockets/server.bcc
+samples/sockets/*.xbm
+samples/sockets/*.xpm
+samples/sockets/*.ico
+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/forty/*.h
-samples/forty/makefile*
-samples/forty/*.rc
-samples/forty/*.def
-samples/forty/*.bmp
-samples/forty/*.xpm
-samples/forty/*.xbm
-samples/forty/*.png
-samples/forty/*.ico
-samples/forty/*.txt
-
-samples/dde/*.cpp
-samples/dde/*.h
-samples/dde/makefile*
-samples/dde/client.vc
-samples/dde/server.vc
-samples/dde/client.wat
-samples/dde/server.wat
-samples/dde/client.b32
-samples/dde/server.b32
-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/ipc/*.cpp
+samples/ipc/*.h
+samples/ipc/makefile*
+samples/ipc/client.vc
+samples/ipc/server.vc
+samples/ipc/client.wat
+samples/ipc/server.wat
+samples/ipc/client.b32
+samples/ipc/server.b32
+samples/ipc/client.bcc
+samples/ipc/server.bcc
+samples/ipc/client.dos
+samples/ipc/server.dos
+samples/ipc/*.rc
+samples/ipc/*.def
+samples/ipc/*.bmp
+samples/ipc/*.xpm
+samples/ipc/*.xbm
+samples/ipc/*.png
+samples/ipc/*.ico
+samples/ipc/*.txt
samples/scroll/*.cpp
samples/scroll/*.h
@@ -1004,17 +946,17 @@ samples/font/*.png
samples/font/*.ico
samples/font/*.txt
-samples/nettest/*.cpp
-samples/nettest/*.h
-samples/nettest/makefile*
-samples/nettest/*.rc
-samples/nettest/*.def
-samples/nettest/*.bmp
-samples/nettest/*.xpm
-samples/nettest/*.xbm
-samples/nettest/*.png
-samples/nettest/*.ico
-samples/nettest/*.txt
+samples/dialup/*.cpp
+samples/dialup/*.h
+samples/dialup/makefile*
+samples/dialup/*.rc
+samples/dialup/*.def
+samples/dialup/*.bmp
+samples/dialup/*.xpm
+samples/dialup/*.xbm
+samples/dialup/*.png
+samples/dialup/*.ico
+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
+
diff --git a/docs/html/index.htm b/docs/html/index.htm
index be72358361..3f1208b938 100644
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -35,6 +35,7 @@ downloaded from the wxWindows Web site.
Manuals]
[3rd party tools]
[Samples]
+[Demos]
@@ -101,20 +102,6 @@ downloaded from the wxWindows Web site.
-
-
-Porting Guide
- |
-
-
-Porting Guide
- |
-
-
-Porting Guide
- |
-
-
Dialog Editor Manual
@@ -129,20 +116,6 @@ downloaded from the wxWindows Web site.
|
-
-
-Property List Classes
- |
-
-
-Property List Classes
- |
-
-
-Property List Classes
- |
-
-
wxTreeLayout Class
@@ -185,7 +158,7 @@ downloaded from the wxWindows Web site. Samples
-- bombs: minesweeper-like game.
+
- calendar: a sample to test the wxCalendarCtrl class.
- caret: a sample to test the wxCaret class.
- checklst: demonstrates wxCheckListBox on
supported platforms (currently Windows and GTK only).
@@ -196,9 +169,9 @@ console-mode (no-GUI) compilation of wxWindows.
- controls: sample showing a variety of controls, including
wxNotebook.
- db: wxDB ODBC sample.
-
- dde: shows the DDE protocol in action, both using real
-DDE on Windows, and TCP/IP on all platforms. Edit ddesetup.h
-to switch between compilation modes. Currently the TCP/IP mode needs a bit of work.
+
- ipc: shows the DDE-like protocol in action, both using real
+DDE on Windows, and TCP/IP on all platforms. Edit ddesetup.h
+to switch between compilation modes.
- dialogs: 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.
- drawing: tests device context drawing.
- dynamic: shows how to connect events to member functions
dynamically.
-
- forty: a great little card game by Chris Breeze. A
-fully-fledged application!
- font: tests fonts, font enumerator, font encodings.
-
- fractal: fractal mountains by Andrew Davison.
- grid: demonstrates the wxGrid class.
- help: shows how to use wxHelpController.
- html: 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.
- nativdlg: shows how wxWindows can load a standard Windows
dialog resource, translating the controls into wxWindows controls (Windows only).
-
- nettest: wxDialUpManager demo.
+
- dialup: wxDialUpManager demo.
- newgrid: demonstrates the new wxGrid implementation, by Michael Bedward.
- notebook: shows the wxNotebook (tabbed window) control.
- oleauto: a little OLE automation controller (Windows only; requires
@@ -265,6 +235,7 @@ the user to resize subwindows.
- scroll: demonstrates wxScrolledWindow.
- scrollsub: demonstrates the use of wxScrolledWindow to scroll
an embedded window.
+
- sockets: demonstrates the TCP/IP family of classes.
- splitter: demonstrates the wxSplitterWindow class.
- tab: 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.
- validate: shows simple use of validation.
- wizard: demonstrates the wxWizard class.
-
- wxpoem: a little poetry display program.
-
- wxsocket: demonstrates the TCP/IP family of classes.
+
+
+
+
+
+- bombs: minesweeper-like game.
+
- forty: a great little card game by Chris Breeze. A
+fully-fledged application!
+
- fractal: fractal mountains by Andrew Davison.
+
- life: the game of Life by J. H. Conway, implemented in wxWindows by Guillermo Rodriguez Garcia.
+
- poem: a little poetry display program.
diff --git a/docs/latex/wx/fildrptg.tex b/docs/latex/wx/fildrptg.tex
index f483f11a5a..3c92446d98 100644
--- a/docs/latex/wx/fildrptg.tex
+++ b/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}}
diff --git a/docs/latex/wx/txtdrptg.tex b/docs/latex/wx/txtdrptg.tex
index 85549e31c1..14157895fb 100644
--- a/docs/latex/wx/txtdrptg.tex
+++ b/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}}
diff --git a/samples/makefile.vc b/samples/makefile.vc
index 104d18e413..888d7f8bdf 100644
--- a/samples/makefile.vc
+++ b/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
- nmake -f makefile.vc FINAL=$(FINAL)
- cd $(WXDIR)\samples\wxsocket
+ cd $(WXDIR)\samples\sockets
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
- nmake -f makefile.vc clean
- cd $(WXDIR)\samples\wxsocket
+ cd $(WXDIR)\samples\sockets
nmake -f makefile.vc clean
|