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

[lyx.git] / src / bullet_forms_cb.C

diff --git a/src/bullet_forms_cb.C b/src/bullet_forms_cb.C
index 4bfae2182239364bca40054fd899f7bf517db6de..761f322514f53bf7040472ca21f4d5f9f0b14ea0 100644 (file)
--- a/src/bullet_forms_cb.C
+++ b/src/bullet_forms_cb.C
@@ -11,9 +11,8 @@
 #include "gettext.h"
 #include "lyx_gui_misc.h" // CancelCloseBoxCB + WriteAlert
 
-extern int mono_video;
-extern BufferView *current_view;
-FD_form_bullet *fd_form_bullet;
+extern BufferView * current_view;
+FD_form_bullet * fd_form_bullet;
 
 static int current_bullet_panel;
 static int current_bullet_depth;
@@ -23,12 +22,11 @@ static int current_bullet_depth;
 void bulletForm()
 {
        if (!fd_form_bullet) {
-               if (!mono_video 
-                   && (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();
@@ -47,7 +45,7 @@ void bulletForm()
                }
                else {
                        fl_show_form(fd_form_bullet->form_bullet,
-                                    FL_PLACE_MOUSE,FL_FULLBORDER,
+                                    FL_PLACE_MOUSE, FL_FULLBORDER,
                                     _("Itemize Bullet Selection"));
                }
        }
@@ -220,16 +218,9 @@ void BulletPanelCB(FL_OBJECT * /*ob*/, long data)
                        new_panel = "standard";
                        break;
                }
-               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 {
-                       new_panel += ".xpm";
-                       fl_set_bmtable_pixmap_file(fd_form_bullet->bmtable_bullet_panel, 6, 6,
-                              LibFileSearch("images", new_panel.c_str()).c_str());
-               }
+               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);
        }