Fix crash in Document dialog + small sundries.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4980 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index d215f240390d291e3b8d6e4237cfd17c5612064a..08e090a6e337363586f28e2e9a76a145e6759acc 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-14  Angus Leeming  <leeming@lyx.org>
+
+       * GUI.h: public derivation from boost::noncopyable.
+
 2002-08-14  Angus Leeming  <leeming@lyx.org>
 
        * GUI.h: class GUI deries from boost::noncopyable

diff --git a/src/frontends/controllers/GUI.h b/src/frontends/controllers/GUI.h
index 74e7c26fce0e1f2aace4aab371490a1a7239bea6..03f1a902e12acb7947975085a81e0efd9152156e 100644 (file)
--- a/src/frontends/controllers/GUI.h
+++ b/src/frontends/controllers/GUI.h
@@ -18,7 +18,7 @@
  */
 template <typename Controller, typename GUIview,
          typename Policy,     typename GUIbc>
-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 03d702352547b8763c323effaadd9f111281c7b1..5045b8f51d68e78787babcb1e0a5b78e7b3dd7f8 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-14  Angus Leeming  <leeming@lyx.org>
+
+       * FormBaseDeprecated.h: public derivation from boost::noncopyable.
+
+       * forms/form_document.fd: remove declaration of file 'psnfss2.xpm'
+
 2002-08-14  Angus Leeming  <leeming@lyx.org>
 
        * 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 e2b65411776f688cdc9d57e335b27b227468512e..8a2775754a3c41081bbd2def03f95636c1a77659 100644 (file)
--- 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