X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbullet_forms_cb.C;h=761f322514f53bf7040472ca21f4d5f9f0b14ea0;hb=9e5bd1d609877e602cb697bc695d410e2ab48e0d;hp=bce682e2c002259c270146f48a32589a1a5fb87b;hpb=d6f638ea96150d5a0bb559d520dd2af8baad23d7;p=lyx.git diff --git a/src/bullet_forms_cb.C b/src/bullet_forms_cb.C index bce682e2c0..761f322514 100644 --- a/src/bullet_forms_cb.C +++ b/src/bullet_forms_cb.C @@ -11,10 +11,6 @@ #include "gettext.h" #include "lyx_gui_misc.h" // CancelCloseBoxCB + WriteAlert -#ifdef MONO -extern int mono_video; -#endif - extern BufferView * current_view; FD_form_bullet * fd_form_bullet; @@ -26,15 +22,11 @@ static int current_bullet_depth; void bulletForm() { if (!fd_form_bullet) { - if ( -#ifdef MONO - !mono_video && -#endif - (XpmVersion < 4 - || (XpmVersion == 4 && XpmRevision < 7))) { + if ((XpmVersion < 4 + || (XpmVersion == 4 && XpmRevision < 7))) { WriteAlert(_("Sorry, your libXpm is too old."), _("This feature requires xpm-4.7 (a.k.a 3.4g) or newer."), - _("Try running LyX in mono mode (lyx -Mono).")); + ""); return; } fd_form_bullet = create_form_form_bullet(); @@ -226,19 +218,9 @@ void BulletPanelCB(FL_OBJECT * /*ob*/, long data) new_panel = "standard"; break; } -#ifdef MONO - if (mono_video) { - new_panel += ".xbm"; - fl_set_bmtable_file(fd_form_bullet->bmtable_bullet_panel, 6, 6, - LibFileSearch("images", new_panel.c_str()).c_str()); - } else { -#endif - new_panel += ".xpm"; - fl_set_bmtable_pixmap_file(fd_form_bullet->bmtable_bullet_panel, 6, 6, - LibFileSearch("images", new_panel.c_str()).c_str()); -#ifdef MONO - } -#endif + new_panel += ".xpm"; + fl_set_bmtable_pixmap_file(fd_form_bullet->bmtable_bullet_panel, 6, 6, + LibFileSearch("images", new_panel.c_str()).c_str()); fl_redraw_object(fd_form_bullet->bmtable_bullet_panel); fl_unfreeze_form(fd_form_bullet->form_bullet); }