diff --git a/ChangeLog b/ChangeLog index 4556361d0e..db6d8715d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-02-27 Angus Leeming + + * configure.in: don't compile src/frontends/support as LyXImage is + now dead. + 2002-02-26 John Levon * acconfig.h: nt/os2 defines moved diff --git a/configure.in b/configure.in index 2db8f28988..1e88d2ff7b 100644 --- a/configure.in +++ b/configure.in @@ -345,7 +345,6 @@ AC_OUTPUT([Makefile \ 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 \ diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog index d5e6cdf214..169380f132 100644 --- a/src/frontends/ChangeLog +++ b/src/frontends/ChangeLog @@ -1,3 +1,7 @@ +2002-02-27 Angus Leeming + + * Makefile.am: don't compile support as LyXImage is now dead. + 2002-02-20 Lars Gullik Bjønnes * Makefile.am: better dep. tracking from controllers and xforms diff --git a/src/frontends/Makefile.am b/src/frontends/Makefile.am index 9954cb3714..ee31fca568 100644 --- a/src/frontends/Makefile.am +++ b/src/frontends/Makefile.am @@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in # 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) @@ -13,13 +13,11 @@ noinst_LTLIBRARIES = libfrontends.la 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 \ diff --git a/src/frontends/support/ChangeLog b/src/frontends/support/ChangeLog deleted file mode 100644 index efaec97016..0000000000 --- a/src/frontends/support/ChangeLog +++ /dev/null @@ -1,19 +0,0 @@ -2001-12-19 Jean-Marc Lasgouttes - - * LyXImage.h: do not include in header files - -2001-06-14 Angus Leeming - - * LyXImage.C: - * LyXImage_X.C: removed // -*- C++ -*- as first line. - -2001-01-21 Baruch Even - - * 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. diff --git a/src/frontends/support/LyXImage.C b/src/frontends/support/LyXImage.C deleted file mode 100644 index 342ec6e3ac..0000000000 --- a/src/frontends/support/LyXImage.C +++ /dev/null @@ -1,20 +0,0 @@ -/* 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 -#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 diff --git a/src/frontends/support/LyXImage.h b/src/frontends/support/LyXImage.h deleted file mode 100644 index 45a66bdd00..0000000000 --- a/src/frontends/support/LyXImage.h +++ /dev/null @@ -1,24 +0,0 @@ -// -*- 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 diff --git a/src/frontends/support/LyXImage_X.C b/src/frontends/support/LyXImage_X.C deleted file mode 100644 index 79b49c2f09..0000000000 --- a/src/frontends/support/LyXImage_X.C +++ /dev/null @@ -1,38 +0,0 @@ -/* 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 -#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_; -} diff --git a/src/frontends/support/LyXImage_X.h b/src/frontends/support/LyXImage_X.h deleted file mode 100644 index 021cd74c94..0000000000 --- a/src/frontends/support/LyXImage_X.h +++ /dev/null @@ -1,49 +0,0 @@ -// -*- 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 - -// 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 diff --git a/src/frontends/support/Makefile.am b/src/frontends/support/Makefile.am deleted file mode 100644 index 6ac2f9bc88..0000000000 --- a/src/frontends/support/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -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