anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compiles with gcc

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4352 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2002-06-10 16:49:41 +00:00
parent dbfd1f24ac
commit c47cfe391b
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/controllers/ChangeLog
View File

@ -1,3 +1,7 @@
2002-06-10 Lars Gullik Bjønnes <larsbj@birdstep.com>
* ControlDialog.tmpl: remove the Base:: prefix
2002-06-07 Angus Leeming <leeming@lyx.org> 2002-06-07 Angus Leeming <leeming@lyx.org>
Fixes needed to compile with Compaq cxx 6.5. Fixes needed to compile with Compaq cxx 6.5.

26
src/frontends/controllers/ControlDialog.tmpl
View File

@ -27,49 +27,49 @@ ControlDialog<Base>::ControlDialog(LyXView & lv, Dialogs & d)
template <class Base> template <class Base>
void ControlDialog<Base>::show() void ControlDialog<Base>::show()
{ {
if (Base::isBufferDependent() && !Base::lv_.view()->available()) if (isBufferDependent() && !lv_.view()->available())
return; return;
Base::connect(); connect();
setParams(); setParams();
if (Base::emergency_exit_) { if (emergency_exit_) {
hide(); hide();
return; return;
} }
if (!dialog_built_) { if (!dialog_built_) {
Base::view().build(); view().build();
dialog_built_ = true; dialog_built_ = true;
} }
Base::bc().readOnly(Base::isReadonly()); bc().readOnly(isReadonly());
Base::view().show(); view().show();
} }
template <class Base> template <class Base>
void ControlDialog<Base>::update() void ControlDialog<Base>::update()
{ {
if (Base::isBufferDependent() && !Base::lv_.view()->available()) if (isBufferDependent() && !lv_.view()->available())
return; return;
setParams(); setParams();
if (Base::emergency_exit_) { if (emergency_exit_) {
hide(); hide();
return; return;
} }
Base::bc().readOnly(Base::isReadonly()); bc().readOnly(isReadonly());
Base::view().update(); view().update();
} }
template <class Base> template <class Base>
void ControlDialog<Base>::hide() void ControlDialog<Base>::hide()
{ {
Base::emergency_exit_ = false; emergency_exit_ = false;
clearParams(); clearParams();
Base::disconnect(); disconnect();
Base::view().hide(); view().hide();
} }