anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-05 13:26:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Strip out another 180 #includes.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7675 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2003-09-05 13:15:43 +00:00
parent 36439eab21
commit b538a4c8fe
78 changed files with 442 additions and 495 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontends/Alert_pimpl.h
View File

@ -11,6 +11,9 @@
// GUI-specific implementations
#include "LString.h"
int prompt_pimpl(string const & title, string const & question,
int default_button, int escape_button,
string const & b1, string const & b2, string const & b3);

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

@ -10,21 +10,22 @@
#include <config.h>
#include "Alert.h"
#include "Alert_pimpl.h"
#include "forms_gettext.h"
#include "gettext.h"
#include "xforms_helpers.h"
#include "debug.h"
#include "gettext.h"
#include <algorithm>
#include <boost/tuple/tuple.hpp>
#include "lyx_forms.h"
using std::pair;
using std::make_pair;
using std::endl;
using std::make_pair;
using std::pair;
void warning_pimpl(string const &, string const & message)
{

5
src/frontends/xforms/ChangeLog
View File

@ -1,3 +1,8 @@
2003-09-05 Angus Leeming <angus@localhost.localdomain>
* *.C: strip out redundant #includes. (180 in total.)
Reorder remaining #includes in consistent fashion.
2003-09-04 Angus Leeming <angus@localhost.localdomain>
* Alert_pimpl.C: move #include "debug.h" out of the header file.

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

@ -10,15 +10,15 @@
#include <config.h>
#include "Color.h"
#include <algorithm> // max
#include <cmath> // floor
#include <iomanip>
#include "lyx_forms.h"
#include "Lsstream.h"
#include "support/LAssert.h"
#include "lyx_forms.h"
#include "Lsstream.h"
#include <iomanip>
namespace support = lyx::support;
#ifndef CXX_GLOBAL_CSTD

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

@ -10,17 +10,17 @@
#include <config.h>
#include "ColorHandler.h"
#include "LColor.h"
#include "gettext.h"
#include "debug.h"
#include "gettext.h"
#include "support/lstrings.h"
#include "support/tostr.h"
#include "lyx_forms.h"
#include <boost/scoped_array.hpp>
#include "support/tostr.h"
#include "support/lstrings.h"
#include <cmath>
using namespace lyx::support;
@ -30,7 +30,6 @@ using std::pow;
using std::endl;
#include "lyx_forms.h"
namespace {

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

@ -11,7 +11,6 @@
#include <config.h>
#include "Dialogs.h"
#include "Dialog.h"
#include "Tooltips.h"
@ -19,9 +18,7 @@
#include "ControlBibtex.h"
#include "ControlBranch.h"
#include "ControlChanges.h"
#include "ControlCharacter.h"
#include "ControlCitation.h"
#include "ControlCommand.h"
#include "ControlErrorList.h"
#include "ControlERT.h"
#include "ControlExternal.h"
@ -37,7 +34,6 @@
#include "ControlShowFile.h"
#include "ControlTabular.h"
#include "ControlTabularCreate.h"
#include "ControlTexinfo.h"
#include "ControlToc.h"
#include "ControlVCLog.h"
#include "ControlWrap.h"
@ -99,7 +95,6 @@
#include "ams_nrel.xbm"
#include "ams_ops.xbm"
#include <vector>
namespace {

1
src/frontends/xforms/Dialogs2.C
View File

@ -15,7 +15,6 @@
#include "controllers/GUI.h"
#include "ButtonController.h"
#include "Tooltips.h"
#include "xformsBC.h"
#include "ControlDocument.h"

13
src/frontends/xforms/FileDialog.C
View File

@ -10,22 +10,19 @@
#include <config.h>
#include "FormFiledialog.h"
#include "frontends/FileDialog.h"
#include "frontends/LyXView.h"
#include "bufferview_funcs.h"
#include "gettext.h"
#include "lfuns.h"
#include "debug.h"
#include "gettext.h"
#include "support/lstrings.h"
#include <utility>
using namespace lyx::support;
using std::endl;
using std::make_pair;
using std::pair;
using std::endl;
FileDialog::FileDialog(string const &t, kb_action s, Button b1, Button b2)
: private_(0), title_(t), success_(s)

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

@ -12,23 +12,23 @@
#include <config.h>
#include "FontInfo.h"
#include "debug.h"
#include "lyxrc.h" // lyxrc.use_scalable_fonts
#include "support/tostr.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "frontends/lyx_gui.h"
#include <cmath> // abs()
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/tostr.h"
#include "lyx_forms.h"
using namespace lyx::support;
using std::endl;
using std::abs;
using std::endl;
#include "lyx_forms.h"
/// Load font close to this size
string const FontInfo::getFontname(int size)

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

@ -12,23 +12,23 @@
#include "FormBase.h"
#include "ControlButtons.h"
#include "xformsBC.h"
#include "ButtonController.h"
#include "xforms_resize.h"
#include "Tooltips.h"
#include "xforms_helpers.h" // formatted
#include "xforms_resize.h"
#include "xformsBC.h"
#include "gettext.h" // _()
#include "controllers/ButtonController.h"
#include "controllers/ControlButtons.h"
#include "support/lstrings.h"
#include "support/LAssert.h"
#include "support/filetools.h" // LibFileSearch
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
using namespace lyx::support;
extern "C" {
#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0)

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

@ -9,19 +9,22 @@
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "xformsBC.h"
#include "ControlCommand.h"
#include "FormBibitem.h"
#include "Tooltips.h"
#include "ControlCommand.h"
#include "forms/form_bibitem.h"
#include "lyx_forms.h"
#include "gettext.h"
#include "Tooltips.h"
#include "xformsBC.h"
#include "support/lstrings.h" // compare
#include "lyx_forms.h"
using namespace lyx::support;
typedef FormController<ControlCommand, FormView<FD_bibitem> > base_class;
FormBibitem::FormBibitem(Dialog & parent)

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

@ -11,26 +11,26 @@
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "xformsBC.h"
#include "ControlBibtex.h"
#include "FormBibtex.h"
#include "ControlBibtex.h"
#include "forms/form_bibtex.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "lyx_forms.h"
#include "xformsBC.h"
#include "helper_funcs.h"
#include "gettext.h"
#include "support/lstrings.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "support/lyxalgo.h"
#include "lyx_forms.h"
using namespace lyx::support;
using std::vector;
using std::sort;
using std::vector;
typedef FormController<ControlBibtex, FormView<FD_bibtex> > base_class;

12
src/frontends/xforms/FormBranch.C
View File

@ -11,14 +11,16 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlBranch.h"
#include "FormBranch.h"
#include "ControlBranch.h"
#include "forms/form_branch.h"
#include "xforms_helpers.h" // formatted
#include "lyx_forms.h"
#include "xformsBC.h"
#include "insets/insetbranch.h"
#include "debug.h"
#include "lyx_forms.h"
typedef FormController<ControlBranch, FormView<FD_branch> > base_class;

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

@ -10,11 +10,11 @@
#include <config.h>
#include "FormBrowser.h"
#include "forms/form_browser.h"
#include "xformsBC.h"
FormBrowser::FormBrowser(Dialog & parent,
string const & title, bool allowResize)
: FormView<FD_browser>(parent, title, allowResize)

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

@ -10,14 +10,16 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlChanges.h"
#include "FormChanges.h"
#include "ControlChanges.h"
#include "forms/form_changes.h"
#include "xformsBC.h"
#include "xforms_helpers.h"
#include "lyx_forms.h"
typedef FormController<ControlChanges, FormView<FD_changes> > base_class;
FormChanges::FormChanges(Dialog & parent)

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

@ -11,27 +11,25 @@
#include <config.h>
#include "xformsBC.h"
#include "ButtonController.h"
#include "ControlCharacter.h"
#include "FormCharacter.h"
#include "forms/form_character.h"
#include "gettext.h"
#include "helper_funcs.h"
#include "xforms_helpers.h"
#include "lyx_forms.h"
#include "combox.h"
#include "frnt_lang.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "controllers/frnt_lang.h"
#include "controllers/helper_funcs.h"
#include "support/lstrings.h"
#include <vector>
#include "lyx_forms.h"
#include "combox.h"
using namespace lyx::support;
using std::vector;
using std::find;
using std::vector;
using namespace frnt;

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

@ -11,31 +11,28 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlCitation.h"
#include "FormCitation.h"
#include "ControlCitation.h"
#include "forms/form_citation.h"
#include "Kernel.h"
#include "Tooltips.h"
#include "helper_funcs.h"
#include "xforms_helpers.h"
#include "lyx_forms.h"
#include "gettext.h"
#include "support/LAssert.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "support/lstrings.h"
#include <algorithm>
#include "lyx_forms.h"
using namespace lyx::support;
using std::find;
using std::max;
using std::min;
using std::pair;
using std::sort;
using std::pair;
using std::vector;
namespace {
// shamelessly stolen from Menubar_pimpl.C

8
src/frontends/xforms/FormColorpicker.C
View File

@ -13,22 +13,18 @@
#include "FormColorpicker.h"
#include "forms/form_colorpicker.h"
#include "xforms_resize.h"
#include "Tooltips.h"
#include "Color.h"
#include "xforms_resize.h"
#include "gettext.h"
#include "lyxrc.h"
#include "support/LAssert.h"
#include "support/filetools.h" // LibFileSearch
#include "support/LAssert.h"
#include "support/tostr.h"
#include "lyx_forms.h"
#include "Lsstream.h"
#include <iomanip>
namespace {

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

@ -12,24 +12,24 @@
#include "FormDialogView.h"
#include "Dialog.h"
#include "xformsBC.h"
#include "ButtonController.h"
#include "xforms_resize.h"
#include "Tooltips.h"
#include "xforms_helpers.h" // formatted
#include "xforms_resize.h"
#include "xformsBC.h"
#include "controllers/ButtonController.h"
#include "gettext.h" // _()
#include "lyxrc.h"
#include "support/lstrings.h"
#include "support/LAssert.h"
#include "support/filetools.h" // LibFileSearch
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
using namespace lyx::support;
extern "C" {
#if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0)

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

@ -13,53 +13,44 @@
#include <config.h>
#include "ControlDocument.h"
#include "FormDocument.h"
#include "ControlDocument.h"
#include "forms/form_document.h"
#include "xformsBC.h"
#include "ButtonController.h"
#include "FormColorpicker.h"
#include "LColor.h"
#include "Lsstream.h"
#include "bmtable.h"
#include "checkedwidgets.h"
#include "Tooltips.h"
#include "ColorHandler.h"
#include "combox.h"
#include "FormColorpicker.h"
#include "input_validators.h" // fl_unsigned_float_filter
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "controllers/ButtonController.h"
#include "controllers/frnt_lang.h"
#include "controllers/helper_funcs.h"
#include "bufferparams.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "language.h"
#include "lyxrc.h"
#include "lyxtextclasslist.h"
#include "tex-strings.h"
#include "ColorHandler.h"
#include "controllers/frnt_lang.h"
#include "controllers/helper_funcs.h"
#include "support/tostr.h"
#include "support/lstrings.h" // contains_functor, getStringFromVector
#include "support/filetools.h" // LibFileSearch
#include "lyx_xpm.h"
#include "lyx_forms.h"
#include "combox.h"
#include <boost/bind.hpp>
#include <functional>
#include <iomanip>
using namespace lyx::support;
using std::bind2nd;
using std::vector;
using std::endl;
using std::setw;
using std::setfill;
using std::vector;
namespace {

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

@ -12,8 +12,8 @@
#ifndef FORM_DOCUMENT_H
#define FORM_DOCUMENT_H
#include "FormBase.h"
#include "BranchList.h"
#include <boost/scoped_ptr.hpp>

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

@ -10,16 +10,15 @@
#include <config.h>
#include "FormERT.h"
#include "ControlERT.h"
#include "forms/form_ert.h"
#include "xformsBC.h"
#include "ControlERT.h"
#include "FormERT.h"
#include "forms/form_ert.h"
#include "support/lstrings.h"
#include "helper_funcs.h"
#include "debug.h"
#include "lyx_forms.h"
typedef FormController<ControlERT, FormView<FD_ert> > base_class;
FormERT::FormERT(Dialog & parent)

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

@ -10,16 +10,12 @@
#include <config.h>
#include "errorlist.h"
#include "FormErrorList.h"
#include "xformsBC.h"
#include "xforms_helpers.h"
#include "ControlErrorList.h"
#include "forms/form_errorlist.h"
#include "support/lstrings.h" // frontStrip, strip
#include "debug.h"
#include "gettext.h"
#include "xformsBC.h"
#include "xforms_helpers.h"
#include "lyx_forms.h"

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

@ -12,26 +12,25 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlExternal.h"
#include "FormExternal.h"
#include "ControlExternal.h"
#include "forms/form_external.h"
#include "helper_funcs.h"
#include "input_validators.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "gettext.h"
#include "xformsBC.h"
#include "insets/ExternalTemplate.h"
#include "support/tostr.h"
#include "support/lstrings.h"
#include "support/tostr.h"
#include "lyx_forms.h"
using namespace lyx::support;
typedef FormController<ControlExternal, FormView<FD_external> > base_class;
FormExternal::FormExternal(Dialog & parent)

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

@ -11,32 +11,29 @@
#include <config.h>
#include <unistd.h>
#include <cstdlib>
#include <pwd.h>
#include <grp.h>
#include <map>
#include <algorithm>
#include "FormFiledialog.h"
#include "forms/form_filedialog.h"
using std::map;
using std::max;
using std::sort;
#include "gettext.h"
#include "forms_gettext.h"
#include "xforms_helpers.h"
#include "frontends/Dialogs.h"
#include "support/FileInfo.h"
#include "support/lyxlib.h"
#include "support/lstrings.h"
#include "support/tostr.h"
#include "support/filetools.h"
#include "frontends/Alert.h"
#include "frontends/Dialogs.h"
#include "lyx_forms.h"
#include <boost/bind.hpp>
#include <algorithm>
#include <map>
#include <grp.h>
#include <pwd.h>
//#ifdef HAVE_ERRNO_H
//#include <cerrno>
//#endif
@ -56,13 +53,13 @@ using std::sort;
# endif
#endif
#include "FormFiledialog.h"
#include "forms/form_filedialog.h"
#include "lyx_forms.h"
using std::max;
using std::sort;
using std::map;
using namespace lyx::support;
namespace {
// six months, in seconds

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

@ -12,19 +12,23 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlFloat.h"
#include "FormFloat.h"
#include "ControlFloat.h"
#include "forms/form_float.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "insets/insetfloat.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
using namespace lyx::support;
namespace {
enum {

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

@ -11,24 +11,27 @@
#include <config.h>
#include "xformsBC.h"
#include "ButtonController.h"
#include "FormForks.h"
#include "ControlForks.h"
#include "forms/form_forks.h"
#include "Tooltips.h"
#include "helper_funcs.h"
#include "xforms_helpers.h"
#include "gettext.h"
#include "xformsBC.h"
#include "controllers/ButtonController.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
#include "support/tostr.h"
#include "lyx_forms.h"
using namespace lyx::support;
using std::vector;
using std::find;
using std::find_if;
using std::vector;
typedef FormCB<ControlForks, FormDB<FD_forks> > base_class;

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

@ -12,31 +12,26 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlGraphics.h"
#include "FormGraphics.h"
#include "ControlGraphics.h"
#include "forms/form_graphics.h"
#include "controllers/helper_funcs.h" // for getStringFromVector
#include "checkedwidgets.h"
#include "input_validators.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "debug.h" // for lyxerr
#include "lyxrc.h" // for lyxrc.display_graphics
#include "insets/insetgraphicsParams.h"
#include "controllers/helper_funcs.h" // for getStringFromVector
#include "frontends/Alert.h"
#include "support/tostr.h"
#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 "support/tostr.h"
#include "lyx_forms.h"

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

@ -12,22 +12,21 @@
#include <config.h>
#include "debug.h"
#include "xformsBC.h"
#include "ControlInclude.h"
#include "FormInclude.h"
#include "ControlInclude.h"
#include "forms/form_include.h"
#include "insets/insetinclude.h"
#include "Tooltips.h"
#include "xforms_helpers.h" // setEnabled
#include "xformsBC.h"
#include "support/lstrings.h" // strip
#include "lyx_forms.h"
#include <algorithm>
using namespace lyx::support;
typedef FormController<ControlInclude, FormView<FD_include> > base_class;
FormInclude::FormInclude(Dialog & parent)

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

@ -10,14 +10,15 @@
#include <config.h>
#include "FormLog.h"
#include "ControlLog.h"
#include "forms/form_browser.h"
#include "xformsBC.h"
#include "ControlLog.h"
#include "FormLog.h"
#include "forms/form_browser.h"
#include "gettext.h"
#include "lyx_forms.h"
FormLog::FormLog(Dialog & parent)
: FormController<ControlLog, FormBrowser>(parent, _("LaTeX Log"))
{}

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

@ -12,29 +12,25 @@
#include <config.h>
#include "FormMathsBitmap.h"
#include "ControlMath.h"
#include "xformsBC.h"
#include "bmtable.h"
#include "forms_gettext.h"
#include "gettext.h"
#include "xformsBC.h"
#include "ControlMath.h"
#include "support/LAssert.h"
#include "lyx_xpm.h"
#include <algorithm>
extern "C" void C_FormDialogView_CancelCB(FL_OBJECT *, long);
extern "C" void C_FormDialogView_InputCB(FL_OBJECT *, long);
using namespace lyx::support;
using std::vector;
using std::max;
using std::vector;
extern "C" void C_FormDialogView_CancelCB(FL_OBJECT *, long);
extern "C" void C_FormDialogView_InputCB(FL_OBJECT *, long);
FD_maths_bitmap::~FD_maths_bitmap()
{
if (form->visible) fl_hide_form(form);

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

@ -13,21 +13,17 @@
#include <config.h>
#include "FormMathsDelim.h"
#include "forms/form_maths_delim.h"
#include "ControlMath.h"
#include "xformsBC.h"
#include "ButtonController.h"
#include "bmtable.h"
#include "xformsBC.h"
#include "support/lstrings.h"
#include "controllers/ButtonController.h"
#include "Lsstream.h"
#include "lyx_forms.h"
#include "delim.xbm"
#include "delim0.xpm"
#include "delim1.xpm"

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

@ -13,21 +13,20 @@
#include <config.h>
#include "FormMathsMatrix.h"
#include "forms/form_maths_matrix.h"
#include "ControlMath.h"
#include "xformsBC.h"
#include "ButtonController.h"
#include "controllers/ButtonController.h"
#include "support/LAssert.h"
#include "support/lyxalgo.h" // lyx::count
#include "Lsstream.h"
#include "lyx_forms.h"
#include <algorithm>
#include "Lsstream.h"
using namespace lyx::support;

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

@ -13,10 +13,10 @@
#include <config.h>
#include "ControlMath.h"
#include "FormMathsPanel.h"
#include "ControlMath.h"
#include "forms/form_maths_panel.h"
#include "xformsBC.h"
#include "lyx_forms.h"

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

@ -13,7 +13,6 @@
#include <config.h>
#include "FormMathsSpace.h"
#include "forms/form_maths_space.h"
#include "ControlMath.h"
@ -21,6 +20,7 @@
#include "lyx_forms.h"
extern char * latex_mathspace[];
typedef FormController<ControlMath, FormView<FD_maths_space> > base_class;

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

@ -14,19 +14,18 @@
#include <config.h>
#include "FormMathsStyle.h"
#include "forms/form_maths_style.h"
#include "ControlMath.h"
#include "xformsBC.h"
#include "bmtable.h"
#include "lyx_forms.h"
#include "bmtable.h"
#include "style.xbm"
#include "font.xbm"
char const * latex_mathstyle[] = {
"displaystyle", "textstyle", "scriptstyle", "scriptscriptstyle"
};

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

@ -10,19 +10,23 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlMinipage.h"
#include "FormMinipage.h"
#include "ControlMinipage.h"
#include "forms/form_minipage.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "controllers/helper_funcs.h"
#include "support/lstrings.h"
#include "support/tostr.h"
#include "helper_funcs.h"
#include "debug.h"
#include "xforms_helpers.h"
#include "lyx_forms.h"
using namespace lyx::support;
typedef FormController<ControlMinipage, FormView<FD_minipage> > base_class;
FormMinipage::FormMinipage(Dialog & parent)

14
src/frontends/xforms/FormNote.C
View File

@ -11,16 +11,16 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlNote.h"
#include "FormNote.h"
#include "ControlNote.h"
#include "forms/form_note.h"
#include "Tooltips.h"
#include "lyx_forms.h"
#include "insets/insetnote.h"
#include "debug.h"
#include <vector>
#include "Tooltips.h"
#include "xformsBC.h"
#include "insets/insetnote.h"
#include "lyx_forms.h"
using std::vector;

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

@ -11,35 +11,32 @@
#include <config.h>
#include "ControlParagraph.h"
#include "FormParagraph.h"
#include "ControlParagraph.h"
#include "forms/form_paragraph.h"
#include "Tooltips.h"
#include "checkedwidgets.h"
#include "input_validators.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "controllers/helper_funcs.h"
#include "lyxrc.h" // to set the deafult length values
#include "ParagraphParameters.h"
#include "xforms_helpers.h"
#include "lyxrc.h" // to set the deafult length values
#include "input_validators.h"
#include "helper_funcs.h"
#include "checkedwidgets.h"
#include "gettext.h"
#include "xformsBC.h"
#include "layout.h" // LyXAlignment
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "support/tostr.h"
#include "support/LAssert.h"
#include "lyx_forms.h"
#include <functional>
using namespace lyx::support;
using std::vector;
using std::bind2nd;
using std::remove_if;
using std::vector;
namespace

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

@ -10,15 +10,16 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlPreamble.h"
#include "FormPreamble.h"
#include "ControlPreamble.h"
#include "forms/form_preamble.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "lyx_forms.h"
typedef FormCB<ControlPreamble, FormDB<FD_preamble> > base_class;
FormPreamble::FormPreamble()

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

@ -10,63 +10,45 @@
#include <config.h>
#include "ControlPrefs.h"
#include "FormPreferences.h"
#include "ControlPrefs.h"
#include "forms/form_preferences.h"
#include "xformsBC.h"
#include "ButtonController.h"
#include "FormColorpicker.h"
#include "Color.h"
#include "input_validators.h"
#include "forms_gettext.h"
#include "xforms_helpers.h"
#include "helper_funcs.h" // getSecond
#include "input_validators.h"
#include "xformsBC.h"
#include "controllers/helper_funcs.h" // getSecond
#include "buffer.h"
#include "converter.h"
#include "format.h"
#include "debug.h"
#include "language.h"
#include "frnt_lang.h"
#include "lyxlex.h"
#include "lyxrc.h"
#include "LColor.h"
#include "Lsstream.h"
#include "funcrequest.h"
#include "author.h"
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "support/lyxfunctional.h"
#include "support/lyxmanip.h"
#include "support/tostr.h"
#include "support/path_defines.h"
#include "support/filetools.h"
#include "support/LAssert.h"
#include "graphics/GraphicsCache.h"
#include "graphics/GraphicsTypes.h"
#include <boost/bind.hpp>
#include "lyx_forms.h"
#include "combox.h"
#include <utility>
#include <iomanip>
#include <X11/Xlib.h>
using std::endl;
using std::pair;
using std::make_pair;
using std::max;
using std::min;
using std::vector;
using std::setw;
using std::setfill;
using std::setw;
using std::pair;
using std::vector;
using namespace lyx::support;
namespace {
// These should probably go inside the class definition...

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

@ -26,6 +26,7 @@
class ControlPrefs;
class Dialogs;
class LyXRC;
class LyXView;
class RGBColor;
class FormColorpicker;

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

@ -11,23 +11,24 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlPrint.h"
#include "FormPrint.h"
#include "ControlPrint.h"
#include "forms/form_print.h"
#include "input_validators.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "PrinterParams.h"
#include "input_validators.h"
#include "xforms_helpers.h"
#include "support/tostr.h"
#include "lyx_forms.h"
#include "support/tostr.h"
#include "support/lstrings.h"
using namespace lyx::support;
typedef FormCB<ControlPrint, FormDB<FD_print> > base_class;

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

@ -10,18 +10,19 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlRef.h"
#include "FormRef.h"
#include "Tooltips.h"
#include "ControlRef.h"
#include "forms/form_ref.h"
#include "xforms_helpers.h"
#include "insets/insetref.h"
#include "helper_funcs.h" // getStringFromVector
#include "support/lstrings.h" // trim
#include "lyx_forms.h"
#include <algorithm>
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "insets/insetref.h"
#include "support/lstrings.h" // trim
#include "lyx_forms.h"
using namespace lyx::support;
@ -30,6 +31,7 @@ using std::max;
using std::sort;
using std::vector;
typedef FormController<ControlRef, FormView<FD_ref> > base_class;
FormRef::FormRef(Dialog & parent)

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

@ -10,16 +10,17 @@
#include <config.h>
#include "xformsBC.h"
#include "ControlSearch.h"
#include "FormSearch.h"
#include "ControlSearch.h"
#include "forms/form_search.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "lyx_forms.h"
typedef FormCB<ControlSearch, FormDB<FD_search> > base_class;
FormSearch::FormSearch()

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

@ -11,20 +11,24 @@
#include <config.h>
#include "FormSendto.h"
#include "forms/form_sendto.h"
#include "ControlSendto.h"
#include "xformsBC.h"
#include "forms/form_sendto.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "format.h"
#include "gettext.h"
#include "lyx_forms.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
using namespace lyx::support;
using std::vector;
typedef FormCB<ControlSendto, FormDB<FD_sendto> > base_class;
FormSendto::FormSendto()

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

@ -10,12 +10,12 @@
#include <config.h>
#include "FormShowFile.h"
#include "ControlShowFile.h"
#include "forms/form_browser.h"
#include "xformsBC.h"
#include "ControlShowFile.h"
#include "FormShowFile.h"
#include "forms/form_browser.h"
#include "gettext.h"
#include "lyx_forms.h"

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

@ -10,20 +10,21 @@
#include <config.h>
#include "xformsBC.h"
#include "FormSpellchecker.h"
#include "ControlSpellchecker.h"
#include "forms/form_spellchecker.h"
#include "forms_gettext.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "support/tostr.h"
#include "lyx_forms.h"
using std::endl;
typedef FormCB<ControlSpellchecker, FormDB<FD_spellchecker> > base_class;
FormSpellchecker::FormSpellchecker()

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

@ -10,30 +10,24 @@
#include <config.h>
#include "ControlTabular.h"
#include "xformsBC.h"
#include "ButtonController.h"
#include "insets/insettabular.h"
#include "FormTabular.h"
#include "ControlTabular.h"
#include "forms/form_tabular.h"
#include "debug.h"
#include "xforms_helpers.h"
#include "gettext.h"
#include "lyxrc.h"
#include "helper_funcs.h"
#include "input_validators.h"
#include "xformsBC.h"
#include "controllers/ButtonController.h"
#include "controllers/helper_funcs.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
#include <vector>
#include <algorithm>
using namespace lyx::support;
using std::vector;
using std::bind2nd;
using std::vector;
namespace {

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

@ -9,17 +9,15 @@
*/
#include <config.h>
#include <utility>
#include "xformsBC.h"
#include "ControlTabularCreate.h"
#include "FormTabularCreate.h"
#include "ControlTabularCreate.h"
#include "forms/form_tabular_create.h"
#include "Tooltips.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
#include "Tooltips.h"
#include "xformsBC.h"
#include "lyx_forms.h"
using std::make_pair;

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

@ -10,20 +10,19 @@
#include <config.h>
#include "xformsBC.h"
#include "FormTexinfo.h"
#include "forms/form_texinfo.h"
#include "Tooltips.h"
#include "gettext.h"
#include "xforms_helpers.h"
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "xformsBC.h"
#include "support/filetools.h"
#include "lyx_forms.h"
using namespace lyx::support;
typedef FormController<ControlTexinfo, FormView<FD_texinfo> > base_class;
FormTexinfo::FormTexinfo(Dialog & parent)

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

@ -10,19 +10,22 @@
#include <config.h>
#include "xformsBC.h"
#include "ButtonController.h"
#include "ControlCommand.h"
#include "FormText.h"
#include "ControlCommand.h"
#include "forms/form_text.h"
#include "xformsBC.h"
#include "forms_gettext.h"
#include "controllers/ButtonController.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
using namespace lyx::support;
typedef FormController<ControlCommand, FormView<FD_text> > base_class;
FormText::FormText(Dialog & parent, string const & title, string const & label)

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

@ -10,16 +10,16 @@
#include <config.h>
#include "ControlThesaurus.h"
#include "FormThesaurus.h"
#include "ControlThesaurus.h"
#include "forms/form_thesaurus.h"
#include "xformsBC.h"
#include "xforms_helpers.h"
#include "debug.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
#include <cctype>
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
using namespace lyx::support;

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

@ -10,23 +10,21 @@
#include <config.h>
#include "FormToc.h"
#include "xformsBC.h"
#include "xforms_helpers.h"
#include "ControlToc.h"
#include "forms/form_toc.h"
#include "support/lstrings.h" // frontStrip, strip
#include "debug.h"
#include "gettext.h"
#include "lyx_forms.h"
#include <vector>
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "support/lstrings.h" // frontStrip, strip
#include "lyx_forms.h"
using namespace lyx::support;
using std::vector;
using std::endl;
using std::vector;
typedef FormController<ControlToc, FormView<FD_toc> > base_class;

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

@ -11,13 +11,15 @@
#include <config.h>
#include "FormUrl.h"
#include "ControlCommand.h"
#include "forms/form_url.h"
#include "xformsBC.h"
#include "ControlCommand.h"
#include "FormUrl.h"
#include "forms/form_url.h"
#include "lyx_forms.h"
typedef FormController<ControlCommand, FormView<FD_url> > base_class;
FormUrl::FormUrl(Dialog & parent)

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

@ -9,16 +9,17 @@
*/
#include <config.h>
#include "Lsstream.h"
#include "FormVCLog.h"
#include "ControlVCLog.h"
#include "forms/form_browser.h"
#include "xformsBC.h"
#include "ControlVCLog.h"
#include "FormVCLog.h"
#include "forms/form_browser.h"
#include "gettext.h"
#include "lyx_forms.h"
#include "Lsstream.h"
FormVCLog::FormVCLog(Dialog & parent)
: FormController<ControlVCLog, FormBrowser>(parent, _("Version Control Log"))

1
src/frontends/xforms/LyXKeySymFactory.C
View File

@ -14,6 +14,7 @@
#include "XLyXKeySym.h"
namespace LyXKeySymFactory {
LyXKeySym * create()

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

@ -12,8 +12,9 @@
#include "frontends/LyXScreenFactory.h"
#include "XWorkArea.h"
#include "xscreen.h"
#include "XWorkArea.h"
namespace LyXScreenFactory {

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

@ -11,22 +11,21 @@
#include <config.h>
#include "RadioButtonGroup.h"
#include "lyx_forms.h"
#include "xforms_helpers.h"
#include "debug.h"
#include "support/LAssert.h"
#include "debug.h" // for lyxerr
#include "support/lyxfunctional.h"
#include <algorithm>
#include <iterator>
#include "lyx_forms.h"
using namespace lyx::support;
using std::find_if;
using std::endl;
using std::find_if;
void RadioButtonGroup::init(FL_OBJECT * ob, size_type value)

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

@ -16,18 +16,20 @@
#include <config.h>
#include "Tooltips.h"
#include "xforms_helpers.h" // formatted
#include "gettext.h"
#include "support/lstrings.h"
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
#include <boost/bind.hpp>
using namespace lyx::support;
bool Tooltips::enabled_ = true;
boost::signal0<void> Tooltips::toggled;

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

@ -11,9 +11,9 @@
#include <config.h>
#include "frontends/WorkAreaFactory.h"
#include "XWorkArea.h"
namespace WorkAreaFactory {
WorkArea * create(int x, int y, int w, int h)

21
src/frontends/xforms/XFormsMenubar.C
View File

@ -12,27 +12,28 @@
#include <config.h>
#include "XFormsMenubar.h"
#include "MenuBackend.h"
#include "XFormsView.h"
#include "debug.h"
#include "gettext.h"
#include "lyxfunc.h"
#include "MenuBackend.h"
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "support/tostr.h"
#include "support/LAssert.h"
#include "gettext.h"
#include "debug.h"
#include "lyx_forms.h"
//#include <boost/scoped_ptr.hpp>
#include <algorithm>
using namespace lyx::support;
using std::endl;
using std::vector;
using std::for_each;
using std::max;
using std::min;
using std::for_each;
using std::vector;
typedef vector<int>::size_type size_type;

27
src/frontends/xforms/XFormsToolbar.C
View File

@ -13,28 +13,25 @@
#include <config.h>
#include "XFormsToolbar.h"
#include "debug.h"
#include "XFormsView.h"
#include "lyxfunc.h"
#include "FuncStatus.h"
#include "buffer.h"
#include "funcrequest.h"
#include "gettext.h"
#include "Tooltips.h"
#include "xforms_helpers.h"
#include "XFormsView.h"
#include "buffer.h"
#include "debug.h"
#include "funcrequest.h"
#include "FuncStatus.h"
#include "gettext.h"
#include "lyxfunc.h"
#include "lyx_forms.h"
#include "combox.h"
#include "xforms_helpers.h"
#include "LyXAction.h"
#include "support/LAssert.h"
#include "support/filetools.h"
#include "support/lstrings.h"
using std::endl;
// some constants
const int standardspacing = 2; // the usual space between items
const int sepspace = 6; // extra space

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

@ -10,33 +10,29 @@
#include <config.h>
#include "XFormsView.h"
#include "lyx_forms.h"
#include "XMiniBuffer.h"
#include "XFormsMenubar.h"
#include "XFormsToolbar.h"
#include "debug.h"
#include "intl.h"
#include "lyxrc.h"
#include "support/filetools.h" // OnlyFilename()
#include "frontends/Timeout.h"
#include "frontends/Dialogs.h"
#include "MenuBackend.h"
#include "ToolbarBackend.h"
#include "lyxfunc.h"
#include "bufferview_funcs.h"
#include "XMiniBuffer.h"
#include "BufferView.h"
#include "debug.h"
#include "lyxfunc.h"
#include "MenuBackend.h"
#include "frontends/Dialogs.h"
#include "support/filetools.h" // OnlyFilename()
#include <boost/bind.hpp>
#include <boost/signals/connection.hpp>
using namespace lyx::support;
using std::abs;
using std::endl;
//extern void AutoSave(BufferView *);
extern void QuitLyX();

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

@ -10,16 +10,15 @@
#include <config.h>
#include "XLyXKeySym.h"
#include "debug.h"
#include <X11/Xlib.h>
#include <X11/keysym.h>
using std::endl;
XLyXKeySym::XLyXKeySym()
: LyXKeySym(), keysym_(NoSymbol)
{

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

@ -12,19 +12,18 @@
#include <config.h>
#include "XMiniBuffer.h"
#include "ControlCommandBuffer.h"
#include "freebrowser.h"
#include "xforms_helpers.h"
#include "gettext.h"
#include "controllers/ControlCommandBuffer.h"
#include "frontends/Timeout.h"
#include "support/lstrings.h"
#include "gettext.h"
#include <boost/bind.hpp>
#include <vector>
#ifndef CXX_GLOBAL_CSTD
using std::isprint;

19
src/frontends/xforms/XPainter.C
View File

@ -12,25 +12,18 @@
#include <config.h>
#include "XPainter.h"
#include "LString.h"
#include "debug.h"
#include "XWorkArea.h"
#include "xfont_metrics.h"
#include "lyxfont.h"
#include "ColorHandler.h"
#include "lyxrc.h"
#include "xfont_metrics.h"
#include "xformsImage.h"
#include "XWorkArea.h"
#include "encoding.h"
#include "language.h"
#include "lyxfont.h"
#include "xformsImage.h"
#include "support/LAssert.h"
#include "support/lstrings.h"
#include <boost/scoped_array.hpp>
#include <cmath>
using namespace lyx::support;
using std::endl;

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

@ -13,16 +13,16 @@
#include "checkedwidgets.h"
#include "xforms_helpers.h"
#include "lyxlength.h"
#include "lyxgluelength.h"
#include "support/LAssert.h"
#include "support/lstrings.h"
#include "LString.h"
#include "lyx_forms.h"
using namespace lyx::support;
void addCheckedLyXLength(BCView & bcview,
FL_OBJECT * input, FL_OBJECT * label)
{

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

@ -10,7 +10,6 @@
#include <config.h>
#include "fdesign_base.h"
#include "lyx_forms.h"

9
src/frontends/xforms/forms_gettext.C
View File

@ -9,16 +9,17 @@
*/
#include <config.h>
#include "forms_gettext.h"
#include "support/lstrings.h"
using namespace lyx::support;
namespace support = lyx::support;
// Extract shortcut from "<identifier>|<shortcut>" string
string const scex(string const & str)
{
return split(str, '|');
return support::split(str, '|');
}
@ -26,6 +27,6 @@ string const scex(string const & str)
string const idex(string const & str)
{
string identifier;
split(str, identifier, '|');
support::split(str, identifier, '|');
return identifier;
}

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

@ -10,11 +10,14 @@
#include <config.h>
#include "lyx_forms.h"
#include "support/lstrings.h"
#include "input_validators.h"
using namespace lyx::support;
#include "support/lstrings.h"
#include "lyx_forms.h"
namespace support = lyx::support;
#if defined(__cplusplus)
extern "C"
@ -26,7 +29,7 @@ int fl_int_filter(FL_OBJECT * ob,
{
if (c == 0 /* final test before handing contents to app */
|| strchr("0123456789+-", c)) {
if (isStrInt(fl_get_input(ob)))
if (support::isStrInt(fl_get_input(ob)))
return FL_VALID;
}
return FL_INVALID|FL_RINGBELL;
@ -50,7 +53,7 @@ int fl_float_filter(FL_OBJECT * ob,
{
if (c == 0 /* final test before handing contents to app */
|| strchr("0123456789.+-", c)) {
if (isStrDbl(fl_get_input(ob)))
if (support::isStrDbl(fl_get_input(ob)))
return FL_VALID;
}
return FL_INVALID|FL_RINGBELL;
@ -64,7 +67,7 @@ int fl_unsigned_float_filter(FL_OBJECT * ob,
{
if (c == 0 /* final test before handing contents to app */
|| strchr("0123456789.", c)) {
if (isStrDbl(fl_get_input(ob)))
if (support::isStrDbl(fl_get_input(ob)))
return FL_VALID;
}
return FL_INVALID|FL_RINGBELL;

1
src/frontends/xforms/input_validators.h
View File

@ -18,6 +18,7 @@
#ifndef INPUT_VALIDATORS_H
#define INPUT_VALIDATORS_H
#include "forms_fwd.h"
#if defined(__cplusplus)
extern "C"

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

@ -12,38 +12,35 @@
#include <config.h>
#include "lyx_gui.h"
#include "ColorHandler.h"
#include "xfont_loader.h"
#include "xforms_helpers.h"
#include "xformsImage.h"
#include "XFormsView.h"
#include "bufferlist.h"
#include "BufferView.h"
#include "debug.h"
#include "gettext.h"
#include "lyx_main.h"
#include "lyxfunc.h"
#include "lyxrc.h"
#include "lyxserver.h"
#include "graphics/LoaderQueue.h"
#include "support/lyxlib.h"
#include "support/os.h"
#include "support/filetools.h"
#include "support/path_defines.h"
#include "debug.h"
#include "gettext.h"
#include "lyx_main.h"
#include "lyxrc.h"
#include "lyxfont.h"
#include "graphics/LoaderQueue.h"
// FIXME: move this stuff out again
#include "bufferlist.h"
#include "buffer_funcs.h"
#include "lyxfunc.h"
#include "lyxserver.h"
#include "BufferView.h"
#include "XFormsView.h"
#include "lyx_forms.h"
#include "ColorHandler.h"
#include "xforms_helpers.h"
#include "xfont_loader.h"
#include "xformsImage.h"
#include <boost/bind.hpp>
#include "Lsstream.h"
#include <iomanip>
#include <fcntl.h>
#include <boost/bind.hpp>
using namespace lyx::support;
@ -51,13 +48,14 @@ using namespace lyx::support;
using std::exit;
#endif
using std::vector;
using std::hex;
using std::dec;
using std::endl;
using std::hex;
using std::setbase;
using std::setfill;
using std::setw;
using std::vector;
extern BufferList bufferlist;

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

@ -9,19 +9,17 @@
*/
#include <config.h>
#include <cmath> // fabs()
#include "xfont_loader.h"
#include "FontInfo.h"
#include "gettext.h"
#include "debug.h"
#include "lyxrc.h" // lyxrc.font_*
#include "BufferView.h"
#include "frontends/LyXView.h"
#include "frontends/lyx_gui.h"
#include "support/systemcall.h"
#include "support/filetools.h"
#include "support/systemcall.h"
#include "lyx_forms.h"
@ -29,6 +27,7 @@ using namespace lyx::support;
using std::endl;
// The global fontloader
xfont_loader fontloader;

9
src/frontends/xforms/xfont_metrics.C
View File

@ -11,18 +11,21 @@
#include <config.h>
#include "support/lstrings.h"
#include "frontends/lyx_gui.h"
#include "xfont_metrics.h"
#include "xfont_loader.h"
#include "lyxrc.h"
#include "encoding.h"
#include "language.h"
#include "frontends/lyx_gui.h"
#include "support/lstrings.h"
#include <boost/scoped_array.hpp>
using namespace lyx::support;
namespace {
inline

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

@ -12,17 +12,15 @@
#include "xforms_helpers.h"
#include "lyxlex.h"
#include "gettext.h"
#include "lyxlength.h"
#include "lyxgluelength.h"
#include "Lsstream.h"
#include "lyxlex.h"
#include "support/LAssert.h"
#include "support/FileInfo.h"
#include "support/filetools.h"
#include "support/tostr.h"
#include "support/LAssert.h"
#include "support/lstrings.h" // frontStrip, strip
#include "support/tostr.h"
#include "lyx_forms.h"
#include "combox.h"
@ -31,10 +29,10 @@
using namespace lyx::support;
using std::make_pair;
using std::ofstream;
using std::pair;
using std::vector;
using std::make_pair;
bool isActive(FL_OBJECT * ob)

25
src/frontends/xforms/xscreen.C
View File

@ -11,29 +11,18 @@
#include <config.h>
#include <algorithm>
#include <X11/Xlib.h>
#include "frontends/screen.h"
#include "frontends/font_metrics.h"
#include "XWorkArea.h"
#include "xscreen.h"
#include "lyxtext.h"
#include "lyxrow.h"
#include "Painter.h"
#include "WorkArea.h"
#include "buffer.h"
#include "BufferView.h"
#include "insets/insettext.h"
#include "ColorHandler.h"
#include "language.h"
#include "XWorkArea.h"
#include "debug.h"
using std::endl;
using std::max;
using std::min;
namespace {
GC createGC()
@ -69,6 +58,12 @@ XScreen::~XScreen()
}
WorkArea & XScreen::workarea() const
{
return owner_;
}
void XScreen::setCursorColor()
{
if (!lyxColorHandler.get())

4
src/frontends/xforms/xscreen.h
View File

@ -17,8 +17,10 @@
#include "screen.h"
#include <X11/Xlib.h> // for Pixmap, GC
class WorkArea;
class XWorkArea;
/** The class XScreen is used for the main Textbody.
Concretely, the screen is held in a pixmap. This pixmap is kept up to
date and used to optimize drawing on the screen.
@ -37,7 +39,7 @@ public:
protected:
/// get the work area
virtual WorkArea & workarea() const { return owner_; }
virtual WorkArea & workarea() const;
/// Copies specified area of pixmap to screen
virtual void expose(int x, int y, int w, int h);