mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 12:00:52 +00:00
Correct line endings.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25349 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer
parent
22f8170973
commit
6419d056d2
3 changed files with 123 additions and 118 deletions
|
|
@ -1,3 +1,8 @@
|
|||
2007-07-23 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Headers/AppKit/NSAnimation.h: Remove unneeded includes.
|
||||
* Headers/Additions/GNUstepGUI/GSAnimator.h: Correct line endings.
|
||||
|
||||
2007-07-23 Fred Kiefer <FredKiefer@gmx.de>
|
||||
|
||||
* Headers/AppKit/NSCell.h,
|
||||
|
|
|
|||
|
|
@ -1,112 +1,112 @@
|
|||
/*
|
||||
* GSAnimator.h
|
||||
*
|
||||
* Author: Xavier Glattard (xgl) <xavier.glattard@online.fr>
|
||||
*
|
||||
* Copyright (c) 2007 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of the GNUstep GUI Library.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; see the file COPYING.LIB.
|
||||
* If not, write to the Free Software Foundation,
|
||||
* 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef _GNUstep_H_GSAnimator_
|
||||
#define _GNUstep_H_GSAnimator_
|
||||
|
||||
@class NSRunLoop;
|
||||
@class NSEvent;
|
||||
@class NSTimer;
|
||||
@class NSString;
|
||||
|
||||
#include <Foundation/NSObject.h>
|
||||
#include <Foundation/NSDate.h>
|
||||
#include <Foundation/NSTimer.h>
|
||||
|
||||
/**
|
||||
* Protocol that needs to be adopted by classes that want to
|
||||
* be animated by a GSAnimator.
|
||||
*/
|
||||
@protocol GSAnimation
|
||||
/** Call back method indicating that the GSAnimator did start the
|
||||
* animation loop. */
|
||||
- (void) animatorDidStart;
|
||||
/** Call back method indicating that the GSAnimator did stop the
|
||||
* animation loop. */
|
||||
- (void) animatorDidStop;
|
||||
/** Call back method called for each animation loop. */
|
||||
- (void) animatorStep: (NSTimeInterval)elapsedTime;
|
||||
@end
|
||||
|
||||
/**
|
||||
* GSAnimator is the front of a class cluster. Instances of a subclass of
|
||||
* GSAnimator manage the timing of an animation.
|
||||
*/
|
||||
@interface GSAnimator : NSObject
|
||||
{
|
||||
id<GSAnimation> _animation; // The Object to be animated
|
||||
NSDate* _startTime; // The time the animation did started
|
||||
BOOL _running; // Indicates that the animator is looping
|
||||
|
||||
NSTimeInterval _elapsed; // Elapsed time since the animator started
|
||||
NSTimeInterval _lastFrame; // The time of the last animation loop
|
||||
unsigned int _frameCount; // The number of loops since the start
|
||||
|
||||
NSArray* _runLoopModes;
|
||||
|
||||
NSTimer* _timer; // Timer used for looping
|
||||
NSTimeInterval _timerInterval;
|
||||
}
|
||||
|
||||
/** Returns a GSAnimator object initialized with the specified object
|
||||
* to be animated as fast as possible. */
|
||||
+ (GSAnimator*) animatorWithAnimation: (id<GSAnimation>)anAnimation;
|
||||
|
||||
/** Returns a GSAnimator object initialized with the specified object
|
||||
* to be animated. */
|
||||
+ (GSAnimator*) animatorWithAnimation: (id<GSAnimation>)anAnimation
|
||||
frameRate: (float)fps;
|
||||
|
||||
/** Returns a GSAnimator object allocated in the given NSZone and
|
||||
* initialized with the specified object to be animated. */
|
||||
+ (GSAnimator*) animatorWithAnimation: (id<GSAnimation>)anAnimation
|
||||
frameRate: (float)fps
|
||||
zone: (NSZone*)aZone;
|
||||
|
||||
/** Returns a GSAnimator object initialized with the specified object
|
||||
* to be animated. The given NSRunLoop is used in NSDefaultRunLoopMode.*/
|
||||
- (GSAnimator*) initWithAnimation: (id<GSAnimation>)anAnimation
|
||||
frameRate: (float)aFrameRate;
|
||||
|
||||
- (GSAnimator*) initWithAnimation: (id<GSAnimation>)anAnimation;
|
||||
|
||||
- (unsigned int) frameCount;
|
||||
- (void) resetCounters;
|
||||
- (float) frameRate;
|
||||
- (NSArray*) runLoopModesForAnimating;
|
||||
- (void) setRunLoopModesForAnimating: (NSArray*)modes;
|
||||
|
||||
- (void) startAnimation;
|
||||
- (void) stopAnimation;
|
||||
- (BOOL) isAnimationRunning;
|
||||
- (void) startStopAnimation;
|
||||
|
||||
- (void) stepAnimation;
|
||||
|
||||
- (void) animationLoopEvent: (NSEvent*)e;
|
||||
@end
|
||||
|
||||
#endif /* _GNUstep_H_GSAnimator_ */
|
||||
/*
|
||||
* GSAnimator.h
|
||||
*
|
||||
* Author: Xavier Glattard (xgl) <xavier.glattard@online.fr>
|
||||
*
|
||||
* Copyright (c) 2007 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of the GNUstep GUI Library.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; see the file COPYING.LIB.
|
||||
* If not, write to the Free Software Foundation,
|
||||
* 51 Franklin Street, Fifth Floor,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef _GNUstep_H_GSAnimator_
|
||||
#define _GNUstep_H_GSAnimator_
|
||||
|
||||
@class NSRunLoop;
|
||||
@class NSEvent;
|
||||
@class NSTimer;
|
||||
@class NSString;
|
||||
|
||||
#include <Foundation/NSObject.h>
|
||||
#include <Foundation/NSDate.h>
|
||||
#include <Foundation/NSTimer.h>
|
||||
|
||||
/**
|
||||
* Protocol that needs to be adopted by classes that want to
|
||||
* be animated by a GSAnimator.
|
||||
*/
|
||||
@protocol GSAnimation
|
||||
/** Call back method indicating that the GSAnimator did start the
|
||||
* animation loop. */
|
||||
- (void) animatorDidStart;
|
||||
/** Call back method indicating that the GSAnimator did stop the
|
||||
* animation loop. */
|
||||
- (void) animatorDidStop;
|
||||
/** Call back method called for each animation loop. */
|
||||
- (void) animatorStep: (NSTimeInterval)elapsedTime;
|
||||
@end
|
||||
|
||||
/**
|
||||
* GSAnimator is the front of a class cluster. Instances of a subclass of
|
||||
* GSAnimator manage the timing of an animation.
|
||||
*/
|
||||
@interface GSAnimator : NSObject
|
||||
{
|
||||
id<GSAnimation> _animation; // The Object to be animated
|
||||
NSDate *_startTime; // The time the animation did started
|
||||
BOOL _running; // Indicates that the animator is looping
|
||||
|
||||
NSTimeInterval _elapsed; // Elapsed time since the animator started
|
||||
NSTimeInterval _lastFrame; // The time of the last animation loop
|
||||
unsigned int _frameCount; // The number of loops since the start
|
||||
|
||||
NSArray *_runLoopModes;
|
||||
|
||||
NSTimer *_timer; // Timer used for looping
|
||||
NSTimeInterval _timerInterval;
|
||||
}
|
||||
|
||||
/** Returns a GSAnimator object initialized with the specified object
|
||||
* to be animated as fast as possible. */
|
||||
+ (GSAnimator*) animatorWithAnimation: (id<GSAnimation>)anAnimation;
|
||||
|
||||
/** Returns a GSAnimator object initialized with the specified object
|
||||
* to be animated. */
|
||||
+ (GSAnimator*) animatorWithAnimation: (id<GSAnimation>)anAnimation
|
||||
frameRate: (float)fps;
|
||||
|
||||
/** Returns a GSAnimator object allocated in the given NSZone and
|
||||
* initialized with the specified object to be animated. */
|
||||
+ (GSAnimator*) animatorWithAnimation: (id<GSAnimation>)anAnimation
|
||||
frameRate: (float)fps
|
||||
zone: (NSZone*)aZone;
|
||||
|
||||
/** Returns a GSAnimator object initialized with the specified object
|
||||
* to be animated. The given NSRunLoop is used in NSDefaultRunLoopMode.*/
|
||||
- (GSAnimator*) initWithAnimation: (id<GSAnimation>)anAnimation
|
||||
frameRate: (float)aFrameRate;
|
||||
|
||||
- (GSAnimator*) initWithAnimation: (id<GSAnimation>)anAnimation;
|
||||
|
||||
- (unsigned int) frameCount;
|
||||
- (void) resetCounters;
|
||||
- (float) frameRate;
|
||||
- (NSArray*) runLoopModesForAnimating;
|
||||
- (void) setRunLoopModesForAnimating: (NSArray*)modes;
|
||||
|
||||
- (void) startAnimation;
|
||||
- (void) stopAnimation;
|
||||
- (BOOL) isAnimationRunning;
|
||||
- (void) startStopAnimation;
|
||||
|
||||
- (void) stepAnimation;
|
||||
|
||||
- (void) animationLoopEvent: (NSEvent*)e;
|
||||
@end
|
||||
|
||||
#endif /* _GNUstep_H_GSAnimator_ */
|
||||
|
|
|
|||
|
|
@ -36,15 +36,15 @@
|
|||
#include <Foundation/NSObject.h>
|
||||
#include <AppKit/AppKitDefines.h>
|
||||
#include <GNUstepGUI/GSAnimator.h>
|
||||
#include <Foundation/NSString.h>
|
||||
#include <Foundation/NSArray.h>
|
||||
|
||||
@class NSString;
|
||||
@class NSArray;
|
||||
@class NSMutableArray;
|
||||
@class NSNumber;
|
||||
@class NSRecursiveLock;
|
||||
|
||||
/** These constants describe the curve of an animation—that is, the relative speed of an animation from start to finish. */
|
||||
/** These constants describe the curve of an animation,
|
||||
that is, the relative speed of an animation from start to finish. */
|
||||
typedef enum _NSAnimationCurve
|
||||
{
|
||||
NSAnimationEaseInOut = 0, // default
|
||||
|
|
@ -180,7 +180,7 @@ APPKIT_EXPORT NSString *NSAnimationProgressMark;
|
|||
/** Returns a Boolean value that indicates whether the receiver is currently animating. */
|
||||
- (BOOL) isAnimating;
|
||||
|
||||
/** Returns the receiver’s progress marks. */
|
||||
/** Returns the receiver's progress marks. */
|
||||
- (NSArray*) progressMarks;
|
||||
|
||||
/** Removes a progress mark from the receiver.
|
||||
|
|
@ -195,7 +195,7 @@ APPKIT_EXPORT NSString *NSAnimationProgressMark;
|
|||
The new blocking mode takes effect the next time the receiver is started. */
|
||||
- (void) setAnimationBlockingMode: (NSAnimationBlockingMode)mode;
|
||||
|
||||
/** Sets the receiver’s animation curve.
|
||||
/** Sets the receiver's animation curve.
|
||||
The new value affects the animation already in progress : the actual
|
||||
curve smoothly changes from the old curve to the new one. */
|
||||
- (void) setAnimationCurve: (NSAnimationCurve)curve;
|
||||
|
|
@ -221,7 +221,7 @@ APPKIT_EXPORT NSString *NSAnimationProgressMark;
|
|||
The new frame rate takes effect at the next frame. */
|
||||
- (void) setFrameRate: (float)fps;
|
||||
|
||||
/** Sets the receiver’s progress marks to the values specified in the
|
||||
/** Sets the receiver's progress marks to the values specified in the
|
||||
passed-in array. The new marks are t*/
|
||||
- (void) setProgressMarks: (NSArray*)progress;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue