Merge from 0.8.5 branch

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

ANNOUNCE

@@ -1,7 +1,7 @@
 ANNOUNCE
 ********
 
-This is version 0.8.4 of the GNUstep GUI library (`gnustep-gui').
+This is version 0.8.5 of the GNUstep GUI library (`gnustep-gui').
 
 What is the GNUstep GUI Library?
 ================================
@@ -28,6 +28,11 @@ systems.
 GNUstep Base Library, the TIFF Graphics library, and a back-end
 component like the GNUstep 'Back' Backend.
 
+Noteworthy changes in version `0.8.5'
+=====================================
+
+   Bug fixes. NSStringDrawing now uses text system implementation.
+
 Noteworthy changes in version `0.8.4'
 =====================================
 
@@ -45,7 +50,7 @@ Alexander Malmberg. Other improvements include:
 Where can you get it?  How can you compile it?
 ==============================================
 
-   The gstep-gui-0.8.4.tar.gz distribution file has been placed on
+   The gstep-gui-0.8.5.tar.gz distribution file has been placed on
 `ftp.gnustep.org' in `pub/gnustep/core'.
 
    the TIFF Graphics library version 3.4 is required.

ChangeLog

@@ -1,3 +1,7 @@
+2003-03-24  Adam Fedor  <fedor@gnu.org>
+
+	* Merge from 0.8.5 branch
+
 2003-03-23 Serg Stoyan <stoyan@on.com.ua>
 	* Source/NSMenuView.m: Removed horizontal menu related code.
 	(setHorizontal:): Removed.
@@ -275,6 +279,37 @@
 	(-textStorage:edited:range:changeInLength:invalidatedRange:): Fix
 	handling of trailing text containers when soft-invalidating.
 
+2003-03-24  Adam Fedor  <fedor@gnu.org>
+
+	* Version: 0.8.5
+
+2003-03-24  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSBox.m (-sizeToFit): Set frame to calculated size when
+	content view has no subviews.
+
+2003-03-18 17:54  Alexander Malmberg <alexander@malmberg.org>
+
+	* Source/NSFont.m, Source/NSStringDrawing.m,
+	Headers/gnustep/gui/NSStringDrawing.h: Change to an implementation
+	that uses the text system.
+
+2003-03-07  Richard Frith-Macdonald <rfm@gnu.org>
+
+        * Source/NSWindow: ([-miniaturise:]) order the counterpart window
+        in so that it gets drawn properly.
+
+2003-03-04  Adam Fedor  <fedor@gnu.org>
+
+	* Headers/gnustep/gui/GMAppKit.h, GMArchiver.h, IMConnectors.h,
+	IMCustomObject.h, IMLoading.h, NSNibConnector.h: Change #import to
+	#include
+	* Model/Controller.[h,m], GMAppKit.m, GMArchiveObjects.m,
+	GMArchiver.m, IBClasses.[hm], IMConnectors.h, IMLoading.m,
+	Translator.[hm], nib2gmodel.m, test.m: Idem.
+
+	* Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c: Fixes for FreeBSD.
+
 2003-02-24  Adam Fedor  <fedor@gnu.org>
 
 	* Version: 0.8.4

Documentation/news.texi

@@ -9,6 +9,10 @@
 The currently released version of the library is @samp{@value{GNUSTEP-GUI-VERSION}}.
 @end ifclear
 
+@section Noteworthy changes in version @samp{0.8.5}
+
+Bug fixes. NSStringDrawing now uses text system implementation.
+
 @section Noteworthy changes in version @samp{0.8.4}
 
 This release features a brand new text and layout system thanks

Headers/gnustep/gui/GMAppKit.h

@@ -27,7 +27,7 @@
 #define _GNUstep_H_GMAppKit
 
 #include <AppKit/AppKit.h>
-#import <gnustep/gui/GMArchiver.h>
+#include <gnustep/gui/GMArchiver.h>
 
 @interface NSApplication (GMArchiverMethods) <ModelCoding>
 @end

Headers/gnustep/gui/GMArchiver.h

@@ -29,10 +29,14 @@
 #ifndef __GMArchiver_h__
 #define __GMArchiver_h__
 
-#import <Foundation/NSCoder.h>
+#ifndef GNUSTEP
-#import <Foundation/NSHashTable.h>
+#include <Foundation/Foundation.h>
-#import <Foundation/NSMapTable.h>
+#else
-#import <Foundation/NSGeometry.h>
+#include <Foundation/NSCoder.h>
+#include <Foundation/NSHashTable.h>
+#include <Foundation/NSMapTable.h>
+#include <Foundation/NSGeometry.h>
+#endif
 
 @class NSString;
 @class NSData;

Headers/gnustep/gui/IMConnectors.h

@@ -30,7 +30,11 @@
 #ifndef _GNUstep_H_IMConnectors
 #define _GNUstep_H_IMConnectors
 
-#import <Foundation/NSObject.h>
+#ifndef GNUSTEP
+#include <Foundation/Foundation.h>
+#else
+#include <Foundation/NSObject.h>
+#endif
 
 @interface IMConnector : NSObject
 {

Headers/gnustep/gui/IMCustomObject.h

@@ -30,8 +30,12 @@
 #ifndef _GNUstep_H_IMCustomObject
 #define _GNUstep_H_IMCustomObject
 
-#import <Foundation/NSObject.h>
+#ifndef GNUSTEP
-#import <AppKit/NSView.h>
+#include <AppKit/AppKit.h>
+#else
+#include <Foundation/NSObject.h>
+#include <AppKit/NSView.h>
+#endif
 
 /* Add an archiving category to object so every object can respond to
    -nibInstantiate

Headers/gnustep/gui/IMLoading.h

@@ -26,7 +26,11 @@
 #ifndef _GNUstep_H_IMLoading
 #define _GNUstep_H_IMLoading
 
-#import <Foundation/NSBundle.h>
+#ifndef GNUSTEP
+#include <Foundation/Foundation.h>
+#else
+#include <Foundation/NSBundle.h>
+#endif
 
 @interface NSObject (NibAwaking)
 - (void)awakeFromModel;

Headers/gnustep/gui/NSNibConnector.h

@@ -26,7 +26,11 @@
 #ifndef _GNUstep_H_NSNibConnector
 #define _GNUstep_H_NSNibConnector
 
-#import <Foundation/NSObject.h>
+#ifndef GNUSTEP
+#include <Foundation/Foundation.h>
+#else
+#include <Foundation/NSObject.h>
+#endif
 
 @interface NSNibConnector : NSObject <NSCoding>
 {

Headers/gnustep/gui/NSStringDrawing.h

@@ -51,10 +51,6 @@
 - (void) drawAtPoint: (NSPoint)point;
 - (void) drawInRect: (NSRect)rect;
 
--(NSSize) sizeRange:(NSRange) aRange;
--(void) drawRange:(NSRange) aRange atPoint:(NSPoint) aPoint;
--(void) drawRange:(NSRange) aRange inRect:(NSRect) aRect;
-
 @end
 
 #endif /* _GNUstep_H_NSStringDrawing */

Model/Controller.h

@@ -1,4 +1,4 @@
-#import <AppKit/AppKit.h>
+#include <AppKit/AppKit.h>
 
 @interface Controller : NSObject
 {

Model/Controller.m

@@ -1,4 +1,4 @@
-#import "Controller.h"
+#include "Controller.h"
 
 @implementation Controller
 

Model/GMAppKit.m

@@ -23,8 +23,6 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */
 
-#import <Foundation/NSArray.h>
-#import <Foundation/NSException.h>
 #include "gnustep/gui/GMAppKit.h"
 
 #ifndef AUTORELEASE

Model/GMArchiveObjects.m

@@ -34,7 +34,11 @@
   symbol from the category's file in order to force it link.
  */
 
-#import <Foundation/NSData.h>
+#ifndef GNUSTEP
+#include <Foundation/Foundation.h>
+#else
+#include <Foundation/NSData.h>
+#endif
 
 
 @implementation NSObject (ModelArchivingMethods)

Model/GMArchiver.m

@@ -26,16 +26,20 @@
 /* Portions of the code are based on NSArchiver from libFoundation. See the
    COPYING file from libFoundation for copyright information. */
 
-#import <Foundation/NSString.h>
+#ifndef GNUSTEP
-#import <Foundation/NSArray.h>
+#include <Foundation/Foundation.h>
-#import <Foundation/NSDictionary.h>
+#else
-#import <Foundation/NSData.h>
+#include <Foundation/NSString.h>
-#import <Foundation/NSDebug.h>
+#include <Foundation/NSArray.h>
-#import <Foundation/NSObjCRuntime.h>
+#include <Foundation/NSDictionary.h>
-#import <Foundation/NSEnumerator.h>
+#include <Foundation/NSData.h>
-#import <Foundation/NSScanner.h>
+#include <Foundation/NSDebug.h>
-#import <Foundation/NSException.h>
+#include <Foundation/NSObjCRuntime.h>
-#import <Foundation/NSArchiver.h>
+#include <Foundation/NSEnumerator.h>
+#include <Foundation/NSScanner.h>
+#include <Foundation/NSException.h>
+#include <Foundation/NSArchiver.h>
+#endif
 
 #ifndef AUTORELEASE
 #define AUTORELEASE(object)     [object autorelease]

Model/IBClasses.h

@@ -29,7 +29,11 @@
 #ifndef _GNUstep_H_IBClasses
 #define _GNUstep_H_IBClasses
 
-#import <AppKit/NSView.h>
+#ifndef GNUSTEP
+#include <AppKit/AppKit.h>
+#else
+#include <AppKit/NSView.h>
+#endif
 
 @class NSString;
 

Model/IBClasses.m

@@ -25,10 +25,11 @@
 
 #include <stdio.h>
 
-#import <Foundation/NSCoder.h>
+#ifdef GNUSTEP
-#import <Foundation/NSString.h>
+#include <Foundation/NSString.h>
-#import <Foundation/NSArray.h>
+#include <Foundation/NSArray.h>
-#import <gnustep/gui/GMArchiver.h>
+#endif
+#include <gnustep/gui/GMArchiver.h>
 
 #ifdef __APPLE__
 #import <AppKit/NSNibConnector.h>
@@ -36,10 +37,10 @@
 #import <AppKit/NSNibControlConnector.h>
 #endif
 
-#import "IBClasses.h"
+#include "IBClasses.h"
-#import "Translator.h"
+#include "Translator.h"
-#import "IMConnectors.h"
+#include "IMConnectors.h"
-#import "gnustep/gui/IMCustomObject.h"
+#include "gnustep/gui/IMCustomObject.h"
 
 //#define DEBUG
 

Model/IMConnectors.h

@@ -30,7 +30,11 @@
 #ifndef _GNUstep_H_IMConnectors
 #define _GNUstep_H_IMConnectors
 
-#import <Foundation/NSObject.h>
+#ifndef GNUSTEP
+#include <Foundation/Foundation.h>
+#else
+#include <Foundation/NSObject.h>
+#endif
 
 @interface IMConnector : NSObject
 {

Model/IMLoading.m

@@ -23,10 +23,14 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */
 
-#import <Foundation/NSDictionary.h>
+#ifndef GNUSTEP
-#import <Foundation/NSArray.h>
+#include <Foundation/Foundation.h>
-#import <Foundation/NSFileManager.h>
+#else
-#import <Foundation/NSPathUtilities.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSArray.h>
+#include <Foundation/NSFileManager.h>
+#include <Foundation/NSPathUtilities.h>
+#endif
 
 #include "gnustep/gui/GMArchiver.h"
 #include "gnustep/gui/IMLoading.h"
@@ -204,7 +208,7 @@ BOOL _fileOwnerDecoded = NO;
 
 
 #if GNU_RUNTIME
-#import "IMConnectors.h"
+#include "IMConnectors.h"
 
 static void __dummyFunctionForLinking (void)
 {

Model/Translator.h

@@ -26,7 +26,11 @@
 #ifndef _GNUstep_H_Translator
 #define _GNUstep_H_Translator
 
-#import <Foundation/NSObject.h>
+#ifndef GNUSTEP
+#include <Foundation/Foundation.h>
+#else
+#include <Foundation/NSObject.h>
+#endif
 
 @class NSMutableArray;
 

Model/Translator.m

@@ -30,12 +30,11 @@
    Imran Qureshi.
  */
 
-#import <Foundation/NSNotification.h>
+#include <AppKit/AppKit.h>
-#import <AppKit/AppKit.h>
+#include "gnustep/gui/GMArchiver.h"
-#import "gnustep/gui/GMArchiver.h"
+#include "gnustep/gui/IMLoading.h"
-#import "gnustep/gui/IMLoading.h"
+#include "IBClasses.h"
-#import "IBClasses.h"
+#include "Translator.h"
-#import "Translator.h"
 
 NSMutableArray* objects;
 NSMutableArray* connections;

Model/nib2gmodel.m

@@ -25,11 +25,8 @@
 
 #include <stdio.h>
 
-#import <Foundation/NSAutoreleasePool.h>
+#include <Foundation/Foundation.h>
-#import <Foundation/NSProcessInfo.h>
+#include "Translator.h"
-#import <Foundation/NSArray.h>
-#import <Foundation/NSString.h>
-#import "Translator.h"
 
 int main ()
 {

Model/test.m

@@ -1,5 +1,5 @@
-#import <Foundation/Foundation.h>
+#include <Foundation/Foundation.h>
-#import <AppKit/AppKit.h>
+#include <AppKit/AppKit.h>
 
 int main (int argc, char** argv, char** env)
 {

NEWS

@@ -1,7 +1,12 @@
 NEWS
 ****
 
-The currently released version of the library is `0.8.4'.
+The currently released version of the library is `0.8.5'.
+
+Noteworthy changes in version `0.8.5'
+=====================================
+
+   Bug fixes. NSStringDrawing now uses text system implementation.
 
 Noteworthy changes in version `0.8.4'
 =====================================

README

@@ -1,7 +1,7 @@
 README
 ******
 
-This is version 0.8.4 of the GNUstep GUI library (`gnustep-gui').
+This is version 0.8.5 of the GNUstep GUI library (`gnustep-gui').
 
    Here is some introductory info to get you started:
 

Source/NSBox.m

@@ -301,7 +301,7 @@
 	}
       else // _content_view has no subviews
 	{
-	  [_content_view setFrame: NSZeroRect];
+  	  [_content_view setFrame: [self calcSizesAllowingNegative: NO]];
 	}
     }
 

Source/NSFont.m

@@ -749,6 +749,12 @@ setNSFont(NSString* key, NSFont* font)
 			screenFont: screenFont]);
 }
 
+static BOOL flip_hack;
++(void) _setFontFlipHack: (BOOL)flip
+{
+  flip_hack = flip;
+}
+
 //
 // Setting the Font
 //
@@ -760,7 +766,7 @@ setNSFont(NSString* key, NSFont* font)
 {
   NSGraphicsContext *ctxt = GSCurrentContext();
 
-  if (matrixExplicitlySet == NO && [[NSView focusView] isFlipped])
+  if (matrixExplicitlySet == NO && ([[NSView focusView] isFlipped] || flip_hack))
     [ctxt GSSetFont: [[self _flippedViewFont] fontRef]];
   else
     [ctxt GSSetFont: [self fontRef]];

Tools/gsnd/portaudio/pa_unix_oss/pa_unix_oss.c

@@ -95,7 +95,9 @@ PaDriverInfo;
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifndef __FreeBSD__
 #include <malloc.h>
+#endif
 #include <memory.h>
 #include <math.h>
 #include <sys/ioctl.h>
@@ -110,8 +112,12 @@ PaDriverInfo;
 #ifdef __linux__
 #include <linux/soundcard.h>
 #else
+#ifdef __FreeBSD__
+#include <sys/soundcard.h>
+#else
 #include <machine/soundcard.h> /* JH20010905 */
 #endif
+#endif
 
 #include "portaudio.h"
 #include "pa_host.h"

Version

@@ -11,7 +11,7 @@ GNUSTEP_GUI_LIBTIFF=3.4
 # The version number of this release.
 GNUSTEP_GUI_MAJOR_VERSION=0
 GNUSTEP_GUI_MINOR_VERSION=8
-GNUSTEP_GUI_SUBMINOR_VERSION=4
+GNUSTEP_GUI_SUBMINOR_VERSION=5
 GNUSTEP_GUI_VERSION=${GNUSTEP_GUI_MAJOR_VERSION}.${GNUSTEP_GUI_MINOR_VERSION}.${GNUSTEP_GUI_SUBMINOR_VERSION}
 VERSION=${GNUSTEP_GUI_VERSION}