Addressing gtk+ 2 deprecations.
authorAlexander Koenig <alex@lisas.de>
Sun, 19 Jan 2014 23:17:03 +0000 (00:17 +0100)
committerAlexander Koenig <alex@lisas.de>
Sun, 19 Jan 2014 23:17:03 +0000 (00:17 +0100)
12 files changed:
gnome-support/Makefile.in
src/tX_dialog.cc
src/tX_extdial.cc
src/tX_extdial.h
src/tX_mastergui.cc
src/tX_mastergui.h
src/tX_midiin.cc
src/tX_panel.cc
src/tX_seqpar.cc
src/tX_seqpar.h
src/tX_vttgui.cc
src/tX_vttgui.h

index d782974a47a5ff53b3daa7020abc2c5f58eedeb3..04b27dbf26494112dc8a41f46e99a9cad1a8fd86 100644 (file)
@@ -1,6 +1,9 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+@SET_MAKE@
 
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \  ]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+subdir = gnome-support
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+       $(srcdir)/terminatorX.keys.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+       $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = terminatorX.keys
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(gnomeappdir)" \
+       "$(DESTDIR)$(mimetypedir)" "$(DESTDIR)$(pixmapdir)"
+DATA = $(gnomeapp_DATA) $(mimetype_DATA) $(pixmap_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DEPRECATED_FLAGS = @DEPRECATED_FLAGS@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
 GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
 GTK_LIBS = @GTK_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MPG123_PROG = @MPG123_PROG@
+OBJEXT = @OBJEXT@
+OGG123_PROG = @OGG123_PROG@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SK_CONFIG = @SK_CONFIG@
 SOX_PROG = @SOX_PROG@
+STRIP = @STRIP@
 VERSION = @VERSION@
+XMKMF = @XMKMF@
+XML2_CONFIG = @XML2_CONFIG@
+XML_CFLAGS = @XML_CFLAGS@
+XML_CONFIG = @XML_CONFIG@
+XML_LIBS = @XML_LIBS@
 XSETPOINTER_PROG = @XSETPOINTER_PROG@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+af_config = @af_config@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+gnomeconfig = @gnomeconfig@
+gnomedatadir = @gnomedatadir@
+gnomepresent = @gnomepresent@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 x_libraries = @x_libraries@
+EXTRA_DIST = terminatorX-app.png\
+       terminatorX-mime.png\
+       terminatorX.mime\
+       tx-gnome-install\
+       tx-gnome-uninstall\
+       terminatorX.desktop\
+       README.GNOME
+
+@GNOMEpresent_TRUE@gnomedir = @gnomedatadir@
+@GNOMEpresent_TRUE@gnomeappdir = $(gnomedir)/gnome/apps/Multimedia
+@GNOMEpresent_TRUE@gnomeapp_DATA = terminatorX.desktop
+@GNOMEpresent_TRUE@mimetypedir = $(gnomedir)/mime-info
+@GNOMEpresent_TRUE@mimetype_DATA = terminatorX.keys terminatorX.mime
+@GNOMEpresent_TRUE@pixmapdir = $(gnomedir)/pixmaps
+@GNOMEpresent_TRUE@pixmap_DATA = terminatorX-app.png terminatorX-mime.png
+all: all-am
 
-SOURCES = terminatorX-app.xpm  terminatorX-mime.xpm    terminatorX.keys        terminatorX.mime        tx-gnome-install        tx-gnome-uninstall      README.GNOME
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-       cd $(top_srcdir) && $(AUTOMAKE) --gnu gnome-support/Makefile
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+       @for dep in $?; do \
+         case '$(am__configure_deps)' in \
+           *$$dep*) \
+             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+               && { if test -f $@; then exit 0; else break; fi; }; \
+             exit 1;; \
+         esac; \
+       done; \
+       echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gnome-support/Makefile'; \
+       $(am__cd) $(top_srcdir) && \
+         $(AUTOMAKE) --gnu gnome-support/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+       @case '$?' in \
+         *config.status*) \
+           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+         *) \
+           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+       esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+terminatorX.keys: $(top_builddir)/config.status $(srcdir)/terminatorX.keys.in
+       cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+install-gnomeappDATA: $(gnomeapp_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(gnomeapp_DATA)'; test -n "$(gnomeappdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(gnomeappdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(gnomeappdir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gnomeappdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(gnomeappdir)" || exit $$?; \
+       done
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-       cd $(top_builddir) \
-         && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+uninstall-gnomeappDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(gnomeapp_DATA)'; test -n "$(gnomeappdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(gnomeappdir)'; $(am__uninstall_files_from_dir)
+install-mimetypeDATA: $(mimetype_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(mimetype_DATA)'; test -n "$(mimetypedir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(mimetypedir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(mimetypedir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimetypedir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(mimetypedir)" || exit $$?; \
+       done
+
+uninstall-mimetypeDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(mimetype_DATA)'; test -n "$(mimetypedir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(mimetypedir)'; $(am__uninstall_files_from_dir)
+install-pixmapDATA: $(pixmap_DATA)
+       @$(NORMAL_INSTALL)
+       @list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
+       if test -n "$$list"; then \
+         echo " $(MKDIR_P) '$(DESTDIR)$(pixmapdir)'"; \
+         $(MKDIR_P) "$(DESTDIR)$(pixmapdir)" || exit 1; \
+       fi; \
+       for p in $$list; do \
+         if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; \
+       done | $(am__base_list) | \
+       while read files; do \
+         echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pixmapdir)'"; \
+         $(INSTALL_DATA) $$files "$(DESTDIR)$(pixmapdir)" || exit $$?; \
+       done
 
+uninstall-pixmapDATA:
+       @$(NORMAL_UNINSTALL)
+       @list='$(pixmap_DATA)'; test -n "$(pixmapdir)" || list=; \
+       files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+       dir='$(DESTDIR)$(pixmapdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
+ctags: CTAGS
+CTAGS:
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = gnome-support
 
 distdir: $(DISTFILES)
-       here=`cd $(top_builddir) && pwd`; \
-       top_distdir=`cd $(top_distdir) && pwd`; \
-       distdir=`cd $(distdir) && pwd`; \
-       cd $(top_srcdir) \
-         && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu gnome-support/Makefile
-       @for file in $(DISTFILES); do \
-         d=$(srcdir); \
+       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+       list='$(DISTFILES)'; \
+         dist_files=`for file in $$list; do echo $$file; done | \
+         sed -e "s|^$$srcdirstrip/||;t" \
+             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+       case $$dist_files in \
+         */*) $(MKDIR_P) `echo "$$dist_files" | \
+                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+                          sort -u` ;; \
+       esac; \
+       for file in $$dist_files; do \
+         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
-           cp -pr $$d/$$file $(distdir)/$$file; \
+           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+           if test -d "$(distdir)/$$file"; then \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+           fi; \
+           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
          else \
-           test -f $(distdir)/$$file \
-           || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-           || cp -p $$d/$$file $(distdir)/$$file || :; \
+           test -f "$(distdir)/$$file" \
+           || cp -p $$d/$$file "$(distdir)/$$file" \
+           || exit 1; \
          fi; \
        done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
+all-am: Makefile $(DATA)
+installdirs:
+       for dir in "$(DESTDIR)$(gnomeappdir)" "$(DESTDIR)$(mimetypedir)" "$(DESTDIR)$(pixmapdir)"; do \
+         test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+       done
+install: install-am
 install-exec: install-exec-am
-
-install-data-am:
 install-data: install-data-am
+uninstall: uninstall-am
 
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
 
+installcheck: installcheck-am
+install-strip:
+       if test -z '$(STRIP)'; then \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+             install; \
+       else \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+       fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
-       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+       @echo "This command is intended for maintainers to use"
+       @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
+       -rm -f Makefile
+distclean-am: clean-am distclean-generic
 
-clean: clean-am
+dvi: dvi-am
+
+dvi-am:
 
-distclean-am:  distclean-generic clean-am
+html: html-am
 
-distclean: distclean-am
+html-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-       @echo "This command is intended for maintainers to use;"
-       @echo "it deletes files that may require special tools to rebuild."
+info: info-am
+
+info-am:
+
+install-data-am: install-gnomeappDATA install-mimetypeDATA \
+       install-pixmapDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+       -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-gnomeappDATA uninstall-mimetypeDATA \
+       uninstall-pixmapDATA
+
+.MAKE: install-am install-strip
 
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+.PHONY: all all-am check check-am clean clean-generic distclean \
+       distclean-generic distdir dvi dvi-am html html-am info info-am \
+       install install-am install-data install-data-am install-dvi \
+       install-dvi-am install-exec install-exec-am \
+       install-gnomeappDATA install-html install-html-am install-info \
+       install-info-am install-man install-mimetypeDATA install-pdf \
+       install-pdf-am install-pixmapDATA install-ps install-ps-am \
+       install-strip installcheck installcheck-am installdirs \
+       maintainer-clean maintainer-clean-generic mostlyclean \
+       mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+       uninstall-gnomeappDATA uninstall-mimetypeDATA \
+       uninstall-pixmapDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
index 87d8dd7baba785692b62dc2b885922d6fc3d8e92..128a39b2dcff532cb953d6eafbffd002e87347e2 100644 (file)
@@ -81,18 +81,18 @@ void apply_options(GtkWidget *dialog) {
        globals.use_realtime=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(dialog, "use_realtime")));
        
        /* Audio: OSS */
-       strcpy(globals.oss_device, gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(lookup_widget(dialog, "oss_audio_device"))->entry)));
+       strcpy(globals.oss_device, gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(lookup_widget(dialog, "oss_audio_device"))));
        globals.oss_buff_no=(int) gtk_spin_button_get_value(GTK_SPIN_BUTTON(lookup_widget(dialog, "oss_buffers")));
        globals.oss_buff_size=(int) gtk_range_get_value(GTK_RANGE(lookup_widget(dialog, "oss_buffersize")));
-       globals.oss_samplerate=atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(lookup_widget(dialog, "oss_samplerate"))->entry)));
+       globals.oss_samplerate=atoi(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(lookup_widget(dialog, "oss_samplerate"))));
        
        /* Audio: ALSA */
-       strcpy(globals.alsa_device_id, gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(lookup_widget(dialog, "alsa_audio_device"))->entry)));
+       strcpy(globals.alsa_device_id, gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(lookup_widget(dialog, "alsa_audio_device"))));
        globals.alsa_buffer_time=(int) gtk_range_get_value(GTK_RANGE(lookup_widget(dialog, "alsa_buffer_time")));
        globals.alsa_buffer_time*=1000;
        globals.alsa_period_time=(int) gtk_range_get_value(GTK_RANGE(lookup_widget(dialog, "alsa_period_time")));
        globals.alsa_period_time*=1000;
-       globals.alsa_samplerate=atoi(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(lookup_widget(dialog, "alsa_samplerate"))->entry)));        
+       globals.alsa_samplerate=atoi(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(lookup_widget(dialog, "alsa_samplerate")))); 
        globals.alsa_free_hwstats=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(dialog, "alsa_free_hwstats")));
        
        /* TODO: JACK
@@ -100,7 +100,7 @@ void apply_options(GtkWidget *dialog) {
        
        /* Input */
        globals.xinput_enable=(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(dialog, "xinput_enable")))==TRUE);
-       strcpy(globals.xinput_device, gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(lookup_widget(dialog, "xinput_device"))->entry)));
+       strcpy(globals.xinput_device, gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(lookup_widget(dialog, "xinput_device"))));
        globals.mouse_speed=gtk_range_get_value(GTK_RANGE(lookup_widget(dialog, "mouse_speed")));
        globals.sense_cycles=(int) gtk_range_get_value(GTK_RANGE(lookup_widget(dialog, "stop_sense_cycles")));
        globals.vtt_inertia=gtk_range_get_value(GTK_RANGE(lookup_widget(dialog, "vtt_inertia")));
@@ -109,8 +109,9 @@ void apply_options(GtkWidget *dialog) {
        globals.show_nag=(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(dialog, "startup_nagbox")))==TRUE);
        globals.tooltips=(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(dialog, "mainwin_tooltips")))==TRUE);
        globals.filename_length=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(lookup_widget(dialog, "filename_length")));
-       if (globals.tooltips) gtk_tooltips_enable(gui_tooltips);
-       else gtk_tooltips_disable(gui_tooltips);
+//     if (globals.tooltips) gtk_tooltips_enable(gui_tooltips);
+//     else gtk_tooltips_disable(gui_tooltips);
+//     TODO: Disable Tooltips no longer possible?
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(dialog, "buttons_text_only")))) {
                globals.button_type=BUTTON_TYPE_TEXT;
@@ -209,16 +210,9 @@ void apply_options(GtkWidget *dialog) {
        add_widget_dyn(label);
 
 #ifdef USE_ALSA
-static GList *alsa_devices=NULL;
-
-GList *get_alsa_device_list() {
-       if (alsa_devices) {
-               return alsa_devices;
-       }
-       
+void append_alsa_device_list(GtkComboBoxText *combo) {
        FILE *file;
        char buffer[PATH_MAX+1];
-       alsa_devices=NULL;
        
        if ((file = fopen("/proc/asound/pcm", "r"))) {
                while(fgets(buffer, PATH_MAX, file)) {
@@ -234,49 +228,36 @@ GList *get_alsa_device_list() {
                                sscanf(buffer, "%i-%i: %1024c", &card, &device, foo);
                                sprintf(tmp, "hw:%i,%i# %s", card, device, foo);
                                
-                               alsa_devices=g_list_append (alsa_devices, strdup(tmp));
+                               gtk_combo_box_text_append_text(combo, strdup(tmp));
                        }
                }
                fclose(file);
        }
-       
-       return alsa_devices;
 }
 #else
-GList *get_alsa_device_list() {
-       return NULL;
+void append_alsa_device_list(GtkComboBoxText *combo) {
 }
 #endif
 
 
 #ifdef USE_OSS
-static GList *oss_devices=NULL;
-
 int oss_select_dsp_only(const struct dirent *entry){
        return (strstr(entry->d_name, "dsp")!=0);
 }
 
-GList *get_oss_device_list() {
-       if (oss_devices) {
-               return oss_devices;
-       }
-               
+void append_oss_device_list(GtkComboBoxText *combo) {
     struct dirent **namelist;
     int n,i;
     n = scandir("/dev", &namelist, oss_select_dsp_only, alphasort);
     
-       oss_devices=NULL;
-       
     if (n>0) {
        for (i=0; i<n; i++) {
                        char buffer[256];
             sprintf(buffer, "/dev/%s", namelist[i]->d_name);
             free(namelist[i]);
-                       oss_devices=g_list_append (oss_devices, strdup(buffer));
+            gtk_combo_box_text_append_text(combo, strdup(buffer));
                }
        }
-       
-       return oss_devices;
 }
 #endif
 
@@ -328,8 +309,6 @@ char *colors[MAX_COLORS]={ NULL };
 
 
 void init_tx_options(GtkWidget *dialog) {
-       GtkTooltips *tooltips=GTK_TOOLTIPS(lookup_widget(dialog, "tooltips"));
-       
        if (colors[0]==NULL) {
                for (int i=0; i<MAX_COLORS; i++) {
                        colors[i]=new char[8];
@@ -376,57 +355,52 @@ void init_tx_options(GtkWidget *dialog) {
 #endif 
        
        /* Audio: OSS */
-       GList *oss_list=get_oss_device_list();
-       if (oss_list) {
-               gtk_combo_set_popdown_strings(GTK_COMBO(lookup_widget(dialog, "oss_audio_device")), oss_list);
-       }
-       gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(lookup_widget(dialog, "oss_audio_device"))->entry), globals.oss_device);
+       append_oss_device_list(GTK_COMBO_BOX_TEXT(lookup_widget(dialog, "oss_audio_device")));
+       gtk_entry_set_text(GTK_ENTRY(GTK_COMBO_BOX(lookup_widget(dialog, "oss_audio_device"))->entry), globals.oss_device);
 
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(lookup_widget(dialog, "oss_buffers")), globals.oss_buff_no);
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "oss_buffersize")), globals.oss_buff_size);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "oss_buffersize"), "Set the size of the kernel level audio buffers. On slower systems you might have to increase this value (if you hear \"clicks\" or drop-outs). Lower values mean lower latency though.", NULL);        
-       gtk_combo_set_popdown_strings(GTK_COMBO(lookup_widget(dialog, "oss_samplerate")), get_sampling_rates_list());
+       gtk_widget_set_tooltip_text(lookup_widget(dialog, "oss_buffersize"), "Set the size of the kernel level audio buffers. On slower systems you might have to increase this value (if you hear \"clicks\" or drop-outs). Lower values mean lower latency though."); 
+       gtk_combo_set_popdown_strings(GTK_COMBO_BOX(lookup_widget(dialog, "oss_samplerate")), get_sampling_rates_list());
        char tmp[64];
        sprintf(tmp, "%i", globals.oss_samplerate);
-       gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(lookup_widget(dialog, "oss_samplerate"))->entry), tmp);
+       gtk_entry_set_text(GTK_ENTRY(GTK_COMBO_BOX(lookup_widget(dialog, "oss_samplerate"))->entry), tmp);
        
        
        /* Audio: ALSA */
-       GtkCombo *combo=GTK_COMBO(lookup_widget(dialog, "alsa_audio_device"));
+       GtkCombo *combo=GTK_COMBO_BOX(lookup_widget(dialog, "alsa_audio_device"));
        GList *alsa_list=get_alsa_device_list();
        last_alsa_device_widget=NULL;
        alsa_device_entry=combo->entry;
        
-       if (alsa_list) {
-               gtk_combo_set_popdown_strings(combo, get_alsa_device_list());
-       }
+       append_alsa_device_list(GTK_COMBOBOX_TEXT(combo));
        gtk_entry_set_text(GTK_ENTRY(combo->entry), globals.alsa_device_id);
 
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "alsa_buffer_time")), globals.alsa_buffer_time/1000);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "alsa_buffer_time"), "Sets the size of the ALSA ring buffer. On slower systems you might have to increase this value (if you hear \"clicks\" or drop-outs). Lower values mean lower latency though.", NULL);       
+       gtk_widget_set_tooltip_text(lookup_widget(dialog, "alsa_buffer_time"), "Sets the size of the ALSA ring buffer. On slower systems you might have to increase this value (if you hear \"clicks\" or drop-outs). Lower values mean lower latency though.");        
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "alsa_period_time")), globals.alsa_period_time/1000);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "alsa_period_time"), "The ALSA period time determines how much audio data will be written to the device at once. It is recommended to set this value to a half or a third of the ALSA buffer time.", NULL);        
+       gtk_widget_set_tooltip_text(lookup_widget(dialog, "alsa_period_time"), "The ALSA period time determines how much audio data will be written to the device at once. It is recommended to set this value to a half or a third of the ALSA buffer time."); 
 
-       gtk_combo_set_popdown_strings(GTK_COMBO(lookup_widget(dialog, "alsa_samplerate")), get_sampling_rates_list());
+       gtk_combo_set_popdown_strings(GTK_COMBO_BOX(lookup_widget(dialog, "alsa_samplerate")), get_sampling_rates_list());
        sprintf(tmp, "%i", globals.alsa_samplerate);
-       gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(lookup_widget(dialog, "alsa_samplerate"))->entry), tmp);
+       gtk_entry_set_text(GTK_ENTRY(GTK_COMBO_BOX(lookup_widget(dialog, "alsa_samplerate"))->entry), tmp);
        
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(dialog, "alsa_free_hwstats")), globals.alsa_free_hwstats);
        
        /* Input */
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(lookup_widget(dialog, "xinput_enable")), globals.xinput_enable);
        
-       gtk_combo_set_popdown_strings(GTK_COMBO(lookup_widget(dialog, "xinput_device")), get_xinput_devices_list());
-       gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(lookup_widget(dialog, "xinput_device"))->entry), globals.xinput_device);
+       gtk_combo_set_popdown_strings(GTK_COMBO_BOX(lookup_widget(dialog, "xinput_device")), get_xinput_devices_list());
+       gtk_entry_set_text(GTK_ENTRY(GTK_COMBO_BOX(lookup_widget(dialog, "xinput_device"))->entry), globals.xinput_device);
 
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "mouse_speed")), globals.mouse_speed);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "mouse_speed"), "The speed of your mouse in scratch mode. Use negative values to invert motion.", NULL);
+       gtk_widget_set_tooltip_text(lookup_widget(dialog, "mouse_speed"), "The speed of your mouse in scratch mode. Use negative values to invert motion.");
        
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "stop_sense_cycles")), globals.sense_cycles);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "stop_sense_cycles"),"If there is no \"motion-event\" for x cycles, where x is the number of cycles you select here, terminatorX assumes mouse motion has stopped. For smaller buffer sizes (=> shorter cycle times) you might have to increase this value", NULL);        
+       gtk_widget_set_tooltip_text(lookup_widget(dialog, "stop_sense_cycles"),"If there is no \"motion-event\" for x cycles, where x is the number of cycles you select here, terminatorX assumes mouse motion has stopped. For smaller buffer sizes (=> shorter cycle times) you might have to increase this value"); 
 
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "vtt_inertia")), globals.vtt_inertia);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "vtt_inertia"),"This value defines how fast the turntables will adapt to the speed input - the higher this value, the longer it will take the turntable to actually reach the target speed.", NULL);       
+       gtk_widget_set_tooltip_text(lookup_widget(dialog, "vtt_inertia"),"This value defines how fast the turntables will adapt to the speed input - the higher this value, the longer it will take the turntable to actually reach the target speed.");        
 
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(lookup_widget(dialog, "filename_length")), globals.filename_length);
 
@@ -449,11 +423,11 @@ void init_tx_options(GtkWidget *dialog) {
        }
        
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "update_delay")), globals.update_delay);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "update_delay"), "How often to update the slow widgets.", NULL);   
+       gtk_widget_set_tooltip_text(lookup_widget(dialog, "update_delay"), "How often to update the slow widgets.");    
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "update_idle")), globals.update_idle);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "update_idle"), "The update thread will idle for the selcted amount of milliseconds. If you want to have a more responsive display update reduce this value - if you have performance problems increase this value.", NULL);       
+       gtk_widget_set_tooltip_text(lookup_widget(dialog, "update_idle"), "The update thread will idle for the selcted amount of milliseconds. If you want to have a more responsive display update reduce this value - if you have performance problems increase this value.");        
        gtk_range_set_value(GTK_RANGE(lookup_widget(dialog, "vumeter_decay")), globals.flash_response);
-       gtk_tooltips_set_tip(tooltips, lookup_widget(dialog, "vumeter_decay"), "Defines how fast the maximum values of the VU meters should be decayed.", NULL);        
+       gtk_widget_set_tooltip_text(lookup_widget(dialog, "vumeter_decay"), "Defines how fast the maximum values of the VU meters should be decayed."); 
 
        /* Audio Colors */
        int ctr=0;
@@ -777,8 +751,8 @@ void show_about(int nag)
                gtk_container_add(GTK_CONTAINER(window), box);
                gtk_widget_show(box);
                
-               g_signal_connect(G_OBJECT(btn), "clicked", (GtkSignalFunc) destroy_about, NULL);                
-               g_signal_connect(G_OBJECT(window), "delete-event", (GtkSignalFunc) destroy_about, NULL);                
+               g_signal_connect(G_OBJECT(btn), "clicked", (GCallback) destroy_about, NULL);            
+               g_signal_connect(G_OBJECT(window), "delete-event", (GCallback) destroy_about, NULL);            
        }
        gtk_widget_show(window);        
        tX_set_icon(window);
index a4e43e75027304cba704cba7b50b631047cc4f85..0a354da750441aab636eb5377b1d3f3a6377b089 100644 (file)
@@ -25,7 +25,7 @@
 #define WID_DYN TRUE, TRUE, 0
 #define WID_FIX FALSE, FALSE, 0
 
-GtkSignalFunc tX_extdial :: f_entry(GtkWidget *w, tX_extdial *ed)
+GCallback tX_extdial :: f_entry(GtkWidget *w, tX_extdial *ed)
 {
        strcpy(ed->sval, gtk_entry_get_text(GTK_ENTRY(ed->entry)));
        ed->s2f();
@@ -33,7 +33,7 @@ GtkSignalFunc tX_extdial :: f_entry(GtkWidget *w, tX_extdial *ed)
        return NULL;
 }
 
-GtkSignalFunc tX_extdial :: f_adjustment(GtkWidget *w, tX_extdial *ed)
+GCallback tX_extdial :: f_adjustment(GtkWidget *w, tX_extdial *ed)
 {
        ed->fval=ed->adj->value;
        ed->f2s();
index 4563fa7203d4a7ed2b2ab46fa2fb6054923dacfb..2e0733d2fd2bc6423f99fc2471961ab7ea038f58 100644 (file)
@@ -52,8 +52,8 @@ class tX_extdial
        GtkWidget *get_dial() { return dial; }
        GtkWidget *get_entry() { return entry; }
        
-       static GtkSignalFunc f_entry(GtkWidget *w, tX_extdial *ed);
-       static GtkSignalFunc f_adjustment(GtkWidget *w, tX_extdial *ed);
+       static GCallback f_entry(GtkWidget *w, tX_extdial *ed);
+       static GCallback f_adjustment(GtkWidget *w, tX_extdial *ed);
 };
 
 #endif
index 030f57739b50f39dd64db4b0cbb7a2eeaf8fc2ab..1d487f2d1623ba2de4d5f8e9ad3f398040132b63 100644 (file)
@@ -101,9 +101,9 @@ GtkWidget *fullscreen_item;
 int rec_dont_care=0;
 gint update_tag;
 
-#define connect_entry(wid, func, ptr); g_signal_connect(G_OBJECT(wid), "activate", (GtkSignalFunc) func, (void *) ptr);
-#define connect_adj(wid, func, ptr); g_signal_connect(G_OBJECT(wid), "value_changed", (GtkSignalFunc) func, (void *) ptr);
-#define connect_button(wid, func, ptr); g_signal_connect(G_OBJECT(wid), "clicked", (GtkSignalFunc) func, (void *) ptr);
+#define connect_entry(wid, func, ptr); g_signal_connect(G_OBJECT(wid), "activate", (GCallback) func, (void *) ptr);
+#define connect_adj(wid, func, ptr); g_signal_connect(G_OBJECT(wid), "value_changed", (GCallback) func, (void *) ptr);
+#define connect_button(wid, func, ptr); g_signal_connect(G_OBJECT(wid), "clicked", (GCallback) func, (void *) ptr);
 
 Window x_window;
 GdkWindow* top_window;
@@ -138,11 +138,9 @@ int last_grab_status=0;
 GtkWidget *delete_all_item=NULL;
 GtkWidget *delete_all_vtt_item=NULL;
 
-GtkTooltips *gui_tooltips=NULL;
-
 void gui_set_tooltip(GtkWidget *wid, const char *tip)
 {
-       gtk_tooltips_set_tip(gui_tooltips, wid, tip, NULL);
+       gtk_widget_set_tooltip_text(wid, tip);
 }
 
 void turn_audio_off(void)
@@ -246,7 +244,7 @@ void mg_update_status()
        gtk_label_set_text(GTK_LABEL(no_of_vtts), buffer);*/
 }
 
-GtkSignalFunc new_table(GtkWidget *, char *fn)
+GCallback new_table(GtkWidget *, char *fn)
 {
        //turn_audio_off();
                
@@ -270,7 +268,7 @@ GtkSignalFunc new_table(GtkWidget *, char *fn)
 bool tx_mg_have_setname=false;
 char tx_mg_current_setname[PATH_MAX]="";
 
-GtkSignalFunc new_tables() {
+GCallback new_tables() {
        GtkWidget *dialog=gtk_message_dialog_new(GTK_WINDOW(main_window), 
                GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
                "Are you sure you want to lose all turntables and events?");
@@ -296,7 +294,7 @@ GtkSignalFunc new_tables() {
 
 /* Loading saved setups */
 #ifndef USE_FILECHOOSER
-GtkSignalFunc cancel_load_tables(GtkWidget *wid)
+GCallback cancel_load_tables(GtkWidget *wid)
 {
        gtk_widget_destroy(load_dialog);
        load_dialog=NULL;
@@ -397,7 +395,7 @@ void do_load_tables(GtkWidget *wid)
 }
 #endif
 
-GtkSignalFunc load_tables()
+GCallback load_tables()
 {
 #ifdef USE_FILECHOOSER 
        GtkWidget * dialog = gtk_file_chooser_dialog_new ("Open Set File",
@@ -513,7 +511,7 @@ vtt_class* choose_vtt() {
 }
 
 
-GtkSignalFunc load_audio() {
+GCallback load_audio() {
        vtt_class *vtt = NULL;
        
        pthread_mutex_lock(&vtt_class::render_lock);
@@ -531,7 +529,7 @@ GtkSignalFunc load_audio() {
        return NULL;
 }
 
-GtkSignalFunc drop_set(GtkWidget *widget, GdkDragContext *context,
+GCallback drop_set(GtkWidget *widget, GdkDragContext *context,
                gint x, gint y, GtkSelectionData *selection_data,
                guint info, guint time, vtt_class *vtt)
 {
@@ -556,7 +554,7 @@ GtkSignalFunc drop_set(GtkWidget *widget, GdkDragContext *context,
 /* save tables */
 
 #ifndef USE_FILECHOOSER
-GtkSignalFunc cancel_save_tables(GtkWidget *wid)
+GCallback cancel_save_tables(GtkWidget *wid)
 {
        gtk_widget_destroy(save_dialog);
        save_dialog=NULL;
@@ -627,7 +625,7 @@ void do_save_tables(char *buffer)
        }
 }
 
-GtkSignalFunc save_tables_as()
+GCallback save_tables_as()
 {
 #ifdef USE_FILECHOOSER
        GtkWidget * dialog = gtk_file_chooser_dialog_new ("Save Set",
@@ -672,7 +670,7 @@ GtkSignalFunc save_tables_as()
        return NULL;
 }
 
-GtkSignalFunc save_tables()
+GCallback save_tables()
 {
        if (!tx_mg_have_setname) {
                save_tables_as();
@@ -683,13 +681,13 @@ GtkSignalFunc save_tables()
        return NULL;
 }
 
-GtkSignalFunc master_volume_changed (GtkWidget *wid, void *d)
+GCallback master_volume_changed (GtkWidget *wid, void *d)
 {
        sp_master_volume.receive_gui_value((float) GTK_ADJUSTMENT(wid)->value);
        return NULL;    
 }
 
-GtkSignalFunc master_pitch_changed(GtkWidget *wid, void *d)
+GCallback master_pitch_changed(GtkWidget *wid, void *d)
 {
        sp_master_pitch.receive_gui_value((float) GTK_ADJUSTMENT(wid)->value);  
        return NULL;    
@@ -708,11 +706,11 @@ void mg_enable_critical_buttons(int enable)
        vg_enable_critical_buttons(enable);
 }
 
-GtkSignalFunc seq_stop(GtkWidget *w, void *);
+GCallback seq_stop(GtkWidget *w, void *);
 
 static bool stop_override=false;
 
-GtkSignalFunc audio_on(GtkWidget *w, void *d)
+GCallback audio_on(GtkWidget *w, void *d)
 {
        tX_engine_error res;
        
@@ -777,7 +775,7 @@ GtkSignalFunc audio_on(GtkWidget *w, void *d)
        return NULL;
 }
 
-GtkSignalFunc cancel_rec(GtkWidget *wid)
+GCallback cancel_rec(GtkWidget *wid)
 {
        gtk_widget_destroy(rec_dialog);
        rec_dialog=NULL;
@@ -806,7 +804,7 @@ void do_rec(GtkWidget *wid)
        rec_dialog_win=NULL;
 }
 
-GtkSignalFunc select_rec_file()
+GCallback select_rec_file()
 {
 #ifdef USE_FILECHOOSER
        GtkWidget * dialog = gtk_file_chooser_dialog_new ("Record To Disk",
@@ -858,7 +856,7 @@ GtkSignalFunc select_rec_file()
        return NULL;
 }
 
-GtkSignalFunc tape_on(GtkWidget *w, void *d)
+GCallback tape_on(GtkWidget *w, void *d)
 {
        if (rec_dont_care) return 0;
 
@@ -925,7 +923,7 @@ void mplcfitx()
        show_about(0);
 }
 
-GtkSignalFunc seq_play(GtkWidget *w, void *)
+GCallback seq_play(GtkWidget *w, void *)
 {
        if ((sequencer.is_empty()) &&   (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(seq_rec_btn)))) {
                if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
@@ -946,7 +944,7 @@ GtkSignalFunc seq_play(GtkWidget *w, void *)
        return NULL;
 }
 
-GtkSignalFunc seq_stop(GtkWidget *w, void *)
+GCallback seq_stop(GtkWidget *w, void *)
 {
        if (!sequencer_ready) return NULL;
        sequencer.trig_stop();
@@ -964,7 +962,7 @@ GtkSignalFunc seq_stop(GtkWidget *w, void *)
        return NULL;
 }
 
-GtkSignalFunc seq_rec(GtkWidget *w, void *)
+GCallback seq_rec(GtkWidget *w, void *)
 {
        seq_adj_care=0;
        gtk_widget_set_sensitive(seq_slider, 0);
@@ -1543,7 +1541,7 @@ void create_mastergui(int x, int y)
        dummy=gtk_hscale_new(dumadj);
        gtk_widget_set_size_request(dummy, 65, 20);
        seq_slider=dummy;
-       g_signal_connect(G_OBJECT(seq_slider), "button-release-event", (GtkSignalFunc) seq_slider_released, NULL);
+       g_signal_connect(G_OBJECT(seq_slider), "button-release-event", (GCallback) seq_slider_released, NULL);
        gtk_scale_set_draw_value(GTK_SCALE(dummy), FALSE);
        
        gui_set_tooltip(dummy, "Select the start position for the sequencer in song-time.");
@@ -1621,7 +1619,7 @@ void create_mastergui(int x, int y)
        dummy=gtk_vscale_new(dumadj);
        gtk_range_set_inverted(GTK_RANGE(dummy), TRUE);
        gtk_scale_set_draw_value(GTK_SCALE(dummy), False);
-       g_signal_connect(G_OBJECT(dummy), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, &sp_master_volume); 
+       g_signal_connect(G_OBJECT(dummy), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, &sp_master_volume);     
        
        gtk_box_pack_end(GTK_BOX(master_vol_box), dummy, WID_FIX);
        gtk_widget_show(dummy); 
@@ -1696,7 +1694,7 @@ void create_mastergui(int x, int y)
 
        new_table(NULL, NULL); // to give the user something to start with ;)
 
-       g_signal_connect (G_OBJECT(main_window), "delete-event", (GtkSignalFunc) quit, NULL);
+       g_signal_connect (G_OBJECT(main_window), "delete-event", (GCallback) quit, NULL);
        
        if (globals.tooltips) gtk_tooltips_enable(gui_tooltips);
        else gtk_tooltips_disable(gui_tooltips);
index 255e7f0b2e268f9a1ae80ab2b469318d30d822ce..7436b2958cf8f35fb1a3375f9bc62656104374af 100644 (file)
@@ -55,7 +55,7 @@ extern void seq_update();
 
 extern GtkWidget *control_parent;
 extern GtkWidget *audio_parent;
-extern GtkTooltips *gui_tooltips;
+
 extern void gui_set_tooltip(GtkWidget *wid, const char *tip);
 
 extern GtkWidget *panel_bar;
index 3956339925079e89b360ace0c726ee022f8232cd..6087c11947a9c647bdf1fac7b4db98d43cc28874 100644 (file)
@@ -302,10 +302,10 @@ tX_midiin::midi_binding_gui::midi_binding_gui ( GtkTreeModel* _model, tX_midiin*
        gtk_widget_show (close_button);
        gtk_box_pack_start (GTK_BOX (vbox1), close_button, FALSE, FALSE, 0);
        
-       g_signal_connect(G_OBJECT(bind_button), "clicked", (GtkSignalFunc) bind_clicked, (void *) this);
-       g_signal_connect(G_OBJECT(unbind_button), "clicked", (GtkSignalFunc) unbind_clicked, (void *) this);    
-       g_signal_connect(G_OBJECT(close_button), "clicked", (GtkSignalFunc) close_clicked, (void *) this);
-       g_signal_connect(G_OBJECT(window), "destroy", (GtkSignalFunc) close_clicked, (void *) this);
+       g_signal_connect(G_OBJECT(bind_button), "clicked", (GCallback) bind_clicked, (void *) this);
+       g_signal_connect(G_OBJECT(unbind_button), "clicked", (GCallback) unbind_clicked, (void *) this);        
+       g_signal_connect(G_OBJECT(close_button), "clicked", (GCallback) close_clicked, (void *) this);
+       g_signal_connect(G_OBJECT(window), "destroy", (GCallback) close_clicked, (void *) this);
        
        timer_tag = gtk_timeout_add( 100, (GtkFunction) timer, (void *) this);
        
index 1e16d6e9b49a0c4e4b30b9aba3c974bc7390946c..64b52391c8f815ec86b599f2a88a5efc600d1c84 100644 (file)
@@ -103,7 +103,7 @@ tX_panel :: tX_panel (const char *name, GtkWidget *par)
        gtk_widget_show(clientframe);   
        gtk_widget_show(mainbox);
        
-       g_signal_connect(G_OBJECT(minbutton), "clicked", (GtkSignalFunc) tX_panel::minimize, (void *) this);
+       g_signal_connect(G_OBJECT(minbutton), "clicked", (GCallback) tX_panel::minimize, (void *) this);
 }
 
 void tX_panel :: add_client_widget(GtkWidget *w)
index 3fb7f509b912fa6b47265ae176ada49652f39e37..1e4c0a0e1900175f5bf072a566c9489aacb5a0b3 100644 (file)
@@ -959,7 +959,7 @@ void tX_seqpar_vttfx_float :: create_widget()
        //myadj=GTK_ADJUSTMENT(gtk_adjustment_new(*fx_value, min_value+tmp/10, max_value-tmp/10, tmp, tmp, tmp));
        myadj=GTK_ADJUSTMENT(gtk_adjustment_new(*fx_value, min_value, max_value, tmp, tmp, tmp));
        mydial=new tX_extdial(label_name, myadj, this);
-       g_signal_connect(G_OBJECT(myadj), "value_changed", (GtkSignalFunc) tX_seqpar_vttfx_float :: gtk_callback, this);
+       g_signal_connect(G_OBJECT(myadj), "value_changed", (GCallback) tX_seqpar_vttfx_float :: gtk_callback, this);
        widget = mydial->get_widget();  
 }
 
@@ -978,7 +978,7 @@ void tX_seqpar_vttfx_float :: do_update_graphics()
        gtk_adjustment_set_value(myadj, *fx_value);
 }
 
-GtkSignalFunc tX_seqpar_vttfx_float :: gtk_callback(GtkWidget* w, tX_seqpar_vttfx_float *sp)
+GCallback tX_seqpar_vttfx_float :: gtk_callback(GtkWidget* w, tX_seqpar_vttfx_float *sp)
 {
        sp->receive_gui_value(sp->myadj->value);        
        return NULL;    
@@ -998,9 +998,9 @@ void tX_seqpar_vttfx_int :: create_widget()
        tmpwid=gtk_spin_button_new(myadj,1.0,0);
        gtk_widget_show(tmpwid);
        gtk_box_pack_start(GTK_BOX(box), tmpwid, WID_DYN);
-       g_signal_connect(G_OBJECT(tmpwid), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, this);
+       g_signal_connect(G_OBJECT(tmpwid), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, this);
        
-       g_signal_connect(G_OBJECT(myadj), "value_changed", (GtkSignalFunc) tX_seqpar_vttfx_int :: gtk_callback, this);
+       g_signal_connect(G_OBJECT(myadj), "value_changed", (GCallback) tX_seqpar_vttfx_int :: gtk_callback, this);
 
     tmpwid=gtk_label_new(label_name);
        gtk_widget_show(tmpwid);
@@ -1009,7 +1009,7 @@ void tX_seqpar_vttfx_int :: create_widget()
        gtk_widget_show(box);
        
        widget=gtk_event_box_new();
-       g_signal_connect(G_OBJECT(widget), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, this);
+       g_signal_connect(G_OBJECT(widget), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, this);
        
        gtk_container_add(GTK_CONTAINER(widget), box);
 }
@@ -1029,7 +1029,7 @@ void tX_seqpar_vttfx_int :: do_update_graphics()
        gtk_adjustment_set_value(myadj, *fx_value);
 }
 
-GtkSignalFunc tX_seqpar_vttfx_int :: gtk_callback(GtkWidget* w, tX_seqpar_vttfx_int *sp)
+GCallback tX_seqpar_vttfx_int :: gtk_callback(GtkWidget* w, tX_seqpar_vttfx_int *sp)
 {
        sp->receive_gui_value(sp->myadj->value);        
        return NULL;
@@ -1040,8 +1040,8 @@ void tX_seqpar_vttfx_bool :: create_widget()
        *fx_value=min_value;
        widget=gtk_check_button_new_with_label(label_name);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), 0);
-       g_signal_connect(G_OBJECT(widget), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, this);
-       g_signal_connect(G_OBJECT(widget), "clicked", (GtkSignalFunc) tX_seqpar_vttfx_bool :: gtk_callback, this);
+       g_signal_connect(G_OBJECT(widget), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, this);
+       g_signal_connect(G_OBJECT(widget), "clicked", (GCallback) tX_seqpar_vttfx_bool :: gtk_callback, this);
 }
 
 tX_seqpar_vttfx_bool :: ~tX_seqpar_vttfx_bool()
@@ -1054,7 +1054,7 @@ void tX_seqpar_vttfx_bool :: do_exec(const float value)
        *fx_value=value;
 }
 
-GtkSignalFunc tX_seqpar_vttfx_bool :: gtk_callback(GtkWidget* w, tX_seqpar_vttfx_bool *sp)
+GCallback tX_seqpar_vttfx_bool :: gtk_callback(GtkWidget* w, tX_seqpar_vttfx_bool *sp)
 {
        sp->receive_gui_value(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sp->widget)));     
        return NULL;
index c70813f08407a7f3796f30095d51b329fffc5d22..82aa6ec4c311e0d3e53a95241a5a244a692572d0 100644 (file)
@@ -448,7 +448,7 @@ class tX_seqpar_vttfx_float : public tX_seqpar_vttfx
        public:
        virtual ~tX_seqpar_vttfx_float();
        
-       static GtkSignalFunc gtk_callback(GtkWidget*, tX_seqpar_vttfx_float *);
+       static GCallback gtk_callback(GtkWidget*, tX_seqpar_vttfx_float *);
 };
 
 class tX_seqpar_vttfx_bool : public tX_seqpar_vttfx
@@ -458,7 +458,7 @@ class tX_seqpar_vttfx_bool : public tX_seqpar_vttfx
        virtual void do_exec(const float value);
        virtual void do_update_graphics();      
 
-       static GtkSignalFunc gtk_callback(GtkWidget*, tX_seqpar_vttfx_bool *);
+       static GCallback gtk_callback(GtkWidget*, tX_seqpar_vttfx_bool *);
 
        public:
        virtual ~tX_seqpar_vttfx_bool();
@@ -477,7 +477,7 @@ class tX_seqpar_vttfx_int : public tX_seqpar_vttfx
        public:
        virtual ~tX_seqpar_vttfx_int();
 
-       static GtkSignalFunc gtk_callback(GtkWidget*, tX_seqpar_vttfx_int *);
+       static GCallback gtk_callback(GtkWidget*, tX_seqpar_vttfx_int *);
 };
 
 #endif
index 3c6e6c5b7f88e94259c0e4a3fe7605ae1c2c889b..c2c9edd9de657c3d42bad5434e7e6695c55d3aba 100644 (file)
@@ -110,7 +110,7 @@ void pitch_changed(GtkWidget *wid, vtt_class *vtt)
 }
 
 #ifdef USE_FILECHOOSER
-GtkSignalFunc chooser_prelis(GtkWidget *w)
+GCallback chooser_prelis(GtkWidget *w)
 {
        GtkFileChooser *fc=GTK_FILE_CHOOSER(gtk_widget_get_toplevel(w));
        char *filename=gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(fc));
@@ -124,7 +124,7 @@ GtkSignalFunc chooser_prelis(GtkWidget *w)
        return NULL;
 }
 #else
-GtkSignalFunc trigger_prelis(GtkWidget *w)
+GCallback trigger_prelis(GtkWidget *w)
 {
        GtkFileSelection *fs;
 
@@ -274,7 +274,7 @@ void drop_file(GtkWidget *widget, GdkDragContext *context,
        if (host) g_free(host);
 }
 
-GtkSignalFunc load_file(GtkWidget *wid, vtt_class *vtt)
+GCallback load_file(GtkWidget *wid, vtt_class *vtt)
 {      
 #ifdef USE_FILECHOOSER
        const char *extensions[]={ "mp3", "wav", "ogg", "flac", "iff", "aiff", "voc", "au", "spx", NULL };
@@ -990,8 +990,8 @@ void build_vtt_gui(vtt_class *vtt)
        g->stop=gtk_button_new_with_label("Stop.");
        gui_set_tooltip(g->stop, "Stop this turntable's playback.");
        p->add_client_widget(g->stop);
-       g_signal_connect(G_OBJECT(g->trigger), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, &vtt->sp_trigger);             
-       g_signal_connect(G_OBJECT(g->stop), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, &vtt->sp_trigger);                
+       g_signal_connect(G_OBJECT(g->trigger), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, &vtt->sp_trigger);         
+       g_signal_connect(G_OBJECT(g->stop), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, &vtt->sp_trigger);            
        
        g->autotrigger=gtk_check_button_new_with_label("Auto");
        p->add_client_widget(g->autotrigger);
@@ -1002,7 +1002,7 @@ void build_vtt_gui(vtt_class *vtt)
        p->add_client_widget(g->loop);
        gui_set_tooltip(g->loop, "Enable this option to make the turntable loop the audio data.");
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->loop), vtt->loop);
-       g_signal_connect(G_OBJECT(g->loop), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, &vtt->sp_loop);           
+       g_signal_connect(G_OBJECT(g->loop), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, &vtt->sp_loop);               
        
        g->sync_master=gtk_check_button_new_with_label("Master");
        p->add_client_widget(g->sync_master);
@@ -1013,13 +1013,13 @@ void build_vtt_gui(vtt_class *vtt)
        p->add_client_widget(g->sync_client);
        gui_set_tooltip(g->sync_client, "If enabled this turntable will be (re-)triggerd in relation to the sync-master turntable.");
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->sync_client), vtt->is_sync_client);
-       g_signal_connect(G_OBJECT(g->sync_client), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, &vtt->sp_sync_client);     
+       g_signal_connect(G_OBJECT(g->sync_client), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, &vtt->sp_sync_client); 
        
        g->cycles=GTK_ADJUSTMENT(gtk_adjustment_new(vtt->sync_cycles, 0, 10.0, 1,1,0));
        dummy=gtk_spin_button_new(g->cycles, 1.0, 0);
        p->add_client_widget(dummy);
        gui_set_tooltip(dummy, "Determines how often a sync-client turntable gets triggered. 0 -> this turntable will be triggered with every trigger of the sync-master table, 1 -> the table will be triggered every 2nd master trigger and so on.");
-       g_signal_connect(G_OBJECT(dummy), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, &vtt->sp_sync_cycles);      
+       g_signal_connect(G_OBJECT(dummy), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, &vtt->sp_sync_cycles);  
 
        gtk_box_pack_start(GTK_BOX(g->control_subbox), p->get_widget(), WID_FIX);
        
@@ -1044,7 +1044,7 @@ void build_vtt_gui(vtt_class *vtt)
        gui_set_tooltip(g->lp_enable, "Click here to enable the built-in lowpass effect.");
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->lp_enable), vtt->lp_enable);
        p->add_client_widget(vg_create_fx_bar(vtt, vtt->lp_fx, 0));
-       g_signal_connect(G_OBJECT(g->lp_enable), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, &vtt->sp_lp_enable); 
+       g_signal_connect(G_OBJECT(g->lp_enable), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, &vtt->sp_lp_enable);     
 
        p->add_client_widget(g->lp_enable);
 
@@ -1078,7 +1078,7 @@ void build_vtt_gui(vtt_class *vtt)
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(g->ec_enable), vtt->ec_enable);
        p->add_client_widget(g->ec_enable);
        gui_set_tooltip(g->ec_enable, "Enable the built-in echo effect.");
-       g_signal_connect(G_OBJECT(g->ec_enable), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, &vtt->sp_ec_enable); 
+       g_signal_connect(G_OBJECT(g->ec_enable), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, &vtt->sp_ec_enable);     
 
        g->ec_length=GTK_ADJUSTMENT(gtk_adjustment_new(vtt->ec_length, 0, 1, 0.1, 0.01, 0.001));
        g->ec_feedback=GTK_ADJUSTMENT(gtk_adjustment_new(vtt->ec_feedback, 0, 1, 0.1, 0.01, 0.001));
@@ -1141,13 +1141,13 @@ void build_vtt_gui(vtt_class *vtt)
 
        g->mute=gtk_check_button_new_with_label("M");
        gtk_box_pack_start(GTK_BOX(tempbox3), g->mute, WID_FIX);
-       g_signal_connect(G_OBJECT(g->mute),"clicked", (GtkSignalFunc) mute_volume, vtt);
+       g_signal_connect(G_OBJECT(g->mute),"clicked", (GCallback) mute_volume, vtt);
        gtk_widget_show(g->mute);
        gui_set_tooltip(g->mute, "Mute this turntable's mixer output.");
 
        g->solo=gtk_check_button_new_with_label("S");
        gtk_box_pack_start(GTK_BOX(tempbox3), g->solo, WID_FIX);
-       g_signal_connect(G_OBJECT(g->solo),"clicked", (GtkSignalFunc) solo_vtt, vtt);
+       g_signal_connect(G_OBJECT(g->solo),"clicked", (GCallback) solo_vtt, vtt);
        gtk_widget_show(g->solo);
        gui_set_tooltip(g->solo, "Allow only this and other solo-switched turntabels' signal to be routed to the mixer.");
 
@@ -1161,7 +1161,7 @@ void build_vtt_gui(vtt_class *vtt)
        dummy=gtk_vscale_new(GTK_ADJUSTMENT(g->volume)); 
        gtk_scale_set_draw_value(GTK_SCALE(dummy), False);
        gui_set_tooltip(dummy, "Adjust this turntable's volume.");
-       g_signal_connect(G_OBJECT(dummy), "button_press_event", (GtkSignalFunc) tX_seqpar::tX_seqpar_press, &vtt->sp_volume);   
+       g_signal_connect(G_OBJECT(dummy), "button_press_event", (GCallback) tX_seqpar::tX_seqpar_press, &vtt->sp_volume);       
 
        gtk_box_pack_start(GTK_BOX(tempbox2), dummy, WID_FIX);
        gtk_widget_show(dummy);
@@ -1226,7 +1226,7 @@ GtkWidget *vg_create_fx_bar(vtt_class *vtt, vtt_fx *effect, int showdel)
                gtk_box_pack_end(GTK_BOX(box), button, WID_FIX);
                gtk_widget_show(pixmap);
                gtk_widget_show(button);
-               g_signal_connect(G_OBJECT(button), "clicked", (GtkSignalFunc) fx_kill, (void *) effect);
+               g_signal_connect(G_OBJECT(button), "clicked", (GCallback) fx_kill, (void *) effect);
        }
 
        button=gtk_button_new();
@@ -1235,7 +1235,7 @@ GtkWidget *vg_create_fx_bar(vtt_class *vtt, vtt_fx *effect, int showdel)
        gtk_box_pack_end(GTK_BOX(box), button, WID_FIX);
        gtk_widget_show(pixmap);
        gtk_widget_show(button);
-       g_signal_connect(G_OBJECT(button), "clicked", (GtkSignalFunc) fx_down, (void *) effect);
+       g_signal_connect(G_OBJECT(button), "clicked", (GCallback) fx_down, (void *) effect);
 
        button=gtk_button_new();
        pixmap=tx_pixmap_widget(FX_UP);
@@ -1243,7 +1243,7 @@ GtkWidget *vg_create_fx_bar(vtt_class *vtt, vtt_fx *effect, int showdel)
        gtk_box_pack_end(GTK_BOX(box), button, WID_FIX);
        gtk_widget_show(pixmap);
        gtk_widget_show(button);
-       g_signal_connect(G_OBJECT(button), "clicked", (GtkSignalFunc) fx_up, (void *) effect);
+       g_signal_connect(G_OBJECT(button), "clicked", (GCallback) fx_up, (void *) effect);
        
        gtk_widget_show(box);
        
@@ -1374,7 +1374,7 @@ void vg_create_fx_gui(vtt_class *vtt, vtt_fx_ladspa *effect, LADSPA_Plugin *plug
                        p->add_client_widget((*sp)->get_widget());
        }
 
-       g_signal_connect(G_OBJECT(p->get_labelbutton()), "button_press_event", (GtkSignalFunc) vg_show_fx_menu, (void *) effect);
+       g_signal_connect(G_OBJECT(p->get_labelbutton()), "button_press_event", (GCallback) vg_show_fx_menu, (void *) effect);
        gui_set_tooltip(p->get_labelbutton(), "Right-click to access menu.");
        effect->set_panel_widget(p->get_widget());
        effect->set_panel(p);
@@ -1400,7 +1400,7 @@ void gui_hide_control_panel(vtt_class *vtt, bool hide) {
        if (hide) {
                gtk_widget_hide(vtt->gui.control_box);
                vtt->gui.control_minimized_panel_bar_button=tx_xpm_button_new(MIN_CONTROL, vtt->name, 0, &vtt->gui.control_minimized_panel_bar_label);
-               g_signal_connect(G_OBJECT(vtt->gui.control_minimized_panel_bar_button), "clicked", (GtkSignalFunc) unminimize_control_panel, vtt);
+               g_signal_connect(G_OBJECT(vtt->gui.control_minimized_panel_bar_button), "clicked", (GCallback) unminimize_control_panel, vtt);
                gtk_widget_show(vtt->gui.control_minimized_panel_bar_button);
                snprintf(tooltip, TOOLTIP_LENGTH, "Show \"%s\" control panel.", vtt->name);
                gui_set_tooltip(vtt->gui.control_minimized_panel_bar_button, tooltip);
@@ -1419,7 +1419,7 @@ void gui_hide_audio_panel(vtt_class *vtt, bool hide) {
        if (hide) {
                gtk_widget_hide(vtt->gui.audio_box);
                vtt->gui.audio_minimized_panel_bar_button=tx_xpm_button_new(MIN_AUDIO, vtt->name, 0, &vtt->gui.audio_minimized_panel_bar_label);
-               g_signal_connect(G_OBJECT(vtt->gui.audio_minimized_panel_bar_button), "clicked", (GtkSignalFunc) unminimize_audio_panel, vtt);          
+               g_signal_connect(G_OBJECT(vtt->gui.audio_minimized_panel_bar_button), "clicked", (GCallback) unminimize_audio_panel, vtt);              
                gtk_widget_show(vtt->gui.audio_minimized_panel_bar_button);
                snprintf(tooltip, TOOLTIP_LENGTH, "Show \"%s\" audio panel.", vtt->name);
                gui_set_tooltip(vtt->gui.audio_minimized_panel_bar_button, tooltip);
index 1a30cccc71f9ba536045c2998e712782b9db3989..e34feff14e980edfbafe35b97220b2563ff01069 100644 (file)
@@ -135,5 +135,5 @@ extern void update_all_vtts();
 extern void vg_enable_critical_buttons(int enable);
 extern void vg_init_all_non_seqpars();
 extern void vg_adjust_zoom(GtkWidget *wid, vtt_class *vtt);
-extern GtkSignalFunc load_file(GtkWidget *wid, vtt_class *vtt);
+extern GCallback load_file(GtkWidget *wid, vtt_class *vtt);
 #endif