Fix spellchecker popups glitch, TOC menu glitch, remove dependency on xforms in lyxlo...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1275 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 58557966d839117e8fa50ad94b577eaf18d2acbb..edc14183d4001ff2bcafaf7303745c9db6142ad5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2000-12-11  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+       * src/lyxlookup.C: do not condition on FL_REVISION.
+
+       * forms/sp_form.fd:
+       * src/sp_form.C: fix the font size of some text entries
+
+       * src/frontends/xforms/Menubar_pimpl.C (add_toc): honor separator
+       after TOC when there is no TOC. 
+
        * src/lyxrc.C (readBindFileIfNeeded): new method. Reads the main
        bind file if it has not been done yet.
        (read): remove local bindFile variable. Try to fix the handling of

diff --git a/forms/sp_form.fd b/forms/sp_form.fd
index 03762369a2208530af6c3bf9358583218ef80537..fc36a1aba65ed2961155a02440b6937297d7faf9 100644 (file)
--- a/forms/sp_form.fd
+++ b/forms/sp_form.fd
@@ -146,7 +146,7 @@ boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: 0
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
@@ -272,7 +272,7 @@ boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: 0
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
@@ -290,7 +290,7 @@ boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
-size: 0
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 
@@ -386,7 +386,7 @@ boxtype: FL_DOWN_BOX
 colors: FL_COL1 FL_MCOL
 alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_NORMAL_STYLE
-size: 0
+size: FL_NORMAL_SIZE
 lcol: FL_BLACK
 label: 
 shortcut: 

diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index 1f1a198a795b3fa7d110db6f76fc2206dff83256..891ebdef56a9952ceba05a4ec72f4d282edf576d 100644 (file)
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -336,7 +336,8 @@ void Menubar::Pimpl::add_toc(int menu, string const & extra_label,
 
        // Handle normal TOC
        if (max_nonempty == 0 && toc_list[0].empty()) {
-               fl_addtopup(menu,_("No Table of Contents%i"));
+               fl_addtopup(menu, (_("No Table of Contents%i")
+                                  + extra_label).c_str());
                return;
        }
 

diff --git a/src/lyxlookup.C b/src/lyxlookup.C
index 0b4854011618e79fb57f975ff6cd7ff5bff83bb8..16007c65522ce87cd8da2a757916408ec42ffc58 100644 (file)
--- a/src/lyxlookup.C
+++ b/src/lyxlookup.C
@@ -17,11 +17,9 @@
 #ifdef HAVE_XOPENIM
 // This part is the full blown Input Method manager for X11R5 and up.
 // For the plain-and-old-X11R4 version, see later.
-#include FORMS_H_LOCATION
-//#include <X11/Xlib.h>
-//#include <X11/Xutil.h>
-//#include <X11/keysym.h>
-#if FL_REVISION < 89
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/keysym.h>
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
@@ -41,7 +39,11 @@ XComposeStatus compose_status= {0, 0};
 void InitLyXLookup(Display * display, Window window) 
 {
        xic = 0;
-       
+
+       lyxerr[Debug::KEY]
+                       << "InitLyXLookup: creating an input context."
+                       << endl;
+
        // This part could be done before opening display
        setlocale(LC_CTYPE, "");
                if (!XSupportsLocale()) {
@@ -185,7 +187,7 @@ int LyXLookupString(XEvent * event,
                        lyxerr[Debug::KEY] << "XBufferOverflow" << endl;
                        break;
                case XLookupBoth:
-                       lyxerr[Debug::KEY] << "XLookupBoth"
+                       lyxerr[Debug::KEY] << "XLookupBoth "
                                           << string(buffer_return, result)
                                           << endl;
                        break;
@@ -264,4 +266,3 @@ void CloseLyXLookup()
 
 #endif // HAVE_XOPENIM
 
-#endif

diff --git a/src/sp_form.C b/src/sp_form.C
index ebc087bf6236092763c2fbed20ad34fb54767c30..af7eeac0277cde81fb1c7c2865a8a30a78df306b 100644 (file)
--- a/src/sp_form.C
+++ b/src/sp_form.C
@@ -30,7 +30,7 @@ FD_form_spell_options *create_form_form_spell_options(void)
   fl_end_group();
 
   fdui->altlang_input = obj = fl_add_input(FL_NORMAL_INPUT, 40, 90, 240, 30, "");
-    fl_set_object_lsize(obj, 0);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
   fdui->compounds = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 160, 320, 30, idex(_("Treat run-together words as legal|#T")));fl_set_button_shortcut(obj, scex(_("Treat run-together words as legal|#T")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
   fdui->inpenc = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 190, 320, 30, idex(_("Input Encoding switch to ispell|#I")));fl_set_button_shortcut(obj, scex(_("Input Encoding switch to ispell|#I")), 1);
@@ -48,9 +48,9 @@ FD_form_spell_options *create_form_form_spell_options(void)
   fdui->esc_chars = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 10, 280, 320, 30, idex(_("Extra special chars allowed in words:|#E")));fl_set_button_shortcut(obj, scex(_("Extra special chars allowed in words:|#E")), 1);
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
   fdui->perdict_input = obj = fl_add_input(FL_NORMAL_INPUT, 40, 250, 240, 30, "");
-    fl_set_object_lsize(obj, 0);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
   fdui->esc_chars_input = obj = fl_add_input(FL_NORMAL_INPUT, 40, 310, 240, 30, "");
-    fl_set_object_lsize(obj, 0);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
   obj = fl_add_text(FL_NORMAL_TEXT, 20, 10, 90, 20, _("Dictionary"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
@@ -81,7 +81,7 @@ FD_form_spell_check *create_form_form_spell_check(void)
     fl_set_object_lsize(obj, 0);
   fdui->text = obj = fl_add_text(FL_NORMAL_TEXT, 80, 10, 220, 30, "");
     fl_set_object_boxtype(obj, FL_DOWN_BOX);
-    fl_set_object_lsize(obj, 0);
+    fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_lalign(obj, FL_ALIGN_LEFT|FL_ALIGN_INSIDE);
   fdui->input = obj = fl_add_input(FL_NORMAL_INPUT, 80, 40, 220, 30, _("Replace"));
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);