anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shared-4.diff. Gui independant config.h

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6962 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-05-14 09:17:22 +00:00
parent 6449d5b3d8
commit 4c16922aad
86 changed files with 182 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/ChangeLog
View File

@ -1,3 +1,15 @@
2003-05-14 Lars Gullik Bjønnes <larsbj@gullik.net>
* xforms.m4 (lyx_cv_xpm_h_location): don't define XPM_H_LOCATION,
subst it instead.
(lyx_cv_forms_h_location): don't define FORMS_H_LOCATION, subst it
instead.
* configure.in: generate lyx_forms.h and lyx_xpm.h.
* configure.ac: always check for xforms and qt libs regardless of
frontend chosen. Generate lyx_forms.h and lyx_xpm.h.
2003-05-08 Lars Gullik Bjønnes <larsbj@gullik.net>
* configure.ac: better lib building.

13
config/configure.ac
View File

@ -148,14 +148,18 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
### check which frontend we want to use
# XForms tests
LYX_PATH_XPM
LYX_PATH_XFORMS
LYX_CHECK_XFORMS_IMAGE_LOADER
# QT tests
QT_DO_IT_ALL
#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)
LYX_PATH_XPM
LYX_PATH_XFORMS
LYX_CHECK_XFORMS_IMAGE_LOADER
FRONTEND="xforms"
RPM_FRONTEND="xforms"
RPM_FRONTEND_DEPS='libforms >= 1.0'
@ -179,7 +183,6 @@ dnl FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTE
dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
dnl ;;
qt)
QT_DO_IT_ALL
RPM_FRONTEND="qt"
RPM_FRONTEND_DEPS='qt >= 2.2.1'
FRONTEND="qt2"
@ -373,6 +376,8 @@ AC_CONFIG_FILES([Makefile \
src/frontends/Makefile \
src/frontends/controllers/Makefile \
src/frontends/xforms/Makefile \
src/frontends/xforms/lyx_forms.h \
src/frontends/xforms/lyx_xpm.h \
src/frontends/xforms/forms/Makefile \
src/frontends/qt2/Makefile \
src/frontends/qt2/moc/Makefile \

2
config/configure.in
View File

@ -305,6 +305,8 @@ AC_OUTPUT([Makefile \
src/frontends/Makefile \
src/frontends/controllers/Makefile \
src/frontends/xforms/Makefile \
src/frontends/xforms/lyx_forms.h \
src/frontends/xforms/lyx_xpm.h \
src/frontends/xforms/forms/Makefile \
src/frontends/qt2/Makefile \
src/frontends/qt2/moc/Makefile \

13
config/xforms.m4
View File

@ -13,9 +13,9 @@ AC_CHECK_HEADER(X11/xpm.h,[
lyx_cv_xpm_h_location="<X11/xpm.h>"],[
AC_CHECK_HEADER(xpm.h,[],[
LYX_LIB_ERROR(xpm.h,Xpm)])])
AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location,
[define this to the location of xpm.h to be used with #include, e.g. <xpm.h>])
#AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location,
# [define this to the location of xpm.h to be used with #include, e.g. <xpm.h>])
AC_SUBST(XPM_H_LOCATION,$lyx_cv_xpm_h_location)
### Test for the header version
if test $ac_cv_header_xpm_h = yes; then
AC_CACHE_CHECK([xpm header version],lyx_cv_xpmversion,
@ -23,7 +23,7 @@ if test $ac_cv_header_xpm_h = yes; then
#line __oline__ "configure"
#include "confdefs.h"
#include XPM_H_LOCATION
#include $lyx_cv_xpm_h_location
"%%%"lyx_cv_xpmv=XpmVersion;lyx_cv_xpmr=XpmRevision"%%%"
EOF
eval `(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
@ -70,8 +70,7 @@ AC_CHECK_HEADER(X11/forms.h,[
lyx_cv_forms_h_location="<X11/forms.h>"],[
AC_CHECK_HEADER(forms.h,[],[
LYX_LIB_ERROR(forms.h,forms)])])
AC_DEFINE_UNQUOTED(FORMS_H_LOCATION,$lyx_cv_forms_h_location,
[define this to the location of forms.h to be used with #include, e.g. <forms.h>])
AC_SUBST(FORMS_H_LOCATION,$lyx_cv_forms_h_location)
if test $ac_cv_header_forms_h = yes; then
AC_CACHE_CHECK([xforms header version],lyx_cv_xfversion,
@ -79,7 +78,7 @@ if test $ac_cv_header_forms_h = yes; then
#line __oline__ "configure"
#include "confdefs.h"
#include FORMS_H_LOCATION
#include $lyx_cv_forms_h_location
#if ! defined(FL_INCLUDE_VERSION)
"%%%"(unknown)"%%%"
#else

3
po/POTFILES.in
View File

@ -1,7 +1,6 @@
src/BufferView.C
src/BufferView_pimpl.C
src/Chktex.C
src/CutAndPaste.C
src/LColor.C
src/LaTeX.C
src/MenuBackend.C
@ -50,6 +49,7 @@ src/frontends/qt2/QDocument.C
src/frontends/qt2/QDocumentDialog.C
src/frontends/qt2/QERT.C
src/frontends/qt2/QError.C
src/frontends/qt2/QErrorList.C
src/frontends/qt2/QExternal.C
src/frontends/qt2/QExternalDialog.C
src/frontends/qt2/QFloat.C
@ -96,6 +96,7 @@ src/frontends/xforms/FormDialogView.C
src/frontends/xforms/FormDocument.C
src/frontends/xforms/FormERT.C
src/frontends/xforms/FormError.C
src/frontends/xforms/FormErrorList.C
src/frontends/xforms/FormExternal.C
src/frontends/xforms/FormFiledialog.C
src/frontends/xforms/FormFloat.C

9
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,10 @@
2003-05-14 Lars Gullik Bjønnes <larsbj@gullik.net>
* Menubar_pimpl.C (~Pimpl): move out of line
(update): ditto
(view): ditto
(backend): ditto
2003-05-12 Alfredo Braunstein <abraunst@libero.it>
* QErrorList.[Ch]:
@ -18,7 +25,7 @@
2003-05-08 Lars Gullik Bjønnes <larsbj@gullik.net>
* ui/moc/Makefile.am: better lib building
* ui/moc/Makefile.am: better lib building
* ui/Makefile.am: better lib building

20
src/frontends/qt2/Menubar_pimpl.C
View File

@ -52,6 +52,10 @@ Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mbe)
}
Menubar::Pimpl::~Pimpl()
{}
void Menubar::Pimpl::openByName(string const & name)
{
NameMap::const_iterator const cit = name_map_.find(name);
@ -61,3 +65,19 @@ void Menubar::Pimpl::openByName(string const & name)
// this will have to do I'm afraid.
cit->second->exec(QCursor::pos());
}
void Menubar::Pimpl::update()
{}
QtView * Menubar::Pimpl::view()
{
return owner_;
}
MenuBackend const & Menubar::Pimpl::backend()
{
return menubackend_;
}

8
src/frontends/qt2/Menubar_pimpl.h
View File

@ -28,17 +28,19 @@ struct Menubar::Pimpl {
public:
Pimpl(LyXView *, MenuBackend const &);
~Pimpl();
/// opens a top-level submenu given its name
void openByName(string const &);
/// update the state of the menuitems - not needed
void update() {}
void update();
/// return the owning view
QtView * view() { return owner_; }
QtView * view();
/// return the menu controller
MenuBackend const & backend() { return menubackend_; }
MenuBackend const & backend();
private:
/// owning view
QtView * owner_;

2
src/frontends/qt2/QtView.C
View File

@ -136,7 +136,7 @@ void QtView::update_view_state()
{
// let the user see the explicit message
if (statusbar_timer_.isActive())
return;
return;
statusBar()->message(toqstr(getLyXFunc().view_status_message()));
}

2
src/frontends/xforms/Alert_pimpl.C
View File

@ -19,7 +19,7 @@
#include <algorithm>
#include <boost/tuple/tuple.hpp>
#include FORMS_H_LOCATION
#include "lyx_forms.h"
using std::pair;
using std::make_pair;

12
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,15 @@
2003-05-14 Lars Gullik Bjønnes <larsbj@gullik.net>
* lyx_xpm.h.in: new file
* lyx_forms.h.in: new file
* forms/fdfix.sh: adjust for FORMS_H_LOCATION -> lyx_forms.h change.
* Makefile.am (EXTRA_DIST): lyx_forms.h.in lyx_xpm.h.in
* Almost all files:: FORMS_H_LOCATION -> lyx_forms.h
2003-05-12 Alfredo Braunstein <abraunst@libero.it>
* FormErrorList.[Ch]:

2
src/frontends/xforms/Color.C
View File

@ -14,7 +14,7 @@
#include "Color.h"
#include <algorithm> // max
#include <cmath> // floor
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#ifndef CXX_GLOBAL_CSTD
using std::floor;

2
src/frontends/xforms/ColorHandler.C
View File

@ -27,7 +27,7 @@ using std::pow;
using std::endl;
#include FORMS_H_LOCATION
#include "lyx_forms.h"
LyXColorHandler::LyXColorHandler()
{

2
src/frontends/xforms/Dialogs.C
View File

@ -102,7 +102,7 @@ private:
bool Dialogs::isValidName(string const & name) const
{
return std::find_if(dialognames, end_dialognames,
return std::find_if(dialognames, end_dialognames,
cmpCStr(name.c_str())) != end_dialognames;
}

2
src/frontends/xforms/FontInfo.C
View File

@ -26,7 +26,7 @@
using std::endl;
using std::abs;
#include FORMS_H_LOCATION
#include "lyx_forms.h"
/// Load font close to this size
string const FontInfo::getFontname(int size)

2
src/frontends/xforms/FormAboutlyx.C
View File

@ -21,7 +21,7 @@
#include "Lsstream.h"
#include "version.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
namespace {

2
src/frontends/xforms/FormBase.C
View File

@ -25,7 +25,7 @@
#include "support/LAssert.h"
#include "support/filetools.h" // LibFileSearch
#include FORMS_H_LOCATION
#include "lyx_forms.h"
extern "C" {

2
src/frontends/xforms/FormBibitem.C
View File

@ -16,7 +16,7 @@
#include "FormBibitem.h"
#include "Tooltips.h"
#include "forms/form_bibitem.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "gettext.h"
#include "support/lstrings.h" // compare

2
src/frontends/xforms/FormBibtex.C
View File

@ -19,7 +19,7 @@
#include "forms/form_bibtex.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "helper_funcs.h"
#include "gettext.h"

2
src/frontends/xforms/FormChanges.C
View File

@ -16,7 +16,7 @@
#include "forms/form_changes.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormController<ControlChanges, FormView<FD_changes> > base_class;

2
src/frontends/xforms/FormCharacter.C
View File

@ -22,7 +22,7 @@
#include "gettext.h"
#include "helper_funcs.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "combox.h"
#include "frnt_lang.h"

2
src/frontends/xforms/FormCitation.C
View File

@ -21,7 +21,7 @@
#include "Tooltips.h"
#include "helper_funcs.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "gettext.h"
#include "support/LAssert.h"

2
src/frontends/xforms/FormDialogView.C
View File

@ -26,7 +26,7 @@
#include "support/LAssert.h"
#include "support/filetools.h" // LibFileSearch
#include FORMS_H_LOCATION
#include "lyx_forms.h"
extern "C" {

4
src/frontends/xforms/FormDocument.C
View File

@ -37,8 +37,8 @@
#include "support/filetools.h" // LibFileSearch
#include "support/BoostFormat.h"
#include XPM_H_LOCATION
#include FORMS_H_LOCATION
#include "lyx_xpm.h"
#include "lyx_forms.h"
#include "combox.h"
#include <boost/bind.hpp>

2
src/frontends/xforms/FormERT.C
View File

@ -18,7 +18,7 @@
#include "support/lstrings.h"
#include "helper_funcs.h"
#include "debug.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormController<ControlERT, FormView<FD_ert> > base_class;

2
src/frontends/xforms/FormError.C
View File

@ -16,7 +16,7 @@
#include "FormError.h"
#include "forms/form_error.h"
#include "xforms_helpers.h" // formatted
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormController<ControlError, FormView<FD_error> > base_class;

6
src/frontends/xforms/FormErrorList.C
View File

@ -19,7 +19,7 @@
#include "support/lstrings.h" // frontStrip, strip
#include "debug.h"
#include "gettext.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include <vector>
@ -52,7 +52,7 @@ void FormErrorList::update()
ButtonPolicy::SMInput FormErrorList::input(FL_OBJECT * ob, long)
{
std::vector<ControlErrorList::ErrorItem> const &
std::vector<ControlErrorList::ErrorItem> const &
Errors = controller().ErrorList();
if (ob == dialog_->browser_errors) {
@ -74,7 +74,7 @@ ButtonPolicy::SMInput FormErrorList::input(FL_OBJECT * ob, long)
void FormErrorList::updateContents()
{
std::vector<ControlErrorList::ErrorItem> const &
std::vector<ControlErrorList::ErrorItem> const &
Errors = controller().ErrorList();
if (Errors.empty()) {

2
src/frontends/xforms/FormExternal.C
View File

@ -22,7 +22,7 @@
#include "helper_funcs.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormController<ControlExternal, FormView<FD_external> > base_class;

2
src/frontends/xforms/FormFiledialog.C
View File

@ -59,7 +59,7 @@ using std::sort;
#include "FormFiledialog.h"
#include "forms/form_filedialog.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
namespace {

2
src/frontends/xforms/FormFloat.C
View File

@ -21,7 +21,7 @@
#include "xforms_helpers.h"
#include "insets/insetfloat.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
namespace {

2
src/frontends/xforms/FormForks.C
View File

@ -21,8 +21,8 @@
#include "xforms_helpers.h"
#include "gettext.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
#include "support/tostr.h"
#include FORMS_H_LOCATION
using std::vector;
using std::find;

4
src/frontends/xforms/FormGraphics.C
View File

@ -32,13 +32,13 @@
#include "frontends/Alert.h"
#include "support/tostr.h"
#include "support/lstrings.h" // for strToDbl
#include "support/lstrings.h" // for strToDbl
#include "support/lyxlib.h" // for float_equal
#include "support/filetools.h" // for MakeAbsPath etc
#include "support/BoostFormat.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
using std::endl;
using std::vector;

2
src/frontends/xforms/FormInclude.C
View File

@ -24,7 +24,7 @@
#include "Tooltips.h"
#include "xforms_helpers.h" // setEnabled
#include "support/lstrings.h" // strip
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormController<ControlInclude, FormView<FD_include> > base_class;

2
src/frontends/xforms/FormLog.C
View File

@ -16,7 +16,7 @@
#include "FormLog.h"
#include "forms/form_browser.h"
#include "gettext.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
FormLog::FormLog(Dialog & parent)
: FormController<ControlLog, FormBrowser>(parent, _("LaTeX Log"))

2
src/frontends/xforms/FormMathsBitmap.C
View File

@ -22,7 +22,7 @@
#include "gettext.h"
#include "support/LAssert.h"
#include XPM_H_LOCATION
#include "lyx_xpm.h"
#include <algorithm>

2
src/frontends/xforms/FormMathsDelim.C
View File

@ -26,7 +26,7 @@
#include "Lsstream.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "delim.xbm"
#include "delim0.xpm"

2
src/frontends/xforms/FormMathsMatrix.C
View File

@ -25,7 +25,7 @@
#include "Lsstream.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include <algorithm>

2
src/frontends/xforms/FormMathsPanel.C
View File

@ -30,7 +30,7 @@
#include "forms/form_maths_space.h"
#include "forms/form_maths_style.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "deco.xpm"
#include "delim.xpm"

2
src/frontends/xforms/FormMathsSpace.C
View File

@ -19,7 +19,7 @@
#include "ControlMath.h"
#include "xformsBC.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
extern char * latex_mathspace[];

2
src/frontends/xforms/FormMathsStyle.C
View File

@ -22,7 +22,7 @@
#include "bmtable.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "style.xbm"
#include "font.xbm"

2
src/frontends/xforms/FormMinipage.C
View File

@ -19,7 +19,7 @@
#include "helper_funcs.h"
#include "debug.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormController<ControlMinipage, FormView<FD_minipage> > base_class;

2
src/frontends/xforms/FormParagraph.C
View File

@ -31,7 +31,7 @@
#include "support/tostr.h"
#include "support/LAssert.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include <functional>

2
src/frontends/xforms/FormPreamble.C
View File

@ -17,7 +17,7 @@
#include "forms/form_preamble.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormCB<ControlPreamble, FormDB<FD_preamble> > base_class;

2
src/frontends/xforms/FormPreferences.C
View File

@ -46,7 +46,7 @@
#include <boost/bind.hpp>
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "combox.h"
#include <utility>

2
src/frontends/xforms/FormPreferences.h
View File

@ -21,7 +21,7 @@
#include <boost/scoped_ptr.hpp>
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include <utility> // pair
class ControlPrefs;

3
src/frontends/xforms/FormPrint.C
View File

@ -22,12 +22,13 @@
#include "input_validators.h"
#include "xforms_helpers.h"
#include "lyx_forms.h"
#include "support/tostr.h"
#include FORMS_H_LOCATION
typedef FormCB<ControlPrint, FormDB<FD_print> > base_class;
FormPrint::FormPrint()
: base_class(_("Print Document"))
{}

4
src/frontends/xforms/FormRef.C
View File

@ -20,8 +20,8 @@
#include "xforms_helpers.h"
#include "insets/insetref.h"
#include "helper_funcs.h" // getStringFromVector
#include "support/lstrings.h" // frontStrip, strip
#include FORMS_H_LOCATION
#include "support/lstrings.h" // trim
#include "lyx_forms.h"
using std::find;
using std::max;

2
src/frontends/xforms/FormSearch.C
View File

@ -18,7 +18,7 @@
#include "Tooltips.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormCB<ControlSearch, FormDB<FD_search> > base_class;

2
src/frontends/xforms/FormSendto.C
View File

@ -19,7 +19,7 @@
#include "xforms_helpers.h"
#include "format.h"
#include "gettext.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
using std::vector;

2
src/frontends/xforms/FormShowFile.C
View File

@ -16,7 +16,7 @@
#include "FormShowFile.h"
#include "forms/form_browser.h"
#include "gettext.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
FormShowFile::FormShowFile(Dialog & parent)

2
src/frontends/xforms/FormSpellchecker.C
View File

@ -20,7 +20,7 @@
#include "xforms_helpers.h"
#include "support/tostr.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
using std::endl;

2
src/frontends/xforms/FormTabular.C
View File

@ -29,7 +29,7 @@
#include "input_validators.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
using std::vector;
using std::bind2nd;

2
src/frontends/xforms/FormTabularCreate.C
View File

@ -18,7 +18,7 @@
#include "forms/form_tabular_create.h"
#include "Tooltips.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
using std::make_pair;

2
src/frontends/xforms/FormTexinfo.C
View File

@ -22,7 +22,7 @@
#include "support/LAssert.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
using std::vector;

2
src/frontends/xforms/FormText.C
View File

@ -19,7 +19,7 @@
#include "support/lstrings.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormController<ControlCommand, FormView<FD_text> > base_class;

2
src/frontends/xforms/FormThesaurus.C
View File

@ -18,7 +18,7 @@
#include "xforms_helpers.h"
#include "debug.h"
#include "support/lstrings.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include <cctype>
#ifndef CXX_GLOBAL_CSTD

2
src/frontends/xforms/FormToc.C
View File

@ -19,7 +19,7 @@
#include "support/lstrings.h" // frontStrip, strip
#include "debug.h"
#include "gettext.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include <vector>

2
src/frontends/xforms/FormUrl.C
View File

@ -16,7 +16,7 @@
#include "ControlCommand.h"
#include "FormUrl.h"
#include "forms/form_url.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
typedef FormController<ControlCommand, FormView<FD_url> > base_class;

2
src/frontends/xforms/FormVCLog.C
View File

@ -17,7 +17,7 @@
#include "FormVCLog.h"
#include "forms/form_browser.h"
#include "gettext.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
FormVCLog::FormVCLog(Dialog & parent)

4
src/frontends/xforms/FormWrap.C
View File

@ -22,11 +22,13 @@
#include "insets/insetwrap.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
#include "support/tostr.h"
#include FORMS_H_LOCATION
typedef FormController<ControlWrap, FormView<FD_wrap> > base_class;
FormWrap::FormWrap(Dialog & parent)
: base_class(parent, _("Text Wrap Settings"))
{}

2
src/frontends/xforms/Makefile.am
View File

@ -2,6 +2,8 @@ include $(top_srcdir)/config/common.am
SUBDIRS = forms
EXTRA_DIST = lyx_forms.h.in lyx_xpm.h.in
INCLUDES = -I$(top_srcdir)/images -I$(top_srcdir)/src \
-I$(top_srcdir)/src/frontends \
-I$(top_srcdir)/src/frontends/controllers \

2
src/frontends/xforms/Menubar_pimpl.C
View File

@ -20,7 +20,7 @@
#include "support/LAssert.h"
#include "gettext.h"
#include "debug.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
//#include <boost/scoped_ptr.hpp>

2
src/frontends/xforms/RadioButtonGroup.C
View File

@ -15,7 +15,7 @@
#include "RadioButtonGroup.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "support/LAssert.h"
#include "debug.h" // for lyxerr

2
src/frontends/xforms/Toolbar_pimpl.C
View File

@ -24,7 +24,7 @@
#include "funcrequest.h"
#include "gettext.h"
#include "Tooltips.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "combox.h"
#include "xforms_helpers.h"

2
src/frontends/xforms/Tooltips.C
View File

@ -22,7 +22,7 @@
#include "gettext.h"
#include "support/lstrings.h"
#include "support/LAssert.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include <boost/bind.hpp>

2
src/frontends/xforms/XFormsView.C
View File

@ -12,7 +12,7 @@
#include "XFormsView.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "XMiniBuffer.h"
#include "debug.h"

2
src/frontends/xforms/XMiniBuffer.C
View File

@ -53,7 +53,7 @@ XMiniBuffer::XMiniBuffer(ControlCommandBuffer & control,
{
input_ = create_input_box(this, FL_NORMAL_INPUT, x, y, h, w);
freebrowser_.reset(create_freebrowser(this), fl_free_freebrowser);
info_timer_.reset(new Timeout(1500));
idle_timer_.reset(new Timeout(6000));
info_con = info_timer_->timeout.connect(boost::bind(&XMiniBuffer::info_timeout, this));

2
src/frontends/xforms/XMiniBuffer.h
View File

@ -14,7 +14,7 @@
#ifndef XMINIBUFFER_H
#define XMINIBUFFER_H
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "LString.h"
#include <boost/scoped_ptr.hpp>

2
src/frontends/xforms/XWorkArea.h
View File

@ -17,7 +17,7 @@
#include "frontends/WorkArea.h"
#include "XPainter.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
///
class XWorkArea : public WorkArea {

2
src/frontends/xforms/bmtable.c
View File

@ -17,7 +17,7 @@
#include <stdlib.h>
#include "bmtable.h"
#include XPM_H_LOCATION
#include "lyx_xpm.h"
#if defined(__cplusplus)
extern "C"

2
src/frontends/xforms/bmtable.h
View File

@ -17,7 +17,7 @@
#define BMTABLE_H
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#if defined(__cplusplus)
extern "C"

2
src/frontends/xforms/checkedwidgets.C
View File

@ -19,7 +19,7 @@
#include "support/lstrings.h"
#include "LString.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
void addCheckedLyXLength(BCView & bcview,

4
src/frontends/xforms/combox.c
View File

@ -15,7 +15,7 @@
*/
#include <config.h>
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "combox.h"
#include "freebrowser.h"
@ -376,7 +376,7 @@ combox_handle(FL_OBJECT * ob, int event, FL_Coord mx, FL_Coord my, int key,
/* Fall through */
case FL_DRAWLABEL:
fl_draw_object_label(ob);
break;
break;
case FL_SHORTCUT:
show_browser(ob->spec);
break;

2
src/frontends/xforms/fdesign_base.C
View File

@ -12,7 +12,7 @@
#include "fdesign_base.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
FD_base::~FD_base()
{

2
src/frontends/xforms/forms/fdfix.sh
View File

@ -140,7 +140,7 @@ INTRO_MESSAGE ${TMP}
echo "#include <config.h>" >> ${TMP}
echo "#include \"forms_gettext.h\"" >> ${TMP}
echo "#include \"gettext.h\"" >> ${TMP}
echo "#include FORMS_H_LOCATION" >> ${TMP}
echo "#include \"../lyx_forms.h\"" >> ${TMP}
grep bmtable ${CIN} > /dev/null &&
echo "#include \"bmtable.h\"" >> ${TMP}

2
src/frontends/xforms/freebrowser.c
View File

@ -15,7 +15,7 @@
*/
#include <config.h>
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "freebrowser.h"
#include <ctype.h> /* isprint */

2
src/frontends/xforms/input_validators.C
View File

@ -7,7 +7,7 @@
#include <config.h>
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "support/lstrings.h"
#include "input_validators.h"

10
src/frontends/xforms/lyx_forms.h.in Normal file
View File

@ -0,0 +1,10 @@
// -*- C++ -*-
// This file is autogenerated. Do not edit this, but
// edit the lyx_forms.h.in file instead.
#ifndef LYX_FORMS_H
#define LYX_FORMS_H
#include @FORMS_H_LOCATION@
#endif

4
src/frontends/xforms/lyx_gui.C
View File

@ -3,7 +3,7 @@
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author unknown
* \author Lars Gullik Bjønnes
* \author John Levon
*
* Full author contact details are available in file CREDITS
@ -32,7 +32,7 @@
#include "BufferView.h"
#include "XFormsView.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "ColorHandler.h"
#include "xforms_helpers.h"
#include "xfont_loader.h"

10
src/frontends/xforms/lyx_xpm.h.in Normal file
View File

@ -0,0 +1,10 @@
// -*- C++ -*-
// This file is autogenerated. Do not edit this, but
// edit the lyx_forms.h.in file instead.
#ifndef LYX_XPM_H
#define LYX_XPM_H
#include @XPM_H_LOCATION@
#endif

2
src/frontends/xforms/xfont_loader.C
View File

@ -23,7 +23,7 @@
#include "support/systemcall.h"
#include "support/filetools.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
using std::endl;

2
src/frontends/xforms/xformsBC.C
View File

@ -15,7 +15,7 @@
#include "xformsBC.h"
#include "xforms_helpers.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
xformsBC::xformsBC(ButtonController const & parent,

2
src/frontends/xforms/xformsImage.C
View File

@ -19,7 +19,7 @@
#include "support/LAssert.h"
#include "support/lyxfunctional.h" // compare_memfun
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#ifdef HAVE_FLIMAGE_H
# include <flimage.h>

2
src/frontends/xforms/xformsTimeout.C
View File

@ -13,7 +13,7 @@
#include "xformsTimeout.h"
#include "debug.h"
#include FORMS_H_LOCATION
#include "lyx_forms.h"
Timeout::Timeout(unsigned int msec, Type t)

2
src/frontends/xforms/xforms_helpers.C
View File

@ -23,7 +23,7 @@
#include "support/filetools.h"
#include "support/lstrings.h" // frontStrip, strip
#include FORMS_H_LOCATION
#include "lyx_forms.h"
#include "combox.h"
#include <fstream>

2
src/frontends/xforms/xforms_resize.C
View File

@ -14,7 +14,7 @@
#include "xforms_resize.h"
#include "support/LAssert.h"
#include <algorithm> // std::max. Use FL_max in .c code...
#include FORMS_H_LOCATION
#include "lyx_forms.h"
namespace {