Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use -Wunused-parameter with gcc for consistency with MSVC and other compilers which warn about this; fix the uncovered warnings in wxGTK

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-10-23 22:19:34 +00:00
parent 87f8a3cf25
commit e4161a2a08
28 changed files with 198 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

230
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Id: configure.in 49284 2007-10-21 11:39:33Z MW . # From configure.in Id: configure.in 49352 2007-10-23 13:40:27Z VZ .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
# #
@@ -829,9 +829,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_0_USE_STC_1 COND_MONOLITHIC_0_SHARED_0_USE_STC_1
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
@@ -840,19 +838,15 @@ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_STC_1
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
COND_MONOLITHIC_0_USE_AUI_1 COND_MONOLITHIC_0_USE_AUI_1
COND_MONOLITHIC_0_USE_GUI_1 COND_MONOLITHIC_0_USE_GUI_1
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1
COND_MONOLITHIC_0_USE_HTML_1 COND_MONOLITHIC_0_USE_HTML_1
COND_MONOLITHIC_0_USE_MEDIA_1 COND_MONOLITHIC_0_USE_MEDIA_1
COND_MONOLITHIC_0_USE_ODBC_1
COND_MONOLITHIC_0_USE_QA_1 COND_MONOLITHIC_0_USE_QA_1
COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_USE_STC_1 COND_MONOLITHIC_0_USE_STC_1
@@ -875,8 +869,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11
COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_GUI_1
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
COND_PLATFORM_MACOS_1 COND_PLATFORM_MACOS_1
COND_PLATFORM_MAC_1
COND_PLATFORM_MSDOS_0
COND_PLATFORM_MSDOS_1 COND_PLATFORM_MSDOS_1
COND_PLATFORM_OS2_1 COND_PLATFORM_OS2_1
COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_0
@@ -888,22 +880,16 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0
COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_0
COND_PLATFORM_WIN32_1 COND_PLATFORM_WIN32_1
COND_SHARED_0 COND_SHARED_0
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
COND_SHARED_0_USE_STC_1 COND_SHARED_0_USE_STC_1
COND_SHARED_0_USE_XRC_1
COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN
COND_SHARED_0_WXUSE_ODBC_BUILTIN
COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN
COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN
COND_SHARED_1 COND_SHARED_1
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
COND_SHARED_1_USE_XRC_1
COND_TOOLKIT_ COND_TOOLKIT_
COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA
COND_TOOLKIT_COCOA_USE_GUI_1 COND_TOOLKIT_COCOA_USE_GUI_1
@@ -950,8 +936,6 @@ COND_USE_GUI_1_WXUNIV_1
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
COND_USE_ODBC_1
COND_USE_OPENGL_1
COND_USE_PCH_1 COND_USE_PCH_1
COND_USE_PLUGINS_0 COND_USE_PLUGINS_0
COND_USE_RTTI_0 COND_USE_RTTI_0
@@ -973,7 +957,6 @@ COND_WXUSE_EXPAT_BUILTIN
COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN
COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN
COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN
COND_WXUSE_ODBC_BUILTIN
COND_WXUSE_REGEX_BUILTIN COND_WXUSE_REGEX_BUILTIN
COND_WXUSE_ZLIB_BUILTIN COND_WXUSE_ZLIB_BUILTIN
DEREZ DEREZ
@@ -49201,7 +49184,7 @@ fi
if test "x$INTELCXX" = "xyes" ; then if test "x$INTELCXX" = "xyes" ; then
CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419" CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
elif test "$GXX" = yes ; then elif test "$GXX" = yes ; then
CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy" CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
fi fi
@@ -51747,21 +51730,11 @@ EOF
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1="" COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1=""
fi fi
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
fi
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#" COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="" COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
fi fi
COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1=""
fi
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#" COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="" COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
@@ -51802,21 +51775,11 @@ EOF
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1="" COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1=""
fi fi
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
fi
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#" COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="" COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
fi fi
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1=""
fi
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#" COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="" COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
@@ -51847,11 +51810,6 @@ EOF
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="" COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1=""
fi fi
COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1=""
fi
COND_MONOLITHIC_0_USE_HTML_1="#" COND_MONOLITHIC_0_USE_HTML_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then
COND_MONOLITHIC_0_USE_HTML_1="" COND_MONOLITHIC_0_USE_HTML_1=""
@@ -51862,11 +51820,6 @@ EOF
COND_MONOLITHIC_0_USE_MEDIA_1="" COND_MONOLITHIC_0_USE_MEDIA_1=""
fi fi
COND_MONOLITHIC_0_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_USE_ODBC_1=""
fi
COND_MONOLITHIC_0_USE_QA_1="#" COND_MONOLITHIC_0_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_USE_QA_1="" COND_MONOLITHIC_0_USE_QA_1=""
@@ -51977,16 +51930,6 @@ EOF
COND_PLATFORM_MACOS_1="" COND_PLATFORM_MACOS_1=""
fi fi
COND_PLATFORM_MAC_1="#"
if test "x$PLATFORM_MAC" = "x1" ; then
COND_PLATFORM_MAC_1=""
fi
COND_PLATFORM_MSDOS_0="#"
if test "x$PLATFORM_MSDOS" = "x0" ; then
COND_PLATFORM_MSDOS_0=""
fi
COND_PLATFORM_MSDOS_1="#" COND_PLATFORM_MSDOS_1="#"
if test "x$PLATFORM_MSDOS" = "x1" ; then if test "x$PLATFORM_MSDOS" = "x1" ; then
COND_PLATFORM_MSDOS_1="" COND_PLATFORM_MSDOS_1=""
@@ -52042,21 +51985,6 @@ EOF
COND_SHARED_0="" COND_SHARED_0=""
fi fi
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#"
if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0=""
fi
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#"
if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
fi
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
fi
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
@@ -52082,21 +52010,11 @@ EOF
COND_SHARED_0_USE_STC_1="" COND_SHARED_0_USE_STC_1=""
fi fi
COND_SHARED_0_USE_XRC_1="#"
if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
COND_SHARED_0_USE_XRC_1=""
fi
COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#" COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_EXPAT_BUILTIN="" COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
fi fi
COND_SHARED_0_WXUSE_ODBC_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_ODBC_BUILTIN=""
fi
COND_SHARED_0_WXUSE_REGEX_BUILTIN="#" COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_REGEX_BUILTIN="" COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
@@ -52117,11 +52035,6 @@ EOF
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
fi fi
COND_SHARED_1_USE_XRC_1="#"
if test "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then
COND_SHARED_1_USE_XRC_1=""
fi
COND_TOOLKIT_="#" COND_TOOLKIT_="#"
if test "x$TOOLKIT" = "x" ; then if test "x$TOOLKIT" = "x" ; then
COND_TOOLKIT_="" COND_TOOLKIT_=""
@@ -52352,16 +52265,6 @@ EOF
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi fi
COND_USE_ODBC_1="#"
if test "x$USE_ODBC" = "x1" ; then
COND_USE_ODBC_1=""
fi
COND_USE_OPENGL_1="#"
if test "x$USE_OPENGL" = "x1" ; then
COND_USE_OPENGL_1=""
fi
COND_USE_PCH_1="#" COND_USE_PCH_1="#"
if test "x$USE_PCH" = "x1" ; then if test "x$USE_PCH" = "x1" ; then
COND_USE_PCH_1="" COND_USE_PCH_1=""
@@ -52467,11 +52370,6 @@ EOF
COND_WXUSE_LIBTIFF_BUILTIN="" COND_WXUSE_LIBTIFF_BUILTIN=""
fi fi
COND_WXUSE_ODBC_BUILTIN="#"
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_WXUSE_ODBC_BUILTIN=""
fi
COND_WXUSE_REGEX_BUILTIN="#" COND_WXUSE_REGEX_BUILTIN="#"
if test "x$wxUSE_REGEX" = "xbuiltin" ; then if test "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_WXUSE_REGEX_BUILTIN="" COND_WXUSE_REGEX_BUILTIN=""
@@ -53890,9 +53788,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_AUI_1$ac_de
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
@@ -53901,19 +53797,15 @@ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_AUI_1$ac_de
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
COND_MONOLITHIC_0_USE_AUI_1!$COND_MONOLITHIC_0_USE_AUI_1$ac_delim COND_MONOLITHIC_0_USE_AUI_1!$COND_MONOLITHIC_0_USE_AUI_1$ac_delim
COND_MONOLITHIC_0_USE_GUI_1!$COND_MONOLITHIC_0_USE_GUI_1$ac_delim COND_MONOLITHIC_0_USE_GUI_1!$COND_MONOLITHIC_0_USE_GUI_1$ac_delim
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_USE_ODBC_1!$COND_MONOLITHIC_0_USE_ODBC_1$ac_delim
COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
@@ -53936,8 +53828,6 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim
COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim
COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
@@ -53949,25 +53839,33 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim
COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
COND_SHARED_0!$COND_SHARED_0$ac_delim COND_SHARED_0!$COND_SHARED_0$ac_delim
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
COND_SHARED_0_USE_XRC_1!$COND_SHARED_0_USE_XRC_1$ac_delim
COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim
COND_SHARED_0_WXUSE_ODBC_BUILTIN!$COND_SHARED_0_WXUSE_ODBC_BUILTIN$ac_delim
COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim
COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim
COND_SHARED_1!$COND_SHARED_1$ac_delim COND_SHARED_1!$COND_SHARED_1$ac_delim
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim
COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54009,20 +53907,6 @@ _ACEOF
ac_delim='%!_!# ' ac_delim='%!_!# '
for ac_last_try in false false false false false :; do for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF cat >conf$$subs.sed <<_ACEOF
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
@@ -54052,8 +53936,6 @@ COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
COND_USE_ODBC_1!$COND_USE_ODBC_1$ac_delim
COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
@@ -54075,7 +53957,6 @@ COND_WXUSE_EXPAT_BUILTIN!$COND_WXUSE_EXPAT_BUILTIN$ac_delim
COND_WXUSE_LIBJPEG_BUILTIN!$COND_WXUSE_LIBJPEG_BUILTIN$ac_delim COND_WXUSE_LIBJPEG_BUILTIN!$COND_WXUSE_LIBJPEG_BUILTIN$ac_delim
COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim
COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
COND_WXUSE_ODBC_BUILTIN!$COND_WXUSE_ODBC_BUILTIN$ac_delim
COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
DEREZ!$DEREZ$ac_delim DEREZ!$DEREZ$ac_delim
@@ -54106,6 +53987,23 @@ WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
GUIDIST!$GUIDIST$ac_delim GUIDIST!$GUIDIST$ac_delim
DISTDIR!$DISTDIR$ac_delim DISTDIR!$DISTDIR$ac_delim
SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim
LDFLAGS_GL!$LDFLAGS_GL$ac_delim
OPENGL_LIBS!$OPENGL_LIBS$ac_delim
DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
RESCOMP!$RESCOMP$ac_delim
RESFLAGS!$RESFLAGS$ac_delim
RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim
LIBWXMACRES!$LIBWXMACRES$ac_delim
POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
MACSETFILE!$MACSETFILE$ac_delim
GCC!$GCC$ac_delim
DLLTOOL!$DLLTOOL$ac_delim
CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF _ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -54144,66 +54042,6 @@ CEOF$ac_eof
_ACEOF _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
LDFLAGS_GL!$LDFLAGS_GL$ac_delim
OPENGL_LIBS!$OPENGL_LIBS$ac_delim
DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim
WX_VERSION_TAG!$WX_VERSION_TAG$ac_delim
RESCOMP!$RESCOMP$ac_delim
RESFLAGS!$RESFLAGS$ac_delim
RESPROGRAMOBJ!$RESPROGRAMOBJ$ac_delim
WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim
WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim
LIBWXMACRES!$LIBWXMACRES$ac_delim
POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim
MACSETFILE!$MACSETFILE$ac_delim
GCC!$GCC$ac_delim
DLLTOOL!$DLLTOOL$ac_delim
CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
if test -n "$ac_eof"; then
ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
ac_eof=`expr $ac_eof + 1`
fi
cat >>$CONFIG_STATUS <<_ACEOF
cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
s/^/s,@/; s/!/@,|#_!!_#|/
:n
t n
s/'"$ac_delim"'$/,g/; t
s/$/\\/; p
N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
:end
s/|#_!!_#|//g
CEOF$ac_eof
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir), # VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
# trailing colons and then remove the whole line if VPATH becomes empty # trailing colons and then remove the whole line if VPATH becomes empty
@@ -54447,7 +54285,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack $ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&

2
configure.in
View File

@@ -7293,7 +7293,7 @@ if test "x$INTELCXX" = "xyes" ; then
CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419" CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
elif test "$GXX" = yes ; then elif test "$GXX" = yes ; then
dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy" CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
fi fi

2
include/wx/gtk/animate.h
View File

@@ -44,7 +44,7 @@ public:
// we can retrieve the delay for a frame only after building // we can retrieve the delay for a frame only after building
// a GdkPixbufAnimationIter... // a GdkPixbufAnimationIter...
virtual int GetDelay(unsigned int frame) const { return 0; } virtual int GetDelay(unsigned int WXUNUSED(frame)) const { return 0; }
virtual wxSize GetSize() const; virtual wxSize GetSize() const;

12
include/wx/gtk/dcscreen.h
View File

@@ -33,21 +33,21 @@ public:
~wxGTKScreenImplDC(); ~wxGTKScreenImplDC();
static bool StartDrawingOnTop( wxWindow *window ) { return true; } static bool StartDrawingOnTop(wxWindow * WXUNUSED(window))
static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL ) { return true; } { return true; }
static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) = NULL)
{ return true; }
static bool EndDrawingOnTop() { return true; } static bool EndDrawingOnTop() { return true; }
protected: protected:
virtual void DoGetSize(int *width, int *height) const; virtual void DoGetSize(int *width, int *height) const;
void Init(); void Init();
private: private:
DECLARE_ABSTRACT_CLASS(wxGTKScreenImplDC) DECLARE_ABSTRACT_CLASS(wxGTKScreenImplDC)
}; };
#endif #endif // __GTKDCSCREENH__
// __GTKDCSCREENH__

3
include/wx/gtk/filepicker.h
View File

@@ -49,7 +49,8 @@
/* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \ /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \
/* give us access to the internal GdkWindow of a GtkFileChooserButton */ \ /* give us access to the internal GdkWindow of a GtkFileChooserButton */ \
protected: \ protected: \
virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const \ virtual GdkWindow * \
GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const \
{ return NULL; } { return NULL; }

2
src/common/wincmn.cpp
View File

@@ -2667,7 +2667,7 @@ bool wxWindowBase::TryParent(wxEvent& event)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Navigates in the specified direction inside this window // Navigates in the specified direction inside this window
bool wxWindowBase::DoNavigateIn(int flags) bool wxWindowBase::DoNavigateIn(int WXUNUSED(flags))
{ {
#ifdef wxHAS_NATIVE_TAB_TRAVERSAL #ifdef wxHAS_NATIVE_TAB_TRAVERSAL
// native code doesn't process our wxNavigationKeyEvents anyhow // native code doesn't process our wxNavigationKeyEvents anyhow

2
src/generic/dcpsg.cpp
View File

@@ -252,7 +252,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC)
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
void wxPostScriptDC::SetResolution(int ppi) void wxPostScriptDC::SetResolution(int WXUNUSED(ppi))
{ {
} }

10
src/gtk/animate.cpp
View File

@@ -30,10 +30,10 @@
// ============================================================================ // ============================================================================
void gdk_pixbuf_area_updated(GdkPixbufLoader *loader, void gdk_pixbuf_area_updated(GdkPixbufLoader *loader,
gint x, gint WXUNUSED(x),
gint y, gint WXUNUSED(y),
gint width, gint WXUNUSED(width),
gint height, gint WXUNUSED(height),
wxAnimation *anim) wxAnimation *anim)
{ {
if (anim && anim->GetPixbuf() == NULL) if (anim && anim->GetPixbuf() == NULL)
@@ -420,7 +420,7 @@ bool wxAnimationCtrl::SetBackgroundColour( const wxColour &colour )
// wxAnimationCtrl - event handlers // wxAnimationCtrl - event handlers
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void wxAnimationCtrl::OnTimer(wxTimerEvent &ev) void wxAnimationCtrl::OnTimer(wxTimerEvent& WXUNUSED(ev))
{ {
wxASSERT(m_iter != NULL); wxASSERT(m_iter != NULL);

2
src/gtk/checklst.cpp
View File

@@ -24,7 +24,7 @@
// "toggled" // "toggled"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern "C" { extern "C" {
static void gtk_checklist_toggled(GtkCellRendererToggle *renderer, static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer),
gchar *stringpath, gchar *stringpath,
wxCheckListBox *listbox) wxCheckListBox *listbox)
{ {

7
src/gtk/collpane.cpp
View File

@@ -39,9 +39,10 @@
extern "C" { extern "C" {
static void gtk_collapsiblepane_expanded_callback (GObject *object, static void
GParamSpec *param_spec, gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object),
wxCollapsiblePane *p) GParamSpec * WXUNUSED(param_spec),
wxCollapsiblePane *p)
{ {
// NB: unlike for the "activate" signal, when this callback is called, if // NB: unlike for the "activate" signal, when this callback is called, if
// we try to query the "collapsed" status through p->IsCollapsed(), we // we try to query the "collapsed" status through p->IsCollapsed(), we

4
src/gtk/dataobj.cpp
View File

@@ -205,7 +205,9 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir)
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__WXGTK20__) && wxUSE_UNICODE #if defined(__WXGTK20__) && wxUSE_UNICODE
void wxTextDataObject::GetAllFormats(wxDataFormat *formats, wxDataObjectBase::Direction dir) const void
wxTextDataObject::GetAllFormats(wxDataFormat *formats,
wxDataObjectBase::Direction WXUNUSED(dir)) const
{ {
*formats++ = GetPreferredFormat(); *formats++ = GetPreferredFormat();
*formats = g_altTextAtom; *formats = g_altTextAtom;

14
src/gtk/dcclient.cpp
View File

@@ -91,11 +91,7 @@ void gdk_wx_draw_bitmap(GdkDrawable *drawable,
GdkGC *gc, GdkGC *gc,
GdkDrawable *src, GdkDrawable *src,
gint xsrc, gint xsrc,
gint ysrc, gint ysrc)
gint xdest,
gint ydest,
gint width,
gint height)
{ {
wxCHECK_RET( drawable, _T("NULL drawable in gdk_wx_draw_bitmap") ); wxCHECK_RET( drawable, _T("NULL drawable in gdk_wx_draw_bitmap") );
wxCHECK_RET( src, _T("NULL src in gdk_wx_draw_bitmap") ); wxCHECK_RET( src, _T("NULL src in gdk_wx_draw_bitmap") );
@@ -103,15 +99,13 @@ void gdk_wx_draw_bitmap(GdkDrawable *drawable,
gint src_width, src_height; gint src_width, src_height;
gdk_drawable_get_size(src, &src_width, &src_height); gdk_drawable_get_size(src, &src_width, &src_height);
if (width == -1) width = src_width;
if (height == -1) height = src_height;
XCopyPlane( GDK_WINDOW_XDISPLAY(drawable), XCopyPlane( GDK_WINDOW_XDISPLAY(drawable),
GDK_WINDOW_XID(src), GDK_WINDOW_XID(src),
GDK_WINDOW_XID(drawable), GDK_WINDOW_XID(drawable),
GDK_GC_XGC(gc), GDK_GC_XGC(gc),
xsrc, ysrc, xsrc, ysrc,
width, height, src_width, src_height,
0, 0, 0, 0,
1 ); 1 );
} }
@@ -1196,7 +1190,7 @@ void wxGTKWindowImplDC::DoDrawBitmap( const wxBitmap &bitmap,
GdkGC *gc = gdk_gc_new( bitmap2 ); GdkGC *gc = gdk_gc_new( bitmap2 );
gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() ); gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() ); gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
gdk_wx_draw_bitmap( bitmap2, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 ); gdk_wx_draw_bitmap(bitmap2, gc, use_bitmap.GetPixmap(), 0, 0);
gdk_draw_drawable(m_window, use_gc, bitmap2, 0, 0, xx, yy, -1, -1); gdk_draw_drawable(m_window, use_gc, bitmap2, 0, 0, xx, yy, -1, -1);
@@ -1418,7 +1412,7 @@ bool wxGTKWindowImplDC::DoBlit( wxCoord xdest, wxCoord ydest,
GdkGC *gc = gdk_gc_new( bitmap ); GdkGC *gc = gdk_gc_new( bitmap );
gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() ); gdk_gc_set_foreground( gc, m_textForegroundColour.GetColor() );
gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() ); gdk_gc_set_background( gc, m_textBackgroundColour.GetColor() );
gdk_wx_draw_bitmap( bitmap, gc, use_bitmap.GetPixmap(), 0, 0, 0, 0, -1, -1 ); gdk_wx_draw_bitmap(bitmap, gc, use_bitmap.GetPixmap(), 0, 0);
gdk_draw_drawable(m_window, use_gc, bitmap, xsrc, ysrc, cx, cy, cw, ch); gdk_draw_drawable(m_window, use_gc, bitmap, xsrc, ysrc, cx, cy, cw, ch);

7
src/gtk/filedlg.cpp
View File

@@ -63,13 +63,13 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
{ {
if ( !g_file_test(filename, G_FILE_TEST_EXISTS) ) if ( !g_file_test(filename, G_FILE_TEST_EXISTS) )
{ {
wxMessageDialog dlg( dialog, _("Please choose an existing file."), wxMessageDialog dlg( dialog, _("Please choose an existing file."),
_("Error"), wxOK| wxICON_ERROR); _("Error"), wxOK| wxICON_ERROR);
dlg.ShowModal(); dlg.ShowModal();
return; return;
} }
} }
// change to the directory where the user went if asked // change to the directory where the user went if asked
if (style & wxFD_CHANGE_DIR) if (style & wxFD_CHANGE_DIR)
{ {
@@ -91,7 +91,8 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog)
extern "C" extern "C"
{ {
static void gtk_filedialog_cancel_callback(GtkWidget *w, wxFileDialog *dialog) static void
gtk_filedialog_cancel_callback(GtkWidget * WXUNUSED(w), wxFileDialog *dialog)
{ {
wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL); wxCommandEvent event(wxEVT_COMMAND_BUTTON_CLICKED, wxID_CANCEL);
event.SetEventObject(dialog); event.SetEventObject(dialog);

97
src/gtk/gnome/gprint.cpp
View File

@@ -153,7 +153,7 @@ public:
(GnomePrintConfig *config, const guchar *key, gboolean value), (config, key, value), false ) (GnomePrintConfig *config, const guchar *key, gboolean value), (config, key, value), false )
wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_length, wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_length,
(GnomePrintConfig *config, const guchar *key, gdouble value, const GnomePrintUnit *unit), (config, key, value, unit), false ) (GnomePrintConfig *config, const guchar *key, gdouble value, const GnomePrintUnit *unit), (config, key, value, unit), false )
wxDL_METHOD_DEFINE( guchar*, gnome_print_config_get, wxDL_METHOD_DEFINE( guchar*, gnome_print_config_get,
(GnomePrintConfig *config, const guchar *key), (config, key), NULL ) (GnomePrintConfig *config, const guchar *key), (config, key), NULL )
wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_length, wxDL_METHOD_DEFINE( gboolean, gnome_print_config_get_length,
@@ -264,7 +264,7 @@ bool wxGnomePrintLibrary::InitializeMethods()
wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_double ); wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_double );
wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_int ); wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_int );
wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_length ); wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_set_length );
wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get ); wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get );
wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_length ); wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_length );
wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_boolean ); wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_boolean );
@@ -333,7 +333,7 @@ bool wxGnomePrintNativeData::TransferTo( wxPrintData &data )
} }
// gnome_print_v // gnome_print_v
return true; return true;
} }
@@ -404,7 +404,7 @@ bool wxGnomePrintNativeData::TransferFrom( const wxPrintData &data )
(guchar*)(char*)"C6" ); (guchar*)(char*)"C6" );
break; break;
case wxPAPER_NONE: break; case wxPAPER_NONE: break;
default: default:
case wxPAPER_A4: gs_libGnomePrint->gnome_print_config_set( m_config, case wxPAPER_A4: gs_libGnomePrint->gnome_print_config_set( m_config,
(guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE, (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE,
@@ -468,7 +468,9 @@ bool wxGnomePrintFactory::HasPrintSetupDialog()
return false; return false;
} }
wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) wxDialog *
wxGnomePrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent),
wxPrintData * WXUNUSED(data))
{ {
return NULL; return NULL;
} }
@@ -544,7 +546,7 @@ wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintData *data )
void wxGnomePrintDialog::Init() void wxGnomePrintDialog::Init()
{ {
wxPrintData data = m_printDialogData.GetPrintData(); wxPrintData data = m_printDialogData.GetPrintData();
data.ConvertToNative(); data.ConvertToNative();
wxGnomePrintNativeData *native = wxGnomePrintNativeData *native =
@@ -648,8 +650,8 @@ bool wxGnomePrintDialog::TransferDataFromWindow()
IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase) IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase)
wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent, wxGnomePageSetupDialog::wxGnomePageSetupDialog(wxWindow * WXUNUSED(parent),
wxPageSetupDialogData* data ) wxPageSetupDialogData *data)
{ {
if (data) if (data)
m_pageDialogData = *data; m_pageDialogData = *data;
@@ -675,7 +677,7 @@ wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent,
double mt = (double) m_pageDialogData.GetMarginTopLeft().y; double mt = (double) m_pageDialogData.GetMarginTopLeft().y;
double mr = (double) m_pageDialogData.GetMarginBottomRight().x; double mr = (double) m_pageDialogData.GetMarginBottomRight().x;
double mb = (double) m_pageDialogData.GetMarginBottomRight().y; double mb = (double) m_pageDialogData.GetMarginBottomRight().y;
gs_libGnomePrint->gnome_print_config_set_length (config, gs_libGnomePrint->gnome_print_config_set_length (config,
(const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit ); (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit );
gs_libGnomePrint->gnome_print_config_set_length (config, gs_libGnomePrint->gnome_print_config_set_length (config,
@@ -720,7 +722,7 @@ int wxGnomePageSetupDialog::ShowModal()
{ {
wxGnomePrintNativeData *native = wxGnomePrintNativeData *native =
(wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData(); (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData();
GnomePrintConfig *config = native->GetPrintConfig(); GnomePrintConfig *config = native->GetPrintConfig();
@@ -815,7 +817,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
} }
wxPrintData printdata = GetPrintDialogData().GetPrintData(); wxPrintData printdata = GetPrintDialogData().GetPrintData();
wxGnomePrintNativeData *native = wxGnomePrintNativeData *native =
(wxGnomePrintNativeData*) printdata.GetNativeData(); (wxGnomePrintNativeData*) printdata.GetNativeData();
@@ -959,7 +961,7 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent )
return new wxGnomePrintDC( m_printDialogData.GetPrintData() ); return new wxGnomePrintDC( m_printDialogData.GetPrintData() );
} }
bool wxGnomePrinter::Setup( wxWindow *parent ) bool wxGnomePrinter::Setup(wxWindow * WXUNUSED(parent))
{ {
return false; return false;
} }
@@ -1017,12 +1019,19 @@ bool wxGnomePrintDC::IsOk() const
return true; return true;
} }
bool wxGnomePrintDC::DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, int style ) bool
wxGnomePrintDC::DoFloodFill(wxCoord WXUNUSED(x1),
wxCoord WXUNUSED(y1),
const wxColour& WXUNUSED(col),
int WXUNUSED(style))
{ {
return false; return false;
} }
bool wxGnomePrintDC::DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const bool
wxGnomePrintDC::DoGetPixel(wxCoord WXUNUSED(x1),
wxCoord WXUNUSED(y1),
wxColour * WXUNUSED(col)) const
{ {
return false; return false;
} }
@@ -1041,7 +1050,7 @@ void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
CalcBoundingBox( x2, y2 ); CalcBoundingBox( x2, y2 );
} }
void wxGnomePrintDC::DoCrossHair(wxCoord x, wxCoord y) void wxGnomePrintDC::DoCrossHair(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
{ {
} }
@@ -1146,7 +1155,7 @@ void wxGnomePrintDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d
CalcBoundingBox( x+w, y+h ); CalcBoundingBox( x+w, y+h );
} }
void wxGnomePrintDC::DoDrawPoint(wxCoord x, wxCoord y) void wxGnomePrintDC::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
{ {
} }
@@ -1170,7 +1179,9 @@ void wxGnomePrintDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoo
gs_libGnomePrint->gnome_print_stroke ( m_gpc); gs_libGnomePrint->gnome_print_stroke ( m_gpc);
} }
void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) void wxGnomePrintDC::DoDrawPolygon(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset,
int WXUNUSED(fillStyle))
{ {
if (n==0) return; if (n==0) return;
@@ -1461,9 +1472,14 @@ void wxGnomePrintDC::DoDrawSpline(const wxPointList *points)
} }
#endif // wxUSE_SPLINES #endif // wxUSE_SPLINES
bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool
wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask, wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest,
wxCoord xsrcMask, wxCoord ysrcMask) wxCoord width, wxCoord height,
wxDC *source,
wxCoord xsrc, wxCoord ysrc,
int rop,
bool WXUNUSED(useMask),
wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
{ {
wxCHECK_MSG( source, false, wxT("invalid source dc") ); wxCHECK_MSG( source, false, wxT("invalid source dc") );
@@ -1485,7 +1501,10 @@ void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y )
DoDrawBitmap( icon, x, y, true ); DoDrawBitmap( icon, x, y, true );
} }
void wxGnomePrintDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask ) void
wxGnomePrintDC::DoDrawBitmap(const wxBitmap& bitmap,
wxCoord x, wxCoord y,
bool WXUNUSED(useMask))
{ {
if (!bitmap.Ok()) return; if (!bitmap.Ok()) return;
@@ -1601,18 +1620,18 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord
// Draw layout. // Draw layout.
gs_libGnomePrint->gnome_print_moveto (m_gpc, xx, yy); gs_libGnomePrint->gnome_print_moveto (m_gpc, xx, yy);
gs_libGnomePrint->gnome_print_gsave( m_gpc ); gs_libGnomePrint->gnome_print_gsave( m_gpc );
gs_libGnomePrint->gnome_print_scale( m_gpc, m_scaleX * DEV2PS, m_scaleY * DEV2PS ); gs_libGnomePrint->gnome_print_scale( m_gpc, m_scaleX * DEV2PS, m_scaleY * DEV2PS );
if (fabs(angle) > 0.00001) if (fabs(angle) > 0.00001)
gs_libGnomePrint->gnome_print_rotate( m_gpc, angle ); gs_libGnomePrint->gnome_print_rotate( m_gpc, angle );
gs_libGnomePrint->gnome_print_pango_layout( m_gpc, m_layout ); gs_libGnomePrint->gnome_print_pango_layout( m_gpc, m_layout );
gs_libGnomePrint->gnome_print_grestore( m_gpc ); gs_libGnomePrint->gnome_print_grestore( m_gpc );
if (underlined) if (underlined)
{ {
// undo underline attributes setting: // undo underline attributes setting:
@@ -1648,7 +1667,7 @@ void wxGnomePrintDC::SetPen( const wxPen& pen )
m_pen = pen; m_pen = pen;
double width; double width;
if (m_pen.GetWidth() <= 0) if (m_pen.GetWidth() <= 0)
width = 0.1; width = 0.1;
else else
@@ -1746,20 +1765,20 @@ void wxGnomePrintDC::SetBrush( const wxBrush& brush )
} }
} }
void wxGnomePrintDC::SetLogicalFunction( int function ) void wxGnomePrintDC::SetLogicalFunction(int WXUNUSED(function))
{ {
} }
void wxGnomePrintDC::SetBackground( const wxBrush& brush ) void wxGnomePrintDC::SetBackground(const wxBrush& WXUNUSED(brush))
{ {
} }
void wxGnomePrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxGnomePrintDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{ {
wxDC::DoSetClippingRegion( x, y, width, height ); wxDC::DoSetClippingRegion( x, y, width, height );
gs_libGnomePrint->gnome_print_gsave( m_gpc ); gs_libGnomePrint->gnome_print_gsave( m_gpc );
gs_libGnomePrint->gnome_print_newpath( m_gpc ); gs_libGnomePrint->gnome_print_newpath( m_gpc );
gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) );
gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) ); gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) );
@@ -1774,7 +1793,7 @@ void wxGnomePrintDC::DestroyClippingRegion()
wxDC::DestroyClippingRegion(); wxDC::DestroyClippingRegion();
gs_libGnomePrint->gnome_print_grestore( m_gpc ); gs_libGnomePrint->gnome_print_grestore( m_gpc );
#if 0 #if 0
// not needed, we set the values in each // not needed, we set the values in each
// drawing method anyways // drawing method anyways
@@ -1784,7 +1803,7 @@ void wxGnomePrintDC::DestroyClippingRegion()
#endif #endif
} }
bool wxGnomePrintDC::StartDoc(const wxString& message) bool wxGnomePrintDC::StartDoc(const wxString& WXUNUSED(message))
{ {
return true; return true;
} }
@@ -1899,7 +1918,7 @@ void wxGnomePrintDC::DoGetSize(int* width, int* height) const
if (width) if (width)
*width = wxRound( pw * PS2DEV ); *width = wxRound( pw * PS2DEV );
if (height) if (height)
*height = wxRound( ph * PS2DEV ); *height = wxRound( ph * PS2DEV );
} }
@@ -1933,9 +1952,9 @@ wxSize wxGnomePrintDC::GetPPI() const
} }
void wxGnomePrintDC::SetPrintData(const wxPrintData& data) void wxGnomePrintDC::SetPrintData(const wxPrintData& data)
{ {
m_printData = data; m_printData = data;
int height; int height;
if (m_printData.GetOrientation() == wxPORTRAIT) if (m_printData.GetOrientation() == wxPORTRAIT)
GetSize( NULL, &height ); GetSize( NULL, &height );
@@ -1944,7 +1963,7 @@ void wxGnomePrintDC::SetPrintData(const wxPrintData& data)
m_deviceLocalOriginY = height; m_deviceLocalOriginY = height;
} }
void wxGnomePrintDC::SetResolution(int ppi) void wxGnomePrintDC::SetResolution(int WXUNUSED(ppi))
{ {
} }
@@ -2064,5 +2083,5 @@ void wxGnomePrintPreview::DetermineScaling()
} }
} }
#endif #endif
// wxUSE_LIBGNOMEPRINT // wxUSE_LIBGNOMEPRINT

2
src/gtk/gsockgtk.cpp
View File

@@ -25,7 +25,7 @@
extern "C" { extern "C" {
static static
void _GSocket_GDK_Input(gpointer data, void _GSocket_GDK_Input(gpointer data,
gint source, gint WXUNUSED(source),
GdkInputCondition condition) GdkInputCondition condition)
{ {
GSocket *socket = (GSocket *)data; GSocket *socket = (GSocket *)data;

17
src/gtk/listbox.cpp
View File

@@ -62,9 +62,9 @@ extern bool g_blockEventsOnScroll;
extern "C" { extern "C" {
static void static void
gtk_listbox_row_activated_callback(GtkTreeView *treeview, gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview),
GtkTreePath *path, GtkTreePath *path,
GtkTreeViewColumn *col, GtkTreeViewColumn * WXUNUSED(col),
wxListBox *listbox) wxListBox *listbox)
{ {
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
@@ -114,7 +114,8 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview,
extern "C" { extern "C" {
static void static void
gtk_listitem_changed_callback( GtkTreeSelection* selection, wxListBox *listbox ) gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection),
wxListBox *listbox )
{ {
if (g_blockEventsOnDrag) return; if (g_blockEventsOnDrag) return;
@@ -208,7 +209,7 @@ static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry,
#include <iostream> #include <iostream>
extern "C" { extern "C" {
static gint gtk_listbox_sort_callback(GtkTreeModel *model, static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model),
GtkTreeIter *a, GtkTreeIter *a,
GtkTreeIter *b, GtkTreeIter *b,
wxListBox *listbox) wxListBox *listbox)
@@ -244,8 +245,8 @@ static gint gtk_listbox_sort_callback(GtkTreeModel *model,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern "C" { extern "C" {
static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model, static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model),
gint column, gint WXUNUSED(column),
const gchar* key, const gchar* key,
GtkTreeIter* iter, GtkTreeIter* iter,
wxListBox* listbox) wxListBox* listbox)
@@ -447,7 +448,7 @@ wxListBox::~wxListBox()
int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items,
unsigned int pos, unsigned int pos,
void **clientData, void **clientData,
wxClientDataType type) wxClientDataType WXUNUSED(type))
{ {
wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") ); wxCHECK_MSG( m_treeview != NULL, wxNOT_FOUND, wxT("invalid listbox") );
@@ -768,7 +769,7 @@ void wxListBox::GtkSetSelection(int n, const bool select, const bool blockEvent)
gtk_tree_selection_select_iter(selection, &iter); gtk_tree_selection_select_iter(selection, &iter);
else else
gtk_tree_selection_unselect_iter(selection, &iter); gtk_tree_selection_unselect_iter(selection, &iter);
GtkTreePath* path = gtk_tree_model_get_path( GtkTreePath* path = gtk_tree_model_get_path(
GTK_TREE_MODEL(m_liststore), &iter); GTK_TREE_MODEL(m_liststore), &iter);

22
src/gtk/menu.cpp
View File

@@ -143,14 +143,16 @@ static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
extern "C" { extern "C" {
static void gtk_menu_open_callback( GtkWidget *widget, wxMenu *menu ) static void
gtk_menu_open_callback(GtkWidget * WXUNUSED(widget), wxMenu *menu)
{ {
wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu); wxMenuEvent event(wxEVT_MENU_OPEN, -1, menu);
DoCommonMenuCallbackCode(menu, event); DoCommonMenuCallbackCode(menu, event);
} }
static void gtk_menu_close_callback( GtkWidget *widget, wxMenuBar *menubar ) static void
gtk_menu_close_callback(GtkWidget * WXUNUSED(widget), wxMenuBar *menubar)
{ {
if ( !menubar->GetMenuCount() ) if ( !menubar->GetMenuCount() )
{ {
@@ -451,11 +453,11 @@ wxMenu *wxMenuBar::Remove(size_t pos)
if( frame ) if( frame )
frame->UpdateMenuBarSize(); frame->UpdateMenuBarSize();
wxMenubarUnsetInvokingWindow( menu, m_invokingWindow ); wxMenubarUnsetInvokingWindow( menu, m_invokingWindow );
} }
return menu; return menu;
} }
@@ -1068,12 +1070,12 @@ wxMenu::~wxMenu()
if ( m_owner ) if ( m_owner )
gtk_widget_destroy( m_menu ); gtk_widget_destroy( m_menu );
} }
// This must come after we release GTK resources above. Otherwise, GTK will // This must come after we release GTK resources above. Otherwise, GTK will
// give warnings/errors when attempting to free accelerator resources from // give warnings/errors when attempting to free accelerator resources from
// child items that just were destroyed (the m_menu widget can contain // child items that just were destroyed (the m_menu widget can contain
// references to accelerators in child items. Problem detected when removing // references to accelerators in child items. Problem detected when removing
// a menu from a wxMenuBar, and the removed menu had submenus with accelerators.) // a menu from a wxMenuBar, and the removed menu had submenus with accelerators.)
WX_CLEAR_LIST(wxMenuItemList, m_items); WX_CLEAR_LIST(wxMenuItemList, m_items);
} }

4
src/gtk/minifram.cpp
View File

@@ -239,7 +239,9 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto
extern "C" { extern "C" {
static gboolean static gboolean
gtk_window_leave_callback( GtkWidget *widget, GdkEventCrossing *gdk_event, wxMiniFrame *win ) gtk_window_leave_callback(GtkWidget *widget,
GdkEventCrossing * WXUNUSED(gdk_event),
wxMiniFrame *win)
{ {
if (!win->m_hasVMT) return FALSE; if (!win->m_hasVMT) return FALSE;
if (g_blockEventsOnDrag) return FALSE; if (g_blockEventsOnDrag) return FALSE;

4
src/gtk/notebook.cpp
View File

@@ -101,9 +101,9 @@ static void gtk_notebook_page_changing_callback( GtkNotebook *widget,
} }
extern "C" { extern "C" {
static void gtk_notebook_page_changed_callback( GtkNotebook *widget, static void gtk_notebook_page_changed_callback( GtkNotebook * WXUNUSED(widget),
GtkNotebookPage *WXUNUSED(gpage), GtkNotebookPage *WXUNUSED(gpage),
guint page, guint WXUNUSED(page),
wxNotebook *notebook ) wxNotebook *notebook )
{ {
int old = notebook->m_oldSelection; int old = notebook->m_oldSelection;

4
src/gtk/radiobox.cpp
View File

@@ -138,7 +138,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_
} }
extern "C" { extern "C" {
static gint gtk_radiobutton_focus_in( GtkWidget *widget, static gint gtk_radiobutton_focus_in( GtkWidget * WXUNUSED(widget),
GdkEvent *WXUNUSED(event), GdkEvent *WXUNUSED(event),
wxRadioBox *win ) wxRadioBox *win )
{ {
@@ -164,7 +164,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget,
} }
extern "C" { extern "C" {
static gint gtk_radiobutton_focus_out( GtkWidget *widget, static gint gtk_radiobutton_focus_out( GtkWidget * WXUNUSED(widget),
GdkEvent *WXUNUSED(event), GdkEvent *WXUNUSED(event),
wxRadioBox *win ) wxRadioBox *win )
{ {

8
src/gtk/renderer.cpp
View File

@@ -378,21 +378,17 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win,
if ( isVert ) if ( isVert )
{ {
int h = win->GetClientSize().GetHeight();
rect.x = position; rect.x = position;
rect.y = 0; rect.y = 0;
rect.width = full_size; rect.width = full_size;
rect.height = h; rect.height = size.y;
} }
else // horz else // horz
{ {
int w = win->GetClientSize().GetWidth();
rect.x = 0; rect.x = 0;
rect.y = position; rect.y = position;
rect.height = full_size; rect.height = full_size;
rect.width = w; rect.width = size.x;
} }
int x_diff = 0; int x_diff = 0;

2
src/gtk/statbox.cpp
View File

@@ -36,7 +36,7 @@ extern "C" {
static void static void
gtk_frame_size_allocate (GtkWidget *widget, gtk_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation, GtkAllocation *allocation,
wxStaticBox *p) wxStaticBox * WXUNUSED(box))
{ {
GtkFrame *frame = GTK_FRAME (widget); GtkFrame *frame = GTK_FRAME (widget);

2
src/gtk/tbargtk.cpp
View File

@@ -448,7 +448,7 @@ bool wxToolBar::Create( wxWindow *parent,
return true; return true;
} }
GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& windows) const GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const
{ {
return GTK_WIDGET(m_toolbar)->window; return GTK_WIDGET(m_toolbar)->window;
} }

30
src/gtk/textctrl.cpp
View File

@@ -38,8 +38,8 @@
extern "C" { extern "C" {
static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, static void wxGtkOnRemoveTag(GtkTextBuffer *buffer,
GtkTextTag *tag, GtkTextTag *tag,
GtkTextIter *start, GtkTextIter * WXUNUSED(start),
GtkTextIter *end, GtkTextIter * WXUNUSED(end),
char *prefix) char *prefix)
{ {
gchar *name; gchar *name;
@@ -305,9 +305,9 @@ extern "C" {
static void static void
au_apply_tag_callback(GtkTextBuffer *buffer, au_apply_tag_callback(GtkTextBuffer *buffer,
GtkTextTag *tag, GtkTextTag *tag,
GtkTextIter *start, GtkTextIter * WXUNUSED(start),
GtkTextIter *end, GtkTextIter * WXUNUSED(end),
gpointer textctrl) gpointer WXUNUSED(textctrl))
{ {
if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl")) if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl"))
g_signal_stop_emission_by_name (buffer, "apply_tag"); g_signal_stop_emission_by_name (buffer, "apply_tag");
@@ -320,7 +320,7 @@ au_apply_tag_callback(GtkTextBuffer *buffer,
extern "C" { extern "C" {
static gboolean static gboolean
pred_whitespace (gunichar ch, gpointer user_data) pred_whitespace(gunichar ch, gpointer WXUNUSED(user_data))
{ {
return g_unichar_isspace(ch); return g_unichar_isspace(ch);
} }
@@ -328,7 +328,7 @@ pred_whitespace (gunichar ch, gpointer user_data)
extern "C" { extern "C" {
static gboolean static gboolean
pred_non_whitespace (gunichar ch, gpointer user_data) pred_non_whitespace (gunichar ch, gpointer WXUNUSED(user_data))
{ {
return !g_unichar_isspace(ch); return !g_unichar_isspace(ch);
} }
@@ -336,7 +336,7 @@ pred_non_whitespace (gunichar ch, gpointer user_data)
extern "C" { extern "C" {
static gboolean static gboolean
pred_nonpunct (gunichar ch, gpointer user_data) pred_nonpunct (gunichar ch, gpointer WXUNUSED(user_data))
{ {
return !g_unichar_ispunct(ch); return !g_unichar_ispunct(ch);
} }
@@ -344,7 +344,7 @@ pred_nonpunct (gunichar ch, gpointer user_data)
extern "C" { extern "C" {
static gboolean static gboolean
pred_nonpunct_or_slash (gunichar ch, gpointer user_data) pred_nonpunct_or_slash (gunichar ch, gpointer WXUNUSED(user_data))
{ {
return !g_unichar_ispunct(ch) || ch == '/'; return !g_unichar_ispunct(ch) || ch == '/';
} }
@@ -453,7 +453,7 @@ au_check_range(GtkTextIter *s,
extern "C" { extern "C" {
static void static void
au_insert_text_callback(GtkTextBuffer *buffer, au_insert_text_callback(GtkTextBuffer * WXUNUSED(buffer),
GtkTextIter *end, GtkTextIter *end,
gchar *text, gchar *text,
gint len, gint len,
@@ -485,7 +485,7 @@ au_insert_text_callback(GtkTextBuffer *buffer,
extern "C" { extern "C" {
static void static void
au_delete_range_callback(GtkTextBuffer *buffer, au_delete_range_callback(GtkTextBuffer * WXUNUSED(buffer),
GtkTextIter *start, GtkTextIter *start,
GtkTextIter *end, GtkTextIter *end,
wxTextCtrl *win) wxTextCtrl *win)
@@ -511,7 +511,7 @@ au_delete_range_callback(GtkTextBuffer *buffer,
extern "C" { extern "C" {
static void static void
gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) gtk_text_changed_callback( GtkWidget * WXUNUSED(widget), wxTextCtrl *win )
{ {
if ( win->IgnoreTextUpdate() ) if ( win->IgnoreTextUpdate() )
return; return;
@@ -573,7 +573,9 @@ gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win )
extern "C" { extern "C" {
static gboolean static gboolean
gtk_text_exposed_callback( GtkWidget *widget, GdkEventExpose *event, wxTextCtrl *win ) gtk_text_exposed_callback( GtkWidget * WXUNUSED(widget),
GdkEventExpose * WXUNUSED(event),
wxTextCtrl * WXUNUSED(win) )
{ {
return TRUE; return TRUE;
} }
@@ -1234,7 +1236,7 @@ bool wxTextCtrl::Enable( bool enable )
// wxGTK-specific: called recursively by Enable, // wxGTK-specific: called recursively by Enable,
// to give widgets an opportunity to correct their colours after they // to give widgets an opportunity to correct their colours after they
// have been changed by Enable // have been changed by Enable
void wxTextCtrl::OnEnabled( bool enable ) void wxTextCtrl::OnEnabled(bool WXUNUSED(enable))
{ {
// If we have a custom background colour, we use this colour in both // If we have a custom background colour, we use this colour in both
// disabled and enabled mode, or we end up with a different colour under the // disabled and enabled mode, or we end up with a different colour under the

6
src/gtk/textentry.cpp
View File

@@ -42,9 +42,9 @@ extern "C"
// "insert_text" handler for GtkEntry // "insert_text" handler for GtkEntry
static void static void
wx_gtk_insert_text_callback(GtkEditable *editable, wx_gtk_insert_text_callback(GtkEditable *editable,
const gchar *new_text, const gchar * WXUNUSED(new_text),
gint new_text_length, gint WXUNUSED(new_text_length),
gint *position, gint * WXUNUSED(position),
wxTextEntry *text) wxTextEntry *text)
{ {
// we should only be called if we have a max len limit at all // we should only be called if we have a max len limit at all

7
src/gtk/toplevel.cpp
View File

@@ -167,9 +167,10 @@ static gboolean gtk_frame_focus_in_callback( GtkWidget *widget,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
extern "C" { extern "C" {
static gboolean gtk_frame_focus_out_callback( GtkWidget *widget, static
GdkEventFocus *WXUNUSED(gdk_event), gboolean gtk_frame_focus_out_callback(GtkWidget * WXUNUSED(widget),
wxTopLevelWindowGTK *win ) GdkEventFocus *WXUNUSED(gdk_event),
wxTopLevelWindowGTK * WXUNUSED(win))
{ {
// if the focus goes out of our app alltogether, OnIdle() will send // if the focus goes out of our app alltogether, OnIdle() will send
// wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset

4
src/gtk/utilsgtk.cpp
View File

@@ -245,6 +245,10 @@ const gchar *wx_pango_version_check (int major, int minor, int micro)
return "can't check"; return "can't check";
#else // !PANGO_VERSION_MAJOR #else // !PANGO_VERSION_MAJOR
wxUnusedVar(major);
wxUnusedVar(minor);
wxUnusedVar(micro);
return "too old headers"; return "too old headers";
#endif #endif
} }

25
src/gtk/window.cpp
View File

@@ -407,9 +407,9 @@ gtk_window_own_expose_callback( GtkWidget *widget,
// make it extern because wxStaticText needs to disconnect this one // make it extern because wxStaticText needs to disconnect this one
extern "C" { extern "C" {
void wxgtk_window_size_request_callback(GtkWidget *widget, void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget),
GtkRequisition *requisition, GtkRequisition *requisition,
wxWindow *win) wxWindow * win)
{ {
int w, h; int w, h;
win->GetSize( &w, &h ); win->GetSize( &w, &h );
@@ -427,7 +427,7 @@ void wxgtk_window_size_request_callback(GtkWidget *widget,
extern "C" { extern "C" {
static static
void wxgtk_combo_size_request_callback(GtkWidget *widget, void wxgtk_combo_size_request_callback(GtkWidget * WXUNUSED(widget),
GtkRequisition *requisition, GtkRequisition *requisition,
wxComboBox *win) wxComboBox *win)
{ {
@@ -1115,7 +1115,7 @@ gtk_window_key_press_callback( GtkWidget *widget,
extern "C" { extern "C" {
static void static void
gtk_wxwindow_commit_cb (GtkIMContext *context, gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context),
const gchar *str, const gchar *str,
wxWindow *window) wxWindow *window)
{ {
@@ -1193,7 +1193,7 @@ gtk_wxwindow_commit_cb (GtkIMContext *context,
extern "C" { extern "C" {
static gboolean static gboolean
gtk_window_key_release_callback( GtkWidget *widget, gtk_window_key_release_callback( GtkWidget * WXUNUSED(widget),
GdkEventKey *gdk_event, GdkEventKey *gdk_event,
wxWindowGTK *win ) wxWindowGTK *win )
{ {
@@ -1652,7 +1652,7 @@ gtk_window_button_release_callback( GtkWidget *widget,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gboolean static gboolean
gtk_window_motion_notify_callback( GtkWidget *widget, gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget),
GdkEventMotion *gdk_event, GdkEventMotion *gdk_event,
wxWindowGTK *win ) wxWindowGTK *win )
{ {
@@ -1762,7 +1762,7 @@ static gboolean wxgtk_window_popup_menu_callback(GtkWidget*, wxWindowGTK* win)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gboolean static gboolean
gtk_window_focus_in_callback( GtkWidget *widget, gtk_window_focus_in_callback( GtkWidget * WXUNUSED(widget),
GdkEventFocus *WXUNUSED(event), GdkEventFocus *WXUNUSED(event),
wxWindow *win ) wxWindow *win )
{ {
@@ -1812,8 +1812,8 @@ gtk_window_focus_in_callback( GtkWidget *widget,
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
static gboolean static gboolean
gtk_window_focus_out_callback( GtkWidget *widget, gtk_window_focus_out_callback( GtkWidget * WXUNUSED(widget),
GdkEventFocus *gdk_event, GdkEventFocus * WXUNUSED(gdk_event),
wxWindowGTK *win ) wxWindowGTK *win )
{ {
DEBUG_MAIN_THREAD DEBUG_MAIN_THREAD
@@ -1867,7 +1867,7 @@ gtk_window_focus_out_callback( GtkWidget *widget,
static gboolean static gboolean
wx_window_focus_callback(GtkWidget *widget, wx_window_focus_callback(GtkWidget *widget,
GtkDirectionType direction, GtkDirectionType WXUNUSED(direction),
wxWindowGTK *win) wxWindowGTK *win)
{ {
// the default handler for focus signal in GtkPizza (or, rather, in // the default handler for focus signal in GtkPizza (or, rather, in
@@ -2070,7 +2070,7 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win )
static static
void gtk_window_size_callback( GtkWidget *WXUNUSED(widget), void gtk_window_size_callback( GtkWidget *WXUNUSED(widget),
GtkAllocation *alloc, GtkAllocation * WXUNUSED(alloc),
wxWindow *win ) wxWindow *win )
{ {
int client_width = 0; int client_width = 0;
@@ -3610,7 +3610,8 @@ bool wxWindowGTK::ScrollPages(int pages)
return DoScrollByUnits(ScrollDir_Vert, ScrollUnit_Page, pages); return DoScrollByUnits(ScrollDir_Vert, ScrollUnit_Page, pages);
} }
void wxWindowGTK::Refresh( bool eraseBackground, const wxRect *rect ) void wxWindowGTK::Refresh(bool WXUNUSED(eraseBackground),
const wxRect *rect)
{ {
if (!m_widget) if (!m_widget)
return; return;