From ad556aa948efb55c7ecf5060fb3e51f64aacc3ad Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Sun, 7 Nov 1999 12:36:36 +0000
Subject: [PATCH] Tidied up wxHTML About HTML file (missing /td, /tr etc.: how
did that work? :-)); added sample entries to index.htm; fixed some
wxUSE_SPINBUTTON -> wxUSE_SPINBTN
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
distrib/msw/generic.rsp | 12 ++++++++
docs/html/index.htm | 6 ++++
docs/msw/install.txt | 11 +++----
include/wx/msw/setup0.h | 3 +-
samples/controls/controls.cpp | 7 +++--
samples/html/about/data/about.htm | 50 +++++++++++++++++++++----------
samples/makefile.vc | 16 ++++++++++
7 files changed, 78 insertions(+), 27 deletions(-)
diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index e55cb19893..0beb8d0c1b 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -1024,3 +1024,15 @@ samples/menu/*.png
samples/menu/*.ico
samples/menu/*.txt
+samples/font/*.cpp
+samples/font/*.h
+samples/font/makefile*
+samples/font/*.rc
+samples/font/*.def
+samples/font/*.bmp
+samples/font/*.xpm
+samples/font/*.xbm
+samples/font/*.png
+samples/font/*.ico
+samples/font/*.txt
+
diff --git a/docs/html/index.htm b/docs/html/index.htm
index e561f4b877..33b86c91de 100644
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -211,6 +211,7 @@ using wxMDIParentFrame, wxMDIChildFrame.
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.
@@ -232,6 +233,7 @@ applications and also as a help facility.
<li><a href="../../samples/layout">layout</a>: shows the constraint layout system in action.
<li><a href="../../samples/listctrl">listctrl</a>: demonstrates the wxListCtrl (implemented natively on
WIN32, and using a generic version on other platforms).
+<li><a href="../../samples/menu">menu</a>: tests menus.
<li><a href="../../samples/mdi">mdi</a>: shows off the MDI (Multiple Document Interface) classes. On Windows, the regular MDI
scheme is used whereby child windows have full sizing and moving rights within the main
window. On other platforms, tabbed windows are used, where the children are always maximized.
@@ -245,6 +247,7 @@ 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/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
Excel to be present).
@@ -258,6 +261,9 @@ Excel to be present).
facilities.
<li><a href="../../samples/sashtest">sashtest</a>: demonstrates use of the wxSashWindow class to allow
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/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
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 6feb6de607..1c547ab717 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -141,17 +141,14 @@ project files are unlikely to be compatible, so use one method or
the other.
Note (3): VC++ 5's optimization code seems to be broken and can
-cause problems: this can be seen when deleting an object Dialog
-Editor, in Release mode with optimizations on. If in doubt,
-switch off optimisations, although this will result in much
+cause both compile and run-time problems: this can be seen when
+deleting an object Dialog Editor, in Release mode with optimizations
+on. If in doubt, switch off optimisations, although this will result in much
larger executables. It seems possible that the library can be created with
strong optimization, so long as the application is not strongly
optimized. For example, in wxWindows project, set to 'Minimum
Size'. In Dialog Editor project, set to 'Customize: Favor Small
Code' (and no others). This will then work.
-Note also that a bug in the compiler, even without optimization,
-causes dobjcmn.cpp to produce an internal error, so setup.h
-switches off drag and drop for VC++ 5.
Similarly, in VC++ 4, optimization can cause internal compiler
errors, so edit src\makevc.env and change /O1 to /Od before
@@ -388,7 +385,7 @@ Notes:
- Doesn't compile src/msw/ole files, so no drag and drop.
-- There's a bug in the Mingw32 headers for some distributions.
+- There's a bug in Mingw32 headers for some early distributions.
in include/windows32/defines.h, where it says:
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 31e03b6432..73add4e890 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -453,11 +453,12 @@
#endif
// Problem with VC++ 5 and dobjcmn.cpp
-
+/*
#if defined(_MSC_VER) && (_MSC_VER > 1020) && (_MSC_VER < 1200)
#undef wxUSE_DRAG_AND_DROP
#define wxUSE_DRAG_AND_DROP 0
#endif
+*/
#endif
// _WX_SETUP_H_
diff --git a/samples/controls/controls.cpp b/samples/controls/controls.cpp
index 6bc15448f9..79ffa750a2 100644
--- a/samples/controls/controls.cpp
+++ b/samples/controls/controls.cpp
@@ -49,12 +49,13 @@
#ifdef __WIN16__
// Win16 doesn't have them
- #ifndef wxUSE_SPINBTN
+ #ifdef wxUSE_SPINBTN
#undef wxUSE_SPINBTN
+ #endif
#define wxUSE_SPINBTN 0
#else
- #if !defined(wxUSE_SPINBTN)
- #define wxUSE_SPINBTN 1
+ #ifndef wxUSE_SPINBTN
+ #define wxUSE_SPINBTN 1
#endif
#endif // __WIN16__
diff --git a/samples/html/about/data/about.htm b/samples/html/about/data/about.htm
index b3bfa67dfc..aefdd32104 100644
--- a/samples/html/about/data/about.htm
+++ b/samples/html/about/data/about.htm
@@ -1,17 +1,35 @@
-<html><body bgcolor="#FFFFFF"><table cellspacing=3 cellpadding=4 width="100%">
-<tr><td bgcolor="#101010">
-<center><font size=+2 color="#FFFFFF"><b>
-<br>wxHTML Library Sample 0.2.0<br>
-</b></font></center>
-<tr><td bgcolor="#73A183">
-<b><font size=+1>Copyright (C) 1999 Vaclav Slavik</font></b><p>
-<font size=-1>
-<table cellpadding=0 cellspacing=0 width="100%">
-<tr><td width="65%">
-Vaclav Slavik (slavik2@czn.cz)<br>Someone Else (selse@hell.org)<p>
-<td valign=top><img src="logo.png">
+<html>
+<body bgcolor="#FFFFFF">
+<table cellspacing=3 cellpadding=4 width="100%">
+ <tr>
+ <td bgcolor="#101010">
+ <center>
+ <font size=+2 color="#FFFFFF"><b><br>wxHTML Library Sample 0.2.0<br></b>
+ </font>
+ </center>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#73A183">
+ <b><font size=+1>Copyright (C) 1999 Vaclav Slavik</font></b><p>
+ <font size=-1>
+ <table cellpadding=0 cellspacing=0 width="100%">
+ <tr>
+ <td width="65%">
+ Vaclav Slavik (slavik2@czn.cz)<p>
+ </td>
+ <td valign=top>
+ <img src="logo.png">
+ </td>
+ </tr>
+ </table>
+ <font size=1>
+ The wxHTML library is available at <font color="#0000FF">http://www.ms.mff.cuni.cz/~vsla8348/wxhtml</font><br>
+ Licenced under wxWindows Library Licence, Version 3.
+ </font>
+ </font>
+ </td>
+ </tr>
</table>
-<font size=-2>
-The wxHTML library is available at <font color="#0000FF">http://www.ms.mff.cuni.cz/~vsla8348/wxhtml</font><br>
-The library is licenced under wxWindows Library Licence, Version 3.
-</font></font></table></body></html>
+</body>
+</html>
diff --git a/samples/makefile.vc b/samples/makefile.vc
index 6edb3485bb..104d18e413 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -60,6 +60,8 @@ all:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\dynamic
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
@@ -88,6 +90,8 @@ all:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\mdi
nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\menu
+ nmake -f makefile.vc FINAL=$(FINAL)
!if "$(FINAL)" == "0"
cd $(WXDIR)\samples\memcheck
nmake -f makefile.vc FINAL=$(FINAL)
@@ -102,6 +106,8 @@ all:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\nativdlg
nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\nettest
+ nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\notebook
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\oleauto
@@ -126,6 +132,8 @@ all:
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\scroll
nmake -f makefile.vc FINAL=$(FINAL)
+ cd $(WXDIR)\samples\scrollsub
+ nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\splitter
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\tab
@@ -178,6 +186,8 @@ clean:
nmake -f makefile.vc clean
cd $(WXDIR)\samples\dynamic
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
@@ -208,12 +218,16 @@ clean:
!endif
cd $(WXDIR)\samples\mfc
nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\menu
+ nmake -f makefile.vc clean
cd $(WXDIR)\samples\minifram
nmake -f makefile.vc clean
cd $(WXDIR)\samples\minimal
nmake -f makefile.vc clean
cd $(WXDIR)\samples\nativdlg
nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\nettest
+ nmake -f makefile.vc clean
cd $(WXDIR)\samples\notebook
nmake -f makefile.vc clean
cd $(WXDIR)\samples\oleauto
@@ -236,6 +250,8 @@ clean:
nmake -f makefile.vc clean
cd $(WXDIR)\samples\scroll
nmake -f makefile.vc clean
+ cd $(WXDIR)\samples\scrollsub
+ nmake -f makefile.vc clean
cd $(WXDIR)\samples\splitter
nmake -f makefile.vc clean
cd $(WXDIR)\samples\tab
--
2.47.2