mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-06 00:10:59 +00:00
some configure output changes, fix a new bug
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7798 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
c319aee7c2
commit
08265598c5
@ -1,3 +1,8 @@
|
|||||||
|
2003-09-21 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* configure.ac (FORNTENDS): use tabs to align message, make gtk
|
||||||
|
not delete info about other frontends
|
||||||
|
|
||||||
2003-09-16 Lars Gullik Bjønnes <larsbj@gullik.net>
|
2003-09-16 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
* configure.ac: remove LYX_CXX_STL_STRING and
|
* configure.ac: remove LYX_CXX_STL_STRING and
|
||||||
|
@ -37,7 +37,6 @@ AC_DEFUN(PKG_CHECK_MODULES, [
|
|||||||
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
|
||||||
ifelse([$4], ,echo $$1_PKG_ERRORS,)
|
ifelse([$4], ,echo $$1_PKG_ERRORS,)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST($1_CFLAGS)
|
AC_SUBST($1_CFLAGS)
|
||||||
AC_SUBST($1_LIBS)
|
AC_SUBST($1_LIBS)
|
||||||
else
|
else
|
||||||
|
12
configure.ac
12
configure.ac
@ -184,8 +184,8 @@ for frontend in $FRONTENDS ; do
|
|||||||
RPM_FRONTEND_DEPS='libforms >= 1.0'
|
RPM_FRONTEND_DEPS='libforms >= 1.0'
|
||||||
FRONTEND_INFO="${FRONTEND_INFO}\
|
FRONTEND_INFO="${FRONTEND_INFO}\
|
||||||
XForms Frontend:\n\
|
XForms Frontend:\n\
|
||||||
libXpm version: ${XPM_VERSION}\n\
|
libXpm version:\t\t${XPM_VERSION}\n\
|
||||||
libforms version: ${XFORMS_VERSION}\n"
|
libforms version:\t\t${XFORMS_VERSION}\n"
|
||||||
;;
|
;;
|
||||||
dnl gnome)
|
dnl gnome)
|
||||||
dnl XFORMS_DO_IT_ALL
|
dnl XFORMS_DO_IT_ALL
|
||||||
@ -208,8 +208,10 @@ for frontend in $FRONTENDS ; do
|
|||||||
RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
|
RPM_FRONTEND_DEPS='gtkmm >= 2.2.0'
|
||||||
GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
|
GTKMM_VERSION=`pkg-config --modversion gtkmm-2.0`
|
||||||
LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.0`
|
LIBGLADEMM_VERSION=`pkg-config --modversion libglademm-2.0`
|
||||||
FRONTEND_INFO=" libgtkmm version: ${GTKMM_VERSION}\n\
|
FRONTEND_INFO="${FRONTEND_INFO}\
|
||||||
libglademm version: ${LIBGLADEMM_VERSION}\n"
|
GTK Frontend:\n\
|
||||||
|
libgtkmm version:\t\t${GTKMM_VERSION}\n\
|
||||||
|
libglademm version:\t\t${LIBGLADEMM_VERSION}\n"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
qt)
|
qt)
|
||||||
@ -220,7 +222,7 @@ for frontend in $FRONTENDS ; do
|
|||||||
RPM_FRONTEND_DEPS='qt >= 2.2.1'
|
RPM_FRONTEND_DEPS='qt >= 2.2.1'
|
||||||
FRONTEND_INFO="${FRONTEND_INFO}\
|
FRONTEND_INFO="${FRONTEND_INFO}\
|
||||||
Qt Frontend:\n\
|
Qt Frontend:\n\
|
||||||
Qt version: ${QT_VERSION}\n"
|
Qt version:\t\t${QT_VERSION}\n"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
LYX_ERROR(Unknown frontend '$frontend');;
|
LYX_ERROR(Unknown frontend '$frontend');;
|
||||||
|
@ -185,7 +185,6 @@ src/mathed/ref_inset.C
|
|||||||
src/paragraph.C
|
src/paragraph.C
|
||||||
src/paragraph_funcs.C
|
src/paragraph_funcs.C
|
||||||
src/rowpainter.C
|
src/rowpainter.C
|
||||||
src/support/path_defines.C
|
|
||||||
src/text.C
|
src/text.C
|
||||||
src/text2.C
|
src/text2.C
|
||||||
src/text3.C
|
src/text3.C
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2003-09-21 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* factory.C (createInset): fix new bug
|
||||||
|
|
||||||
2003-09-19 Angus Leeming <leeming@lyx.org>
|
2003-09-19 Angus Leeming <leeming@lyx.org>
|
||||||
|
|
||||||
* CutAndPaste.C (pasteSelection): remove fudge used to set the
|
* CutAndPaste.C (pasteSelection): remove fudge used to set the
|
||||||
|
@ -67,7 +67,7 @@ InsetOld * createInset(FuncRequest const & cmd)
|
|||||||
|
|
||||||
switch (cmd.action) {
|
switch (cmd.action) {
|
||||||
case LFUN_HFILL:
|
case LFUN_HFILL:
|
||||||
return new InsetHFill();
|
return new InsetHFill;
|
||||||
|
|
||||||
case LFUN_INSET_MINIPAGE:
|
case LFUN_INSET_MINIPAGE:
|
||||||
return new InsetMinipage(params);
|
return new InsetMinipage(params);
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2003-09-21 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* ControlDocument.C (setParams): fix new bug
|
||||||
|
|
||||||
2003-09-19 Angus Leeming <leeming@lyx.org>
|
2003-09-19 Angus Leeming <leeming@lyx.org>
|
||||||
|
|
||||||
* ControlInclude.[Ch]: Store and access the params as an
|
* ControlInclude.[Ch]: Store and access the params as an
|
||||||
|
@ -93,7 +93,7 @@ void ControlDocument::apply()
|
|||||||
void ControlDocument::setParams()
|
void ControlDocument::setParams()
|
||||||
{
|
{
|
||||||
if (!bp_.get())
|
if (!bp_.get())
|
||||||
bp_.reset(new BufferParams());
|
bp_.reset(new BufferParams);
|
||||||
|
|
||||||
/// Set the buffer parameters
|
/// Set the buffer parameters
|
||||||
*bp_ = buffer()->params();
|
*bp_ = buffer()->params();
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2003-09-21 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* lyx_gui.C (parse_init): fix new bug
|
||||||
|
|
||||||
2003-09-09 Lars Gullik Bjønnes <larsbj@lyx.org>
|
2003-09-09 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||||
|
|
||||||
* GView.C: change Assert to BOOST_ASSERT
|
* GView.C: change Assert to BOOST_ASSERT
|
||||||
|
@ -167,7 +167,7 @@ void lyx_gui::parse_init(int & argc, char * argv[])
|
|||||||
|
|
||||||
XSetErrorHandler(LyX_XErrHandler);
|
XSetErrorHandler(LyX_XErrHandler);
|
||||||
|
|
||||||
lyxColorHandler.reset(new LyXColorHandler());
|
lyxColorHandler.reset(new LyXColorHandler);
|
||||||
|
|
||||||
using namespace lyx::graphics;
|
using namespace lyx::graphics;
|
||||||
|
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
2003-09-21 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* LyXKeySymFactory.C (create): fix new bug
|
||||||
|
|
||||||
|
* GView.C (GView): fix new bug
|
||||||
|
|
||||||
|
* GToolbar.C (add): fix new bug
|
||||||
|
|
||||||
2003-09-18 Angus Leeming <leeming@lyx.org>
|
2003-09-18 Angus Leeming <leeming@lyx.org>
|
||||||
|
|
||||||
* GPainter.C:
|
* GPainter.C:
|
||||||
|
@ -77,7 +77,7 @@ GToolbar::~GToolbar()
|
|||||||
|
|
||||||
void GToolbar::add(ToolbarBackend::Toolbar const & tb)
|
void GToolbar::add(ToolbarBackend::Toolbar const & tb)
|
||||||
{
|
{
|
||||||
Gtk::Toolbar * toolbar = manage(new Gtk::Toolbar());
|
Gtk::Toolbar * toolbar = manage(new Gtk::Toolbar);
|
||||||
ToolbarBackend::item_iterator it = tb.items.begin();
|
ToolbarBackend::item_iterator it = tb.items.begin();
|
||||||
ToolbarBackend::item_iterator end = tb.items.end();
|
ToolbarBackend::item_iterator end = tb.items.end();
|
||||||
for (; it != end; ++it)
|
for (; it != end; ++it)
|
||||||
|
@ -31,7 +31,7 @@ GView * GView::view_ = 0;
|
|||||||
GView::GView()
|
GView::GView()
|
||||||
{
|
{
|
||||||
view_ = this;
|
view_ = this;
|
||||||
vbox_.reset(new Gtk::VBox());
|
vbox_.reset(new Gtk::VBox);
|
||||||
add(*vbox_.get());
|
add(*vbox_.get());
|
||||||
menubar_.reset(new GMenubar(this, menubackend));
|
menubar_.reset(new GMenubar(this, menubackend));
|
||||||
toolbar_.reset(new GToolbar(this, 0, 0));
|
toolbar_.reset(new GToolbar(this, 0, 0));
|
||||||
|
@ -20,7 +20,7 @@ namespace LyXKeySymFactory {
|
|||||||
|
|
||||||
LyXKeySym * create()
|
LyXKeySym * create()
|
||||||
{
|
{
|
||||||
return new GLyXKeySym();
|
return new GLyXKeySym;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -262,4 +262,3 @@ void buttonText(string const & str, LyXFont const & font,
|
|||||||
|
|
||||||
|
|
||||||
} // namespace font_metrics
|
} // namespace font_metrics
|
||||||
|
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2003-09-21 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* QContentPane.C (keyPressEvent): fix new bug
|
||||||
|
|
||||||
|
* LyXKeySymFactory.C (create): fix new bug
|
||||||
|
|
||||||
2003-09-19 Angus Leeming <leeming@lyx.org>
|
2003-09-19 Angus Leeming <leeming@lyx.org>
|
||||||
|
|
||||||
* QInclude.C: changes dues to the changed storage in InsetInclude,
|
* QInclude.C: changes dues to the changed storage in InsetInclude,
|
||||||
|
@ -18,7 +18,7 @@ namespace LyXKeySymFactory {
|
|||||||
|
|
||||||
LyXKeySym * create()
|
LyXKeySym * create()
|
||||||
{
|
{
|
||||||
return new QLyXKeySym();
|
return new QLyXKeySym;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace LyXKeySymFactory
|
} // namespace LyXKeySymFactory
|
||||||
|
@ -138,7 +138,7 @@ void QContentPane::keyPressEvent(QKeyEvent * e)
|
|||||||
{
|
{
|
||||||
typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
|
typedef boost::shared_ptr<LyXKeySym> LyXKeySymPtr;
|
||||||
|
|
||||||
QLyXKeySym * sym = new QLyXKeySym();
|
QLyXKeySym * sym = new QLyXKeySym;
|
||||||
sym->set(e);
|
sym->set(e);
|
||||||
wa_->workAreaKeyPress(LyXKeySymPtr(sym), q_key_state(e->state()));
|
wa_->workAreaKeyPress(LyXKeySymPtr(sym), q_key_state(e->state()));
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,17 @@
|
|||||||
|
2003-09-21 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* lyx_gui.C (parse_init): fix new bug
|
||||||
|
|
||||||
|
* XFormsToolbar.C (XFormsToolbar): fix new bug
|
||||||
|
|
||||||
|
* LyXKeySymFactory.C (create): fix new bug
|
||||||
|
|
||||||
|
* FormDialogView.C (FormDialogView): fix new bug
|
||||||
|
|
||||||
|
* FormBase.C (FormBase): fix new bug
|
||||||
|
|
||||||
|
* FileDialog.C (FileDialog): fix new bug
|
||||||
|
|
||||||
2003-09-19 Angus Leeming <leeming@lyx.org>
|
2003-09-19 Angus Leeming <leeming@lyx.org>
|
||||||
|
|
||||||
* FormInclude.C: changes dues to the changed storage in InsetInclude,
|
* FormInclude.C: changes dues to the changed storage in InsetInclude,
|
||||||
|
@ -26,7 +26,7 @@ using std::endl;
|
|||||||
FileDialog::FileDialog(string const &t, kb_action s, Button b1, Button b2)
|
FileDialog::FileDialog(string const &t, kb_action s, Button b1, Button b2)
|
||||||
: private_(0), title_(t), success_(s)
|
: private_(0), title_(t), success_(s)
|
||||||
{
|
{
|
||||||
private_ = new FileDialog::Private();
|
private_ = new FileDialog::Private;
|
||||||
|
|
||||||
private_->SetButton(0, b1.first, b1.second);
|
private_->SetButton(0, b1.first, b1.second);
|
||||||
private_->SetButton(1, b2.first, b2.second);
|
private_->SetButton(1, b2.first, b2.second);
|
||||||
|
@ -52,7 +52,7 @@ FormBase::FormBase(string const & t, bool allowResize)
|
|||||||
warning_posted_(false), message_widget_(0),
|
warning_posted_(false), message_widget_(0),
|
||||||
minw_(0), minh_(0), allow_resize_(allowResize),
|
minw_(0), minh_(0), allow_resize_(allowResize),
|
||||||
icon_pixmap_(0), icon_mask_(0),
|
icon_pixmap_(0), icon_mask_(0),
|
||||||
tooltips_(new Tooltips())
|
tooltips_(new Tooltips)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
|
@ -54,7 +54,7 @@ FormDialogView::FormDialogView(Dialog & parent,
|
|||||||
warning_posted_(false), message_widget_(0),
|
warning_posted_(false), message_widget_(0),
|
||||||
minw_(0), minh_(0), allow_resize_(allowResize),
|
minw_(0), minh_(0), allow_resize_(allowResize),
|
||||||
icon_pixmap_(0), icon_mask_(0),
|
icon_pixmap_(0), icon_mask_(0),
|
||||||
tooltips_(new Tooltips())
|
tooltips_(new Tooltips)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ namespace LyXKeySymFactory {
|
|||||||
|
|
||||||
LyXKeySym * create()
|
LyXKeySym * create()
|
||||||
{
|
{
|
||||||
return new XLyXKeySym();
|
return new XLyXKeySym;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,7 @@ XFormsToolbar::toolbarItem::operator=(toolbarItem const & ti)
|
|||||||
XFormsToolbar::XFormsToolbar(LyXView * o, int x, int y)
|
XFormsToolbar::XFormsToolbar(LyXView * o, int x, int y)
|
||||||
: owner_(static_cast<XFormsView *>(o)), combox_(0), xpos(x), ypos(y)
|
: owner_(static_cast<XFormsView *>(o)), combox_(0), xpos(x), ypos(y)
|
||||||
{
|
{
|
||||||
tooltip_ = new Tooltips();
|
tooltip_ = new Tooltips;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -174,7 +174,7 @@ void parse_init(int & argc, char * argv[])
|
|||||||
|
|
||||||
XSetErrorHandler(LyX_XErrHandler);
|
XSetErrorHandler(LyX_XErrHandler);
|
||||||
|
|
||||||
lyxColorHandler.reset(new LyXColorHandler());
|
lyxColorHandler.reset(new LyXColorHandler);
|
||||||
|
|
||||||
using namespace lyx::graphics;
|
using namespace lyx::graphics;
|
||||||
|
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
2003-09-21 Lars Gullik Bjønnes <larsbj@gullik.net>
|
||||||
|
|
||||||
|
* Previews.C (Previews): fix new bug
|
||||||
|
|
||||||
|
* GraphicsCache.C (Cache): fix new bug
|
||||||
|
|
||||||
2003-09-19 Angus Leeming <leeming@lyx.org>
|
2003-09-19 Angus Leeming <leeming@lyx.org>
|
||||||
|
|
||||||
* PreviewedInset.[Ch] (generatePreview, previewWanted): now passed
|
* PreviewedInset.[Ch] (generatePreview, previewWanted): now passed
|
||||||
|
@ -45,7 +45,7 @@ Cache & Cache::get()
|
|||||||
|
|
||||||
|
|
||||||
Cache::Cache()
|
Cache::Cache()
|
||||||
: pimpl_(new Impl())
|
: pimpl_(new Impl)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ struct Previews::Impl {
|
|||||||
|
|
||||||
|
|
||||||
Previews::Previews()
|
Previews::Previews()
|
||||||
: pimpl_(new Impl())
|
: pimpl_(new Impl)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user