+2002-02-27 Angus Leeming <a.leeming@ic.ac.uk>
+
+ * configure.in: don't compile src/frontends/support as LyXImage is
+ now dead.
+
2002-02-26 John Levon <moz@compsoc.man.ac.uk>
* acconfig.h: nt/os2 defines moved
src/insets/Makefile \
src/support/Makefile \
src/frontends/Makefile \
- src/frontends/support/Makefile \
src/frontends/controllers/Makefile \
src/frontends/xforms/Makefile \
src/frontends/qt2/Makefile \
+2002-02-27 Angus Leeming <a.leeming@ic.ac.uk>
+
+ * Makefile.am: don't compile support as LyXImage is now dead.
+
2002-02-20 Lars Gullik Bjønnes <larsbj@birdstep.com>
* Makefile.am: better dep. tracking from controllers and xforms
# xforms has to be fixed here as we still need object files in this directory
# for the compilation of other frontends, so until that we have to let this
# here.
-SUBDIRS = support controllers xforms @FRONTEND@
+SUBDIRS = controllers xforms @FRONTEND@
ETAGS_ARGS = --lang=c++
BOOST_INCLUDES = -I$(top_srcdir)/boost
INCLUDES = ${FRONTEND_INCLUDES} -I${srcdir}/.. -I${srcdir}/xforms ${SIGC_CFLAGS} $(BOOST_INCLUDES)
libfrontends_la_LIBADD= \
xforms/*.lo \
- controllers/*.lo \
- support/libfrontendsupport.o
+ controllers/*.lo
libfrontends_la_DEPENDENCIES = \
xforms/*.lo \
- controllers/*.lo \
- support/libfrontendsupport.o
+ controllers/*.lo
libfrontends_la_SOURCES=\
Alert.C \
+++ /dev/null
-2001-12-19 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
-
- * LyXImage.h: do not include <config.h> in header files
-
-2001-06-14 Angus Leeming <a.leeming@ic.ac.uk>
-
- * LyXImage.C:
- * LyXImage_X.C: removed // -*- C++ -*- as first line.
-
-2001-01-21 Baruch Even <baruch@ev-en.org>
-
- * LyXImage.h:
- * LyXImage.C: Removal of the #pragma interface/implementation because of
- bad interaction with the inclusion of the real implementation, it resulted
- in errors while linking.
-
- * LyXImage_X.h:
- * LyXImage_X.C: Stored the width and height of the image in the image
- object.
+++ /dev/null
-/* This file is part of
- * =================================================
- *
- * LyX, The Document Processor
- * Copyright 1995 Matthias Ettrich.
- * Copyright 1995-2001 The LyX Team.
- *
- * This file Copyright 2000 Baruch Even
- * ================================================= */
-
-#include <config.h>
-#include "LyXImage.h"
-
-
-#ifndef X_DISPLAY_MISSING
- #include "LyXImage_X.C"
-#elif defined(DO_WINDOWS)
- // Not implemented, for illustration only.
- #include "LyXImage_Windows.C"
-#endif
+++ /dev/null
-// -*- C++ -*-
-/* This file is part of
- * =================================================
- *
- * LyX, The Document Processor
- * Copyright 1995 Matthias Ettrich.
- * Copyright 1995-2001 The LyX Team.
- *
- * This file Copyright 2000 Baruch Even
- * ================================================= */
-
-#ifndef LYXIMAGE_H
-#define LYXIMAGE_H
-
-// We need it to know what version to use.
-
-#ifndef X_DISPLAY_MISSING
- #include "LyXImage_X.h"
-#elif defined(DO_WINDOWS)
- // Not implemented, for illustration only.
- #include "LyXImage_Windows.h"
-#endif
-
-#endif
+++ /dev/null
-/* This file is part of
- * =================================================
- *
- * LyX, The Document Processor
- * Copyright 1995 Matthias Ettrich.
- * Copyright 1995-2000 The LyX Team.
- *
- * This file Copyright 2000 Baruch Even
- * ================================================= */
-
-#include <config.h>
-#include "LyXImage.h"
-
-#include FORMS_H_LOCATION
-
-#include "support/LAssert.h"
-
-LyXImage::LyXImage()
- : pixmap_(0), pixmapInitialized(false), width_(0), height_(0)
-{}
-
-LyXImage::LyXImage(Pixmap pixmap, unsigned int width, unsigned int height)
- : pixmap_(pixmap), pixmapInitialized(true), width_(width), height_(height)
-{}
-
-LyXImage::~LyXImage()
-{
- if (pixmapInitialized)
- XFreePixmap(fl_get_display(), pixmap_);
-}
-
-Pixmap
-LyXImage::getPixmap() const
-{
- lyx::Assert(pixmapInitialized);
-
- return pixmap_;
-}
+++ /dev/null
-// -*- C++ -*-
-/* This file is part of
- * =================================================
- *
- * LyX, The Document Processor
- * Copyright 1995 Matthias Ettrich.
- * Copyright 1995-2000 The LyX Team.
- *
- * This file Copyright 2000 Baruch Even
- * ================================================= */
-
-#ifndef LYXIMAGE_X_H
-#define LYXIMAGE_X_H
-
-#include "frontends/support/LyXImage.h"
-#include <X11/Xlib.h>
-
-// This class actually acts as a base class when X Window is used.
-
-class LyXImage {
-public:
- ///
- LyXImage();
- ///
- LyXImage(Pixmap pixmap, unsigned int width, unsigned int height);
- ///
- ~LyXImage();
-
- ///
- Pixmap getPixmap() const;
-
- /// Get the image width
- unsigned int getWidth() const { return width_; }
-
- /// Get the image height
- unsigned int getHeight() const { return height_; }
-
-private:
- /// The pixmap itself.
- Pixmap pixmap_;
- /// Is the pixmap initialized?
- bool pixmapInitialized;
- /// Width of the image
- unsigned int width_;
- /// Height of the image
- unsigned int height_;
-};
-
-#endif
+++ /dev/null
-AUTOMAKE_OPTIONS = foreign 1.4
-DISTCLEANFILES= *.orig *.rej *~ *.bak core
-MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-noinst_LTLIBRARIES = libfrontendsupport.la
-LIBS =
-ETAGS_ARGS = --lang=c++
-INCLUDES = -I${srcdir}/../../ $(SIGC_CFLAGS)
-
-libfrontendsupport_la_SOURCES = \
- LyXImage.h \
- LyXImage.C
-
-libfrontendsupport.la: libfrontendsupport.o
-
-libfrontendsupport.o: $(libfrontendsupport_la_OBJECTS) $(libfrontendsupport_la_DEPENDENCIES)
- $(CXXLINK) $(libfrontendsupport_la_OBJECTS)
-
-EXTRA_DIST = \
- LyXImage_X.h \
- LyXImage_X.C
projects / lyx.git / commitdiff