Added moo_edit_(un)comment back

This commit is contained in:
Yevgen Muntyan 2006-04-20 17:59:37 -05:00
parent 59556f67cd
commit b0e27c1f48
5 changed files with 43 additions and 39 deletions

View File

@ -30,8 +30,8 @@ $ACLOCAL $ACLOCAL_FLAGS $aclocal_extra || exit $?
echo $AUTOHEADER
$AUTOHEADER || exit $?
echo $AUTOMAKE --add-missing --copy
$AUTOMAKE --add-missing --copy || exit $?
echo $AUTOMAKE --add-missing --copy --foreign
$AUTOMAKE --add-missing --copy --foreign || exit $?
echo $AUTOCONF
$AUTOCONF || exit $?

View File

@ -1,33 +1,37 @@
##############################################################################
# MOO_AC_GTKHTML()
#
# AC_DEFUN([MOO_AC_GTKHTML],[
# MOO_USE_GTKHTML=auto
#
# AC_ARG_WITH([gtkhtml],
# AC_HELP_STRING([--with-gtkhtml], [whether to use gtkhtml (default = AUTO)]),[
# if test x$with_gtkhtml = "xyes"; then
# MOO_USE_GTKHTML="yes"
# else
# MOO_USE_GTKHTML="no"
# fi
# ])
#
# if test x$MOO_USE_GTKHTML != xno; then
# PKG_CHECK_MODULES(GTKHTML, [libgtkhtml-2.0], [
# MOO_USE_GTKHTML=yes
# MOO_GTKHTML_PACKAGE=libgtkhtml-2.0
# AC_DEFINE(MOO_USE_GTKHTML, 1, [use libgtkhtml-2.0])
# ],[
# if test x$MOO_USE_GTKHTML = xyes; then
# AC_MSG_ERROR([libgtkhtml-2 not found.])
# else
# MOO_USE_GTKHTML=no
# fi
# ])
# fi
#
# AC_SUBST(MOO_USE_GTKHTML)
# AC_SUBST(MOO_GTKHTML_PACKAGE)
# AM_CONDITIONAL(MOO_USE_GTKHTML, test x$MOO_USE_GTKHTML = "xyes")
# ])
AC_DEFUN([MOO_AC_GTKHTML],[
MOO_USE_GTKHTML=auto
AC_ARG_WITH([gtkhtml],
AC_HELP_STRING([--with-gtkhtml], [whether to use gtkhtml (default = AUTO)]),[
if test x$with_gtkhtml = "xyes"; then
MOO_USE_GTKHTML="yes"
else
MOO_USE_GTKHTML="no"
fi
])
if test x$MOO_USE_GTKHTML != xno; then
PKG_CHECK_MODULES(GTKHTML, [libgtkhtml-2.0], [
MOO_USE_GTKHTML=yes
MOO_GTKHTML_PACKAGE=libgtkhtml-2.0
AC_DEFINE(MOO_USE_GTKHTML, 1, [use libgtkhtml-2.0])
],[
if test x$MOO_USE_GTKHTML = xyes; then
AC_MSG_ERROR([libgtkhtml-2 not found.])
else
MOO_USE_GTKHTML=no
fi
])
fi
AC_SUBST(MOO_USE_GTKHTML)
AC_SUBST(MOO_GTKHTML_PACKAGE)
AM_CONDITIONAL(MOO_USE_GTKHTML, test x$MOO_USE_GTKHTML = "xyes")
AM_CONDITIONAL(MOO_USE_GTKHTML, false)
])

View File

@ -33,7 +33,7 @@
<kdevautoproject>
<general>
<activetarget>moo/libmoo.la</activetarget>
<useconfiguration>optimized</useconfiguration>
<useconfiguration>debug</useconfiguration>
</general>
<run>
<mainprogram>./medit</mainprogram>
@ -288,16 +288,16 @@
</kdevdoctreeview>
<kdevfilecreate>
<filetypes>
<type icon="source" ext="g" create="template" name="GAP source" >
<type icon="source" ext="g" name="GAP source" create="template" >
<descr>A new empty GAP source file</descr>
</type>
<type icon="source_cpp" ext="cpp" create="template" name="C++ Source" >
<type icon="source_cpp" ext="cpp" name="C++ Source" create="template" >
<descr>A new empty C++ file.</descr>
</type>
<type icon="source_h" ext="h" create="template" name="C/C++ Header" >
<type icon="source_h" ext="h" name="C/C++ Header" create="template" >
<descr>A new empty header file for C/C++.</descr>
</type>
<type icon="source_c" ext="c" create="template" name="C Source" >
<type icon="source_c" ext="c" name="C Source" create="template" >
<descr>A new empty C file.</descr>
</type>
</filetypes>

View File

@ -181,7 +181,7 @@ moo_edit_class_init (MooEditClass *klass)
moo_signal_new_cb ("comment",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
NULL, /* G_CALLBACK (moo_edit_comment), */
G_CALLBACK (moo_edit_comment),
NULL, NULL,
_moo_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@ -190,7 +190,7 @@ moo_edit_class_init (MooEditClass *klass)
moo_signal_new_cb ("uncomment",
G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
NULL, /* G_CALLBACK (moo_edit_uncomment), */
G_CALLBACK (moo_edit_uncomment),
NULL, NULL,
_moo_marshal_VOID__VOID,
G_TYPE_NONE, 0);

View File

@ -38,9 +38,9 @@
<separator/>
<item action="SelectAll"/>
<separator/>
<!-- <item action="Comment"/>
<item action="Comment"/>
<item action="Uncomment"/>
<separator/>-->
<separator/>
</item>
<item name="Search" label="_Search">