diff --git a/configure b/configure index c6b885531f..6aa5b0b12e 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /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. # 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_USE_HTML_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_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_STC_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_USE_HTML_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_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_AUI_1 COND_MONOLITHIC_0_USE_GUI_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_MEDIA_1 -COND_MONOLITHIC_0_USE_ODBC_1 COND_MONOLITHIC_0_USE_QA_1 COND_MONOLITHIC_0_USE_RICHTEXT_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_SOVERSION_1 COND_PLATFORM_MACOS_1 -COND_PLATFORM_MAC_1 -COND_PLATFORM_MSDOS_0 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 @@ -888,22 +880,16 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 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_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_STC_1 -COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN -COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 -COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA 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_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN -COND_USE_ODBC_1 -COND_USE_OPENGL_1 COND_USE_PCH_1 COND_USE_PLUGINS_0 COND_USE_RTTI_0 @@ -973,7 +957,6 @@ COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN -COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN DEREZ @@ -49201,7 +49184,7 @@ fi if test "x$INTELCXX" = "xyes" ; then CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419" elif test "$GXX" = yes ; then - CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy" + CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy" fi @@ -51747,21 +51730,11 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1="" 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="#" 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="" 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="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="" @@ -51802,21 +51775,11 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1="" 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="#" 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="" 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="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="" @@ -51847,11 +51810,6 @@ EOF COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="" 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="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then COND_MONOLITHIC_0_USE_HTML_1="" @@ -51862,11 +51820,6 @@ EOF COND_MONOLITHIC_0_USE_MEDIA_1="" 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="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then COND_MONOLITHIC_0_USE_QA_1="" @@ -51977,16 +51930,6 @@ EOF COND_PLATFORM_MACOS_1="" 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="#" if test "x$PLATFORM_MSDOS" = "x1" ; then COND_PLATFORM_MSDOS_1="" @@ -52042,21 +51985,6 @@ EOF COND_SHARED_0="" 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="#" 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="" @@ -52082,21 +52010,11 @@ EOF COND_SHARED_0_USE_STC_1="" 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="#" if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then COND_SHARED_0_WXUSE_EXPAT_BUILTIN="" 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="#" if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then COND_SHARED_0_WXUSE_REGEX_BUILTIN="" @@ -52117,11 +52035,6 @@ EOF COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" 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_="#" if test "x$TOOLKIT" = "x" ; then COND_TOOLKIT_="" @@ -52352,16 +52265,6 @@ EOF COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" 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="#" if test "x$USE_PCH" = "x1" ; then COND_USE_PCH_1="" @@ -52467,11 +52370,6 @@ EOF COND_WXUSE_LIBTIFF_BUILTIN="" fi - COND_WXUSE_ODBC_BUILTIN="#" - if test "x$wxUSE_ODBC" = "xbuiltin" ; then - COND_WXUSE_ODBC_BUILTIN="" - fi - COND_WXUSE_REGEX_BUILTIN="#" if test "x$wxUSE_REGEX" = "xbuiltin" ; then 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_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_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_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_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 @@ -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_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_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_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_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_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_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_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_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_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_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_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_OS2_1!$COND_PLATFORM_OS2_1$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_1!$COND_PLATFORM_WIN32_1$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_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_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_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_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_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$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_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim COND_TOOLKIT_!$COND_TOOLKIT_$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_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 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54009,20 +53907,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do 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_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$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_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_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_PLUGINS_0!$COND_USE_PLUGINS_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_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_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_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim DEREZ!$DEREZ$ac_delim @@ -54106,6 +53987,23 @@ WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim GUIDIST!$GUIDIST$ac_delim DISTDIR!$DISTDIR$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 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 -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 >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof -_ACEOF - - # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # 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&@INSTALL@&$ac_INSTALL&;t t $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" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && diff --git a/configure.in b/configure.in index fb51528d40..30bc78ef17 100644 --- a/configure.in +++ b/configure.in @@ -7293,7 +7293,7 @@ if test "x$INTELCXX" = "xyes" ; then CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419" elif test "$GXX" = yes ; then dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" - CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy" + CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy" fi diff --git a/include/wx/gtk/animate.h b/include/wx/gtk/animate.h index ef51ffe352..1bc82afc18 100644 --- a/include/wx/gtk/animate.h +++ b/include/wx/gtk/animate.h @@ -44,7 +44,7 @@ public: // we can retrieve the delay for a frame only after building // 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; diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h index 79ed9959a9..1e8a9425ac 100644 --- a/include/wx/gtk/dcscreen.h +++ b/include/wx/gtk/dcscreen.h @@ -33,21 +33,21 @@ public: ~wxGTKScreenImplDC(); - static bool StartDrawingOnTop( wxWindow *window ) { return true; } - static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL ) { return true; } + static bool StartDrawingOnTop(wxWindow * WXUNUSED(window)) + { return true; } + static bool StartDrawingOnTop(wxRect * WXUNUSED(rect) = NULL) + { return true; } static bool EndDrawingOnTop() { return true; } protected: virtual void DoGetSize(int *width, int *height) const; - + void Init(); private: DECLARE_ABSTRACT_CLASS(wxGTKScreenImplDC) }; -#endif - - // __GTKDCSCREENH__ +#endif // __GTKDCSCREENH__ diff --git a/include/wx/gtk/filepicker.h b/include/wx/gtk/filepicker.h index bb91c6d554..e1bd484781 100644 --- a/include/wx/gtk/filepicker.h +++ b/include/wx/gtk/filepicker.h @@ -49,7 +49,8 @@ /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \ /* give us access to the internal GdkWindow of a GtkFileChooserButton */ \ protected: \ - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const \ + virtual GdkWindow * \ + GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const \ { return NULL; } diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 200adf03af..57b4fe1959 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -2667,7 +2667,7 @@ bool wxWindowBase::TryParent(wxEvent& event) // ---------------------------------------------------------------------------- // Navigates in the specified direction inside this window -bool wxWindowBase::DoNavigateIn(int flags) +bool wxWindowBase::DoNavigateIn(int WXUNUSED(flags)) { #ifdef wxHAS_NATIVE_TAB_TRAVERSAL // native code doesn't process our wxNavigationKeyEvents anyhow diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index d0b8b3fa36..777796b782 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -252,7 +252,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) //------------------------------------------------------------------------------- -void wxPostScriptDC::SetResolution(int ppi) +void wxPostScriptDC::SetResolution(int WXUNUSED(ppi)) { } diff --git a/src/gtk/animate.cpp b/src/gtk/animate.cpp index 8786f1fde9..f9190b6c05 100644 --- a/src/gtk/animate.cpp +++ b/src/gtk/animate.cpp @@ -30,10 +30,10 @@ // ============================================================================ void gdk_pixbuf_area_updated(GdkPixbufLoader *loader, - gint x, - gint y, - gint width, - gint height, + gint WXUNUSED(x), + gint WXUNUSED(y), + gint WXUNUSED(width), + gint WXUNUSED(height), wxAnimation *anim) { if (anim && anim->GetPixbuf() == NULL) @@ -420,7 +420,7 @@ bool wxAnimationCtrl::SetBackgroundColour( const wxColour &colour ) // wxAnimationCtrl - event handlers //----------------------------------------------------------------------------- -void wxAnimationCtrl::OnTimer(wxTimerEvent &ev) +void wxAnimationCtrl::OnTimer(wxTimerEvent& WXUNUSED(ev)) { wxASSERT(m_iter != NULL); diff --git a/src/gtk/checklst.cpp b/src/gtk/checklst.cpp index 1bfd53c2d9..2c7f866733 100644 --- a/src/gtk/checklst.cpp +++ b/src/gtk/checklst.cpp @@ -24,7 +24,7 @@ // "toggled" //----------------------------------------------------------------------------- extern "C" { -static void gtk_checklist_toggled(GtkCellRendererToggle *renderer, +static void gtk_checklist_toggled(GtkCellRendererToggle * WXUNUSED(renderer), gchar *stringpath, wxCheckListBox *listbox) { diff --git a/src/gtk/collpane.cpp b/src/gtk/collpane.cpp index b5fd6511b5..b6b81b3042 100644 --- a/src/gtk/collpane.cpp +++ b/src/gtk/collpane.cpp @@ -39,9 +39,10 @@ extern "C" { -static void gtk_collapsiblepane_expanded_callback (GObject *object, - GParamSpec *param_spec, - wxCollapsiblePane *p) +static void +gtk_collapsiblepane_expanded_callback(GObject * WXUNUSED(object), + GParamSpec * WXUNUSED(param_spec), + wxCollapsiblePane *p) { // NB: unlike for the "activate" signal, when this callback is called, if // we try to query the "collapsed" status through p->IsCollapsed(), we diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp index f0ed8dcb5a..fa6d1cc5db 100644 --- a/src/gtk/dataobj.cpp +++ b/src/gtk/dataobj.cpp @@ -205,7 +205,9 @@ bool wxDataObject::IsSupportedFormat(const wxDataFormat& format, Direction dir) // ---------------------------------------------------------------------------- #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 = g_altTextAtom; diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp index 2edcb8c804..67f287aa24 100644 --- a/src/gtk/dcclient.cpp +++ b/src/gtk/dcclient.cpp @@ -91,11 +91,7 @@ void gdk_wx_draw_bitmap(GdkDrawable *drawable, GdkGC *gc, GdkDrawable *src, gint xsrc, - gint ysrc, - gint xdest, - gint ydest, - gint width, - gint height) + gint ysrc) { wxCHECK_RET( drawable, _T("NULL drawable 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; 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), GDK_WINDOW_XID(src), GDK_WINDOW_XID(drawable), GDK_GC_XGC(gc), xsrc, ysrc, - width, height, + src_width, src_height, 0, 0, 1 ); } @@ -1196,7 +1190,7 @@ void wxGTKWindowImplDC::DoDrawBitmap( const wxBitmap &bitmap, GdkGC *gc = gdk_gc_new( bitmap2 ); gdk_gc_set_foreground( gc, m_textForegroundColour.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); @@ -1418,7 +1412,7 @@ bool wxGTKWindowImplDC::DoBlit( wxCoord xdest, wxCoord ydest, GdkGC *gc = gdk_gc_new( bitmap ); gdk_gc_set_foreground( gc, m_textForegroundColour.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); diff --git a/src/gtk/filedlg.cpp b/src/gtk/filedlg.cpp index ce722561ac..22ca5c3e6d 100644 --- a/src/gtk/filedlg.cpp +++ b/src/gtk/filedlg.cpp @@ -63,13 +63,13 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) { 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); dlg.ShowModal(); return; } } - + // change to the directory where the user went if asked if (style & wxFD_CHANGE_DIR) { @@ -91,7 +91,8 @@ static void gtk_filedialog_ok_callback(GtkWidget *widget, wxFileDialog *dialog) 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); event.SetEventObject(dialog); diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp index c2d2f3b7b6..ec888f66a0 100644 --- a/src/gtk/gnome/gprint.cpp +++ b/src/gtk/gnome/gprint.cpp @@ -153,7 +153,7 @@ public: (GnomePrintConfig *config, const guchar *key, gboolean value), (config, key, value), false ) wxDL_METHOD_DEFINE( gboolean, gnome_print_config_set_length, (GnomePrintConfig *config, const guchar *key, gdouble value, const GnomePrintUnit *unit), (config, key, value, unit), false ) - + wxDL_METHOD_DEFINE( guchar*, gnome_print_config_get, (GnomePrintConfig *config, const guchar *key), (config, key), NULL ) 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_int ); 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_length ); wxDL_METHOD_LOAD( m_libGnomePrint, gnome_print_config_get_boolean ); @@ -333,7 +333,7 @@ bool wxGnomePrintNativeData::TransferTo( wxPrintData &data ) } // gnome_print_v - + return true; } @@ -404,7 +404,7 @@ bool wxGnomePrintNativeData::TransferFrom( const wxPrintData &data ) (guchar*)(char*)"C6" ); break; case wxPAPER_NONE: break; - + default: case wxPAPER_A4: gs_libGnomePrint->gnome_print_config_set( m_config, (guchar*)(char*)GNOME_PRINT_KEY_PAPER_SIZE, @@ -468,7 +468,9 @@ bool wxGnomePrintFactory::HasPrintSetupDialog() return false; } -wxDialog *wxGnomePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ) +wxDialog * +wxGnomePrintFactory::CreatePrintSetupDialog(wxWindow * WXUNUSED(parent), + wxPrintData * WXUNUSED(data)) { return NULL; } @@ -544,7 +546,7 @@ wxGnomePrintDialog::wxGnomePrintDialog( wxWindow *parent, wxPrintData *data ) void wxGnomePrintDialog::Init() { wxPrintData data = m_printDialogData.GetPrintData(); - + data.ConvertToNative(); wxGnomePrintNativeData *native = @@ -648,8 +650,8 @@ bool wxGnomePrintDialog::TransferDataFromWindow() IMPLEMENT_CLASS(wxGnomePageSetupDialog, wxPageSetupDialogBase) -wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData* data ) +wxGnomePageSetupDialog::wxGnomePageSetupDialog(wxWindow * WXUNUSED(parent), + wxPageSetupDialogData *data) { if (data) m_pageDialogData = *data; @@ -675,7 +677,7 @@ wxGnomePageSetupDialog::wxGnomePageSetupDialog( wxWindow *parent, double mt = (double) m_pageDialogData.GetMarginTopLeft().y; double mr = (double) m_pageDialogData.GetMarginBottomRight().x; double mb = (double) m_pageDialogData.GetMarginBottomRight().y; - + gs_libGnomePrint->gnome_print_config_set_length (config, (const guchar*) GNOME_PRINT_KEY_PAGE_MARGIN_LEFT, ml, mm_unit ); gs_libGnomePrint->gnome_print_config_set_length (config, @@ -720,7 +722,7 @@ int wxGnomePageSetupDialog::ShowModal() { wxGnomePrintNativeData *native = (wxGnomePrintNativeData*) m_pageDialogData.GetPrintData().GetNativeData(); - + GnomePrintConfig *config = native->GetPrintConfig(); @@ -815,7 +817,7 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt ) } wxPrintData printdata = GetPrintDialogData().GetPrintData(); - + wxGnomePrintNativeData *native = (wxGnomePrintNativeData*) printdata.GetNativeData(); @@ -959,7 +961,7 @@ wxDC* wxGnomePrinter::PrintDialog( wxWindow *parent ) return new wxGnomePrintDC( m_printDialogData.GetPrintData() ); } -bool wxGnomePrinter::Setup( wxWindow *parent ) +bool wxGnomePrinter::Setup(wxWindow * WXUNUSED(parent)) { return false; } @@ -1017,12 +1019,19 @@ bool wxGnomePrintDC::IsOk() const 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; } -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; } @@ -1041,7 +1050,7 @@ void wxGnomePrintDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord 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 ); } -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); } -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; @@ -1461,9 +1472,14 @@ void wxGnomePrintDC::DoDrawSpline(const wxPointList *points) } #endif // wxUSE_SPLINES -bool wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask, - wxCoord xsrcMask, wxCoord ysrcMask) +bool +wxGnomePrintDC::DoBlit(wxCoord xdest, wxCoord ydest, + 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") ); @@ -1485,7 +1501,10 @@ void wxGnomePrintDC::DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ) 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; @@ -1601,18 +1620,18 @@ void wxGnomePrintDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord // Draw layout. gs_libGnomePrint->gnome_print_moveto (m_gpc, xx, yy); - + gs_libGnomePrint->gnome_print_gsave( m_gpc ); - + gs_libGnomePrint->gnome_print_scale( m_gpc, m_scaleX * DEV2PS, m_scaleY * DEV2PS ); - + if (fabs(angle) > 0.00001) gs_libGnomePrint->gnome_print_rotate( m_gpc, angle ); - + gs_libGnomePrint->gnome_print_pango_layout( m_gpc, m_layout ); - + gs_libGnomePrint->gnome_print_grestore( m_gpc ); - + if (underlined) { // undo underline attributes setting: @@ -1648,7 +1667,7 @@ void wxGnomePrintDC::SetPen( const wxPen& pen ) m_pen = pen; double width; - + if (m_pen.GetWidth() <= 0) width = 0.1; 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) { wxDC::DoSetClippingRegion( x, y, width, height ); - + gs_libGnomePrint->gnome_print_gsave( m_gpc ); - + gs_libGnomePrint->gnome_print_newpath( m_gpc ); gs_libGnomePrint->gnome_print_moveto( m_gpc, XLOG2DEV(x), YLOG2DEV(y) ); gs_libGnomePrint->gnome_print_lineto( m_gpc, XLOG2DEV(x + width), YLOG2DEV(y) ); @@ -1774,7 +1793,7 @@ void wxGnomePrintDC::DestroyClippingRegion() wxDC::DestroyClippingRegion(); gs_libGnomePrint->gnome_print_grestore( m_gpc ); - + #if 0 // not needed, we set the values in each // drawing method anyways @@ -1784,7 +1803,7 @@ void wxGnomePrintDC::DestroyClippingRegion() #endif } -bool wxGnomePrintDC::StartDoc(const wxString& message) +bool wxGnomePrintDC::StartDoc(const wxString& WXUNUSED(message)) { return true; } @@ -1899,7 +1918,7 @@ void wxGnomePrintDC::DoGetSize(int* width, int* height) const if (width) *width = wxRound( pw * PS2DEV ); - + if (height) *height = wxRound( ph * PS2DEV ); } @@ -1933,9 +1952,9 @@ wxSize wxGnomePrintDC::GetPPI() const } void wxGnomePrintDC::SetPrintData(const wxPrintData& data) -{ +{ m_printData = data; - + int height; if (m_printData.GetOrientation() == wxPORTRAIT) GetSize( NULL, &height ); @@ -1944,7 +1963,7 @@ void wxGnomePrintDC::SetPrintData(const wxPrintData& data) 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 diff --git a/src/gtk/gsockgtk.cpp b/src/gtk/gsockgtk.cpp index c8f1d5c8f6..b38c4d7759 100644 --- a/src/gtk/gsockgtk.cpp +++ b/src/gtk/gsockgtk.cpp @@ -25,7 +25,7 @@ extern "C" { static void _GSocket_GDK_Input(gpointer data, - gint source, + gint WXUNUSED(source), GdkInputCondition condition) { GSocket *socket = (GSocket *)data; diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp index faec2bf664..81f2e12471 100644 --- a/src/gtk/listbox.cpp +++ b/src/gtk/listbox.cpp @@ -62,9 +62,9 @@ extern bool g_blockEventsOnScroll; extern "C" { static void -gtk_listbox_row_activated_callback(GtkTreeView *treeview, +gtk_listbox_row_activated_callback(GtkTreeView * WXUNUSED(treeview), GtkTreePath *path, - GtkTreeViewColumn *col, + GtkTreeViewColumn * WXUNUSED(col), wxListBox *listbox) { if (g_blockEventsOnDrag) return; @@ -114,7 +114,8 @@ gtk_listbox_row_activated_callback(GtkTreeView *treeview, extern "C" { static void -gtk_listitem_changed_callback( GtkTreeSelection* selection, wxListBox *listbox ) +gtk_listitem_changed_callback(GtkTreeSelection * WXUNUSED(selection), + wxListBox *listbox ) { if (g_blockEventsOnDrag) return; @@ -208,7 +209,7 @@ static void gtk_tree_entry_destroy_cb(GtkTreeEntry* entry, #include extern "C" { -static gint gtk_listbox_sort_callback(GtkTreeModel *model, +static gint gtk_listbox_sort_callback(GtkTreeModel * WXUNUSED(model), GtkTreeIter *a, GtkTreeIter *b, wxListBox *listbox) @@ -244,8 +245,8 @@ static gint gtk_listbox_sort_callback(GtkTreeModel *model, //----------------------------------------------------------------------------- extern "C" { -static gboolean gtk_listbox_searchequal_callback(GtkTreeModel* model, - gint column, +static gboolean gtk_listbox_searchequal_callback(GtkTreeModel * WXUNUSED(model), + gint WXUNUSED(column), const gchar* key, GtkTreeIter* iter, wxListBox* listbox) @@ -447,7 +448,7 @@ wxListBox::~wxListBox() int wxListBox::DoInsertItems(const wxArrayStringsAdapter& items, unsigned int pos, void **clientData, - wxClientDataType type) + wxClientDataType WXUNUSED(type)) { 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); else gtk_tree_selection_unselect_iter(selection, &iter); - + GtkTreePath* path = gtk_tree_model_get_path( GTK_TREE_MODEL(m_liststore), &iter); diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index a4e6ec9e1a..98a7ea30de 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -143,14 +143,16 @@ static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event) 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); 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() ) { @@ -451,11 +453,11 @@ wxMenu *wxMenuBar::Remove(size_t pos) if( frame ) frame->UpdateMenuBarSize(); - + wxMenubarUnsetInvokingWindow( menu, m_invokingWindow ); } - + return menu; } @@ -1068,12 +1070,12 @@ wxMenu::~wxMenu() if ( m_owner ) gtk_widget_destroy( m_menu ); } - - // This must come after we release GTK resources above. Otherwise, GTK will - // give warnings/errors when attempting to free accelerator resources from - // child items that just were destroyed (the m_menu widget can contain - // references to accelerators in child items. Problem detected when removing - // a menu from a wxMenuBar, and the removed menu had submenus with accelerators.) + + // This must come after we release GTK resources above. Otherwise, GTK will + // give warnings/errors when attempting to free accelerator resources from + // child items that just were destroyed (the m_menu widget can contain + // references to accelerators in child items. Problem detected when removing + // a menu from a wxMenuBar, and the removed menu had submenus with accelerators.) WX_CLEAR_LIST(wxMenuItemList, m_items); } diff --git a/src/gtk/minifram.cpp b/src/gtk/minifram.cpp index e162ba9014..98fff86c66 100644 --- a/src/gtk/minifram.cpp +++ b/src/gtk/minifram.cpp @@ -239,7 +239,9 @@ static gint gtk_window_button_release_callback( GtkWidget *widget, GdkEventButto extern "C" { 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 (g_blockEventsOnDrag) return FALSE; diff --git a/src/gtk/notebook.cpp b/src/gtk/notebook.cpp index c878f8728f..2c8241b149 100644 --- a/src/gtk/notebook.cpp +++ b/src/gtk/notebook.cpp @@ -101,9 +101,9 @@ static void gtk_notebook_page_changing_callback( GtkNotebook *widget, } extern "C" { -static void gtk_notebook_page_changed_callback( GtkNotebook *widget, +static void gtk_notebook_page_changed_callback( GtkNotebook * WXUNUSED(widget), GtkNotebookPage *WXUNUSED(gpage), - guint page, + guint WXUNUSED(page), wxNotebook *notebook ) { int old = notebook->m_oldSelection; diff --git a/src/gtk/radiobox.cpp b/src/gtk/radiobox.cpp index b54b7ccbc0..418c82be3e 100644 --- a/src/gtk/radiobox.cpp +++ b/src/gtk/radiobox.cpp @@ -138,7 +138,7 @@ static gint gtk_radiobox_keypress_callback( GtkWidget *widget, GdkEventKey *gdk_ } extern "C" { -static gint gtk_radiobutton_focus_in( GtkWidget *widget, +static gint gtk_radiobutton_focus_in( GtkWidget * WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxRadioBox *win ) { @@ -164,7 +164,7 @@ static gint gtk_radiobutton_focus_in( GtkWidget *widget, } extern "C" { -static gint gtk_radiobutton_focus_out( GtkWidget *widget, +static gint gtk_radiobutton_focus_out( GtkWidget * WXUNUSED(widget), GdkEvent *WXUNUSED(event), wxRadioBox *win ) { diff --git a/src/gtk/renderer.cpp b/src/gtk/renderer.cpp index 9ce5074138..d4c273d979 100644 --- a/src/gtk/renderer.cpp +++ b/src/gtk/renderer.cpp @@ -378,21 +378,17 @@ wxRendererGTK::DrawSplitterSash(wxWindow *win, if ( isVert ) { - int h = win->GetClientSize().GetHeight(); - rect.x = position; rect.y = 0; rect.width = full_size; - rect.height = h; + rect.height = size.y; } else // horz { - int w = win->GetClientSize().GetWidth(); - rect.x = 0; rect.y = position; rect.height = full_size; - rect.width = w; + rect.width = size.x; } int x_diff = 0; diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index 783d1315fa..c8c14a446a 100644 --- a/src/gtk/statbox.cpp +++ b/src/gtk/statbox.cpp @@ -36,7 +36,7 @@ extern "C" { static void gtk_frame_size_allocate (GtkWidget *widget, GtkAllocation *allocation, - wxStaticBox *p) + wxStaticBox * WXUNUSED(box)) { GtkFrame *frame = GTK_FRAME (widget); diff --git a/src/gtk/tbargtk.cpp b/src/gtk/tbargtk.cpp index 54e50ec64a..d81c1fb2a6 100644 --- a/src/gtk/tbargtk.cpp +++ b/src/gtk/tbargtk.cpp @@ -448,7 +448,7 @@ bool wxToolBar::Create( wxWindow *parent, return true; } -GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& windows) const +GdkWindow *wxToolBar::GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const { return GTK_WIDGET(m_toolbar)->window; } diff --git a/src/gtk/textctrl.cpp b/src/gtk/textctrl.cpp index e7a77241d1..a1bdfc5414 100644 --- a/src/gtk/textctrl.cpp +++ b/src/gtk/textctrl.cpp @@ -38,8 +38,8 @@ extern "C" { static void wxGtkOnRemoveTag(GtkTextBuffer *buffer, GtkTextTag *tag, - GtkTextIter *start, - GtkTextIter *end, + GtkTextIter * WXUNUSED(start), + GtkTextIter * WXUNUSED(end), char *prefix) { gchar *name; @@ -305,9 +305,9 @@ extern "C" { static void au_apply_tag_callback(GtkTextBuffer *buffer, GtkTextTag *tag, - GtkTextIter *start, - GtkTextIter *end, - gpointer textctrl) + GtkTextIter * WXUNUSED(start), + GtkTextIter * WXUNUSED(end), + gpointer WXUNUSED(textctrl)) { if(tag == gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "wxUrl")) g_signal_stop_emission_by_name (buffer, "apply_tag"); @@ -320,7 +320,7 @@ au_apply_tag_callback(GtkTextBuffer *buffer, extern "C" { static gboolean -pred_whitespace (gunichar ch, gpointer user_data) +pred_whitespace(gunichar ch, gpointer WXUNUSED(user_data)) { return g_unichar_isspace(ch); } @@ -328,7 +328,7 @@ pred_whitespace (gunichar ch, gpointer user_data) extern "C" { static gboolean -pred_non_whitespace (gunichar ch, gpointer user_data) +pred_non_whitespace (gunichar ch, gpointer WXUNUSED(user_data)) { return !g_unichar_isspace(ch); } @@ -336,7 +336,7 @@ pred_non_whitespace (gunichar ch, gpointer user_data) extern "C" { static gboolean -pred_nonpunct (gunichar ch, gpointer user_data) +pred_nonpunct (gunichar ch, gpointer WXUNUSED(user_data)) { return !g_unichar_ispunct(ch); } @@ -344,7 +344,7 @@ pred_nonpunct (gunichar ch, gpointer user_data) extern "C" { 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 == '/'; } @@ -453,7 +453,7 @@ au_check_range(GtkTextIter *s, extern "C" { static void -au_insert_text_callback(GtkTextBuffer *buffer, +au_insert_text_callback(GtkTextBuffer * WXUNUSED(buffer), GtkTextIter *end, gchar *text, gint len, @@ -485,7 +485,7 @@ au_insert_text_callback(GtkTextBuffer *buffer, extern "C" { static void -au_delete_range_callback(GtkTextBuffer *buffer, +au_delete_range_callback(GtkTextBuffer * WXUNUSED(buffer), GtkTextIter *start, GtkTextIter *end, wxTextCtrl *win) @@ -511,7 +511,7 @@ au_delete_range_callback(GtkTextBuffer *buffer, extern "C" { static void -gtk_text_changed_callback( GtkWidget *widget, wxTextCtrl *win ) +gtk_text_changed_callback( GtkWidget * WXUNUSED(widget), wxTextCtrl *win ) { if ( win->IgnoreTextUpdate() ) return; @@ -573,7 +573,9 @@ gtk_paste_clipboard_callback( GtkWidget *widget, wxTextCtrl *win ) extern "C" { 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; } @@ -1234,7 +1236,7 @@ bool wxTextCtrl::Enable( bool enable ) // wxGTK-specific: called recursively by Enable, // to give widgets an opportunity to correct their colours after they // 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 // disabled and enabled mode, or we end up with a different colour under the diff --git a/src/gtk/textentry.cpp b/src/gtk/textentry.cpp index f25d8f80fa..ad8170294e 100644 --- a/src/gtk/textentry.cpp +++ b/src/gtk/textentry.cpp @@ -42,9 +42,9 @@ extern "C" // "insert_text" handler for GtkEntry static void wx_gtk_insert_text_callback(GtkEditable *editable, - const gchar *new_text, - gint new_text_length, - gint *position, + const gchar * WXUNUSED(new_text), + gint WXUNUSED(new_text_length), + gint * WXUNUSED(position), wxTextEntry *text) { // we should only be called if we have a max len limit at all diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp index 0529cf1fa4..51ac28e480 100644 --- a/src/gtk/toplevel.cpp +++ b/src/gtk/toplevel.cpp @@ -167,9 +167,10 @@ static gboolean gtk_frame_focus_in_callback( GtkWidget *widget, //----------------------------------------------------------------------------- extern "C" { -static gboolean gtk_frame_focus_out_callback( GtkWidget *widget, - GdkEventFocus *WXUNUSED(gdk_event), - wxTopLevelWindowGTK *win ) +static +gboolean gtk_frame_focus_out_callback(GtkWidget * WXUNUSED(widget), + GdkEventFocus *WXUNUSED(gdk_event), + wxTopLevelWindowGTK * WXUNUSED(win)) { // if the focus goes out of our app alltogether, OnIdle() will send // wxActivateEvent, otherwise gtk_window_focus_in_callback() will reset diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index 1f9ea333a7..9a3e250f44 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -245,6 +245,10 @@ const gchar *wx_pango_version_check (int major, int minor, int micro) return "can't check"; #else // !PANGO_VERSION_MAJOR + wxUnusedVar(major); + wxUnusedVar(minor); + wxUnusedVar(micro); + return "too old headers"; #endif } diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index eb36d67c61..115e27d54f 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -407,9 +407,9 @@ gtk_window_own_expose_callback( GtkWidget *widget, // make it extern because wxStaticText needs to disconnect this one extern "C" { -void wxgtk_window_size_request_callback(GtkWidget *widget, +void wxgtk_window_size_request_callback(GtkWidget * WXUNUSED(widget), GtkRequisition *requisition, - wxWindow *win) + wxWindow * win) { int w, h; win->GetSize( &w, &h ); @@ -427,7 +427,7 @@ void wxgtk_window_size_request_callback(GtkWidget *widget, extern "C" { static -void wxgtk_combo_size_request_callback(GtkWidget *widget, +void wxgtk_combo_size_request_callback(GtkWidget * WXUNUSED(widget), GtkRequisition *requisition, wxComboBox *win) { @@ -1115,7 +1115,7 @@ gtk_window_key_press_callback( GtkWidget *widget, extern "C" { static void -gtk_wxwindow_commit_cb (GtkIMContext *context, +gtk_wxwindow_commit_cb (GtkIMContext * WXUNUSED(context), const gchar *str, wxWindow *window) { @@ -1193,7 +1193,7 @@ gtk_wxwindow_commit_cb (GtkIMContext *context, extern "C" { static gboolean -gtk_window_key_release_callback( GtkWidget *widget, +gtk_window_key_release_callback( GtkWidget * WXUNUSED(widget), GdkEventKey *gdk_event, wxWindowGTK *win ) { @@ -1652,7 +1652,7 @@ gtk_window_button_release_callback( GtkWidget *widget, //----------------------------------------------------------------------------- static gboolean -gtk_window_motion_notify_callback( GtkWidget *widget, +gtk_window_motion_notify_callback( GtkWidget * WXUNUSED(widget), GdkEventMotion *gdk_event, wxWindowGTK *win ) { @@ -1762,7 +1762,7 @@ static gboolean wxgtk_window_popup_menu_callback(GtkWidget*, wxWindowGTK* win) //----------------------------------------------------------------------------- static gboolean -gtk_window_focus_in_callback( GtkWidget *widget, +gtk_window_focus_in_callback( GtkWidget * WXUNUSED(widget), GdkEventFocus *WXUNUSED(event), wxWindow *win ) { @@ -1812,8 +1812,8 @@ gtk_window_focus_in_callback( GtkWidget *widget, //----------------------------------------------------------------------------- static gboolean -gtk_window_focus_out_callback( GtkWidget *widget, - GdkEventFocus *gdk_event, +gtk_window_focus_out_callback( GtkWidget * WXUNUSED(widget), + GdkEventFocus * WXUNUSED(gdk_event), wxWindowGTK *win ) { DEBUG_MAIN_THREAD @@ -1867,7 +1867,7 @@ gtk_window_focus_out_callback( GtkWidget *widget, static gboolean wx_window_focus_callback(GtkWidget *widget, - GtkDirectionType direction, + GtkDirectionType WXUNUSED(direction), wxWindowGTK *win) { // 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 void gtk_window_size_callback( GtkWidget *WXUNUSED(widget), - GtkAllocation *alloc, + GtkAllocation * WXUNUSED(alloc), wxWindow *win ) { int client_width = 0; @@ -3610,7 +3610,8 @@ bool wxWindowGTK::ScrollPages(int 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) return;