diff --git a/contrib/samples/ogl/studio/csprint.cpp b/contrib/samples/ogl/studio/csprint.cpp index bf058de632..28134aa425 100644 --- 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 91326c6619..f9ce881a95 100644 --- 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 8578fdc013..fdbf7a27b0 100644 --- 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 df33965ef4..a7f7985a41 100644 --- a/docs/html/faqgtk.htm +++ b/docs/html/faqgtk.htm @@ -32,7 +32,8 @@ See also top-level FAQ page.
  • Warning about GTK libraries supplied with RedHat
  • What range of Intel Linux platforms will a given application binary be usable on?
  • Can I statically link the GTK+ library?
    • -
  • Why does my simple program using EVT_CHAR doesn't work?
    • +
  • Why does my simple program using EVT_CHAR not work?
    • +
  • How do I trace the cause of an X11 error such as BadMatch?
    • @@ -99,7 +100,7 @@ No, this is not possible. It leads to crashes in GTK+.

    Why does my simple program using -EVT_CHAR doesn't work?

    +EVT_CHAR not work? In wxGTK, the frames never get focus and so can never receive CHAR nor KEY events so an EVT_CHAR handler for a frame will be @@ -109,6 +110,14 @@ frame.

    +

    How do I trace the cause of an X11 error such as BadMatch?

    + +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 (b g_log +in gdb). + +

    + diff --git a/docs/html/platform.htm b/docs/html/platform.htm index d185504cd2..f312ae8078 100644 --- a/docs/html/platform.htm +++ b/docs/html/platform.htm @@ -1,4 +1,3 @@ - Platforms supported by wxWindows 2.4 @@ -92,7 +91,7 @@ often don't work.
    All BSD systems tests are for wxGTK using gcc. FreeBSD - all version between 3.2 and 5.0 x86OkVZ
    + all versions between 3.2 and 5.1 x86OkVZ