diff --git a/config/ChangeLog b/config/ChangeLog index c21a92ccce..cf7cea3898 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2002-08-14 John Levon + + * configure.in: + * configure.ac: no xforms check with Qt + 2002-08-13 Lars Gullik Bjønnes * configure.in: change AC_LANG(XX) back to the AC_LANG_XX variant. diff --git a/config/configure.ac b/config/configure.ac index 4ebcfd43fb..b31cb9ca3d 100644 --- a/config/configure.ac +++ b/config/configure.ac @@ -150,17 +150,17 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS" ## Check whether X is new enough to handle the input method stuff AC_CHECK_FUNCS(XOpenIM) + ### check which frontend we want to use -# We have to check for xforms anyway -LYX_PATH_XPM -LYX_PATH_XFORMS #LYX_USE_FRONTEND dnl The code below is not in a macro, because this would cause big dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL. case "$lyx_use_frontend" in xforms) - # for now don't set it for xforms as this is always entered + LYX_PATH_XPM + LYX_PATH_XFORMS + LYX_USE_XFORMS_IMAGE_LOADER FRONTEND="xforms" FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo" FRONTEND_INCLUDES="-I\$(srcdir)/xforms" @@ -176,6 +176,9 @@ case "$lyx_use_frontend" in libforms version: ${XFORMS_VERSION}\n" ;; gnome) + LYX_PATH_XPM + LYX_PATH_XFORMS + LYX_USE_XFORMS_IMAGE_LOADER PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) AC_SUBST(GNOME_FRONTEND_CFLAGS) AC_SUBST(GNOME_FRONTEND_LIBS) @@ -184,7 +187,8 @@ case "$lyx_use_frontend" in FRONTEND_GUILIB="gnome/*.lo" FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}" FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} " - FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";; + FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}" + ;; qt2) QT2_DO_IT_ALL FRONTEND="qt2" @@ -204,11 +208,6 @@ LYX_ERROR(dnl the development tools.]) fi -### Check whether the xforms library has a viable image loader -### For now, run this test always so config.h is unchanged by a change in -### frontend -LYX_USE_XFORMS_IMAGE_LOADER - ### Setup GNU gettext dnl GNU gettext is written in C AC_LANG_PUSH(C) diff --git a/config/configure.in b/config/configure.in index fa5b34dd1d..5bb3a79e5d 100644 --- a/config/configure.in +++ b/config/configure.in @@ -154,16 +154,15 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS" AC_CHECK_FUNCS(XOpenIM) ### check which frontend we want to use -# We have to check for xforms anyway -LYX_PATH_XPM -LYX_PATH_XFORMS #LYX_USE_FRONTEND dnl The code below is not in a macro, because this would cause big dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL. case "$lyx_use_frontend" in xforms) - # for now don't set it for xforms as this is always entered + LYX_PATH_XPM + LYX_PATH_XFORMS + LYX_USE_XFORMS_IMAGE_LOADER FRONTEND="xforms" FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo" FRONTEND_INCLUDES="-I\$(srcdir)/xforms" @@ -179,6 +178,9 @@ case "$lyx_use_frontend" in libforms version: ${XFORMS_VERSION}\n" ;; gnome) + LYX_PATH_XPM + LYX_PATH_XFORMS + LYX_USE_XFORMS_IMAGE_LOADER PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0) AC_SUBST(GNOME_FRONTEND_CFLAGS) AC_SUBST(GNOME_FRONTEND_LIBS) @@ -207,11 +209,6 @@ LYX_ERROR(dnl the development tools.]) fi -### Check whether the xforms library has a viable image loader -### For now, run this test always so config.h is unchanged by a change in -### frontend -LYX_USE_XFORMS_IMAGE_LOADER - ### Setup GNU gettext dnl GNU gettext is written in C AC_LANG_C diff --git a/po/POTFILES.in b/po/POTFILES.in index 9724457417..e662eeb24b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,7 +8,6 @@ src/converter.C src/CutAndPaste.C src/debug.C src/exporter.C -src/ext_l10n.h src/FloatList.C src/frontends/controllers/biblio.C src/frontends/controllers/ButtonController.h @@ -155,7 +154,6 @@ src/lyxrc.C src/lyxtextclasslist.C src/lyxvc.C src/mathed/formulabase.C -src/mathed/formula.C src/mathed/formulamacro.C src/mathed/math_cursor.C src/mathed/math_hullinset.C diff --git a/src/ChangeLog b/src/ChangeLog index eaddd585f9..c53bd78122 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2002-08-14 John Levon + + * lyxserver.C: remove spurious xforms include + 2002-08-14 Jean-Marc Lasgouttes * lyxfunc.C (getStatus): disable math-extern outside of math mode diff --git a/src/frontends/qt2/Alert_pimpl.C b/src/frontends/qt2/Alert_pimpl.C index 1926136bf4..3739cd3332 100644 --- a/src/frontends/qt2/Alert_pimpl.C +++ b/src/frontends/qt2/Alert_pimpl.C @@ -13,8 +13,6 @@ #include #include "ui/QAskForTextDialog.h" -#include FORMS_H_LOCATION - #include #include diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index be32813b13..3b94117d83 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,9 @@ +2002-08-14 John Levon + + * Alert_pimpl.C: remove xforms header + + * Toolbar_pimpl.C: build fix + 2002-08-13 Angus Leeming * Qt2Base.h: compile fix isReadonly -> bufferIsReadonly. diff --git a/src/frontends/qt2/Toolbar_pimpl.C b/src/frontends/qt2/Toolbar_pimpl.C index 188590cff5..b7e824fb43 100644 --- a/src/frontends/qt2/Toolbar_pimpl.C +++ b/src/frontends/qt2/Toolbar_pimpl.C @@ -42,15 +42,13 @@ namespace { QPixmap getIconPixmap(int action) { - kb_action act; - string arg; - boost::tie(act, arg) = lyxaction.retrieveActionArg(action); + FuncRequest f = lyxaction.retrieveActionArg(action); - string const name = lyxaction.getActionName(act); + string const name = lyxaction.getActionName(f.action); string xpm_name; - if (!arg.empty()) - xpm_name = subst(name + ' ' + arg, ' ','_'); + if (!f.argument.empty()) + xpm_name = subst(name + ' ' + f.argument, ' ','_'); else xpm_name = name; @@ -62,7 +60,7 @@ QPixmap getIconPixmap(int action) return QPixmap(fullname.c_str()); } - if (act == LFUN_INSERT_MATH && !arg.empty()) { + if (f.action == LFUN_INSERT_MATH && !f.argument.empty()) { #if 0 // FIXME: GUII char const ** pixmap = get_pixmap_from_symbol(arg.c_str(), 30, 30); diff --git a/src/lyxserver.C b/src/lyxserver.C index f9435b9541..0c4e152e1e 100644 --- a/src/lyxserver.C +++ b/src/lyxserver.C @@ -41,7 +41,6 @@ #include #include #include -#include FORMS_H_LOCATION #ifdef __GNUG__ #pragma implementation