// needed to make the c++ compiler find the correct version of abs.
// This is at least true for g++.
-using std::abs;
+//using std::abs;
static inline
void waitForX()
+++ /dev/null
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 2000 The LyX Team.
- *
- * @author Jürgen Vigna
- *
- * ====================================================== */
-
-
-#include <config.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "GUIRunTime.h"
-#include "GUIRunTime_pimpl.h"
-
-GUIRunTime::GUIRunTime()
-{
- pimpl_ = new Pimpl;
-}
-
-
-GUIRunTime::~GUIRunTime()
-{
- delete pimpl_;
-}
-
-
-void GUIRunTime::processEvents()
-{
- pimpl_->processEvents();
-}
-
-
-void GUIRunTime::runTime()
-{
- pimpl_->runTime();
-}
*
* Copyright 2000 The LyX Team.
*
- * @author Jürgen Vigna
- *
* ====================================================== */
#ifndef GUIRUNTIME_H
class LyXView;
/** The LyX GUI independent guiruntime class
- The GUI interface is implemented in the corresponding GUIRunTime_pimpl class.
- */
+ The GUI interface is implemented in the corresponding
+ frontends GUIRunTime.C file.
+*/
class GUIRunTime {
public:
- ///
- GUIRunTime();
- ///
- ~GUIRunTime();
- ///
- void processEvents();
- ///
- void runTime();
-
- struct Pimpl;
- friend struct Pimpl;
-
-private:
- ///
- Pimpl * pimpl_;
+ ///
+ static
+ void processEvents();
+ ///
+ static
+ void runTime();
};
#endif
ButtonPolicies.h \
Dialogs.h \
DialogBase.h \
- GUIRunTime.C \
GUIRunTime.h \
Liason.C \
Liason.h \
--- /dev/null
+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 2000 The LyX Team.
+ *
+ *======================================================*/
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include FORMS_H_LOCATION
+
+#include "GUIRunTime.h"
+#include "debug.h"
+
+#include <gnome--/main.h>
+
+using std::endl;
+
+extern bool finished;
+
+void GUIRunTime::processEvents()
+{
+ while(Gnome::Main::instance()->events_pending())
+ Gnome::Main::instance()->iteration(FALSE);
+}
+
+
+void GUIRunTime::runTime()
+{
+ XEvent ev;
+ while (!finished) {
+ processEvents();
+ if (fl_check_forms() == FL_EVENT) {
+ lyxerr << "LyX: This shouldn't happen..." << endl;
+ fl_XNextEvent(&ev);
+ }
+ }
+}
+++ /dev/null
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright (C) 2000 The LyX Team.
- *
- * @author Jürgen Vigna
- *
- *======================================================*/
-
-#include <config.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include FORMS_H_LOCATION
-
-#include "GUIRunTime_pimpl.h"
-#include "debug.h"
-
-#include <gnome--/main.h>
-
-using std::endl;
-
-extern bool finished;
-
-void GUIRunTime::Pimpl::processEvents()
-{
- while(Gnome::Main::instance()->events_pending())
- Gnome::Main::instance()->iteration(FALSE);
-}
-
-
-void GUIRunTime::Pimpl::runTime()
-{
- XEvent ev;
- while (!finished) {
- Pimpl::processEvents();
- if (fl_check_forms() == FL_EVENT) {
- lyxerr << "LyX: This shouldn't happen..." << endl;
- fl_XNextEvent(&ev);
- }
- }
-}
+++ /dev/null
-// -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 2000 The LyX Team.
- *
- * @author Jürgen Vigna
- *
- * ====================================================== */
-
-#ifndef GUIRUNTIME_PIMPL_H
-#define GUIRUNTIME_PIMPL_H
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "frontends/GUIRunTime.h"
-
-/*
- * The GUI interface for runtime GUI stuff.
- */
-struct GUIRunTime::Pimpl {
-public:
- ///
- static void processEvents();
- ///
- static void runTime();
-};
-#endif
#ETAGS_ARGS = --lang=c++
libgnome_la_SOURCES = \
Dialogs.C \
- GUIRunTime_pimpl.C \
- GUIRunTime_pimpl.h \
+ GUIRunTime.C \
FormCopyright.C \
FormCopyright.h \
FormPrint.C \
--- /dev/null
+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 2000 The LyX Team.
+ *
+ * ====================================================== */
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include "GUIRunTime.h"
+#include "debug.h"
+
+#include <kapp.h>
+
+#include FORMS_H_LOCATION
+
+using std::endl;
+
+extern bool finished;
+
+
+void GUIRunTime::processEvents()
+{
+ kapp->processEvents();
+}
+
+
+void GUIRunTime::runTime()
+{
+ // We still use xforms event handler as the main one...
+ XEvent ev;
+ while (!finished) {
+ processEvents();
+ if (fl_check_forms() == FL_EVENT) {
+ lyxerr << "LyX: This shouldn't happen..." << endl;
+ fl_XNextEvent(&ev);
+ }
+ }
+}
+++ /dev/null
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright (C) 2000 The LyX Team.
- *
- * @author Jürgen Vigna
- *
- *======================================================*/
-
-#include <config.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "GUIRunTime_pimpl.h"
-#include "debug.h"
-
-#include <kapp.h>
-
-#include FORMS_H_LOCATION
-
-using std::endl;
-
-extern bool finished;
-
-
-void GUIRunTime::Pimpl::processEvents()
-{
- kapp->processEvents();
-}
-
-
-void GUIRunTime::Pimpl::runTime()
-{
- // We still use xforms event handler as te main one...
- XEvent ev;
- while (!finished) {
- Pimpl::processEvents();
- if (fl_check_forms() == FL_EVENT) {
- lyxerr << "LyX: This shouldn't happen..." << endl;
- fl_XNextEvent(&ev);
- }
- }
-}
-
+++ /dev/null
-// -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 2000 The LyX Team.
- *
- * @author Jürgen Vigna
- *
- * ====================================================== */
-
-#ifndef GUIRUNTIME_PIMPL_H
-#define GUIRUNTIME_PIMPL_H
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "frontends/GUIRunTime.h"
-
-/**
- The GUI interface for runtime GUI stuff.
-*/
-struct GUIRunTime::Pimpl {
-public:
- ///
- static void processEvents();
- ///
- static void runTime();
-};
-#endif
ETAGS_ARGS = --lang=c++
libkde_la_SOURCES = \
Dialogs.C \
- GUIRunTime_pimpl.C \
- GUIRunTime_pimpl.h \
+ GUIRunTime.C \
FormCopyright.C \
FormCopyright.h \
formcopyrightdialog.C \
# add a dependency for every moc file to be full portable
# I've added a key binding to emacs for this.
-formcopyrightdialog.C:formcopyrightdialog_moc.C
+formcopyrightdialog.C: formcopyrightdialog_moc.C
formcopyrightdialog_moc.C: formcopyrightdialog.h
$(MOC) formcopyrightdialog.h -o formcopyrightdialog_moc.C
--- /dev/null
+/* This file is part of
+ * ======================================================
+ *
+ * LyX, The Document Processor
+ *
+ * Copyright 2000 The LyX Team.
+ *
+ *======================================================*/
+
+#include <config.h>
+
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
+#include FORMS_H_LOCATION
+#include "GUIRunTime.h"
+#include "debug.h"
+
+using std::endl;
+
+extern bool finished;
+
+
+void GUIRunTime::processEvents()
+{
+ XEvent ev;
+
+ if (fl_do_forms() == FL_EVENT) {
+ lyxerr << "LyX: This shouldn't happen..." << endl;
+ fl_XNextEvent(&ev);
+ }
+}
+
+
+void GUIRunTime::runTime()
+{
+ XEvent ev;
+ while (!finished) {
+ if (fl_check_forms() == FL_EVENT) {
+ lyxerr << "LyX: This shouldn't appen..." << endl;
+ fl_XNextEvent(&ev);
+ }
+ }
+}
+
+++ /dev/null
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright (C) 2000 The LyX Team.
- *
- * @author Jürgen Vigna
- *
- *======================================================*/
-
-#include <config.h>
-
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include FORMS_H_LOCATION
-#include "GUIRunTime_pimpl.h"
-#include "debug.h"
-
-using std::endl;
-
-extern bool finished;
-
-
-void GUIRunTime::Pimpl::processEvents()
-{
- XEvent ev;
-
- if (fl_do_forms() == FL_EVENT) {
- lyxerr << "LyX: This shouldn't happen..." << endl;
- fl_XNextEvent(&ev);
- }
-}
-
-
-void GUIRunTime::Pimpl::runTime()
-{
- XEvent ev;
- while (!finished) {
- if (fl_check_forms() == FL_EVENT) {
- lyxerr << "LyX: This shouldn't appen..." << endl;
- fl_XNextEvent(&ev);
- }
- }
-}
-
+++ /dev/null
-// -*- C++ -*-
-/* This file is part of
- * ======================================================
- *
- * LyX, The Document Processor
- *
- * Copyright 2000 The LyX Team.
- *
- * @author Jürgen Vigna
- *
- * ====================================================== */
-
-#ifndef GUIRUNTIME_PIMPL_H
-#define GUIRUNTIME_PIMPL_H
-
-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "frontends/GUIRunTime.h"
-
-/**
- The GUI interface for runtime GUI stuff.
-*/
-struct GUIRunTime::Pimpl {
-public:
- ///
- static void processEvents();
- ///
- static void runTime();
-};
-#endif
libxforms_la_SOURCES = \
ButtonController.h \
Dialogs.C \
- GUIRunTime_pimpl.C \
- GUIRunTime_pimpl.h \
+ GUIRunTime.C \
FormCitation.C \
FormCitation.h \
form_citation.C \
{
if (!gui) return;
- GUIRunTime grt;
- grt.runTime();
+ GUIRunTime::runTime();
}
if (fd_form_paragraph_extra->form_paragraph_extra->visible) {
UpdateParagraphExtra();
}
+#ifndef NEW_TABULAR
if (fd_form_table_options->form_table_options->visible) {
UpdateLayoutTable(1); // just like a right mouse click
}
+#endif
if (fd_form_bullet) {
if (fd_form_bullet->form_bullet->visible) {
updateBulletForm();
lyxerr << "Key ["
<< action << "]["
<< buf << "]"
-#if 0
- << "["
- << num_bytes << "]"
-#endif
<< endl;
}
return 0;
}
}
-#if 0
- else
- if (action == LFUN_SELFINSERT) {
- argument = s_r[0];
- }
-#endif
+
bool tmp_sc = show_sc;
show_sc = false;
Dispatch(action, argument.c_str());
// I dare you to try this one too. It is ortogonal with NEW_INSETS so you
// can try both or just one of them.
-//#define NEW_TABULAR 1
+#define NEW_TABULAR 1
/// A LyXParagraph holds all text, attributes and insets in a text paragraph
class LyXParagraph {
tmppar->next->MakeSameLayout(cursor.par());
// first the end
- if ((!tmppar->GetLayout() && !tmppar->table)
+ if ((!tmppar->GetLayout()
+#ifndef NEW_TABULAR
+ && !tmppar->table
+#endif
+ )
|| (tmppar->Next()
&& (!tmppar->Next()->Last()
|| tmppar->Next()->HasSameLayout(tmppar)))) {
/* if there is no space between the text and the footnote, so we insert
* a blank
* (only if the previous par and the footnotepar are not empty!) */
- if ((!firsttmppar->next->GetLayout() && !firsttmppar->next->table)
+ if ((!firsttmppar->next->GetLayout()
+#ifndef NEW_TABULAR
+ && !firsttmppar->next->table
+#endif
+ )
|| firsttmppar->HasSameLayout(firsttmppar->next)) {
if (firsttmppar->size()
&& !firsttmppar->IsSeparator(firsttmppar->size() - 1)
projects / features.git / commitdiff