Minor fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2059 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,13 @@
+Thu Jan 23 15:10:13 1997  Scott Christley  <scottc@net-community.com>
+
+	* Makefile.in (install): Don't force make of source.
+	* Source/Makefile.in: Use configure variables for libdir,
+	includedir, bindir, and links.
+	* Source/NSCell.m (-stringValue, -setStringValue:): Make copies.
+	* Source/NSColorList.m (NSColorListNotEditableException): Already
+	defined in NSApplication.
+	* Source/NSTextFieldCell.m (-initWithFrame:): Bezeled by default.
+
 Thu Dec  5 06:58:51 1996  GNUstep Development  <gnustep@net-community.com>
 
 	* Source/NSColorList.m: Fill out implementation.

Makefile.in

@@ -41,7 +41,7 @@ all: Source
 Source Documentation: FORCE
 	cd $@; $(MAKE) $(MAKEDEFINES)
 
-install uninstall TAGS: Source
+install uninstall TAGS: FORCE
 	for i in $(SUBDIRS); do \
 	  (cd $$i; $(MAKE) $(MAKEDEFINES) $@); \
 	done

Source/Makefile.in

@@ -38,8 +38,9 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-libdir = $(exec_prefix)/lib
-includedir = $(prefix)/include
+libdir = @libdir@
+includedir = @includedir@
+bindir = @bindir@
 
 MAKEDEFINES =
 
@@ -258,9 +259,9 @@ all: header_links src
 
 header_links:
 	-rm -rf ../Headers/AppKit
-	$(LN_S) ../Headers/gnustep/gui ../Headers/AppKit
+	cp -r ../Headers/gnustep/gui ../Headers/AppKit
 	-rm -rf ../Headers/DPSClient
-	$(LN_S) ../Headers/gnustep/dps ../Headers/DPSClient
+	cp -r ../Headers/gnustep/dps ../Headers/DPSClient
 
 src: $(MAIN_FILE)$(libext)
 
@@ -289,10 +290,6 @@ installdirs:
 		$(includedir)/gnustep \
 		$(includedir)/gnustep/dps \
 		$(includedir)/gnustep/gui
-	if [ -d $(includedir)/AppKit ] ; then true ; else \
-		$(LN_S) $(includedir)/gnustep/gui $(includedir)/AppKit ; fi
-	if [ -d $(includedir)/DPSClient ] ; then true ; else \
-		$(LN_S) $(includedir)/gnustep/dps $(includedir)/DPSClient ; fi
 
 install-lib: $(MAIN_FILE)$(libext)
 	$(INSTALL_PROGRAM) $(MAIN_FILE)$(libext) $(libdir)
@@ -315,6 +312,8 @@ install-headers:
 		$(INSTALL_DATA) ../Headers/gnustep/$$file \
 			$(includedir)/gnustep/$$file ; \
 	done
+	cd $(includedir); rm -rf AppKit; cp -r ./gnustep/gui ./AppKit
+	cd $(includedir); rm -rf DPSClient; cp -r ./gnustep/dps ./DPSClient
 
 install-resource:
 	for file in $(GNUSTEP_RESOURCE); do \

Source/NSCell.m

@@ -245,7 +245,7 @@
 
 - (NSString *)stringValue
 {
-  return contents;
+  return [NSString stringWithCString: [contents cString]];
 }
 
 - (void)setDoubleValue:(double)aDouble
@@ -291,7 +291,10 @@
 
 - (void)setStringValue:(NSString *)aString
 {
-  contents = aString;
+  if (!aString)
+    contents = @"";
+  else
+    contents = [NSString stringWithCString: [aString cString]];
 }
 
 //

Source/NSColorList.m

@@ -35,9 +35,6 @@
 // NSColorList notifications
 NSString *NSColorListChangedNotification = @"NSColorListChange";
 
-// NSColorList exceptions
-NSString *NSColorListNotEditableException = @"NSColorListNotEditable";
-
 // global variable
 static NSMutableArray *gnustep_available_color_lists;
 static NSLock *gnustep_color_list_lock;

Source/NSTextFieldCell.m

@@ -70,6 +70,7 @@
 
   [self setEnabled:YES];
   [self setBordered:YES];
+  [self setBezeled:YES];
   [self setScrollable:YES];
   [self setEditable:YES];
   [self setAlignment:NSLeftTextAlignment];