gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 19:20:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

New AppKit events. Updates for autogsdoc

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12217 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2002-01-26 04:14:38 +00:00
parent c8fa793240
commit c97710e1f6
41 changed files with 384 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ChangeLog
View file

@ -1,3 +1,25 @@
2002-01-25 Adam Fedor <fedor@gnu.org>
* Documentation/gsdoc/GNUmakefile: Remove autogsdoc processing
* Source/GNUmakefile: Moved to here.
* Headers/gnustep/gui/GSHbox.h, GSVbox.h, NSAffineTransform.h,
NSApplication.h, NSBezierPath.h, NSBitmapImageRep.h,
NSBrowser.h, NSBrowserCell.h, NSCell.h, NSColorWell.h, NSDataLink.h,
NSDataLinkManager.h, NSDataLinkPanel.h, NSForm.h, NSHelpPanel.h,
NSImage.h, NSLayoutManager.h, NSMatrix.h, NSParagraphStyle.h,
NSPasteboard.h, NSPopUpButtonCell.h, NSProgressIndicator.h,
NSSavePanel.h, NSSelection.h, NSStepperCell.h, NSText.h,
NSTextFieldCell.h: Sync interface/impl declarations for autogsdoc.
* Source/GSTable.m, NSAffineTransform.m, NSApplication.m,
NSBitmapImageRep.m, NSGraphicsContext.m, NSSlider.m,
NSTableHeaderView.m, NSText.m,
* Headers/gnustep/gui/NSEvent.h: Two new AppKit events.
* Source/NSWindow.m ([NSWindow -sendEvent:]): Implement response
for GSAppKitWindowLeave event.
2002-01-24 Adam Fedor <fedor@gnu.org> 2002-01-24 Adam Fedor <fedor@gnu.org>
* Source/NSBundleAdditions.m ([NSBundle * Source/NSBundleAdditions.m ([NSBundle

179
Documentation/gsdoc/GNUmakefile
View file

@ -49,97 +49,94 @@ Gui_GSDOC_FILES = Gui.gsdoc \
NSTextTab.gsdoc NSTextTab.gsdoc
# These gsdoc files are automatically generated from class source/headers # These gsdoc files are automatically generated from class source/headers
Gui_AGSDOC_FILES = \ Gui_AUTOGSDOC_FILES = \
NSActionCell.h \ NSActionCell.gsdoc \
NSAffineTransform.h \ NSAffineTransform.gsdoc \
NSApplication.h \ NSApplication.gsdoc \
NSAttributedString.h \ NSAttributedString.gsdoc \
NSBezierPath.h \ NSBezierPath.gsdoc \
NSBitmapImageRep.h \ NSBitmapImageRep.gsdoc \
NSBox.h \ NSBox.gsdoc \
NSBrowser.h \ NSBrowser.gsdoc \
NSBrowserCell.h \ NSBrowserCell.gsdoc \
NSButton.h \ NSButton.gsdoc \
NSButtonCell.h \ NSButtonCell.gsdoc \
NSCachedImageRep.h \ NSCachedImageRep.gsdoc \
NSCell.h \ NSCell.gsdoc \
NSClipView.h \ NSClipView.gsdoc \
NSColor.h \ NSColor.gsdoc \
NSColorList.h \ NSColorList.gsdoc \
NSColorPanel.h \ NSColorPanel.gsdoc \
NSColorPicker.h \ NSColorPicker.gsdoc \
NSColorWell.h \ NSColorWell.gsdoc \
NSComboBox.h \ NSComboBox.gsdoc \
NSComboBoxCell.h \ NSComboBoxCell.gsdoc \
NSControl.h \ NSControl.gsdoc \
NSCursor.h \ NSCursor.gsdoc \
NSCustomImageRep.h \ NSCustomImageRep.gsdoc \
NSDocument.h \ NSDocument.gsdoc \
NSDocumentController.h \ NSDocumentController.gsdoc \
NSEPSImageRep.h \ NSEPSImageRep.gsdoc \
NSEvent.h \ NSEvent.gsdoc \
NSFileWrapper.h \ NSFileWrapper.gsdoc \
NSFont.h \ NSFont.gsdoc \
NSFontManager.h \ NSFontManager.gsdoc \
NSFontPanel.h \ NSFontPanel.gsdoc \
NSForm.h \ NSForm.gsdoc \
NSFormCell.h \ NSFormCell.gsdoc \
NSGraphicsContext.h \ NSGraphicsContext.gsdoc \
NSHelpManager.h \ NSHelpManager.gsdoc \
NSImage.h \ NSImage.gsdoc \
NSImageCell.h \ NSImageCell.gsdoc \
NSImageRep.h \ NSImageRep.gsdoc \
NSImageView.h \ NSImageView.gsdoc \
NSInputManager.h \ NSInputManager.gsdoc \
NSInputServer.h \ NSInputServer.gsdoc \
NSLayoutManager.h \ NSLayoutManager.gsdoc \
NSMatrix.h \ NSMatrix.gsdoc \
NSMenu.h \ NSMenu.gsdoc \
NSMenuItemCell.h \ NSMenuItemCell.gsdoc \
NSMenuView.h \ NSMenuView.gsdoc \
NSOpenPanel.h \ NSOpenPanel.gsdoc \
NSPageLayout.h \ NSPageLayout.gsdoc \
NSPanel.h \ NSPanel.gsdoc \
NSParagraphStyle.h \ NSParagraphStyle.gsdoc \
NSPasteboard.h \ NSPasteboard.gsdoc \
NSPopUpButton.h \ NSPopUpButton.gsdoc \
NSPopUpButtonCell.h \ NSPopUpButtonCell.gsdoc \
NSPrintInfo.h \ NSPrintInfo.gsdoc \
NSPrintOperation.h \ NSPrintOperation.gsdoc \
NSPrintPanel.h \ NSPrintPanel.gsdoc \
NSPrinter.h \ NSPrinter.gsdoc \
NSProgressIndicator.h \ NSProgressIndicator.gsdoc \
NSResponder.h \ NSResponder.gsdoc \
NSRulerMarker.h \ NSRulerMarker.gsdoc \
NSRulerView.h \ NSRulerView.gsdoc \
NSSavePanel.h \ NSSavePanel.gsdoc \
NSScreen.h \ NSScreen.gsdoc \
NSScrollView.h \ NSScrollView.gsdoc \
NSScroller.h \ NSScroller.gsdoc \
NSSecureTextField.h \ NSSecureTextField.gsdoc \
NSSlider.h \ NSSlider.gsdoc \
NSSliderCell.h \ NSSliderCell.gsdoc \
NSSpellChecker.h \ NSSpellChecker.gsdoc \
NSSpellServer.h \ NSSpellServer.gsdoc \
NSSplitView.h \ NSSplitView.gsdoc \
NSTabView.h \ NSTabView.gsdoc \
NSTabViewItem.h \ NSTabViewItem.gsdoc \
NSTableHeaderCell.h \ NSTableHeaderCell.gsdoc \
NSTableHeaderView.h \ NSTableHeaderView.gsdoc \
NSTableView.h \ NSTableView.gsdoc \
NSText.h \ NSText.gsdoc \
NSTextContainer.h \ NSTextContainer.gsdoc \
NSTextField.h \ NSTextField.gsdoc \
NSTextFieldCell.h \ NSTextFieldCell.gsdoc \
NSTextStorage.h \ NSTextStorage.gsdoc \
NSTextView.h \ NSTextView.gsdoc \
NSView.h \ NSView.gsdoc \
NSWindow.h \ NSWindow.gsdoc \
NSWindowController.h \ NSWindowController.gsdoc \
NSWorkspace.h NSWorkspace.gsdoc
Gui_AGSDOC_FLAGS = -HeaderDirectory ../../Headers/AppKit -Declared AppKit \
-SourceDirectory ../../Source
Gui_DOC_INSTALL_DIR = Developer/Gui/Reference Gui_DOC_INSTALL_DIR = Developer/Gui/Reference

4
Headers/gnustep/gui/GSHbox.h
View file

@ -88,7 +88,7 @@
-(void) addView: (NSView *)aView; -(void) addView: (NSView *)aView;
-(void) addView: (NSView *)aView -(void) addView: (NSView *)aView
enablingXResizing: (BOOL)flag; enablingXResizing: (BOOL)aFlag;
-(void) addView: (NSView *)aView -(void) addView: (NSView *)aView
withMinXMargin: (float)aMargin; withMinXMargin: (float)aMargin;
@ -97,7 +97,7 @@ enablingXResizing: (BOOL)flag;
// enablingXResizing is YES if the {view and its margins} should be // enablingXResizing is YES if the {view and its margins} should be
// resized when the GSHbox is resized in the horizontal direction. // resized when the GSHbox is resized in the horizontal direction.
// FALSE does not resize it. Default is YES. // FALSE does not resize it. Default is YES.
enablingXResizing: (BOOL)flag enablingXResizing: (BOOL)aFlag
// With a GSHbox, only one margin is set when you add views to the GSHbox: // With a GSHbox, only one margin is set when you add views to the GSHbox:
// the margin between each view and the preceding one. // the margin between each view and the preceding one.
// Exception: the first view is special, and has no margin set (it has no // Exception: the first view is special, and has no margin set (it has no

4
Headers/gnustep/gui/GSVbox.h
View file

@ -69,13 +69,13 @@
-(void) addView: (NSView *)aView; -(void) addView: (NSView *)aView;
-(void) addView: (NSView *)aView -(void) addView: (NSView *)aView
enablingYResizing: (BOOL)flag; enablingYResizing: (BOOL)aFlag;
-(void) addView: (NSView *)aView -(void) addView: (NSView *)aView
withMinYMargin: (float)aMargin; withMinYMargin: (float)aMargin;
-(void) addView: (NSView *)aView -(void) addView: (NSView *)aView
enablingYResizing: (BOOL)flag enablingYResizing: (BOOL)aFlag
withMinYMargin: (float)aMargin; withMinYMargin: (float)aMargin;
// //

2
Headers/gnustep/gui/NSAffineTransform.h
View file

@ -96,7 +96,7 @@ typedef struct {
- (void) setMatrix: (const float[6])replace; - (void) setMatrix: (const float[6])replace;
- (void) getMatrix: (float[6])replace; - (void) getMatrix: (float[6])replace;
- (void) takeMatrixFromTransform: (NSAffineTransform *)other; - (void) takeMatrixFromTransform: (NSAffineTransform *)aTransform;
@end @end
#endif #endif

4
Headers/gnustep/gui/NSApplication.h
View file

@ -150,9 +150,9 @@ APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
* Getting, removing, and posting events * Getting, removing, and posting events
*/ */
- (NSEvent*) currentEvent; - (NSEvent*) currentEvent;
- (void) discardEventsMatchingMask: (unsigned)mask - (void) discardEventsMatchingMask: (unsigned int)mask
beforeEvent: (NSEvent*)lastEvent; beforeEvent: (NSEvent*)lastEvent;
- (NSEvent*) nextEventMatchingMask: (unsigned)mask - (NSEvent*) nextEventMatchingMask: (unsigned int)mask
untilDate: (NSDate*)expiration untilDate: (NSDate*)expiration
inMode: (NSString*)mode inMode: (NSString*)mode
dequeue: (BOOL)flag; dequeue: (BOOL)flag;

10
Headers/gnustep/gui/NSBezierPath.h
View file

@ -86,11 +86,11 @@ typedef enum {
// //
// Immediate mode drawing of common paths // Immediate mode drawing of common paths
// //
+ (void)fillRect:(NSRect)rect; + (void)fillRect:(NSRect)aRect;
+ (void)strokeRect:(NSRect)rect; + (void)strokeRect:(NSRect)aRect;
+ (void)clipRect:(NSRect)rect; + (void)clipRect:(NSRect)aRect;
+ (void)strokeLineFromPoint:(NSPoint)point1 toPoint:(NSPoint)point2; + (void)strokeLineFromPoint:(NSPoint)point1 toPoint:(NSPoint)point2;
+ (void)drawPackedGlyphs:(const char *)packedGlyphs atPoint:(NSPoint)point; + (void)drawPackedGlyphs: (const char *)packedGlyphs atPoint: (NSPoint)aPoint;
// //
// Default path rendering parameters // Default path rendering parameters
@ -185,7 +185,7 @@ typedef enum {
// //
// Appending common paths // Appending common paths
// //
- (void)appendBezierPath:(NSBezierPath *)path; - (void)appendBezierPath:(NSBezierPath *)aPath;
- (void)appendBezierPathWithRect:(NSRect)rect; - (void)appendBezierPathWithRect:(NSRect)rect;
- (void)appendBezierPathWithPoints:(NSPoint *)points count:(int)count; - (void)appendBezierPathWithPoints:(NSPoint *)points count:(int)count;
- (void)appendBezierPathWithOvalInRect:(NSRect)aRect; - (void)appendBezierPathWithOvalInRect:(NSRect)aRect;

2
Headers/gnustep/gui/NSBitmapImageRep.h
View file

@ -85,7 +85,7 @@ typedef enum _NSBitmapImageFileType {
bitsPerSample: (int)bps bitsPerSample: (int)bps
samplesPerPixel: (int)spp samplesPerPixel: (int)spp
hasAlpha: (BOOL)alpha hasAlpha: (BOOL)alpha
isPlanar: (BOOL)config isPlanar: (BOOL)isPlanar
colorSpaceName: (NSString*)colorSpaceName colorSpaceName: (NSString*)colorSpaceName
bytesPerRow: (int)rowBytes bytesPerRow: (int)rowBytes
bitsPerPixel: (int)pixelBits; bitsPerPixel: (int)pixelBits;

6
Headers/gnustep/gui/NSBrowser.h
View file

@ -164,7 +164,7 @@
- (int) numberOfVisibleColumns; - (int) numberOfVisibleColumns;
- (void) reloadColumn: (int)column; - (void) reloadColumn: (int)column;
- (void) selectAll: (id)sender; - (void) selectAll: (id)sender;
- (void) selectRow: (int)row inColumn: (int)col; - (void) selectRow: (int)row inColumn: (int)column;
- (int) selectedColumn; - (int) selectedColumn;
- (int) selectedRowInColumn: (int)column; - (int) selectedRowInColumn: (int)column;
- (void) setLastColumn: (int)column; - (void) setLastColumn: (int)column;
@ -232,8 +232,8 @@
// //
// NSCoding protocol // NSCoding protocol
// //
- (void) encodeWithCoder: aCoder; - (void) encodeWithCoder: (NSCoder *)aCoder;
- (id) initWithCoder: aDecoder; - (id) initWithCoder: (NSCoder *)aDecoder;
@end @end

4
Headers/gnustep/gui/NSBrowserCell.h
View file

@ -72,8 +72,8 @@
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

4
Headers/gnustep/gui/NSCell.h
View file

@ -414,8 +414,8 @@ typedef enum _NSControlSize {
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

4
Headers/gnustep/gui/NSColorWell.h
View file

@ -73,8 +73,8 @@
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

4
Headers/gnustep/gui/NSDataLink.h
View file

@ -115,8 +115,8 @@ APPKIT_EXPORT NSString *NSDataLinkFileNameExtension;
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

4
Headers/gnustep/gui/NSDataLinkManager.h
View file

@ -122,8 +122,8 @@
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

4
Headers/gnustep/gui/NSDataLinkPanel.h
View file

@ -79,8 +79,8 @@
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

2
Headers/gnustep/gui/NSEvent.h
View file

@ -328,6 +328,8 @@ typedef enum {
GSAppKitWindowMiniaturize, GSAppKitWindowMiniaturize,
GSAppKitWindowFocusIn, GSAppKitWindowFocusIn,
GSAppKitWindowFocusOut, GSAppKitWindowFocusOut,
GSAppKitWindowLeave,
GSAppKitWindowEnter,
GSAppKitDraggingEnter, GSAppKitDraggingEnter,
GSAppKitDraggingUpdate, GSAppKitDraggingUpdate,
GSAppKitDraggingStatus, GSAppKitDraggingStatus,

4
Headers/gnustep/gui/NSForm.h
View file

@ -58,9 +58,9 @@
// //
- (void)setBezeled:(BOOL)flag; - (void)setBezeled:(BOOL)flag;
- (void)setBordered:(BOOL)flag; - (void)setBordered:(BOOL)flag;
- (void)setTextAlignment:(int)mode; - (void)setTextAlignment:(int)aMode;
- (void)setTextFont:(NSFont*)fontObject; - (void)setTextFont:(NSFont*)fontObject;
- (void)setTitleAlignment:(NSTextAlignment)mode; - (void)setTitleAlignment:(NSTextAlignment)aMode;
- (void)setTitleFont:(NSFont*)fontObject; - (void)setTitleFont:(NSFont*)fontObject;
// //

4
Headers/gnustep/gui/NSHelpPanel.h
View file

@ -78,8 +78,8 @@
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

8
Headers/gnustep/gui/NSImage.h
View file

@ -72,8 +72,8 @@
// //
// Initializing a New NSImage Instance // Initializing a New NSImage Instance
// //
- (id) initByReferencingFile: (NSString*)filename; - (id) initByReferencingFile: (NSString*)fileName;
- (id) initWithContentsOfFile: (NSString*)filename; - (id) initWithContentsOfFile: (NSString*)fileName;
- (id) initWithData: (NSData*)data; - (id) initWithData: (NSData*)data;
- (id) initWithPasteboard: (NSPasteboard*)pasteboard; - (id) initWithPasteboard: (NSPasteboard*)pasteboard;
- (id) initWithSize: (NSSize)aSize; - (id) initWithSize: (NSSize)aSize;
@ -93,8 +93,8 @@
// //
// Referring to Images by Name // Referring to Images by Name
// //
+ (id) imageNamed: (NSString*)name; + (id) imageNamed: (NSString*)aName;
- (BOOL) setName: (NSString*)name; - (BOOL) setName: (NSString*)aName;
- (NSString*) name; - (NSString*) name;
// //

34
Headers/gnustep/gui/NSLayoutManager.h
View file

@ -168,12 +168,12 @@ typedef enum {
/*************************** Helper objects ***************************/ /*************************** Helper objects ***************************/
- (NSTextStorage *) textStorage; - (NSTextStorage *) textStorage;
- (void) setTextStorage: (NSTextStorage *)textStorage; - (void) setTextStorage: (NSTextStorage *)aTextStorage;
- (void) replaceTextStorage: (NSTextStorage *)newTextStorage; - (void) replaceTextStorage: (NSTextStorage *)newTextStorage;
- (id) delegate; - (id) delegate;
- (void) setDelegate: (id)delegate; - (void) setDelegate: (id)aDelegate;
/**************************** Containers ****************************/ /**************************** Containers ****************************/
@ -184,21 +184,21 @@ typedef enum {
atIndex: (unsigned)index; atIndex: (unsigned)index;
- (void) removeTextContainerAtIndex: (unsigned)index; - (void) removeTextContainerAtIndex: (unsigned)index;
- (void) textContainerChangedGeometry: (NSTextContainer *)container; - (void) textContainerChangedGeometry: (NSTextContainer *)aContainer;
- (void) textContainerChangedTextView: (NSTextContainer *)container; - (void) textContainerChangedTextView: (NSTextContainer *)aContainer;
/************************** Invalidation primitives **************************/ /************************** Invalidation primitives **************************/
- (void) invalidateGlyphsForCharacterRange: (NSRange)charRange - (void) invalidateGlyphsForCharacterRange: (NSRange)aRange
changeInLength: (int)delta changeInLength: (int)lengthChange
actualCharacterRange: (NSRange *)actualCharRange; actualCharacterRange: (NSRange *)actualRange;
- (void) invalidateLayoutForCharacterRange: (NSRange)charRange - (void) invalidateLayoutForCharacterRange: (NSRange)aRange
isSoft: (BOOL)flag isSoft: (BOOL)flag
actualCharacterRange: (NSRange *)actualCharRange; actualCharacterRange: (NSRange *)actualRange;
- (void) invalidateDisplayForGlyphRange: (NSRange)glyphRange; - (void) invalidateDisplayForGlyphRange: (NSRange)aRange;
#ifndef STRICT_40 #ifndef STRICT_40
- (void) invalidateDisplayForCharacterRange: (NSRange)charRange; - (void) invalidateDisplayForCharacterRange: (NSRange)aRange;
#endif #endif
/******************* Invalidation sent by NSTextStorage *******************/ /******************* Invalidation sent by NSTextStorage *******************/
@ -223,13 +223,13 @@ typedef enum {
/************************ Adding and removing glyphs ************************/ /************************ Adding and removing glyphs ************************/
- (void) insertGlyph: (NSGlyph)glyph atGlyphIndex: (unsigned)glyphIndex - (void) insertGlyph: (NSGlyph)aGlyph atGlyphIndex: (unsigned)glyphIndex
characterIndex: (unsigned)charIndex; characterIndex: (unsigned)charIndex;
- (void) replaceGlyphAtIndex: (unsigned)glyphIndex - (void) replaceGlyphAtIndex: (unsigned)glyphIndex
withGlyph: (NSGlyph)newGlyph; withGlyph: (NSGlyph)newGlyph;
- (void) deleteGlyphsInRange: (NSRange)glyphRange; - (void) deleteGlyphsInRange: (NSRange)aRange;
- (void) setCharacterIndex: (unsigned)charIndex - (void) setCharacterIndex: (unsigned)charIndex
forGlyphAtIndex: (unsigned)glyphIndex; forGlyphAtIndex: (unsigned)glyphIndex;
@ -250,7 +250,7 @@ typedef enum {
/************************ Set/Get glyph attributes ************************/ /************************ Set/Get glyph attributes ************************/
- (void) setIntAttribute: (int)attributeTag - (void) setIntAttribute: (int)attributeTag
value: (int)val value: (int)anInt
forGlyphAtIndex: (unsigned)glyphIndex; forGlyphAtIndex: (unsigned)glyphIndex;
- (int) intAttribute: (int)attributeTag - (int) intAttribute: (int)attributeTag
@ -261,7 +261,7 @@ typedef enum {
/************************ Set/Get layout attributes ************************/ /************************ Set/Get layout attributes ************************/
- (void) setTextContainer: (NSTextContainer *)container - (void) setTextContainer: (NSTextContainer *)aTextContainer
forGlyphRange: (NSRange)glyphRange; forGlyphRange: (NSRange)glyphRange;
- (void) setLineFragmentRect: (NSRect)fragmentRect - (void) setLineFragmentRect: (NSRect)fragmentRect
@ -282,7 +282,7 @@ forStartOfGlyphRange: (NSRange)glyphRange;
forGlyphAtIndex: (unsigned)glyphIndex; forGlyphAtIndex: (unsigned)glyphIndex;
- (NSTextContainer *) textContainerForGlyphAtIndex: (unsigned)glyphIndex - (NSTextContainer *) textContainerForGlyphAtIndex: (unsigned)glyphIndex
effectiveRange: (NSRange *)effectiveGlyphRange; effectiveRange: (NSRange *)effectiveRange;
- (NSRect) usedRectForTextContainer: (NSTextContainer *)container; - (NSRect) usedRectForTextContainer: (NSTextContainer *)container;
@ -327,7 +327,7 @@ forStartOfGlyphRange: (NSRange)glyphRange;
rectCount: (unsigned *)rectCount; rectCount: (unsigned *)rectCount;
- (NSRect) boundingRectForGlyphRange: (NSRange)glyphRange - (NSRect) boundingRectForGlyphRange: (NSRange)glyphRange
inTextContainer: (NSTextContainer *)container; inTextContainer: (NSTextContainer *)aTextContainer;
- (NSRange) glyphRangeForBoundingRect: (NSRect)bounds - (NSRange) glyphRangeForBoundingRect: (NSRect)bounds
inTextContainer: (NSTextContainer *)container; inTextContainer: (NSTextContainer *)container;

10
Headers/gnustep/gui/NSMatrix.h
View file

@ -224,11 +224,11 @@ typedef enum _NSMatrixMode {
- (void) selectText: (id)sender; - (void) selectText: (id)sender;
- (id) selectTextAtRow: (int)row - (id) selectTextAtRow: (int)row
column: (int)column; column: (int)column;
- (void) textDidBeginEditing: (NSNotification *)notification; - (void) textDidBeginEditing: (NSNotification *)aNotification;
- (void) textDidChange: (NSNotification *)notification; - (void) textDidChange: (NSNotification *)aNotification;
- (void) textDidEndEditing: (NSNotification *)notification; - (void) textDidEndEditing: (NSNotification *)aNotification;
- (BOOL) textShouldBeginEditing: (NSText *)textObject; - (BOOL) textShouldBeginEditing: (NSText *)aTextObject;
- (BOOL) textShouldEndEditing: (NSText *)textObject; - (BOOL) textShouldEndEditing: (NSText *)aTextObject;
/* /*
* Setting Tab Key Behavior * Setting Tab Key Behavior

2
Headers/gnustep/gui/NSParagraphStyle.h
View file

@ -136,7 +136,7 @@ typedef enum _NSLineBreakMode { /* What to do with long lines */
- (void) setLineSpacing: (float)aFloat; - (void) setLineSpacing: (float)aFloat;
- (void) setParagraphSpacing: (float)aFloat; - (void) setParagraphSpacing: (float)aFloat;
- (void) setAlignment: (NSTextAlignment)alignment; - (void) setAlignment: (NSTextAlignment)newAlignment;
- (void) setFirstLineHeadIndent: (float)aFloat; - (void) setFirstLineHeadIndent: (float)aFloat;
- (void) setHeadIndent: (float)aFloat; - (void) setHeadIndent: (float)aFloat;
- (void) setTailIndent: (float)aFloat; - (void) setTailIndent: (float)aFloat;

4
Headers/gnustep/gui/NSPasteboard.h
View file

@ -89,7 +89,7 @@ APPKIT_EXPORT NSString *NSPasteboardCommunicationException;
// Creating and Releasing an NSPasteboard Object // Creating and Releasing an NSPasteboard Object
// //
+ (NSPasteboard *)generalPasteboard; + (NSPasteboard *)generalPasteboard;
+ (NSPasteboard *)pasteboardWithName:(NSString *)name; + (NSPasteboard *)pasteboardWithName:(NSString *)aName;
+ (NSPasteboard *)pasteboardWithUniqueName; + (NSPasteboard *)pasteboardWithUniqueName;
- (void)releaseGlobally; - (void)releaseGlobally;
@ -159,7 +159,7 @@ provideDataForType:(NSString *)type
+ (NSString *) mimeTypeForPasteboardType: (NSString *)type; + (NSString *) mimeTypeForPasteboardType: (NSString *)type;
+ (NSString *) pasteboardTypeForMimeType: (NSString *)mimeType; + (NSString *) pasteboardTypeForMimeType: (NSString *)mimeType;
- (void)setChangeCount: (int)changeCount; - (void)setChangeCount: (int)count;
@end @end
#ifndef STRICT_OPENSTEP #ifndef STRICT_OPENSTEP

4
Headers/gnustep/gui/NSPopUpButtonCell.h
View file

@ -91,9 +91,9 @@ typedef enum {
- (int) indexOfItem: (id <NSMenuItem>)item; - (int) indexOfItem: (id <NSMenuItem>)item;
- (int) indexOfItemWithTitle: (NSString*)title; - (int) indexOfItemWithTitle: (NSString*)title;
- (int) indexOfItemWithTag: (int)tag; - (int) indexOfItemWithTag: (int)aTag;
- (int) indexOfItemWithRepresentedObject: (id)obj; - (int) indexOfItemWithRepresentedObject: (id)obj;
- (int) indexOfItemWithTarget: (id)target andAction: (SEL)actionSelector; - (int) indexOfItemWithTarget: (id)aTarget andAction: (SEL)actionSelector;
- (id <NSMenuItem>) itemAtIndex: (int)index; - (id <NSMenuItem>) itemAtIndex: (int)index;
- (id <NSMenuItem>) itemWithTitle: (NSString*)title; - (id <NSMenuItem>) itemWithTitle: (NSString*)title;

2
Headers/gnustep/gui/NSProgressIndicator.h
View file

@ -69,7 +69,7 @@
// //
- (void)incrementBy:(double)delta; - (void)incrementBy:(double)delta;
- (double)doubleValue; - (double)doubleValue;
- (void)setDoubleValue:(double)doubleValue; - (void)setDoubleValue:(double)aValue;
- (double)minValue; - (double)minValue;
- (void)setMinValue:(double)newMinimum; - (void)setMinValue:(double)newMinimum;
- (double)maxValue; - (double)maxValue;

2
Headers/gnustep/gui/NSSavePanel.h
View file

@ -176,7 +176,7 @@ enum {
#ifndef STRICT_OPENSTEP #ifndef STRICT_OPENSTEP
- (int) runModalForDirectory: (NSString *)path - (int) runModalForDirectory: (NSString *)path
file: (NSString *)name file: (NSString *)filename
relativeToWindow: (NSWindow*)window; relativeToWindow: (NSWindow*)window;
- (void) beginSheetForDirectory: (NSString *)path - (void) beginSheetForDirectory: (NSString *)path
file: (NSString *)name file: (NSString *)name

4
Headers/gnustep/gui/NSSelection.h
View file

@ -71,8 +71,8 @@
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

4
Headers/gnustep/gui/NSStepperCell.h
View file

@ -60,8 +60,8 @@
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

26
Headers/gnustep/gui/NSText.h
View file

@ -130,16 +130,16 @@ enum {
withRTFD: (NSData*)rtfdData; withRTFD: (NSData*)rtfdData;
- (void) replaceCharactersInRange: (NSRange)aRange - (void) replaceCharactersInRange: (NSRange)aRange
withString: (NSString*)aString; withString: (NSString*)aString;
- (void) setString: (NSString*)string; - (void) setString: (NSString*)aString;
- (NSString*) string; - (NSString*) string;
/* /*
* Old fashioned OpenStep methods (wrappers for the previous ones) * Old fashioned OpenStep methods (wrappers for the previous ones)
*/ */
- (void) replaceRange: (NSRange)range withString: (NSString*)aString; - (void) replaceRange: (NSRange)aRange withString: (NSString*)aString;
- (void) replaceRange: (NSRange)range withRTF: (NSData*)rtfData; - (void) replaceRange: (NSRange)aRange withRTF: (NSData*)rtfData;
- (void) replaceRange: (NSRange)range withRTFD: (NSData*)rtfdData; - (void) replaceRange: (NSRange)aRange withRTFD: (NSData*)rtfdData;
- (void) setText: (NSString*)string; - (void) setText: (NSString*)aString;
- (void) setText: (NSString*)aString range: (NSRange)aRange; - (void) setText: (NSString*)aString range: (NSRange)aRange;
- (NSString*) text; - (NSString*) text;
@ -201,8 +201,8 @@ enum {
*/ */
- (void) changeFont: (id)sender; - (void) changeFont: (id)sender;
- (NSFont*) font; - (NSFont*) font;
- (void) setFont: (NSFont*)obj; - (void) setFont: (NSFont*)font;
- (void) setFont: (NSFont*)font ofRange: (NSRange)range; - (void) setFont: (NSFont*)font ofRange: (NSRange)aRange;
/* /*
* Managing Alignment * Managing Alignment
@ -216,8 +216,8 @@ enum {
/* /*
* Text colour * Text colour
*/ */
- (void) setTextColor: (NSColor*)color range: (NSRange)range; - (void) setTextColor: (NSColor*)color range: (NSRange)aRange;
- (void) setColor: (NSColor*)color ofRange: (NSRange)range; - (void) setColor: (NSColor*)color ofRange: (NSRange)aRange;
- (void) setTextColor: (NSColor*)color; - (void) setTextColor: (NSColor*)color;
- (NSColor*) textColor; - (NSColor*) textColor;
@ -234,8 +234,8 @@ enum {
*/ */
-(BOOL) readRTFDFromFile: (NSString*)path; -(BOOL) readRTFDFromFile: (NSString*)path;
-(BOOL) writeRTFDToFile: (NSString*)path atomically: (BOOL)flag; -(BOOL) writeRTFDToFile: (NSString*)path atomically: (BOOL)flag;
-(NSData*) RTFDFromRange: (NSRange)range; -(NSData*) RTFDFromRange: (NSRange)aRange;
-(NSData*) RTFFromRange: (NSRange)range; -(NSData*) RTFFromRange: (NSRange)aRange;
/* /*
* Sizing the Frame Rectangle * Sizing the Frame Rectangle
@ -259,7 +259,7 @@ enum {
/* /*
* Scrolling * Scrolling
*/ */
- (void) scrollRangeToVisible: (NSRange)range; - (void) scrollRangeToVisible: (NSRange)aRange;
/* /*
* Managing the Delegate * Managing the Delegate
@ -286,7 +286,7 @@ enum {
@interface NSText (GNUstepExtensions) @interface NSText (GNUstepExtensions)
- (void) replaceRange: (NSRange)range - (void) replaceRange: (NSRange)aRange
withAttributedString: (NSAttributedString*)attrString; withAttributedString: (NSAttributedString*)attrString;
- (unsigned) textLength; - (unsigned) textLength;

6
Headers/gnustep/gui/NSTextFieldCell.h
View file

@ -57,14 +57,14 @@
- (void)setBackgroundColor:(NSColor *)aColor; - (void)setBackgroundColor:(NSColor *)aColor;
- (NSColor *)backgroundColor; - (NSColor *)backgroundColor;
- (id)setUpFieldEditorAttributes:(id)textObject; - (id)setUpFieldEditorAttributes: (NSText *)textObject;
// //
// NSCoding protocol // NSCoding protocol
// //
- (void)encodeWithCoder:aCoder; - (void)encodeWithCoder: (NSCoder *)aCoder;
- initWithCoder:aDecoder; - initWithCoder: (NSCoder *)aDecoder;
@end @end

83
Source/GNUmakefile
View file

@ -34,6 +34,10 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version include ../Version
include ../config.make include ../config.make
srcdir = .
PACKAGE_NAME = gnustep-gui
LIBRARY_VAR = GNUSTEP_GUI
# The library to be compiled # The library to be compiled
LIBRARY_NAME = libgnustep-gui LIBRARY_NAME = libgnustep-gui
@ -166,32 +170,22 @@ endif
libgnustep-gui_HEADER_FILES_DIR = ../Headers/AppKit libgnustep-gui_HEADER_FILES_DIR = ../Headers/AppKit
libgnustep-gui_HEADER_FILES_INSTALL_DIR = /AppKit libgnustep-gui_HEADER_FILES_INSTALL_DIR = /AppKit
libgnustep-gui_HEADER_FILES = \ DOCUMENT_NAME = Gui
AppKit.h \
GSVersion.h \ Gui_AGSDOC_FILES = Gui.gsdoc $(AUTOGSDOC_HEADERS)
AppKitDefines.h \ Gui_AGSDOC_FLAGS = \
AppKitExceptions.h \ -HeaderDirectory ../Headers/AppKit \
DPSOperators.h \ -Declared AppKit \
GMAppKit.h \ -Standards YES \
GMArchiver.h \ -Up Gui
GSFontInfo.h \
GSInfoPanel.h \ AUTOGSDOC_HEADERS = \
GSMethodTable.h \
GSPasteboardServer.h \
GSServicesManager.h \
GSTextConverter.h \
GSTrackingRect.h \
GSHelpManagerPanel.h \
GSTable.h \ GSTable.h \
GSHbox.h \ GSHbox.h \
GSVbox.h \ GSVbox.h \
IMConnectors.h \
IMCustomObject.h \
IMLoading.h \
NSActionCell.h \ NSActionCell.h \
NSAffineTransform.h \ NSAffineTransform.h \
NSApplication.h \ NSApplication.h \
NSAttributedString.h \
NSBezierPath.h \ NSBezierPath.h \
NSBox.h \ NSBox.h \
NSBitmapImageRep.h \ NSBitmapImageRep.h \
@ -199,7 +193,6 @@ NSBrowser.h \
NSBrowserCell.h \ NSBrowserCell.h \
NSButton.h \ NSButton.h \
NSButtonCell.h \ NSButtonCell.h \
NSCStringText.h \
NSCachedImageRep.h \ NSCachedImageRep.h \
NSCell.h \ NSCell.h \
NSClipView.h \ NSClipView.h \
@ -207,7 +200,6 @@ NSColor.h \
NSColorList.h \ NSColorList.h \
NSColorPanel.h \ NSColorPanel.h \
NSColorPicker.h \ NSColorPicker.h \
NSColorPicking.h \
NSColorWell.h \ NSColorWell.h \
NSComboBox.h \ NSComboBox.h \
NSComboBoxCell.h \ NSComboBoxCell.h \
@ -219,8 +211,6 @@ NSDataLinkManager.h \
NSDataLinkPanel.h \ NSDataLinkPanel.h \
NSDocument.h \ NSDocument.h \
NSDocumentController.h \ NSDocumentController.h \
NSDocumentFrameworkPrivate.h \
NSDragging.h \
NSDrawer.h \ NSDrawer.h \
NSEPSImageRep.h \ NSEPSImageRep.h \
NSEvent.h \ NSEvent.h \
@ -230,7 +220,6 @@ NSFontManager.h \
NSFontPanel.h \ NSFontPanel.h \
NSForm.h \ NSForm.h \
NSFormCell.h \ NSFormCell.h \
NSGraphics.h \
NSGraphicsContext.h \ NSGraphicsContext.h \
NSHelpPanel.h \ NSHelpPanel.h \
NSHelpManager.h \ NSHelpManager.h \
@ -247,9 +236,6 @@ NSMenu.h \
NSMenuItem.h \ NSMenuItem.h \
NSMenuItemCell.h \ NSMenuItemCell.h \
NSMenuView.h \ NSMenuView.h \
NSNibConnector.h \
NSNibDeclarations.h \
NSNibLoading.h \
NSOpenPanel.h \ NSOpenPanel.h \
NSOutlineView.h \ NSOutlineView.h \
NSPageLayout.h \ NSPageLayout.h \
@ -276,7 +262,6 @@ NSSlider.h \
NSSliderCell.h \ NSSliderCell.h \
NSText.h \ NSText.h \
NSSpellChecker.h \ NSSpellChecker.h \
NSSpellProtocol.h \
NSSpellServer.h \ NSSpellServer.h \
NSSplitView.h \ NSSplitView.h \
NSStepper.h \ NSStepper.h \
@ -294,11 +279,42 @@ NSTextField.h \
NSTextFieldCell.h \ NSTextFieldCell.h \
NSTextStorage.h \ NSTextStorage.h \
NSTextView.h \ NSTextView.h \
NSUserInterfaceValidation.h \
NSView.h \ NSView.h \
NSWindow.h \ NSWindow.h \
NSWindowController.h \ NSWindowController.h \
NSWorkspace.h \ NSWorkspace.h
libgnustep-gui_HEADER_FILES = \
AppKit.h \
GSVersion.h \
AppKitDefines.h \
AppKitExceptions.h \
DPSOperators.h \
GMAppKit.h \
GMArchiver.h \
GSFontInfo.h \
GSInfoPanel.h \
GSMethodTable.h \
GSPasteboardServer.h \
GSServicesManager.h \
GSTextConverter.h \
GSTrackingRect.h \
GSHelpManagerPanel.h \
$(AUTOGSDOC_HEADERS) \
IMConnectors.h \
IMCustomObject.h \
IMLoading.h \
NSAttributedString.h \
NSColorPicking.h \
NSCStringText.h \
NSDocumentFrameworkPrivate.h \
NSDragging.h \
NSGraphics.h \
NSNibConnector.h \
NSNibDeclarations.h \
NSNibLoading.h \
NSSpellProtocol.h \
NSUserInterfaceValidation.h \
PSOperators.h \ PSOperators.h \
nsimage-tiff.h nsimage-tiff.h
@ -311,4 +327,9 @@ include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/library.make include $(GNUSTEP_MAKEFILES)/library.make
# Only build the doc if doc=yes was passed on the command line
ifeq ($(doc),yes)
include $(GNUSTEP_MAKEFILES)/documentation.make
endif
include GNUmakefile.postamble include GNUmakefile.postamble

48
Source/GSTable.m
View file

@ -49,8 +49,6 @@
@end @end
@implementation GSTable: NSView @implementation GSTable: NSView
{
}
// //
// Class Methods // Class Methods
// //
@ -311,7 +309,7 @@
withMinXMargin: (float)minXMargin withMinXMargin: (float)minXMargin
maxXMargin: (float)maxXMargin maxXMargin: (float)maxXMargin
minYMargin: (float)minYMargin minYMargin: (float)minYMargin
maxYMargin: (float)maxYMargin; maxYMargin: (float)maxYMargin
{ {
int jailNumber; int jailNumber;
NSRect oldFrame; NSRect oldFrame;
@ -715,80 +713,80 @@
// Setting Row and Column Expand Flag // Setting Row and Column Expand Flag
// //
-(void) setXResizingEnabled: (BOOL)aFlag -(void) setXResizingEnabled: (BOOL)aFlag
forColumn: (int)column forColumn: (int)aColumn
{ {
if (column > (_numberOfColumns - 1)) if (aColumn > (_numberOfColumns - 1))
{ {
NSLog (@"Warning: argument column is > (numberOfColumns - 1)\n"); NSLog (@"Warning: argument column is > (numberOfColumns - 1)\n");
return; return;
} }
if (column < 0) if (aColumn < 0)
{ {
NSLog (@"Warning: argument column is < 0\n"); NSLog (@"Warning: argument column is < 0\n");
return; return;
} }
if ((_expandColumn[column] == YES) && (aFlag == NO)) if ((_expandColumn[aColumn] == YES) && (aFlag == NO))
{ {
_expandingColumnNumber--; _expandingColumnNumber--;
_expandColumn[column] = aFlag; _expandColumn[aColumn] = aFlag;
} }
else if ((_expandColumn[column] == NO) && (aFlag == YES)) else if ((_expandColumn[aColumn] == NO) && (aFlag == YES))
{ {
_expandingColumnNumber++; _expandingColumnNumber++;
_expandColumn[column] = aFlag; _expandColumn[aColumn] = aFlag;
} }
} }
-(BOOL) isXResizingEnabledForColumn: (int)column -(BOOL) isXResizingEnabledForColumn: (int)aColumn
{ {
if (column > (_numberOfColumns - 1)) if (aColumn > (_numberOfColumns - 1))
{ {
NSLog (@"Warning: argument column is > (numberOfColumns - 1)\n"); NSLog (@"Warning: argument column is > (numberOfColumns - 1)\n");
return NO; return NO;
} }
if (column < 0) if (aColumn < 0)
{ {
NSLog (@"Warning: argument column is < 0\n"); NSLog (@"Warning: argument column is < 0\n");
return NO; return NO;
} }
return _expandColumn[column]; return _expandColumn[aColumn];
} }
-(void) setYResizingEnabled: (BOOL)aFlag -(void) setYResizingEnabled: (BOOL)aFlag
forRow: (int)row forRow: (int)aRow
{ {
if (row > (_numberOfRows - 1)) if (aRow > (_numberOfRows - 1))
{ {
NSLog (@"Warning: argument row is > (numberOfRows - 1)\n"); NSLog (@"Warning: argument row is > (numberOfRows - 1)\n");
return; return;
} }
if (row < 0) if (aRow < 0)
{ {
NSLog (@"Warning: argument row is < 0\n"); NSLog (@"Warning: argument row is < 0\n");
return; return;
} }
if ((_expandRow[row] == YES) && (aFlag == NO)) if ((_expandRow[aRow] == YES) && (aFlag == NO))
{ {
_expandingRowNumber--; _expandingRowNumber--;
_expandRow[row] = aFlag; _expandRow[aRow] = aFlag;
} }
else if ((_expandRow[row] == NO) && (aFlag == YES)) else if ((_expandRow[aRow] == NO) && (aFlag == YES))
{ {
_expandingRowNumber++; _expandingRowNumber++;
_expandRow[row] = aFlag; _expandRow[aRow] = aFlag;
} }
} }
-(BOOL) isYResizingEnabledForRow: (int)row -(BOOL) isYResizingEnabledForRow: (int)aRow
{ {
if (row > (_numberOfRows - 1)) if (aRow > (_numberOfRows - 1))
{ {
NSLog (@"Warning: argument row is > (numberOfRows - 1)\n"); NSLog (@"Warning: argument row is > (numberOfRows - 1)\n");
return NO; return NO;
} }
if (row < 0) if (aRow < 0)
{ {
NSLog (@"Warning: argument row is < 0\n"); NSLog (@"Warning: argument row is < 0\n");
return NO; return NO;
} }
return _expandRow[row]; return _expandRow[aRow];
} }
// //
// Getting Row and Column Number // Getting Row and Column Number

80
Source/NSAffineTransform.m
View file

@ -80,24 +80,24 @@ static NSAffineTransformStruct identityTransform = {
return t; return t;
} }
- (void) appendTransform: (NSAffineTransform*)other - (void) appendTransform: (NSAffineTransform*)aTransform
{ {
float newA, newB, newC, newD, newTX, newTY; float newA, newB, newC, newD, newTX, newTY;
newA = other->A * A + other->B * C; newA = aTransform->A * A + aTransform->B * C;
newB = other->A * B + other->B * D; newB = aTransform->A * B + aTransform->B * D;
newC = other->C * A + other->D * C; newC = aTransform->C * A + aTransform->D * C;
newD = other->C * B + other->D * D; newD = aTransform->C * B + aTransform->D * D;
newTX = other->TX * A + other->TY * C + TX; newTX = aTransform->TX * A + aTransform->TY * C + TX;
newTY = other->TX * B + other->TY * D + TY; newTY = aTransform->TX * B + aTransform->TY * D + TY;
A = newA; B = newB; A = newA; B = newB;
C = newC; D = newD; C = newC; D = newD;
TX = newTX; TY = newTY; TX = newTX; TY = newTY;
if (rotationAngle >= 0 && other->rotationAngle >= 0) if (rotationAngle >= 0 && aTransform->rotationAngle >= 0)
{ {
rotationAngle += other->rotationAngle; rotationAngle += aTransform->rotationAngle;
if (rotationAngle < 0) if (rotationAngle < 0)
rotationAngle -= ((int)(rotationAngle/360)-1)*360; rotationAngle -= ((int)(rotationAngle/360)-1)*360;
else if (rotationAngle >= 360) else if (rotationAngle >= 360)
@ -163,24 +163,24 @@ static NSAffineTransformStruct identityTransform = {
TX = newTX; TY = newTY; TX = newTX; TY = newTY;
} }
- (void) prependTransform: (NSAffineTransform*)other - (void) prependTransform: (NSAffineTransform*)aTransform
{ {
float newA, newB, newC, newD, newTX, newTY; float newA, newB, newC, newD, newTX, newTY;
newA = A * other->A + B * other->C; newA = A * aTransform->A + B * aTransform->C;
newB = A * other->B + B * other->D; newB = A * aTransform->B + B * aTransform->D;
newC = C * other->A + D * other->C; newC = C * aTransform->A + D * aTransform->C;
newD = C * other->B + D * other->D; newD = C * aTransform->B + D * aTransform->D;
newTX = TX * other->A + TY * other->C + other->TX; newTX = TX * aTransform->A + TY * aTransform->C + aTransform->TX;
newTY = TX * other->B + TY * other->D + other->TY; newTY = TX * aTransform->B + TY * aTransform->D + aTransform->TY;
A = newA; B = newB; A = newA; B = newB;
C = newC; D = newD; C = newC; D = newD;
TX = newTX; TY = newTY; TX = newTX; TY = newTY;
if (rotationAngle >= 0 && other->rotationAngle >= 0) if (rotationAngle >= 0 && aTransform->rotationAngle >= 0)
{ {
rotationAngle += other->rotationAngle; rotationAngle += aTransform->rotationAngle;
if (rotationAngle < 0) if (rotationAngle < 0)
rotationAngle -= ((int)(rotationAngle/360)-1)*360; rotationAngle -= ((int)(rotationAngle/360)-1)*360;
else if (rotationAngle >= 360) else if (rotationAngle >= 360)
@ -278,24 +278,24 @@ static NSAffineTransformStruct identityTransform = {
return AUTORELEASE(path); return AUTORELEASE(path);
} }
- (NSPoint) transformPoint: (NSPoint)point - (NSPoint) transformPoint: (NSPoint)aPoint
{ {
NSPoint new; NSPoint new;
new.x = A * point.x + C * point.y + TX; new.x = A * aPoint.x + C * aPoint.y + TX;
new.y = B * point.x + D * point.y + TY; new.y = B * aPoint.x + D * aPoint.y + TY;
return new; return new;
} }
- (NSSize) transformSize: (NSSize)size - (NSSize) transformSize: (NSSize)aSize
{ {
NSSize new; NSSize new;
new.width = A * size.width + C * size.height; new.width = A * aSize.width + C * aSize.height;
if (new.width < 0) if (new.width < 0)
new.width = - new.width; new.width = - new.width;
new.height = B * size.width + D * size.height; new.height = B * aSize.width + D * aSize.height;
if (new.height < 0) if (new.height < 0)
new.height = - new.height; new.height = - new.height;
@ -433,21 +433,21 @@ static NSAffineTransformStruct identityTransform = {
return rotationAngle; return rotationAngle;
} }
- (void) concatenateWith: (NSAffineTransform*)other - (void) concatenateWith: (NSAffineTransform*)anotherMatrix
{ {
[self appendTransform: other]; [self appendTransform: anotherMatrix];
} }
- (void) concatenateWithMatrix: (const float[6])concat - (void) concatenateWithMatrix: (const float[6])anotherMatrix
{ {
float newA, newB, newC, newD, newTX, newTY; float newA, newB, newC, newD, newTX, newTY;
newA = concat[0] * A + concat[1] * C; newA = anotherMatrix[0] * A + anotherMatrix[1] * C;
newB = concat[0] * B + concat[1] * D; newB = anotherMatrix[0] * B + anotherMatrix[1] * D;
newC = concat[2] * A + concat[3] * C; newC = anotherMatrix[2] * A + anotherMatrix[3] * C;
newD = concat[2] * B + concat[3] * D; newD = anotherMatrix[2] * B + anotherMatrix[3] * D;
newTX = concat[4] * A + concat[5] * C + TX; newTX = anotherMatrix[4] * A + anotherMatrix[5] * C + TX;
newTY = concat[4] * B + concat[5] * D + TY; newTY = anotherMatrix[4] * B + anotherMatrix[5] * D + TY;
A = newA; B = newB; A = newA; B = newB;
C = newC; D = newD; C = newC; D = newD;
@ -607,14 +607,14 @@ static NSAffineTransformStruct identityTransform = {
replace[5] = matrix.ty; replace[5] = matrix.ty;
} }
- (void) takeMatrixFromTransform: (NSAffineTransform *)other - (void) takeMatrixFromTransform: (NSAffineTransform *)aTransform
{ {
matrix.m11 = other->matrix.m11; matrix.m11 = aTransform->matrix.m11;
matrix.m12 = other->matrix.m12; matrix.m12 = aTransform->matrix.m12;
matrix.m21 = other->matrix.m21; matrix.m21 = aTransform->matrix.m21;
matrix.m22 = other->matrix.m22; matrix.m22 = aTransform->matrix.m22;
matrix.tx = other->matrix.tx; matrix.tx = aTransform->matrix.tx;
matrix.ty = other->matrix.ty; matrix.ty = aTransform->matrix.ty;
} }

8
Source/NSApplication.m
View file

@ -1820,9 +1820,9 @@ delegate.
[self orderFrontStandardInfoPanel: sender]; [self orderFrontStandardInfoPanel: sender];
} }
- (void) orderFrontStandardAboutPanelWithOptions: (NSDictionary *)options - (void) orderFrontStandardAboutPanelWithOptions: (NSDictionary *)dictionary
{ {
[self orderFrontStandardInfoPanelWithOptions: options]; [self orderFrontStandardInfoPanelWithOptions: dictionary];
} }
/* infoPanel, GNUstep API */ /* infoPanel, GNUstep API */
@ -1831,10 +1831,10 @@ delegate.
[self orderFrontStandardInfoPanelWithOptions: nil]; [self orderFrontStandardInfoPanelWithOptions: nil];
} }
- (void) orderFrontStandardInfoPanelWithOptions: (NSDictionary *)options - (void) orderFrontStandardInfoPanelWithOptions: (NSDictionary *)dictionary
{ {
if (_infoPanel == nil) if (_infoPanel == nil)
_infoPanel = [[GSInfoPanel alloc] initWithDictionary: options]; _infoPanel = [[GSInfoPanel alloc] initWithDictionary: dictionary];
[_infoPanel setTitle: GSGuiLocalizedString (@"Info", [_infoPanel setTitle: GSGuiLocalizedString (@"Info",
@"Title of the Info Panel")]; @"Title of the Info Panel")];

12
Source/NSBitmapImageRep.m
View file

@ -526,9 +526,9 @@
} }
} }
- (BOOL) canBeCompressedUsing: (NSTIFFCompression)type - (BOOL) canBeCompressedUsing: (NSTIFFCompression)compression
{ {
switch (type) switch (compression)
{ {
case NSTIFFCompressionCCITTFAX3: case NSTIFFCompressionCCITTFAX3:
case NSTIFFCompressionCCITTFAX4: case NSTIFFCompressionCCITTFAX4:
@ -550,17 +550,17 @@
} }
} }
- (void) getCompression: (NSTIFFCompression*)type - (void) getCompression: (NSTIFFCompression*)compression
factor: (float*)factor factor: (float*)factor
{ {
*type = _compression; *compression = _compression;
*factor = _comp_factor; *factor = _comp_factor;
} }
- (void) setCompression: (NSTIFFCompression)type - (void) setCompression: (NSTIFFCompression)compression
factor: (float)factor factor: (float)factor
{ {
_compression = type; _compression = compression;
_comp_factor = factor; _comp_factor = factor;
} }

24
Source/NSGraphicsContext.m
View file

@ -144,7 +144,7 @@ NSGraphicsContext *GSCurrentContext()
return [self graphicsContextWithAttributes: info]; return [self graphicsContextWithAttributes: info];
} }
+ (NSGraphicsContext *) graphicsContextWithAttributes: (NSDictionary *)info + (NSGraphicsContext *) graphicsContextWithAttributes: (NSDictionary *)attributes
{ {
NSGraphicsContext *ctxt; NSGraphicsContext *ctxt;
if (self == [NSGraphicsContext class]) if (self == [NSGraphicsContext class])
@ -152,11 +152,11 @@ NSGraphicsContext *GSCurrentContext()
NSAssert(defaultNSGraphicsContextClass, NSAssert(defaultNSGraphicsContextClass,
@"Internal Error: No default NSGraphicsContext set\n"); @"Internal Error: No default NSGraphicsContext set\n");
ctxt = [[defaultNSGraphicsContextClass allocWithZone: _globalGSZone] ctxt = [[defaultNSGraphicsContextClass allocWithZone: _globalGSZone]
initWithContextInfo: info]; initWithContextInfo: attributes];
AUTORELEASE(ctxt); AUTORELEASE(ctxt);
} }
else else
ctxt = [[self allocWithZone: _globalGSZone] initWithContextInfo: info]; ctxt = [[self allocWithZone: _globalGSZone] initWithContextInfo: attributes];
return ctxt; return ctxt;
} }
@ -1655,7 +1655,7 @@ NSGraphicsContext *GSCurrentContext()
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
- (void) DPSueofill: (const char *)nums : (int)n : (const char *)op : (int)l - (void) DPSueofill: (const char *)nums : (int)n : (const char *)ops : (int)l
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
@ -1938,7 +1938,7 @@ NSGraphicsContext *GSCurrentContext()
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
- (void) DPScurrentalpha: (float *)alpha - (void) DPScurrentalpha: (float *)a
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
@ -2021,7 +2021,7 @@ NSGraphicsContext *GSCurrentContext()
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
- (void) DPSsetexposurecolor; - (void) DPSsetexposurecolor
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
@ -2136,7 +2136,7 @@ NSGraphicsContext *GSCurrentContext()
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
- (void) DPSreleasemouse; - (void) DPSreleasemouse
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
@ -2146,12 +2146,12 @@ NSGraphicsContext *GSCurrentContext()
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
- (void) DPShidecursor; - (void) DPShidecursor
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
- (void) DPSshowcursor; - (void) DPSshowcursor
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
@ -2171,7 +2171,7 @@ NSGraphicsContext *GSCurrentContext()
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
- (void) DPSstyleoffsets: (float *) r : (float *) l : (float *) t : (float *) b : (int) style - (void) DPSstyleoffsets: (float *) l : (float *) r : (float *) t : (float *) b : (int) style
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
@ -2508,7 +2508,7 @@ NSGraphicsContext *GSCurrentContext()
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
- (void) DPSsetinputstate: (int)win : (int)st - (void) DPSsetinputstate: (int)window : (int)state
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
@ -2621,7 +2621,7 @@ NSGraphicsContext *GSCurrentContext()
} }
} }
- (void) NSRectFillUsingOperation: (NSRect) aRect : (NSCompositingOperation) op; - (void) NSRectFillUsingOperation: (NSRect)aRect : (NSCompositingOperation)op
{ {
// FIXME: // FIXME:
NSRectFill(aRect); NSRectFill(aRect);

2
Source/NSPageLayout.m
View file

@ -58,7 +58,7 @@ static NSPageLayout *shared_instance;
This includes information about the paper size and orientation. This includes information about the paper size and orientation.
Typically you would create a page layout panel with the Typically you would create a page layout panel with the
<ref id="pageLayout">pageLayout</ref> class method. However, the best +pageLayout class method. However, the best
way to use the panel is to have the application way to use the panel is to have the application
call the runPageLayout: method in the NSApplication object call the runPageLayout: method in the NSApplication object
which would both create a standard NSPageLayout panel and display it which would both create a standard NSPageLayout panel and display it

2
Source/NSSlider.m
View file

@ -311,7 +311,7 @@ static Class cellClass;
return [_cell indexOfTickMarkAtPoint: point]; return [_cell indexOfTickMarkAtPoint: point];
} }
- (int) numberOfTickMarks; - (int) numberOfTickMarks
{ {
return [_cell numberOfTickMarks]; return [_cell numberOfTickMarks];
} }

3
Source/NSTableHeaderView.m
View file

@ -45,8 +45,7 @@
@end @end
@implementation NSTableHeaderView @implementation NSTableHeaderView
{
}
/* /*
* *
* Class methods * Class methods

2
Source/NSText.m
View file

@ -8,7 +8,7 @@
Date: 1996 Date: 1996
Author: Felipe A. Rodriguez <far@ix.netcom.com> Author: Felipe A. Rodriguez <far@ix.netcom.com>
Date: July 1998 Date: July 1998
Author: Daniel Bðhringer <boehring@biomed.ruhr-uni-bochum.de></email></author> Author: Daniel Bðhringer <boehring@biomed.ruhr-uni-bochum.de>
Date: August 1998 Date: August 1998
Author: Fred Kiefer <FredKiefer@gmx.de> Author: Fred Kiefer <FredKiefer@gmx.de>
Date: March 2000 Date: March 2000

56
Source/NSWindow.m
View file

@ -407,13 +407,15 @@ static NSCell *tileCell = nil;
associated NSViews, and events generate by the user. An NSWindow's associated NSViews, and events generate by the user. An NSWindow's
size is defined by its frame rectangle, which encompasses its entire size is defined by its frame rectangle, which encompasses its entire
structure, and its content rectangle, which includes only the structure, and its content rectangle, which includes only the
content. </p> content.
</p>
<p> Every NSWindow has a content view, the NSView which forms the <p> Every NSWindow has a content view, the NSView which forms the
root of the window's view hierarchy. This view can be set using the root of the window's view hierarchy. This view can be set using the
<code>setContentView:</code> method, and accessed through the <code>setContentView:</code> method, and accessed through the
<code>contentView</code> method. <code>setContentView:</code> <code>contentView</code> method. <code>setContentView:</code>
replaces the default content view created by NSWindow. </p> replaces the default content view created by NSWindow.
</p>
<p> Other views may be added to the window by using the content <p> Other views may be added to the window by using the content
view's <code>addSubview:</code> method. These subviews can also view's <code>addSubview:</code> method. These subviews can also
@ -421,7 +423,8 @@ static NSCell *tileCell = nil;
When an NSWindow must display itself, it causes this hierarchy to When an NSWindow must display itself, it causes this hierarchy to
draw itself. Leaf nodes in the view hierarchy are drawn last, draw itself. Leaf nodes in the view hierarchy are drawn last,
causing them to potentially obscure views further up in the causing them to potentially obscure views further up in the
hierarchy. </p> hierarchy.
</p>
<p> A delegate can be specified for an NSWindow, which will receive <p> A delegate can be specified for an NSWindow, which will receive
notifications of events pertaining to the window. The delegate is notifications of events pertaining to the window. The delegate is
@ -429,7 +432,8 @@ static NSCell *tileCell = nil;
<code>delegate</code>. The delegate can restrain resizing by <code>delegate</code>. The delegate can restrain resizing by
implementing the <code>windowWillResize: toSize:</code> method, or implementing the <code>windowWillResize: toSize:</code> method, or
control the closing of the window by implementing control the closing of the window by implementing
<code>windowShouldClose:</code>. </p> <code>windowShouldClose:</code>.
</p>
</unit> </unit>
*/ */
@ -698,18 +702,22 @@ static NSNotificationCenter *nc = nil;
/** /**
<p> Initializes the receiver with a content rect of <p> Initializes the receiver with a content rect of
<var>contentRect</var>, a style mask of <var>styleMask</var>, and a <var>contentRect</var>, a style mask of <var>styleMask</var>, and a
backing store type of <var>backingType</var>. </p> backing store type of <var>backingType</var>.
</p>
<p> The style mask values are <code>NSTitledWindowMask</code>, for a <p> The style mask values are <code>NSTitledWindowMask</code>, for a
window with a title, <code>NSClosableWindowMask</code>, for a window window with a title, <code>NSClosableWindowMask</code>, for a window
with a close widget, <code>NSMiniaturizableWindowMask</code>, for a with a close widget, <code>NSMiniaturizableWindowMask</code>, for a
window with a miniaturize widget, and window with a miniaturize widget, and
<code>NSResizableWindowMask</code>, for a window with a resizing <code>NSResizableWindowMask</code>, for a window with a resizing
widget. These mask values can be OR'd in any combination. </p> widget. These mask values can be OR'd in any combination.
</p>
<p> Backing store values are <code>NSBackingStoreBuffered</code>, <p> Backing store values are <code>NSBackingStoreBuffered</code>,
<code>NSBackingStoreRetained</code> and <code>NSBackingStoreRetained</code> and
<code>NSBackingStoreNonretained</code>. </p> */ <code>NSBackingStoreNonretained</code>.
</p>
*/
- (id) initWithContentRect: (NSRect)contentRect - (id) initWithContentRect: (NSRect)contentRect
styleMask: (unsigned int)aStyle styleMask: (unsigned int)aStyle
backing: (NSBackingStoreType)bufferingType backing: (NSBackingStoreType)bufferingType
@ -730,18 +738,22 @@ static NSNotificationCenter *nc = nil;
backing store type of <var>backingType</var> and a boolean backing store type of <var>backingType</var> and a boolean
<var>flag</var>. <var>flag</var> specifies whether the window <var>flag</var>. <var>flag</var> specifies whether the window
should be created now (<code>NO</code>), or when it is displayed should be created now (<code>NO</code>), or when it is displayed
(<code>YES</code>). </p> (<code>YES</code>).
</p>
<p> The style mask values are <code>NSTitledWindowMask</code>, for a <p> The style mask values are <code>NSTitledWindowMask</code>, for a
window with a title, <code>NSClosableWindowMask</code>, for a window window with a title, <code>NSClosableWindowMask</code>, for a window
with a close widget, <code>NSMiniaturizableWindowMask</code>, for a with a close widget, <code>NSMiniaturizableWindowMask</code>, for a
window with a miniaturize widget, and window with a miniaturize widget, and
<code>NSResizableWindowMask</code>, for a window with a resizing <code>NSResizableWindowMask</code>, for a window with a resizing
widget. These mask values can be OR'd in any combination. </p> widget. These mask values can be OR'd in any combination.
</p>
<p> Backing store values are <code>NSBackingStoreBuffered</code>, <p> Backing store values are <code>NSBackingStoreBuffered</code>,
<code>NSBackingStoreRetained</code> and <code>NSBackingStoreRetained</code> and
<code>NSBackingStoreNonretained</code>. </p> */ <code>NSBackingStoreNonretained</code>.
</p>
*/
- (id) initWithContentRect: (NSRect)contentRect - (id) initWithContentRect: (NSRect)contentRect
styleMask: (unsigned int)aStyle styleMask: (unsigned int)aStyle
backing: (NSBackingStoreType)bufferingType backing: (NSBackingStoreType)bufferingType
@ -2856,6 +2868,30 @@ resetCursorRectsForView(NSView *theView)
case GSAppKitWindowFocusOut: case GSAppKitWindowFocusOut:
break; break;
case GSAppKitWindowLeave:
/*
* We need to go through all of the views, and if there
* is any with a tracking rectangle then we need to
* determine if we should send a NSMouseExited event. */
(*ctImp)(self, ctSel, _contentView, theEvent);
if (_f.is_key)
{
/*
* We need to go through all of the views, and if
* there is any with a cursor rectangle then we need
* to determine if we should send a cursor update
* event. */
if (_f.cursor_rects_enabled)
(*ccImp)(self, ccSel, _contentView, theEvent);
}
_lastPoint = NSMakePoint(-1, -1);
break;
case GSAppKitWindowEnter:
break;
#define GSPerformDragSelector(view, sel, info, action) \ #define GSPerformDragSelector(view, sel, info, action) \
if ([view window] == self) \ if ([view window] == self) \