Misc bugfixes

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

Source/NSClipView.m

@@ -5,6 +5,8 @@
 
    Author: Ovidiu Predescu <ovidiu@net-community.com>
    Date: July 1997
+   Author:  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+   Date: January 1999
 
    This file is part of the GNUstep GUI Library.
 
@@ -184,7 +186,7 @@
       [_documentView setNeedsDisplayInRect:
               [self convertRect: newBounds toView: _documentView]];
     }
-  [super_view reflectScrolledClipView:self];
+  [super_view reflectScrolledClipView: self];
 }
 
 - (NSPoint) constrainScrollPoint: (NSPoint)proposedNewOrigin

Source/NSScrollView.m

@@ -271,7 +271,7 @@ static Class rulerViewClass = nil;
   [self tile];
 }
 
-- (void)_doScroll: (NSScroller*)scroller
+- (void) _doScroll: (NSScroller*)scroller
 {
   float floatValue = [scroller floatValue];
   NSRect clipViewBounds = [_contentView bounds];
@@ -342,12 +342,6 @@ static Class rulerViewClass = nil;
     }
 
   [_contentView scrollToPoint: point];
-  // scroll clipview
-  // reflectScrolledClipView has been called by the clipView.
-
-  //FIXME: should this be here?
-  // NSWindow's doc says update is called for each event
-  [window update];
 }
 
 - (void) reflectScrolledClipView: (NSClipView*)aClipView
@@ -495,13 +489,14 @@ static Class rulerViewClass = nil;
       contentRect.origin.y += scrollerWidth + 1;
     }
 
-  // If the document view is not flipped reverse the meaning
-  // of the vertical scroller's
-  if (![_contentView isFlipped])
-    [_vertScroller setFloatValue: 1];
   [_horizScroller setFrame: horizScrollerRect];
   [_vertScroller setFrame: vertScrollerRect];
   [_contentView setFrame: contentRect];
+#if 1
+  // [_contentView viewFrameChanged: nil];
+  // update scroller
+  [self reflectScrolledClipView: (NSClipView*)_contentView];
+#endif
 }
 
 - (void) drawRect: (NSRect)rect
@@ -586,12 +581,6 @@ static Class rulerViewClass = nil;
   if (_contentView && ![_contentView isFlipped])
     [_vertScroller setFloatValue: 1];
   [self tile];
-#if 0
-/* Redundant stuff - done in -tile */
-  [_contentView viewFrameChanged: nil];
-  // update scroller
-  [self reflectScrolledClipView: (NSClipView*)_contentView];
-#endif
 }
 
 - (void) resizeSubviewsWithOldSize: (NSSize)oldSize

Source/NSTextField.m

@@ -204,12 +204,12 @@ id t;
 //
 // Handling Events 
 //
-- (void)mouseDown:(NSEvent *)theEvent
+- (void) mouseDown: (NSEvent*)theEvent
 {
-NSRect cellFrame = bounds;							
-													// If not selectable then 
-	if (![self isSelectable]) 						// don't recognize the 
-		return;										// mouse down
+  NSRect cellFrame = bounds;
+
+  if (![self isSelectable])
+    return;
 
 fprintf(stderr, " TextField mouseDown --- ");
 
@@ -219,39 +219,38 @@ fprintf(stderr, " TextField mouseDown --- ");
 //		    cellFrame.origin = [super_view convertPoint:frame.origin 
 //								 toView:[window contentView]];
 
-	if ([cell isBordered]) 								// draw the border if 
-		{												// needed.
-		if ([cell isBezeled]) 
-			{
-			cellFrame.origin.x += 4;
-			cellFrame.origin.y += 2;
-			cellFrame.size.width -= 6;
-			cellFrame.size.height -= 4;
-    		}
-		else 
-			{
-			cellFrame.origin.x += 1;
-			cellFrame.origin.y += 1;
-			cellFrame.size.width -= 2;
-			cellFrame.size.height -= 2;
-    		}
-  		}
-													// set field editor to
-	fprintf (stderr,
+  if ([cell isBordered])
+    {
+      if ([cell isBezeled]) 
+	{
+	  cellFrame.origin.x += 4;
+	  cellFrame.origin.y += 2;
+	  cellFrame.size.width -= 6;
+	  cellFrame.size.height -= 4;
+	}
+      else 
+	{
+	  cellFrame.origin.x += 1;
+	  cellFrame.origin.y += 1;
+	  cellFrame.size.width -= 2;
+	  cellFrame.size.height -= 2;
+	}
+    }
+
+  fprintf (stderr,
 	"XRTextField 0: rect origin (%1.2f, %1.2f), size (%1.2f, %1.2f)\n",
 				frame.origin.x, frame.origin.y, 
 				frame.size.width, frame.size.height);
-	fprintf (stderr,
+  fprintf (stderr,
 	"XRTextField 1: rect origin (%1.2f, %1.2f), size (%1.2f, %1.2f)\n",
 				cellFrame.origin.x, cellFrame.origin.y, 
 				cellFrame.size.width, cellFrame.size.height);
 
-	[cell editWithFrame:cellFrame 			
-					inView:self				
-					editor:[window fieldEditor:YES forObject:cell]	
-					delegate:self	
-					event:theEvent];
-
+  [cell editWithFrame: cellFrame
+	       inView: self
+	       editor: [window fieldEditor: YES forObject: cell]	
+	     delegate: self	
+		event: theEvent];
 
 //	[[self cell] _setCursorLocation:location];
 //	[[self cell] _setCursorVisibility: YES];

Source/NSWindow.m

@@ -8,6 +8,8 @@
    Date: 1996
    Author:  Felipe A. Rodriguez <far@ix.netcom.com>
    Date: June 1998
+   Author:  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+   Date: December 1998
 
    This file is part of the GNUstep GUI Library.
 
@@ -1374,8 +1376,6 @@ id result = nil;
 
 - initWithCoder:aDecoder
 {
-  NSApplication *theApp;
-
   [super initWithCoder:aDecoder];
 
   NSDebugLog(@"NSWindow: start decoding\n");

Source/PSMatrix.m

@@ -26,6 +26,7 @@
 #include <gnustep/gui/config.h>
 #include <math.h>
 
+#include <Foundation/NSArray.h>
 #include <Foundation/NSString.h>
 
 #include <AppKit/config.h>

Source/tiff.m

@@ -56,6 +56,7 @@
 
 #include <gnustep/gui/config.h>
 #include <gnustep/gui/nsimage-tiff.h>
+#include <Foundation/NSArray.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSUtilities.h>
 

Testing/GNUmakefile

@@ -44,7 +44,7 @@ TEST_APP_NAME = buttons matrix menu nsbox nsbrowser nsbrowsercell \
 		slider windows
 
 # The source files to be compiled
-testpb_OBJC_FILES = testpb.m
+testpb_OBJC_FILES = testpb.m Functions.m
 buttons_OBJC_FILES = buttons.m
 matrix_OBJC_FILES = matrix.m
 menu_OBJC_FILES = menu.m

Testing/GNUmakefile.preamble

@@ -1,10 +1,10 @@
 #
-#   GNUmakefile.preamble
+#   Makefile.preamble
 #
 #   Project specific makefile variables, and additional
 #
-#   Do not put any GNUmakefile rules in this file, instead they should
-#   be put into GNUmakefile.postamble.
+#   Do not put any Makefile rules in this file, instead they should
+#   be put into Makefile.postamble.
 #
 
 #
@@ -27,13 +27,13 @@ ADDITIONAL_INCLUDE_DIRS += -I../Headers -I$(GNUSTEP_SYSTEM_ROOT)/Headers
 # ADDITIONAL_LDFLAGS += 
 
 # Additional library directories the linker should search
-ADDITIONAL_LIB_DIRS +=
+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
+ADDITIONAL_TOOL_LIBS += -lgnustep-gui -ltiff -ljpeg
 
 # Additional libraries when linking applications
-ADDITIONAL_GUI_LIBS +=
+ADDITIONAL_GUI_LIBS += -lgnustep-gui -ltiff -ljpeg
 
 #
 # Flags dealing with installing and uninstalling

Testing/testpb.m

@@ -5,27 +5,6 @@
 #include <Foundation/NSGeometry.h>
 #include <AppKit/NSPasteboard.h>
 
-BOOL
-initialize_gnustep_backend(void)
-{
-  /* Dummy replacement for the xdps function */
-  return YES;
-}
-void NSHighlightRect(NSRect aRect)       						// dummy define
-{}
-void NSRectFill(NSRect aRect)       							// dummy define
-{}
-void NSBeep(void)												// dummy define
-{}
-
-@interface	GMModel: NSObject
-{
-}
-@end
-
-@implementation	GMModel
-@end
-
 @interface	pbOwner : NSObject
 {
 }