diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm
index d40cb8f4e7..a0de58ca37 100644
--- a/docs/html/faqgen.htm
+++ b/docs/html/faqgen.htm
@@ -51,9 +51,10 @@ wxWindows is a class library that allows you to compile graphical C++ programs o
different platforms. wxWindows defines a common API across platforms, but uses the native graphical user interface (GUI) on each platform,
so your program will take on the native 'look and feel' that users are familiar with.
-Although GUI applications are mostly built programmatically, there is a dialog editor to help
+Although GUI applications are mostly built programmatically, there are several dialog editors to help
build attractive dialogs and panels. Robert Roebling's wxDesigner
-makes light work of resizable, portable dialogs.
+and Anthemion Software's DialogBlocks
+are two commercial examples, but there are others: see the Useful Tools page.
You don't have to use C++ to use wxWindows: there is a Python interface for wxWindows 2,
and also a Perl interface.
@@ -292,6 +293,8 @@ wxWindows (I'm aware there is GTK# for use with the C# language).
that wxWindows does not require.
Mono hasn't proven its long-term viability yet (it's a complex system of components); wxWindows is ready now.
You may not wish to buy into Microsoft marketing spin and APIs.
+Microsoft may at some point sue developers of non-Microsoft .NET implementations. After all,
+platform-independence is not in Microsoft's interest.
.NET might never be implemented on some platforms, especially Mac and embedded variants of Linux.
wxPython and other language variants provide further reasons for wxWindows to continue.
The same issue exists for Qt: if Qt sales remain strong, it's a good indication that
diff --git a/docs/html/faqmsw.htm b/docs/html/faqmsw.htm
index 18584d9100..cfe6e89be3 100644
--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -35,6 +35,7 @@ See also top-level FAQ page.
Can you compile wxWindows 2 as a DLL?
How can I reduce executable size?
Is wxWindows compatible with MFC?
+Why do I get errors about setup.h not being found?
Why do I get errors about FooBarA when I only use FooBar in my program?
Why my code fails to compile with strange errors about new operator?
How do I port MFC applications to wxWindows?
@@ -242,6 +243,21 @@ There is a sample which demonstrates MFC and wxWindows code co-existing in the s
application. However, don't expect to be able to enable wxWindows windows with OLE-2
functionality using MFC.
+
+
+When you build the wxWindows library, setup.h is copied
+from include/wx/msw/setup.h to e.g. lib/mswd/wx/setup.h (the path
+depends on the configuration you're building). So you need to add
+this include path if building using the static Debug library:
+
+lib/mswd
+
+or if building the static Release library, lib/msw.
+
+See also the wxWiki Contents
+for more information.
+
+
If you get errors like
@@ -280,7 +296,8 @@ the VC++ CRT memory debugging features instead.
-Set up your interface from scratch using wxWindows (especially wxDesigner --
+Set up your interface from scratch using wxWindows (especially wxDesigner
+or DialogBlocks --
it'll save you a lot of time) and when you have a shell prepared, you can start
'pouring in' code from the MFC app, with appropriate
modifications. This is the approach I have used, and I found
diff --git a/docs/html/i18n.htm b/docs/html/i18n.htm
index 25972fd943..d0468baa37 100644
--- a/docs/html/i18n.htm
+++ b/docs/html/i18n.htm
@@ -141,7 +141,8 @@ translations as of wxWindows 2.3.
Greek |
 |
- Tsolakos Stavros
+ | Tsolakos Stavros,
+ Nassos Yiannopoulos
|
diff --git a/docs/html/platform.htm b/docs/html/platform.htm
index 440186e190..d185504cd2 100644
--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -59,7 +59,7 @@ often don't work.
-Win32 (Win 9x/NT/2K) |
+Win32 (Win 9x/NT/2K) |
Visual C++ 4.2/5.x/6.0 |  | VZ, JS | Project files are provided for all versions except 4.2 |
Borland C++ 5.0 |  |
| Also works with free command line Borland C++ 5.5 |
Mingw32 |  | GRG, VZ | Cross compilation from Linux works as well
@@ -68,14 +68,15 @@ often don't work.
|
Cygwin |  | Stephane Junique Andrea Venturoli | tested under NT 4, cross-compiling for mingw also works |
Watcom C++ 10 |  | JS | Tested with 10.6: works, but wxImage seems to be broken no support for JPEG, TIFF or OpenGL |
Watcom C++ 11 |  | Markus Neifer | Tested with 11.0b under win95 |
-
Symantec C++ |  |
|
|
+
Open Watcom 1.0 |  | Chris Elliott | Tested with 1.0 under W2K(?) |
+
Digital Mars (was Symantec C++) |  | Chris Elliott | Tested with 8.34beta |
Win16 (Windows 3.1) |
Visual C++ 1.52 |  |
|
Some features are missing (OLE related classes, threads, ...)
- Borland C++ can't cope with ODBC, resources and new wxGrid class |
+ Borland C++ can't cope with ODBC, resources and new wxGrid class. Last tested in wxWindows 2.2.7.
Borland C++ 4.0/5.0 |  | JS |
diff --git a/docs/publicity/publicity.txt b/docs/publicity/publicity.txt
index 15d59c45a1..6b000d31d6 100644
--- a/docs/publicity/publicity.txt
+++ b/docs/publicity/publicity.txt
@@ -142,3 +142,6 @@ Organisations:
http://www.egovos.org/ The Center of Open Source & Government
(Submitted to their directory, 2003-04-25)
+http://www.opensector.org/
+(nothing submitted yet)
+
diff --git a/docs/todo30.txt b/docs/todo30.txt
index 8f7e1b91f4..9c80803e08 100644
--- a/docs/todo30.txt
+++ b/docs/todo30.txt
@@ -203,5 +203,8 @@ wxMiscellaneous
behaviour (click, click, click, click away...) and
reduce checkbox size on non-Windows platforms.
- Add wxNotebook::HitTest for non-Windows platforms.
+- Implement rebar for all platforms. This will help us
+ get closer to native look and feel, e.g. the gradient
+ shadow on XP toolbars.
Version: $Id$
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index cd01827079..bf8af41876 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1009,12 +1009,7 @@
//
// Default is 0 for (most) Win32 (systems), 1 for Win16
//
-// Recommended setting: same as default
-#if defined(__WIN95__)
#define wxUSE_ITSY_BITSY 0
-#else
-#define wxUSE_ITSY_BITSY 1
-#endif
// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
// which allows to put more than ~32Kb of text in it even under Win9x (NT
diff --git a/include/wx/printdlg.h b/include/wx/printdlg.h
index 63c9625946..859646589b 100644
--- a/include/wx/printdlg.h
+++ b/include/wx/printdlg.h
@@ -1,7 +1,7 @@
#ifndef _WX_PRINTDLG_H_BASE_
#define _WX_PRINTDLG_H_BASE_
-#if defined(__WXUNIVERSAL__)
+#if defined(__WXUNIVERSAL__) /* && !defined(__WXMSW__) */
#include "wx/generic/prntdlgg.h"
#elif defined(__WXMSW__)
#include "wx/msw/printdlg.h"
@@ -19,7 +19,7 @@
#include "wx/generic/prntdlgg.h"
#endif
-#if defined(__WXUNIVERSAL__) || (!defined(__WXMSW__) && !defined(__WXMAC__))
+#if (defined(__WXUNIVERSAL__) /* && !defined(__WXMSW__) */ ) || (!defined(__WXMSW__) && !defined(__WXMAC__))
#define wxPrintDialog wxGenericPrintDialog
#define sm_classwxPrintDialog sm_classwxGenericPrintDialog