anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

minor tweaks to make qt2 compile (Edwin)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1791 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2001-03-19 13:28:31 +00:00
parent 75c9443ecd
commit 32fed6ce08
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,10 @@
2001-03-19 Edwin Leuven <leuven@fee.uva.nl>
* qt2 compiles again:
* Makefile.am: added missing xform dialogs
* FormParagraph.C: only extra setting if wanted
* FormParagraph.h: add namespace to connection
2001-03-16 Kalle Dalheimer <kalle@klaralvdalens-datakonsult.se>
* FormParagraph.C (apply): Only call SetParagraphExtraOpt() when

3
src/frontends/qt2/FormParagraph.C
View File

@ -148,6 +148,7 @@ void FormParagraph::apply()
spaceabove, spacebelow, dialog_->getAlign(),
dialog_->getLabelWidth(), dialog_->getNoIndent());
#ifndef NO_PEXTRA
// extra stuff
string width("");
@ -167,7 +168,7 @@ void FormParagraph::apply()
dialog_->getExtraAlign(),
dialog_->getHfillBetween(),
dialog_->getStartNewMinipage());
#endif
lv_->view()->update(lv_->view()->text,
BufferView::SELECT |
BufferView::FITCUR |

2
src/frontends/qt2/FormParagraph.h
View File

@ -50,7 +50,7 @@ private:
Dialogs * d_;
/// Hide connection.
Connection h_;
SigC::Connection h_;
/// readonly file or not
bool readonly;

30
src/frontends/qt2/Makefile.am
View File

@ -30,34 +30,52 @@ LYXDATADIRS = dlg
DISTCLEANFILES = $(BUILTSOURCES) *.orig *.rej *~ *.bak core
libqt2_la_OBJADD = \
../xforms/ButtonController.lo \
../controllers/ButtonController.lo \
../xforms/combox.lo \
../xforms/Color.lo \
../xforms/FormBase.lo \
../xforms/FormBaseDeprecated.lo \
../xforms/FormBibitem.lo \
../xforms/FormBibtex.lo \
../xforms/FormBrowser.lo \
../xforms/FormCopyright.lo \
../xforms/FormCredits.lo \
../xforms/FormDocument.lo \
../xforms/FormError.lo \
../xforms/FormExternal.lo \
../xforms/FormGraphics.lo \
../xforms/FormInclude.lo \
../xforms/FormIndex.lo \
../xforms/FormInset.lo \
../xforms/FormLog.lo \
../xforms/FormMinipage.lo \
../xforms/FormMaths.lo \
../xforms/FormPreamble.lo \
../xforms/FormPreferences.lo \
../xforms/FormRef.lo \
../xforms/FormTabular.lo \
../xforms/FormToc.lo \
../xforms/FormUrl.lo \
../xforms/FormVCLog.lo \
../xforms/MathsSymbols.lo \
../xforms/Menubar_pimpl.lo \
../xforms/RadioButtonGroup.lo \
../xforms/Toolbar_pimpl.lo \
../xforms/Timeout_pimpl.lo \
../xforms/form_citation.lo \
../xforms/Toolbar_pimpl.lo \
../xforms/bmtable.lo \
../xforms/form_bibitem.lo \
../xforms/form_bibtex.lo \
../xforms/form_browser.lo \
../xforms/form_credits.lo \
../xforms/form_copyright.lo \
../xforms/form_document.lo \
../xforms/form_error.lo \
../xforms/form_external.lo \
../xforms/form_index.lo \
../xforms/form_graphics.lo \
../xforms/form_include.lo \
../xforms/form_index.lo \
../xforms/form_maths.lo \
../xforms/form_minipage.lo \
../xforms/form_preamble.lo \
../xforms/form_preferences.lo \
../xforms/form_ref.lo \
@ -65,8 +83,8 @@ libqt2_la_OBJADD = \
../xforms/form_toc.lo \
../xforms/form_url.lo \
../xforms/input_validators.lo \
../xforms/xforms_helpers.lo \
../xforms/xformsBC.lo
../xforms/xformsBC.lo \
../xforms/xforms_helpers.lo
LIBS=
LDFLAGS= $(libqt2_la_OBJADD)