From 72d33d75dbe24ebfc43f5b6ddde4ec752723324e Mon Sep 17 00:00:00 2001 From: kichikuou Date: Wed, 8 Feb 2017 20:31:21 +0900 Subject: [PATCH] Drop gtk1 support --- Makefile.in | 5 +- aclocal.m4 | 1 - config.h.in | 2 +- configure | 287 +---------------------------- configure.ac | 15 +- macros/Makefile.am | 1 - macros/Makefile.in | 6 +- macros/gtk.m4 | 194 ------------------- modules/AliceLogo/Makefile.in | 5 +- modules/Confirm/Makefile.in | 5 +- modules/Gpx/Makefile.in | 5 +- modules/Makefile.in | 5 +- modules/Math/Makefile.in | 5 +- modules/MsgSkip/Makefile.in | 5 +- modules/NIGHTDLL/Makefile.in | 5 +- modules/NightDemonDemo/Makefile.in | 5 +- modules/RandMT/Makefile.in | 5 +- modules/SACT/Makefile.in | 5 +- modules/ShArray/Makefile.in | 5 +- modules/ShCalc/Makefile.in | 5 +- modules/ShGraph/Makefile.in | 5 +- modules/ShPort/Makefile.in | 5 +- modules/ShSound/Makefile.in | 5 +- modules/ShString/Makefile.in | 5 +- modules/dDemo/Makefile.in | 5 +- modules/eDemo/Makefile.in | 5 +- modules/eeDemo/Makefile.in | 5 +- modules/lib/Makefile.in | 5 +- modules/nDEMO/Makefile.in | 5 +- modules/nDEMOE/Makefile.in | 5 +- modules/oDEMO/Makefile.in | 5 +- modules/oujimisc/Makefile.in | 5 +- modules/tDemo/Makefile.in | 5 +- src/Makefile.in | 5 +- src/font_gtk.c | 18 -- src/menu.c | 19 -- src/menu_gui.c | 97 +--------- 37 files changed, 67 insertions(+), 708 deletions(-) delete mode 100644 macros/gtk.m4 diff --git a/Makefile.in b/Makefile.in index 94476fd..51cdf97 100644 --- a/Makefile.in +++ b/Makefile.in @@ -92,8 +92,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -259,7 +259,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/aclocal.m4 b/aclocal.m4 index 0663a21..c54dafe 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1435,7 +1435,6 @@ m4_include([macros/freetype2.m4]) m4_include([macros/gettext.m4]) m4_include([macros/glib-2.0.m4]) m4_include([macros/gtk-2.0.m4]) -m4_include([macros/gtk.m4]) m4_include([macros/iconv.m4]) m4_include([macros/lib-ld.m4]) m4_include([macros/lib-link.m4]) diff --git a/config.h.in b/config.h.in index b9ffd0f..8474470 100644 --- a/config.h.in +++ b/config.h.in @@ -57,7 +57,7 @@ /* Define this if you have glib >= 2.0.0 */ #undef ENABLE_GLIB -/* Define this if you have gtk+ >= 1.0.0 */ +/* Define this if you have gtk+ >= 2.0.0 */ #undef ENABLE_GTK /* define this if you use gtk(gdk) font interface */ diff --git a/configure b/configure index 0a2da7a..21a774d 100755 --- a/configure +++ b/configure @@ -682,7 +682,6 @@ HAVE_GTK_FALSE HAVE_GTK_TRUE GTK_LIBS GTK_CFLAGS -GTK_CONFIG GLIB_COMPILE_RESOURCES GLIB_MKENUMS GOBJECT_QUERY @@ -876,8 +875,6 @@ with_libintl_prefix with_x enable_glibtest enable_gtk -with_gtk_prefix -with_gtk_exec_prefix enable_gtktest enable_audio with_alsa_prefix @@ -1577,7 +1574,6 @@ Optional Features: --disable-nls do not use Native Language Support --disable-glibtest do not try to compile and run a test GLIB program --enable-gtk Enable gtk-based widget default=yes - --disable-gtktest Do not try to compile and run a test GTK program --disable-gtktest do not try to compile and run a test GTK+ program --enable-audio=mode_list Enable audio (Specify comma separated mode list): default: Automatically select audio device. @@ -1629,8 +1625,6 @@ Optional Packages: --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir --with-x use the X Window System - --with-gtk-prefix=PFX Prefix where GTK is installed (optional) - --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) --with-alsa-prefix=PFX Prefix where Alsa library is installed(optional) --with-alsa-inc-prefix=PFX Prefix where include libraries are (optional) --with-esd-prefix=PFX Prefix where ESD is installed (optional) @@ -15881,287 +15875,9 @@ else fi -no_gtk1x=no have_gtk=no if test "x$enable_gtk" = xyes; then - -# Check whether --with-gtk-prefix was given. -if test "${with_gtk_prefix+set}" = set; then : - withval=$with_gtk_prefix; gtk_config_prefix="$withval" -else - gtk_config_prefix="" -fi - - -# Check whether --with-gtk-exec-prefix was given. -if test "${with_gtk_exec_prefix+set}" = set; then : - withval=$with_gtk_exec_prefix; gtk_config_exec_prefix="$withval" -else - gtk_config_exec_prefix="" -fi - -# Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then : - enableval=$enable_gtktest; -else - enable_gtktest=yes -fi - - - for module in . - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - # Extract the first word of "gtk-config", so it can be a program name with args. -set dummy gtk-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTK_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $GTK_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no" - ;; -esac -fi -GTK_CONFIG=$ac_cv_path_GTK_CONFIG -if test -n "$GTK_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CONFIG" >&5 -$as_echo "$GTK_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - min_gtk_version=1.0.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" - rm -f conf.gtktest - if test "$cross_compiling" = yes; then : - echo $ac_n "cross compiling; assumed OK... $ac_c" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - no_gtk=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define ENABLE_GTK 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#include - -int -main () -{ - return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" -else - echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: No gtk-1.x found. Next check gtk-2.x" >&5 -$as_echo "No gtk-1.x found. Next check gtk-2.x" >&6; } - no_gtk1x=yes - - - fi - - - rm -f conf.gtktest - - if test "x$no_gtk1x" = xyes; then - # Check whether --enable-gtktest was given. + # Check whether --enable-gtktest was given. if test "${enable_gtktest+set}" = set; then : enableval=$enable_gtktest; else @@ -16423,7 +16139,6 @@ rm -f core conftest.err conftest.$ac_objext \ rm -f conf.gtktest - fi have_gtk=yes fi diff --git a/configure.ac b/configure.ac index 990c14f..41c38e6 100644 --- a/configure.ac +++ b/configure.ac @@ -173,21 +173,12 @@ AC_ARG_ENABLE(gtk, [ --enable-gtk Enable gtk-based widget [default=yes]],, [enable_gtk=yes]) -no_gtk1x=no have_gtk=no if test "x$enable_gtk" = xyes; then - AM_PATH_GTK(1.0.0, - AC_DEFINE(ENABLE_GTK,1,[Define this if you have gtk+ >= 1.0.0]), - [AC_MSG_RESULT(No gtk-1.x found. Next check gtk-2.x) - no_gtk1x=yes - ] + AM_PATH_GTK_2_0(2.0.0, + AC_DEFINE(ENABLE_GTK,1,[Define this if you have gtk+ >= 2.0.0]), + AC_MSG_ERROR(*** check for GTK failed ***) ) - if test "x$no_gtk1x" = xyes; then - AM_PATH_GTK_2_0(2.0.0, - AC_DEFINE(ENABLE_GTK,1,[Define this if you have gtk+ >= 1.0.0]), - AC_MSG_ERROR(*** check for GTK failed ***) - ) - fi have_gtk=yes fi diff --git a/macros/Makefile.am b/macros/Makefile.am index 7898b2a..fd3110b 100644 --- a/macros/Makefile.am +++ b/macros/Makefile.am @@ -11,7 +11,6 @@ MACROS= \ glib-2.0.m4 \ glibc21.m4 \ gtk-2.0.m4 \ - gtk.m4 \ iconv.m4 \ intdiv0.m4 \ inttypes_h.m4 \ diff --git a/macros/Makefile.in b/macros/Makefile.in index d608171..c01bfc6 100644 --- a/macros/Makefile.in +++ b/macros/Makefile.in @@ -87,8 +87,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -174,7 +174,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ @@ -339,7 +338,6 @@ MACROS = \ glib-2.0.m4 \ glibc21.m4 \ gtk-2.0.m4 \ - gtk.m4 \ iconv.m4 \ intdiv0.m4 \ inttypes_h.m4 \ diff --git a/macros/gtk.m4 b/macros/gtk.m4 deleted file mode 100644 index f2dd472..0000000 --- a/macros/gtk.m4 +++ /dev/null @@ -1,194 +0,0 @@ -# Configure paths for GTK+ -# Owen Taylor 97-11-3 - -dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -dnl -AC_DEFUN([AM_PATH_GTK], -[dnl -dnl Get the cflags and libraries from the gtk-config script -dnl -AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], - gtk_config_prefix="$withval", gtk_config_prefix="") -AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], - gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], - , enable_gtktest=yes) - - for module in . $4 - do - case "$module" in - gthread) - gtk_config_args="$gtk_config_args gthread" - ;; - esac - done - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" - if test x${GTK_CONFIG+set} != xset ; then - GTK_CONFIG=$gtk_config_prefix/bin/gtk-config - fi - fi - - AC_PATH_PROG(GTK_CONFIG, gtk-config, no) - min_gtk_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" - if test "$GTK_CONFIG" = "no" ; then - no_gtk=yes - else - GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` - GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` - gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK is sufficiently new. (Also sanity -dnl checks the results of gtk-config to some extent -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If gtk-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); - printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } -#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } -#endif /* defined (GTK_MAJOR_VERSION) ... */ - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); - printf("*** correct copy of gtk-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GTK_CONFIG" = "no" ; then - echo "*** The gtk-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GTK_CONFIG environment variable to the" - echo "*** full path to gtk-config." - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK or finding the wrong" - echo "*** version of GTK. If it is not finding GTK, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" - echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) diff --git a/modules/AliceLogo/Makefile.in b/modules/AliceLogo/Makefile.in index 85f740a..c418818 100644 --- a/modules/AliceLogo/Makefile.in +++ b/modules/AliceLogo/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/Confirm/Makefile.in b/modules/Confirm/Makefile.in index 18a60ea..7e05a15 100644 --- a/modules/Confirm/Makefile.in +++ b/modules/Confirm/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/Gpx/Makefile.in b/modules/Gpx/Makefile.in index e423f01..c018b39 100644 --- a/modules/Gpx/Makefile.in +++ b/modules/Gpx/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/Makefile.in b/modules/Makefile.in index 17cc640..46c980b 100644 --- a/modules/Makefile.in +++ b/modules/Makefile.in @@ -87,8 +87,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -234,7 +234,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/Math/Makefile.in b/modules/Math/Makefile.in index aafb021..cc296c4 100644 --- a/modules/Math/Makefile.in +++ b/modules/Math/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/MsgSkip/Makefile.in b/modules/MsgSkip/Makefile.in index 997e34f..578bf43 100644 --- a/modules/MsgSkip/Makefile.in +++ b/modules/MsgSkip/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -260,7 +260,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/NIGHTDLL/Makefile.in b/modules/NIGHTDLL/Makefile.in index fbc1eba..af6dbab 100644 --- a/modules/NIGHTDLL/Makefile.in +++ b/modules/NIGHTDLL/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -257,7 +257,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/NightDemonDemo/Makefile.in b/modules/NightDemonDemo/Makefile.in index 2abd078..f54bf4d 100644 --- a/modules/NightDemonDemo/Makefile.in +++ b/modules/NightDemonDemo/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -256,7 +256,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/RandMT/Makefile.in b/modules/RandMT/Makefile.in index d7cf7e1..717eb93 100644 --- a/modules/RandMT/Makefile.in +++ b/modules/RandMT/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/SACT/Makefile.in b/modules/SACT/Makefile.in index 802b12d..122992b 100644 --- a/modules/SACT/Makefile.in +++ b/modules/SACT/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -261,7 +261,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/ShArray/Makefile.in b/modules/ShArray/Makefile.in index 4560e67..b7a3607 100644 --- a/modules/ShArray/Makefile.in +++ b/modules/ShArray/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/ShCalc/Makefile.in b/modules/ShCalc/Makefile.in index 0a1498b..f76507a 100644 --- a/modules/ShCalc/Makefile.in +++ b/modules/ShCalc/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/ShGraph/Makefile.in b/modules/ShGraph/Makefile.in index 702a3fc..6a541f6 100644 --- a/modules/ShGraph/Makefile.in +++ b/modules/ShGraph/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/ShPort/Makefile.in b/modules/ShPort/Makefile.in index 6e3c67b..1f285ab 100644 --- a/modules/ShPort/Makefile.in +++ b/modules/ShPort/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/ShSound/Makefile.in b/modules/ShSound/Makefile.in index 9b0d30f..d96be67 100644 --- a/modules/ShSound/Makefile.in +++ b/modules/ShSound/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/ShString/Makefile.in b/modules/ShString/Makefile.in index 9436559..0218a3e 100644 --- a/modules/ShString/Makefile.in +++ b/modules/ShString/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/dDemo/Makefile.in b/modules/dDemo/Makefile.in index 03ace45..b483476 100644 --- a/modules/dDemo/Makefile.in +++ b/modules/dDemo/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/eDemo/Makefile.in b/modules/eDemo/Makefile.in index f3e0278..cb51fb6 100644 --- a/modules/eDemo/Makefile.in +++ b/modules/eDemo/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/eeDemo/Makefile.in b/modules/eeDemo/Makefile.in index 6d4cf27..ab4ff5e 100644 --- a/modules/eeDemo/Makefile.in +++ b/modules/eeDemo/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/lib/Makefile.in b/modules/lib/Makefile.in index 28d53cb..fd52b0b 100644 --- a/modules/lib/Makefile.in +++ b/modules/lib/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -239,7 +239,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/nDEMO/Makefile.in b/modules/nDEMO/Makefile.in index ec07489..5c26330 100644 --- a/modules/nDEMO/Makefile.in +++ b/modules/nDEMO/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/nDEMOE/Makefile.in b/modules/nDEMOE/Makefile.in index 532c377..f5cd946 100644 --- a/modules/nDEMOE/Makefile.in +++ b/modules/nDEMOE/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/oDEMO/Makefile.in b/modules/oDEMO/Makefile.in index 11afcdd..1a5fc6f 100644 --- a/modules/oDEMO/Makefile.in +++ b/modules/oDEMO/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/oujimisc/Makefile.in b/modules/oujimisc/Makefile.in index 37526f7..f511662 100644 --- a/modules/oujimisc/Makefile.in +++ b/modules/oujimisc/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/modules/tDemo/Makefile.in b/modules/tDemo/Makefile.in index 91d55d0..808ff5d 100644 --- a/modules/tDemo/Makefile.in +++ b/modules/tDemo/Makefile.in @@ -88,8 +88,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -254,7 +254,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/src/Makefile.in b/src/Makefile.in index 6a5609a..0e7fc74 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -93,8 +93,8 @@ am__aclocal_m4_deps = $(top_srcdir)/macros/aclocal-include.m4 \ $(top_srcdir)/macros/esd.m4 $(top_srcdir)/macros/freetype2.m4 \ $(top_srcdir)/macros/gettext.m4 \ $(top_srcdir)/macros/glib-2.0.m4 \ - $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/gtk.m4 \ - $(top_srcdir)/macros/iconv.m4 $(top_srcdir)/macros/lib-ld.m4 \ + $(top_srcdir)/macros/gtk-2.0.m4 $(top_srcdir)/macros/iconv.m4 \ + $(top_srcdir)/macros/lib-ld.m4 \ $(top_srcdir)/macros/lib-link.m4 \ $(top_srcdir)/macros/lib-prefix.m4 \ $(top_srcdir)/macros/libtool.m4 $(top_srcdir)/macros/ltdl.m4 \ @@ -266,7 +266,6 @@ GMSGFMT = @GMSGFMT@ GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ -GTK_CONFIG = @GTK_CONFIG@ GTK_LIBS = @GTK_LIBS@ HAVE_NASM = @HAVE_NASM@ INCLTDL = @INCLTDL@ diff --git a/src/font_gtk.c b/src/font_gtk.c index cc7c99a..d06a682 100644 --- a/src/font_gtk.c +++ b/src/font_gtk.c @@ -41,20 +41,6 @@ #include "antialiase.h" #include "image.h" -#ifndef GTK_CHECK_VERSION -#define GTK_CHECK_VERSION(major,minor,micro) \ -(GTK_MAJOR_VERSION > (major) || \ - (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \ - (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \ - GTK_MICRO_VERSION >= (micro))) -#endif /* !GTK_CHECK_VERSION */ - -#if defined (GTK_CHECK_VERSION) && GTK_CHECK_VERSION (1,2,0) -#define GTKV12 -#else -#define GTKV10 -#endif - /* fontset ¤Î°Ù¤Î¾ðÊó */ typedef struct { int size; @@ -145,11 +131,7 @@ static void *font_gtk_get_glyph(unsigned char *str) { return NULL; } -#ifdef GTKV12 h = gdk_text_height(fontset, conv, l); -#else - h = font_ascent + fontset->ascent; -#endif if (w > GLYPH_PIXMAP_WIDTH) w = GLYPH_PIXMAP_WIDTH; if (h > GLYPH_PIXMAP_HEIGHT) h = GLYPH_PIXMAP_HEIGHT; diff --git a/src/menu.c b/src/menu.c index 9e1bf24..9c166e0 100644 --- a/src/menu.c +++ b/src/menu.c @@ -33,20 +33,6 @@ #include "music.h" -#ifndef GTK_CHECK_VERSION -#define GTK_CHECK_VERSION(major,minor,micro) \ -(GTK_MAJOR_VERSION > (major) || \ - (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \ - (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \ - GTK_MICRO_VERSION >= (micro))) -#endif /* !GTK_CHECK_VERSION */ - -#if defined (GTK_CHECK_VERSION) && GTK_CHECK_VERSION (1,2,0) -#define GTKV12 -#else -#define GTKV10 -#endif - static boolean menu_initilized = FALSE; static int menu_callback() { @@ -58,13 +44,8 @@ static int menu_callback() { void menu_open(void) { if (!menu_initilized) return; -#ifdef GTKV12 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(menu_item_msgskip_on), get_skipMode()); gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(menu_item_msgskip_off), !get_skipMode()); -#else - gtk_check_menu_item_set_state (GTK_CHECK_MENU_ITEM(menu_item_msgskip_on), get_skipMode()); - gtk_check_menu_item_set_state (GTK_CHECK_MENU_ITEM(menu_item_msgskip_off), !get_skipMode()); -#endif gtk_menu_popup(GTK_MENU(menu_window_popup), NULL, NULL, NULL, NULL, 0, 100); gtk_widget_show(menu_window_popup); nact->popupmenu_opened = TRUE; diff --git a/src/menu_gui.c b/src/menu_gui.c index b4d0f35..6470b7e 100644 --- a/src/menu_gui.c +++ b/src/menu_gui.c @@ -32,27 +32,6 @@ #include #include -#ifndef GTK_CHECK_VERSION -#define GTK_CHECK_VERSION(major,minor,micro) \ -(GTK_MAJOR_VERSION > (major) || \ - (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION > (minor)) || \ - (GTK_MAJOR_VERSION == (major) && GTK_MINOR_VERSION == (minor) && \ - GTK_MICRO_VERSION >= (micro))) -#endif /* !GTK_CHECK_VERSION */ - -#if GTK_CHECK_VERSION (1,2,0) -#define GTKV12 -#if GTK_CHECK_VERSION(1,3,0) -#define GTKV13 -#endif -#else -#define GTKV10 -#endif - -#ifdef GTKV13 -#define GTK_WINDOW_DIALOG GTK_WINDOW_TOPLEVEL -#endif - #include "menu_callback.h" #include "menu_gui.h" @@ -76,7 +55,7 @@ create_window1 (void) GtkWidget *button2; GtkWidget *label4; - window1 = gtk_window_new (GTK_WINDOW_DIALOG); + window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_object_set_data (GTK_OBJECT (window1), "window1", window1); gtk_window_set_title (GTK_WINDOW (window1), _("InputNumber")); gtk_window_set_policy (GTK_WINDOW (window1), FALSE, FALSE, FALSE); @@ -96,11 +75,7 @@ create_window1 (void) gtk_widget_show (vbox1); gtk_box_pack_start (GTK_BOX (hbox1), vbox1, TRUE, TRUE, 0); gtk_widget_set_usize (vbox1, 128, -2); -#ifdef GTKV12 gtk_container_set_border_width (GTK_CONTAINER (vbox1), 10); -#else - gtk_container_border_width (GTK_CONTAINER (vbox1), 10); -#endif spinbutton1_adj = gtk_adjustment_new (100, 0, 100, 1, 1, 100); menu_spinbutton = spinbutton1 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton1_adj), 1, 0); @@ -185,11 +160,7 @@ create_window1 (void) (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (vbox2); gtk_box_pack_start (GTK_BOX (hbox1), vbox2, FALSE, TRUE, 0); -#ifdef GTKV12 gtk_container_set_border_width (GTK_CONTAINER (vbox2), 10); -#else - gtk_container_border_width (GTK_CONTAINER (vbox2), 10); -#endif button1 = gtk_button_new_with_label (_("OK")); gtk_widget_ref (button1); gtk_object_set_data_full (GTK_OBJECT (window1), "button1", button1, @@ -237,13 +208,9 @@ create_window2 (void) GtkWidget *button4; GtkWidget *button3; - window2 = gtk_window_new (GTK_WINDOW_DIALOG); + window2 = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_object_set_data (GTK_OBJECT (window2), "window2", window2); -#ifdef GTKV12 gtk_container_set_border_width (GTK_CONTAINER (window2), 10); -#else - gtk_container_border_width (GTK_CONTAINER (window2), 10); -#endif gtk_window_set_title (GTK_WINDOW (window2), _("InputString")); gtk_window_set_policy (GTK_WINDOW (window2), FALSE, FALSE, FALSE); gtk_window_position (GTK_WINDOW (window2), GTK_WIN_POS_MOUSE); @@ -333,13 +300,9 @@ create_window3 (void) GtkWidget *button5; GtkWidget *button6; - window3 = gtk_window_new (GTK_WINDOW_DIALOG); + window3 = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_object_set_data (GTK_OBJECT (window3), "window3", window3); -#ifdef GTKV12 gtk_container_set_border_width (GTK_CONTAINER (window3), 10); -#else - gtk_container_border_width (GTK_CONTAINER (window3), 10); -#endif gtk_window_set_title (GTK_WINDOW (window3), _("Exit")); gtk_window_set_policy (GTK_WINDOW (window3), FALSE, FALSE, FALSE); gtk_window_position (GTK_WINDOW (window3), GTK_WIN_POS_MOUSE); @@ -350,11 +313,7 @@ create_window3 (void) (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (vbox4); gtk_container_add (GTK_CONTAINER (window3), vbox4); -#ifdef GTKV12 gtk_container_set_border_width (GTK_CONTAINER (vbox4), 5); -#else - gtk_container_border_width (GTK_CONTAINER (vbox4), 5); -#endif label8 = gtk_label_new (_("Exit System35 ?")); gtk_widget_ref (label8); gtk_object_set_data_full (GTK_OBJECT (window3), "label8", label8, @@ -410,7 +369,7 @@ create_window4 (void) GtkWidget *label25; GtkWidget *button11; - window4 = gtk_window_new (GTK_WINDOW_DIALOG); + window4 = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_object_set_data (GTK_OBJECT (window4), "window4", window4); gtk_window_set_title (GTK_WINDOW (window4), _("About")); gtk_window_position (GTK_WINDOW (window4), GTK_WIN_POS_MOUSE); @@ -443,9 +402,7 @@ create_window4 (void) gtk_object_set_data_full (GTK_OBJECT (window4), "label23", label23, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label23); -#ifdef GTKV12 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label23); -#endif empty_notebook_page = gtk_vbox_new (FALSE, 0); gtk_widget_show (empty_notebook_page); gtk_container_add (GTK_CONTAINER (notebook1), empty_notebook_page); @@ -455,9 +412,7 @@ create_window4 (void) gtk_object_set_data_full (GTK_OBJECT (window4), "label24", label24, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label24); -#ifdef GTKV12 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label24); -#endif empty_notebook_page = gtk_vbox_new (FALSE, 0); gtk_widget_show (empty_notebook_page); gtk_container_add (GTK_CONTAINER (notebook1), empty_notebook_page); @@ -467,9 +422,7 @@ create_window4 (void) gtk_object_set_data_full (GTK_OBJECT (window4), "label25", label25, (GtkDestroyNotify) gtk_widget_unref); gtk_widget_show (label25); -#ifdef GTKV12 gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label25); -#endif button11 = gtk_button_new_with_label (_("OK")); gtk_widget_ref (button11); gtk_object_set_data_full (GTK_OBJECT (window4), "button11", button11, @@ -489,14 +442,12 @@ GtkWidget* create_menu1 (void) { GtkWidget *menu1; -#ifdef GTKV12 GtkAccelGroup *menu1_accels; GtkAccelGroup *item1_menu_accels; GtkAccelGroup *item4_menu_accels; GtkAccelGroup *item7_menu_accels; GtkAccelGroup *item10_menu_accels; GtkAccelGroup *item13_menu_accels; -#endif GtkWidget *item1; GtkWidget *item1_menu; GSList *msg_group = NULL; @@ -531,12 +482,6 @@ create_menu1 (void) menu1 = gtk_menu_new (); gtk_object_set_data (GTK_OBJECT (menu1), "menu1", menu1); -#ifdef GTKV12 -#ifdef GTKV13 -#else - menu1_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menu1)); -#endif -#endif item1 = gtk_menu_item_new_with_label (_("MessageSkip")); gtk_widget_ref (item1); gtk_object_set_data_full (GTK_OBJECT (menu1), "item1", item1, @@ -549,12 +494,6 @@ create_menu1 (void) gtk_object_set_data_full (GTK_OBJECT (menu1), "item1_menu", item1_menu, (GtkDestroyNotify) gtk_widget_unref); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item1), item1_menu); -#ifdef GTKV12 -#ifdef GTKV13 -#else - item1_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (item1_menu)); -#endif -#endif menu_item_msgskip_on = item2 = gtk_radio_menu_item_new_with_label (msg_group, _("ON")); msg_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item2)); gtk_widget_ref (item2); @@ -591,12 +530,6 @@ create_menu1 (void) gtk_object_set_data_full (GTK_OBJECT (menu1), "item4_menu", item4_menu, (GtkDestroyNotify) gtk_widget_unref); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item4), item4_menu); -#ifdef GTKV12 -#ifdef GTKV13 -#else - item4_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (item4_menu)); -#endif -#endif item5 = gtk_radio_menu_item_new_with_label (mouse_group, _("ON")); mouse_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item5)); gtk_widget_ref (item5); @@ -641,12 +574,6 @@ create_menu1 (void) gtk_object_set_data_full (GTK_OBJECT (menu1), "item7_menu", item7_menu, (GtkDestroyNotify) gtk_widget_unref); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item7), item7_menu); -#ifdef GTKV12 -#ifdef GTKV13 -#else - item7_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (item7_menu)); -#endif -#endif item8 = gtk_radio_menu_item_new_with_label (pcm_group, _("ON")); pcm_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item8)); gtk_widget_ref (item8); @@ -675,12 +602,6 @@ create_menu1 (void) gtk_object_set_data_full (GTK_OBJECT (menu1), "item10_menu", item10_menu, (GtkDestroyNotify) gtk_widget_unref); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item10), item10_menu); -#ifdef GTKV12 -#ifdef GTKV13 -#else - item10_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (item10_menu)); -#endif -#endif item11 = gtk_radio_menu_item_new_with_label (cdrom_group, _("ON")); cdrom_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item11)); gtk_widget_ref (item11); @@ -709,12 +630,6 @@ create_menu1 (void) gtk_object_set_data_full (GTK_OBJECT (menu1), "item13_menu", item13_menu, (GtkDestroyNotify) gtk_widget_unref); gtk_menu_item_set_submenu (GTK_MENU_ITEM (item13), item13_menu); -#ifdef GTKV12 -#ifdef GTKV13 -#else - item13_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (item13_menu)); -#endif -#endif item14 = gtk_radio_menu_item_new_with_label (midi_group, _("ON")); midi_group = gtk_radio_menu_item_group (GTK_RADIO_MENU_ITEM (item14)); gtk_widget_ref (item14); @@ -816,7 +731,7 @@ create_window5 (void) GtkWidget *window5; GtkWidget *entry2; - window5 = gtk_window_new (GTK_WINDOW_DIALOG); + window5 = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_object_set_data (GTK_OBJECT (window5), "window5", window5); gtk_window_position (GTK_WINDOW (window5), GTK_WIN_POS_MOUSE); @@ -844,7 +759,7 @@ create_window6 (void) GtkWidget *label51; GtkWidget *button16; - window6 = menu_window_msgbox = gtk_window_new (GTK_WINDOW_DIALOG); + window6 = menu_window_msgbox = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_object_set_data (GTK_OBJECT (window6), "window6", window6); gtk_window_set_title (GTK_WINDOW (window6), _("MessageBox")); gtk_window_position (GTK_WINDOW (window6), GTK_WIN_POS_MOUSE);