No change

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

diff --git a/contrib/samples/ogl/studio/csprint.cpp b/contrib/samples/ogl/studio/csprint.cpp
index bf058de6325e1df73559b0c16e3371bb6115efdf..28134aa425e47d56103d0e43349bd0f646eb772a 100644 (file)
--- a/contrib/samples/ogl/studio/csprint.cpp
+++ b/contrib/samples/ogl/studio/csprint.cpp
@@ -178,8 +178,8 @@ bool wxDiagramClipboard::CopyToClipboard(double scale)
     // Draw on metafile DC
     Redraw(mfDC);
 
-    /* int printWidth = */ mfDC.MaxX() - mfDC.MinX();
-    /* int printHeight = */ mfDC.MaxY() - mfDC.MinY();
+    // int printWidth = mfDC.MaxX() - mfDC.MinX();
+    // int printHeight = mfDC.MaxY() - mfDC.MinY();
     int maxX = (int)mfDC.MaxX();
     int maxY = (int)mfDC.MaxY();
     wxMetaFile *mf = mfDC.Close();

diff --git a/distrib/msw/contrib.rsp b/distrib/msw/contrib.rsp
index 91326c6619312cd7554487b959fa1347ecbce1ab..f9ce881a95f3007520ea4858190226b23d6e886c 100644 (file)
--- a/distrib/msw/contrib.rsp
+++ b/distrib/msw/contrib.rsp
@@ -165,7 +165,6 @@ contrib/samples/fl/bitmaps/*.xpm
 contrib/samples/fl/*.cpp
 contrib/samples/fl/*.h
 contrib/samples/fl/*.def
-contrib/samples/fl/makefile*
 contrib/samples/fl/*.xbm
 contrib/samples/fl/*.xpm
 contrib/samples/fl/*.txt

diff --git a/distrib/msw/makesetup.sh b/distrib/msw/makesetup.sh
index 8578fdc01341af68733674dbd8aefcebaacf54d8..fdbf7a27b0bb7457e94f7443b3e8d2a6d07f76c2 100644 (file)
--- a/distrib/msw/makesetup.sh
+++ b/distrib/msw/makesetup.sh
@@ -359,12 +359,9 @@ dospinsetup()
     #cp $APPDIR/bin/dialoged.hlp bin
     #cp $APPDIR/bin/dialoged.chm bin
     cp $APPDIR/bin/tex2rtf.exe bin
-    cp $APPDIR/bin/tex2rtf.hlp bin
-    cp $APPDIR/bin/tex2rtf.cnt bin
+    cp $APPDIR/bin/tex2rtf.chm bin
     cp $APPDIR/bin/widgets.exe bin
-    cp $APPDIR/bin/widgets.exe.manifest bin
     cp $APPDIR/bin/life.exe bin
-    cp $APPDIR/bin/life.exe.manifest bin
     cp $APPDIR/demos/life/breeder.lif bin
     #cp $APPDIR/docs/htmlhelp/dialoged.chm bin
     cp $APPDIR/docs/htmlhelp/tex2rtf.chm bin
@@ -626,6 +623,7 @@ usage()
     echo "    --wxos2           Build wxOS2 distribution"
     echo "    --docs            Build docs archives"
     echo "    --all             Build all distributions (the default)"
+    echo "    --verbose         Verbose zip operation"
     echo.
     echo Note that options only override settings in $SCRIPTDIR/setup.var.
     exit 1

diff --git a/docs/html/faqgtk.htm b/docs/html/faqgtk.htm
index df33965ef4df19877fbe2618fdf4186bedc32f0f..a7f7985a41a28c636ba54155938c391a74beca34 100644 (file)
--- a/docs/html/faqgtk.htm
+++ b/docs/html/faqgtk.htm
@@ -32,7 +32,8 @@ See also <a href="faq.htm">top-level FAQ page</a>.
 <li><a href="#redhat">Warning about GTK libraries supplied with RedHat</a></li>
 <li><a href="#bincompat">What range of Intel Linux platforms will a given application binary be usable on?</a></li>
 <li><a href="#static">Can I statically link the GTK+ library?</a></li>
-<li><a href="#charinframe">Why does my simple program using <tt>EVT_CHAR</tt> doesn't work?</a></li>
+<li><a href="#charinframe">Why does my simple program using <tt>EVT_CHAR</tt> not work?</a></li>
+<li><a href="#debugging">How do I trace the cause of an X11 error such as BadMatch?</a></li>
 </ul>
 
 <hr>
@@ -99,7 +100,7 @@ No, this is not possible. It leads to crashes in GTK+.
 <P>
 
 <h3><a name="#charinframe">Why does my simple program using
-<tt>EVT_CHAR</tt> doesn't work?</a></h3>
+<tt>EVT_CHAR</tt> not work?</a></h3>
 
 In wxGTK, the frames never get focus and so can never receive <tt>CHAR</tt>
 nor <tt>KEY</tt> events so an <tt>EVT_CHAR</tt> handler for a frame will be
@@ -109,6 +110,14 @@ frame.
 
 <p>
 
+<h3><a name="#debugging">How do I trace the cause of an X11 error such as BadMatch?</h3>
+
+When a fatal X11 error occurs, the application quits with no stack trace.
+To find out where the problem is, put a breakpoint on g_log (<tt>b g_log</tt>
+in gdb).
+
+<p>
+
 </font>
 
 </BODY>

diff --git a/docs/html/platform.htm b/docs/html/platform.htm
index d185504cd232eadd369c4ea32d067721b95d668e..f312ae80788a326e7f47b048098b261a34c0fcac 100644 (file)
--- a/docs/html/platform.htm
+++ b/docs/html/platform.htm
@@ -1,4 +1,3 @@
-
 <html>
 <head>
    <title>Platforms supported by wxWindows 2.4</title>
@@ -92,7 +91,7 @@ often don&#39;t work.
 <tr> <td bgcolor="#fafafa"><br></td><td bgcolor="#fafafa" colspan=5> All BSD systems tests are for wxGTK using gcc. </td>
 <tr>
 <td bgcolor="#F0F0F0" align=center valign=center rowspan=1>FreeBSD</td>
-     <td>all version between 3.2 and 5.0 x86</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td><br></td>
+     <td>all versions between 3.2 and 5.1 x86</td><td align=center><IMG SRC="images/yes.gif" ALT=Ok></td><td>VZ</td><td><br></td>
 </tr>
 
 <tr>