gross hack to set layout

[lyx.git] / src / lyx_gui.C

diff --git a/src/lyx_gui.C b/src/lyx_gui.C
index 9bb2bf2b82eb95cb7495defce2e53ea5370e9902..80884c5d8943960483ceb44a66de71ec5d2cef31 100644 (file)
--- a/src/lyx_gui.C
+++ b/src/lyx_gui.C
@@ -16,7 +16,6 @@
 
 #include "lyx_gui.h"
 #include FORMS_H_LOCATION
-#include "figure_form.h"
 #include "print_form.h"
 #include "tex-strings.h"
 #include "lyx_main.h"
@@ -48,7 +47,6 @@
 using std::endl;
 
 FD_form_sendto * fd_form_sendto;
-FD_form_figure * fd_form_figure;
 
 extern LyXServer * lyxserver;
 extern bool finished;  // flag, that we are quitting the program
@@ -88,7 +86,7 @@ int LyX_XErrHandler(Display * display, XErrorEvent * xeev)
        // Get the reason for the crash.
        char etxt[513];
        XGetErrorText(display, xeev->error_code, etxt, 512);
-       lyxerr << etxt << endl;
+       lyxerr << etxt << " id: " << xeev->resourceid << endl;
        // By doing an abort we get a nice backtrace. (hopefully)
        lyx::abort();
        return 0; // Solaris CC wants us to return something
@@ -115,7 +113,7 @@ LyXGUI::LyXGUI(LyX * owner, int * argc, char * argv[], bool GUI)
        fl_get_app_resources(res, num_res);
 
        static const int geometryBitmask =
-               XParseGeometry( geometry,
+               XParseGeometry(geometry,
                                &xpos,
                                &ypos,
                                reinterpret_cast<unsigned int *>(&width),
@@ -241,6 +239,11 @@ void LyXGUI::init()
        fl_setpup_fontsize(FL_NORMAL_SIZE);
        fl_setpup_color(FL_MCOL, FL_BLACK);
        fl_set_goodies_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);
+#if FL_REVISION < 89 
+       fl_set_oneliner_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);
+#else
+       fl_set_tooltip_font(FL_NORMAL_STYLE, FL_NORMAL_SIZE);
+#endif
 
         // all lyxrc settings has to be done here as lyxrc has not yet
         // been read when the GUI is created (Jug)
@@ -288,16 +291,10 @@ void LyXGUI::create_forms()
        fd_form_sendto = create_form_form_sendto();
        fl_set_form_atclose(fd_form_sendto->form_sendto, CancelCloseBoxCB, 0);
 
-       // the figure form
-       fd_form_figure = create_form_form_figure();
-       fl_set_form_atclose(fd_form_figure->form_figure,
-                           CancelCloseBoxCB, 0);
-       fl_set_button(fd_form_figure->radio_postscript, 1);
-
        // This is probably as good a time as any to map the xform colours,
        // should a mapping exist.
        string const filename = AddName(user_lyxdir, "preferences.xform");
-       XformsColor::read( filename );
+       XformsColor::read(filename);
        
        // Show the main & title form
        int main_placement = FL_PLACE_CENTER | FL_FREE_SIZE;