Added NSRuler*.h and fixed a few bugs in NSText.m

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

ChangeLog

@@ -1,3 +1,9 @@
+1999-02-21 Michael Hanni <mhanni@sprintmail.com>
+
+	* Headers/gnustep/gui/NSRulerView.h: added (note: not implemented)
+	* Headers/gnustep/gui/NSRulerMarker.h: added (note: not
+	implemented)
+
 Sun Feb 21 20:36:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Headers/gnustep/gui/NSCell.h: tidyup

Headers/gnustep/gui/NSRulerMarker.h

@@ -0,0 +1,45 @@
+#ifndef _GNUstep_H_NSRulerMarker
+#define _GNUstep_H_NSRulerMarker
+
+#include <Foundation/NSObject.h>
+
+@class NSRulerView;
+@class NSImage;
+
+@interface NSRulerMarker : NSObject <NSObject,NSCopying>
+- (id)initWithRulerView:(NSRulerView *)aRulerView
+         markerLocation:(float)location
+		  image:(NSImage *)anImage
+	    imageOrigin:(NSPoint)imageOrigin; 
+
+- (NSRulerView *)ruler; 
+
+- (void)setImage:(NSImage *)anImage; 
+- (NSImage *)image;
+
+- (void)setImageOrigin:(NSPoint)aPoint; 
+- (NSPoint)imageOrigin; 
+- (NSRect)imageRectInRuler; 
+- (float)thicknessRequiredInRuler; 
+
+- (void)setMovable:(BOOL)flag;
+- (BOOL)isMovable; 
+- (void)setRemovable:(BOOL)flag; 
+- (BOOL)isRemovable; 
+
+- (void)setMarkerLocation:(float)location; 
+- (float)makerLocation; 
+
+- (void)setRepresentedObject:(id <NSCopying>)anObject; 
+- (id <NSCopying>)representedObject;
+
+- (void)drawRect:(NSRect)aRect;
+- (BOOL)isDragging; 
+- (BOOL)trackMouse:(NSEvent *)theEvent adding:(BOOL)flag; 
+
+// NSCopying
+- (id) copyWithZone: (NSZone*)zone;
+@end
+
+#endif /* _GNUstep_H_NSRulerMarker */
+

Headers/gnustep/gui/NSRulerView.h

@@ -0,0 +1,90 @@
+#ifndef _GNUstep_H_NSRulerView
+#define _GNUstep_H_NSRulerView
+
+#include <AppKit/NSView.h>
+#include <AppKit/NSRulerMarker.h>
+#include <AppKit/NSScrollView.h>
+
+typedef enum {
+  NSHorizontalRuler,
+  NSVerticalRuler
+} NSRulerOrientation;
+
+@interface NSRulerView : NSView <NSObject, NSCoding>
+
+- (id)initWithScrollView:(NSScrollView *)aScrollView
+	     orientation:(NSRulerOrientation)orientation; 
+
+
++ (void)registerUnitWithName:(NSString *)unitName
+		abbreviation:(NSString *)abbreviation
+unitToPointsConversionFactor:(float)conversionFactor
+		 stepUpCycle:(NSArray *)stepUpCycle
+	       stepDownCycle:(NSArray *)stepDownCycle;
+
+- (void)setMeasurementUnits:(NSString *)unitName; 
+- (NSString *)measurementUnits; 
+
+- (void)setClientView:(NSView *)aView; 
+- (NSView *)clientView; 
+
+- (void)setAccessoryView:(NSView *)aView; 
+- (NSView *)accessoryView; 
+
+- (void)setOriginOffset:(float)offset; 
+- (float)originOffset; 
+
+- (void)setMarkers:(NSArray *)markers; 
+- (NSArray *)markers;
+- (void)addMarker:(NSRulerMarker *)aMarker; 
+- (void)removeMarker:(NSRulerMarker *)aMarker; 
+- (BOOL)trackMarker:(NSRulerMarker *)aMarker 
+     withMouseEvent:(NSEvent *)theEvent; 
+
+- (void)moveRulerlineFromLocation:(float)oldLoc toLocation:(float)newLoc; 
+
+- (void)drawHashMarksAndLabelsInRect:(NSRect)aRect; 
+- (void)drawMarkersInRect:(NSRect)aRect; 
+- (void)invalidateHashMarks; 
+
+- (void)setScrollView:(NSScrollView *)scrollView;
+- (NSScrollView *)scrollView; 
+
+- (void)setOrientation:(NSRulerOrientation)orientation; 
+- (NSRulerOrientation)orientation; 
+- (void)setReservedThicknessForAccessoryView:(float)thickness; 
+- (float)reservedThicknessForAccessoryView; 
+- (void)setReservedThicknessForMarkers:(float)thickness; 
+- (float)reservedThicknessForMarkers; 
+- (void)setRuleThickness:(float)thickness; 
+- (float)ruleThickness; 
+- (float)requiredThickness;
+- (float)baselineLocation; 
+- (BOOL)isFlipped; 
+
+- (void)rulerView:(NSRulerView *)aRulerView
+     didAddMarker:(NSRulerMarker *)aMarker;
+- (void)rulerView:(NSRulerView *)aRulerView 
+    didMoveMarker:(NSRulerMarker *)aMarker; 
+- (void)rulerView:(NSRulerView *)aRulerView 
+  didRemoveMarker:(NSRulerMarker *)aMarker; 
+- (void)rulerView:(NSRulerView *)aRulerView 
+  handleMouseDown:(NSEvent *)theEvent; 
+- (BOOL)rulerView:(NSRulerView *)aRulerView 
+  shouldAddMarker:(NSRulerMarker *)aMarker; 
+- (BOOL)rulerView:(NSRulerView *)aRulerView
+ shouldMoveMarker:(NSRulerMarker *)aMarker; 
+- (BOOL)rulerView:(NSRulerView *)aRulerView 
+   shouldRemoveMarker: (NSRulerMarker *)aMarker;
+- (float)rulerView:(NSRulerView *)aRulerView
+     willAddMarker:(NSRulerMarker *)aMarker
+        atLocation:(float)location; 
+- (float)rulerView:(NSRulerView *)aRulerView
+    willMoveMarker:(NSRulerMarker *)aMarker
+        toLocation:(float)location; 
+- (void)rulerView:(NSRulerView *)aRulerView
+willSetClientView:(NSView *)newClient; 
+@end
+
+#endif /* _GNUstep_H_NSRulerView */
+

Headers/gnustep/gui/NSTextView.h

@@ -33,13 +33,12 @@
 
 #include <AppKit/NSText.h>
 #include <AppKit/NSTextAttachment.h>
+#include <AppKit/NSRulerView.h>
+#include <AppKit/NSRulerMarker.h>
 
 @class NSTextContainer;
 @class NSTextStorage;
 @class NSLayoutManager;
-@class NSRulerView;
-@class NSRulerMarker;
-
 
 //@interface NSTextView : NSText <NSTextInput>
 @interface NSTextView : NSText 

Source/NSScrollView.m

@@ -31,6 +31,7 @@
 #include <AppKit/NSScroller.h>
 #include <AppKit/NSClipView.h>
 #include <AppKit/NSScrollView.h>
+#include <AppKit/NSRulerView.h>
 #include <AppKit/NSWindow.h>
 
 //

Source/NSTextView.m

@@ -26,6 +26,7 @@
 */
 
 #include <AppKit/NSTextView.h>
+#include <AppKit/NSRulerView.h>
 #include <AppKit/NSPasteboard.h>
 #include <AppKit/NSSpellChecker.h>
 #include <AppKit/NSFontPanel.h>