mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 12:00:45 +00:00
Makefiles changed to GNUmakefile.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2577 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Ovidiu Predescu
parent
971f4e24fa
commit
062915eb1a
19 changed files with 162 additions and 922 deletions
31
ChangeLog
31
ChangeLog
|
|
@ -1,10 +1,41 @@
|
|||
Tue Oct 28 11:24:40 1997 Ovidiu Predescu <ovidiu@net-community.com>
|
||||
|
||||
* Makefile: Changed to GNUmakefile.
|
||||
* Makefile.postamble: Changed to GNUmakefile.postamble.
|
||||
* Documentation/Makefile: Changed to GNUmakefile.
|
||||
* Images/Makefile: Changed to GNUmakefile.
|
||||
* Images/Makefile.postamble: Changed to GNUmakefile.postamble.
|
||||
* Source/Makefile: Changed to GNUmakefile.
|
||||
* Source/Makefile.preamble: Changed to GNUmakefile.preamble.
|
||||
* Source/Makefile.postamble: Changed to GNUmakefile.postamble.
|
||||
* Testing/Makefile: Changed to GNUmakefile.
|
||||
* Testing/Makefile.preamble: Changed to GNUmakefile.preamble.
|
||||
* Testing/Makefile.postamble: Changed to GNUmakefile.postamble.
|
||||
|
||||
Mon Oct 27 09:33:17 1997 Ovidiu Predescu <ovidiu@net-community.com>
|
||||
|
||||
* Source/NSBox.m (-initWithFrame:): Call super's addSubview: method
|
||||
(bug fix from Benhur Stein <Benhur-de-Oliveira.Stein@imag.fr>).
|
||||
(setContentView:): Fixed.
|
||||
|
||||
Tue Oct 21 18:25:14 1997 Ovidiu Predescu <ovidiu@net-community.com>
|
||||
|
||||
* Incorporated some bug fixes from Benhur Stein
|
||||
<Benhur-de-Oliveira.Stein@imag.fr>.
|
||||
* Source/NSApplication.m (setDelegate:): Register the delegate for
|
||||
receiving notifications.
|
||||
(hide:): Post the NSApplicationWillHideNotification and
|
||||
NSApplicationDidHideNotification notifications.
|
||||
(unhideWithoutActivation:): Post NSApplicationWillUnhideNotification
|
||||
and NSApplicationDidUnhideNotification notifications.
|
||||
* Source/NSView.m (visibleRect): Implemented.
|
||||
* Source/NSColorWell.m (initWithFrame:): Assign the color without
|
||||
using ASSIGN.
|
||||
* Source/NSForm (+initialize): New method.
|
||||
(+cellClass): Likewise.
|
||||
(+setCellClass:): Likewise.
|
||||
* Source/NSView.m (addSubview:): Invoke windowWillMoveToWindow:.
|
||||
(replaceSubview:): Likewise.
|
||||
|
||||
Tue Oct 21 16:21:06 1997 Ovidiu Predescu <ovidiu@net-community.com>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,254 +0,0 @@
|
|||
# Documentation makefile for GNUstep GUI Library
|
||||
# Copyright (C) 1996 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Scott Christley <scottc@net-community.com>
|
||||
# Date: August 1996
|
||||
#
|
||||
# This file is part of the GNUstep GUI Library.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Library General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Library General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Library General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation, Inc.,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
|
||||
|
||||
#### Start of system configuration section. ####
|
||||
|
||||
srcdir = .
|
||||
|
||||
MAKEINFO = makeinfo
|
||||
TEXI2DVI = texi2dvi
|
||||
TEXI2HTML = texi2html
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
include $(srcdir)/../Version
|
||||
|
||||
ORIG_FILES = \
|
||||
version.tmpl.texi \
|
||||
gnustep-gui.tmpl.texi \
|
||||
announce.tmpl.texi \
|
||||
install.tmpl.texi \
|
||||
news.tmpl.texi \
|
||||
readme.tmpl.texi \
|
||||
status.tmpl.texi \
|
||||
todo.tmpl.texi \
|
||||
faq.tmpl.texi
|
||||
|
||||
TEXI_FILES = \
|
||||
version.texi \
|
||||
gnustep-gui.texi \
|
||||
announce.texi \
|
||||
install.texi \
|
||||
news.texi \
|
||||
readme.texi \
|
||||
status.texi \
|
||||
todo.texi \
|
||||
faq.texi \
|
||||
|
||||
TEXT_FILES = \
|
||||
TODO INSTALL NEWS README ANNOUNCE FAQ STATUS
|
||||
|
||||
DVI_FILES = gnustep-gui.dvi
|
||||
PS_FILES = gnustep-gui.ps
|
||||
HTML_FILES = gnustep-gui_toc.html
|
||||
INFO_FILES = gnustep-gui.info
|
||||
|
||||
INFO_FLAGS = -I $(srcdir) -D NO-TEXI2HTML --no-header
|
||||
HTML_FLAGS = -split_chapter -expandinfo -I $(srcdir)
|
||||
TEXT_FLAGS = -I $(srcdir) -D NO-TEXI2HTML -D TEXT-ONLY --no-header --no-split
|
||||
|
||||
all: info dvi html text ps
|
||||
|
||||
info: $(INFO_FILES)
|
||||
dvi: $(DVI_FILES)
|
||||
html: $(HTML_FILES)
|
||||
text: $(TEXT_FILES)
|
||||
ps: $(PS_FILES)
|
||||
|
||||
version.tmpl.texi: $(srcdir)/../Version
|
||||
rm -f version.tmpl.texi
|
||||
echo '@set GNUSTEP-GUI-VERSION' $(GNUSTEP_GUI_VERSION) \
|
||||
> version.tmpl.texi
|
||||
echo '@set GNUSTEP-GUI-GCC $(GNUSTEP_GUI_GCC)' \
|
||||
>> version.tmpl.texi
|
||||
echo '@set GNUSTEP-GUI-BASE $(GNUSTEP_GUI_BASE)' \
|
||||
>> version.tmpl.texi
|
||||
echo '@set LIB-FOUNDATION $(LIB_FOUNDATION)' \
|
||||
>> version.tmpl.texi
|
||||
echo '@set GNUSTEP-GUI-LIBTIFF $(GNUSTEP_GUI_LIBTIFF)' \
|
||||
>> version.tmpl.texi
|
||||
echo '@set GNUSTEP-GUI-DGS $(GNUSTEP_GUI_DGS)' \
|
||||
>> version.tmpl.texi
|
||||
echo '@set GNUSTEP-GUI-DPSCLIENT $(GNUSTEP_GUI_DPSCLIENT)' \
|
||||
>> version.tmpl.texi
|
||||
if [ $(GNUSTEP_GUI_FTP_MACHINE) ]; then \
|
||||
echo '@set GNUSTEP-GUI-FTP-MACHINE $(GNUSTEP_GUI_FTP_MACHINE)' \
|
||||
>> version.tmpl.texi; fi
|
||||
if [ $(GNUSTEP_GUI_FTP_DIRECTORY) ]; then \
|
||||
echo '@set GNUSTEP-GUI-FTP-DIRECTORY $(GNUSTEP_GUI_FTP_DIRECTORY)' \
|
||||
>> version.tmpl.texi; fi
|
||||
if [ $(GNUSTEP_GUI_SNAP_FTP_MACHINE) ]; then \
|
||||
echo '@set GNUSTEP-GUI-SNAP-FTP-MACHINE \
|
||||
$(GNUSTEP_GUI_SNAP_FTP_MACHINE)' \
|
||||
>> version.tmpl.texi; fi
|
||||
if [ $(GNUSTEP_GUI_SNAP_FTP_DIRECTORY) ]; then \
|
||||
echo '@set GNUSTEP-GUI-SNAP-FTP-DIRECTORY \
|
||||
$(GNUSTEP_GUI_SNAP_FTP_DIRECTORY)' \
|
||||
>> version.tmpl.texi; fi
|
||||
cp version.tmpl.texi version.texi
|
||||
|
||||
gnustep-gui.dvi: $(ORIG_FILES)
|
||||
rm -f $(TEXI_FILES)
|
||||
for i in $(ORIG_FILES); do \
|
||||
cp $$i `basename $$i .tmpl.texi`.texi ; \
|
||||
done
|
||||
$(TEXI2DVI) $(srcdir)/gnustep-gui.texi
|
||||
|
||||
gnustep-gui.info: $(ORIG_FILES)
|
||||
rm -f $(TEXI_FILES)
|
||||
for i in $(ORIG_FILES); do \
|
||||
sed -e 's,@email{\([^}]*\)},<\1>,g' \
|
||||
$(srcdir)/$$i \
|
||||
| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
|
||||
> `basename $$i .tmpl.texi`.texi ; \
|
||||
done
|
||||
$(MAKEINFO) $(INFO_FLAGS) -o gnustep-gui.info $(srcdir)/gnustep-gui.texi
|
||||
|
||||
gnustep-gui.ps: gnustep-gui.dvi
|
||||
dvips gnustep-gui.dvi -o gnustep-gui.ps
|
||||
|
||||
gnustep-gui_toc.html: $(ORIG_FILES)
|
||||
rm -f $(TEXI_FILES)
|
||||
for i in $(ORIG_FILES); do \
|
||||
sed -e 's,@email{\([^}]*\)},<A HREF="mailto:\1">\1</A>,g' \
|
||||
$(srcdir)/$$i \
|
||||
| sed -e 's,@url{\([^}]*\)},<A HREF="\1">\1</A>,g' \
|
||||
| sed -e 's,^ *$$,@br{},g' \
|
||||
> `basename $$i .tmpl.texi`.texi ; \
|
||||
done
|
||||
$(TEXI2HTML) $(HTML_FLAGS) gnustep-gui.texi
|
||||
|
||||
# Rules for producing the text files
|
||||
README: version.tmpl.texi readme.tmpl.texi
|
||||
sed -e 's,@email{\([^}]*\)},<\1>,g' \
|
||||
$(srcdir)/readme.tmpl.texi \
|
||||
| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
|
||||
> readme.texi ; \
|
||||
$(MAKEINFO) $(TEXT_FLAGS) -o README $(srcdir)/readme.texi
|
||||
|
||||
ANNOUNCE: version.tmpl.texi announce.tmpl.texi
|
||||
sed -e 's,@email{\([^}]*\)},<\1>,g' \
|
||||
$(srcdir)/announce.tmpl.texi \
|
||||
| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
|
||||
> announce.texi ; \
|
||||
$(MAKEINFO) $(TEXT_FLAGS) -o ANNOUNCE $(srcdir)/announce.texi
|
||||
|
||||
INSTALL: version.tmpl.texi install.tmpl.texi
|
||||
sed -e 's,@email{\([^}]*\)},<\1>,g' \
|
||||
$(srcdir)/install.tmpl.texi \
|
||||
| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
|
||||
> install.texi ; \
|
||||
$(MAKEINFO) $(TEXT_FLAGS) -o INSTALL $(srcdir)/install.texi
|
||||
|
||||
NEWS: version.tmpl.texi news.tmpl.texi
|
||||
sed -e 's,@email{\([^}]*\)},<\1>,g' \
|
||||
$(srcdir)/news.tmpl.texi \
|
||||
| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
|
||||
> news.texi ; \
|
||||
$(MAKEINFO) $(TEXT_FLAGS) -o NEWS $(srcdir)/news.texi
|
||||
|
||||
FAQ: version.tmpl.texi faq.tmpl.texi
|
||||
sed -e 's,@email{\([^}]*\)},<\1>,g' \
|
||||
$(srcdir)/faq.tmpl.texi \
|
||||
| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
|
||||
> faq.texi ; \
|
||||
$(MAKEINFO) $(TEXT_FLAGS) -o FAQ $(srcdir)/faq.texi
|
||||
|
||||
STATUS: version.tmpl.texi status.tmpl.texi
|
||||
sed -e 's,@email{\([^}]*\)},<\1>,g' \
|
||||
$(srcdir)/status.tmpl.texi \
|
||||
| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
|
||||
> status.texi ; \
|
||||
$(MAKEINFO) $(TEXT_FLAGS) -o STATUS $(srcdir)/status.texi
|
||||
|
||||
TODO: version.tmpl.texi todo.tmpl.texi
|
||||
sed -e 's,@email{\([^}]*\)},<\1>,g' \
|
||||
$(srcdir)/todo.tmpl.texi \
|
||||
| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
|
||||
> todo.texi ; \
|
||||
$(MAKEINFO) $(TEXT_FLAGS) -o TODO $(srcdir)/todo.texi
|
||||
|
||||
#
|
||||
# GNU Objective-C Runtime Library Manual
|
||||
#
|
||||
objc-runtime.dvi: version.tmpl.texi objc-runtime.tmpl.texi
|
||||
rm -f $(TEXI_FILES)
|
||||
for i in version.tmpl.texi objc-runtime.tmpl.texi; do \
|
||||
cp $$i `basename $$i .tmpl.texi`.texi ; \
|
||||
done
|
||||
$(TEXI2DVI) $(srcdir)/objc-runtime.texi
|
||||
|
||||
objc-runtime.info: version.tmpl.texi objc-runtime.tmpl.texi
|
||||
rm -f $(TEXI_FILES)
|
||||
for i in version.tmpl.texi objc-runtime.tmpl.texi; do \
|
||||
sed -e 's,@email{\([^}]*\)},<\1>,g' \
|
||||
$(srcdir)/$$i \
|
||||
| sed -e 's,@url{\([^}]*\)},@samp{\1},g' \
|
||||
> `basename $$i .tmpl.texi`.texi ; \
|
||||
done
|
||||
$(MAKEINFO) $(INFO_FLAGS) -o objc-runtime.info $(srcdir)/objc-runtime.texi
|
||||
|
||||
objc-runtime.ps: objc-runtime.dvi
|
||||
dvips objc-runtime.dvi -o objc-runtime.ps
|
||||
|
||||
objc-runtime_toc.html: version.tmpl.texi objc-runtime.tmpl.texi
|
||||
rm -f $(TEXI_FILES)
|
||||
for i in version.tmpl.texi objc-runtime.tmpl.texi; do \
|
||||
sed -e 's,@email{\([^}]*\)},<A HREF="mailto:\1">\1</A>,g' \
|
||||
$(srcdir)/$$i \
|
||||
| sed -e 's,@url{\([^}]*\)},<A HREF="\1">\1</A>,g' \
|
||||
| sed -e 's,^ *$$,@br{},g' \
|
||||
> `basename $$i .tmpl.texi`.texi ; \
|
||||
done
|
||||
$(TEXI2HTML) $(HTML_FLAGS) objc-runtime.texi
|
||||
|
||||
install:
|
||||
uninstall:
|
||||
|
||||
update-top: ANNOUNCE FAQ INSTALL NEWS README TODO STATUS
|
||||
cp ANNOUNCE ..
|
||||
cp FAQ ..
|
||||
cp INSTALL ..
|
||||
cp NEWS ..
|
||||
cp README ..
|
||||
cp TODO ..
|
||||
cp STATUS ..
|
||||
|
||||
mostlyclean:
|
||||
rm -f *~
|
||||
rm -f *.aux *.cp *.cps *.fn *.fns
|
||||
rm -f *.ky *.log *.pg *.toc *.tp *.vr
|
||||
rm -f $(TEXI_FILES)
|
||||
rm -f objc-runtime.texi
|
||||
|
||||
distclean clean: mostlyclean
|
||||
rm -f version.tmpl.texi
|
||||
rm -f $(TEXT_FILES)
|
||||
rm -f *.html
|
||||
rm -f *.info
|
||||
rm -f *.dvi
|
||||
rm -f *.ps
|
||||
|
||||
maintainer-clean: distclean
|
||||
|
|
@ -32,8 +32,8 @@ include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make
|
|||
#
|
||||
SUBPROJECTS = Source Images Tools
|
||||
|
||||
-include Makefile.preamble
|
||||
-include GNUmakefile.preamble
|
||||
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/aggregate.make
|
||||
|
||||
-include Makefile.postamble
|
||||
-include GNUmakefile.postamble
|
||||
|
|
@ -51,10 +51,10 @@ common_SliderVert.tiff \
|
|||
common_Dimple.tiff \
|
||||
common_ret.tiff
|
||||
|
||||
-include Makefile.preamble
|
||||
-include GNUmakefile.preamble
|
||||
|
||||
# We don't actually build anything in this directory so
|
||||
# just include the common makefile rules
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
|
||||
|
||||
-include Makefile.postamble
|
||||
-include GNUmakefile.postamble
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Makefile.postamble
|
||||
# GNUmakefile.postamble
|
||||
#
|
||||
# Copyright (C) 1997 Free Software Foundation, Inc.
|
||||
#
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#
|
||||
# Makefile.postamble
|
||||
# GNUmakefile.postamble
|
||||
#
|
||||
# Project specific makefile rules
|
||||
#
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
#
|
||||
# Makefile.postamble
|
||||
#
|
||||
# Copyright (C) 1997 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Scott Christley <scottc@net-community.com>
|
||||
#
|
||||
# This file is part of the GNUstep GUI Library.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Library General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Library General Public License for more details.
|
||||
#
|
||||
# If you are interested in a warranty or support for this source code,
|
||||
# contact Scott Christley at scottc@net-community.com
|
||||
#
|
||||
# You should have received a copy of the GNU Library General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#
|
||||
# Makefile.postamble
|
||||
#
|
||||
# Project specific makefile rules
|
||||
#
|
||||
# Uncomment the targets you want.
|
||||
# The double colons (::) are important, do not make them single colons
|
||||
# otherwise the normal makefile rules will not be performed.
|
||||
#
|
||||
|
||||
# Things to do before compiling
|
||||
# before-all::
|
||||
|
||||
# Things to do after compiling
|
||||
# after-all::
|
||||
|
||||
# Things to do before installing
|
||||
# before-install::
|
||||
|
||||
# Things to do after installing
|
||||
# after-install::
|
||||
|
||||
# Things to do before uninstalling
|
||||
# before-uninstall::
|
||||
|
||||
# Things to do after uninstalling
|
||||
# after-uninstall::
|
||||
|
||||
# Things to do before cleaning
|
||||
# before-clean::
|
||||
|
||||
# Things to do after cleaning
|
||||
after-clean::
|
||||
cd Headers ; cd gnustep ; cd gui ; rm -f *~
|
||||
cd Headers ; cd gnustep ; cd dps ; rm -f *~
|
||||
|
||||
# Things to do before distcleaning
|
||||
# before-distclean::
|
||||
|
||||
# Things to do after distcleaning
|
||||
after-distclean::
|
||||
rm -f config.status config.log config.cache TAGS config.mak
|
||||
cd Headers ; rm -rf AppKit ; rm -rf DPSClient
|
||||
|
||||
# Things to do before checking
|
||||
# before-check::
|
||||
|
||||
# Things to do after checking
|
||||
# after-check::
|
||||
|
|
@ -183,8 +183,8 @@ DPSClient/DPSOperators.h \
|
|||
DPSClient/TypesandConstants.h
|
||||
|
||||
|
||||
-include Makefile.preamble
|
||||
-include GNUmakefile.preamble
|
||||
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/library.make
|
||||
|
||||
-include Makefile.postamble
|
||||
-include GNUmakefile.postamble
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Makefile.postamble
|
||||
# GNUmakefile.postamble
|
||||
#
|
||||
# Copyright (C) 1997 Free Software Foundation, Inc.
|
||||
#
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#
|
||||
# Makefile.postamble
|
||||
# GNUmakefile.postamble
|
||||
#
|
||||
# Project specific makefile rules
|
||||
#
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Makefile.preamble
|
||||
# GNUmakefile.preamble
|
||||
#
|
||||
# Copyright (C) 1997 Free Software Foundation, Inc.
|
||||
#
|
||||
|
|
@ -26,12 +26,12 @@
|
|||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
#
|
||||
# Makefile.preamble
|
||||
# GNUmakefile.preamble
|
||||
#
|
||||
# Project specific makefile variables, and additional
|
||||
#
|
||||
# Do not put any Makefile rules in this file, instead they should
|
||||
# be put into Makefile.postamble.
|
||||
# Do not put any GNUmakefile rules in this file, instead they should
|
||||
# be put into GNUmakefile.postamble.
|
||||
#
|
||||
|
||||
#
|
||||
|
|
@ -1,397 +0,0 @@
|
|||
# @configure_input@
|
||||
#
|
||||
# Main makefile for GNUstep GUI Library
|
||||
# Copyright (C) 1996, 1996 Free Software Foundation, Inc.
|
||||
#
|
||||
# Author: Scott Christley <scottc@net-community.com>
|
||||
#
|
||||
# This file is part of the GNUstep GUI Library.
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Library General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Library General Public License for more details.
|
||||
#
|
||||
# If you are interested in a warranty or support for this source code,
|
||||
# contact Scott Christley at scottc@net-community.com
|
||||
#
|
||||
# You should have received a copy of the GNU Library General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
#### Start of system configuration section. ####
|
||||
|
||||
# The main executable or library
|
||||
MAIN_FILE=libgnustep-gui
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
libdir = @libdir@
|
||||
gnustep_libdir = $(libdir)/gnustep
|
||||
includedir = @includedir@
|
||||
bindir = @bindir@
|
||||
|
||||
MAKEDEFINES =
|
||||
|
||||
CC = @CC@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CFLAGS = -g -O -Wall $(GCCFLAGS)
|
||||
ALL_CPPFLAGS = $(CPPFLAGS) -I../Headers
|
||||
ALL_CFLAGS = $(ALL_CPPFLAGS) $(CFLAGS)
|
||||
DEFS = -DGNUSTEP_INSTALL_LIBDIR=\"$(gnustep_libdir)\" @DEFS@
|
||||
|
||||
GCC_LIB =
|
||||
SYS_LIBS =
|
||||
ADD_LIBS = @LIBS@
|
||||
|
||||
exeext =
|
||||
oext = .o
|
||||
libext = .a
|
||||
resext = .res
|
||||
rcext = .rc
|
||||
|
||||
LN_S = @LN_S@
|
||||
|
||||
LDFLAGS = @LDFLAGS@ -o
|
||||
LD = ld
|
||||
|
||||
LDOUT =
|
||||
AR = ar
|
||||
AROUT =
|
||||
ARFLAGS = rc
|
||||
RANLIB = @RANLIB@
|
||||
RC =
|
||||
DLLTOOL = @DLLTOOL@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
||||
INIT_FILE =
|
||||
INIT_FILE_OBJ=$(INIT_FILE)$(oext)
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
include $(srcdir)/../Version
|
||||
|
||||
GNUSTEP1_HEADERS = gui/AppKit.h \
|
||||
gui/NSActionCell.h \
|
||||
gui/NSApplication.h \
|
||||
gui/NSBitmapImageRep.h \
|
||||
gui/NSBox.h \
|
||||
gui/NSBrowser.h \
|
||||
gui/NSBrowserCell.h \
|
||||
gui/NSButton.h \
|
||||
gui/NSButtonCell.h \
|
||||
gui/NSCStringText.h \
|
||||
gui/NSCachedImageRep.h \
|
||||
gui/NSCell.h \
|
||||
gui/NSClipView.h \
|
||||
gui/NSColor.h \
|
||||
gui/NSColorList.h \
|
||||
gui/NSColorPanel.h \
|
||||
gui/NSColorPicker.h \
|
||||
gui/NSColorPicking.h \
|
||||
gui/NSColorWell.h \
|
||||
gui/NSControl.h \
|
||||
gui/NSCursor.h \
|
||||
gui/NSCustomImageRep.h
|
||||
|
||||
GNUSTEP2_HEADERS = gui/NSDataLink.h \
|
||||
gui/NSDataLinkManager.h \
|
||||
gui/NSDataLinkPanel.h \
|
||||
gui/NSDragging.h \
|
||||
gui/NSEPSImageRep.h \
|
||||
gui/NSEvent.h \
|
||||
gui/NSFont.h \
|
||||
gui/NSFontManager.h \
|
||||
gui/NSFontPanel.h \
|
||||
gui/NSForm.h \
|
||||
gui/NSFormCell.h \
|
||||
gui/NSGraphics.h \
|
||||
gui/NSHelpPanel.h \
|
||||
gui/NSImage.h \
|
||||
gui/NSImageRep.h \
|
||||
gui/NSMatrix.h \
|
||||
gui/NSMenu.h \
|
||||
gui/NSMenuItem.h \
|
||||
gui/NSNibLoading.h \
|
||||
gui/NSOpenPanel.h \
|
||||
gui/NSPageLayout.h \
|
||||
gui/NSPanel.h \
|
||||
gui/NSPasteboard.h \
|
||||
gui/NSPopUpButton.h \
|
||||
gui/NSPrintInfo.h \
|
||||
gui/NSPrintOperation.h \
|
||||
gui/NSPrintPanel.h
|
||||
|
||||
GNUSTEP3_HEADERS = gui/NSPrinter.h \
|
||||
gui/NSResponder.h \
|
||||
gui/NSSavePanel.h \
|
||||
gui/NSScreen.h \
|
||||
gui/NSScrollView.h \
|
||||
gui/NSScroller.h \
|
||||
gui/NSSelection.h \
|
||||
gui/NSSlider.h \
|
||||
gui/NSSliderCell.h \
|
||||
gui/NSSpellChecker.h \
|
||||
gui/NSSpellProtocol.h \
|
||||
gui/NSSpellServer.h \
|
||||
gui/NSSplitView.h \
|
||||
gui/NSText.h \
|
||||
gui/NSTextField.h \
|
||||
gui/NSTextFieldCell.h \
|
||||
gui/NSView.h \
|
||||
gui/NSWindow.h \
|
||||
gui/NSWorkspace.h \
|
||||
gui/TrackingRectangle.h \
|
||||
gui/config.h \
|
||||
gui/nsimage-tiff.h \
|
||||
gui/PSMatrix.h
|
||||
|
||||
GNUSTEP_DPS_HEADERS = dps/NSDPSContext.h \
|
||||
dps/DPSOperators.h \
|
||||
dps/TypesandConstants.h
|
||||
|
||||
OBJS_WITHOUT_INIT = $(MAIN_FILE)$(oext) \
|
||||
NSActionCell$(oext) \
|
||||
NSApplication$(oext) \
|
||||
NSBitmapImageRep$(oext) \
|
||||
NSBox$(oext) \
|
||||
NSBrowser$(oext) \
|
||||
NSBrowserCell$(oext) \
|
||||
NSBundleAdditions$(oext) \
|
||||
NSButton$(oext) \
|
||||
NSButtonCell$(oext) \
|
||||
NSCStringText$(oext) \
|
||||
NSCachedImageRep$(oext) \
|
||||
NSCell$(oext) \
|
||||
NSClipView$(oext) \
|
||||
NSColor$(oext) \
|
||||
NSColorList$(oext) \
|
||||
NSColorPanel$(oext) \
|
||||
NSColorPicker$(oext) \
|
||||
NSColorWell$(oext) \
|
||||
NSControl$(oext) \
|
||||
NSCursor$(oext) \
|
||||
NSCustomImageRep$(oext) \
|
||||
NSDataLink$(oext) \
|
||||
NSDataLinkManager$(oext) \
|
||||
NSDataLinkPanel$(oext) \
|
||||
NSDPSContext$(oext) \
|
||||
NSEPSImageRep$(oext) \
|
||||
NSEvent$(oext) \
|
||||
NSFont$(oext) \
|
||||
NSFontManager$(oext) \
|
||||
NSFontPanel$(oext) \
|
||||
NSForm$(oext) \
|
||||
NSFormCell$(oext) \
|
||||
NSHelpPanel$(oext) \
|
||||
NSImage$(oext) \
|
||||
NSImageRep$(oext) \
|
||||
NSMatrix$(oext) \
|
||||
NSMenu$(oext) \
|
||||
NSMenuItem$(oext) \
|
||||
NSOpenPanel$(oext) \
|
||||
NSPageLayout$(oext) \
|
||||
NSPanel$(oext) \
|
||||
NSPasteboard$(oext) \
|
||||
NSPrinter$(oext) \
|
||||
NSPrintInfo$(oext) \
|
||||
NSPrintOperation$(oext) \
|
||||
NSPrintPanel$(oext) \
|
||||
NSPopUpButton$(oext) \
|
||||
NSResponder$(oext) \
|
||||
NSSavePanel$(oext) \
|
||||
NSScreen$(oext) \
|
||||
NSScroller$(oext) \
|
||||
NSScrollView$(oext) \
|
||||
NSSelection$(oext) \
|
||||
NSSlider$(oext) \
|
||||
NSSliderCell$(oext) \
|
||||
NSSpellChecker$(oext) \
|
||||
NSSpellServer$(oext) \
|
||||
NSSplitView$(oext) \
|
||||
NSText$(oext) \
|
||||
NSTextField$(oext) \
|
||||
NSTextFieldCell$(oext) \
|
||||
NSView$(oext) \
|
||||
NSWindow$(oext) \
|
||||
NSWorkspace$(oext) \
|
||||
TrackingRectangle$(oext) \
|
||||
PSMatrix$(oext) \
|
||||
tiff$(oext) \
|
||||
externs$(oext)
|
||||
|
||||
OBJS = $(OBJS_WITHOUT_INIT)
|
||||
|
||||
.SUFFIXES: .m
|
||||
.m$(oext):
|
||||
$(CC) @OBJC_RUNTIME_FLAG@ -c $(ALL_CFLAGS) $(DEFS) -o $@ $<
|
||||
.c$(oext):
|
||||
$(CC) -c $(ALL_CFLAGS) $(DEFS) -o $@ $<
|
||||
|
||||
#
|
||||
# libraries
|
||||
#
|
||||
LIBS = $(GCC_LIB) $(SYS_LIBS) $(ADD_LIBS)
|
||||
|
||||
IMPORT_LIBRARY=@IMPORT_LIBRARY@
|
||||
|
||||
#
|
||||
# targets
|
||||
#
|
||||
|
||||
all: header_links src gpbs
|
||||
|
||||
header_links:
|
||||
-rm -rf ../Headers/AppKit
|
||||
$(LN_S) ../Headers/gnustep/gui ../Headers/AppKit
|
||||
-rm -rf ../Headers/DPSClient
|
||||
$(LN_S) ../Headers/gnustep/dps ../Headers/DPSClient
|
||||
|
||||
src: @STATIC_LIBRARY@ @SHARED_LIBRARY@
|
||||
|
||||
gpbs: gpbs.m
|
||||
$(CC) $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) -g -w -o $@ $< \
|
||||
NSPasteboard.o $(LIBS)
|
||||
|
||||
# library
|
||||
$(MAIN_FILE)$(libext): $(OBJS)
|
||||
$(AR) $(ARFLAGS) $(AROUT)$(MAIN_FILE)$(libext) $(OBJS)
|
||||
$(RANLIB) $(MAIN_FILE)$(libext)
|
||||
|
||||
# static library when building DLL
|
||||
$(MAIN_FILE)_s$(libext): $(OBJS)
|
||||
$(AR) $(ARFLAGS) $(AROUT)$(MAIN_FILE)_s$(libext) $(OBJS)
|
||||
$(RANLIB) $(MAIN_FILE)_s$(libext)
|
||||
|
||||
$(MAIN_FILE).def: FORCE
|
||||
nm @STATIC_LIBRARY@ \
|
||||
| grep '^........ [T] _' \
|
||||
| sed 's/[^_]*_//' >> $(MAIN_FILE).lst
|
||||
cat win32-def.top $(MAIN_FILE).lst > $(MAIN_FILE).def
|
||||
rm $(MAIN_FILE).lst
|
||||
|
||||
# build DLL
|
||||
$(MAIN_FILE).dll: @STATIC_LIBRARY@ win32-entry$(oext)
|
||||
# Link DLL.
|
||||
$(CC) -dll -Wl,--base-file -Wl,$(MAIN_FILE).base \
|
||||
-o $(MAIN_FILE).dll @STATIC_LIBRARY@ win32-entry$(oext) \
|
||||
-ltiff -lgnustep-base \
|
||||
-lmoldname -lobjc -lkernel32 -lwsock32 -ladvapi32
|
||||
$(DLLTOOL) --dllname $(MAIN_FILE).dll \
|
||||
--def $(MAIN_FILE).def --base-file \
|
||||
$(MAIN_FILE).base --output-exp $(MAIN_FILE).exp
|
||||
$(CC) -dll -Wl,--base-file -Wl,$(MAIN_FILE).base \
|
||||
$(MAIN_FILE).exp \
|
||||
-o $(MAIN_FILE).dll @STATIC_LIBRARY@ win32-entry$(oext) \
|
||||
-ltiff -lgnustep-base \
|
||||
-lmoldname -lobjc -lkernel32 -lwsock32 -ladvapi32
|
||||
$(DLLTOOL) --dllname $(MAIN_FILE).dll \
|
||||
--def $(MAIN_FILE).def \
|
||||
--base-file $(MAIN_FILE).base \
|
||||
--output-exp $(MAIN_FILE).exp
|
||||
$(CC) -dll $(MAIN_FILE).exp \
|
||||
-o $(MAIN_FILE).dll @STATIC_LIBRARY@ win32-entry$(oext) \
|
||||
-ltiff -lgnustep-base \
|
||||
-lmoldname -lobjc -lkernel32 -lwsock32 -ladvapi32
|
||||
# Build the import library to link to:
|
||||
$(DLLTOOL) --dllname $(MAIN_FILE).dll \
|
||||
--def $(MAIN_FILE).def \
|
||||
--output-lib $(IMPORT_LIBRARY)
|
||||
ar r $(IMPORT_LIBRARY) externs$(oext)
|
||||
|
||||
#
|
||||
# Initialization routine
|
||||
#
|
||||
$(INIT_FILE_OBJ): $(OBJS_WITHOUT_INIT)
|
||||
nm $(OBJS_WITHOUT_INIT) | grep " __GLOBAL_" > tmpinit.c
|
||||
collect tmpinit.c $(INIT_FILE)
|
||||
$(CC) $(ALL_CFLAGS) $(INIT_FILE).c
|
||||
rm tmpinit.c
|
||||
|
||||
install: installdirs install-lib install-headers
|
||||
|
||||
installdirs:
|
||||
$(srcdir)/../mkinstalldirs \
|
||||
$(libdir) \
|
||||
$(libdir)/gnustep \
|
||||
$(includedir)/gnustep \
|
||||
$(includedir)/gnustep/dps \
|
||||
$(includedir)/gnustep/gui
|
||||
|
||||
install-lib: src
|
||||
$(INSTALL_PROGRAM) $(MAIN_FILE)$(libext) $(libdir)
|
||||
$(RANLIB) $(libdir)/$(MAIN_FILE)$(libext)
|
||||
# Install the static library if it exists
|
||||
if [ -e $(MAIN_FILE)_s$(libext) ]; then \
|
||||
$(INSTALL_DATA) $(MAIN_FILE)_s$(libext) $(libdir) ; \
|
||||
$(RANLIB) $(libdir)/$(MAIN_FILE)_s$(libext) ; \
|
||||
fi
|
||||
# Install the DLL if it exists
|
||||
if [ -e $(MAIN_FILE).dll ]; then \
|
||||
$(INSTALL_DATA) $(MAIN_FILE).dll $(bindir) ; \
|
||||
fi
|
||||
|
||||
install-headers:
|
||||
for file in $(GNUSTEP1_HEADERS); do \
|
||||
$(INSTALL_DATA) ../Headers/gnustep/$$file \
|
||||
$(includedir)/gnustep/$$file ; \
|
||||
done
|
||||
for file in $(GNUSTEP2_HEADERS); do \
|
||||
$(INSTALL_DATA) ../Headers/gnustep/$$file \
|
||||
$(includedir)/gnustep/$$file ; \
|
||||
done
|
||||
for file in $(GNUSTEP3_HEADERS); do \
|
||||
$(INSTALL_DATA) ../Headers/gnustep/$$file \
|
||||
$(includedir)/gnustep/$$file ; \
|
||||
done
|
||||
for file in $(GNUSTEP_DPS_HEADERS); do \
|
||||
$(INSTALL_DATA) ../Headers/gnustep/$$file \
|
||||
$(includedir)/gnustep/$$file ; \
|
||||
done
|
||||
cd $(includedir); rm -rf AppKit; $(LN_S) ./gnustep/gui ./AppKit
|
||||
cd $(includedir); rm -rf DPSClient; $(LN_S) ./gnustep/dps ./DPSClient
|
||||
# end of install targets
|
||||
|
||||
uninstall:
|
||||
rm -rf $(includedir)/gnustep/dps
|
||||
rm -rf $(includedir)/gnustep/gui
|
||||
rm -rf $(includedir)/AppKit
|
||||
rm -rf $(includedir)/DPSClient
|
||||
rm -f $(libdir)/$(MAIN_FILE)$(libext)
|
||||
rm -f $(libdir)/$(MAIN_FILE)_s$(libext)
|
||||
rm -f $(bindir)/$(MAIN_FILE).dll
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in ../config.status
|
||||
cd ..; $(SHELL) config.status
|
||||
|
||||
#
|
||||
# Cleaning
|
||||
#
|
||||
mostlyclean:
|
||||
clean:
|
||||
rm -f *~
|
||||
rm -f *$(oext)
|
||||
rm -f $(MAIN_FILE)$(libext)
|
||||
rm -f $(MAIN_FILE)_s$(libext)
|
||||
rm -f $(MAIN_FILE).dll $(MAIN_FILE).exp $(MAIN_FILE).base
|
||||
rm -f $(INIT_FILE).c
|
||||
distclean: clean
|
||||
rm -f Makefile
|
||||
maintainer-clean: distclean
|
||||
|
||||
FORCE:
|
||||
|
|
@ -426,11 +426,17 @@ static id NSApp;
|
|||
|
||||
// Not in queue so wait for next event
|
||||
while (!done) {
|
||||
NSDate* limitDate = [currentLoop limitDateForMode:mode];
|
||||
/* Retain the limitDate so it doesn't get release accidentally by
|
||||
runMode:beforeDate: if a timer which has this date as fire date gets
|
||||
released. */
|
||||
NSDate* limitDate = [[currentLoop limitDateForMode:mode] retain];
|
||||
NSDate* originalLimitDate = limitDate;
|
||||
|
||||
event = [self _eventMatchingMask:mask];
|
||||
if (event)
|
||||
if (event) {
|
||||
[limitDate release];
|
||||
break;
|
||||
}
|
||||
|
||||
if (limitDate)
|
||||
limitDate = [expiration earlierDate:limitDate];
|
||||
|
|
@ -441,6 +447,7 @@ static id NSApp;
|
|||
[self _flushCommunicationChannels];
|
||||
[currentLoop runMode:mode beforeDate:limitDate];
|
||||
|
||||
[originalLimitDate release];
|
||||
event = [self _eventMatchingMask:mask];
|
||||
if (event)
|
||||
break;
|
||||
|
|
@ -568,6 +575,11 @@ static id NSApp;
|
|||
- (void)hide:sender
|
||||
{
|
||||
int i, count;
|
||||
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
|
||||
|
||||
// notify that we will hide
|
||||
[nc postNotificationName: NSApplicationWillHideNotification
|
||||
object: self];
|
||||
|
||||
// TODO: hide the menu
|
||||
|
||||
|
|
@ -576,6 +588,10 @@ static id NSApp;
|
|||
[[window_list objectAtIndex:i] performHide:sender];
|
||||
|
||||
app_is_hidden = YES;
|
||||
|
||||
// notify that we did hide
|
||||
[nc postNotificationName: NSApplicationDidHideNotification
|
||||
object: self];
|
||||
}
|
||||
|
||||
- (BOOL)isHidden
|
||||
|
|
@ -601,7 +617,17 @@ static id NSApp;
|
|||
|
||||
- (void)unhideWithoutActivation
|
||||
{
|
||||
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
|
||||
|
||||
// notify that we will unhide
|
||||
[nc postNotificationName: NSApplicationWillUnhideNotification
|
||||
object: self];
|
||||
|
||||
[self unhide: self];
|
||||
|
||||
// notify that we did unhide
|
||||
[nc postNotificationName: NSApplicationDidUnhideNotification
|
||||
object: self];
|
||||
}
|
||||
|
||||
//
|
||||
|
|
@ -660,9 +686,18 @@ static id NSApp;
|
|||
- (void)updateWindows
|
||||
{
|
||||
int i, count;
|
||||
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
|
||||
|
||||
// notify that we will update
|
||||
[nc postNotificationName: NSApplicationWillUpdateNotification
|
||||
object: self];
|
||||
|
||||
for (i = 0, count = [window_list count]; i < count; i++)
|
||||
[[window_list objectAtIndex:i] update];
|
||||
|
||||
// notify that we did update
|
||||
[nc postNotificationName: NSApplicationDidUpdateNotification
|
||||
object: self];
|
||||
}
|
||||
|
||||
- (NSArray *)windows
|
||||
|
|
@ -865,12 +900,28 @@ static id NSApp;
|
|||
|
||||
- (void)setDelegate:anObject
|
||||
{
|
||||
NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
|
||||
|
||||
delegate = anObject;
|
||||
|
||||
if ([delegate respondsToSelector:@selector(applicationDidFinishLaunching:)])
|
||||
[[NSNotificationCenter defaultCenter] addObserver:delegate
|
||||
selector:@selector(applicationDidFinishLaunching:)
|
||||
name:NSApplicationDidFinishLaunchingNotification object:self];
|
||||
#define SET_DELEGATE_NOTIFICATION(notif_name) \
|
||||
if ([delegate respondsToSelector:@selector(application##notif_name:)]) \
|
||||
[nc addObserver:delegate \
|
||||
selector:@selector(application##notif_name:) \
|
||||
name:NSApplication##notif_name##Notification object:self]
|
||||
|
||||
SET_DELEGATE_NOTIFICATION(DidBecomeActive);
|
||||
SET_DELEGATE_NOTIFICATION(DidFinishLaunching);
|
||||
SET_DELEGATE_NOTIFICATION(DidHide);
|
||||
SET_DELEGATE_NOTIFICATION(DidResignActive);
|
||||
SET_DELEGATE_NOTIFICATION(DidUnhide);
|
||||
SET_DELEGATE_NOTIFICATION(DidUpdate);
|
||||
SET_DELEGATE_NOTIFICATION(WillBecomeActive);
|
||||
SET_DELEGATE_NOTIFICATION(WillFinishLaunching);
|
||||
SET_DELEGATE_NOTIFICATION(WillHide);
|
||||
SET_DELEGATE_NOTIFICATION(WillResignActive);
|
||||
SET_DELEGATE_NOTIFICATION(WillUnhide);
|
||||
SET_DELEGATE_NOTIFICATION(WillUpdate);
|
||||
}
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -70,7 +70,8 @@
|
|||
border_type = NSLineBorder;
|
||||
title_position = NSAtTop;
|
||||
title_rect = NSZeroRect;
|
||||
[self setContentView: [[NSView alloc] init]];
|
||||
content_view = [NSView new];
|
||||
[super addSubview:content_view];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
|
@ -169,26 +170,11 @@
|
|||
|
||||
- (void)setContentView:(NSView *)aView
|
||||
{
|
||||
if (content_view)
|
||||
{
|
||||
// Tell view that it is no longer in a window
|
||||
[content_view viewWillMoveToWindow:nil];
|
||||
[content_view release];
|
||||
}
|
||||
[aView retain];
|
||||
[content_view release];
|
||||
content_view = aView;
|
||||
[content_view retain];
|
||||
|
||||
// We only have one view in our subview array
|
||||
[sub_views release];
|
||||
sub_views = [NSMutableArray array];
|
||||
if ([sub_views count] == 0)
|
||||
{
|
||||
[sub_views addObject:aView];
|
||||
}
|
||||
|
||||
[content_view setSuperview:self];
|
||||
[content_view setNextResponder:self];
|
||||
[content_view viewWillMoveToWindow:window];
|
||||
[self replaceSubview:content_view with:aView];
|
||||
[content_view setFrame: [self calcSizes]];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
is_bordered = YES;
|
||||
is_active = NO;
|
||||
ASSIGN(the_color, [NSColor blackColor]);
|
||||
the_color = [[NSColor blackColor] retain];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,6 +32,30 @@
|
|||
|
||||
@implementation NSForm
|
||||
|
||||
/* Class variables */
|
||||
static Class defaultCellClass = nil;
|
||||
|
||||
+ (void)initialize
|
||||
{
|
||||
if (self == [NSForm class]) {
|
||||
/* Set the initial version */
|
||||
[self setVersion: 1];
|
||||
|
||||
/* Set the default cell class */
|
||||
defaultCellClass = [NSFormCell class];
|
||||
}
|
||||
}
|
||||
|
||||
+ (Class)cellClass
|
||||
{
|
||||
return defaultCellClass;
|
||||
}
|
||||
|
||||
+ (void)setCellClass:(Class)classId
|
||||
{
|
||||
defaultCellClass = classId;
|
||||
}
|
||||
|
||||
- (NSFormCell*)addEntry:(NSString*)title
|
||||
{
|
||||
return [self insertEntry:title atIndex:[self numberOfRows]];
|
||||
|
|
|
|||
|
|
@ -187,12 +187,13 @@ static NSRecursiveLock *gnustep_gui_nsview_lock = nil;
|
|||
}
|
||||
|
||||
// Add to our subview list
|
||||
[sub_views addObject:(id)aView];
|
||||
[aView viewWillMoveToWindow:window];
|
||||
[aView setSuperview:self];
|
||||
[aView setNextResponder:self];
|
||||
[aView viewWillMoveToWindow:window];
|
||||
[sub_views addObject:(id)aView];
|
||||
}
|
||||
|
||||
/* This method needs to be worked out!!! */
|
||||
- (void)addSubview:(NSView *)aView
|
||||
positioned:(NSWindowOrderingMode)place
|
||||
relativeTo:(NSView *)otherView
|
||||
|
|
@ -268,6 +269,8 @@ static NSRecursiveLock *gnustep_gui_nsview_lock = nil;
|
|||
// No superview then just return
|
||||
if (!super_view) return;
|
||||
|
||||
[self viewWillMoveToWindow:nil];
|
||||
|
||||
views = [super_view subviews];
|
||||
[views removeObjectIdenticalTo:self];
|
||||
}
|
||||
|
|
@ -275,10 +278,26 @@ static NSRecursiveLock *gnustep_gui_nsview_lock = nil;
|
|||
- (void)replaceSubview:(NSView *)oldView
|
||||
with:(NSView *)newView
|
||||
{
|
||||
int index = [sub_views indexOfObjectIdenticalTo:oldView];
|
||||
if (!newView)
|
||||
return;
|
||||
|
||||
if (index != NSNotFound)
|
||||
[sub_views replaceObjectAtIndex:index withObject:newView];
|
||||
if (!oldView)
|
||||
[self addSubview:newView];
|
||||
else {
|
||||
int index = [sub_views indexOfObjectIdenticalTo:oldView];
|
||||
|
||||
if (index != NSNotFound) {
|
||||
[oldView viewWillMoveToWindow:nil];
|
||||
[oldView setSuperview:nil];
|
||||
[newView setNextResponder:nil];
|
||||
|
||||
[sub_views replaceObjectAtIndex:index withObject:newView];
|
||||
|
||||
[newView viewWillMoveToWindow:window];
|
||||
[newView setSuperview:self];
|
||||
[newView setNextResponder:self];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (void)sortSubviewsUsingFunction:(int (*)(id ,id ,void *))compare
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ TOOL_NAME = testpb
|
|||
# The source files to be compiled
|
||||
testpb_OBJC_FILES = testpb.m
|
||||
|
||||
-include Makefile.preamble
|
||||
-include GNUmakefile.preamble
|
||||
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/tool.make
|
||||
|
||||
-include Makefile.postamble
|
||||
-include GNUmakefile.postamble
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Makefile.postamble
|
||||
# GNUmakefile.postamble
|
||||
#
|
||||
# Project specific makefile rules
|
||||
#
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
#
|
||||
# Makefile.preamble
|
||||
# GNUmakefile.preamble
|
||||
#
|
||||
# Project specific makefile variables, and additional
|
||||
#
|
||||
# Do not put any Makefile rules in this file, instead they should
|
||||
# be put into Makefile.postamble.
|
||||
# Do not put any GNUmakefile rules in this file, instead they should
|
||||
# be put into GNUmakefile.postamble.
|
||||
#
|
||||
|
||||
#
|
||||
|
|
@ -1,144 +0,0 @@
|
|||
#
|
||||
# Makefile for GNUstep GUI Library Test Examples
|
||||
# Copyright (C) 1996 Free Software Foundation, Inc.
|
||||
#
|
||||
# Written by: Scott Christley <scottc@net-community.com>
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Library General Public
|
||||
# License as published by the Free Software Foundation; either
|
||||
# version 2 of the License, or (at your option) any later version.
|
||||
#
|
||||
# This library is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# Library General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Library General Public
|
||||
# License along with this library; see the file COPYING.LIB.
|
||||
# If not, write to the Free Software Foundation, Inc.,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
SHELL = /bin/sh
|
||||
|
||||
#### Start of system configuration section. ####
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
CC = @CC@
|
||||
|
||||
CFLAGS = -Wall -Wno-implicit -g -O
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
LDFLAGS =
|
||||
|
||||
DYNAMIC_BUNDLER_LINKER=@DYNAMIC_BUNDLER_LINKER@
|
||||
DYNAMIC_LDFLAGS=@DYNAMIC_LDFLAGS@
|
||||
DYNAMIC_CFLAGS=@DYNAMIC_CFLAGS@
|
||||
DEFS = @DEFS@
|
||||
LIBS = -L../Source -lgnustep-gui @LIBS@ -lm
|
||||
EXEEXT =
|
||||
OEXT = .o
|
||||
LIBEXT = .a
|
||||
|
||||
#### End of system configuration section. ####
|
||||
|
||||
ALL_CPPFLAGS = -I.. -I../Headers $(CPPFLAGS)
|
||||
ALL_CFLAGS = $(CFLAGS)
|
||||
ALL_OBJCFLAGS = $(CFLAGS) -Wno-protocol
|
||||
ALL_LDFLAGS = $(LDFLAGS) $(LIBS)
|
||||
|
||||
.SUFFIXES: .m
|
||||
.m$(OEXT):
|
||||
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_OBJCFLAGS) $< -o $*$(OEXT)
|
||||
.c$(OEXT):
|
||||
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(ALL_CFLAGS) $< -o $*$(OEXT)
|
||||
|
||||
SRCS = \
|
||||
nsarchiver.m \
|
||||
testpb.m
|
||||
|
||||
HDRS =
|
||||
|
||||
EXCS = $(SRCS:.m=)
|
||||
EXECS = $(SRCS:.m=$(EXEEXT))
|
||||
|
||||
BUNDLE_NAME=LoadMe
|
||||
DYNAMIC_MFILES = \
|
||||
LoadMe.m \
|
||||
MyCategory.m \
|
||||
SecondClass.m
|
||||
|
||||
DYNAMIC_HFILES = \
|
||||
LoadMe.h \
|
||||
MyCategory.h \
|
||||
SecondClass.h
|
||||
|
||||
DYNAMIC_OFILES = $(DYNAMIC_MFILES:.m=$(OEXT))
|
||||
|
||||
RCS_FILES = $(SRCS) $(HDRS) $(DYNAMIC_MFILES) $(DYNAMIC_HFILES) \
|
||||
Makefile.in NXStringTable.example Makefile.sed.nt
|
||||
DIST_FILES = $(RCS_FILES)
|
||||
|
||||
# type 'make bundles' if you also want to check bundles.
|
||||
all: $(EXCS)
|
||||
|
||||
# This works for GNU make, but not others.
|
||||
# %: %$(OEXT) $(srcdir)/../src/libobjects$(LIBEXT)
|
||||
# $(CC) $(ALL_CFLAGS) $< -o $@ $(ALL_LDFLAGS)
|
||||
# How can I do this in a better way than the ugliness below?
|
||||
# (but also have it work on old-style /bin/make)
|
||||
|
||||
LINK_CMD = $(CC) $(ALL_CFLAGS) $@$(OEXT) -o $@ $(ALL_LDFLAGS)
|
||||
|
||||
diningPhilosophers: diningPhilosophers$(OEXT) ../libgnustep-gui$(LIBEXT)
|
||||
$(LINK_CMD)
|
||||
|
||||
nsarchiver: nsarchiver$(OEXT) ../Source/libgnustep-gui$(LIBEXT)
|
||||
$(LINK_CMD)
|
||||
|
||||
testpb: testpb$(OEXT) ../Source/libgnustep-gui$(LIBEXT)
|
||||
$(LINK_CMD)
|
||||
|
||||
install:
|
||||
uninstall:
|
||||
|
||||
echo-excs:
|
||||
@echo $(EXCS)
|
||||
|
||||
remote: server client
|
||||
|
||||
# These next few lines give an example of how to compile, link and store
|
||||
# a bundle.
|
||||
bundles: $(BUNDLE_NAME).bundle/$(BUNDLE_NAME)
|
||||
|
||||
$(DYNAMIC_OFILES): $(DYNAMIC_MFILES) $(DYNAMIC_HFILES)
|
||||
$(CC) -c $(ALL_CPPFLAGS) $(DEFS) $(DYNAMIC_CFLAGS) $(ALL_OBJCFLAGS) \
|
||||
$(srcdir)/$*.m -o $*$(OEXT)
|
||||
|
||||
$(BUNDLE_NAME).bundle/$(BUNDLE_NAME): $(DYNAMIC_OFILES)
|
||||
-mkdir $(BUNDLE_NAME).bundle
|
||||
-mkdir $(BUNDLE_NAME).bundle/English.lproj
|
||||
$(DYNAMIC_BUNDLER_LINKER) -o $(BUNDLE_NAME).bundle/$(BUNDLE_NAME) \
|
||||
$(DYNAMIC_OFILES)
|
||||
cp $(srcdir)/NXStringTable.example $(BUNDLE_NAME).bundle/English.lproj
|
||||
|
||||
mostlyclean:
|
||||
rm -f core *~ test08.data textcoder.txt
|
||||
|
||||
clean: mostlyclean
|
||||
rm -f *$(OEXT) $(EXECS)
|
||||
rm -rf $(BUNDLE_NAME).bundle
|
||||
|
||||
distclean: clean
|
||||
rm -f Makefile config.status
|
||||
|
||||
realclean: distclean
|
||||
rm -f TAGS
|
||||
|
||||
copy-dist: $(DIST_FILES)
|
||||
mkdir ../snap/checks
|
||||
ln $(DIST_FILES) ../snap/checks
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in
|
||||
cd ..; $(SHELL) config.status
|
||||
Loading…
Reference in a new issue