mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 07:00:46 +00:00
New AppKit events. Updates for autogsdoc
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@12217 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
22112f40df
commit
4b54ab9f06
41 changed files with 384 additions and 309 deletions
22
ChangeLog
22
ChangeLog
|
@ -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>
|
||||
|
||||
* Source/NSBundleAdditions.m ([NSBundle
|
||||
|
|
|
@ -49,97 +49,94 @@ Gui_GSDOC_FILES = Gui.gsdoc \
|
|||
NSTextTab.gsdoc
|
||||
|
||||
# These gsdoc files are automatically generated from class source/headers
|
||||
Gui_AGSDOC_FILES = \
|
||||
NSActionCell.h \
|
||||
NSAffineTransform.h \
|
||||
NSApplication.h \
|
||||
NSAttributedString.h \
|
||||
NSBezierPath.h \
|
||||
NSBitmapImageRep.h \
|
||||
NSBox.h \
|
||||
NSBrowser.h \
|
||||
NSBrowserCell.h \
|
||||
NSButton.h \
|
||||
NSButtonCell.h \
|
||||
NSCachedImageRep.h \
|
||||
NSCell.h \
|
||||
NSClipView.h \
|
||||
NSColor.h \
|
||||
NSColorList.h \
|
||||
NSColorPanel.h \
|
||||
NSColorPicker.h \
|
||||
NSColorWell.h \
|
||||
NSComboBox.h \
|
||||
NSComboBoxCell.h \
|
||||
NSControl.h \
|
||||
NSCursor.h \
|
||||
NSCustomImageRep.h \
|
||||
NSDocument.h \
|
||||
NSDocumentController.h \
|
||||
NSEPSImageRep.h \
|
||||
NSEvent.h \
|
||||
NSFileWrapper.h \
|
||||
NSFont.h \
|
||||
NSFontManager.h \
|
||||
NSFontPanel.h \
|
||||
NSForm.h \
|
||||
NSFormCell.h \
|
||||
NSGraphicsContext.h \
|
||||
NSHelpManager.h \
|
||||
NSImage.h \
|
||||
NSImageCell.h \
|
||||
NSImageRep.h \
|
||||
NSImageView.h \
|
||||
NSInputManager.h \
|
||||
NSInputServer.h \
|
||||
NSLayoutManager.h \
|
||||
NSMatrix.h \
|
||||
NSMenu.h \
|
||||
NSMenuItemCell.h \
|
||||
NSMenuView.h \
|
||||
NSOpenPanel.h \
|
||||
NSPageLayout.h \
|
||||
NSPanel.h \
|
||||
NSParagraphStyle.h \
|
||||
NSPasteboard.h \
|
||||
NSPopUpButton.h \
|
||||
NSPopUpButtonCell.h \
|
||||
NSPrintInfo.h \
|
||||
NSPrintOperation.h \
|
||||
NSPrintPanel.h \
|
||||
NSPrinter.h \
|
||||
NSProgressIndicator.h \
|
||||
NSResponder.h \
|
||||
NSRulerMarker.h \
|
||||
NSRulerView.h \
|
||||
NSSavePanel.h \
|
||||
NSScreen.h \
|
||||
NSScrollView.h \
|
||||
NSScroller.h \
|
||||
NSSecureTextField.h \
|
||||
NSSlider.h \
|
||||
NSSliderCell.h \
|
||||
NSSpellChecker.h \
|
||||
NSSpellServer.h \
|
||||
NSSplitView.h \
|
||||
NSTabView.h \
|
||||
NSTabViewItem.h \
|
||||
NSTableHeaderCell.h \
|
||||
NSTableHeaderView.h \
|
||||
NSTableView.h \
|
||||
NSText.h \
|
||||
NSTextContainer.h \
|
||||
NSTextField.h \
|
||||
NSTextFieldCell.h \
|
||||
NSTextStorage.h \
|
||||
NSTextView.h \
|
||||
NSView.h \
|
||||
NSWindow.h \
|
||||
NSWindowController.h \
|
||||
NSWorkspace.h
|
||||
|
||||
Gui_AGSDOC_FLAGS = -HeaderDirectory ../../Headers/AppKit -Declared AppKit \
|
||||
-SourceDirectory ../../Source
|
||||
Gui_AUTOGSDOC_FILES = \
|
||||
NSActionCell.gsdoc \
|
||||
NSAffineTransform.gsdoc \
|
||||
NSApplication.gsdoc \
|
||||
NSAttributedString.gsdoc \
|
||||
NSBezierPath.gsdoc \
|
||||
NSBitmapImageRep.gsdoc \
|
||||
NSBox.gsdoc \
|
||||
NSBrowser.gsdoc \
|
||||
NSBrowserCell.gsdoc \
|
||||
NSButton.gsdoc \
|
||||
NSButtonCell.gsdoc \
|
||||
NSCachedImageRep.gsdoc \
|
||||
NSCell.gsdoc \
|
||||
NSClipView.gsdoc \
|
||||
NSColor.gsdoc \
|
||||
NSColorList.gsdoc \
|
||||
NSColorPanel.gsdoc \
|
||||
NSColorPicker.gsdoc \
|
||||
NSColorWell.gsdoc \
|
||||
NSComboBox.gsdoc \
|
||||
NSComboBoxCell.gsdoc \
|
||||
NSControl.gsdoc \
|
||||
NSCursor.gsdoc \
|
||||
NSCustomImageRep.gsdoc \
|
||||
NSDocument.gsdoc \
|
||||
NSDocumentController.gsdoc \
|
||||
NSEPSImageRep.gsdoc \
|
||||
NSEvent.gsdoc \
|
||||
NSFileWrapper.gsdoc \
|
||||
NSFont.gsdoc \
|
||||
NSFontManager.gsdoc \
|
||||
NSFontPanel.gsdoc \
|
||||
NSForm.gsdoc \
|
||||
NSFormCell.gsdoc \
|
||||
NSGraphicsContext.gsdoc \
|
||||
NSHelpManager.gsdoc \
|
||||
NSImage.gsdoc \
|
||||
NSImageCell.gsdoc \
|
||||
NSImageRep.gsdoc \
|
||||
NSImageView.gsdoc \
|
||||
NSInputManager.gsdoc \
|
||||
NSInputServer.gsdoc \
|
||||
NSLayoutManager.gsdoc \
|
||||
NSMatrix.gsdoc \
|
||||
NSMenu.gsdoc \
|
||||
NSMenuItemCell.gsdoc \
|
||||
NSMenuView.gsdoc \
|
||||
NSOpenPanel.gsdoc \
|
||||
NSPageLayout.gsdoc \
|
||||
NSPanel.gsdoc \
|
||||
NSParagraphStyle.gsdoc \
|
||||
NSPasteboard.gsdoc \
|
||||
NSPopUpButton.gsdoc \
|
||||
NSPopUpButtonCell.gsdoc \
|
||||
NSPrintInfo.gsdoc \
|
||||
NSPrintOperation.gsdoc \
|
||||
NSPrintPanel.gsdoc \
|
||||
NSPrinter.gsdoc \
|
||||
NSProgressIndicator.gsdoc \
|
||||
NSResponder.gsdoc \
|
||||
NSRulerMarker.gsdoc \
|
||||
NSRulerView.gsdoc \
|
||||
NSSavePanel.gsdoc \
|
||||
NSScreen.gsdoc \
|
||||
NSScrollView.gsdoc \
|
||||
NSScroller.gsdoc \
|
||||
NSSecureTextField.gsdoc \
|
||||
NSSlider.gsdoc \
|
||||
NSSliderCell.gsdoc \
|
||||
NSSpellChecker.gsdoc \
|
||||
NSSpellServer.gsdoc \
|
||||
NSSplitView.gsdoc \
|
||||
NSTabView.gsdoc \
|
||||
NSTabViewItem.gsdoc \
|
||||
NSTableHeaderCell.gsdoc \
|
||||
NSTableHeaderView.gsdoc \
|
||||
NSTableView.gsdoc \
|
||||
NSText.gsdoc \
|
||||
NSTextContainer.gsdoc \
|
||||
NSTextField.gsdoc \
|
||||
NSTextFieldCell.gsdoc \
|
||||
NSTextStorage.gsdoc \
|
||||
NSTextView.gsdoc \
|
||||
NSView.gsdoc \
|
||||
NSWindow.gsdoc \
|
||||
NSWindowController.gsdoc \
|
||||
NSWorkspace.gsdoc
|
||||
|
||||
Gui_DOC_INSTALL_DIR = Developer/Gui/Reference
|
||||
|
||||
|
|
|
@ -88,7 +88,7 @@
|
|||
-(void) addView: (NSView *)aView;
|
||||
|
||||
-(void) addView: (NSView *)aView
|
||||
enablingXResizing: (BOOL)flag;
|
||||
enablingXResizing: (BOOL)aFlag;
|
||||
|
||||
-(void) addView: (NSView *)aView
|
||||
withMinXMargin: (float)aMargin;
|
||||
|
@ -97,7 +97,7 @@ enablingXResizing: (BOOL)flag;
|
|||
// enablingXResizing is YES if the {view and its margins} should be
|
||||
// resized when the GSHbox is resized in the horizontal direction.
|
||||
// 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:
|
||||
// the margin between each view and the preceding one.
|
||||
// Exception: the first view is special, and has no margin set (it has no
|
||||
|
|
|
@ -69,13 +69,13 @@
|
|||
-(void) addView: (NSView *)aView;
|
||||
|
||||
-(void) addView: (NSView *)aView
|
||||
enablingYResizing: (BOOL)flag;
|
||||
enablingYResizing: (BOOL)aFlag;
|
||||
|
||||
-(void) addView: (NSView *)aView
|
||||
withMinYMargin: (float)aMargin;
|
||||
|
||||
-(void) addView: (NSView *)aView
|
||||
enablingYResizing: (BOOL)flag
|
||||
enablingYResizing: (BOOL)aFlag
|
||||
withMinYMargin: (float)aMargin;
|
||||
|
||||
//
|
||||
|
|
|
@ -96,7 +96,7 @@ typedef struct {
|
|||
- (void) setMatrix: (const float[6])replace;
|
||||
- (void) getMatrix: (float[6])replace;
|
||||
|
||||
- (void) takeMatrixFromTransform: (NSAffineTransform *)other;
|
||||
- (void) takeMatrixFromTransform: (NSAffineTransform *)aTransform;
|
||||
|
||||
@end
|
||||
#endif
|
||||
|
|
|
@ -150,9 +150,9 @@ APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
|
|||
* Getting, removing, and posting events
|
||||
*/
|
||||
- (NSEvent*) currentEvent;
|
||||
- (void) discardEventsMatchingMask: (unsigned)mask
|
||||
- (void) discardEventsMatchingMask: (unsigned int)mask
|
||||
beforeEvent: (NSEvent*)lastEvent;
|
||||
- (NSEvent*) nextEventMatchingMask: (unsigned)mask
|
||||
- (NSEvent*) nextEventMatchingMask: (unsigned int)mask
|
||||
untilDate: (NSDate*)expiration
|
||||
inMode: (NSString*)mode
|
||||
dequeue: (BOOL)flag;
|
||||
|
|
|
@ -86,11 +86,11 @@ typedef enum {
|
|||
//
|
||||
// Immediate mode drawing of common paths
|
||||
//
|
||||
+ (void)fillRect:(NSRect)rect;
|
||||
+ (void)strokeRect:(NSRect)rect;
|
||||
+ (void)clipRect:(NSRect)rect;
|
||||
+ (void)fillRect:(NSRect)aRect;
|
||||
+ (void)strokeRect:(NSRect)aRect;
|
||||
+ (void)clipRect:(NSRect)aRect;
|
||||
+ (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
|
||||
|
@ -185,7 +185,7 @@ typedef enum {
|
|||
//
|
||||
// Appending common paths
|
||||
//
|
||||
- (void)appendBezierPath:(NSBezierPath *)path;
|
||||
- (void)appendBezierPath:(NSBezierPath *)aPath;
|
||||
- (void)appendBezierPathWithRect:(NSRect)rect;
|
||||
- (void)appendBezierPathWithPoints:(NSPoint *)points count:(int)count;
|
||||
- (void)appendBezierPathWithOvalInRect:(NSRect)aRect;
|
||||
|
|
|
@ -85,7 +85,7 @@ typedef enum _NSBitmapImageFileType {
|
|||
bitsPerSample: (int)bps
|
||||
samplesPerPixel: (int)spp
|
||||
hasAlpha: (BOOL)alpha
|
||||
isPlanar: (BOOL)config
|
||||
isPlanar: (BOOL)isPlanar
|
||||
colorSpaceName: (NSString*)colorSpaceName
|
||||
bytesPerRow: (int)rowBytes
|
||||
bitsPerPixel: (int)pixelBits;
|
||||
|
|
|
@ -164,7 +164,7 @@
|
|||
- (int) numberOfVisibleColumns;
|
||||
- (void) reloadColumn: (int)column;
|
||||
- (void) selectAll: (id)sender;
|
||||
- (void) selectRow: (int)row inColumn: (int)col;
|
||||
- (void) selectRow: (int)row inColumn: (int)column;
|
||||
- (int) selectedColumn;
|
||||
- (int) selectedRowInColumn: (int)column;
|
||||
- (void) setLastColumn: (int)column;
|
||||
|
@ -232,8 +232,8 @@
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void) encodeWithCoder: aCoder;
|
||||
- (id) initWithCoder: aDecoder;
|
||||
- (void) encodeWithCoder: (NSCoder *)aCoder;
|
||||
- (id) initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -72,8 +72,8 @@
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -414,8 +414,8 @@ typedef enum _NSControlSize {
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -73,8 +73,8 @@
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -115,8 +115,8 @@ APPKIT_EXPORT NSString *NSDataLinkFileNameExtension;
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -122,8 +122,8 @@
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -79,8 +79,8 @@
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -328,6 +328,8 @@ typedef enum {
|
|||
GSAppKitWindowMiniaturize,
|
||||
GSAppKitWindowFocusIn,
|
||||
GSAppKitWindowFocusOut,
|
||||
GSAppKitWindowLeave,
|
||||
GSAppKitWindowEnter,
|
||||
GSAppKitDraggingEnter,
|
||||
GSAppKitDraggingUpdate,
|
||||
GSAppKitDraggingStatus,
|
||||
|
|
|
@ -58,9 +58,9 @@
|
|||
//
|
||||
- (void)setBezeled:(BOOL)flag;
|
||||
- (void)setBordered:(BOOL)flag;
|
||||
- (void)setTextAlignment:(int)mode;
|
||||
- (void)setTextAlignment:(int)aMode;
|
||||
- (void)setTextFont:(NSFont*)fontObject;
|
||||
- (void)setTitleAlignment:(NSTextAlignment)mode;
|
||||
- (void)setTitleAlignment:(NSTextAlignment)aMode;
|
||||
- (void)setTitleFont:(NSFont*)fontObject;
|
||||
|
||||
//
|
||||
|
|
|
@ -78,8 +78,8 @@
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -72,8 +72,8 @@
|
|||
//
|
||||
// Initializing a New NSImage Instance
|
||||
//
|
||||
- (id) initByReferencingFile: (NSString*)filename;
|
||||
- (id) initWithContentsOfFile: (NSString*)filename;
|
||||
- (id) initByReferencingFile: (NSString*)fileName;
|
||||
- (id) initWithContentsOfFile: (NSString*)fileName;
|
||||
- (id) initWithData: (NSData*)data;
|
||||
- (id) initWithPasteboard: (NSPasteboard*)pasteboard;
|
||||
- (id) initWithSize: (NSSize)aSize;
|
||||
|
@ -93,8 +93,8 @@
|
|||
//
|
||||
// Referring to Images by Name
|
||||
//
|
||||
+ (id) imageNamed: (NSString*)name;
|
||||
- (BOOL) setName: (NSString*)name;
|
||||
+ (id) imageNamed: (NSString*)aName;
|
||||
- (BOOL) setName: (NSString*)aName;
|
||||
- (NSString*) name;
|
||||
|
||||
//
|
||||
|
|
|
@ -168,12 +168,12 @@ typedef enum {
|
|||
/*************************** Helper objects ***************************/
|
||||
|
||||
- (NSTextStorage *) textStorage;
|
||||
- (void) setTextStorage: (NSTextStorage *)textStorage;
|
||||
- (void) setTextStorage: (NSTextStorage *)aTextStorage;
|
||||
|
||||
- (void) replaceTextStorage: (NSTextStorage *)newTextStorage;
|
||||
|
||||
- (id) delegate;
|
||||
- (void) setDelegate: (id)delegate;
|
||||
- (void) setDelegate: (id)aDelegate;
|
||||
|
||||
/**************************** Containers ****************************/
|
||||
|
||||
|
@ -184,21 +184,21 @@ typedef enum {
|
|||
atIndex: (unsigned)index;
|
||||
- (void) removeTextContainerAtIndex: (unsigned)index;
|
||||
|
||||
- (void) textContainerChangedGeometry: (NSTextContainer *)container;
|
||||
- (void) textContainerChangedTextView: (NSTextContainer *)container;
|
||||
- (void) textContainerChangedGeometry: (NSTextContainer *)aContainer;
|
||||
- (void) textContainerChangedTextView: (NSTextContainer *)aContainer;
|
||||
|
||||
/************************** Invalidation primitives **************************/
|
||||
|
||||
- (void) invalidateGlyphsForCharacterRange: (NSRange)charRange
|
||||
changeInLength: (int)delta
|
||||
actualCharacterRange: (NSRange *)actualCharRange;
|
||||
- (void) invalidateLayoutForCharacterRange: (NSRange)charRange
|
||||
- (void) invalidateGlyphsForCharacterRange: (NSRange)aRange
|
||||
changeInLength: (int)lengthChange
|
||||
actualCharacterRange: (NSRange *)actualRange;
|
||||
- (void) invalidateLayoutForCharacterRange: (NSRange)aRange
|
||||
isSoft: (BOOL)flag
|
||||
actualCharacterRange: (NSRange *)actualCharRange;
|
||||
actualCharacterRange: (NSRange *)actualRange;
|
||||
|
||||
- (void) invalidateDisplayForGlyphRange: (NSRange)glyphRange;
|
||||
- (void) invalidateDisplayForGlyphRange: (NSRange)aRange;
|
||||
#ifndef STRICT_40
|
||||
- (void) invalidateDisplayForCharacterRange: (NSRange)charRange;
|
||||
- (void) invalidateDisplayForCharacterRange: (NSRange)aRange;
|
||||
#endif
|
||||
|
||||
/******************* Invalidation sent by NSTextStorage *******************/
|
||||
|
@ -223,13 +223,13 @@ typedef enum {
|
|||
|
||||
/************************ Adding and removing glyphs ************************/
|
||||
|
||||
- (void) insertGlyph: (NSGlyph)glyph atGlyphIndex: (unsigned)glyphIndex
|
||||
- (void) insertGlyph: (NSGlyph)aGlyph atGlyphIndex: (unsigned)glyphIndex
|
||||
characterIndex: (unsigned)charIndex;
|
||||
|
||||
- (void) replaceGlyphAtIndex: (unsigned)glyphIndex
|
||||
withGlyph: (NSGlyph)newGlyph;
|
||||
|
||||
- (void) deleteGlyphsInRange: (NSRange)glyphRange;
|
||||
- (void) deleteGlyphsInRange: (NSRange)aRange;
|
||||
|
||||
- (void) setCharacterIndex: (unsigned)charIndex
|
||||
forGlyphAtIndex: (unsigned)glyphIndex;
|
||||
|
@ -250,7 +250,7 @@ typedef enum {
|
|||
/************************ Set/Get glyph attributes ************************/
|
||||
|
||||
- (void) setIntAttribute: (int)attributeTag
|
||||
value: (int)val
|
||||
value: (int)anInt
|
||||
forGlyphAtIndex: (unsigned)glyphIndex;
|
||||
|
||||
- (int) intAttribute: (int)attributeTag
|
||||
|
@ -261,7 +261,7 @@ typedef enum {
|
|||
|
||||
/************************ Set/Get layout attributes ************************/
|
||||
|
||||
- (void) setTextContainer: (NSTextContainer *)container
|
||||
- (void) setTextContainer: (NSTextContainer *)aTextContainer
|
||||
forGlyphRange: (NSRange)glyphRange;
|
||||
|
||||
- (void) setLineFragmentRect: (NSRect)fragmentRect
|
||||
|
@ -282,7 +282,7 @@ forStartOfGlyphRange: (NSRange)glyphRange;
|
|||
forGlyphAtIndex: (unsigned)glyphIndex;
|
||||
|
||||
- (NSTextContainer *) textContainerForGlyphAtIndex: (unsigned)glyphIndex
|
||||
effectiveRange: (NSRange *)effectiveGlyphRange;
|
||||
effectiveRange: (NSRange *)effectiveRange;
|
||||
|
||||
- (NSRect) usedRectForTextContainer: (NSTextContainer *)container;
|
||||
|
||||
|
@ -327,7 +327,7 @@ forStartOfGlyphRange: (NSRange)glyphRange;
|
|||
rectCount: (unsigned *)rectCount;
|
||||
|
||||
- (NSRect) boundingRectForGlyphRange: (NSRange)glyphRange
|
||||
inTextContainer: (NSTextContainer *)container;
|
||||
inTextContainer: (NSTextContainer *)aTextContainer;
|
||||
|
||||
- (NSRange) glyphRangeForBoundingRect: (NSRect)bounds
|
||||
inTextContainer: (NSTextContainer *)container;
|
||||
|
|
|
@ -224,11 +224,11 @@ typedef enum _NSMatrixMode {
|
|||
- (void) selectText: (id)sender;
|
||||
- (id) selectTextAtRow: (int)row
|
||||
column: (int)column;
|
||||
- (void) textDidBeginEditing: (NSNotification *)notification;
|
||||
- (void) textDidChange: (NSNotification *)notification;
|
||||
- (void) textDidEndEditing: (NSNotification *)notification;
|
||||
- (BOOL) textShouldBeginEditing: (NSText *)textObject;
|
||||
- (BOOL) textShouldEndEditing: (NSText *)textObject;
|
||||
- (void) textDidBeginEditing: (NSNotification *)aNotification;
|
||||
- (void) textDidChange: (NSNotification *)aNotification;
|
||||
- (void) textDidEndEditing: (NSNotification *)aNotification;
|
||||
- (BOOL) textShouldBeginEditing: (NSText *)aTextObject;
|
||||
- (BOOL) textShouldEndEditing: (NSText *)aTextObject;
|
||||
|
||||
/*
|
||||
* Setting Tab Key Behavior
|
||||
|
|
|
@ -136,7 +136,7 @@ typedef enum _NSLineBreakMode { /* What to do with long lines */
|
|||
|
||||
- (void) setLineSpacing: (float)aFloat;
|
||||
- (void) setParagraphSpacing: (float)aFloat;
|
||||
- (void) setAlignment: (NSTextAlignment)alignment;
|
||||
- (void) setAlignment: (NSTextAlignment)newAlignment;
|
||||
- (void) setFirstLineHeadIndent: (float)aFloat;
|
||||
- (void) setHeadIndent: (float)aFloat;
|
||||
- (void) setTailIndent: (float)aFloat;
|
||||
|
|
|
@ -89,7 +89,7 @@ APPKIT_EXPORT NSString *NSPasteboardCommunicationException;
|
|||
// Creating and Releasing an NSPasteboard Object
|
||||
//
|
||||
+ (NSPasteboard *)generalPasteboard;
|
||||
+ (NSPasteboard *)pasteboardWithName:(NSString *)name;
|
||||
+ (NSPasteboard *)pasteboardWithName:(NSString *)aName;
|
||||
+ (NSPasteboard *)pasteboardWithUniqueName;
|
||||
- (void)releaseGlobally;
|
||||
|
||||
|
@ -159,7 +159,7 @@ provideDataForType:(NSString *)type
|
|||
+ (NSString *) mimeTypeForPasteboardType: (NSString *)type;
|
||||
+ (NSString *) pasteboardTypeForMimeType: (NSString *)mimeType;
|
||||
|
||||
- (void)setChangeCount: (int)changeCount;
|
||||
- (void)setChangeCount: (int)count;
|
||||
@end
|
||||
|
||||
#ifndef STRICT_OPENSTEP
|
||||
|
|
|
@ -91,9 +91,9 @@ typedef enum {
|
|||
|
||||
- (int) indexOfItem: (id <NSMenuItem>)item;
|
||||
- (int) indexOfItemWithTitle: (NSString*)title;
|
||||
- (int) indexOfItemWithTag: (int)tag;
|
||||
- (int) indexOfItemWithTag: (int)aTag;
|
||||
- (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>) itemWithTitle: (NSString*)title;
|
||||
|
|
|
@ -69,7 +69,7 @@
|
|||
//
|
||||
- (void)incrementBy:(double)delta;
|
||||
- (double)doubleValue;
|
||||
- (void)setDoubleValue:(double)doubleValue;
|
||||
- (void)setDoubleValue:(double)aValue;
|
||||
- (double)minValue;
|
||||
- (void)setMinValue:(double)newMinimum;
|
||||
- (double)maxValue;
|
||||
|
|
|
@ -176,7 +176,7 @@ enum {
|
|||
|
||||
#ifndef STRICT_OPENSTEP
|
||||
- (int) runModalForDirectory: (NSString *)path
|
||||
file: (NSString *)name
|
||||
file: (NSString *)filename
|
||||
relativeToWindow: (NSWindow*)window;
|
||||
- (void) beginSheetForDirectory: (NSString *)path
|
||||
file: (NSString *)name
|
||||
|
|
|
@ -71,8 +71,8 @@
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -60,8 +60,8 @@
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -130,16 +130,16 @@ enum {
|
|||
withRTFD: (NSData*)rtfdData;
|
||||
- (void) replaceCharactersInRange: (NSRange)aRange
|
||||
withString: (NSString*)aString;
|
||||
- (void) setString: (NSString*)string;
|
||||
- (void) setString: (NSString*)aString;
|
||||
- (NSString*) string;
|
||||
|
||||
/*
|
||||
* Old fashioned OpenStep methods (wrappers for the previous ones)
|
||||
*/
|
||||
- (void) replaceRange: (NSRange)range withString: (NSString*)aString;
|
||||
- (void) replaceRange: (NSRange)range withRTF: (NSData*)rtfData;
|
||||
- (void) replaceRange: (NSRange)range withRTFD: (NSData*)rtfdData;
|
||||
- (void) setText: (NSString*)string;
|
||||
- (void) replaceRange: (NSRange)aRange withString: (NSString*)aString;
|
||||
- (void) replaceRange: (NSRange)aRange withRTF: (NSData*)rtfData;
|
||||
- (void) replaceRange: (NSRange)aRange withRTFD: (NSData*)rtfdData;
|
||||
- (void) setText: (NSString*)aString;
|
||||
- (void) setText: (NSString*)aString range: (NSRange)aRange;
|
||||
- (NSString*) text;
|
||||
|
||||
|
@ -201,8 +201,8 @@ enum {
|
|||
*/
|
||||
- (void) changeFont: (id)sender;
|
||||
- (NSFont*) font;
|
||||
- (void) setFont: (NSFont*)obj;
|
||||
- (void) setFont: (NSFont*)font ofRange: (NSRange)range;
|
||||
- (void) setFont: (NSFont*)font;
|
||||
- (void) setFont: (NSFont*)font ofRange: (NSRange)aRange;
|
||||
|
||||
/*
|
||||
* Managing Alignment
|
||||
|
@ -216,8 +216,8 @@ enum {
|
|||
/*
|
||||
* Text colour
|
||||
*/
|
||||
- (void) setTextColor: (NSColor*)color range: (NSRange)range;
|
||||
- (void) setColor: (NSColor*)color ofRange: (NSRange)range;
|
||||
- (void) setTextColor: (NSColor*)color range: (NSRange)aRange;
|
||||
- (void) setColor: (NSColor*)color ofRange: (NSRange)aRange;
|
||||
- (void) setTextColor: (NSColor*)color;
|
||||
- (NSColor*) textColor;
|
||||
|
||||
|
@ -234,8 +234,8 @@ enum {
|
|||
*/
|
||||
-(BOOL) readRTFDFromFile: (NSString*)path;
|
||||
-(BOOL) writeRTFDToFile: (NSString*)path atomically: (BOOL)flag;
|
||||
-(NSData*) RTFDFromRange: (NSRange)range;
|
||||
-(NSData*) RTFFromRange: (NSRange)range;
|
||||
-(NSData*) RTFDFromRange: (NSRange)aRange;
|
||||
-(NSData*) RTFFromRange: (NSRange)aRange;
|
||||
|
||||
/*
|
||||
* Sizing the Frame Rectangle
|
||||
|
@ -259,7 +259,7 @@ enum {
|
|||
/*
|
||||
* Scrolling
|
||||
*/
|
||||
- (void) scrollRangeToVisible: (NSRange)range;
|
||||
- (void) scrollRangeToVisible: (NSRange)aRange;
|
||||
|
||||
/*
|
||||
* Managing the Delegate
|
||||
|
@ -286,7 +286,7 @@ enum {
|
|||
|
||||
@interface NSText (GNUstepExtensions)
|
||||
|
||||
- (void) replaceRange: (NSRange)range
|
||||
- (void) replaceRange: (NSRange)aRange
|
||||
withAttributedString: (NSAttributedString*)attrString;
|
||||
|
||||
- (unsigned) textLength;
|
||||
|
|
|
@ -57,14 +57,14 @@
|
|||
- (void)setBackgroundColor:(NSColor *)aColor;
|
||||
- (NSColor *)backgroundColor;
|
||||
|
||||
- (id)setUpFieldEditorAttributes:(id)textObject;
|
||||
- (id)setUpFieldEditorAttributes: (NSText *)textObject;
|
||||
|
||||
|
||||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder;
|
||||
- initWithCoder:aDecoder;
|
||||
- (void)encodeWithCoder: (NSCoder *)aCoder;
|
||||
- initWithCoder: (NSCoder *)aDecoder;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -34,6 +34,10 @@ include $(GNUSTEP_MAKEFILES)/common.make
|
|||
include ../Version
|
||||
include ../config.make
|
||||
|
||||
srcdir = .
|
||||
PACKAGE_NAME = gnustep-gui
|
||||
LIBRARY_VAR = GNUSTEP_GUI
|
||||
|
||||
# The library to be compiled
|
||||
LIBRARY_NAME = libgnustep-gui
|
||||
|
||||
|
@ -166,32 +170,22 @@ endif
|
|||
libgnustep-gui_HEADER_FILES_DIR = ../Headers/AppKit
|
||||
libgnustep-gui_HEADER_FILES_INSTALL_DIR = /AppKit
|
||||
|
||||
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 \
|
||||
DOCUMENT_NAME = Gui
|
||||
|
||||
Gui_AGSDOC_FILES = Gui.gsdoc $(AUTOGSDOC_HEADERS)
|
||||
Gui_AGSDOC_FLAGS = \
|
||||
-HeaderDirectory ../Headers/AppKit \
|
||||
-Declared AppKit \
|
||||
-Standards YES \
|
||||
-Up Gui
|
||||
|
||||
AUTOGSDOC_HEADERS = \
|
||||
GSTable.h \
|
||||
GSHbox.h \
|
||||
GSVbox.h \
|
||||
IMConnectors.h \
|
||||
IMCustomObject.h \
|
||||
IMLoading.h \
|
||||
NSActionCell.h \
|
||||
NSAffineTransform.h \
|
||||
NSApplication.h \
|
||||
NSAttributedString.h \
|
||||
NSBezierPath.h \
|
||||
NSBox.h \
|
||||
NSBitmapImageRep.h \
|
||||
|
@ -199,7 +193,6 @@ NSBrowser.h \
|
|||
NSBrowserCell.h \
|
||||
NSButton.h \
|
||||
NSButtonCell.h \
|
||||
NSCStringText.h \
|
||||
NSCachedImageRep.h \
|
||||
NSCell.h \
|
||||
NSClipView.h \
|
||||
|
@ -207,7 +200,6 @@ NSColor.h \
|
|||
NSColorList.h \
|
||||
NSColorPanel.h \
|
||||
NSColorPicker.h \
|
||||
NSColorPicking.h \
|
||||
NSColorWell.h \
|
||||
NSComboBox.h \
|
||||
NSComboBoxCell.h \
|
||||
|
@ -219,8 +211,6 @@ NSDataLinkManager.h \
|
|||
NSDataLinkPanel.h \
|
||||
NSDocument.h \
|
||||
NSDocumentController.h \
|
||||
NSDocumentFrameworkPrivate.h \
|
||||
NSDragging.h \
|
||||
NSDrawer.h \
|
||||
NSEPSImageRep.h \
|
||||
NSEvent.h \
|
||||
|
@ -230,7 +220,6 @@ NSFontManager.h \
|
|||
NSFontPanel.h \
|
||||
NSForm.h \
|
||||
NSFormCell.h \
|
||||
NSGraphics.h \
|
||||
NSGraphicsContext.h \
|
||||
NSHelpPanel.h \
|
||||
NSHelpManager.h \
|
||||
|
@ -247,9 +236,6 @@ NSMenu.h \
|
|||
NSMenuItem.h \
|
||||
NSMenuItemCell.h \
|
||||
NSMenuView.h \
|
||||
NSNibConnector.h \
|
||||
NSNibDeclarations.h \
|
||||
NSNibLoading.h \
|
||||
NSOpenPanel.h \
|
||||
NSOutlineView.h \
|
||||
NSPageLayout.h \
|
||||
|
@ -276,7 +262,6 @@ NSSlider.h \
|
|||
NSSliderCell.h \
|
||||
NSText.h \
|
||||
NSSpellChecker.h \
|
||||
NSSpellProtocol.h \
|
||||
NSSpellServer.h \
|
||||
NSSplitView.h \
|
||||
NSStepper.h \
|
||||
|
@ -294,11 +279,42 @@ NSTextField.h \
|
|||
NSTextFieldCell.h \
|
||||
NSTextStorage.h \
|
||||
NSTextView.h \
|
||||
NSUserInterfaceValidation.h \
|
||||
NSView.h \
|
||||
NSWindow.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 \
|
||||
nsimage-tiff.h
|
||||
|
||||
|
@ -311,4 +327,9 @@ include GNUmakefile.preamble
|
|||
|
||||
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
|
||||
|
|
|
@ -49,8 +49,6 @@
|
|||
@end
|
||||
|
||||
@implementation GSTable: NSView
|
||||
{
|
||||
}
|
||||
//
|
||||
// Class Methods
|
||||
//
|
||||
|
@ -311,7 +309,7 @@
|
|||
withMinXMargin: (float)minXMargin
|
||||
maxXMargin: (float)maxXMargin
|
||||
minYMargin: (float)minYMargin
|
||||
maxYMargin: (float)maxYMargin;
|
||||
maxYMargin: (float)maxYMargin
|
||||
{
|
||||
int jailNumber;
|
||||
NSRect oldFrame;
|
||||
|
@ -715,80 +713,80 @@
|
|||
// Setting Row and Column Expand Flag
|
||||
//
|
||||
-(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");
|
||||
return;
|
||||
}
|
||||
if (column < 0)
|
||||
if (aColumn < 0)
|
||||
{
|
||||
NSLog (@"Warning: argument column is < 0\n");
|
||||
return;
|
||||
}
|
||||
if ((_expandColumn[column] == YES) && (aFlag == NO))
|
||||
if ((_expandColumn[aColumn] == YES) && (aFlag == NO))
|
||||
{
|
||||
_expandingColumnNumber--;
|
||||
_expandColumn[column] = aFlag;
|
||||
_expandColumn[aColumn] = aFlag;
|
||||
}
|
||||
else if ((_expandColumn[column] == NO) && (aFlag == YES))
|
||||
else if ((_expandColumn[aColumn] == NO) && (aFlag == YES))
|
||||
{
|
||||
_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");
|
||||
return NO;
|
||||
}
|
||||
if (column < 0)
|
||||
if (aColumn < 0)
|
||||
{
|
||||
NSLog (@"Warning: argument column is < 0\n");
|
||||
return NO;
|
||||
}
|
||||
return _expandColumn[column];
|
||||
return _expandColumn[aColumn];
|
||||
}
|
||||
-(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");
|
||||
return;
|
||||
}
|
||||
if (row < 0)
|
||||
if (aRow < 0)
|
||||
{
|
||||
NSLog (@"Warning: argument row is < 0\n");
|
||||
return;
|
||||
}
|
||||
if ((_expandRow[row] == YES) && (aFlag == NO))
|
||||
if ((_expandRow[aRow] == YES) && (aFlag == NO))
|
||||
{
|
||||
_expandingRowNumber--;
|
||||
_expandRow[row] = aFlag;
|
||||
_expandRow[aRow] = aFlag;
|
||||
}
|
||||
else if ((_expandRow[row] == NO) && (aFlag == YES))
|
||||
else if ((_expandRow[aRow] == NO) && (aFlag == YES))
|
||||
{
|
||||
_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");
|
||||
return NO;
|
||||
}
|
||||
if (row < 0)
|
||||
if (aRow < 0)
|
||||
{
|
||||
NSLog (@"Warning: argument row is < 0\n");
|
||||
return NO;
|
||||
}
|
||||
return _expandRow[row];
|
||||
return _expandRow[aRow];
|
||||
}
|
||||
//
|
||||
// Getting Row and Column Number
|
||||
|
|
|
@ -80,24 +80,24 @@ static NSAffineTransformStruct identityTransform = {
|
|||
return t;
|
||||
}
|
||||
|
||||
- (void) appendTransform: (NSAffineTransform*)other
|
||||
- (void) appendTransform: (NSAffineTransform*)aTransform
|
||||
{
|
||||
float newA, newB, newC, newD, newTX, newTY;
|
||||
|
||||
newA = other->A * A + other->B * C;
|
||||
newB = other->A * B + other->B * D;
|
||||
newC = other->C * A + other->D * C;
|
||||
newD = other->C * B + other->D * D;
|
||||
newTX = other->TX * A + other->TY * C + TX;
|
||||
newTY = other->TX * B + other->TY * D + TY;
|
||||
newA = aTransform->A * A + aTransform->B * C;
|
||||
newB = aTransform->A * B + aTransform->B * D;
|
||||
newC = aTransform->C * A + aTransform->D * C;
|
||||
newD = aTransform->C * B + aTransform->D * D;
|
||||
newTX = aTransform->TX * A + aTransform->TY * C + TX;
|
||||
newTY = aTransform->TX * B + aTransform->TY * D + TY;
|
||||
|
||||
A = newA; B = newB;
|
||||
C = newC; D = newD;
|
||||
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)
|
||||
rotationAngle -= ((int)(rotationAngle/360)-1)*360;
|
||||
else if (rotationAngle >= 360)
|
||||
|
@ -163,24 +163,24 @@ static NSAffineTransformStruct identityTransform = {
|
|||
TX = newTX; TY = newTY;
|
||||
}
|
||||
|
||||
- (void) prependTransform: (NSAffineTransform*)other
|
||||
- (void) prependTransform: (NSAffineTransform*)aTransform
|
||||
{
|
||||
float newA, newB, newC, newD, newTX, newTY;
|
||||
|
||||
newA = A * other->A + B * other->C;
|
||||
newB = A * other->B + B * other->D;
|
||||
newC = C * other->A + D * other->C;
|
||||
newD = C * other->B + D * other->D;
|
||||
newTX = TX * other->A + TY * other->C + other->TX;
|
||||
newTY = TX * other->B + TY * other->D + other->TY;
|
||||
newA = A * aTransform->A + B * aTransform->C;
|
||||
newB = A * aTransform->B + B * aTransform->D;
|
||||
newC = C * aTransform->A + D * aTransform->C;
|
||||
newD = C * aTransform->B + D * aTransform->D;
|
||||
newTX = TX * aTransform->A + TY * aTransform->C + aTransform->TX;
|
||||
newTY = TX * aTransform->B + TY * aTransform->D + aTransform->TY;
|
||||
|
||||
A = newA; B = newB;
|
||||
C = newC; D = newD;
|
||||
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)
|
||||
rotationAngle -= ((int)(rotationAngle/360)-1)*360;
|
||||
else if (rotationAngle >= 360)
|
||||
|
@ -278,24 +278,24 @@ static NSAffineTransformStruct identityTransform = {
|
|||
return AUTORELEASE(path);
|
||||
}
|
||||
|
||||
- (NSPoint) transformPoint: (NSPoint)point
|
||||
- (NSPoint) transformPoint: (NSPoint)aPoint
|
||||
{
|
||||
NSPoint new;
|
||||
|
||||
new.x = A * point.x + C * point.y + TX;
|
||||
new.y = B * point.x + D * point.y + TY;
|
||||
new.x = A * aPoint.x + C * aPoint.y + TX;
|
||||
new.y = B * aPoint.x + D * aPoint.y + TY;
|
||||
|
||||
return new;
|
||||
}
|
||||
|
||||
- (NSSize) transformSize: (NSSize)size
|
||||
- (NSSize) transformSize: (NSSize)aSize
|
||||
{
|
||||
NSSize new;
|
||||
|
||||
new.width = A * size.width + C * size.height;
|
||||
new.width = A * aSize.width + C * aSize.height;
|
||||
if (new.width < 0)
|
||||
new.width = - new.width;
|
||||
new.height = B * size.width + D * size.height;
|
||||
new.height = B * aSize.width + D * aSize.height;
|
||||
if (new.height < 0)
|
||||
new.height = - new.height;
|
||||
|
||||
|
@ -433,21 +433,21 @@ static NSAffineTransformStruct identityTransform = {
|
|||
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;
|
||||
|
||||
newA = concat[0] * A + concat[1] * C;
|
||||
newB = concat[0] * B + concat[1] * D;
|
||||
newC = concat[2] * A + concat[3] * C;
|
||||
newD = concat[2] * B + concat[3] * D;
|
||||
newTX = concat[4] * A + concat[5] * C + TX;
|
||||
newTY = concat[4] * B + concat[5] * D + TY;
|
||||
newA = anotherMatrix[0] * A + anotherMatrix[1] * C;
|
||||
newB = anotherMatrix[0] * B + anotherMatrix[1] * D;
|
||||
newC = anotherMatrix[2] * A + anotherMatrix[3] * C;
|
||||
newD = anotherMatrix[2] * B + anotherMatrix[3] * D;
|
||||
newTX = anotherMatrix[4] * A + anotherMatrix[5] * C + TX;
|
||||
newTY = anotherMatrix[4] * B + anotherMatrix[5] * D + TY;
|
||||
|
||||
A = newA; B = newB;
|
||||
C = newC; D = newD;
|
||||
|
@ -607,14 +607,14 @@ static NSAffineTransformStruct identityTransform = {
|
|||
replace[5] = matrix.ty;
|
||||
}
|
||||
|
||||
- (void) takeMatrixFromTransform: (NSAffineTransform *)other
|
||||
- (void) takeMatrixFromTransform: (NSAffineTransform *)aTransform
|
||||
{
|
||||
matrix.m11 = other->matrix.m11;
|
||||
matrix.m12 = other->matrix.m12;
|
||||
matrix.m21 = other->matrix.m21;
|
||||
matrix.m22 = other->matrix.m22;
|
||||
matrix.tx = other->matrix.tx;
|
||||
matrix.ty = other->matrix.ty;
|
||||
matrix.m11 = aTransform->matrix.m11;
|
||||
matrix.m12 = aTransform->matrix.m12;
|
||||
matrix.m21 = aTransform->matrix.m21;
|
||||
matrix.m22 = aTransform->matrix.m22;
|
||||
matrix.tx = aTransform->matrix.tx;
|
||||
matrix.ty = aTransform->matrix.ty;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1820,9 +1820,9 @@ delegate.
|
|||
[self orderFrontStandardInfoPanel: sender];
|
||||
}
|
||||
|
||||
- (void) orderFrontStandardAboutPanelWithOptions: (NSDictionary *)options
|
||||
- (void) orderFrontStandardAboutPanelWithOptions: (NSDictionary *)dictionary
|
||||
{
|
||||
[self orderFrontStandardInfoPanelWithOptions: options];
|
||||
[self orderFrontStandardInfoPanelWithOptions: dictionary];
|
||||
}
|
||||
|
||||
/* infoPanel, GNUstep API */
|
||||
|
@ -1831,10 +1831,10 @@ delegate.
|
|||
[self orderFrontStandardInfoPanelWithOptions: nil];
|
||||
}
|
||||
|
||||
- (void) orderFrontStandardInfoPanelWithOptions: (NSDictionary *)options
|
||||
- (void) orderFrontStandardInfoPanelWithOptions: (NSDictionary *)dictionary
|
||||
{
|
||||
if (_infoPanel == nil)
|
||||
_infoPanel = [[GSInfoPanel alloc] initWithDictionary: options];
|
||||
_infoPanel = [[GSInfoPanel alloc] initWithDictionary: dictionary];
|
||||
|
||||
[_infoPanel setTitle: GSGuiLocalizedString (@"Info",
|
||||
@"Title of the Info Panel")];
|
||||
|
|
|
@ -526,9 +526,9 @@
|
|||
}
|
||||
}
|
||||
|
||||
- (BOOL) canBeCompressedUsing: (NSTIFFCompression)type
|
||||
- (BOOL) canBeCompressedUsing: (NSTIFFCompression)compression
|
||||
{
|
||||
switch (type)
|
||||
switch (compression)
|
||||
{
|
||||
case NSTIFFCompressionCCITTFAX3:
|
||||
case NSTIFFCompressionCCITTFAX4:
|
||||
|
@ -550,17 +550,17 @@
|
|||
}
|
||||
}
|
||||
|
||||
- (void) getCompression: (NSTIFFCompression*)type
|
||||
- (void) getCompression: (NSTIFFCompression*)compression
|
||||
factor: (float*)factor
|
||||
{
|
||||
*type = _compression;
|
||||
*compression = _compression;
|
||||
*factor = _comp_factor;
|
||||
}
|
||||
|
||||
- (void) setCompression: (NSTIFFCompression)type
|
||||
- (void) setCompression: (NSTIFFCompression)compression
|
||||
factor: (float)factor
|
||||
{
|
||||
_compression = type;
|
||||
_compression = compression;
|
||||
_comp_factor = factor;
|
||||
}
|
||||
|
||||
|
|
|
@ -144,7 +144,7 @@ NSGraphicsContext *GSCurrentContext()
|
|||
return [self graphicsContextWithAttributes: info];
|
||||
}
|
||||
|
||||
+ (NSGraphicsContext *) graphicsContextWithAttributes: (NSDictionary *)info
|
||||
+ (NSGraphicsContext *) graphicsContextWithAttributes: (NSDictionary *)attributes
|
||||
{
|
||||
NSGraphicsContext *ctxt;
|
||||
if (self == [NSGraphicsContext class])
|
||||
|
@ -152,11 +152,11 @@ NSGraphicsContext *GSCurrentContext()
|
|||
NSAssert(defaultNSGraphicsContextClass,
|
||||
@"Internal Error: No default NSGraphicsContext set\n");
|
||||
ctxt = [[defaultNSGraphicsContextClass allocWithZone: _globalGSZone]
|
||||
initWithContextInfo: info];
|
||||
initWithContextInfo: attributes];
|
||||
AUTORELEASE(ctxt);
|
||||
}
|
||||
else
|
||||
ctxt = [[self allocWithZone: _globalGSZone] initWithContextInfo: info];
|
||||
ctxt = [[self allocWithZone: _globalGSZone] initWithContextInfo: attributes];
|
||||
return ctxt;
|
||||
}
|
||||
|
||||
|
@ -1655,7 +1655,7 @@ NSGraphicsContext *GSCurrentContext()
|
|||
[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];
|
||||
}
|
||||
|
@ -1938,7 +1938,7 @@ NSGraphicsContext *GSCurrentContext()
|
|||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
- (void) DPScurrentalpha: (float *)alpha
|
||||
- (void) DPScurrentalpha: (float *)a
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
@ -2021,7 +2021,7 @@ NSGraphicsContext *GSCurrentContext()
|
|||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
- (void) DPSsetexposurecolor;
|
||||
- (void) DPSsetexposurecolor
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
@ -2136,7 +2136,7 @@ NSGraphicsContext *GSCurrentContext()
|
|||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
- (void) DPSreleasemouse;
|
||||
- (void) DPSreleasemouse
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
@ -2146,12 +2146,12 @@ NSGraphicsContext *GSCurrentContext()
|
|||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
- (void) DPShidecursor;
|
||||
- (void) DPShidecursor
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
- (void) DPSshowcursor;
|
||||
- (void) DPSshowcursor
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
@ -2171,7 +2171,7 @@ NSGraphicsContext *GSCurrentContext()
|
|||
[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];
|
||||
}
|
||||
|
@ -2508,7 +2508,7 @@ NSGraphicsContext *GSCurrentContext()
|
|||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
||||
- (void) DPSsetinputstate: (int)win : (int)st
|
||||
- (void) DPSsetinputstate: (int)window : (int)state
|
||||
{
|
||||
[self subclassResponsibility: _cmd];
|
||||
}
|
||||
|
@ -2621,7 +2621,7 @@ NSGraphicsContext *GSCurrentContext()
|
|||
}
|
||||
}
|
||||
|
||||
- (void) NSRectFillUsingOperation: (NSRect) aRect : (NSCompositingOperation) op;
|
||||
- (void) NSRectFillUsingOperation: (NSRect)aRect : (NSCompositingOperation)op
|
||||
{
|
||||
// FIXME:
|
||||
NSRectFill(aRect);
|
||||
|
|
|
@ -58,7 +58,7 @@ static NSPageLayout *shared_instance;
|
|||
This includes information about the paper size and orientation.
|
||||
|
||||
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
|
||||
call the runPageLayout: method in the NSApplication object
|
||||
which would both create a standard NSPageLayout panel and display it
|
||||
|
|
|
@ -311,7 +311,7 @@ static Class cellClass;
|
|||
return [_cell indexOfTickMarkAtPoint: point];
|
||||
}
|
||||
|
||||
- (int) numberOfTickMarks;
|
||||
- (int) numberOfTickMarks
|
||||
{
|
||||
return [_cell numberOfTickMarks];
|
||||
}
|
||||
|
|
|
@ -45,8 +45,7 @@
|
|||
@end
|
||||
|
||||
@implementation NSTableHeaderView
|
||||
{
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* Class methods
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
Date: 1996
|
||||
Author: Felipe A. Rodriguez <far@ix.netcom.com>
|
||||
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
|
||||
Author: Fred Kiefer <FredKiefer@gmx.de>
|
||||
Date: March 2000
|
||||
|
|
|
@ -407,13 +407,15 @@ static NSCell *tileCell = nil;
|
|||
associated NSViews, and events generate by the user. An NSWindow's
|
||||
size is defined by its frame rectangle, which encompasses its entire
|
||||
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
|
||||
root of the window's view hierarchy. This view can be set using the
|
||||
<code>setContentView:</code> method, and accessed through the
|
||||
<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
|
||||
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
|
||||
draw itself. Leaf nodes in the view hierarchy are drawn last,
|
||||
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
|
||||
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
|
||||
implementing the <code>windowWillResize: toSize:</code> method, or
|
||||
control the closing of the window by implementing
|
||||
<code>windowShouldClose:</code>. </p>
|
||||
<code>windowShouldClose:</code>.
|
||||
</p>
|
||||
|
||||
</unit>
|
||||
*/
|
||||
|
@ -698,18 +702,22 @@ static NSNotificationCenter *nc = nil;
|
|||
/**
|
||||
<p> Initializes the receiver with a content rect of
|
||||
<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
|
||||
window with a title, <code>NSClosableWindowMask</code>, for a window
|
||||
with a close widget, <code>NSMiniaturizableWindowMask</code>, for a
|
||||
window with a miniaturize widget, and
|
||||
<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>,
|
||||
<code>NSBackingStoreRetained</code> and
|
||||
<code>NSBackingStoreNonretained</code>. </p> */
|
||||
<code>NSBackingStoreNonretained</code>.
|
||||
</p>
|
||||
*/
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
|
@ -730,18 +738,22 @@ static NSNotificationCenter *nc = nil;
|
|||
backing store type of <var>backingType</var> and a boolean
|
||||
<var>flag</var>. <var>flag</var> specifies whether the window
|
||||
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
|
||||
window with a title, <code>NSClosableWindowMask</code>, for a window
|
||||
with a close widget, <code>NSMiniaturizableWindowMask</code>, for a
|
||||
window with a miniaturize widget, and
|
||||
<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>,
|
||||
<code>NSBackingStoreRetained</code> and
|
||||
<code>NSBackingStoreNonretained</code>. </p> */
|
||||
<code>NSBackingStoreNonretained</code>.
|
||||
</p>
|
||||
*/
|
||||
- (id) initWithContentRect: (NSRect)contentRect
|
||||
styleMask: (unsigned int)aStyle
|
||||
backing: (NSBackingStoreType)bufferingType
|
||||
|
@ -2856,6 +2868,30 @@ resetCursorRectsForView(NSView *theView)
|
|||
case GSAppKitWindowFocusOut:
|
||||
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) \
|
||||
if ([view window] == self) \
|
||||
|
|
Loading…
Reference in a new issue