Re: gdlmm
- From: Murray Cumming <murrayc murrayc com>
- To: Erwin Rol <mailinglists erwinrol com>
- Cc: Gtkmm List <gtkmm-list gnome org>
- Subject: Re: gdlmm
- Date: Wed, 14 Sep 2005 20:37:40 +0200
On Tue, 2005-09-06 at 01:20 +0200, Erwin Rol wrote:
> Hey all,
>
> I put a first pre-alpha-test-very-broken-will-kill-your-hd version of
> gdlmm online at http://www.erwinrol.com/downloads/software/gdlmm.tar.bz2
>
> Please take a look and let me know what you think. Especially when it
> comes to the api, cause that is still very C like (and incomplete).
1.
You've hardcoded "lib64" instead of "lib" in configure.in, to get the
location of gmmproc. If that's necessary then we need a generic
solution, such as getting the full path from pkg-config. A patch for
glib would be welcome.
2. The use of the *_new() functions in the constructors means that
signals and vfuncs will not work. You need to investigate whether the
_new() functions do anything other than g_object_new() and either
a) Patch the C lib.
b) Duplicate some of that code in the .ccg file.
I have included a patch (sorry for the extra junk - I usually do cvs
patches.) that fixes some things.
Well done.
--
Murray Cumming
murrayc murrayc com
www.murrayc.com
www.openismus.com
diff -up --recursive gdlmm_bup/aclocal.m4 gdlmm/aclocal.m4
--- gdlmm_bup/aclocal.m4 2005-09-14 20:28:07.000000000 +0200
+++ gdlmm/aclocal.m4 2005-09-14 19:00:14.000000000 +0200
@@ -889,7 +889,6 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([scripts/macros.m4])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
# serial 47 AC_PROG_LIBTOOL
@@ -7187,3 +7186,4 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
+m4_include([scripts/macros.m4])
Only in gdlmm_bup/autom4te.cache: output.4
diff -up --recursive gdlmm_bup/autom4te.cache/requests gdlmm/autom4te.cache/requests
--- gdlmm_bup/autom4te.cache/requests 2005-09-14 20:28:31.000000000 +0200
+++ gdlmm/autom4te.cache/requests 2005-09-14 19:00:37.000000000 +0200
@@ -37,362 +37,6 @@
{
'AM_ENABLE_STATIC' => 1,
'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
- 'AC_C_VOLATILE' => 1,
- 'AC_TYPE_OFF_T' => 1,
- '_LT_AC_SHELL_INIT' => 1,
- 'AC_FUNC_CLOSEDIR_VOID' => 1,
- 'AC_REPLACE_FNMATCH' => 1,
- 'AC_DEFUN' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- '_LT_AC_LANG_CXX_CONFIG' => 1,
- 'AM_PROG_MKDIR_P' => 1,
- 'AC_FUNC_STAT' => 1,
- 'AC_FUNC_WAIT3' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AC_FUNC_LSTAT' => 1,
- 'AC_STRUCT_TM' => 1,
- 'AC_CHECK_HEADERS' => 1,
- 'AC_FUNC_STRTOD' => 1,
- 'AM_MISSING_PROG' => 1,
- 'AC_FUNC_STRNLEN' => 1,
- 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
- 'AC_PROG_CXX' => 1,
- '_LT_AC_LANG_C_CONFIG' => 1,
- 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
- 'AM_PROG_INSTALL_STRIP' => 1,
- 'AC_PROG_AWK' => 1,
- '_m4_warn' => 1,
- 'AC_LIBTOOL_OBJDIR' => 1,
- 'AC_HEADER_MAJOR' => 1,
- 'AM_SANITY_CHECK' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
- 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
- '_LT_AC_CHECK_DLFCN' => 1,
- '_AM_PROG_TAR' => 1,
- 'AC_LIBTOOL_GCJ' => 1,
- 'AC_PROG_GCC_TRADITIONAL' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AC_STRUCT_ST_BLOCKS' => 1,
- '_LT_AC_LANG_F77' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
- 'AC_PROG_MAKE_SET' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- 'sinclude' => 1,
- 'AM_DISABLE_SHARED' => 1,
- '_LT_AC_LANG_CXX' => 1,
- 'AM_PROG_LIBTOOL' => 1,
- '_LT_AC_FILE_LTDLL_C' => 1,
- 'AM_PROG_LD' => 1,
- 'AC_FUNC_STRERROR_R' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
- 'AC_FUNC_FORK' => 1,
- 'AU_DEFUN' => 1,
- 'AC_FUNC_VPRINTF' => 1,
- 'AC_PROG_NM' => 1,
- 'AC_LIBTOOL_DLOPEN' => 1,
- 'AC_PROG_LD' => 1,
- 'AC_PROG_LD_GNU' => 1,
- 'AC_ENABLE_FAST_INSTALL' => 1,
- 'AC_INIT' => 1,
- 'AC_STRUCT_TIMEZONE' => 1,
- 'AC_SUBST' => 1,
- 'AC_FUNC_ALLOCA' => 1,
- '_AM_SET_OPTION' => 1,
- 'AC_CANONICAL_HOST' => 1,
- '_LT_LINKER_BOILERPLATE' => 1,
- 'AC_LIBTOOL_PROG_CC_C_O' => 1,
- 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
- 'AC_PROG_RANLIB' => 1,
- 'AC_FUNC_SETPGRP' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AC_FUNC_MMAP' => 1,
- 'AL_ACLOCAL_INCLUDE' => 1,
- 'AC_TYPE_SIZE_T' => 1,
- 'AC_CHECK_TYPES' => 1,
- 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AC_CHECK_MEMBERS' => 1,
- 'AC_DEFUN_ONCE' => 1,
- 'AC_FUNC_UTIME_NULL' => 1,
- 'AC_FUNC_SELECT_ARGTYPES' => 1,
- '_LT_AC_LANG_GCJ' => 1,
- 'AC_FUNC_STRFTIME' => 1,
- 'AC_HEADER_STAT' => 1,
- 'AC_C_INLINE' => 1,
- 'AC_LIBTOOL_RC' => 1,
- '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
- 'AC_CONFIG_FILES' => 1,
- '_LT_AC_SYS_LIBPATH_AIX' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
- 'include' => 1,
- 'LT_AC_PROG_SED' => 1,
- 'AM_ENABLE_SHARED' => 1,
- 'AM_GNU_GETTEXT' => 1,
- '_LT_AC_LANG_GCJ_CONFIG' => 1,
- 'AC_ENABLE_SHARED' => 1,
- 'AC_CHECK_LIB' => 1,
- 'AC_FUNC_OBSTACK' => 1,
- 'AC_FUNC_MALLOC' => 1,
- 'AC_FUNC_GETGROUPS' => 1,
- 'AC_FUNC_GETLOADAVG' => 1,
- 'AC_ENABLE_STATIC' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
- 'AC_FUNC_FSEEKO' => 1,
- '_LT_AC_TAGVAR' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AL_PROG_PERL' => 1,
- 'AC_FUNC_MKTIME' => 1,
- 'AC_HEADER_SYS_WAIT' => 1,
- 'AC_FUNC_MEMCMP' => 1,
- 'AC_PROG_LN_S' => 1,
- 'AM_PROG_INSTALL_SH' => 1,
- 'm4_include' => 1,
- 'AC_PROG_EGREP' => 1,
- 'AC_HEADER_DIRENT' => 1,
- 'AC_PATH_MAGIC' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
- 'AL_PROG_GNU_MAKE' => 1,
- 'AM_MAKE_INCLUDE' => 1,
- '_LT_AC_TAGCONFIG' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_LIBTOOL_COMPILER_OPTION' => 1,
- 'AC_DISABLE_SHARED' => 1,
- '_LT_COMPILER_BOILERPLATE' => 1,
- 'AC_LIBTOOL_WIN32_DLL' => 1,
- 'AC_LIBTOOL_SETUP' => 1,
- 'AC_PROG_LD_RELOAD_FLAG' => 1,
- 'AC_HEADER_TIME' => 1,
- 'AM_MISSING_HAS_RUN' => 1,
- 'AC_FUNC_GETMNTENT' => 1,
- 'AC_TYPE_MODE_T' => 1,
- 'AC_LIBTOOL_DLOPEN_SELF' => 1,
- 'm4_sinclude' => 1,
- 'AC_PATH_X' => 1,
- 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
- 'AC_HEADER_STDC' => 1,
- 'AC_LIBTOOL_LINKER_OPTION' => 1,
- 'PKG_CHECK_EXISTS' => 1,
- 'AL_PROG_GNU_M4' => 1,
- 'AC_LIBTOOL_CXX' => 1,
- 'LT_AC_PROG_RC' => 1,
- 'LT_AC_PROG_GCJ' => 1,
- 'AC_FUNC_ERROR_AT_LINE' => 1,
- '_LT_AC_PROG_CXXCPP' => 1,
- 'AM_DISABLE_STATIC' => 1,
- 'AM_DEP_TRACK' => 1,
- '_AC_PROG_LIBTOOL' => 1,
- 'AM_CONFIG_HEADER' => 1,
- 'AC_FUNC_MBRTOWC' => 1,
- 'AC_TYPE_SIGNAL' => 1,
- '_AM_IF_OPTION' => 1,
- 'AC_TYPE_UID_T' => 1,
- 'AC_PATH_TOOL_PREFIX' => 1,
- 'm4_pattern_allow' => 1,
- 'AC_LIBTOOL_F77' => 1,
- 'AM_SET_LEADING_DOT' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
- '_AM_DEPENDENCIES' => 1,
- 'AC_LIBTOOL_LANG_C_CONFIG' => 1,
- '_LT_AC_SYS_COMPILER' => 1,
- 'AC_PROG_CC' => 1,
- 'AM_PROG_NM' => 1,
- 'PKG_CHECK_MODULES' => 1,
- 'AC_FUNC_STRCOLL' => 1,
- 'AC_PROG_YACC' => 1,
- 'AC_LIBLTDL_CONVENIENCE' => 1,
- 'AC_DEPLIBS_CHECK_METHOD' => 1,
- 'AC_LIBLTDL_INSTALLABLE' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
- 'jm_MAINTAINER_MODE' => 1,
- 'AC_FUNC_CHOWN' => 1,
- 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
- 'AC_FUNC_GETPGRP' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AC_FUNC_REALLOC' => 1,
- 'AC_DISABLE_STATIC' => 1,
- 'AC_CONFIG_LINKS' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- '_LT_AC_LOCK' => 1,
- '_LT_AC_LANG_RC_CONFIG' => 1,
- 'AC_PROG_CPP' => 1,
- 'AC_C_CONST' => 1,
- 'AC_PROG_LEX' => 1,
- 'AC_TYPE_PID_T' => 1,
- 'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
- 'AC_FUNC_SETVBUF_REVERSED' => 1,
- 'AM_AUX_DIR_EXPAND' => 1,
- 'AC_PROG_INSTALL' => 1,
- '_LT_AC_LANG_F77_CONFIG' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
- '_AM_SET_OPTIONS' => 1,
- '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
- 'AM_RUN_LOG' => 1,
- 'AC_LIBTOOL_PICMODE' => 1,
- 'AH_OUTPUT' => 1,
- 'AC_CHECK_LIBM' => 1,
- 'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
- '_AM_MANGLE_OPTION' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'AM_SET_DEPDIR' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
- '_LT_CC_BASENAME' => 1,
- 'AC_CHECK_FUNCS' => 1
- }
- ], 'Autom4te::Request' ),
- bless( [
- '1',
- 1,
- [
- '/usr/share/autoconf'
- ],
- [
- '/usr/share/autoconf/autoconf/autoconf.m4f',
- 'aclocal.m4',
- 'configure.in'
- ],
- {
- '_LT_AC_TAGCONFIG' => 1,
- 'm4_pattern_forbid' => 1,
- 'AC_CANONICAL_TARGET' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
- 'AC_TYPE_OFF_T' => 1,
- 'AC_C_VOLATILE' => 1,
- 'AC_FUNC_CLOSEDIR_VOID' => 1,
- 'AC_REPLACE_FNMATCH' => 1,
- 'AC_PROG_LIBTOOL' => 1,
- 'AC_FUNC_STAT' => 1,
- 'AC_HEADER_TIME' => 1,
- 'AC_FUNC_WAIT3' => 1,
- 'AC_STRUCT_TM' => 1,
- 'AC_FUNC_LSTAT' => 1,
- 'AM_AUTOMAKE_VERSION' => 1,
- 'AC_TYPE_MODE_T' => 1,
- 'AC_FUNC_GETMNTENT' => 1,
- 'AC_FUNC_STRTOD' => 1,
- 'AC_CHECK_HEADERS' => 1,
- 'AC_FUNC_STRNLEN' => 1,
- 'm4_sinclude' => 1,
- 'AC_PROG_CXX' => 1,
- 'AC_PATH_X' => 1,
- 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
- 'AC_PROG_AWK' => 1,
- '_m4_warn' => 1,
- 'AC_HEADER_STDC' => 1,
- 'AC_HEADER_MAJOR' => 1,
- 'AC_FUNC_ERROR_AT_LINE' => 1,
- 'AC_PROG_GCC_TRADITIONAL' => 1,
- 'AC_LIBSOURCE' => 1,
- 'AC_FUNC_MBRTOWC' => 1,
- 'AC_STRUCT_ST_BLOCKS' => 1,
- 'AC_TYPE_SIGNAL' => 1,
- 'AC_CANONICAL_BUILD' => 1,
- 'AC_TYPE_UID_T' => 1,
- 'AC_PROG_MAKE_SET' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
- 'sinclude' => 1,
- 'm4_pattern_allow' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
- 'AC_FUNC_STRERROR_R' => 1,
- 'AC_PROG_CC' => 1,
- 'AC_FUNC_FORK' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
- 'AC_FUNC_VPRINTF' => 1,
- 'AC_FUNC_STRCOLL' => 1,
- 'AC_PROG_YACC' => 1,
- 'AC_STRUCT_TIMEZONE' => 1,
- 'AC_INIT' => 1,
- 'AC_FUNC_CHOWN' => 1,
- 'AC_SUBST' => 1,
- 'AC_FUNC_ALLOCA' => 1,
- 'AC_CANONICAL_HOST' => 1,
- 'AC_FUNC_GETPGRP' => 1,
- 'AC_PROG_RANLIB' => 1,
- 'AM_INIT_AUTOMAKE' => 1,
- 'AC_FUNC_SETPGRP' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AC_FUNC_MMAP' => 1,
- 'AC_FUNC_REALLOC' => 1,
- 'AC_TYPE_SIZE_T' => 1,
- 'AC_CONFIG_LINKS' => 1,
- 'AC_CHECK_TYPES' => 1,
- 'LT_SUPPORTED_TAG' => 1,
- 'AC_CHECK_MEMBERS' => 1,
- 'AM_MAINTAINER_MODE' => 1,
- 'AC_FUNC_UTIME_NULL' => 1,
- 'AC_FUNC_SELECT_ARGTYPES' => 1,
- 'AC_HEADER_STAT' => 1,
- 'AC_FUNC_STRFTIME' => 1,
- 'AC_PROG_CPP' => 1,
- 'AC_C_INLINE' => 1,
- 'AC_TYPE_PID_T' => 1,
- 'AC_PROG_LEX' => 1,
- 'AC_C_CONST' => 1,
- 'AM_ENABLE_MULTILIB' => 1,
- 'AC_CONFIG_FILES' => 1,
- 'include' => 1,
- 'AC_FUNC_SETVBUF_REVERSED' => 1,
- 'AC_PROG_INSTALL' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_CHECK_LIB' => 1,
- 'AC_FUNC_OBSTACK' => 1,
- 'AC_FUNC_MALLOC' => 1,
- 'AC_FUNC_GETGROUPS' => 1,
- 'AC_FUNC_GETLOADAVG' => 1,
- 'AH_OUTPUT' => 1,
- 'AC_FUNC_FSEEKO' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_FUNC_MKTIME' => 1,
- 'AC_CONFIG_HEADERS' => 1,
- 'AC_HEADER_SYS_WAIT' => 1,
- 'AC_PROG_LN_S' => 1,
- 'AC_FUNC_MEMCMP' => 1,
- 'm4_include' => 1,
- 'AC_HEADER_DIRENT' => 1,
- 'AC_CHECK_FUNCS' => 1
- }
- ], 'Autom4te::Request' ),
- bless( [
- '2',
- 1,
- [
- '/opt/gnome212/share/autoconf'
- ],
- [
- '/opt/gnome212/share/autoconf/autoconf/autoconf.m4f',
- '/opt/gnome212/share/aclocal-1.9/amversion.m4',
- '/opt/gnome212/share/aclocal-1.9/auxdir.m4',
- '/opt/gnome212/share/aclocal-1.9/cond.m4',
- '/opt/gnome212/share/aclocal-1.9/depend.m4',
- '/opt/gnome212/share/aclocal-1.9/depout.m4',
- '/opt/gnome212/share/aclocal-1.9/header.m4',
- '/opt/gnome212/share/aclocal-1.9/init.m4',
- '/opt/gnome212/share/aclocal-1.9/install-sh.m4',
- '/opt/gnome212/share/aclocal-1.9/lead-dot.m4',
- '/opt/gnome212/share/aclocal-1.9/maintainer.m4',
- '/opt/gnome212/share/aclocal-1.9/make.m4',
- '/opt/gnome212/share/aclocal-1.9/missing.m4',
- '/opt/gnome212/share/aclocal-1.9/mkdirp.m4',
- '/opt/gnome212/share/aclocal-1.9/options.m4',
- '/opt/gnome212/share/aclocal-1.9/runlog.m4',
- '/opt/gnome212/share/aclocal-1.9/sanity.m4',
- '/opt/gnome212/share/aclocal-1.9/strip.m4',
- '/opt/gnome212/share/aclocal-1.9/tar.m4',
- '/opt/gnome212/share/aclocal/libtool.m4',
- '/opt/gnome212/share/aclocal/pkg.m4',
- 'scripts/macros.m4',
- 'configure.in'
- ],
- {
- 'AM_ENABLE_STATIC' => 1,
- 'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
@@ -602,13 +246,13 @@
}
], 'Autom4te::Request' ),
bless( [
- '3',
+ '1',
1,
[
- '/opt/gnome212/share/autoconf'
+ '/usr/share/autoconf'
],
[
- '/opt/gnome212/share/autoconf/autoconf/autoconf.m4f',
+ '/usr/share/autoconf/autoconf/autoconf.m4f',
'aclocal.m4',
'configure.in'
],
@@ -716,7 +360,7 @@
}
], 'Autom4te::Request' ),
bless( [
- '4',
+ '2',
1,
[
'/opt/gnome212/share/autoconf'
@@ -741,30 +385,30 @@
'/opt/gnome212/share/aclocal-1.9/sanity.m4',
'/opt/gnome212/share/aclocal-1.9/strip.m4',
'/opt/gnome212/share/aclocal-1.9/tar.m4',
- 'scripts/macros.m4',
'/opt/gnome212/share/aclocal/libtool.m4',
'/opt/gnome212/share/aclocal/pkg.m4',
+ 'scripts/macros.m4',
'configure.in'
],
{
'AM_ENABLE_STATIC' => 1,
'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
- 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
- 'AC_FUNC_CLOSEDIR_VOID' => 1,
+ 'AC_TYPE_OFF_T' => 1,
'_LT_AC_SHELL_INIT' => 1,
+ 'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_DEFUN' => 1,
- '_LT_AC_LANG_CXX_CONFIG' => 1,
'AC_PROG_LIBTOOL' => 1,
- 'AC_FUNC_STAT' => 1,
+ '_LT_AC_LANG_CXX_CONFIG' => 1,
'AM_PROG_MKDIR_P' => 1,
+ 'AC_FUNC_STAT' => 1,
'AC_FUNC_WAIT3' => 1,
- 'AC_STRUCT_TM' => 1,
- 'AC_FUNC_LSTAT' => 1,
'AM_AUTOMAKE_VERSION' => 1,
- 'AC_FUNC_STRTOD' => 1,
+ 'AC_FUNC_LSTAT' => 1,
+ 'AC_STRUCT_TM' => 1,
'AC_CHECK_HEADERS' => 1,
+ 'AC_FUNC_STRTOD' => 1,
'AM_MISSING_PROG' => 1,
'AC_FUNC_STRNLEN' => 1,
'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
@@ -779,28 +423,28 @@
'AM_SANITY_CHECK' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
- '_LT_AC_CHECK_DLFCN' => 1,
'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+ '_LT_AC_CHECK_DLFCN' => 1,
'_AM_PROG_TAR' => 1,
'AC_LIBTOOL_GCJ' => 1,
'AC_PROG_GCC_TRADITIONAL' => 1,
'AC_LIBSOURCE' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
- 'AC_LIBTOOL_CONFIG' => 1,
'_LT_AC_LANG_F77' => 1,
- 'AC_CONFIG_AUX_DIR' => 1,
+ 'AC_LIBTOOL_CONFIG' => 1,
'AC_PROG_MAKE_SET' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
'sinclude' => 1,
'AM_DISABLE_SHARED' => 1,
- 'AM_PROG_LIBTOOL' => 1,
'_LT_AC_LANG_CXX' => 1,
- 'AM_PROG_LD' => 1,
+ 'AM_PROG_LIBTOOL' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
+ 'AM_PROG_LD' => 1,
'AC_FUNC_STRERROR_R' => 1,
- 'AC_FUNC_FORK' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
- 'AC_FUNC_VPRINTF' => 1,
+ 'AC_FUNC_FORK' => 1,
'AU_DEFUN' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
'AC_PROG_NM' => 1,
'AC_LIBTOOL_DLOPEN' => 1,
'AC_PROG_LD' => 1,
@@ -813,9 +457,9 @@
'_AM_SET_OPTION' => 1,
'AC_CANONICAL_HOST' => 1,
'_LT_LINKER_BOILERPLATE' => 1,
- 'AC_PROG_RANLIB' => 1,
- 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
'AC_LIBTOOL_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+ 'AC_PROG_RANLIB' => 1,
'AC_FUNC_SETPGRP' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AC_FUNC_MMAP' => 1,
@@ -828,45 +472,45 @@
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
'_LT_AC_LANG_GCJ' => 1,
- 'AC_HEADER_STAT' => 1,
'AC_FUNC_STRFTIME' => 1,
+ 'AC_HEADER_STAT' => 1,
'AC_C_INLINE' => 1,
'AC_LIBTOOL_RC' => 1,
- 'AC_DISABLE_FAST_INSTALL' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+ 'AC_DISABLE_FAST_INSTALL' => 1,
'AC_CONFIG_FILES' => 1,
- 'include' => 1,
- '_LT_AC_TRY_DLOPEN_SELF' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
+ '_LT_AC_TRY_DLOPEN_SELF' => 1,
+ 'include' => 1,
'LT_AC_PROG_SED' => 1,
'AM_ENABLE_SHARED' => 1,
'AM_GNU_GETTEXT' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1,
- 'AC_FUNC_OBSTACK' => 1,
- 'AC_CHECK_LIB' => 1,
'AC_ENABLE_SHARED' => 1,
+ 'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1,
- 'AC_FUNC_FSEEKO' => 1,
- 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'AC_ENABLE_STATIC' => 1,
- 'AM_PROG_CC_C_O' => 1,
+ 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+ 'AC_FUNC_FSEEKO' => 1,
'_LT_AC_TAGVAR' => 1,
+ 'AM_PROG_CC_C_O' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
- 'AC_FUNC_MKTIME' => 1,
- 'AL_PROG_PERL' => 1,
'AM_CONDITIONAL' => 1,
+ 'AL_PROG_PERL' => 1,
+ 'AC_FUNC_MKTIME' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
- 'm4_include' => 1,
+ 'AC_PROG_LN_S' => 1,
'AM_PROG_INSTALL_SH' => 1,
- 'AC_HEADER_DIRENT' => 1,
+ 'm4_include' => 1,
'AC_PROG_EGREP' => 1,
- 'AL_PROG_GNU_MAKE' => 1,
- '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AC_HEADER_DIRENT' => 1,
'AC_PATH_MAGIC' => 1,
+ '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+ 'AL_PROG_GNU_MAKE' => 1,
'AM_MAKE_INCLUDE' => 1,
'_LT_AC_TAGCONFIG' => 1,
'm4_pattern_forbid' => 1,
@@ -874,53 +518,53 @@
'AC_LIBTOOL_COMPILER_OPTION' => 1,
'AC_DISABLE_SHARED' => 1,
'_LT_COMPILER_BOILERPLATE' => 1,
- 'AC_LIBTOOL_SETUP' => 1,
'AC_LIBTOOL_WIN32_DLL' => 1,
+ 'AC_LIBTOOL_SETUP' => 1,
'AC_PROG_LD_RELOAD_FLAG' => 1,
'AC_HEADER_TIME' => 1,
- 'AC_TYPE_MODE_T' => 1,
- 'AC_FUNC_GETMNTENT' => 1,
'AM_MISSING_HAS_RUN' => 1,
- 'm4_sinclude' => 1,
+ 'AC_FUNC_GETMNTENT' => 1,
+ 'AC_TYPE_MODE_T' => 1,
'AC_LIBTOOL_DLOPEN_SELF' => 1,
+ 'm4_sinclude' => 1,
'AC_PATH_X' => 1,
'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
'AC_HEADER_STDC' => 1,
'AC_LIBTOOL_LINKER_OPTION' => 1,
'PKG_CHECK_EXISTS' => 1,
'AL_PROG_GNU_M4' => 1,
- 'LT_AC_PROG_RC' => 1,
'AC_LIBTOOL_CXX' => 1,
+ 'LT_AC_PROG_RC' => 1,
'LT_AC_PROG_GCJ' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1,
- 'AM_DEP_TRACK' => 1,
- 'AM_DISABLE_STATIC' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
- 'AC_FUNC_MBRTOWC' => 1,
- 'AM_CONFIG_HEADER' => 1,
+ 'AM_DISABLE_STATIC' => 1,
+ 'AM_DEP_TRACK' => 1,
'_AC_PROG_LIBTOOL' => 1,
+ 'AM_CONFIG_HEADER' => 1,
+ 'AC_FUNC_MBRTOWC' => 1,
'AC_TYPE_SIGNAL' => 1,
- 'AC_TYPE_UID_T' => 1,
'_AM_IF_OPTION' => 1,
+ 'AC_TYPE_UID_T' => 1,
'AC_PATH_TOOL_PREFIX' => 1,
- 'AC_LIBTOOL_F77' => 1,
'm4_pattern_allow' => 1,
+ 'AC_LIBTOOL_F77' => 1,
'AM_SET_LEADING_DOT' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'_AM_DEPENDENCIES' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
- 'AC_PROG_CC' => 1,
'_LT_AC_SYS_COMPILER' => 1,
+ 'AC_PROG_CC' => 1,
'AM_PROG_NM' => 1,
'PKG_CHECK_MODULES' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_LIBLTDL_CONVENIENCE' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1,
- 'AC_FUNC_CHOWN' => 1,
- 'jm_MAINTAINER_MODE' => 1,
- 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AC_LIBLTDL_INSTALLABLE' => 1,
+ 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+ 'jm_MAINTAINER_MODE' => 1,
+ 'AC_FUNC_CHOWN' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'AC_FUNC_GETPGRP' => 1,
'AM_INIT_AUTOMAKE' => 1,
@@ -931,29 +575,143 @@
'_LT_AC_LOCK' => 1,
'_LT_AC_LANG_RC_CONFIG' => 1,
'AC_PROG_CPP' => 1,
- 'AC_TYPE_PID_T' => 1,
- 'AC_PROG_LEX' => 1,
'AC_C_CONST' => 1,
+ 'AC_PROG_LEX' => 1,
+ 'AC_TYPE_PID_T' => 1,
'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1,
- 'AC_PROG_INSTALL' => 1,
'AM_AUX_DIR_EXPAND' => 1,
- 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+ 'AC_PROG_INSTALL' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
+ 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'_AM_SET_OPTIONS' => 1,
- 'AM_RUN_LOG' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+ 'AM_RUN_LOG' => 1,
'AC_LIBTOOL_PICMODE' => 1,
'AH_OUTPUT' => 1,
'AC_CHECK_LIBM' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
'_AM_MANGLE_OPTION' => 1,
'AC_CANONICAL_SYSTEM' => 1,
- 'AC_CONFIG_HEADERS' => 1,
'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
'AM_SET_DEPDIR' => 1,
- '_LT_CC_BASENAME' => 1,
'PKG_PROG_PKG_CONFIG' => 1,
+ '_LT_CC_BASENAME' => 1,
+ 'AC_CHECK_FUNCS' => 1
+ }
+ ], 'Autom4te::Request' ),
+ bless( [
+ '3',
+ 1,
+ [
+ '/opt/gnome212/share/autoconf'
+ ],
+ [
+ '/opt/gnome212/share/autoconf/autoconf/autoconf.m4f',
+ 'aclocal.m4',
+ 'configure.in'
+ ],
+ {
+ '_LT_AC_TAGCONFIG' => 1,
+ 'm4_pattern_forbid' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_TYPE_OFF_T' => 1,
+ 'AC_C_VOLATILE' => 1,
+ 'AC_FUNC_CLOSEDIR_VOID' => 1,
+ 'AC_REPLACE_FNMATCH' => 1,
+ 'AC_PROG_LIBTOOL' => 1,
+ 'AC_FUNC_STAT' => 1,
+ 'AC_HEADER_TIME' => 1,
+ 'AC_FUNC_WAIT3' => 1,
+ 'AC_STRUCT_TM' => 1,
+ 'AC_FUNC_LSTAT' => 1,
+ 'AM_AUTOMAKE_VERSION' => 1,
+ 'AC_TYPE_MODE_T' => 1,
+ 'AC_FUNC_GETMNTENT' => 1,
+ 'AC_FUNC_STRTOD' => 1,
+ 'AC_CHECK_HEADERS' => 1,
+ 'AC_FUNC_STRNLEN' => 1,
+ 'm4_sinclude' => 1,
+ 'AC_PROG_CXX' => 1,
+ 'AC_PATH_X' => 1,
+ 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
+ 'AC_PROG_AWK' => 1,
+ '_m4_warn' => 1,
+ 'AC_HEADER_STDC' => 1,
+ 'AC_HEADER_MAJOR' => 1,
+ 'AC_FUNC_ERROR_AT_LINE' => 1,
+ 'AC_PROG_GCC_TRADITIONAL' => 1,
+ 'AC_LIBSOURCE' => 1,
+ 'AC_FUNC_MBRTOWC' => 1,
+ 'AC_STRUCT_ST_BLOCKS' => 1,
+ 'AC_TYPE_SIGNAL' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
+ 'AC_TYPE_UID_T' => 1,
+ 'AC_PROG_MAKE_SET' => 1,
+ 'AC_CONFIG_AUX_DIR' => 1,
+ 'sinclude' => 1,
+ 'm4_pattern_allow' => 1,
+ 'AC_DEFINE_TRACE_LITERAL' => 1,
+ 'AC_FUNC_STRERROR_R' => 1,
+ 'AC_PROG_CC' => 1,
+ 'AC_FUNC_FORK' => 1,
+ 'AC_DECL_SYS_SIGLIST' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
+ 'AC_FUNC_STRCOLL' => 1,
+ 'AC_PROG_YACC' => 1,
+ 'AC_STRUCT_TIMEZONE' => 1,
+ 'AC_INIT' => 1,
+ 'AC_FUNC_CHOWN' => 1,
+ 'AC_SUBST' => 1,
+ 'AC_FUNC_ALLOCA' => 1,
+ 'AC_CANONICAL_HOST' => 1,
+ 'AC_FUNC_GETPGRP' => 1,
+ 'AC_PROG_RANLIB' => 1,
+ 'AM_INIT_AUTOMAKE' => 1,
+ 'AC_FUNC_SETPGRP' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
+ 'AC_FUNC_MMAP' => 1,
+ 'AC_FUNC_REALLOC' => 1,
+ 'AC_TYPE_SIZE_T' => 1,
+ 'AC_CONFIG_LINKS' => 1,
+ 'AC_CHECK_TYPES' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
+ 'AC_CHECK_MEMBERS' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
+ 'AC_FUNC_UTIME_NULL' => 1,
+ 'AC_FUNC_SELECT_ARGTYPES' => 1,
+ 'AC_HEADER_STAT' => 1,
+ 'AC_FUNC_STRFTIME' => 1,
+ 'AC_PROG_CPP' => 1,
+ 'AC_C_INLINE' => 1,
+ 'AC_TYPE_PID_T' => 1,
+ 'AC_PROG_LEX' => 1,
+ 'AC_C_CONST' => 1,
+ 'AM_ENABLE_MULTILIB' => 1,
+ 'AC_CONFIG_FILES' => 1,
+ 'include' => 1,
+ 'AC_FUNC_SETVBUF_REVERSED' => 1,
+ 'AC_PROG_INSTALL' => 1,
+ 'AM_GNU_GETTEXT' => 1,
+ 'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
+ 'AC_FUNC_MALLOC' => 1,
+ 'AC_FUNC_GETGROUPS' => 1,
+ 'AC_FUNC_GETLOADAVG' => 1,
+ 'AH_OUTPUT' => 1,
+ 'AC_FUNC_FSEEKO' => 1,
+ 'AM_PROG_CC_C_O' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
+ 'AC_FUNC_MKTIME' => 1,
+ 'AC_CONFIG_HEADERS' => 1,
+ 'AC_HEADER_SYS_WAIT' => 1,
+ 'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
+ 'm4_include' => 1,
+ 'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
}
], 'Autom4te::Request' )
diff -up --recursive gdlmm_bup/autom4te.cache/traces.3 gdlmm/autom4te.cache/traces.3
--- gdlmm_bup/autom4te.cache/traces.3 2005-09-14 20:28:20.000000000 +0200
+++ gdlmm/autom4te.cache/traces.3 2005-09-14 19:00:24.000000000 +0200
@@ -1,4 +1,4 @@
-m4trace:aclocal.m4:892: -1- m4_include([scripts/macros.m4])
+m4trace:aclocal.m4:7189: -1- m4_include([scripts/macros.m4])
m4trace:configure.in:13: -1- AC_INIT([gdl/gdlmmconfig.h.in])
m4trace:configure.in:13: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.in:13: -1- m4_pattern_forbid([_AC_])
@@ -149,46 +149,46 @@ m4trace:configure.in:66: -1- AC_SUBST([h
m4trace:configure.in:67: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
-aclocal.m4:2784: AC_ENABLE_STATIC is expanded from...
-aclocal.m4:2793: AC_DISABLE_STATIC is expanded from...
-aclocal.m4:6980: AM_DISABLE_STATIC is expanded from...
+aclocal.m4:2783: AC_ENABLE_STATIC is expanded from...
+aclocal.m4:2792: AC_DISABLE_STATIC is expanded from...
+aclocal.m4:6979: AM_DISABLE_STATIC is expanded from...
configure.in:67: the top level])
m4trace:configure.in:68: -1- AC_PROG_LIBTOOL
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
-aclocal.m4:2745: AC_ENABLE_SHARED is expanded from...
+aclocal.m4:2744: AC_ENABLE_SHARED is expanded from...
configure.in:68: AC_ENABLE_SHARED is required by...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
-aclocal.m4:2823: AC_ENABLE_FAST_INSTALL is expanded from...
+aclocal.m4:2822: AC_ENABLE_FAST_INSTALL is expanded from...
configure.in:68: AC_ENABLE_FAST_INSTALL is required by...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
-aclocal.m4:3020: AC_PROG_LD is expanded from...
+aclocal.m4:3019: AC_PROG_LD is expanded from...
configure.in:68: AC_PROG_LD is required by...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- AC_SUBST([EGREP])
m4trace:configure.in:68: -1- AC_PROG_LN_S
@@ -203,38 +203,38 @@ m4trace:configure.in:68: -1- AC_SUBST([a
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
-aclocal.m4:1473: _LT_AC_LOCK is expanded from...
+aclocal.m4:1472: _LT_AC_LOCK is expanded from...
configure.in:68: _LT_AC_LOCK is required by...
-aclocal.m4:1940: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
-aclocal.m4:3552: _LT_AC_LANG_C_CONFIG is expanded from...
-aclocal.m4:3452: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:1939: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
+aclocal.m4:3551: _LT_AC_LANG_C_CONFIG is expanded from...
+aclocal.m4:3451: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- AC_CHECK_HEADERS([dlfcn.h])
m4trace:configure.in:68: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
@@ -294,29 +294,29 @@ m4trace:configure.in:68: -1- _LT_AC_TAGC
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
-aclocal.m4:2699: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:2698: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
-m4trace:configure.in:68: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:2699: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+m4trace:configure.in:68: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:2698: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
-m4trace:configure.in:68: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:2699: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+m4trace:configure.in:68: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:2698: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- AC_PROG_CXX
m4trace:configure.in:68: -1- AC_SUBST([CXX])
@@ -368,27 +368,27 @@ m4trace:configure.in:68: -1- AC_SUBST([F
m4trace:configure.in:68: -1- AC_SUBST([ac_ct_F77])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
-aclocal.m4:4805: _LT_AC_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:4755: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:2699: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:4804: _LT_AC_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:4754: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:2698: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE',
and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
-aclocal.m4:4805: _LT_AC_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:4755: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:2699: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:4804: _LT_AC_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:4754: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:2698: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
lt_cv_dlopen="dyld"
@@ -419,51 +419,51 @@ m4trace:configure.in:68: -1- AC_CHECK_LI
m4trace:configure.in:68: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from...
-aclocal.m4:4805: _LT_AC_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:4755: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
-aclocal.m4:2699: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:4804: _LT_AC_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:4754: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
+aclocal.m4:2698: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
-aclocal.m4:4849: _LT_AC_LANG_RC_CONFIG is expanded from...
-aclocal.m4:4813: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
-aclocal.m4:2699: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:4848: _LT_AC_LANG_RC_CONFIG is expanded from...
+aclocal.m4:4812: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
+aclocal.m4:2698: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE',
and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
-aclocal.m4:4849: _LT_AC_LANG_RC_CONFIG is expanded from...
-aclocal.m4:4813: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
-aclocal.m4:2699: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:4848: _LT_AC_LANG_RC_CONFIG is expanded from...
+aclocal.m4:4812: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
+aclocal.m4:2698: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from...
-aclocal.m4:4849: _LT_AC_LANG_RC_CONFIG is expanded from...
-aclocal.m4:4813: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
-aclocal.m4:2699: _LT_AC_TAGCONFIG is expanded from...
-aclocal.m4:1104: AC_LIBTOOL_SETUP is expanded from...
+aclocal.m4:4848: _LT_AC_LANG_RC_CONFIG is expanded from...
+aclocal.m4:4812: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
+aclocal.m4:2698: _LT_AC_TAGCONFIG is expanded from...
+aclocal.m4:1103: AC_LIBTOOL_SETUP is expanded from...
configure.in:68: AC_LIBTOOL_SETUP is required by...
-aclocal.m4:960: _AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:959: _AC_PROG_LIBTOOL is expanded from...
configure.in:68: _AC_PROG_LIBTOOL is required by...
-aclocal.m4:940: AC_PROG_LIBTOOL is expanded from...
-aclocal.m4:6976: AM_PROG_LIBTOOL is expanded from...
+aclocal.m4:939: AC_PROG_LIBTOOL is expanded from...
+aclocal.m4:6975: AM_PROG_LIBTOOL is expanded from...
configure.in:68: the top level])
m4trace:configure.in:68: -1- AC_SUBST([LIBTOOL])
m4trace:configure.in:72: -1- AC_SUBST([M4])
Only in gdlmm_bup/autom4te.cache: traces.4
diff -up --recursive gdlmm_bup/ChangeLog gdlmm/ChangeLog
--- gdlmm_bup/ChangeLog 2005-09-14 19:05:16.000000000 +0200
+++ gdlmm/ChangeLog 2005-09-14 20:27:21.000000000 +0200
@@ -1,3 +1,9 @@
+2005-09-14 Murray Cumming <murrayc murrayc com>
+
+ * gdl/src/dock.hg, dock/object.hg, dock-layout.hg, dock-master.hg:
+ Made some get methods const-correct, and added const overloads where
+ necessary. Wrapped GList* return types properly. Removed
+ unnecessary namespace prefixes.
2005-08-31 Erwin rol <erwin erwinrol com>
Only in gdlmm: ChangeLog~
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-bar.cc gdlmm/gdl/gdlmm/dock-bar.cc
--- gdlmm_bup/gdl/gdlmm/dock-bar.cc 2005-09-14 19:05:20.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-bar.cc 2005-09-14 19:25:00.000000000 +0200
@@ -137,9 +137,9 @@ GType DockBar::get_base_type()
}
-Gtk::Orientation DockBar::get_orientation()
+Gtk::Orientation DockBar::get_orientation() const
{
- return ((Gtk::Orientation)(gdl_dock_bar_get_orientation(gobj())));
+ return ((Gtk::Orientation)(gdl_dock_bar_get_orientation(const_cast<GdlDockBar*>(gobj()))));
}
void DockBar::set_orientation(Gtk::Orientation orientation)
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-bar.h gdlmm/gdl/gdlmm/dock-bar.h
--- gdlmm_bup/gdl/gdlmm/dock-bar.h 2005-09-14 19:05:21.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-bar.h 2005-09-14 19:25:00.000000000 +0200
@@ -110,7 +110,7 @@ public:
DockBar(Gnome::Gdl::Dock& dock);
- Gtk::Orientation get_orientation();
+ Gtk::Orientation get_orientation() const;
void set_orientation(Gtk::Orientation orientation);
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock.cc gdlmm/gdl/gdlmm/dock.cc
--- gdlmm_bup/gdl/gdlmm/dock.cc 2005-09-14 19:05:20.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock.cc 2005-09-14 20:03:37.000000000 +0200
@@ -26,6 +26,7 @@
#include <gdlmm/dock.h>
#include <gdlmm/dock-item.h>
#include <gdlmm/dock-placeholder.h>
+#include <gdlmm/dock-master.h>
namespace Gnome
{
@@ -33,7 +34,7 @@ namespace Gnome
namespace Gdl
{
-Dock::Dock(Gnome::Gdl::Dock& original, bool floating)
+Dock::Dock(Dock& original, bool floating)
:
Gnome::Gdl::DockObject((GdlDockObject*) gdl_dock_new_from(Glib::unwrap(&original), floating))
{
@@ -153,13 +154,13 @@ Glib::ObjectBase* Dock_Class::wrap_new(G
Dock::Dock(const Glib::ConstructParams& construct_params)
:
- Gnome::Gdl::DockObject(construct_params)
+ DockObject(construct_params)
{
}
Dock::Dock(GdlDock* castitem)
:
- Gnome::Gdl::DockObject((GdlDockObject*)(castitem))
+ DockObject((GdlDockObject*)(castitem))
{
}
@@ -184,38 +185,53 @@ GType Dock::get_base_type()
Dock::Dock()
:
Glib::ObjectBase(0), //Mark this class as gtkmmproc-generated, rather than a custom class, to allow vfunc optimisations.
- Gnome::Gdl::DockObject(Glib::ConstructParams(dock_class_.init()))
+ DockObject(Glib::ConstructParams(dock_class_.init()))
{
}
-void Dock::add_item(Gnome::Gdl::DockItem& item, Gnome::Gdl::DockPlacement place)
+void Dock::add_item(DockItem& item, DockPlacement place)
{
- gdl_dock_add_item(gobj(), (item).gobj(), (GdlDockPlacement)(place));
+ gdl_dock_add_item(gobj(), (item).gobj(), ((GdlDockPlacement)(place)));
}
-void Dock::add_floating_item(Gnome::Gdl::DockItem& item, gint x, gint y, gint width, gint height)
+void Dock::add_floating_item(DockItem& item, int x, int y, int width, int height)
{
gdl_dock_add_floating_item(gobj(), (item).gobj(), x, y, width, height);
}
-Gnome::Gdl::DockItem* Dock::get_item_by_name(const Glib::ustring& name)
+DockItem* Dock::get_item_by_name(const Glib::ustring& name)
{
return Glib::wrap(gdl_dock_get_item_by_name(gobj(), name.c_str()));
}
-Gnome::Gdl::DockPlaceholder* Dock::get_placeholder_by_name(const Glib::ustring& name)
+const DockItem* Dock::get_item_by_name(const Glib::ustring& name) const
+{
+ return Glib::wrap(gdl_dock_get_item_by_name(const_cast<GdlDock*>(gobj()), name.c_str()));
+}
+
+DockPlaceholder* Dock::get_placeholder_by_name(const Glib::ustring& name)
{
return Glib::wrap(gdl_dock_get_placeholder_by_name(gobj(), name.c_str()));
}
-GList* Dock::get_named_items()
+const DockPlaceholder* Dock::get_placeholder_by_name(const Glib::ustring& name) const
+{
+ return Glib::wrap(gdl_dock_get_placeholder_by_name(const_cast<GdlDock*>(gobj()), name.c_str()));
+}
+
+Glib::ListHandle< Glib::RefPtr<DockMaster> > Dock::get_named_items()
+{
+ return Glib::ListHandle< Glib::RefPtr<DockMaster> >((GList*)gdl_dock_get_named_items(gobj()), Glib::OWNERSHIP_SHALLOW);
+}
+
+Glib::ListHandle< Glib::RefPtr<const DockMaster> > Dock::get_named_items() const
{
- return gdl_dock_get_named_items(gobj());
+ return Glib::ListHandle< Glib::RefPtr<const DockMaster> >((GList*)gdl_dock_get_named_items(const_cast<GdlDock*>(gobj())), Glib::OWNERSHIP_SHALLOW);
}
-void Dock::xor_rect(Gdk::Rectangle& rect)
+void Dock::xor_rect(const Gdk::Rectangle& rect)
{
- gdl_dock_xor_rect(gobj(), (rect).gobj());
+ gdl_dock_xor_rect(gobj(), const_cast<GdkRectangle*>(rect.gobj()));
}
Only in gdlmm/gdl/gdlmm: dock.cc~
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock.h gdlmm/gdl/gdlmm/dock.h
--- gdlmm_bup/gdl/gdlmm/dock.h 2005-09-14 19:05:20.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock.h 2005-09-14 19:56:01.000000000 +0200
@@ -112,20 +112,30 @@ private:
public:
Dock();
- Dock(Gnome::Gdl::Dock& original, bool floating);
+ Dock(Dock& original, bool floating);
- void add_item(Gnome::Gdl::DockItem& item, Gnome::Gdl::DockPlacement place);
+ void add_item(DockItem& item, DockPlacement place);
- void add_floating_item(Gnome::Gdl::DockItem& item, gint x, gint y, gint width, gint height);
+ void add_floating_item(DockItem& item, int x, int y, int width, int height);
- Gnome::Gdl::DockItem* get_item_by_name(const Glib::ustring& name);
+ DockItem* get_item_by_name(const Glib::ustring& name);
- Gnome::Gdl::DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name);
+ const DockItem* get_item_by_name(const Glib::ustring& name) const;
- GList* get_named_items();
+ DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name);
- void xor_rect(Gdk::Rectangle& rect);
+ const DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name) const;
+
+ //TODO: Check what ownership is appropriate:
+
+
+ Glib::ListHandle< Glib::RefPtr<DockMaster> > get_named_items();
+
+ Glib::ListHandle< Glib::RefPtr<const DockMaster> > get_named_items() const;
+
+
+ void xor_rect(const Gdk::Rectangle& rect);
/** Whether the dock is floating in its own window.
*
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-item.cc gdlmm/gdl/gdlmm/dock-item.cc
--- gdlmm_bup/gdl/gdlmm/dock-item.cc 2005-09-14 19:05:21.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-item.cc 2005-09-14 19:27:20.000000000 +0200
@@ -330,13 +330,13 @@ Glib::ObjectBase* DockItem_Class::wrap_n
DockItem::DockItem(const Glib::ConstructParams& construct_params)
:
- Gnome::Gdl::DockObject(construct_params)
+ DockObject(construct_params)
{
}
DockItem::DockItem(GdlDockItem* castitem)
:
- Gnome::Gdl::DockObject((GdlDockObject*)(castitem))
+ DockObject((GdlDockObject*)(castitem))
{
}
@@ -358,9 +358,9 @@ GType DockItem::get_base_type()
}
-void DockItem::dock_to(Gnome::Gdl::DockItem& target, Gnome::Gdl::DockPlacement position, gint docking_param)
+void DockItem::dock_to(DockItem& target, DockPlacement position, gint docking_param)
{
- gdl_dock_item_dock_to(gobj(), (target).gobj(), (GdlDockPlacement)(position), docking_param);
+ gdl_dock_item_dock_to(gobj(), (target).gobj(), ((GdlDockPlacement)(position)), docking_param);
}
void DockItem::set_orientation(Gtk::Orientation orientation)
@@ -423,7 +423,7 @@ void DockItem::unlock()
gdl_dock_item_unlock(gobj());
}
-void DockItem::set_default_position(Gnome::Gdl::DockObject& reference)
+void DockItem::set_default_position(DockObject& reference)
{
gdl_dock_item_set_default_position(gobj(), (reference).gobj());
}
@@ -460,14 +460,14 @@ Glib::PropertyProxy_ReadOnly<bool> DockI
return Glib::PropertyProxy_ReadOnly<bool>(this, "resize");
}
-Glib::PropertyProxy<Gnome::Gdl::DockItemBehavior> DockItem::property_behavior()
+Glib::PropertyProxy<DockItemBehavior> DockItem::property_behavior()
{
- return Glib::PropertyProxy<Gnome::Gdl::DockItemBehavior>(this, "behavior");
+ return Glib::PropertyProxy<DockItemBehavior>(this, "behavior");
}
-Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockItemBehavior> DockItem::property_behavior() const
+Glib::PropertyProxy_ReadOnly<DockItemBehavior> DockItem::property_behavior() const
{
- return Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockItemBehavior>(this, "behavior");
+ return Glib::PropertyProxy_ReadOnly<DockItemBehavior>(this, "behavior");
}
Glib::PropertyProxy<bool> DockItem::property_locked()
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-item.h gdlmm/gdl/gdlmm/dock-item.h
--- gdlmm_bup/gdl/gdlmm/dock-item.h 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-item.h 2005-09-14 19:27:20.000000000 +0200
@@ -107,11 +107,11 @@ protected:
private:
public:
- DockItem(const Glib::ustring& name, const Glib::ustring& long_name, Gnome::Gdl::DockItemBehavior behavior);
- DockItem(const Glib::ustring& name, const Glib::ustring& long_name, const Gtk::StockID& stock_id, Gnome::Gdl::DockItemBehavior behavior);
+ DockItem(const Glib::ustring& name, const Glib::ustring& long_name, DockItemBehavior behavior);
+ DockItem(const Glib::ustring& name, const Glib::ustring& long_name, const Gtk::StockID& stock_id, DockItemBehavior behavior);
- void dock_to( Gnome::Gdl::DockItem& target, Gnome::Gdl::DockPlacement position, gint docking_param);
+ void dock_to( DockItem& target, DockPlacement position, gint docking_param);
void dock_floating( gint docking_param);
void set_orientation( Gtk::Orientation orientation);
@@ -138,7 +138,7 @@ public:
void unlock();
- void set_default_position( Gnome::Gdl::DockObject& reference);
+ void set_default_position( DockObject& reference);
void preferred_size(GtkRequisition* req);
@@ -164,7 +164,7 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy<Gnome::Gdl::DockItemBehavior> property_behavior() ;
+ Glib::PropertyProxy<DockItemBehavior> property_behavior() ;
/** General behavior for the dock item (i.e. whether it can float, if it's locked, etc.).
*
@@ -172,7 +172,7 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockItemBehavior> property_behavior() const;
+ Glib::PropertyProxy_ReadOnly<DockItemBehavior> property_behavior() const;
/** If set
*
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-layout.cc gdlmm/gdl/gdlmm/dock-layout.cc
--- gdlmm_bup/gdl/gdlmm/dock-layout.cc 2005-09-14 19:05:20.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-layout.cc 2005-09-14 19:33:13.000000000 +0200
@@ -31,7 +31,7 @@ namespace Gnome
namespace Gdl
{
-DockLayout::DockLayout(Gnome::Gdl::Dock& dock)
+DockLayout::DockLayout(Dock& dock)
:
Glib::Object((GObject*) gdl_dock_layout_new(Glib::unwrap(&dock)))
{
@@ -145,7 +145,7 @@ GType DockLayout::get_base_type()
}
-void DockLayout::attach(Gnome::Gdl::DockMaster& master)
+void DockLayout::attach(DockMaster& master)
{
gdl_dock_layout_attach(gobj(), (master).gobj());
}
@@ -165,9 +165,9 @@ void DockLayout::delete_layout(const Gli
gdl_dock_layout_delete_layout(gobj(), name.c_str());
}
-GList* DockLayout::get_layouts(bool include_default)
+Glib::ListHandle<Glib::ustring> DockLayout::get_layouts(bool include_default) const
{
- return gdl_dock_layout_get_layouts(gobj(), static_cast<int>(include_default));
+ return Glib::ListHandle<Glib::ustring>(gdl_dock_layout_get_layouts(const_cast<GdlDockLayout*>(gobj()), static_cast<int>(include_default)), Glib::OWNERSHIP_SHALLOW);
}
void DockLayout::run_manager()
@@ -180,14 +180,14 @@ bool DockLayout::load_from_file(const Gl
return gdl_dock_layout_load_from_file(gobj(), filename.c_str());
}
-bool DockLayout::save_to_file(const Glib::ustring& filename)
+bool DockLayout::save_to_file(const Glib::ustring& filename) const
{
- return gdl_dock_layout_save_to_file(gobj(), filename.c_str());
+ return gdl_dock_layout_save_to_file(const_cast<GdlDockLayout*>(gobj()), filename.c_str());
}
-bool DockLayout::is_dirty()
+bool DockLayout::is_dirty() const
{
- return gdl_dock_layout_is_dirty(gobj());
+ return gdl_dock_layout_is_dirty(const_cast<GdlDockLayout*>(gobj()));
}
Gtk::Widget* DockLayout::get_ui()
@@ -195,25 +195,40 @@ Gtk::Widget* DockLayout::get_ui()
return Glib::wrap(gdl_dock_layout_get_ui(gobj()));
}
+const Gtk::Widget* DockLayout::get_ui() const
+{
+ return Glib::wrap(gdl_dock_layout_get_ui(const_cast<GdlDockLayout*>(gobj())));
+}
+
Gtk::Widget* DockLayout::get_items_ui()
{
return Glib::wrap(gdl_dock_layout_get_items_ui(gobj()));
}
+const Gtk::Widget* DockLayout::get_items_ui() const
+{
+ return Glib::wrap(gdl_dock_layout_get_items_ui(const_cast<GdlDockLayout*>(gobj())));
+}
+
Gtk::Widget* DockLayout::get_layouts_ui()
{
return Glib::wrap(gdl_dock_layout_get_layouts_ui(gobj()));
}
+const Gtk::Widget* DockLayout::get_layouts_ui() const
+{
+ return Glib::wrap(gdl_dock_layout_get_layouts_ui(const_cast<GdlDockLayout*>(gobj())));
+}
+
-Glib::PropertyProxy<Gnome::Gdl::DockMaster> DockLayout::property_master()
+Glib::PropertyProxy<DockMaster> DockLayout::property_master()
{
- return Glib::PropertyProxy<Gnome::Gdl::DockMaster>(this, "master");
+ return Glib::PropertyProxy<DockMaster>(this, "master");
}
-Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockMaster> DockLayout::property_master() const
+Glib::PropertyProxy_ReadOnly<DockMaster> DockLayout::property_master() const
{
- return Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockMaster>(this, "master");
+ return Glib::PropertyProxy_ReadOnly<DockMaster>(this, "master");
}
Glib::PropertyProxy_ReadOnly<bool> DockLayout::property_dirty() const
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-layout.h gdlmm/gdl/gdlmm/dock-layout.h
--- gdlmm_bup/gdl/gdlmm/dock-layout.h 2005-09-14 19:05:20.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-layout.h 2005-09-14 19:33:13.000000000 +0200
@@ -99,10 +99,10 @@ public:
private:
public:
- DockLayout(Gnome::Gdl::Dock& dock);
+ DockLayout(Dock& dock);
- void attach(Gnome::Gdl::DockMaster& master);
+ void attach(DockMaster& master);
bool load_layout(const Glib::ustring& name);
void reset_layout();
@@ -110,22 +110,32 @@ public:
void save_layout(const Glib::ustring& name);
void delete_layout(const Glib::ustring& name);
-
- GList* get_layouts(bool include_default);
+
+ //TODO: Check the ownership:
+
+
+ Glib::ListHandle<Glib::ustring> get_layouts(bool include_default) const;
+
void run_manager();
bool load_from_file(const Glib::ustring& filename);
- bool save_to_file(const Glib::ustring& filename);
+ bool save_to_file(const Glib::ustring& filename) const;
- bool is_dirty();
+ bool is_dirty() const;
Gtk::Widget* get_ui();
+ const Gtk::Widget* get_ui() const;
+
Gtk::Widget* get_items_ui();
+ const Gtk::Widget* get_items_ui() const;
+
Gtk::Widget* get_layouts_ui();
+
+ const Gtk::Widget* get_layouts_ui() const;
/** GdlDockMaster object which the layout object is attached to.
*
@@ -133,7 +143,7 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy<Gnome::Gdl::DockMaster> property_master() ;
+ Glib::PropertyProxy<DockMaster> property_master() ;
/** GdlDockMaster object which the layout object is attached to.
*
@@ -141,7 +151,7 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockMaster> property_master() const;
+ Glib::PropertyProxy_ReadOnly<DockMaster> property_master() const;
/** True if the layouts have changed and need to be saved to a file.
*
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-master.cc gdlmm/gdl/gdlmm/dock-master.cc
--- gdlmm_bup/gdl/gdlmm/dock-master.cc 2005-09-14 19:05:21.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-master.cc 2005-09-14 19:34:03.000000000 +0200
@@ -184,27 +184,37 @@ DockMaster::DockMaster()
{
}
-void DockMaster::add(Gnome::Gdl::DockObject& object)
+void DockMaster::add(DockObject& object)
{
gdl_dock_master_add(gobj(), (object).gobj());
}
-void DockMaster::remove(Gnome::Gdl::DockObject& object)
+void DockMaster::remove(DockObject& object)
{
gdl_dock_master_remove(gobj(), (object).gobj());
}
-Gnome::Gdl::DockObject* DockMaster::get_object(const Glib::ustring& nick_name)
+DockObject* DockMaster::get_object(const Glib::ustring& nick_name)
{
return Glib::wrap(gdl_dock_master_get_object(gobj(), nick_name.c_str()));
}
-Gnome::Gdl::DockObject* DockMaster::get_controller()
+const DockObject* DockMaster::get_object(const Glib::ustring& nick_name) const
+{
+ return Glib::wrap(gdl_dock_master_get_object(const_cast<GdlDockMaster*>(gobj()), nick_name.c_str()));
+}
+
+DockObject* DockMaster::get_controller()
{
return Glib::wrap(gdl_dock_master_get_controller(gobj()));
}
-void DockMaster::set_controller(Gnome::Gdl::DockObject& new_controller)
+const DockObject* DockMaster::get_controller() const
+{
+ return Glib::wrap(gdl_dock_master_get_controller(const_cast<GdlDockMaster*>(gobj())));
+}
+
+void DockMaster::set_controller(DockObject& new_controller)
{
gdl_dock_master_set_controller(gobj(), (new_controller).gobj());
}
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-master.h gdlmm/gdl/gdlmm/dock-master.h
--- gdlmm_bup/gdl/gdlmm/dock-master.h 2005-09-14 19:05:21.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-master.h 2005-09-14 19:34:03.000000000 +0200
@@ -99,16 +99,20 @@ public:
DockMaster();
- void add(Gnome::Gdl::DockObject& object);
+ void add(DockObject& object);
- void remove(Gnome::Gdl::DockObject& object);
+ void remove(DockObject& object);
- Gnome::Gdl::DockObject* get_object(const Glib::ustring& nick_name);
+ DockObject* get_object(const Glib::ustring& nick_name);
- Gnome::Gdl::DockObject* get_controller();
+ const DockObject* get_object(const Glib::ustring& nick_name) const;
- void set_controller(Gnome::Gdl::DockObject& new_controller);
+ DockObject* get_controller();
+
+ const DockObject* get_controller() const;
+
+ void set_controller(DockObject& new_controller);
Glib::SignalProxy0< void > signal_layout_changed_signal();
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-object.cc gdlmm/gdl/gdlmm/dock-object.cc
--- gdlmm_bup/gdl/gdlmm/dock-object.cc 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-object.cc 2005-09-14 20:10:26.000000000 +0200
@@ -45,7 +45,7 @@ namespace
void DockObject_signal_signal_dock_callback(GdlDockObject* self, GdlDockObject* requestor,GdlDockPlacement position,GValue* other_data,void* data)
{
using namespace Gnome::Gdl;
- typedef sigc::slot< void,Gnome::Gdl::DockObject&,Gnome::Gdl::DockPlacement,GValue * > SlotType;
+ typedef sigc::slot< void,DockObject&,DockPlacement,GValue * > SlotType;
// Do not try to call a signal on a disassociated wrapper.
if(Glib::ObjectBase::_get_current_wrapper((GObject*) self))
@@ -54,7 +54,7 @@ void DockObject_signal_signal_dock_callb
{
if(sigc::slot_base *const slot = Glib::SignalProxyNormal::data_to_slot(data))
(*static_cast<SlotType*>(slot))(*Glib::wrap(requestor)
-, (Gnome::Gdl::DockPlacement)(position)
+, (DockPlacement)(position)
, other_data);
}
catch(...)
@@ -209,7 +209,7 @@ void DockObject_Class::dock_vfunc_callba
{
// Call the virtual member method, which derived classes might override.
obj->dock_vfunc(*Glib::wrap(requestor)
-, (Gnome::Gdl::DockPlacement)(position)
+, (DockPlacement)(position)
, other_data);
}
catch(...)
@@ -245,7 +245,7 @@ gboolean DockObject_Class::reorder_vfunc
{
// Call the virtual member method, which derived classes might override.
return static_cast<int>(obj->reorder_vfunc(*Glib::wrap(child)
-, (Gnome::Gdl::DockPlacement)(new_position)
+, (DockPlacement)(new_position)
, other_data));
}
catch(...)
@@ -319,7 +319,7 @@ gboolean DockObject_Class::child_placeme
{
// Call the virtual member method, which derived classes might override.
return static_cast<int>(obj->child_placement_vfunc(*Glib::wrap(child)
-, (Gnome::Gdl::DockPlacement*)(placement)
+, (DockPlacement*)(placement)
));
}
catch(...)
@@ -359,7 +359,7 @@ void DockObject_Class::dock_callback(Gdl
{
// Call the virtual member method, which derived classes might override.
obj->on_signal_dock(*Glib::wrap(requestor)
-, (Gnome::Gdl::DockPlacement)(position)
+, (DockPlacement)(position)
, other_data);
}
catch(...)
@@ -461,9 +461,9 @@ DockObject::DockObject()
{
}
-bool DockObject::is_compound()
+bool DockObject::is_compound() const
{
- return gdl_dock_object_is_compound(gobj());
+ return gdl_dock_object_is_compound(const_cast<GdlDockObject*>(gobj()));
}
void DockObject::detach(bool recursive)
@@ -471,16 +471,26 @@ void DockObject::detach(bool recursive)
gdl_dock_object_detach(gobj(), static_cast<int>(recursive));
}
-Gnome::Gdl::DockObject* DockObject::get_parent_object()
+DockObject* DockObject::get_parent_object()
{
return Glib::wrap(gdl_dock_object_get_parent_object(gobj()));
}
-Gnome::Gdl::Dock* DockObject::get_toplevel()
+const DockObject* DockObject::get_parent_object() const
+{
+ return Glib::wrap(gdl_dock_object_get_parent_object(const_cast<GdlDockObject*>(gobj())));
+}
+
+Dock* DockObject::get_toplevel()
{
return Glib::wrap(gdl_dock_object_get_toplevel(gobj()));
}
+const Dock* DockObject::get_toplevel() const
+{
+ return Glib::wrap(gdl_dock_object_get_toplevel(const_cast<GdlDockObject*>(gobj())));
+}
+
void DockObject::freeze()
{
gdl_dock_object_freeze(gobj());
@@ -496,19 +506,19 @@ void DockObject::reduce()
gdl_dock_object_reduce(gobj());
}
-bool DockObject::dock_request(gint x, gint y, GdlDockRequest* request)
+bool DockObject::dock_request(int x, int y, GdlDockRequest* request)
{
return gdl_dock_object_dock_request(gobj(), x, y, request);
}
-void DockObject::dock(Gnome::Gdl::DockObject& requestor, Gnome::Gdl::DockPlacement position, GValue * other_data)
+void DockObject::dock(DockObject& requestor, DockPlacement position, GValue * other_data)
{
- gdl_dock_object_dock(gobj(), (requestor).gobj(), (GdlDockPlacement)(position), other_data);
+ gdl_dock_object_dock(gobj(), (requestor).gobj(), ((GdlDockPlacement)(position)), other_data);
}
-void DockObject::bind(GObject* master)
+void DockObject::bind(const Glib::RefPtr<DockMaster>& master)
{
- gdl_dock_object_bind(gobj(), master);
+ gdl_dock_object_bind(gobj(), G_OBJECT(Glib::unwrap(master)));
}
void DockObject::unbind()
@@ -516,30 +526,30 @@ void DockObject::unbind()
gdl_dock_object_unbind(gobj());
}
-bool DockObject::is_bound()
+bool DockObject::is_bound() const
{
- return gdl_dock_object_is_bound(gobj());
+ return gdl_dock_object_is_bound(const_cast<GdlDockObject*>(gobj()));
}
-bool DockObject::reorder(Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement new_position, GValue * other_data)
+bool DockObject::reorder(DockObject& child, DockPlacement new_position, const Glib::ValueBase& other_data)
{
- return gdl_dock_object_reorder(gobj(), (child).gobj(), (GdlDockPlacement)(new_position), other_data);
+ return gdl_dock_object_reorder(gobj(), (child).gobj(), ((GdlDockPlacement)(new_position)), const_cast<GValue*>((other_data).gobj()));
}
-void DockObject::present(Gnome::Gdl::DockObject& child)
+void DockObject::present(DockObject& child)
{
gdl_dock_object_present(gobj(), (child).gobj());
}
-bool DockObject::child_placement(Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement* placement)
+bool DockObject::child_placement(DockObject& child, DockPlacement& placement)
{
- return gdl_dock_object_child_placement(gobj(), (child).gobj(), (GdlDockPlacement*)(placement));
+ return gdl_dock_object_child_placement(gobj(), (child).gobj(), (GdlDockPlacement*)(&(placement)));
}
-Glib::SignalProxy3< void,Gnome::Gdl::DockObject&,Gnome::Gdl::DockPlacement,GValue * > DockObject::signal_signal_dock()
+Glib::SignalProxy3< void,DockObject&,DockPlacement,GValue * > DockObject::signal_signal_dock()
{
- return Glib::SignalProxy3< void,Gnome::Gdl::DockObject&,Gnome::Gdl::DockPlacement,GValue * >(this, &DockObject_signal_signal_dock_info);
+ return Glib::SignalProxy3< void,DockObject&,DockPlacement,GValue * >(this, &DockObject_signal_signal_dock_info);
}
Glib::SignalProxy1< void,bool > DockObject::signal_signal_detach()
@@ -573,25 +583,25 @@ Glib::PropertyProxy_ReadOnly<Glib::ustri
return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "stock-id");
}
-Glib::PropertyProxy<Gnome::Gdl::DockMaster> DockObject::property_master()
+Glib::PropertyProxy<DockMaster> DockObject::property_master()
{
- return Glib::PropertyProxy<Gnome::Gdl::DockMaster>(this, "master");
+ return Glib::PropertyProxy<DockMaster>(this, "master");
}
-Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockMaster> DockObject::property_master() const
+Glib::PropertyProxy_ReadOnly<DockMaster> DockObject::property_master() const
{
- return Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockMaster>(this, "master");
+ return Glib::PropertyProxy_ReadOnly<DockMaster>(this, "master");
}
-void Gnome::Gdl::DockObject::on_signal_dock(Gnome::Gdl::DockObject& requestor, Gnome::Gdl::DockPlacement position, GValue * other_data)
+void Gnome::Gdl::DockObject::on_signal_dock(DockObject& requestor, DockPlacement position, GValue * other_data)
{
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
);
if(base && base->dock)
- (*base->dock)(gobj(),(requestor).gobj(),(GdlDockPlacement)(position),other_data);
+ (*base->dock)(gobj(),(requestor).gobj(),((GdlDockPlacement)(position)),other_data);
}
void Gnome::Gdl::DockObject::on_signal_detach(bool recursive)
@@ -618,30 +628,30 @@ bool Gnome::Gdl::DockObject::dock_reques
return RType();
}
-void Gnome::Gdl::DockObject::dock_vfunc(Gnome::Gdl::DockObject& requestor, Gnome::Gdl::DockPlacement position, GValue * other_data)
+void Gnome::Gdl::DockObject::dock_vfunc(DockObject& requestor, DockPlacement position, GValue * other_data)
{
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
);
if(base && base->dock)
- (*base->dock)(gobj(),(requestor).gobj(),(GdlDockPlacement)(position),other_data);
+ (*base->dock)(gobj(),(requestor).gobj(),((GdlDockPlacement)(position)),other_data);
}
-bool Gnome::Gdl::DockObject::reorder_vfunc(Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement new_position, GValue * other_data)
+bool Gnome::Gdl::DockObject::reorder_vfunc(DockObject& child, DockPlacement new_position, GValue * other_data)
{
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
);
if(base && base->reorder)
- return (*base->reorder)(gobj(),(child).gobj(),(GdlDockPlacement)(new_position),other_data);
+ return (*base->reorder)(gobj(),(child).gobj(),((GdlDockPlacement)(new_position)),other_data);
typedef bool RType;
return RType();
}
-void Gnome::Gdl::DockObject::present_vfunc(Gnome::Gdl::DockObject& child)
+void Gnome::Gdl::DockObject::present_vfunc(DockObject& child)
{
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
@@ -651,7 +661,7 @@ void Gnome::Gdl::DockObject::present_vfu
(*base->present)(gobj(),(child).gobj());
}
-bool Gnome::Gdl::DockObject::child_placement_vfunc(Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement* placement)
+bool Gnome::Gdl::DockObject::child_placement_vfunc(DockObject& child, DockPlacement* placement)
{
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_class_peek_parent(G_OBJECT_GET_CLASS(gobject_)) // Get the parent class of the object class (The original underlying C class).
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-object.h gdlmm/gdl/gdlmm/dock-object.h
--- gdlmm_bup/gdl/gdlmm/dock-object.h 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-object.h 2005-09-14 19:52:09.000000000 +0200
@@ -102,7 +102,7 @@ protected:
//GTK+ Virtual Functions (override these to change behaviour):
//Default Signal Handlers::
- virtual void on_signal_dock(Gnome::Gdl::DockObject& requestor, Gnome::Gdl::DockPlacement position, GValue * other_data);
+ virtual void on_signal_dock(DockObject& requestor, DockPlacement position, GValue * other_data);
virtual void on_signal_detach(bool recursive);
@@ -111,13 +111,17 @@ private:
public:
DockObject();
- bool is_compound();
+ bool is_compound() const;
void detach(bool recursive);
- Gnome::Gdl::DockObject* get_parent_object();
+ DockObject* get_parent_object();
- Gnome::Gdl::Dock* get_toplevel();
+ const DockObject* get_parent_object() const;
+
+ Dock* get_toplevel();
+
+ const Dock* get_toplevel() const;
void freeze();
@@ -125,21 +129,25 @@ public:
void reduce();
- bool dock_request(gint x, gint y, GdlDockRequest* request);
-
- void dock(Gnome::Gdl::DockObject& requestor, Gnome::Gdl::DockPlacement position, GValue *other_data);
+ bool dock_request(int x, int y, GdlDockRequest* request);
- void bind(GObject* master);
+ void dock(DockObject& requestor, DockPlacement position, GValue *other_data);
+
+ //The C function (wrongly) takes a GObject, but the implementation checks that it's a GdlDockMaster.
+
+
+ void bind(const Glib::RefPtr<DockMaster>& master);
+
void unbind();
- bool is_bound();
+ bool is_bound() const;
- bool reorder(Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement new_position, GValue *other_data);
+ bool reorder(DockObject& child, DockPlacement new_position, const Glib::ValueBase& other_data);
- void present(Gnome::Gdl::DockObject& child);
+ void present(DockObject& child);
- bool child_placement( Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement* placement);
+ bool child_placement(DockObject& child, DockPlacement& placement);
/** Unique name for identifying the dock object.
*
@@ -188,7 +196,7 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy<Gnome::Gdl::DockMaster> property_master() ;
+ Glib::PropertyProxy<DockMaster> property_master() ;
/** Dock master this dock object is bound to.
*
@@ -196,20 +204,20 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockMaster> property_master() const;
+ Glib::PropertyProxy_ReadOnly<DockMaster> property_master() const;
- Glib::SignalProxy3< void,Gnome::Gdl::DockObject&,Gnome::Gdl::DockPlacement,GValue * > signal_signal_dock();
+ Glib::SignalProxy3< void,DockObject&,DockPlacement,GValue * > signal_signal_dock();
Glib::SignalProxy1< void,bool > signal_signal_detach();
virtual bool dock_request_vfunc(gint x, gint y, GdlDockRequest* request);
- virtual void dock_vfunc(Gnome::Gdl::DockObject& requestor, Gnome::Gdl::DockPlacement position, GValue * other_data);
- virtual bool reorder_vfunc(Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement new_position, GValue * other_data);
- virtual void present_vfunc(Gnome::Gdl::DockObject& child);
- virtual bool child_placement_vfunc(Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement* placement);
+ virtual void dock_vfunc(DockObject& requestor, DockPlacement position, GValue * other_data);
+ virtual bool reorder_vfunc(DockObject& child, DockPlacement new_position, GValue * other_data);
+ virtual void present_vfunc(DockObject& child);
+ virtual bool child_placement_vfunc(DockObject& child, DockPlacement* placement);
};
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-placeholder.cc gdlmm/gdl/gdlmm/dock-placeholder.cc
--- gdlmm_bup/gdl/gdlmm/dock-placeholder.cc 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-placeholder.cc 2005-09-14 19:52:52.000000000 +0200
@@ -30,7 +30,7 @@ namespace Gnome
namespace Gdl
{
-DockPlaceholder::DockPlaceholder(const Glib::ustring& name, Gnome::Gdl::DockObject& dock_object, Gnome::Gdl::DockPlacement position, bool sticky)
+DockPlaceholder::DockPlaceholder(const Glib::ustring& name, DockObject& dock_object, DockPlacement position, bool sticky)
: DockObject((GdlDockObject*) gdl_dock_placeholder_new((gchar*)name.c_str(), Glib::unwrap(&dock_object), (GdlDockPlacement)position, sticky))
{
@@ -106,13 +106,13 @@ Glib::ObjectBase* DockPlaceholder_Class:
DockPlaceholder::DockPlaceholder(const Glib::ConstructParams& construct_params)
:
- Gnome::Gdl::DockObject(construct_params)
+ DockObject(construct_params)
{
}
DockPlaceholder::DockPlaceholder(GdlDockPlaceholder* castitem)
:
- Gnome::Gdl::DockObject((GdlDockObject*)(castitem))
+ DockObject((GdlDockObject*)(castitem))
{
}
@@ -134,7 +134,7 @@ GType DockPlaceholder::get_base_type()
}
-void DockPlaceholder::attach(Gnome::Gdl::DockObject& object)
+void DockPlaceholder::attach(DockObject& object)
{
gdl_dock_placeholder_attach(gobj(), (object).gobj());
}
@@ -145,24 +145,24 @@ Glib::PropertyProxy_ReadOnly<bool> DockP
return Glib::PropertyProxy_ReadOnly<bool>(this, "sticky");
}
-Glib::PropertyProxy<Gnome::Gdl::DockObject> DockPlaceholder::property_host()
+Glib::PropertyProxy<DockObject> DockPlaceholder::property_host()
{
- return Glib::PropertyProxy<Gnome::Gdl::DockObject>(this, "host");
+ return Glib::PropertyProxy<DockObject>(this, "host");
}
-Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockObject> DockPlaceholder::property_host() const
+Glib::PropertyProxy_ReadOnly<DockObject> DockPlaceholder::property_host() const
{
- return Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockObject>(this, "host");
+ return Glib::PropertyProxy_ReadOnly<DockObject>(this, "host");
}
-Glib::PropertyProxy<Gnome::Gdl::DockPlacement> DockPlaceholder::property_next_placement()
+Glib::PropertyProxy<DockPlacement> DockPlaceholder::property_next_placement()
{
- return Glib::PropertyProxy<Gnome::Gdl::DockPlacement>(this, "next-placement");
+ return Glib::PropertyProxy<DockPlacement>(this, "next-placement");
}
-Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockPlacement> DockPlaceholder::property_next_placement() const
+Glib::PropertyProxy_ReadOnly<DockPlacement> DockPlaceholder::property_next_placement() const
{
- return Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockPlacement>(this, "next-placement");
+ return Glib::PropertyProxy_ReadOnly<DockPlacement>(this, "next-placement");
}
diff -up --recursive gdlmm_bup/gdl/gdlmm/dock-placeholder.h gdlmm/gdl/gdlmm/dock-placeholder.h
--- gdlmm_bup/gdl/gdlmm/dock-placeholder.h 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/dock-placeholder.h 2005-09-14 19:52:52.000000000 +0200
@@ -105,9 +105,9 @@ protected:
private:
public:
- DockPlaceholder(const Glib::ustring& name, Gnome::Gdl::DockObject& dock_object, Gnome::Gdl::DockPlacement position, bool sticky);
+ DockPlaceholder(const Glib::ustring& name, DockObject& dock_object, DockPlacement position, bool sticky);
- void attach(Gnome::Gdl::DockObject& object);
+ void attach(DockObject& object);
/** Whether the placeholder will stick to its host or move up the hierarchy when the host is redocked.
*
@@ -124,7 +124,7 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy<Gnome::Gdl::DockObject> property_host() ;
+ Glib::PropertyProxy<DockObject> property_host() ;
/** The dock object this placeholder is attached to.
*
@@ -132,7 +132,7 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockObject> property_host() const;
+ Glib::PropertyProxy_ReadOnly<DockObject> property_host() const;
/** The position an item will be docked to our host if a request is made to dock to us.
*
@@ -140,7 +140,7 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy<Gnome::Gdl::DockPlacement> property_next_placement() ;
+ Glib::PropertyProxy<DockPlacement> property_next_placement() ;
/** The position an item will be docked to our host if a request is made to dock to us.
*
@@ -148,7 +148,7 @@ public:
* @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when
* the value of the property changes.
*/
- Glib::PropertyProxy_ReadOnly<Gnome::Gdl::DockPlacement> property_next_placement() const;
+ Glib::PropertyProxy_ReadOnly<DockPlacement> property_next_placement() const;
};
diff -up --recursive gdlmm_bup/gdl/gdlmm/icons.cc gdlmm/gdl/gdlmm/icons.cc
--- gdlmm_bup/gdl/gdlmm/icons.cc 2005-09-14 19:05:20.000000000 +0200
+++ gdlmm/gdl/gdlmm/icons.cc 2005-09-14 19:54:42.000000000 +0200
@@ -144,16 +144,31 @@ Glib::RefPtr<Gdk::Pixbuf> Icons::get_fol
return Glib::wrap(gdl_icons_get_folder_icon(gobj()));
}
+Glib::RefPtr<const Gdk::Pixbuf> Icons::get_folder_icon() const
+{
+ return Glib::wrap(gdl_icons_get_folder_icon(const_cast<GdlIcons*>(gobj())));
+}
+
Glib::RefPtr<Gdk::Pixbuf> Icons::get_uri_icon(const Glib::ustring& uri)
{
return Glib::wrap(gdl_icons_get_uri_icon(gobj(), uri.c_str()));
}
+Glib::RefPtr<const Gdk::Pixbuf> Icons::get_uri_icon(const Glib::ustring& uri) const
+{
+ return Glib::wrap(gdl_icons_get_uri_icon(const_cast<GdlIcons*>(gobj()), uri.c_str()));
+}
+
Glib::RefPtr<Gdk::Pixbuf> Icons::get_mimi_icon(const Glib::ustring& mime_type)
{
return Glib::wrap(gdl_icons_get_mime_icon(gobj(), mime_type.c_str()));
}
+Glib::RefPtr<const Gdk::Pixbuf> Icons::get_mimi_icon(const Glib::ustring& mime_type) const
+{
+ return Glib::wrap(gdl_icons_get_mime_icon(const_cast<GdlIcons*>(gobj()), mime_type.c_str()));
+}
+
} // namespace Gdl
diff -up --recursive gdlmm_bup/gdl/gdlmm/icons.h gdlmm/gdl/gdlmm/icons.h
--- gdlmm_bup/gdl/gdlmm/icons.h 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/icons.h 2005-09-14 19:54:42.000000000 +0200
@@ -97,11 +97,19 @@ public:
Icons();
- Glib::RefPtr<Gdk::Pixbuf> get_folder_icon() ;
+ Glib::RefPtr<Gdk::Pixbuf> get_folder_icon();
- Glib::RefPtr<Gdk::Pixbuf> get_uri_icon(const Glib::ustring& uri) ;
+ Glib::RefPtr<const Gdk::Pixbuf> get_folder_icon() const;
+
+
+ Glib::RefPtr<Gdk::Pixbuf> get_uri_icon(const Glib::ustring& uri);
+
+ Glib::RefPtr<const Gdk::Pixbuf> get_uri_icon(const Glib::ustring& uri) const;
+
Glib::RefPtr<Gdk::Pixbuf> get_mimi_icon(const Glib::ustring& mime_type);
+
+ Glib::RefPtr<const Gdk::Pixbuf> get_mimi_icon(const Glib::ustring& mime_type) const;
public:
diff -up --recursive gdlmm_bup/gdl/gdlmm/private/dock-item_p.h gdlmm/gdl/gdlmm/private/dock-item_p.h
--- gdlmm_bup/gdl/gdlmm/private/dock-item_p.h 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/private/dock-item_p.h 2005-09-14 19:27:20.000000000 +0200
@@ -19,7 +19,7 @@ public:
typedef DockItem CppObjectType;
typedef GdlDockItem BaseObjectType;
typedef GdlDockItemClass BaseClassType;
- typedef Gnome::Gdl::DockObject_Class CppClassParent;
+ typedef DockObject_Class CppClassParent;
typedef GdlDockObjectClass BaseClassParent;
friend class DockItem;
diff -up --recursive gdlmm_bup/gdl/gdlmm/private/dock_p.h gdlmm/gdl/gdlmm/private/dock_p.h
--- gdlmm_bup/gdl/gdlmm/private/dock_p.h 2005-09-14 19:05:20.000000000 +0200
+++ gdlmm/gdl/gdlmm/private/dock_p.h 2005-09-14 19:26:41.000000000 +0200
@@ -19,7 +19,7 @@ public:
typedef Dock CppObjectType;
typedef GdlDock BaseObjectType;
typedef GdlDockClass BaseClassType;
- typedef Gnome::Gdl::DockObject_Class CppClassParent;
+ typedef DockObject_Class CppClassParent;
typedef GdlDockObjectClass BaseClassParent;
friend class Dock;
diff -up --recursive gdlmm_bup/gdl/gdlmm/private/dock-placeholder_p.h gdlmm/gdl/gdlmm/private/dock-placeholder_p.h
--- gdlmm_bup/gdl/gdlmm/private/dock-placeholder_p.h 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/private/dock-placeholder_p.h 2005-09-14 19:52:52.000000000 +0200
@@ -19,7 +19,7 @@ public:
typedef DockPlaceholder CppObjectType;
typedef GdlDockPlaceholder BaseObjectType;
typedef GdlDockPlaceholderClass BaseClassType;
- typedef Gnome::Gdl::DockObject_Class CppClassParent;
+ typedef DockObject_Class CppClassParent;
typedef GdlDockObjectClass BaseClassParent;
friend class DockPlaceholder;
diff -up --recursive gdlmm_bup/gdl/gdlmm/recent.cc gdlmm/gdl/gdlmm/recent.cc
--- gdlmm_bup/gdl/gdlmm/recent.cc 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/recent.cc 2005-09-14 19:54:44.000000000 +0200
@@ -230,9 +230,9 @@ GSList* Recent::get_list()
return gdl_recent_get_list(gobj());
}
-int Recent::get_limit()
+int Recent::get_limit() const
{
- return gdl_recent_get_limit(gobj());
+ return gdl_recent_get_limit(const_cast<GdlRecent*>(gobj()));
}
void Recent::set_limit(int limit)
@@ -240,9 +240,9 @@ void Recent::set_limit(int limit)
gdl_recent_set_limit(gobj(), limit);
}
-int Recent::get_list_type()
+int Recent::get_list_type() const
{
- return gdl_recent_get_list_type(gobj());
+ return gdl_recent_get_list_type(const_cast<GdlRecent*>(gobj()));
}
void Recent::set_list_limit(int list_type)
diff -up --recursive gdlmm_bup/gdl/gdlmm/recent.h gdlmm/gdl/gdlmm/recent.h
--- gdlmm_bup/gdl/gdlmm/recent.h 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/gdlmm/recent.h 2005-09-14 19:54:44.000000000 +0200
@@ -104,14 +104,17 @@ public:
void remove(const Glib::ustring& uri);
void clear();
+
+ //TODO: Wrap this like GConf::Client::get_list(), because that's what it uses:
GSList* get_list();
+
- int get_limit();
+ int get_limit() const;
void set_limit(int limit);
- int get_list_type();
+ int get_list_type() const;
void set_list_limit(int list_type);
diff -up --recursive gdlmm_bup/gdl/src/dock-bar.hg gdlmm/gdl/src/dock-bar.hg
--- gdlmm_bup/gdl/src/dock-bar.hg 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/src/dock-bar.hg 2005-09-14 19:16:18.000000000 +0200
@@ -42,7 +42,7 @@ public:
DockBar(Gnome::Gdl::Dock& dock);
_IGNORE(gdl_dock_bar_new)
- _WRAP_METHOD(Gtk::Orientation get_orientation(), gdl_dock_bar_get_orientation)
+ _WRAP_METHOD(Gtk::Orientation get_orientation() const, gdl_dock_bar_get_orientation)
_WRAP_METHOD(void set_orientation(Gtk::Orientation orientation), gdl_dock_bar_set_orientation)
_WRAP_PROPERTY( "master", Gnome::Gdl::DockMaster )
Only in gdlmm/gdl/src: dock-bar.hg~
diff -up --recursive gdlmm_bup/gdl/src/dock.ccg gdlmm/gdl/src/dock.ccg
--- gdlmm_bup/gdl/src/dock.ccg 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/src/dock.ccg 2005-09-14 20:03:32.000000000 +0200
@@ -21,6 +21,7 @@
#include <gdlmm/dock.h>
#include <gdlmm/dock-item.h>
#include <gdlmm/dock-placeholder.h>
+#include <gdlmm/dock-master.h>
namespace Gnome
{
@@ -28,7 +29,7 @@ namespace Gnome
namespace Gdl
{
-Dock::Dock(Gnome::Gdl::Dock& original, bool floating)
+Dock::Dock(Dock& original, bool floating)
:
Gnome::Gdl::DockObject((GdlDockObject*) gdl_dock_new_from(Glib::unwrap(&original), floating))
{
Only in gdlmm/gdl/src: dock.ccg~
diff -up --recursive gdlmm_bup/gdl/src/dock.hg gdlmm/gdl/src/dock.hg
--- gdlmm_bup/gdl/src/dock.hg 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/src/dock.hg 2005-09-14 20:02:16.000000000 +0200
@@ -40,18 +40,27 @@ class DockPlaceholder;
class Dock : public DockObject
{
- _CLASS_GTKOBJECT(Dock, GdlDock, GDL_DOCK, Gnome::Gdl::DockObject, GdlDockObject)
+ _CLASS_GTKOBJECT(Dock, GdlDock, GDL_DOCK, DockObject, GdlDockObject)
public:
_CTOR_DEFAULT()
- Dock(Gnome::Gdl::Dock& original, bool floating);
+ Dock(Dock& original, bool floating);
_IGNORE(gdl_dock_new_from)
- _WRAP_METHOD(void add_item(Gnome::Gdl::DockItem& item, Gnome::Gdl::DockPlacement place), gdl_dock_add_item )
- _WRAP_METHOD(void add_floating_item(Gnome::Gdl::DockItem& item, gint x, gint y, gint width, gint height), gdl_dock_add_floating_item )
- _WRAP_METHOD(Gnome::Gdl::DockItem* get_item_by_name(const Glib::ustring& name), gdl_dock_get_item_by_name)
- _WRAP_METHOD(Gnome::Gdl::DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name), gdl_dock_get_placeholder_by_name)
- _WRAP_METHOD(GList* get_named_items(), gdl_dock_get_named_items)
- _WRAP_METHOD(void xor_rect(Gdk::Rectangle& rect), gdl_dock_xor_rect)
+ _WRAP_METHOD(void add_item(DockItem& item, DockPlacement place), gdl_dock_add_item )
+ _WRAP_METHOD(void add_floating_item(DockItem& item, int x, int y, int width, int height), gdl_dock_add_floating_item )
+ _WRAP_METHOD(DockItem* get_item_by_name(const Glib::ustring& name), gdl_dock_get_item_by_name)
+ _WRAP_METHOD(const DockItem* get_item_by_name(const Glib::ustring& name) const, gdl_dock_get_item_by_name)
+ _WRAP_METHOD(DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name), gdl_dock_get_placeholder_by_name)
+ _WRAP_METHOD(const DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name) const, gdl_dock_get_placeholder_by_name)
+
+ //TODO: Check what ownership is appropriate:
+ #m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<DockMaster> >',`$2((GList*)$3, Glib::OWNERSHIP_SHALLOW)')
+ #m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<const DockMaster> >',`$2((GList*)$3, Glib::OWNERSHIP_SHALLOW)')
+
+ _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<DockMaster> > get_named_items(), gdl_dock_get_named_items)
+ _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const DockMaster> > get_named_items() const, gdl_dock_get_named_items)
+
+ _WRAP_METHOD(void xor_rect(const Gdk::Rectangle& rect), gdl_dock_xor_rect)
_WRAP_PROPERTY("floating", bool )
_WRAP_PROPERTY("default_title", Glib::ustring )
diff -up --recursive gdlmm_bup/gdl/src/dock.hg~ gdlmm/gdl/src/dock.hg~
--- gdlmm_bup/gdl/src/dock.hg~ 2005-09-14 19:05:18.000000000 +0200
+++ gdlmm/gdl/src/dock.hg~ 2005-09-14 19:55:53.000000000 +0200
@@ -40,18 +40,27 @@ class DockPlaceholder;
class Dock : public DockObject
{
- _CLASS_GTKOBJECT(Dock, GdlDock, GDL_DOCK, Gnome::Gdl::DockObject, GdlDockObject)
+ _CLASS_GTKOBJECT(Dock, GdlDock, GDL_DOCK, DockObject, GdlDockObject)
public:
_CTOR_DEFAULT()
- Dock(Gnome::Gdl::Dock& original, bool floating);
+ Dock(Dock& original, bool floating);
_IGNORE(gdl_dock_new_from)
- _WRAP_METHOD(void add_item(Gnome::Gdl::DockItem& item, Gnome::Gdl::DockPlacement place), gdl_dock_add_item )
- _WRAP_METHOD(void add_floating_item(Gnome::Gdl::DockItem& item, gint x, gint y, gint width, gint height), gdl_dock_add_floating_item )
- _WRAP_METHOD(Gnome::Gdl::DockItem* get_item_by_name(const Glib::ustring& name), gdl_dock_get_item_by_name)
- _WRAP_METHOD(Gnome::Gdl::DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name), gdl_dock_get_placeholder_by_name)
- _WRAP_METHOD(GList* get_named_items(), gdl_dock_get_named_items)
- _WRAP_METHOD(void xor_rect(Gdk::Rectangle& rect), gdl_dock_xor_rect)
+ _WRAP_METHOD(void add_item(DockItem& item, DockPlacement place), gdl_dock_add_item )
+ _WRAP_METHOD(void add_floating_item(DockItem& item, int x, int y, int width, int height), gdl_dock_add_floating_item )
+ _WRAP_METHOD(DockItem* get_item_by_name(const Glib::ustring& name), gdl_dock_get_item_by_name)
+ _WRAP_METHOD(const DockItem* get_item_by_name(const Glib::ustring& name) const, gdl_dock_get_item_by_name)
+ _WRAP_METHOD(DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name), gdl_dock_get_placeholder_by_name)
+ _WRAP_METHOD(const DockPlaceholder* get_placeholder_by_name(const Glib::ustring& name) const, gdl_dock_get_placeholder_by_name)
+
+ //TODO: Check what ownership is appropriate:
+ #m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<DockMaster> >',`$2((GList*)$3, Glib::OWNERSHIP_SHALLOW)')
+ #m4 _CONVERSION(`GList*',`Glib::ListHandle< Glib::RefPtr<const DockMaster> >',`$2((const GList*)$3, Glib::OWNERSHIP_SHALLOW)')
+
+ _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<DockMaster> > get_named_items(), gdl_dock_get_named_items)
+ _WRAP_METHOD(Glib::ListHandle< Glib::RefPtr<const DockMaster> > get_named_items() const, gdl_dock_get_named_items)
+
+ _WRAP_METHOD(void xor_rect(const Gdk::Rectangle& rect), gdl_dock_xor_rect)
_WRAP_PROPERTY("floating", bool )
_WRAP_PROPERTY("default_title", Glib::ustring )
diff -up --recursive gdlmm_bup/gdl/src/dock-item.hg gdlmm/gdl/src/dock-item.hg
--- gdlmm_bup/gdl/src/dock-item.hg 2005-09-14 19:05:18.000000000 +0200
+++ gdlmm/gdl/src/dock-item.hg 2005-09-14 19:27:15.000000000 +0200
@@ -35,12 +35,12 @@ namespace Gdl
class DockItem : public DockObject
{
- _CLASS_GTKOBJECT(DockItem, GdlDockItem, GDL_DOCK_ITEM, Gnome::Gdl::DockObject, GdlDockObject)
+ _CLASS_GTKOBJECT(DockItem, GdlDockItem, GDL_DOCK_ITEM, DockObject, GdlDockObject)
public:
- DockItem(const Glib::ustring& name, const Glib::ustring& long_name, Gnome::Gdl::DockItemBehavior behavior);
- DockItem(const Glib::ustring& name, const Glib::ustring& long_name, const Gtk::StockID& stock_id, Gnome::Gdl::DockItemBehavior behavior);
+ DockItem(const Glib::ustring& name, const Glib::ustring& long_name, DockItemBehavior behavior);
+ DockItem(const Glib::ustring& name, const Glib::ustring& long_name, const Gtk::StockID& stock_id, DockItemBehavior behavior);
- _WRAP_METHOD( void dock_to( Gnome::Gdl::DockItem& target, Gnome::Gdl::DockPlacement position, gint docking_param), gdl_dock_item_dock_to )
+ _WRAP_METHOD( void dock_to( DockItem& target, DockPlacement position, gint docking_param), gdl_dock_item_dock_to )
void dock_floating( gint docking_param);
_WRAP_METHOD( void set_orientation( Gtk::Orientation orientation), gdl_dock_item_set_orientation )
_WRAP_METHOD( GtkWidget* get_tablabel(), gdl_dock_item_get_tablabel )
@@ -54,11 +54,11 @@ public:
_WRAP_METHOD( void show_item(), gdl_dock_item_show_item)
_WRAP_METHOD( void lock(), gdl_dock_item_lock)
_WRAP_METHOD( void unlock(), gdl_dock_item_unlock)
- _WRAP_METHOD( void set_default_position( Gnome::Gdl::DockObject& reference), gdl_dock_item_set_default_position )
+ _WRAP_METHOD( void set_default_position( DockObject& reference), gdl_dock_item_set_default_position )
_WRAP_METHOD( void preferred_size(GtkRequisition* req), gdl_dock_item_preferred_size )
_WRAP_PROPERTY("resize", bool )
- _WRAP_PROPERTY("behavior", Gnome::Gdl::DockItemBehavior )
+ _WRAP_PROPERTY("behavior", DockItemBehavior )
_WRAP_PROPERTY("locked", bool )
_WRAP_PROPERTY("preferred_width", int)
_WRAP_PROPERTY("preferred_height", int)
Only in gdlmm/gdl/src: dock-item.hg~
diff -up --recursive gdlmm_bup/gdl/src/dock-layout.ccg gdlmm/gdl/src/dock-layout.ccg
--- gdlmm_bup/gdl/src/dock-layout.ccg 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/src/dock-layout.ccg 2005-09-14 19:23:40.000000000 +0200
@@ -26,7 +26,7 @@ namespace Gnome
namespace Gdl
{
-DockLayout::DockLayout(Gnome::Gdl::Dock& dock)
+DockLayout::DockLayout(Dock& dock)
:
Glib::Object((GObject*) gdl_dock_layout_new(Glib::unwrap(&dock)))
{
Only in gdlmm/gdl/src: dock-layout.ccg~
diff -up --recursive gdlmm_bup/gdl/src/dock-layout.hg gdlmm/gdl/src/dock-layout.hg
--- gdlmm_bup/gdl/src/dock-layout.hg 2005-09-14 19:05:18.000000000 +0200
+++ gdlmm/gdl/src/dock-layout.hg 2005-09-14 19:33:07.000000000 +0200
@@ -39,24 +39,31 @@ class DockLayout : public Glib::Object
{
_CLASS_GOBJECT(DockLayout, GdlDockLayout, GDL_DOCK_LAYOUT, Glib::Object, GObject)
public:
- DockLayout(Gnome::Gdl::Dock& dock);
+ DockLayout(Dock& dock);
_IGNORE(gdl_dock_layout_new)
- _WRAP_METHOD(void attach(Gnome::Gdl::DockMaster& master), gdl_dock_layout_attach )
+ _WRAP_METHOD(void attach(DockMaster& master), gdl_dock_layout_attach )
_WRAP_METHOD(bool load_layout(const Glib::ustring& name), gdl_dock_layout_load_layout )
void reset_layout();
_WRAP_METHOD(void save_layout(const Glib::ustring& name), gdl_dock_layout_save_layout )
_WRAP_METHOD(void delete_layout(const Glib::ustring& name), gdl_dock_layout_delete_layout )
- _WRAP_METHOD(GList* get_layouts(bool include_default), gdl_dock_layout_get_layouts )
+
+ //TODO: Check the ownership:
+ #m4 _CONVERSION(`GList*',`Glib::ListHandle<Glib::ustring>',__FL2H_SHALLOW)
+ _WRAP_METHOD(Glib::ListHandle<Glib::ustring> get_layouts(bool include_default) const, gdl_dock_layout_get_layouts )
+
_WRAP_METHOD(void run_manager(), gdl_dock_layout_run_manager )
_WRAP_METHOD(bool load_from_file(const Glib::ustring& filename), gdl_dock_layout_load_from_file )
- _WRAP_METHOD(bool save_to_file(const Glib::ustring& filename), gdl_dock_layout_save_to_file )
- _WRAP_METHOD(bool is_dirty(), gdl_dock_layout_is_dirty )
+ _WRAP_METHOD(bool save_to_file(const Glib::ustring& filename) const, gdl_dock_layout_save_to_file )
+ _WRAP_METHOD(bool is_dirty() const, gdl_dock_layout_is_dirty )
_WRAP_METHOD(Gtk::Widget* get_ui(), gdl_dock_layout_get_ui )
+ _WRAP_METHOD(const Gtk::Widget* get_ui() const, gdl_dock_layout_get_ui )
_WRAP_METHOD(Gtk::Widget* get_items_ui(), gdl_dock_layout_get_items_ui )
+ _WRAP_METHOD(const Gtk::Widget* get_items_ui() const, gdl_dock_layout_get_items_ui )
_WRAP_METHOD(Gtk::Widget* get_layouts_ui(), gdl_dock_layout_get_layouts_ui )
+ _WRAP_METHOD(const Gtk::Widget* get_layouts_ui() const, gdl_dock_layout_get_layouts_ui )
- _WRAP_PROPERTY("master", Gnome::Gdl::DockMaster )
+ _WRAP_PROPERTY("master", DockMaster )
_WRAP_PROPERTY("dirty", bool)
};
Only in gdlmm/gdl/src: dock-layout.hg~
diff -up --recursive gdlmm_bup/gdl/src/dock-master.hg gdlmm/gdl/src/dock-master.hg
--- gdlmm_bup/gdl/src/dock-master.hg 2005-09-14 19:05:18.000000000 +0200
+++ gdlmm/gdl/src/dock-master.hg 2005-09-14 19:33:57.000000000 +0200
@@ -38,12 +38,14 @@ class DockMaster : public Glib::Object
public:
_CTOR_DEFAULT()
- _WRAP_METHOD(void add(Gnome::Gdl::DockObject& object), gdl_dock_master_add )
- _WRAP_METHOD(void remove(Gnome::Gdl::DockObject& object), gdl_dock_master_remove )
+ _WRAP_METHOD(void add(DockObject& object), gdl_dock_master_add )
+ _WRAP_METHOD(void remove(DockObject& object), gdl_dock_master_remove )
- _WRAP_METHOD(Gnome::Gdl::DockObject* get_object(const Glib::ustring& nick_name), gdl_dock_master_get_object )
- _WRAP_METHOD(Gnome::Gdl::DockObject* get_controller(), gdl_dock_master_get_controller )
- _WRAP_METHOD(void set_controller(Gnome::Gdl::DockObject& new_controller), gdl_dock_master_set_controller )
+ _WRAP_METHOD(DockObject* get_object(const Glib::ustring& nick_name), gdl_dock_master_get_object )
+ _WRAP_METHOD(const DockObject* get_object(const Glib::ustring& nick_name) const, gdl_dock_master_get_object )
+ _WRAP_METHOD(DockObject* get_controller(), gdl_dock_master_get_controller )
+ _WRAP_METHOD(const DockObject* get_controller() const, gdl_dock_master_get_controller )
+ _WRAP_METHOD(void set_controller(DockObject& new_controller), gdl_dock_master_set_controller )
_WRAP_SIGNAL( void layout_changed_signal(), "layout_changed" )
};
Only in gdlmm/gdl/src: dock-master.hg~
diff -up --recursive gdlmm_bup/gdl/src/dock-object.hg gdlmm/gdl/src/dock-object.hg
--- gdlmm_bup/gdl/src/dock-object.hg 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/src/dock-object.hg 2005-09-14 19:50:04.000000000 +0200
@@ -40,35 +40,41 @@ class DockObject : public Gtk::Container
_CLASS_GTKOBJECT(DockObject, GdlDockObject, GDL_DOCK_OBJECT, Gtk::Container, GtkContainer)
public:
_CTOR_DEFAULT()
- _WRAP_METHOD( bool is_compound(), gdl_dock_object_is_compound)
+ _WRAP_METHOD( bool is_compound() const, gdl_dock_object_is_compound)
_WRAP_METHOD( void detach(bool recursive), gdl_dock_object_detach )
- _WRAP_METHOD( Gnome::Gdl::DockObject* get_parent_object(), gdl_dock_object_get_parent_object )
- _WRAP_METHOD( Gnome::Gdl::Dock* get_toplevel(), gdl_dock_object_get_toplevel )
+ _WRAP_METHOD( DockObject* get_parent_object(), gdl_dock_object_get_parent_object )
+ _WRAP_METHOD( const DockObject* get_parent_object() const, gdl_dock_object_get_parent_object )
+ _WRAP_METHOD( Dock* get_toplevel(), gdl_dock_object_get_toplevel )
+ _WRAP_METHOD( const Dock* get_toplevel() const, gdl_dock_object_get_toplevel )
_WRAP_METHOD( void freeze(), gdl_dock_object_freeze )
_WRAP_METHOD( void thaw(), gdl_dock_object_thaw )
_WRAP_METHOD( void reduce(), gdl_dock_object_reduce )
- _WRAP_METHOD( bool dock_request(gint x, gint y, GdlDockRequest* request), gdl_dock_object_dock_request )
- _WRAP_METHOD( void dock(Gnome::Gdl::DockObject& requestor, Gnome::Gdl::DockPlacement position, GValue *other_data), gdl_dock_object_dock )
- _WRAP_METHOD( void bind(GObject* master), gdl_dock_object_bind )
+ _WRAP_METHOD( bool dock_request(int x, int y, GdlDockRequest* request), gdl_dock_object_dock_request )
+ _WRAP_METHOD( void dock(DockObject& requestor, DockPlacement position, GValue *other_data), gdl_dock_object_dock )
+
+ //The C function (wrongly) takes a GObject, but the implementation checks that it's a GdlDockMaster.
+ #m4 _CONVERSION(`const Glib::RefPtr<DockMaster>&',`GObject*',G_OBJECT(__CONVERT_REFPTR_TO_P))
+ _WRAP_METHOD( void bind(const Glib::RefPtr<DockMaster>& master), gdl_dock_object_bind )
+
_WRAP_METHOD( void unbind(), gdl_dock_object_unbind )
- _WRAP_METHOD( bool is_bound(), gdl_dock_object_is_bound )
- _WRAP_METHOD( bool reorder(Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement new_position, GValue *other_data), gdl_dock_object_reorder )
- _WRAP_METHOD( void present(Gnome::Gdl::DockObject& child), gdl_dock_object_present )
- _WRAP_METHOD( bool child_placement( Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement* placement), gdl_dock_object_child_placement )
+ _WRAP_METHOD( bool is_bound() const, gdl_dock_object_is_bound )
+ _WRAP_METHOD( bool reorder(DockObject& child, DockPlacement new_position, const Glib::ValueBase& other_data), gdl_dock_object_reorder )
+ _WRAP_METHOD( void present(DockObject& child), gdl_dock_object_present )
+ _WRAP_METHOD( bool child_placement(DockObject& child, DockPlacement& placement), gdl_dock_object_child_placement )
_WRAP_PROPERTY( "name", Glib::ustring )
_WRAP_PROPERTY( "long_name", Glib::ustring )
_WRAP_PROPERTY( "stock_id", Glib::ustring )
- _WRAP_PROPERTY( "master", Gnome::Gdl::DockMaster )
+ _WRAP_PROPERTY( "master", DockMaster )
- _WRAP_SIGNAL( void signal_dock(Gnome::Gdl::DockObject& requestor, Gnome::Gdl::DockPlacement position, GValue *other_data), "dock")
+ _WRAP_SIGNAL( void signal_dock(DockObject& requestor, DockPlacement position, GValue *other_data), "dock")
_WRAP_SIGNAL( void signal_detach(bool recursive), "detach")
_WRAP_VFUNC( bool dock_request(gint x, gint y, GdlDockRequest* request), "dock_request" )
- _WRAP_VFUNC( void dock(Gnome::Gdl::DockObject& requestor, Gnome::Gdl::DockPlacement position, GValue *other_data), "dock" )
- _WRAP_VFUNC( bool reorder(Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement new_position, GValue *other_data), "reorder" )
- _WRAP_VFUNC( void present(Gnome::Gdl::DockObject& child), "present" )
- _WRAP_VFUNC( bool child_placement( Gnome::Gdl::DockObject& child, Gnome::Gdl::DockPlacement* placement), "child_placement" )
+ _WRAP_VFUNC( void dock(DockObject& requestor, DockPlacement position, GValue *other_data), "dock" )
+ _WRAP_VFUNC( bool reorder(DockObject& child, DockPlacement new_position, GValue *other_data), "reorder" )
+ _WRAP_VFUNC( void present(DockObject& child), "present" )
+ _WRAP_VFUNC( bool child_placement( DockObject& child, DockPlacement* placement), "child_placement" )
};
} // namespace Gdl
Only in gdlmm/gdl/src: dock-object.hg~
diff -up --recursive gdlmm_bup/gdl/src/dock-placeholder.ccg gdlmm/gdl/src/dock-placeholder.ccg
--- gdlmm_bup/gdl/src/dock-placeholder.ccg 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/src/dock-placeholder.ccg 2005-09-14 19:24:25.000000000 +0200
@@ -25,7 +25,7 @@ namespace Gnome
namespace Gdl
{
-DockPlaceholder::DockPlaceholder(const Glib::ustring& name, Gnome::Gdl::DockObject& dock_object, Gnome::Gdl::DockPlacement position, bool sticky)
+DockPlaceholder::DockPlaceholder(const Glib::ustring& name, DockObject& dock_object, DockPlacement position, bool sticky)
: DockObject((GdlDockObject*) gdl_dock_placeholder_new((gchar*)name.c_str(), Glib::unwrap(&dock_object), (GdlDockPlacement)position, sticky))
{
Only in gdlmm/gdl/src: dock-placeholder.ccg~
diff -up --recursive gdlmm_bup/gdl/src/dock-placeholder.hg gdlmm/gdl/src/dock-placeholder.hg
--- gdlmm_bup/gdl/src/dock-placeholder.hg 2005-09-14 19:05:18.000000000 +0200
+++ gdlmm/gdl/src/dock-placeholder.hg 2005-09-14 19:52:35.000000000 +0200
@@ -35,14 +35,14 @@ namespace Gdl
class DockPlaceholder : public DockObject
{
- _CLASS_GTKOBJECT(DockPlaceholder, GdlDockPlaceholder, GDL_DOCK_PLACEHOLDER, Gnome::Gdl::DockObject, GdlDockObject)
+ _CLASS_GTKOBJECT(DockPlaceholder, GdlDockPlaceholder, GDL_DOCK_PLACEHOLDER, DockObject, GdlDockObject)
public:
- DockPlaceholder(const Glib::ustring& name, Gnome::Gdl::DockObject& dock_object, Gnome::Gdl::DockPlacement position, bool sticky);
- _WRAP_METHOD(void attach(Gnome::Gdl::DockObject& object), gdl_dock_placeholder_attach )
+ DockPlaceholder(const Glib::ustring& name, DockObject& dock_object, DockPlacement position, bool sticky);
+ _WRAP_METHOD(void attach(DockObject& object), gdl_dock_placeholder_attach )
_WRAP_PROPERTY("sticky", bool )
- _WRAP_PROPERTY("host", Gnome::Gdl::DockObject)
- _WRAP_PROPERTY("next_placement", Gnome::Gdl::DockPlacement )
+ _WRAP_PROPERTY("host", DockObject)
+ _WRAP_PROPERTY("next_placement", DockPlacement )
};
} // namespace Gdl
Only in gdlmm/gdl/src: dock-placeholder.hg~
diff -up --recursive gdlmm_bup/gdl/src/icons.hg gdlmm/gdl/src/icons.hg
--- gdlmm_bup/gdl/src/icons.hg 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/src/icons.hg 2005-09-14 19:14:21.000000000 +0200
@@ -36,9 +36,14 @@ class Icons : public Glib::Object
public:
_CTOR_DEFAULT()
- _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_folder_icon() , gdl_icons_get_folder_icon )
- _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_uri_icon(const Glib::ustring& uri) , gdl_icons_get_uri_icon )
+ _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_folder_icon(), gdl_icons_get_folder_icon )
+ _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_folder_icon() const, gdl_icons_get_folder_icon )
+
+ _WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_uri_icon(const Glib::ustring& uri), gdl_icons_get_uri_icon )
+ _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_uri_icon(const Glib::ustring& uri) const, gdl_icons_get_uri_icon )
+
_WRAP_METHOD(Glib::RefPtr<Gdk::Pixbuf> get_mimi_icon(const Glib::ustring& mime_type), gdl_icons_get_mime_icon )
+ _WRAP_METHOD(Glib::RefPtr<const Gdk::Pixbuf> get_mimi_icon(const Glib::ustring& mime_type) const, gdl_icons_get_mime_icon )
};
} // namespace Gdl
Only in gdlmm/gdl/src: icons.hg~
diff -up --recursive gdlmm_bup/gdl/src/recent.hg gdlmm/gdl/src/recent.hg
--- gdlmm_bup/gdl/src/recent.hg 2005-09-14 19:05:19.000000000 +0200
+++ gdlmm/gdl/src/recent.hg 2005-09-14 19:16:00.000000000 +0200
@@ -40,10 +40,13 @@ public:
_WRAP_METHOD(void add(const Glib::ustring& uri), gdl_recent_add )
_WRAP_METHOD(void remove(const Glib::ustring& uri), gdl_recent_delete )
_WRAP_METHOD(void clear(), gdl_recent_clear )
+
+ //TODO: Wrap this like GConf::Client::get_list(), because that's what it uses:
_WRAP_METHOD(GSList* get_list(), gdl_recent_get_list )
- _WRAP_METHOD(int get_limit(), gdl_recent_get_limit )
+
+ _WRAP_METHOD(int get_limit() const, gdl_recent_get_limit )
_WRAP_METHOD(void set_limit(int limit), gdl_recent_set_limit )
- _WRAP_METHOD(int get_list_type(), gdl_recent_get_list_type )
+ _WRAP_METHOD(int get_list_type() const, gdl_recent_get_list_type )
_WRAP_METHOD(void set_list_limit(int list_type), gdl_recent_set_list_type )
_WRAP_SIGNAL(void activate_signal(const Glib::ustring& uri), "activate" )
Only in gdlmm/gdl/src: recent.hg~
diff -up --recursive gdlmm_bup/tools/m4/convert_gdlmm.m4 gdlmm/tools/m4/convert_gdlmm.m4
--- gdlmm_bup/tools/m4/convert_gdlmm.m4 2005-09-14 19:05:16.000000000 +0200
+++ gdlmm/tools/m4/convert_gdlmm.m4 2005-09-14 20:10:06.000000000 +0200
@@ -1,46 +1,46 @@
-_CONVERSION(`Gnome::Gdl::Dock&', `GdlDock*', __FR2P)
-_CONVERSION(`Gnome::Gdl::DockItem&', `GdlDockItem*', __FR2P)
-_CONVERSION(`Gnome::Gdl::DockObject&', `GdlDockObject*', __FR2P)
-_CONVERSION(`Gnome::Gdl::DockPlaceholder&', `GdlDockPlaceholder*', __FR2P)
-_CONVERSION(`GdlDock*',`Gnome::Gdl::Dock*',__RP2P)
-_CONVERSION(`GdlDockItem*',`Gnome::Gdl::DockItem*',__RP2P)
-_CONVERSION(`GdlDockPlaceholder*',`Gnome::Gdl::DockPlaceholder*',__RP2P)
-_CONVERSION(`GdlDock*',`const Gnome::Gdl::Dock*',__RP2P)
-_CONVERSION(`GdlDockItem*',`const Gnome::Gdl::DockItem*',__RP2P)
-_CONVERSION(`GdlDockPlaceholder*',`const Gnome::Gdl::DockPlaceholder*',__RP2P)
-_CONVERSION(`GdlDockObject*',`const Gnome::Gdl::DockObject*',__RP2P)
-_CONVERSION(`GdlDockObject*',`Gnome::Gdl::DockObject*',__RP2P)
-_CONVERSION(`GdlDockObject*', `Gnome::Gdl::DockObject&', `*Glib::wrap($3)')
-
-_CONVERSION(`Gnome::Gdl::DockItem&', `GdlDockItem*', __FR2P)
-_CONVERSION(`Gnome::Gdl::DockObject&', `GdlDockObject*', __FR2P)
-_CONVERSION(`Gnome::Gdl::DockMaster&', `GdlDockMaster*', __FR2P)
-_CONVERSION(`Gnome::Gdl::DockLayout&', `GdlDockLayout*', __FR2P)
-_CONVERSION(`Gnome::Gdl::DockPlaceholder&', `GdlDockPlaceholder*', __FR2P)
+_CONVERSION(`Dock&', `GdlDock*', __FR2P)
+_CONVERSION(`DockItem&', `GdlDockItem*', __FR2P)
+_CONVERSION(`DockObject&', `GdlDockObject*', __FR2P)
+_CONVERSION(`DockPlaceholder&', `GdlDockPlaceholder*', __FR2P)
+_CONVERSION(`GdlDock*',`Dock*',__RP2P)
+_CONVERSION(`GdlDockItem*',`DockItem*',__RP2P)
+_CONVERSION(`GdlDockPlaceholder*',`DockPlaceholder*',__RP2P)
+_CONVERSION(`GdlDock*',`const Dock*',__RP2P)
+_CONVERSION(`GdlDockItem*',`const DockItem*',__RP2P)
+_CONVERSION(`GdlDockPlaceholder*',`const DockPlaceholder*',__RP2P)
+_CONVERSION(`GdlDockObject*',`const DockObject*',__RP2P)
+_CONVERSION(`GdlDockObject*',`DockObject*',__RP2P)
+_CONVERSION(`GdlDockObject*', `DockObject&', `*Glib::wrap($3)')
+
+_CONVERSION(`DockItem&', `GdlDockItem*', __FR2P)
+_CONVERSION(`DockObject&', `GdlDockObject*', __FR2P)
+_CONVERSION(`DockMaster&', `GdlDockMaster*', __FR2P)
+_CONVERSION(`DockLayout&', `GdlDockLayout*', __FR2P)
+_CONVERSION(`DockPlaceholder&', `GdlDockPlaceholder*', __FR2P)
-#_CONVERSION(`Gnome::Gdl::DockRequest&',`GdlDockRequest*',`*($3)')
+#_CONVERSION(`DockRequest&',`GdlDockRequest*',`*($3)')
#_CONVERSION(`GdlDockRequest*',`Gnome::GdlDockRequest&',`&($3)')
#_CONVERSION(`GdlDockRequest*',`Gnome::GdlDockRequest*',`($3)')
-#_CONVERSION(`Gnome::Gdl::DockRequest*',`GdlDockRequest*',`($3)')
+#_CONVERSION(`DockRequest*',`GdlDockRequest*',`($3)')
-_CONVERSION(`GdlDockItem*',`Glib::RefPtr<Gnome::Gdl::DockItem>',`Glib::wrap($3)')
-_CONVERSION(`GdlDockItem*',`Glib::RefPtr<const Gnome::Gdl::DockItem>',`Glib::wrap($3)')
-_CONVERSION(`GdlDockItem*',`const Glib::RefPtr<Gnome::Gdl::DockItem>&',`Glib::wrap($3, true)')
-_CONVERSION(`const Glib::RefPtr<Gnome::Gdl::DockItem>&',`GdlDockItem*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`Glib::RefPtr<Gnome::Gdl::DockItem>',`GdlDockItem*',__CONVERT_REFPTR_TO_P)
-
-_CONVERSION(`GdlDockObject*',`Glib::RefPtr<Gnome::Gdl::DockObject>',`Glib::wrap($3)')
-_CONVERSION(`GdlDockObject*',`Glib::RefPtr<const Gnome::Gdl::DockObject>',`Glib::wrap($3)')
-_CONVERSION(`GdlDockObject*',`const Glib::RefPtr<Gnome::Gdl::DockObject>&',`Glib::wrap($3, true)')
-_CONVERSION(`const Glib::RefPtr<Gnome::Gdl::DockObject>&',`GdlDockObject*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`Glib::RefPtr<Gnome::Gdl::DockObject>',`GdlDockObject*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`GdlDockItem*',`Glib::RefPtr<DockItem>',`Glib::wrap($3)')
+_CONVERSION(`GdlDockItem*',`Glib::RefPtr<const DockItem>',`Glib::wrap($3)')
+_CONVERSION(`GdlDockItem*',`const Glib::RefPtr<DockItem>&',`Glib::wrap($3, true)')
+_CONVERSION(`const Glib::RefPtr<DockItem>&',`GdlDockItem*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`Glib::RefPtr<DockItem>',`GdlDockItem*',__CONVERT_REFPTR_TO_P)
+
+_CONVERSION(`GdlDockObject*',`Glib::RefPtr<DockObject>',`Glib::wrap($3)')
+_CONVERSION(`GdlDockObject*',`Glib::RefPtr<const DockObject>',`Glib::wrap($3)')
+_CONVERSION(`GdlDockObject*',`const Glib::RefPtr<DockObject>&',`Glib::wrap($3, true)')
+_CONVERSION(`const Glib::RefPtr<DockObject>&',`GdlDockObject*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`Glib::RefPtr<DockObject>',`GdlDockObject*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`GdlDockPlaceholder*', `Glib::RefPtr<Gnome::Gdl::DockPlaceholder>',`Glib::wrap($3)')
-_CONVERSION(`GdlDockPlaceholder*',`Glib::RefPtr<const Gnome::Gdl::DockPlaceholder>',`Glib::wrap($3)')
-_CONVERSION(`const Glib::RefPtr<Gnome::Gdl::DockPlaceholder>&',`GdlDockPlaceholder*',__CONVERT_REFPTR_TO_P)
-_CONVERSION(`Glib::RefPtr<Gnome::Gdl::DockPlaceholder>',`GdlDockPlaceholder*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`GdlDockPlaceholder*', `Glib::RefPtr<DockPlaceholder>',`Glib::wrap($3)')
+_CONVERSION(`GdlDockPlaceholder*',`Glib::RefPtr<const DockPlaceholder>',`Glib::wrap($3)')
+_CONVERSION(`const Glib::RefPtr<DockPlaceholder>&',`GdlDockPlaceholder*',__CONVERT_REFPTR_TO_P)
+_CONVERSION(`Glib::RefPtr<DockPlaceholder>',`GdlDockPlaceholder*',__CONVERT_REFPTR_TO_P)
_CONVERSION(`Gtk::Menu&',`GtkMenu*',__FR2P)
@@ -48,18 +48,19 @@ _CONVERSION(`Gtk::Menu&',`GtkMenu*',__FR
#_CONVERSION(`GdkRectangle',`Gdk::Rectangle',`($2)&($3)')
-_CONVERSION(`Gnome::Gdl::DockItemBehavior', `GdlDockItemBehavior', `($2)($3)')
-_CONVERSION(`Gnome::Gdl::DockItemFlags', `GdlDockItemFlags', `($2)($3)')
-_CONVERSION(`Gnome::Gdl::DockObjectFlags', `GdlDockObjectFlags', `($2)($3)')
-_CONVERSION(`Gnome::Gdl::DockPlacement', `GdlDockPlacement', `($2)($3)')
-_CONVERSION(`Gnome::Gdl::DockParamFlags', `GdlDockParamFlags', `($2)($3)')
-
+_CONVERSION(`DockItemBehavior', `GdlDockItemBehavior', `($2)($3)')
+_CONVERSION(`DockItemFlags', `GdlDockItemFlags', `($2)($3)')
+_CONVERSION(`DockObjectFlags', `GdlDockObjectFlags', `($2)($3)')
+_CONVERSION(`DockPlacement', `GdlDockPlacement', `($2)($3)')
+_CONVERSION(`DockParamFlags', `GdlDockParamFlags', `($2)($3)')
+_CONVERSION(`GdkPixbuf*',`Glib::RefPtr<const Gdk::Pixbuf>', Glib::wrap($3))
_CONV_ENUM(Gdl, DockPlacement)
-_CONVERSION(`GdlDockPlacement', `Gnome::Gdl::DockPlacement', `($2)($3)')
-_CONVERSION(`GdlDockPlacement*', `Gnome::Gdl::DockPlacement*', `($2)($3)')
-_CONVERSION(`Gnome::Gdl::DockPlacement*', `GdlDockPlacement*', `($2)($3)')
+_CONVERSION(`GdlDockPlacement', `DockPlacement', `($2)($3)')
+_CONVERSION(`GdlDockPlacement*', `DockPlacement*', `($2)($3)')
+_CONVERSION(`DockPlacement*', `GdlDockPlacement*', `($2)($3)')
+_CONVERSION(`DockPlacement&', `GdlDockPlacement*', `($2)(&($3))')
Only in gdlmm/tools/m4: convert_gdlmm.m4~
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
