From 4ecb8d1f56545d234bac61ebbccd494cab859752 Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 14 Aug 2002 21:05:10 +0000 Subject: [PATCH] Fix crash in Document dialog + small sundries. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4980 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/controllers/ChangeLog | 4 ++++ src/frontends/controllers/GUI.h | 2 +- src/frontends/xforms/ChangeLog | 6 ++++++ src/frontends/xforms/forms/form_document.fd | 10 ++++------ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog index d215f24039..08e090a6e3 100644 --- a/src/frontends/controllers/ChangeLog +++ b/src/frontends/controllers/ChangeLog @@ -1,3 +1,7 @@ +2002-08-14 Angus Leeming + + * GUI.h: public derivation from boost::noncopyable. + 2002-08-14 Angus Leeming * GUI.h: class GUI deries from boost::noncopyable diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h index 74e7c26fce..03f1a902e1 100644 --- a/src/frontends/controllers/GUI.h +++ b/src/frontends/controllers/GUI.h @@ -18,7 +18,7 @@ */ template -class GUI : boost::noncopyable { +class GUI : public boost::noncopyable { public: /// GUI(LyXView & lv, Dialogs & d); diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 03d7023525..5045b8f51d 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ +2002-08-14 Angus Leeming + + * FormBaseDeprecated.h: public derivation from boost::noncopyable. + + * forms/form_document.fd: remove declaration of file 'psnfss2.xpm' + 2002-08-14 Angus Leeming * FormBaseDeprecated.h: no longer derives from DialogBase, but instead diff --git a/src/frontends/xforms/forms/form_document.fd b/src/frontends/xforms/forms/form_document.fd index e2b6541177..8a2775754a 100644 --- a/src/frontends/xforms/forms/form_document.fd +++ b/src/frontends/xforms/forms/form_document.fd @@ -1521,10 +1521,10 @@ callback: argument: -------------------- -class: FL_PIXMAPBUTTON +class: FL_BUTTON type: NORMAL_BUTTON box: 135 105 260 180 -boxtype: FL_NO_BOX +boxtype: FL_UP_BOX colors: FL_COL1 FL_YELLOW alignment: FL_ALIGN_BOTTOM style: FL_NORMAL_STYLE @@ -1535,10 +1535,8 @@ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity name: bmtable_bullet_panel -callback: -argument: - file: psnfss2.xpm - fullpath: 1 +callback: C_FormBaseDeprecatedInputCB +argument: 0 -------------------- class: FL_FRAME