anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't compile src/frontends/support as LyXImage is now dead.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3595 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-02-27 12:17:58 +00:00
parent fcc7529843
commit 0a8d0c71a3
10 changed files with 12 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
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

1
configure.in
View File

@ -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 \

4
src/frontends/ChangeLog
View File

@ -1,3 +1,7 @@
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

8
src/frontends/Makefile.am
View File

@ -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 \

19
src/frontends/support/ChangeLog
View File

@ -1,19 +0,0 @@
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.

20
src/frontends/support/LyXImage.C
View File

@ -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 <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

24
src/frontends/support/LyXImage.h
View File

@ -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

38
src/frontends/support/LyXImage_X.C
View File

@ -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 <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_;
}

49
src/frontends/support/LyXImage_X.h
View File

@ -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 <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

20
src/frontends/support/Makefile.am
View File

@ -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