anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hopefully fix the problem with stateText() in lyxfont.C

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@727 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2000-05-09 16:18:31 +00:00
parent c1ebee5ae1
commit e059c633b0
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2000-05-09 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
* src/lyx_main.C (LyX): adapted the code for default bindings.
* src/lyxrc.C (defaultKeyBinfings): moved to kbmap.C
* src/kbmap.C (defaultBindings): new method. Performs the default
bindings for basic functionality.
* src/lyxfont.C (stateText): use a saner method to determine
whether the font is "default". Seems to fix the crash with DEC
cxx.
* src/Bullet.[Ch] (Bullet): remove const on parameters.
2000-05-08 Juergen Vigna <jug@sad.it>
* src/insets/insettabular.C (InsetButtonRelease): Now opens the

2
src/Bullet.C
View File

@ -34,7 +34,7 @@ Bullet const ITEMIZE_DEFAULTS[4] = { Bullet( 0, 8 ),//"\\(\\bullet\\)"
// and wasysym when that panel is created
Bullet::Bullet(const int f, const int c, const int s)
Bullet::Bullet(int f, int c, int s)
: font(f), character(c), size(s), user_text(0)
{
if (f < MIN || f >= FONTMAX) {

2
src/Bullet.h
View File

@ -27,7 +27,7 @@
class Bullet {
public:
///
Bullet(const int f = -1, const int c = -1, const int s = -1);
Bullet(int f = -1, int c = -1, int s = -1);
///
explicit Bullet(string const &);

6
src/lyxfont.C
View File

@ -408,11 +408,7 @@ string LyXFont::stateText() const
ost << _("Noun ") << _(GUIMiscNames[noun()]) << ", ";
if (latex() != INHERIT)
ost << _("Latex ") << _(GUIMiscNames[latex()]) << ", ";
//if (buf.empty())
// ost << _("Default");
unsigned int opos = ost.tellp();
//lyxerr << "Opos: " << opos << endl;
if (opos == 0 || opos == -1)
if (bits == inherit)
ost << _("Default") << ", ";
ost << _("Language: ") << _(language()->display.c_str());
#ifdef HAVE_SSTREAM

9
src/text.C
View File

@ -463,15 +463,6 @@ void LyXText::draw(Row const * row,
switch (c) {
case LyXParagraph::META_MARGIN:
fs = "margin";
#ifdef WITH_WARNINGS
#warning I think we do not need that '!' (JMarc)
#endif
#if 0
// Draw a sign at the left margin!
owner_->painter()
.text((LYX_PAPER_MARGIN - lyxfont::width('!', font))/2,
offset + row->baseline, "!", 1, font);
#endif
break;
case LyXParagraph::META_FIG:
fs = "fig";