Commit fe4f3bbb authored by Johannes Schmid's avatar Johannes Schmid

Merged gdl-gtk to HEAD

parent 341cb976
2006-06-01 Johannes Schmid <jhs@cvs.gnome.org>
* autogen.sh:
* configure.in:
* gdl/Makefile.am:
* gdl/gdl-dock-master.c:
* gdl/gdl-dock.c:
* gdl/gdl-stock.c:
* gdl/gdl-tools.h:
* gdl/gdl.h:
* gdl/gdl-recent.c:
* gdl/gdl-recent.h:
Removed: Use GtkRecent instead
Merged gdl-gtk to HEAD
2006-05-25 Naba Kumar <naba@gnome.org>
* gdl/gdl-dock-item.c, gdl/gdl-dock-placeholder.c:
......@@ -25,11 +42,153 @@
* NEWS, MAINTAINERS: Updated
2006-06-01 Johannes Schmid <jhs@cvs.gnome.org>
* gdl/Makefile.am: Fixed
* autogen.sh: Changed from AM_PROG_LIBTOOL to AC_PROG_LIBTOOL
2006-06-01 Robert Staudinger <robert.staudinger@gmail.com>
* gdl/Makefile.am:
Some build fixes for mingw
* gdl/gdl-stock.h:
Load stock icons correctly even if not in installation path
2006-05-18 Robert Staudinger <robert.staudinger@gmail.com>
reviewed by: Johannes Schmid <jhs@cvs.gnome.org>
* configure.in:
* gdl/Makefile.am:
* gdl/gdl-dock-master.c:
* gdl/gdl-dock.c:
Fix building on win32 (#342227)
Issues:
+ The preview rectangle is not visible.
+ The icons are not found when not in compile-time prefix
2006-05-08 Johannes Schmid <jhs@cvs.gnome.org>
Revert changes from gdl-no-gnome in HEAD
* symbol-browser-control: Removed deprecated directory
* configure.in:
* gdl/Makefile.am:
* gdl/gdl-tools.c:
* gdl/gdl-tools.h:
* gdl/gdl.h:
* idl/.cvsignore:
* idl/GDL.idl:
* idl/Makefile.am:
* idl/editor-buffer.idl:
* idl/editor-gutter.idl:
* idl/symbol-browser.idl:
* symbol-browser-control/.cvsignore:
* symbol-browser-control/GNOME_Development_SymbolBrowser.server.in:
* symbol-browser-control/Makefile.am:
* symbol-browser-control/factory.c:
* symbol-browser-control/gnome-symbol-browser.xml:
* symbol-browser-control/pixmaps/.cvsignore:
* symbol-browser-control/pixmaps/Makefile.am:
* symbol-browser-control/pixmaps/sv_class.xpm:
* symbol-browser-control/pixmaps/sv_enum.xpm:
* symbol-browser-control/pixmaps/sv_enumerator.xpm:
* symbol-browser-control/pixmaps/sv_function.xpm:
* symbol-browser-control/pixmaps/sv_macro.xpm:
* symbol-browser-control/pixmaps/sv_private_fun.xpm:
* symbol-browser-control/pixmaps/sv_private_var.xpm:
* symbol-browser-control/pixmaps/sv_protected_fun.xpm:
* symbol-browser-control/pixmaps/sv_protected_var.xpm:
* symbol-browser-control/pixmaps/sv_public_fun.xpm:
* symbol-browser-control/pixmaps/sv_public_var.xpm:
* symbol-browser-control/pixmaps/sv_static_fun.xpm:
* symbol-browser-control/pixmaps/sv_static_var.xpm:
* symbol-browser-control/pixmaps/sv_struct.xpm:
* symbol-browser-control/pixmaps/sv_typedef.xpm:
* symbol-browser-control/pixmaps/sv_unknown.xpm:
* symbol-browser-control/pixmaps/sv_variable.xpm:
* symbol-browser-control/symbol-browser-cobject.c:
* symbol-browser-control/symbol-browser-cobject.h:
* symbol-browser-control/symbol-browser.c:
* symbol-browser-control/symbol-browser.h:
* symbol-browser-control/tagmanager/.cvsignore:
* symbol-browser-control/tagmanager/Makefile.am:
* symbol-browser-control/tagmanager/args.c:
* symbol-browser-control/tagmanager/args.h:
* symbol-browser-control/tagmanager/asm.c:
* symbol-browser-control/tagmanager/asp.c:
* symbol-browser-control/tagmanager/awk.c:
* symbol-browser-control/tagmanager/beta.c:
* symbol-browser-control/tagmanager/c.c:
* symbol-browser-control/tagmanager/cobol.c:
* symbol-browser-control/tagmanager/ctags.c:
* symbol-browser-control/tagmanager/ctags.h:
* symbol-browser-control/tagmanager/debug.c:
* symbol-browser-control/tagmanager/debug.h:
* symbol-browser-control/tagmanager/eiffel.c:
* symbol-browser-control/tagmanager/entry.c:
* symbol-browser-control/tagmanager/entry.h:
* symbol-browser-control/tagmanager/fortran.c:
* symbol-browser-control/tagmanager/general.h:
* symbol-browser-control/tagmanager/get.c:
* symbol-browser-control/tagmanager/get.h:
* symbol-browser-control/tagmanager/include/.cvsignore:
* symbol-browser-control/tagmanager/include/Makefile.am:
* symbol-browser-control/tagmanager/include/tm_file_entry.h:
* symbol-browser-control/tagmanager/include/tm_project.h:
* symbol-browser-control/tagmanager/include/tm_source_file.h:
* symbol-browser-control/tagmanager/include/tm_symbol.h:
* symbol-browser-control/tagmanager/include/tm_tag.h:
* symbol-browser-control/tagmanager/include/tm_tagmanager.h:
* symbol-browser-control/tagmanager/include/tm_work_object.h:
* symbol-browser-control/tagmanager/include/tm_workspace.h:
* symbol-browser-control/tagmanager/keyword.c:
* symbol-browser-control/tagmanager/keyword.h:
* symbol-browser-control/tagmanager/lisp.c:
* symbol-browser-control/tagmanager/lua.c:
* symbol-browser-control/tagmanager/main.h:
* symbol-browser-control/tagmanager/make.c:
* symbol-browser-control/tagmanager/options.c:
* symbol-browser-control/tagmanager/options.h:
* symbol-browser-control/tagmanager/parse.c:
* symbol-browser-control/tagmanager/parse.h:
* symbol-browser-control/tagmanager/parsers.h:
* symbol-browser-control/tagmanager/pascal.c:
* symbol-browser-control/tagmanager/perl.c:
* symbol-browser-control/tagmanager/php.c:
* symbol-browser-control/tagmanager/python.c:
* symbol-browser-control/tagmanager/read.c:
* symbol-browser-control/tagmanager/read.h:
* symbol-browser-control/tagmanager/regex.c:
* symbol-browser-control/tagmanager/rexx.c:
* symbol-browser-control/tagmanager/ruby.c:
* symbol-browser-control/tagmanager/scheme.c:
* symbol-browser-control/tagmanager/sh.c:
* symbol-browser-control/tagmanager/slang.c:
* symbol-browser-control/tagmanager/sort.c:
* symbol-browser-control/tagmanager/sort.h:
* symbol-browser-control/tagmanager/strlist.c:
* symbol-browser-control/tagmanager/strlist.h:
* symbol-browser-control/tagmanager/tcl.c:
* symbol-browser-control/tagmanager/tm_file_entry.c:
* symbol-browser-control/tagmanager/tm_project.c:
* symbol-browser-control/tagmanager/tm_source_file.c:
* symbol-browser-control/tagmanager/tm_symbol.c:
* symbol-browser-control/tagmanager/tm_tag.c:
* symbol-browser-control/tagmanager/tm_tagmanager.c:
* symbol-browser-control/tagmanager/tm_work_object.c:
* symbol-browser-control/tagmanager/tm_workspace.c:
* symbol-browser-control/tagmanager/vim.c:
* symbol-browser-control/tagmanager/vstring.c:
* symbol-browser-control/tagmanager/vstring.h:
* symbol-browser-control/tagmanager/yacc.c:
* symbol-browser-control/test-symbol-browser-ui.xml:
* symbol-browser-control/test-symbol-browser.c:
Created gdl-gtk branch:
- remove symbol-browser-control (deprecated)
- Add conditional compile for GNOME/Bonobo
2006-04-28 Johannes Schmid <jhs@cvs.gnome.org>
* Makefile.am:
......
......@@ -48,7 +48,7 @@ fi
}
}
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
(grep "^AC_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
(libtool --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**Error**: You must have \`libtool' installed."
......@@ -123,7 +123,7 @@ do
echo "Running xml-i18n-toolize..."
xml-i18n-toolize --copy --force --automake
fi
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
if grep "^AC_PROG_LIBTOOL" configure.in >/dev/null; then
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize..."
libtoolize --force --copy
......
......@@ -5,7 +5,6 @@ dnl it too, or it will never make it into the spec file!
dnl
dnl ==========================================================================
AC_PREREQ(2.53)
AC_INIT(gdl)
AM_CONFIG_HEADER(config.h)
......@@ -56,17 +55,11 @@ AC_TYPE_SIGNAL
AC_PROG_CXX
AC_STDC_HEADERS
AM_PROG_LIBTOOL
AM_SANITY_CHECK
if test x$MAINT = x; then
GNOME_COMPILE_WARNINGS(error)
DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED"
else
GNOME_COMPILE_WARNINGS(maximum)
DEPRECATED_FLAGS=""
fi
AC_SUBST(DEPRECATED_FLAGS)
AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
dnl ***************
......@@ -85,6 +78,71 @@ PKG_CHECK_MODULES(GDL_DEPENDENCIES,
AC_SUBST(GDL_DEPENDENCIES_CFLAGS)
AC_SUBST(GDL_DEPENDENCIES_LIBS)
PKG_CHECK_MODULES(XML, libxml-2.0 >= $XML_REQUIRED)
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
dnl ****************
dnl GNOME Libraries
dnl ****************
AC_ARG_ENABLE(gnome,
[ --disable-gnome Compile without gnome support],
[ if test "$enableval" = "no"; then
user_disabled_gnome=1
fi ],
[ user_disabled_gnome=0 ])
DEPRECATED_FLAGS=""
AC_MSG_CHECKING(if gnome is disabled)
if test "$user_disabled_gnome" = 1; then
AC_MSG_RESULT(yes)
gnome="no"
else
AC_MSG_RESULT(no)
PKG_CHECK_MODULES(GNOME,
[libgnomeui-2.0 >= $GNOME_REQUIRED,
gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED],
[gnome="yes"],
[gnome="no"])
AC_SUBST(GNOME_CFLAGS)
AC_SUBST(GNOME_LIBS)
if test x$MAINT = x; then
DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED"
# TODO specify flags per hand, no gnome-common on win32
#GNOME_COMPILE_WARNINGS(error)
#else
# TODO GNOME_COMPILE_WARNINGS(maximum)
fi
fi
AC_SUBST(DEPRECATED_FLAGS)
AM_CONDITIONAL(HAVE_GNOME, [test x$gnome = xyes])
AC_MSG_CHECKING([for native Win32])
case "$host" in
*-*-mingw*)
native_win32=yes
;;
*)
native_win32=no
;;
esac
AC_MSG_RESULT([$native_win32])
AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")
EXTRA_CPPFLAGS=
EXTRA_LDFLAGS=
if test "x$native_win32" = "xyes"; then
EXTRA_CPPFLAGS="-mms-bitfields"
EXTRA_LDFLAGS="-no-undefined -Wl,--kill-at -Wl,--export-all-symbols"
fi
AC_SUBST(EXTRA_CPPFLAGS)
AC_SUBST(EXTRA_LDFLAGS)
# marshal and enum generators
GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`"
AC_SUBST(GLIB_GENMARSHAL)
......
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdl\" \
-DGDL_GLADEDIR=\""$(gladedir)"\" \
-DGDL_IMAGESDIR=\""$(gdl_images_dir)"\" \
-I$(includedir) -I$(top_srcdir) \
$(WARN_CFLAGS) $(DEPRECATED_FLAGS) \
$(GDL_DEPENDENCIES_CFLAGS) $(XML_CFLAGS)
lib_LTLIBRARIES = libgdl-1.la
BUILT_SOURCES = \
libgdlmarshal.c \
libgdlmarshal.h \
libgdltypebuiltins.c \
libgdltypebuiltins.h
CLEANFILES = \
libgdltypebuiltins.c \
libgdltypebuiltins.h \
libgdlmarshal.c \
libgdlmarshal.h
libgdl_headers = \
gdl.h \
gdl-tools.h \
gdl-combo-button.h \
gdl-dock-object.h \
gdl-dock-master.h \
gdl-dock.h \
gdl-dock-item.h \
gdl-dock-notebook.h \
gdl-dock-paned.h \
gdl-dock-tablabel.h \
gdl-dock-layout.h \
gdl-dock-placeholder.h \
gdl-dock-bar.h \
gdl-icons.h \
gdl-recent.h \
gdl-stock.h
libgdl_1_la_SOURCES = \
$(libgdl_headers) \
gdl-i18n.h \
gdl-i18n.c \
gdl-tools.c \
gdl-combo-button.c \
gdl-dock-object.c \
gdl-dock-master.c \
gdl-dock.c \
gdl-dock-item.c \
gdl-dock-item-grip.h \
gdl-dock-item-grip.c \
gdl-dock-notebook.c \
gdl-dock-paned.c \
gdl-dock-tablabel.c \
gdl-dock-layout.c \
gdl-dock-placeholder.c \
gdl-dock-bar.c \
gdl-icons.c \
gdl-recent.c \
gdl-stock.c \
libgdltypebuiltins.h \
libgdltypebuiltins.c \
libgdlmarshal.h \
libgdlmarshal.c
libgdl_1_la_LIBADD = \
$(GDL_DEPENDENCIES_LIBS) \
$(XML_LIBS)
noinst_PROGRAMS=test-dock test-dataview test-combo-button
test_dock_sources=test-dock.c
test_dock_LDADD=libgdl-1.la $(XML_LIBS)
libgdlincludedir = $(includedir)/libgdl-1.0/gdl
libgdlinclude_HEADERS = \
$(libgdl_headers) \
libgdltypebuiltins.h
gladedir = $(datadir)/gdl/glade
glade_DATA = layout.glade
imagedir = $(gdl_images_dir)
image_DATA = \
stock-close-12.png \
stock-menu-left-12.png \
stock-menu-right-12.png
EXTRA_DIST = libgdlmarshal.list \
tree-expand.xpm \
tree-contract.xpm \
layout.glade \
program.xpm static.xpm shared.xpm \
$(image_DATA)
test_dataview_SOURCES = \
gdl-data-view.h \
gdl-data-view.c \
gdl-data-frame.h \
gdl-data-frame.c \
gdl-data-model.h \
gdl-data-model.c \
gdl-data-model-test.h \
gdl-data-model-test.c \
gdl-data-row.h \
gdl-data-row.c \
test-dataview.c
test_dataview_LDADD = libgdl-1.la
test_combo_button_SOURCES = test-combo-button.c
test_combo_button_LDADD = libgdl-1.la
# enumerations code generation
libgdltypebuiltins.c: $(libgdl_headers)
@GLIB_MKENUMS@ \
--fhead "#include <glib-object.h>\n" \
--fhead "#include \"libgdltypebuiltins.h\"\n\n" \
--fhead "#include \"gdl-dock-bar.h\"\n\n" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n};\n\n" \
--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
--vtail " static GType type = 0;\n\n" \
--vtail " if (!type)\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
--vtail " return type;\n}\n\n" \
$(libgdl_headers) > xgen-gtbec \
&& cp xgen-gtbec $(@F) \
&& rm -f xgen-gtbec
libgdltypebuiltins.h: $(libgdl_headers)
@GLIB_MKENUMS@ \
--fhead "#ifndef __LIBGDLTYPEBUILTINS_H__\n" \
--fhead "#define __LIBGDLTYPEBUILTINS_H__ 1\n\n" \
--fhead "#include <gdl/gdl.h>\n\n" \
--fhead "G_BEGIN_DECLS\n\n" \
--ftail "G_END_DECLS\n\n" \
--ftail "#endif /* __LIBGDLTYPEBUILTINS_H__ */\n" \
--fprod "\n/* --- @filename@ --- */" \
--eprod "#define GDL_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(libgdl_headers) > xgen-gth \
&& cp xgen-gth $(@F) \
&& rm -f xgen-gth
libgdlmarshal.h: libgdlmarshal.list
@GLIB_GENMARSHAL@ \
--prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --header > xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
libgdlmarshal.c: libgdlmarshal.h
echo "#include \"libgdlmarshal.h\"" > xgen-gmc \
&& @GLIB_GENMARSHAL@ \
--prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
INCLUDES = \
-DG_LOG_DOMAIN=\"Gdl\" \
-DGDL_GLADEDIR=\""$(gladedir)"\" \
-I$(includedir) -I$(top_srcdir) \
$(WARN_CFLAGS) $(DEPRECATED_FLAGS) \
$(GDL_DEPENDENCIES_CFLAGS) $(XML_CFLAGS) \
$(GNOME_CFLAGS) \
$(EXTRA_CPPFLAGS)
lib_LTLIBRARIES = libgdl-1.la
BUILT_SOURCES = \
libgdlmarshal.c \
libgdlmarshal.h \
libgdltypebuiltins.c \
libgdltypebuiltins.h \
gdl-stock-icons.h
CLEANFILES = \
libgdltypebuiltins.c \
libgdltypebuiltins.h \
libgdlmarshal.c \
libgdlmarshal.h
libgdl_headers = \
gdl.h \
gdl-tools.h \
gdl-dock-object.h \
gdl-dock-master.h \
gdl-dock.h \
gdl-dock-item.h \
gdl-dock-notebook.h \
gdl-dock-paned.h \
gdl-dock-tablabel.h \
gdl-dock-layout.h \
gdl-dock-placeholder.h \
gdl-dock-bar.h \
gdl-combo-button.h \
gdl-stock.h \
gdl-stock-icons.h
if HAVE_GNOME
libgdl_headers += \
gdl-icons.h
endif
libgdl_1_la_SOURCES = \
$(libgdl_headers) \
gdl-i18n.h \
gdl-i18n.c \
gdl-dock-object.c \
gdl-dock-master.c \
gdl-dock.c \
gdl-dock-item.c \
gdl-dock-item-grip.h \
gdl-dock-item-grip.c \
gdl-dock-notebook.c \
gdl-dock-paned.c \
gdl-dock-tablabel.c \
gdl-dock-layout.c \
gdl-dock-placeholder.c \
gdl-dock-bar.c \
gdl-combo-button.c \
gdl-stock.c \
libgdltypebuiltins.h \
libgdltypebuiltins.c \
libgdlmarshal.h \
libgdlmarshal.c
if HAVE_GNOME
libgdl_1_la_SOURCES += \
gdl-icons.c
endif
libgdl_1_la_LIBADD = \
$(GDL_DEPENDENCIES_LIBS) \
$(XML_LIBS) \
$(GNOME_LIBS)
libgdl_1_la_LDFLAGS = $(EXTRA_LDFLAGS)
noinst_PROGRAMS=test-dock test-combo-button
test_dock_sources=test-dock.c
test_dock_LDADD=libgdl-1.la $(XML_LIBS)
test_combo_button_SOURCES = test-combo-button.c
test_combo_button_LDADD = libgdl-1.la
if HAVE_GNOME
noinst_PROGRAMS += test-dataview
test_dataview_SOURCES = \
gdl-data-view.h \
gdl-data-view.c \
gdl-data-frame.h \
gdl-data-frame.c \
gdl-data-model.h \
gdl-data-model.c \
gdl-data-model-test.h \
gdl-data-model-test.c \
gdl-data-row.h \
gdl-data-row.c \
test-dataview.c
test_dataview_LDADD = libgdl-1.la
endif
libgdlincludedir = $(includedir)/libgdl-1.0/gdl
libgdlinclude_HEADERS = \
$(libgdl_headers) \
libgdltypebuiltins.h
gladedir = $(datadir)/gdl/glade
glade_DATA = layout.glade
STOCK_ICONS = \
stock_close_icon stock-close-12.png \
stock_menu_left_icon stock-menu-left-12.png \
stock_menu_right_icon stock-menu-right-12.png
STOCK_IMAGES = \
stock-close-12.png \
stock-menu-left-12.png \
stock-menu-right-12.png
EXTRA_DIST = libgdlmarshal.list \
tree-expand.xpm \
tree-contract.xpm \
layout.glade \
program.xpm static.xpm shared.xpm \
$(STOCK_IMAGES)
# enumerations code generation
libgdltypebuiltins.c: $(libgdl_headers)
@GLIB_MKENUMS@ \
--fhead "#include <glib-object.h>\n" \
--fhead "#include \"libgdltypebuiltins.h\"\n\n" \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
--vtail " { 0, NULL, NULL }\n};\n\n" \
--vtail "GType\n@enum_name@_get_type (void)\n{\n" \
--vtail " static GType type = 0;\n\n" \
--vtail " if (!type)\n" \
--vtail " type = g_@type@_register_static (\"@EnumName@\", _@enum_name@_values);\n\n" \
--vtail " return type;\n}\n\n" \
$(libgdl_headers) > xgen-gtbec \
&& cp xgen-gtbec $(@F) \
&& rm -f xgen-gtbec
libgdltypebuiltins.h: $(libgdl_headers)
@GLIB_MKENUMS@ \
--fhead "#ifndef __LIBGDLTYPEBUILTINS_H__\n" \
--fhead "#define __LIBGDLTYPEBUILTINS_H__ 1\n\n" \
--fhead "#include <gdl/gdl.h>\n\n" \
--fhead "G_BEGIN_DECLS\n\n" \
--ftail "G_END_DECLS\n\n" \
--ftail "#endif /* __LIBGDLTYPEBUILTINS_H__ */\n" \
--fprod "\n/* --- @filename@ --- */" \
--eprod "#define GDL_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(libgdl_headers) > xgen-gth \
&& cp xgen-gth $(@F) \
&& rm -f xgen-gth
libgdlmarshal.h: libgdlmarshal.list
@GLIB_GENMARSHAL@ \
--prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --header > xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
libgdlmarshal.c: libgdlmarshal.h
echo "#include \"libgdlmarshal.h\"" > xgen-gmc \
&& @GLIB_GENMARSHAL@ \
--prefix=gdl_marshal $(srcdir)/libgdlmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(@F) \
&& rm -f xgen-gmc
gdl-stock-icons.h: $(STOCK_IMAGES)
gdk-pixbuf-csource --raw --build-list $(STOCK_ICONS) > $@
......@@ -26,7 +26,6 @@
#endif
#include "gdl-i18n.h"
#include <gdk/gdkx.h>
#include "gdl-tools.h"
#include "gdl-dock-master.h"
......@@ -582,7 +581,7 @@ gdl_dock_master_xor_rect (GdlDockMaster *master)
}
rect = &master->_priv->drag_request->rect;
window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
window = gdk_window_lookup (gdk_get_default_root_window ());
if (!master->_priv->root_xor_gc) {
GdkGCValues values;
......
......@@ -26,7 +26,6 @@
#include "gdl-i18n.h"
#include <stdlib.h>
#include <string.h>
#include <gdk/gdkx.h>
#include "gdl-tools.h"
#include "gdl-dock.h"
......
This diff is collapsed.
/*
* This file is part of the GNOME Devtools Libraries.
*
* Copyright (C) 2002 Jeroen Zwartepoorte
* James Willcox <jwillcox@cs.indiana.edu>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#ifndef GDL_RECENT_H
#define GDL_RECENT_H
#include <glib-object.h>
#include <bonobo/bonobo-ui-component.h>
G_BEGIN_DECLS
typedef struct _GdlRecent GdlRecent;
typedef struct _GdlRecentClass GdlRecentClass;
typedef struct _GdlRecentPriv GdlRecentPriv;
#define GDL_RECENT_TYPE (gdl_recent_get_type ())
#define GDL_RECENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDL_RECENT_TYPE, GdlRecent))
#define GDL_RECENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDL_RECENT_TYPE, GdlRecentClass))
#define GDL_IS_RECENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDL_RECENT_TYPE))
#define GDL_IS_RECENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDL_RECENT_TYPE))
struct _GdlRecent {
GObject parent;
GdlRecentPriv *priv;
};
struct _GdlRecentClass {
GObjectClass parent_class;
void (*activate) (GdlRecent *recent, const char *uri);
};
enum {
GDL_RECENT_LIST_NONE,