Even if i'm one of the few people seemingly still interested in a gtk
frontend, i don't have much time to work on it right now - but i wanted
at least to make the branch compile again (though right now lyx-gtk
segfaults right after startup)... just ignore it if you feel you'Re too
busy with 1.5 right now, i can still remind you later on :-)
Bernhard
Index: src/UpdateFlags.h
===================================================================
--- src/UpdateFlags.h (Revision 17378)
+++ src/UpdateFlags.h (Arbeitskopie)
@@ -1,28 +1,40 @@
-#ifndef UPDATE_FLAGS_H
-#define UPDATE_FLAGS_H
-
-namespace lyx {
-
-namespace Update {
- enum flags {
- None = 0,
- FitCursor = 1,
- Force = 2,
- SinglePar = 4,
- MultiParSel = 8
- };
-
-inline flags operator|(flags const f, flags const g)
-{
- return static_cast<flags>(int(f) | int(g));
-}
-
-inline flags operator&(flags const f, flags const g)
-{
- return static_cast<flags>(int(f) & int(g));
-}
-
-} // namespace
-
-} // namespace lyx
-#endif
+// -*- C++ -*-
+/**
+ * \file UpdateFlags.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author The Denmark Cowboys
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef UPDATE_FLAGS_H
+#define UPDATE_FLAGS_H
+
+namespace lyx {
+
+namespace Update {
+ enum flags {
+ None = 0,
+ FitCursor = 1,
+ Force = 2,
+ SinglePar = 4,
+ MultiParSel = 8,
+ Decoration = 16
+ };
+
+inline flags operator|(flags const f, flags const g)
+{
+ return static_cast<flags>(int(f) | int(g));
+}
+
+inline flags operator&(flags const f, flags const g)
+{
+ return static_cast<flags>(int(f) & int(g));
+}
+
+} // namespace
+
+} // namespace lyx
+#endif
Index: src/frontends/gtk/GMenubar.C
===================================================================
--- src/frontends/gtk/GMenubar.C (Revision 17378)
+++ src/frontends/gtk/GMenubar.C (Arbeitskopie)
@@ -43,13 +43,13 @@
class LyxMenu : public Gtk::Menu {
public:
- LyxMenu() { menu_.reset(new ::Menu); }
+ LyxMenu() { menu_.reset(new lyx::Menu); }
- ::Menu & getBackMenu() { return *menu_.get(); }
+ lyx::Menu & getBackMenu() { return *menu_.get(); }
- void clearBackMenu() { menu_.reset(new ::Menu); }
+ void clearBackMenu() { menu_.reset(new lyx::Menu); }
private:
- std::auto_ptr< ::Menu > menu_;
+ std::auto_ptr< lyx::Menu > menu_;
};
Index: src/frontends/gtk/GuiImplementation.C
===================================================================
--- src/frontends/gtk/GuiImplementation.C (Revision 17378)
+++ src/frontends/gtk/GuiImplementation.C (Arbeitskopie)
@@ -21,6 +21,10 @@
#include "GuiImplementation.h"
+//FIXME: part of enum flags in UpdateFlags.h (pulled in by BufferView);
+// seems to be #define'd elsewhere already...
+#undef None
+
#include "GView.h"
#include "BufferView.h"
Index: src/frontends/gtk/GSendto.C
===================================================================
--- src/frontends/gtk/GSendto.C (Revision 17378)
+++ src/frontends/gtk/GSendto.C (Arbeitskopie)
@@ -22,8 +22,6 @@
#include "ControlSendto.h"
#include "ghelpers.h"
-#include "format.h"
-
#include <libglademm.h>
using std::string;
Index: src/frontends/gtk/GSendto.h
===================================================================
--- src/frontends/gtk/GSendto.h (Revision 17378)
+++ src/frontends/gtk/GSendto.h (Arbeitskopie)
@@ -13,6 +13,7 @@
#define GSENDTO_H
#include "GViewBase.h"
+#include "format.h"
#include <vector>
class Format;
@@ -40,7 +41,7 @@
Gtk::TreeView * formatview_;
Gtk::Entry * commandentry_;
- std::vector<Format const *> all_formats_;
+ std::vector<lyx::Format const *> all_formats_;
void onCommandEntryChanged();
};
Index: src/frontends/gtk/xftFontLoader.C
===================================================================
--- src/frontends/gtk/xftFontLoader.C (Revision 17378)
+++ src/frontends/gtk/xftFontLoader.C (Arbeitskopie)
@@ -22,6 +22,11 @@
#include "gettext.h"
#include "debug.h"
#include "lyxrc.h" // lyxrc.font_*
+
+//FIXME: part of enum flags in UpdateFlags.h (pulled in by BufferView);
+// seems to be #define'd elsewhere already...
+#undef None
+
#include "BufferView.h"
#include "GtkmmX.h"
Index: src/frontends/gtk/GuiApplication.C
===================================================================
--- src/frontends/gtk/GuiApplication.C (Revision 17378)
+++ src/frontends/gtk/GuiApplication.C (Arbeitskopie)
@@ -25,6 +25,10 @@
#include "GtkmmX.h"
+//FIXME: part of enum flags in UpdateFlags.h (pulled in by BufferView);
+// seems to be #define'd elsewhere already...
+#undef None
+
#include "BufferView.h"
#include "Color.h"
@@ -51,13 +55,13 @@
namespace {
-std::map<int, boost::shared_ptr<io_callback> > callbacks;
+std::map<int, boost::shared_ptr<lyx::io_callback> > callbacks;
/// estimate DPI from X server
int getDPI()
{
//TODO use GDK instead
- Screen * scr = ScreenOfDisplay(getDisplay(), getScreen());
+ Screen * scr = ScreenOfDisplay(lyx::getDisplay(), lyx::getScreen());
return int(((HeightOfScreen(scr) * 25.4 / HeightMMOfScreen(scr)) +
(WidthOfScreen(scr) * 25.4 / WidthMMOfScreen(scr))) / 2);
}
Index: src/frontends/gtk/GScreen.C
===================================================================
--- src/frontends/gtk/GScreen.C (Revision 17378)
+++ src/frontends/gtk/GScreen.C (Arbeitskopie)
@@ -22,6 +22,10 @@
#include "GWorkArea.h"
+//FIXME: part of enum flags in UpdateFlags.h (pulled in by BufferView);
+// seems to be #define'd elsewhere already...
+#undef None
+
#include "buffer.h"
#include "BufferView.h"
#include "debug.h"
Index: src/frontends/gtk/GToolbar.C
===================================================================
--- src/frontends/gtk/GToolbar.C (Revision 17378)
+++ src/frontends/gtk/GToolbar.C (Arbeitskopie)
@@ -177,12 +177,6 @@
layoutSelected(owner_, layoutGuiName);
}
-Toolbars::ToolbarPtr make_toolbar(ToolbarBackend::Toolbar const & tbb,
- LyXView & owner)
-{
- using lyx::frontend::GToolbar;
- return Toolbars::ToolbarPtr(new GToolbar(tbb, owner));
-}
GToolbar::GToolbar(ToolbarBackend::Toolbar const & tbb, LyXView & owner)
: owner_(dynamic_cast<GView &>(owner))
@@ -297,4 +291,12 @@
}
} // namespace frontend
+
+Toolbars::ToolbarPtr make_toolbar(ToolbarBackend::Toolbar const & tbb,
+ LyXView & owner)
+{
+ using lyx::frontend::GToolbar;
+ return Toolbars::ToolbarPtr(new GToolbar(tbb, owner));
+}
+
} // namespace lyx
Index: src/frontends/gtk/GWorkArea.C
===================================================================
--- src/frontends/gtk/GWorkArea.C (Revision 17378)
+++ src/frontends/gtk/GWorkArea.C (Arbeitskopie)
@@ -23,6 +23,10 @@
#include "GtkmmX.h"
#include "GLyXKeySym.h"
+//FIXME: part of enum flags in UpdateFlags.h (pulled in by BufferView);
+// seems to be #define'd elsewhere already...
+#undef None
+
#include "BufferView.h"
#include "debug.h"
#include "funcrequest.h"
