Selecting a bullet shape in the popup doesn't update the text field.
A fix is attached.
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.311
diff -u -p -r1.311 ChangeLog
--- ChangeLog 2000/05/05 14:45:58 1.311
+++ ChangeLog 2000/05/07 15:22:30
@@ -1,3 +1,12 @@
+2000-05-07 Dekel Tsur <[EMAIL PROTECTED]>
+
+ * src/Bullet.h (c_str): Fixed a bug that caused calling to
+ "getText() const" instead of "getText()".
+ Removed the "getText() const" method.
+
+ * src/lyx_gui.C (init): Try to use helvetica (or fixed) fonts for
+ the menus/popup, if requested fonts are unavailable.
+
2000-05-05 Juergen Vigna <[EMAIL PROTECTED]>
* src/insets/insettabular.C (UpdateLocal): resetCursorPos when
Index: src/Bullet.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Bullet.h,v
retrieving revision 1.11
diff -u -p -r1.11 Bullet.h
--- src/Bullet.h 2000/05/04 10:56:58 1.11
+++ src/Bullet.h 2000/05/07 15:22:31
@@ -47,11 +47,9 @@ public:
///
int getSize() const;
///
- string getText() const;
- ///
string getText();
///
- char const * c_str() const;
+ char const * c_str();
///
Bullet & operator = (Bullet const &);
///
@@ -230,13 +228,6 @@ int Bullet::getSize() const
inline
-string Bullet::getText() const
-{
- return text;
-}
-
-
-inline
Bullet & Bullet::operator=(Bullet const & b)
{
#ifdef ENABLE_ASSERTIONS
@@ -255,9 +246,9 @@ Bullet & Bullet::operator=(Bullet const
inline
-char const * Bullet::c_str() const
+char const * Bullet::c_str()
{
- return this->getText().c_str();
+ return getText().c_str();
}
Index: src/bufferparams.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/bufferparams.h,v
retrieving revision 1.11
diff -u -p -r1.11 bufferparams.h
--- src/bufferparams.h 2000/04/11 22:55:29 1.11
+++ src/bufferparams.h 2000/05/07 15:22:31
@@ -197,7 +197,7 @@ public:
///
block<Bullet, 4> temp_bullets;
///
- block<Bullet, 4> user_defined_bullets;
+ mutable block<Bullet, 4> user_defined_bullets;
///
void readPreamble(LyXLex &);
///
Index: src/lyx_gui.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyx_gui.C,v
retrieving revision 1.34
diff -u -p -r1.34 lyx_gui.C
--- src/lyx_gui.C 2000/04/28 11:18:04 1.34
+++ src/lyx_gui.C 2000/05/07 15:22:33
@@ -247,13 +247,27 @@ void LyXGUI::init()
+ "-*-*-*-?-*-*-*-*-"
+ lyxrc.font_norm_menu;
- if (fl_set_font_name(FL_BOLD_STYLE, menufontname.c_str()) < 0)
+ int bold = fl_set_font_name(FL_BOLD_STYLE, menufontname.c_str());
+ int normal = fl_set_font_name(FL_NORMAL_STYLE, popupfontname.c_str());
+ if (bold < 0)
lyxerr << "Could not set menu font to "
<< menufontname << endl;
- if (fl_set_font_name(FL_NORMAL_STYLE, popupfontname.c_str()) < 0)
+ if (normal < 0)
lyxerr << "Could not set popup font to "
<< popupfontname << endl;
+
+ if (bold < 0 && normal < 0) {
+ lyxerr << "Using 'helvetica' font for menus" << endl;
+ bold = fl_set_font_name(FL_BOLD_STYLE,
+
+"-*-helvetica-bold-r-*-*-*-?-*-*-*-*-iso8859-1");
+ normal = fl_set_font_name(FL_NORMAL_STYLE,
+
+"-*-helvetica-medium-r-*-*-*-?-*-*-*-*-iso8859-1");
+ if (bold < 0 && normal < 0) {
+ lyxerr << "Could not find helvetica font. Using 'fixed'." <<
+endl;
+ normal = fl_set_font_name(FL_NORMAL_STYLE, "fixed");
+ }
+ }
// put here (after fl_initialize) to avoid segfault. Cannot be done
// in setDefaults() (Matthias 140496)
