Merge from dawn branch

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

ChangeLog

@@ -1,3 +1,7 @@
+1999-03-08  Adam Fedor  <fedor@gnu.org>
+
+	* Merge dawn branch into main.
+
 Mon Mar  8  8:55:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSClipView.m: Tidied a little, including minor fixes for
@@ -65,10 +69,6 @@ Mon Mar  1 17:12:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Headers/AppKit/NSCell.h: Added MacOS-X cell state constants.
 
-1999-03-01  Adam Fedor  <fedor@gnu.org>
-
-	* Update documentation.
-
 Thu Feb 25 15:00:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	Added support for the new (MacOS-X) NSGraphicsContext class by
@@ -123,6 +123,23 @@ Sun Feb 21 20:36:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 	* Source/NSView.m: Bugfix in update, plus partial code for improved
 	coordinate handling.
 
+1999-03-08  Adam Fedor  <fedor@gnu.org>
+
+	* Version 0.5.5 Released.
+
+Sun Mar  7  5:58:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSView.m: Fixed error invalidating coordinates of a view.
+
+1999-03-04  Adam Fedor  <fedor@gnu.org>
+
+	* Testing/GNUmakefile.preamble: Remove tiff and jpeg libs.
+	* Tools/GNUmakefile.preamble: Likewise (already in make package).
+
+1999-03-01  Adam Fedor  <fedor@gnu.org>
+
+	* Update documentation.
+
 Wed Feb 24  8:56:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	Benhur reported oddity in cell drawing code - cells were drawing their

Documentation/todo.tmpl.texi

@@ -19,14 +19,4 @@ Also fix or document whatever bugs are there.
 
 @item Need an rtf parser [6 - Objective-C, RTF] (980820).
 
-@item
-Expand the image handling capabilities beyond OpenStep.  There is no
-reason why we must limit ourselves to EPS and TIFF bitmaps, we should
-have image representations for as many bitmap formats as possible;
-excluding GIF files which are currently restricted by patents.
-
-@item
-The spell server and checker; along with this would be to create an
-interface with the GNU Dictionary project.
-
 @end itemize

Source/NSCell.m

@@ -621,6 +621,13 @@
 {
   cellFrame = NSInsetRect(cellFrame, xDist, yDist);
 
+  // Clear the cell frame
+  if ([self isOpaque])
+    {
+      [[NSColor lightGrayColor] set];
+      NSRectFill(cellFrame);
+    }
+
   switch ([self type])
     {
       case NSTextCellType:

Source/NSScrollView.m

@@ -7,7 +7,7 @@
    Date: July 1997
    Author:  Felipe A. Rodriguez <far@ix.netcom.com>
    Date: October 1998
-   Author:  Richard Frith-Macdoanld <richard@brainstorm.co.uk>
+   Author:  Richard Frith-Macdonald <richard@brainstorm.co.uk>
    Date: February 1999
 
    This file is part of the GNUstep GUI Library.

Source/NSTextFieldCell.m

@@ -79,8 +79,8 @@
   [self setEditable:YES];
   [self setAlignment:NSLeftTextAlignment];
 
-  [self setBackgroundColor: [NSColor whiteColor]];
-  [self setTextColor: [NSColor blackColor]];
+  [self setBackgroundColor: [NSColor textBackgroundColor]];
+  [self setTextColor: [NSColor textColor]];
   [self setFont: [NSFont systemFontOfSize:0]];
   draw_background = YES;
   return self;

Testing/Functions.m

@@ -0,0 +1,305 @@
+
+/* 
+   Functions.m
+
+   Copyright (C) 1998 Free Software Foundation, Inc.
+
+   Author:  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+   Date: November 1998
+   
+   This file is part of the GNUstep Project
+
+   This library is free software; you can redistribute it and/or 
+   modify it under the terms of the GNU General Public License
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
+   
+   You should have received a copy of the GNU 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.
+
+*/ 
+
+#include <Foundation/NSObject.h>
+#include <Foundation/NSGeometry.h>
+#include <AppKit/NSGraphics.h>
+#include <AppKit/NSCStringText.h>
+#include <AppKit/NSEvent.h>
+
+
+/*
+ * Dummy definitions provided here to avoid errors when not linking with
+ * a back end.
+ */
+
+BOOL initialize_gnustep_backend(void)
+{
+  return YES;
+}
+void NSHighlightRect(NSRect aRect)
+{}
+void NSRectClip(NSRect aRect)
+{}
+void NSRectFill(NSRect aRect)
+{}
+void NSFrameRect(NSRect aRect)
+{}
+void NSEraseRect(NSRect aRect)
+{}
+void NSDrawButton(NSRect aRect, NSRect clipRect)
+{}
+void NSDrawGrayBezel(NSRect aRect, NSRect clipRect)
+{}
+void NSDrawGroove(NSRect aRect, NSRect clipRect)
+{}
+void PSlineto(float x, float y)
+{}
+void PSmoveto(float x, float y)
+{}
+void PSrlineto(float x, float y)
+{}
+void PSsetgray(float num)
+{}
+void PSstroke(void)
+{}
+void PSsetlinewidth(float width)
+{}
+void PSgrestore(void)
+{}
+void PSgsave(void)
+{}
+
+void GSfill() {}
+void GSsetgray() {}
+void GSnewpath() {}
+void GSgrestore() {}
+void GSrectfill() {}
+void GSsetlinewidth() {}
+void GSclosepath() {}
+void GSshow() {}
+void GStranslate() {}
+void GSmoveto() {}
+void GSgsave() {}
+void GSlineto() {}
+void GSstroke() {}
+void GSrlineto() {}
+void GSrectclip() {}
+
+
+@interface  GMModel : NSObject
+@end
+
+@implementation GMModel
+@end
+
+@interface  GMUnarchiver : NSObject
+@end
+
+@implementation GMUnarchiver
+@end
+
+@interface  NSWindowView : NSObject
+@end
+
+@implementation NSWindowView
+@end
+
+@interface  GPSDrawContext : NSObject
+@end
+
+@implementation GPSDrawContext
+@end
+
+
+void NSDrawWhiteBezel(NSRect aRect, NSRect clipRect)
+{
+}
+
+void NSDrawBezel(NSRect aRect, NSRect clipRect)
+{
+}
+
+
+NSRect NSDrawTiledRects(NSRect boundsRect, NSRect clipRect, 
+			const NSRectEdge *sides, const float *grays, int count)
+{
+  return NSZeroRect;
+}
+
+const NSWindowDepth *NSAvailableWindowDepths(void)
+{
+  return NULL;
+}
+
+NSWindowDepth NSBestDepth(NSString *colorSpace, 
+			  int bitsPerSample, int bitsPerPixel, 
+			  BOOL planar, BOOL *exactMatch)
+{
+  return 0;
+}
+
+int NSBitsPerPixelFromDepth(NSWindowDepth depth)
+{
+  return 0;
+}
+
+int NSBitsPerSampleFromDepth(NSWindowDepth depth)
+{
+  return 0;
+}
+
+NSString *NSColorSpaceFromDepth(NSWindowDepth depth)
+{
+  return nil;
+}
+
+int NSNumberOfColorComponents(NSString *colorSpaceName)
+{
+  return 0;
+}
+
+BOOL NSPlanarFromDepth(NSWindowDepth depth)
+{
+  return NO;
+}
+
+NSColor *NSReadPixel(NSPoint location)
+{
+  return nil;
+}
+
+unsigned short NSEditorFilter(unsigned short theChar, 
+			      int flags, NSStringEncoding theEncoding)
+{
+  return 0;
+}
+
+unsigned short NSFieldFilter(unsigned short theChar, 
+			     int flags, NSStringEncoding theEncoding)
+{
+  return 0;
+}
+
+int NSDrawALine(id self, NSLayInfo *layInfo)
+{
+  return 0;
+}
+
+int NSScanALine(id self, NSLayInfo *layInfo)
+{
+  return 0;
+}
+
+void NSTextFontInfo(id fid, 
+		    float *ascender, float *descender, 
+		    float *lineHeight)
+{}
+
+NSData * NSDataWithWordTable(const unsigned char *smartLeft,
+			     const unsigned char *smartRight,
+			     const unsigned char *charClasses,
+			     const NSFSM *wrapBreaks,
+			     int wrapBreaksCount,
+			     const NSFSM *clickBreaks, 
+			     int clickBreaksCount, 
+			     BOOL charWrap)
+{
+  return nil;
+}
+
+void NSReadWordTable(NSZone *zone,
+		     NSData *data,
+		     unsigned char **smartLeft,
+		     unsigned char **smartRight,
+		     unsigned char **charClasses,
+		     NSFSM **wrapBreaks,
+		     int *wrapBreaksCount,
+		     NSFSM **clickBreaks,
+		     int *clickBreaksCount, 
+		     BOOL *charWrap)
+{}
+
+//
+// Array Allocation Functions for Use by the NSText Class
+//
+NSTextChunk *NSChunkCopy(NSTextChunk *pc, NSTextChunk *dpc)
+{
+  return NULL;
+}
+
+NSTextChunk *NSChunkGrow(NSTextChunk *pc, int newUsed)
+{
+  return NULL;
+}
+
+NSTextChunk *NSChunkMalloc(int growBy, int initUsed)
+{
+  return NULL;
+}
+
+NSTextChunk *NSChunkRealloc(NSTextChunk *pc)
+{
+  return NULL;
+}
+
+NSTextChunk *NSChunkZoneCopy(NSTextChunk *pc, 
+                             NSTextChunk *dpc,
+                             NSZone *zone)
+{
+  return NULL;
+}
+
+NSTextChunk *NSChunkZoneGrow(NSTextChunk *pc, int newUsed, NSZone *zone)
+{
+  return NULL;
+}
+
+NSTextChunk *NSChunkZoneMalloc(int growBy, int initUsed, NSZone *zone)
+{
+  return NULL;
+}
+
+NSTextChunk *NSChunkZoneRealloc(NSTextChunk *pc, NSZone *zone)
+{
+  return NULL;
+}
+
+void NSCopyBitmapFromGState(int srcGstate, NSRect srcRect, NSRect destRect)
+{
+}
+
+void NSCopyBits(int srcGstate, NSRect srcRect, NSPoint destPoint)
+{
+}
+
+void NSDrawBitmap(NSRect rect,
+                  int pixelsWide,
+                  int pixelsHigh,
+                  int bitsPerSample,
+                  int samplesPerPixel,
+                  int bitsPerPixel,
+                  int bytesPerRow, 
+                  BOOL isPlanar,
+                  BOOL hasAlpha, 
+                  NSString *colorSpaceName, 
+                  const unsigned char *const data[5])
+{
+}
+
+void NSBeep(void)
+{
+}
+
+//
+// Draw a Distinctive Outline around Linked Data
+//
+void NSFrameLinkRect(NSRect aRect, BOOL isDestination)
+{
+}
+
+float NSLinkFrameThickness(void)
+{
+  return 0;
+}
+

Testing/GNUmakefile.preamble

@@ -30,10 +30,10 @@ ADDITIONAL_INCLUDE_DIRS += -I../Headers -I$(GNUSTEP_SYSTEM_ROOT)/Headers
 ADDITIONAL_LIB_DIRS += -L../Source/$(GNUSTEP_OBJ_DIR) -L/usr/local/lib -L../Model/$(GNUSTEP_OBJ_DIR)
 
 # Additional libraries when linking tools
-ADDITIONAL_TOOL_LIBS += -lgnustep-gui -ltiff -ljpeg
+ADDITIONAL_TOOL_LIBS += -lgnustep-gui $(SYSTEM_LIBS)
 
 # Additional libraries when linking applications
-ADDITIONAL_GUI_LIBS += -lgnustep-gui -ltiff -ljpeg
+#ADDITIONAL_GUI_LIBS +=
 
 #
 # Flags dealing with installing and uninstalling