some small updates to Painter, and make the new painter the default.

[features.git] / src / bullet_forms_cb.C

diff --git a/src/bullet_forms_cb.C b/src/bullet_forms_cb.C
index 7218992bec9ccedcb209f0452a7e7d5c265ad804..bce682e2c002259c270146f48a32589a1a5fb87b 100644 (file)
--- a/src/bullet_forms_cb.C
+++ b/src/bullet_forms_cb.C
@@ -11,7 +11,9 @@
 #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;
@@ -24,7 +26,10 @@ static int current_bullet_depth;
 void bulletForm()
 {
        if (!fd_form_bullet) {
-               if (!mono_video &&
+               if (
+#ifdef MONO
+                       !mono_video &&
+#endif
                    (XpmVersion < 4
                        || (XpmVersion == 4 && XpmRevision < 7))) {
                        WriteAlert(_("Sorry, your libXpm is too old."),
@@ -221,15 +226,19 @@ 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
                fl_redraw_object(fd_form_bullet->bmtable_bullet_panel);
                fl_unfreeze_form(fd_form_bullet->form_bullet);
        }