John's pref.diff minus the bold inner tabfolder in Preferences; ShowMessage() to...

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

diff --git a/src/ChangeLog b/src/ChangeLog
index d85e95513044c79ff4ce2805cc0a081a05cb19a0..9ee4bca570f215f2ec05ddfab17bc5f17341032b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-17  Allan Rae  <rae@lyx.org>
+
+       * lyx_cb.C (ShowMessage): make sure we have a user and an owner.
+
 2002-01-17  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * CutAndPaste.C (pasteSelection): when pasting multiple paragraph,

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index cce98b9214372eb85be191f7f6848c1eded6d387..1856fd073a83b815be1194cb11fdbcece7b91f35 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-17  John Levon  <moz@compsoc.man.ac.uk>
+
+       * forms/form_preferences.fd: change "Use Scalable Fonts"
+         to "Rescale bitmap fonts"
+ 
 2002-01-16  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormMathsPanel.C:

diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C
index cafb17a8f77063dd5b0fe12bd3627817bbe6d98b..705549e0fe229405a166847e58cb88ef0ab09119 100644 (file)
--- a/src/frontends/xforms/form_preferences.C
+++ b/src/frontends/xforms/form_preferences.C
@@ -116,7 +116,7 @@ FD_form_screen_fonts * FormPreferences::build_screen_fonts()
   fdui->input_screen_encoding = obj = fl_add_input(FL_NORMAL_INPUT, 145, 130, 140, 30, _("Encoding"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
-  fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 34, 41, _("Use scalable fonts"));
+  fdui->check_scalable = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 20, 190, 34, 41, _("Rescale bitmap fonts"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_RIGHT);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);

diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd
index 9b0cee9dd9a73c97e6942e5584b0716e6c2866d0..63f9041f35280c477ff5c04829001f5084e994f0 100644 (file)
--- a/src/frontends/xforms/forms/form_preferences.fd
+++ b/src/frontends/xforms/forms/form_preferences.fd
@@ -305,7 +305,7 @@ alignment: FL_ALIGN_RIGHT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Use scalable fonts
+label: Rescale bitmap fonts
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index accc20cf9a0bad0e12bff2997cc9d5127a64501f..4dba209bcbc6f595b01c62b569ead25dcb198027 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -121,9 +121,10 @@ void ShowMessage(Buffer const * buf,
                 string const & msg2,
                 string const & msg3)
 {
-       if (lyxrc.use_gui) {
-               string const str = msg1 + ' ' + msg2 + ' ' + msg3;
-               buf->getUser()->owner()->message(str);
+       if (lyxrc.use_gui
+           && buf && buf->getUser() && buf->getUser()->owner()) {
+                       string const str = msg1 + ' ' + msg2 + ' ' + msg3;
+                       buf->getUser()->owner()->message(str);
        } else
                lyxerr << msg1 << msg2 << msg3 << endl;
 }