No significant changes

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

diff --git a/docs/html/faqgen.htm b/docs/html/faqgen.htm
index d40cb8f4e77544ab4e1b1c68d3f087f652a85008..a0de58ca37333d3cb872edc2c7fe30083d47de95 100644 (file)
--- 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 &#39;look and feel&#39; that users are familiar with.<P>
 
-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&#39;s <a href="http://www.roebling.com">wxDesigner</a>
-makes light work of resizable, portable dialogs.<P>
+and Anthemion Software's <a href="http://www.anthemion.co.uk/dialogblocks/" target=_new>DialogBlocks</a>
+are two commercial examples, but there are others: see the <a href="lnk_tools.htm">Useful Tools</a> page.<P>
 
 You don&#39;t have to use C++ to use wxWindows: there is a <a href="http://wxpython.org">Python interface</a> for wxWindows 2,
 and also a <a href="http://wxperl.sourceforge.net" target=_top>Perl interface</a>.
@@ -292,6 +293,8 @@ wxWindows (I'm aware there is GTK&#35; for use with the C&#35; language).
 that wxWindows does not require.
 <li>Mono hasn't proven its long-term viability yet (it's a complex system of components); wxWindows is ready now.
 <li>You may not wish to buy into Microsoft marketing spin and APIs.
+<li>Microsoft may at some point sue developers of non-Microsoft .NET implementations. After all,
+platform-independence is not in Microsoft's interest.
 <li>.NET might never be implemented on some platforms, especially Mac and embedded variants of Linux.
 <li>wxPython and other language variants provide further reasons for wxWindows to continue.
 <li>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 18584d9100a513a39f37d10647fe44a3de9b1f51..cfe6e89be30268e877ce24850f43acf987c61f75 100644 (file)
--- a/docs/html/faqmsw.htm
+++ b/docs/html/faqmsw.htm
@@ -35,6 +35,7 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <li><a href="#dll">Can you compile wxWindows 2 as a DLL?</a></li>
 <li><a href="#exesize">How can I reduce executable size?</a></li>
 <li><a href="#mfc">Is wxWindows compatible with MFC?</a></li>
+<li><a href="#setuph">Why do I get errors about setup.h not being found?</a></li>
 <li><a href="#asuffix">Why do I get errors about FooBarA when I only use FooBar in my program?</a></li>
 <li><a href="#newerrors">Why my code fails to compile with strange errors about new operator?</a></li>
 <li><a href="#mfcport">How do I port MFC applications to wxWindows?</a></li>
@@ -242,6 +243,21 @@ There is a sample which demonstrates MFC and wxWindows code co-existing in the s
 application. However, don&#39;t expect to be able to enable wxWindows windows with OLE-2
 functionality using MFC.<P>
 
+<H3><a name="setuph">Why do I get errors about setup.h not being found?</a></H3>
+
+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:<P>
+
+lib/mswd<P>
+
+or if building the static Release library, lib/msw.<P>
+
+See also the <a href="http://wiki.wxwindows.org/wiki.pl?Table_Of_Contents">wxWiki Contents</a>
+for more information.<P>
+
+
 <H3><a name="asuffix">Why do I get errors about FooBarA when I only use FooBar in my program?</H3>
 
 If you get errors like
@@ -280,7 +296,8 @@ the <a href="#vcdebug">VC++ CRT memory debugging features</a> instead.
 
 <H3><a name="mfcport">How do I port MFC applications to wxWindows?</a></H3>
 
-Set up your interface from scratch using wxWindows (especially wxDesigner --
+Set up your interface from scratch using wxWindows (especially <a href="http://www.robeling.de" target=_top>wxDesigner</a>
+or <a href="http://www.anthemion.co.uk/dialogblocks/" target=_new>DialogBlocks</a> --
 it&#39;ll save you a <i>lot</i> of time) and when you have a shell prepared, you can start
 &#39;pouring in&#39; 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 25972fd943524195b8843277913d93f91ab7df2e..d0468baa37c303f2b386282a5f0504879424877e 100644 (file)
--- a/docs/html/i18n.htm
+++ b/docs/html/i18n.htm
@@ -141,7 +141,8 @@ translations as of wxWindows 2.3.
 <tr>
     <td valign=center>Greek</td>
     <td align=center valign=center><IMG SRC="images/no.gif" ALT="Done"></td>
-    <td align=center valign=center><A HREF="mailto:tsolako1@otenet.gr">Tsolakos Stavros</A>
+    <td align=center valign=center><A HREF="mailto:tsolako1@otenet.gr">Tsolakos Stavros</A>,
+                                   <A HREF="mailto:nassosy@compulink.gr">Nassos Yiannopoulos</A>
                                    </td>
 </tr>
 

diff --git a/docs/html/platform.htm b/docs/html/platform.htm
index 440186e190daa2af8b98cba6f1ac62f35b891cb6..d185504cd232eadd369c4ea32d067721b95d668e 100644 (file)
--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -59,7 +59,7 @@ often don't work.
 </tr>
 
 <tr>
-<td bgcolor="#FFFFFF" align=center valign=center rowspan=7>Win32<br>(Win 9x/NT/2K)</td>
+<td bgcolor="#FFFFFF" align=center valign=center rowspan=8>Win32<br>(Win 9x/NT/2K)</td>
      <td>Visual C++ 4.2/5.x/6.0</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ, JS</td><td>Project files are provided for all versions except 4.2</td>
 <tr> <td>Borland C++ 5.0</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td><br></td><td>Also works with free command line Borland C++ 5.5</td>
 <tr> <td>Mingw32</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>GRG, VZ</td><td>Cross compilation from Linux works as well<br>
@@ -68,14 +68,15 @@ often don&#39;t work.
 <tr> <td>Cygwin</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Stephane Junique<br>Andrea Venturoli</td><td>tested under NT 4, cross-compiling for mingw also works</td>
 <tr> <td>Watcom C++ 10</td><td align=center><IMG SRC="images/somewhat.gif" ALT=Almost></td><td>JS</td><td>Tested with 10.6: works, but wxImage seems to be broken<br>no support for JPEG, TIFF or OpenGL</td>
 <tr> <td>Watcom C++ 11</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Markus Neifer</td><td>Tested with 11.0b under win95</td>
-<tr> <td>Symantec C++</td><td align=center><IMG SRC="images/no.gif" ALT=Unknown></td><td><br></td><td><br></td>
+<tr> <td>Open Watcom 1.0</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Chris Elliott</td><td>Tested with 1.0 under W2K(?)</td>
+<tr> <td>Digital Mars (was Symantec C++)</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>Chris Elliott</td><td>Tested with 8.34beta</td>
 </tr>
 
 <tr>
 <td bgcolor="#F0F0F0" align=center valign=center rowspan=2>Win16<br>(Windows 3.1)</td>
      <td>Visual C++ 1.52</td><td align=center><IMG SRC="images/somewhat.gif" ALT=Ok></td><td><br></td>
      <td rowspan=2 valign=center>Some features are missing (OLE related classes, threads, ...)<br>
-                                 Borland C++ can&#39;t cope with ODBC, resources and new wxGrid class</td>
+                                 Borland C++ can&#39;t cope with ODBC, resources and new wxGrid class. <B>Last tested in wxWindows 2.2.7.</B></td>
 <tr> <td>Borland C++ 4.0/5.0</td><td align=center><IMG SRC="images/somewhat.gif" ALT=Ok></td><td>JS</td>
 </tr>
 

diff --git a/docs/publicity/publicity.txt b/docs/publicity/publicity.txt
index 15d59c45a1d753c921123f613f8f76915c35e16c..6b000d31d6081a85bc9d99c40dda1b8f84c800db 100644 (file)
--- 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 8f7e1b91f44f04edfb2241daf6707d9c689f6051..9c80803e08500d7fcc173b780c6da4a34b637747 100644 (file)
--- 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 cd0182707993354ca4285e0c568b745ab84a7607..bf8af41876c40387488b43412463888c216f8d0b 100644 (file)
--- 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 63c962594631b4943bbbf463ff2abbec66dc5c8a..859646589b057a3e1b7a91cdbcdcf78e86f3e991 100644 (file)
--- 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