X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FGUIRunTime.C;h=13dd471b58444c1a1d3d75e16dee4ed4ef99de3e;hb=b9d61343fc76a681b0264d65703ef2119647df56;hp=b7763baf4efc8fb2ced12d8a5591bad4ac5e6261;hpb=eff9b6b7c993861880ef7800f3732b32cf694f57;p=lyx.git

diff --git a/src/frontends/xforms/GUIRunTime.C b/src/frontends/xforms/GUIRunTime.C
index b7763baf4e..13dd471b58 100644
--- a/src/frontends/xforms/GUIRunTime.C
+++ b/src/frontends/xforms/GUIRunTime.C
@@ -3,33 +3,79 @@
  * 
  *           LyX, The Document Processor
  * 	 
- *           Copyright 2000 The LyX Team.
+ *           Copyright 2000-2001 The LyX Team.
  *
  *======================================================*/
 
 #include <config.h>
 
+#include FORMS_H_LOCATION
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include FORMS_H_LOCATION
 #include "GUIRunTime.h"
+#include "XFormsView.h"
 #include "debug.h"
 
+// I keep these here so that it will be processed as early in
+// the compilation process as possible.
+#if !defined(FL_REVISION) || FL_REVISION < 88 || FL_VERSION != 0
+#error LyX will not compile with this version of XForms.\
+       Please get version 0.89.\
+       If you want to try to compile anyway, delete this test in src/frontends/xforms/GUIRunTime.C.
+#endif
+
 using std::endl;
 
 extern bool finished;
 
+namespace {
+
+int const xforms_include_version = FL_INCLUDE_VERSION;
+
+} // namespace anon
+
+
+int GUIRunTime::initApplication(int , char **)
+{
+	// Check the XForms version in the forms.h header against
+	// the one in the libforms. If they don't match quit the
+	// execution of LyX. Better with a clean fast exit than
+	// a strange segfault later.
+	// I realize that this check have to be moved when we
+	// support several toolkits, but IMO all the toolkits
+	// should try to have the same kind of check. This could
+	// be done by having a CheckHeaderAndLib function in
+	// all the toolkit implementations, this function is
+	// responsible for notifing the user.
+	// if (!CheckHeaderAndLib()) {
+	//         // header vs. lib version failed
+	//         return 1;
+	// }
+	int xforms_lib_version = fl_library_version(0, 0);
+	if (xforms_include_version != xforms_lib_version) {
+		lyxerr << "You are either running LyX with wrong "
+			"version of a dynamic XForms library\n"
+			"or you have build LyX with conflicting header "
+			"and library (different\n"
+			"versions of XForms. Sorry but there is no point "
+			"in continuing executing LyX!" << endl;
+		return 1;
+	}
+	return 0;
+}
+
 
 void GUIRunTime::processEvents() 
 {
-    XEvent ev;
+	XEvent ev;
 
-    if (fl_do_forms() == FL_EVENT) {
-	lyxerr << "LyX: This shouldn't happen..." << endl;
-	fl_XNextEvent(&ev);
-    }
+	if (fl_do_forms() == FL_EVENT) {
+		lyxerr << "LyX: This shouldn't happen..." << endl;
+		fl_XNextEvent(&ev);
+	}
 }
 
 
@@ -38,9 +84,36 @@ void GUIRunTime::runTime()
 	XEvent ev;
 	while (!finished) {
 		if (fl_check_forms() == FL_EVENT) {
-			lyxerr << "LyX: This shouldn't appen..." << endl;
+			lyxerr << "LyX: This shouldn't happen..." << endl;
 			fl_XNextEvent(&ev);
 		}
 	}
 }
 
+
+void GUIRunTime::setDefaults()
+{
+	FL_IOPT cntl;
+	cntl.buttonFontSize = FL_NORMAL_SIZE;
+	cntl.browserFontSize = FL_NORMAL_SIZE;
+	cntl.labelFontSize = FL_NORMAL_SIZE;
+	cntl.choiceFontSize = FL_NORMAL_SIZE;
+	cntl.inputFontSize = FL_NORMAL_SIZE;
+	cntl.menuFontSize  = FL_NORMAL_SIZE;
+	cntl.borderWidth = -1;
+	cntl.vclass = FL_DefaultVisual;
+	fl_set_defaults(FL_PDVisual
+			| FL_PDButtonFontSize
+			| FL_PDBrowserFontSize
+			| FL_PDLabelFontSize
+			| FL_PDChoiceFontSize
+			| FL_PDInputFontSize
+			| FL_PDMenuFontSize
+			| FL_PDBorderWidth, &cntl);
+}
+
+
+LyXView * GUIRunTime::createMainView(int w, int h)
+{
+	return new XFormsView(w, h);
+}