gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 06:51:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merged Trunk changes from rev 35219 to TestPlant branch.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@36953 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Frank Le Grand 2013-08-09 14:24:48 +00:00
parent 343da32c8c
commit 4b27157a46
215 changed files with 13994 additions and 8840 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,8 +1,13 @@
2013-08-08 Frank Le Grand <frank.legrand@testplant.com>
Merged changes from Trunk (since rev 35219) to TestPlant branch.
2013-04-24 Frank Le Grand <frank.legrand@testplant.com>
* Source\NSCollectionView.m: Fixed an NSRangeException that would get raised in drawRect:
when we have an empty content array by explicitly casting values to int in the MIN macro.
2013-04-22 Doug Simons <doug.simons@testplant.com>
2013-04-22 Doug Simons <doug.simons@testplant.com>
* Source/NSTextFieldCell.m: Add support for NSLineBreakByTruncatingHead/Tail/Middle
line break modes.
@ -13,10 +18,12 @@
Distributed lock during application launch notification.
2013-03-08 Frank Le Grand <frank.legrand@testplant.com>
* Source\NSCollectionView.m: Implemented drag & drop.
* Source\NSTabView.m: Fixed a bug where the nextKeyView was being set a dealloc'd view in some cases.
2013-02-28 Frank Le Grand <frank.legrand@testplant.com>
Continued work on Collection View: Applied more GNUstep coding standards (including
the use of macros), implemented selection.
This is a work in progress.

2
ColorPickers/GSColorSliderCell.m
View file

@ -186,7 +186,7 @@
[self drawKnob];
}
- (float) knobThickness
- (CGFloat) knobThickness
{
return KNOB_WIDTH;
}

18
ColorPickers/GSNamedColorPicker.m
View file

@ -175,13 +175,13 @@
}
-(NSString *) browser: (NSBrowser *)sender
titleOfColumn: (int)column
titleOfColumn: (NSInteger)column
{
return nil;
}
-(void) browser: (NSBrowser *)sender
createRowsForColumn: (int)column
createRowsForColumn: (NSInteger)column
inMatrix: (NSMatrix *)matrix
{
int i;
@ -215,31 +215,31 @@ createRowsForColumn: (int)column
}
- (BOOL) browser: (NSBrowser*)sender
selectRow: (int)row
inColumn: (int)column
selectRow: (NSInteger)row
inColumn: (NSInteger)column
{
return NO;
}
- (void) browser: (NSBrowser *)sender
willDisplayCell: (id)cell
atRow: (int)row
column: (int)column
atRow: (NSInteger)row
column: (NSInteger)column
{
}
- (int) numberOfItemsInComboBox: (NSComboBox *)aComboBox
- (NSInteger) numberOfItemsInComboBox: (NSComboBox *)aComboBox
{
return [lists count];
}
- (id) comboBox: (NSComboBox *)aComboBox
objectValueForItemAtIndex: (int)index
objectValueForItemAtIndex: (NSInteger)index
{
return [(NSColorList*)[lists objectAtIndex: index] name];
}
- (unsigned int) comboBox: (NSComboBox *)aComboBox
- (NSUInteger) comboBox: (NSComboBox *)aComboBox
indexOfItemWithStringValue: (NSString *)string
{
return [lists indexOfObject: [NSColorList colorListNamed: string]];

9
Documentation/GuiUser/DefaultsSummary.gsdoc
View file

@ -178,6 +178,15 @@
is meant to make things friendlier for slow computers.
</p>
</desc>
<term>GSUnknownFileTool</term>
<desc>
<p>
A string value that defines a program that should be launched
when no GNUstep application has been defined for a specific
file extension or if an URL could not be opened by a service.
This program gets the file name or URL as parameter.
</p>
</desc>
<term>GSUseFreedesktopThumbnails</term>
<desc>
<p>

31
Documentation/ReleaseNotes.gsdoc
View file

@ -20,6 +20,37 @@
migrate to using a newer version of the library.
</p>
<section>
<heading>0.23.1</heading>
<p>This is a bugfix release containint many minor bugfixes, but
most importantly fixing some coding/archiving bugs introduced in
in the NSInteger,NSUInteger,CGFloat changes.
</p>
</section>
<section>
<heading>0.23.0</heading>
<p>
This is a major new stable release of GUI.
Note that this version is binary incompatible with previous
versions on 64-bit systems due to changes in some variables
based on changes in GNUstep base to the type of NSNotFound.<br />
New features include:
</p>
<deflist>
<term>NSInteger,NSUInteger,CGFloat</term>
<desc>API and internals updated to use new types</desc>
<term>NSBezierPath</term>
<desc>Keyed encoding/decoding added</desc>
<term>Many bugfixes and tweaks to improve look and feel</term>
<desc>Most of the changes in this release are individually
small changes fixing UI layout issues, responsiveness etc.
The accumulated result should be a significantly smoother
look and feel.
</desc>
</deflist>
</section>
<section>
<heading>0.22.0</heading>
<p>

8
Documentation/news.texi
View file

@ -9,6 +9,12 @@
The currently released version of the library is @samp{@value{GNUSTEP-GUI-VERSION}}.
@end ifclear
@section Noteworthy changes in version @samp{0.23.1}
This is a bugfix release, primarily to deal with coding/archiving issues.
@ifclear ANNOUNCE-ONLY
@section Noteworthy changes in version @samp{0.22.0}
New features include:
@ -21,8 +27,6 @@ New features include:
Many NSImage improvements (Mac OS X 10.6 drawing methods, better selection of image reps, better support for icons). Many bugfixes, including in Xib loading, printing, and NSView geometry.
@ifclear ANNOUNCE-ONLY
@section Noteworthy changes in version @samp{0.20.0}
A new stable release. Many improvments with Nib loading, documents and

3
Headers/Additions/GNUstepGUI/GSDisplayServer.h
View file

@ -157,7 +157,7 @@ APPKIT_EXPORT NSString *GSScreenNumber;
- (void) docedited: (int) edited : (int)win;
- (void) setinputstate: (int)state : (int)win;
- (void) setinputfocus: (int)win;
- (void) setalpha: (float)alpha: (int)win;
- (void) setalpha: (float)alpha : (int)win;
- (void) setShadow: (BOOL)hasShadow : (int)win;
- (NSPoint) mouselocation;
@ -175,6 +175,7 @@ APPKIT_EXPORT NSString *GSScreenNumber;
- (void) freecursor: (void*) cid;
- (void) setParentWindow: (int)parentWin
forChildWindow: (int)childWin;
- (void) setIgnoreMouse: (BOOL)ignoreMouse : (int)win;
@end

1
Headers/Additions/GNUstepGUI/GSLayoutManager_internal.h
View file

@ -237,6 +237,7 @@ typedef struct GSLayoutManager_textcontainer_s
@interface GSLayoutManager (LayoutHelpers)
-(void) _freeLayout;
-(void) _invalidateLayoutFromContainer: (int)idx;
-(void) _invalidateEverything;
-(void) _doLayout; /* TODO: this is just a hack until proper incremental layout is done */
-(void) _doLayoutToGlyph: (unsigned int)glyphIndex;

118
Headers/Additions/GNUstepGUI/GSMethodTable.h
View file

@ -43,61 +43,61 @@ typedef struct {
/* Color operations */
/* ----------------------------------------------------------------------- */
void (*DPScurrentalpha_)
(NSGraphicsContext*, SEL, float*);
(NSGraphicsContext*, SEL, CGFloat*);
void (*DPScurrentcmykcolor____)
(NSGraphicsContext*, SEL, float*, float*, float*, float*);
(NSGraphicsContext*, SEL, CGFloat*, CGFloat*, CGFloat*, CGFloat*);
void (*DPScurrentgray_)
(NSGraphicsContext*, SEL, float*);
(NSGraphicsContext*, SEL, CGFloat*);
void (*DPScurrenthsbcolor___)
(NSGraphicsContext*, SEL, float*, float*, float*);
(NSGraphicsContext*, SEL, CGFloat*, CGFloat*, CGFloat*);
void (*DPScurrentrgbcolor___)
(NSGraphicsContext*, SEL, float*, float*, float*);
(NSGraphicsContext*, SEL, CGFloat*, CGFloat*, CGFloat*);
void (*DPSsetalpha_)
(NSGraphicsContext*, SEL, float);
(NSGraphicsContext*, SEL, CGFloat);
void (*DPSsetcmykcolor____)
(NSGraphicsContext*, SEL, float, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat);
void (*DPSsetgray_)
(NSGraphicsContext*, SEL, float);
(NSGraphicsContext*, SEL, CGFloat);
void (*DPSsethsbcolor___)
(NSGraphicsContext*, SEL, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat);
void (*DPSsetrgbcolor___)
(NSGraphicsContext*, SEL, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat);
void (*GSSetFillColorspace_)
(NSGraphicsContext*, SEL, NSDictionary *);
void (*GSSetStrokeColorspace_)
(NSGraphicsContext*, SEL, NSDictionary *);
void (*GSSetFillColor_)
(NSGraphicsContext*, SEL, float *);
(NSGraphicsContext*, SEL, CGFloat *);
void (*GSSetStrokeColor_)
(NSGraphicsContext*, SEL, float *);
(NSGraphicsContext*, SEL, CGFloat *);
/* ----------------------------------------------------------------------- */
/* Text operations */
/* ----------------------------------------------------------------------- */
void (*DPSashow___)
(NSGraphicsContext*, SEL, float, float, const char*);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, const char*);
void (*DPSawidthshow______)
(NSGraphicsContext*, SEL, float, float, int, float, float, const char*);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, int, CGFloat, CGFloat, const char*);
void (*DPScharpath__)
(NSGraphicsContext*, SEL, const char*, int);
void (*DPSshow_)
(NSGraphicsContext*, SEL, const char*);
void (*DPSwidthshow____)
(NSGraphicsContext*, SEL, float, float, int, const char*);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, int, const char*);
void (*DPSxshow___)
(NSGraphicsContext*, SEL, const char*, const float*, int);
(NSGraphicsContext*, SEL, const char*, const CGFloat*, int);
void (*DPSxyshow___)
(NSGraphicsContext*, SEL, const char*, const float*, int);
(NSGraphicsContext*, SEL, const char*, const CGFloat*, int);
void (*DPSyshow___)
(NSGraphicsContext*, SEL, const char*, const float*, int);
(NSGraphicsContext*, SEL, const char*, const CGFloat*, int);
void (*GSSetCharacterSpacing_)
(NSGraphicsContext*, SEL, float);
(NSGraphicsContext*, SEL, CGFloat);
void (*GSSetFont_)
(NSGraphicsContext*, SEL, NSFont*);
void (*GSSetFontSize_)
(NSGraphicsContext*, SEL, float);
(NSGraphicsContext*, SEL, CGFloat);
NSAffineTransform * (*GSGetTextCTM)
(NSGraphicsContext*, SEL);
NSPoint (*GSGetTextPosition)
@ -125,46 +125,46 @@ typedef struct {
void (*DPSinitgraphics)
(NSGraphicsContext*, SEL);
void (*DPSsetgstate_)
(NSGraphicsContext*, SEL, int);
(NSGraphicsContext*, SEL, NSInteger);
int (*GSDefineGState)
NSInteger (*GSDefineGState)
(NSGraphicsContext*, SEL);
void (*GSUndefineGState_)
(NSGraphicsContext*, SEL, int);
(NSGraphicsContext*, SEL, NSInteger);
void (*GSReplaceGState_)
(NSGraphicsContext*, SEL, int);
(NSGraphicsContext*, SEL, NSInteger);
/* ----------------------------------------------------------------------- */
/* Gstate operations */
/* ----------------------------------------------------------------------- */
void (*DPScurrentflat_)
(NSGraphicsContext*, SEL, float*);
(NSGraphicsContext*, SEL, CGFloat*);
void (*DPScurrentlinecap_)
(NSGraphicsContext*, SEL, int*);
void (*DPScurrentlinejoin_)
(NSGraphicsContext*, SEL, int*);
void (*DPScurrentlinewidth_)
(NSGraphicsContext*, SEL, float*);
(NSGraphicsContext*, SEL, CGFloat*);
void (*DPScurrentmiterlimit_)
(NSGraphicsContext*, SEL, float*);
(NSGraphicsContext*, SEL, CGFloat*);
void (*DPScurrentpoint__)
(NSGraphicsContext*, SEL, float*, float*);
(NSGraphicsContext*, SEL, CGFloat*, CGFloat*);
void (*DPScurrentstrokeadjust_)
(NSGraphicsContext*, SEL, int*);
void (*DPSsetdash___)
(NSGraphicsContext*, SEL, const float*, int, float);
(NSGraphicsContext*, SEL, const CGFloat*, NSInteger, CGFloat);
void (*DPSsetflat_)
(NSGraphicsContext*, SEL, float);
(NSGraphicsContext*, SEL, CGFloat);
void (*DPSsethalftonephase__)
(NSGraphicsContext*, SEL, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat);
void (*DPSsetlinecap_)
(NSGraphicsContext*, SEL, int);
void (*DPSsetlinejoin_)
(NSGraphicsContext*, SEL, int);
void (*DPSsetlinewidth_)
(NSGraphicsContext*, SEL, float);
(NSGraphicsContext*, SEL, CGFloat);
void (*DPSsetmiterlimit_)
(NSGraphicsContext*, SEL, float);
(NSGraphicsContext*, SEL, CGFloat);
void (*DPSsetstrokeadjust_)
(NSGraphicsContext*, SEL, int);
@ -172,15 +172,15 @@ typedef struct {
/* Matrix operations */
/* ----------------------------------------------------------------------- */
void (*DPSconcat_)
(NSGraphicsContext*, SEL, const float*);
(NSGraphicsContext*, SEL, const CGFloat*);
void (*DPSinitmatrix)
(NSGraphicsContext*, SEL);
void (*DPSrotate_)
(NSGraphicsContext*, SEL, float);
(NSGraphicsContext*, SEL, CGFloat);
void (*DPSscale__)
(NSGraphicsContext*, SEL, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat);
void (*DPStranslate__)
(NSGraphicsContext*, SEL, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat);
NSAffineTransform * (*GSCurrentCTM)
(NSGraphicsContext*, SEL);
@ -193,17 +193,17 @@ typedef struct {
/* Paint operations */
/* ----------------------------------------------------------------------- */
void (*DPSarc_____)
(NSGraphicsContext*, SEL, float, float, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat);
void (*DPSarcn_____)
(NSGraphicsContext*, SEL, float, float, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat);
void (*DPSarct_____)
(NSGraphicsContext*, SEL, float, float, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat);
void (*DPSclip)
(NSGraphicsContext*, SEL);
void (*DPSclosepath)
(NSGraphicsContext*, SEL);
void (*DPScurveto______)
(NSGraphicsContext*, SEL, float, float, float, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat);
void (*DPSeoclip)
(NSGraphicsContext*, SEL);
void (*DPSeofill)
@ -215,27 +215,27 @@ typedef struct {
void (*DPSinitclip)
(NSGraphicsContext*, SEL);
void (*DPSlineto__)
(NSGraphicsContext*, SEL, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat);
void (*DPSmoveto__)
(NSGraphicsContext*, SEL, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat);
void (*DPSnewpath)
(NSGraphicsContext*, SEL);
void (*DPSpathbbox____)
(NSGraphicsContext*, SEL, float*, float*, float*, float*);
(NSGraphicsContext*, SEL, CGFloat*, CGFloat*, CGFloat*, CGFloat*);
void (*DPSrcurveto______)
(NSGraphicsContext*, SEL, float, float, float, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat);
void (*DPSrectclip____)
(NSGraphicsContext*, SEL, float, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat);
void (*DPSrectfill____)
(NSGraphicsContext*, SEL, float, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat);
void (*DPSrectstroke____)
(NSGraphicsContext*, SEL, float, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat);
void (*DPSreversepath)
(NSGraphicsContext*, SEL);
void (*DPSrlineto__)
(NSGraphicsContext*, SEL, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat);
void (*DPSrmoveto__)
(NSGraphicsContext*, SEL, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat);
void (*DPSstroke)
(NSGraphicsContext*, SEL);
@ -262,11 +262,11 @@ typedef struct {
/* Graphics Extensions Ops */
/*-------------------------------------------------------------------------*/
void (*DPScomposite________)
(NSGraphicsContext*, SEL, float, float, float, float, int, float, float, int);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, NSInteger, CGFloat, CGFloat, NSCompositingOperation);
void (*DPScompositerect_____)
(NSGraphicsContext*, SEL, float, float, float, float, int);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, NSCompositingOperation);
void (*DPSdissolve________)
(NSGraphicsContext*, SEL, float, float, float, float, int, float, float, float);
(NSGraphicsContext*, SEL, CGFloat, CGFloat, CGFloat, CGFloat, NSInteger, CGFloat, CGFloat, CGFloat);
void (*GSDrawImage__)
(NSGraphicsContext*, SEL, NSRect, void *);
@ -298,12 +298,12 @@ typedef struct {
* Render Bitmap Images
*/
void (*NSDrawBitmap___________)(NSGraphicsContext*, SEL, NSRect rect,
int pixelsWide,
int pixelsHigh,
int bitsPerSample,
int samplesPerPixel,
int bitsPerPixel,
int bytesPerRow,
NSInteger pixelsWide,
NSInteger pixelsHigh,
NSInteger bitsPerSample,
NSInteger samplesPerPixel,
NSInteger bitsPerPixel,
NSInteger bytesPerRow,
BOOL isPlanar,
BOOL hasAlpha,
NSString *colorSpaceName,

10
Headers/Additions/GNUstepGUI/GSTheme.h
View file

@ -244,6 +244,9 @@
@class NSTabViewItem;
@class GSDrawTiles;
APPKIT_EXPORT NSString *GSSwitch;
APPKIT_EXPORT NSString *GSRadio;
/* First, declare names used for obtaining colors and/or tiles for specific
* controls and parts of controls.
*/
@ -709,6 +712,11 @@ APPKIT_EXPORT NSString *GSThemeWillDeactivateNotification;
*/
- (NSString*) versionString;
/**
* Return the theme's license.
*/
- (NSString*) license;
@end
/**
@ -734,7 +742,7 @@ APPKIT_EXPORT NSString *GSThemeWillDeactivateNotification;
* Allows the theme to set an image or set attributes for drawing the
* button differently based on the key equivalent which is set.
*/
- (void) setKeyEquivalent: (NSString *)key
- (void) setKeyEquivalent: (NSString *)key
forButtonCell: (NSButtonCell *)cell;
/**

14
Headers/Additions/GNUstepGUI/GSWindowDecorationView.h
View file

@ -37,11 +37,11 @@
- (id) newWindowDecorationViewWithFrame: (NSRect)frame
window: (NSWindow *)window;
- (NSRect) contentRectForFrameRect: (NSRect)aRect
styleMask: (unsigned int)aStyle;
styleMask: (NSUInteger)aStyle;
- (NSRect) frameRectForContentRect: (NSRect)aRect
styleMask: (unsigned int)aStyle;
- (float) minFrameWidthWithTitle: (NSString *)aTitle
styleMask: (unsigned int)aStyle;
styleMask: (NSUInteger)aStyle;
- (CGFloat) minFrameWidthWithTitle: (NSString *)aTitle
styleMask: (NSUInteger)aStyle;
@end
@ -65,12 +65,12 @@ this, either directly, or indirectly (by using the backend).
- (id) initWithFrame: (NSRect)frame window: (NSWindow *)w;
- (NSRect) contentRectForFrameRect: (NSRect)aRect
styleMask: (unsigned int)aStyle;
styleMask: (NSUInteger)aStyle;
- (NSRect) frameRectForContentRect: (NSRect)aRect
styleMask: (unsigned int)aStyle;
styleMask: (NSUInteger)aStyle;
- (void) layout;
- (void) changeWindowHeight: (float)difference;
- (void) changeWindowHeight: (CGFloat)difference;
- (void) setBackgroundColor: (NSColor *)color;
- (void) setContentView: (NSView *)contentView;

3
Headers/Additions/GNUstepGUI/config.h.in
View file

@ -69,6 +69,9 @@
/* Define to 1 if you have the <png.h> header file. */
#undef HAVE_PNG_H
/* Define to 1 if you have the `QuantizeBuffer' function. */
#undef HAVE_QUANTIZEBUFFER
/* Define to 1 if you have the `rint' function. */
#undef HAVE_RINT

3
Headers/AppKit/AppKit.h
View file

@ -56,6 +56,8 @@
#import <AppKit/NSCachedImageRep.h>
#import <AppKit/NSCell.h>
#import <AppKit/NSClipView.h>
#import <AppKit/NSCollectionView.h>
#import <AppKit/NSCollectionViewItem.h>
#import <AppKit/NSColor.h>
#import <AppKit/NSColorList.h>
#import <AppKit/NSColorPanel.h>
@ -91,6 +93,7 @@
#import <AppKit/NSPageLayout.h>
#import <AppKit/NSPanel.h>
#import <AppKit/NSPasteboard.h>
#import <AppKit/NSPopover.h>
#import <AppKit/NSPopUpButton.h>
#import <AppKit/NSPopUpButtonCell.h>
#import <AppKit/NSPrinter.h>

14
Headers/AppKit/AppKitDefines.h
View file

@ -27,6 +27,12 @@
#define __AppKitDefines_INCLUDE
#import <GNUstepBase/GSVersionMacros.h>
#ifdef __cplusplus
#define APPKIT_EXTERN extern "C"
#else
#define APPKIT_EXTERN extern
#endif
#ifdef GNUSTEP_WITH_DLL
#if BUILD_libgnustep_gui_DLL
@ -35,20 +41,20 @@
/* On Mingw, the compiler will export all symbols automatically, so
* __declspec(dllexport) is not needed.
*/
# define APPKIT_EXPORT extern
# define APPKIT_EXPORT APPKIT_EXTERN
# define APPKIT_DECLARE
# else
# define APPKIT_EXPORT __declspec(dllexport)
# define APPKIT_EXPORT __declspec(dllexport) APPKIT_EXTERN
# define APPKIT_DECLARE __declspec(dllexport)
# endif
#else
# define APPKIT_EXPORT extern __declspec(dllimport)
# define APPKIT_EXPORT APPKIT_EXTERN __declspec(dllimport)
# define APPKIT_DECLARE __declspec(dllimport)
#endif
#else /* GNUSTEP_WITH[OUT]_DLL */
# define APPKIT_EXPORT extern
# define APPKIT_EXPORT APPKIT_EXTERN
# define APPKIT_DECLARE
#endif

213
Headers/AppKit/DPSOperators.h
View file

@ -36,43 +36,43 @@
/* Color operations */
/* ----------------------------------------------------------------------- */
static inline void
DPScurrentalpha(GSCTXT *ctxt, float* a)
DPScurrentalpha(GSCTXT *ctxt, CGFloat* a)
__attribute__((unused));
static inline void
DPScurrentcmykcolor(GSCTXT *ctxt, float* c, float* m, float* y, float* k)
DPScurrentcmykcolor(GSCTXT *ctxt, CGFloat* c, CGFloat* m, CGFloat* y, CGFloat* k)
__attribute__((unused));
static inline void
DPScurrentgray(GSCTXT *ctxt, float* gray)
DPScurrentgray(GSCTXT *ctxt, CGFloat* gray)
__attribute__((unused));
static inline void
DPScurrenthsbcolor(GSCTXT *ctxt, float* h, float* s, float* b)
DPScurrenthsbcolor(GSCTXT *ctxt, CGFloat* h, CGFloat* s, CGFloat* b)
__attribute__((unused));
static inline void
DPScurrentrgbcolor(GSCTXT *ctxt, float* r, float* g, float* b)
DPScurrentrgbcolor(GSCTXT *ctxt, CGFloat* r, CGFloat* g, CGFloat* b)
__attribute__((unused));
static inline void
DPSsetalpha(GSCTXT *ctxt, float a)
DPSsetalpha(GSCTXT *ctxt, CGFloat a)
__attribute__((unused));
static inline void
DPSsetcmykcolor(GSCTXT *ctxt, float c, float m, float y, float k)
DPSsetcmykcolor(GSCTXT *ctxt, CGFloat c, CGFloat m, CGFloat y, CGFloat k)
__attribute__((unused));
static inline void
DPSsetgray(GSCTXT *ctxt, float gray)
DPSsetgray(GSCTXT *ctxt, CGFloat gray)
__attribute__((unused));
static inline void
DPSsethsbcolor(GSCTXT *ctxt, float h, float s, float b)
DPSsethsbcolor(GSCTXT *ctxt, CGFloat h, CGFloat s, CGFloat b)
__attribute__((unused));
static inline void
DPSsetrgbcolor(GSCTXT *ctxt, float r, float g, float b)
DPSsetrgbcolor(GSCTXT *ctxt, CGFloat r, CGFloat g, CGFloat b)
__attribute__((unused));
@ -85,11 +85,11 @@ GSSetStrokeColorspace(GSCTXT *ctxt, NSDictionary * dict)
__attribute__((unused));
static inline void
GSSetFillColor(GSCTXT *ctxt, float * values)
GSSetFillColor(GSCTXT *ctxt, CGFloat * values)
__attribute__((unused));
static inline void
GSSetStrokeColor(GSCTXT *ctxt, float * values)
GSSetStrokeColor(GSCTXT *ctxt, CGFloat * values)
__attribute__((unused));
@ -97,11 +97,11 @@ __attribute__((unused));
/* Text operations */
/* ----------------------------------------------------------------------- */
static inline void
DPSashow(GSCTXT *ctxt, float x, float y, const char* s)
DPSashow(GSCTXT *ctxt, CGFloat x, CGFloat y, const char* s)
__attribute__((unused));
static inline void
DPSawidthshow(GSCTXT *ctxt, float cx, float cy, int c, float ax, float ay, const char* s)
DPSawidthshow(GSCTXT *ctxt, CGFloat cx, CGFloat cy, int c, CGFloat ax, CGFloat ay, const char* s)
__attribute__((unused));
static inline void
@ -113,24 +113,24 @@ DPSshow(GSCTXT *ctxt, const char* s)
__attribute__((unused));
static inline void
DPSwidthshow(GSCTXT *ctxt, float x, float y, int c, const char* s)
DPSwidthshow(GSCTXT *ctxt, CGFloat x, CGFloat y, int c, const char* s)
__attribute__((unused));
static inline void
DPSxshow(GSCTXT *ctxt, const char* s, const float* numarray, int size)
DPSxshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size)
__attribute__((unused));
static inline void
DPSxyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size)
DPSxyshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size)
__attribute__((unused));
static inline void
DPSyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size)
DPSyshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size)
__attribute__((unused));
static inline void
GSSetCharacterSpacing(GSCTXT *ctxt, float extra)
GSSetCharacterSpacing(GSCTXT *ctxt, CGFloat extra)
__attribute__((unused));
static inline void
@ -138,7 +138,7 @@ GSSetFont(GSCTXT *ctxt, NSFont* font)
__attribute__((unused));
static inline void
GSSetFontSize(GSCTXT *ctxt, float size)
GSSetFontSize(GSCTXT *ctxt, CGFloat size)
__attribute__((unused));
static inline NSAffineTransform *
@ -191,27 +191,27 @@ DPSinitgraphics(GSCTXT *ctxt)
__attribute__((unused));
static inline void
DPSsetgstate(GSCTXT *ctxt, int gst)
DPSsetgstate(GSCTXT *ctxt, NSInteger gst)
__attribute__((unused));
static inline int
static inline NSInteger
GSDefineGState(GSCTXT *ctxt)
__attribute__((unused));
static inline void
GSUndefineGState(GSCTXT *ctxt, int gst)
GSUndefineGState(GSCTXT *ctxt, NSInteger gst)
__attribute__((unused));
static inline void
GSReplaceGState(GSCTXT *ctxt, int gst)
GSReplaceGState(GSCTXT *ctxt, NSInteger gst)
__attribute__((unused));
/* ----------------------------------------------------------------------- */
/* Gstate operations */
/* ----------------------------------------------------------------------- */
static inline void
DPScurrentflat(GSCTXT *ctxt, float* flatness)
DPScurrentflat(GSCTXT *ctxt, CGFloat* flatness)
__attribute__((unused));
static inline void
@ -223,15 +223,15 @@ DPScurrentlinejoin(GSCTXT *ctxt, int* linejoin)
__attribute__((unused));
static inline void
DPScurrentlinewidth(GSCTXT *ctxt, float* width)
DPScurrentlinewidth(GSCTXT *ctxt, CGFloat* width)
__attribute__((unused));
static inline void
DPScurrentmiterlimit(GSCTXT *ctxt, float* limit)
DPScurrentmiterlimit(GSCTXT *ctxt, CGFloat* limit)
__attribute__((unused));
static inline void
DPScurrentpoint(GSCTXT *ctxt, float* x, float* y)
DPScurrentpoint(GSCTXT *ctxt, CGFloat* x, CGFloat* y)
__attribute__((unused));
static inline void
@ -239,15 +239,15 @@ DPScurrentstrokeadjust(GSCTXT *ctxt, int* b)
__attribute__((unused));
static inline void
DPSsetdash(GSCTXT *ctxt, const float* pat, int size, float offset)
DPSsetdash(GSCTXT *ctxt, const CGFloat* pat, NSInteger size, CGFloat offset)
__attribute__((unused));
static inline void
DPSsetflat(GSCTXT *ctxt, float flatness)
DPSsetflat(GSCTXT *ctxt, CGFloat flatness)
__attribute__((unused));
static inline void
DPSsethalftonephase(GSCTXT *ctxt, float x, float y)
DPSsethalftonephase(GSCTXT *ctxt, CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
@ -259,11 +259,11 @@ DPSsetlinejoin(GSCTXT *ctxt, int linejoin)
__attribute__((unused));
static inline void
DPSsetlinewidth(GSCTXT *ctxt, float width)
DPSsetlinewidth(GSCTXT *ctxt, CGFloat width)
__attribute__((unused));
static inline void
DPSsetmiterlimit(GSCTXT *ctxt, float limit)
DPSsetmiterlimit(GSCTXT *ctxt, CGFloat limit)
__attribute__((unused));
static inline void
@ -275,7 +275,7 @@ __attribute__((unused));
/* Matrix operations */
/* ----------------------------------------------------------------------- */
static inline void
DPSconcat(GSCTXT *ctxt, const float* m)
DPSconcat(GSCTXT *ctxt, const CGFloat* m)
__attribute__((unused));
static inline void
@ -283,15 +283,15 @@ DPSinitmatrix(GSCTXT *ctxt)
__attribute__((unused));
static inline void
DPSrotate(GSCTXT *ctxt, float angle)
DPSrotate(GSCTXT *ctxt, CGFloat angle)
__attribute__((unused));
static inline void
DPSscale(GSCTXT *ctxt, float x, float y)
DPSscale(GSCTXT *ctxt, CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
DPStranslate(GSCTXT *ctxt, float x, float y)
DPStranslate(GSCTXT *ctxt, CGFloat x, CGFloat y)
__attribute__((unused));
@ -312,15 +312,15 @@ __attribute__((unused));
/* Paint operations */
/* ----------------------------------------------------------------------- */
static inline void
DPSarc(GSCTXT *ctxt, float x, float y, float r, float angle1, float angle2)
DPSarc(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2)
__attribute__((unused));
static inline void
DPSarcn(GSCTXT *ctxt, float x, float y, float r, float angle1, float angle2)
DPSarcn(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2)
__attribute__((unused));
static inline void
DPSarct(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float r)
DPSarct(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat r)
__attribute__((unused));
static inline void
@ -332,7 +332,7 @@ DPSclosepath(GSCTXT *ctxt)
__attribute__((unused));
static inline void
DPScurveto(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float x3, float y3)
DPScurveto(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3)
__attribute__((unused));
static inline void
@ -356,11 +356,11 @@ DPSinitclip(GSCTXT *ctxt)
__attribute__((unused));
static inline void
DPSlineto(GSCTXT *ctxt, float x, float y)
DPSlineto(GSCTXT *ctxt, CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
DPSmoveto(GSCTXT *ctxt, float x, float y)
DPSmoveto(GSCTXT *ctxt, CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
@ -368,23 +368,23 @@ DPSnewpath(GSCTXT *ctxt)
__attribute__((unused));
static inline void
DPSpathbbox(GSCTXT *ctxt, float* llx, float* lly, float* urx, float* ury)
DPSpathbbox(GSCTXT *ctxt, CGFloat* llx, CGFloat* lly, CGFloat* urx, CGFloat* ury)
__attribute__((unused));
static inline void
DPSrcurveto(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float x3, float y3)
DPSrcurveto(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3)
__attribute__((unused));
static inline void
DPSrectclip(GSCTXT *ctxt, float x, float y, float w, float h)
DPSrectclip(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h)
__attribute__((unused));
static inline void
DPSrectfill(GSCTXT *ctxt, float x, float y, float w, float h)
DPSrectfill(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h)
__attribute__((unused));
static inline void
DPSrectstroke(GSCTXT *ctxt, float x, float y, float w, float h)
DPSrectstroke(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h)
__attribute__((unused));
static inline void
@ -392,11 +392,11 @@ DPSreversepath(GSCTXT *ctxt)
__attribute__((unused));
static inline void
DPSrlineto(GSCTXT *ctxt, float x, float y)
DPSrlineto(GSCTXT *ctxt, CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
DPSrmoveto(GSCTXT *ctxt, float x, float y)
DPSrmoveto(GSCTXT *ctxt, CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
@ -445,15 +445,15 @@ __attribute__((unused));
/* Graphics Extensions Ops */
/*-------------------------------------------------------------------------*/
static inline void
DPScomposite(GSCTXT *ctxt, float x, float y, float w, float h, int gstateNum, float dx, float dy, int op)
DPScomposite(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, NSCompositingOperation op)
__attribute__((unused));
static inline void
DPScompositerect(GSCTXT *ctxt, float x, float y, float w, float h, int op)
DPScompositerect(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSCompositingOperation op)
__attribute__((unused));
static inline void
DPSdissolve(GSCTXT *ctxt, float x, float y, float w, float h, int gstateNum, float dx, float dy, float delta)
DPSdissolve(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, CGFloat delta)
__attribute__((unused));
@ -476,70 +476,70 @@ __attribute__((unused));
/* Color operations */
/* ----------------------------------------------------------------------- */
static inline void
DPScurrentalpha(GSCTXT *ctxt, float* a)
DPScurrentalpha(GSCTXT *ctxt, CGFloat* a)
{
(ctxt->methods->DPScurrentalpha_)
(ctxt, @selector(DPScurrentalpha:), a);
}
static inline void
DPScurrentcmykcolor(GSCTXT *ctxt, float* c, float* m, float* y, float* k)
DPScurrentcmykcolor(GSCTXT *ctxt, CGFloat* c, CGFloat* m, CGFloat* y, CGFloat* k)
{
(ctxt->methods->DPScurrentcmykcolor____)
(ctxt, @selector(DPScurrentcmykcolor: : : :), c, m, y, k);
}
static inline void
DPScurrentgray(GSCTXT *ctxt, float* gray)
DPScurrentgray(GSCTXT *ctxt, CGFloat* gray)
{
(ctxt->methods->DPScurrentgray_)
(ctxt, @selector(DPScurrentgray:), gray);
}
static inline void
DPScurrenthsbcolor(GSCTXT *ctxt, float* h, float* s, float* b)
DPScurrenthsbcolor(GSCTXT *ctxt, CGFloat* h, CGFloat* s, CGFloat* b)
{
(ctxt->methods->DPScurrenthsbcolor___)
(ctxt, @selector(DPScurrenthsbcolor: : :), h, s, b);
}
static inline void
DPScurrentrgbcolor(GSCTXT *ctxt, float* r, float* g, float* b)
DPScurrentrgbcolor(GSCTXT *ctxt, CGFloat* r, CGFloat* g, CGFloat* b)
{
(ctxt->methods->DPScurrentrgbcolor___)
(ctxt, @selector(DPScurrentrgbcolor: : :), r, g, b);
}
static inline void
DPSsetalpha(GSCTXT *ctxt, float a)
DPSsetalpha(GSCTXT *ctxt, CGFloat a)
{
(ctxt->methods->DPSsetalpha_)
(ctxt, @selector(DPSsetalpha:), a);
}
static inline void
DPSsetcmykcolor(GSCTXT *ctxt, float c, float m, float y, float k)
DPSsetcmykcolor(GSCTXT *ctxt, CGFloat c, CGFloat m, CGFloat y, CGFloat k)
{
(ctxt->methods->DPSsetcmykcolor____)
(ctxt, @selector(DPSsetcmykcolor: : : :), c, m, y, k);
}
static inline void
DPSsetgray(GSCTXT *ctxt, float gray)
DPSsetgray(GSCTXT *ctxt, CGFloat gray)
{
(ctxt->methods->DPSsetgray_)
(ctxt, @selector(DPSsetgray:), gray);
}
static inline void
DPSsethsbcolor(GSCTXT *ctxt, float h, float s, float b)
DPSsethsbcolor(GSCTXT *ctxt, CGFloat h, CGFloat s, CGFloat b)
{
(ctxt->methods->DPSsethsbcolor___)
(ctxt, @selector(DPSsethsbcolor: : :), h, s, b);
}
static inline void
DPSsetrgbcolor(GSCTXT *ctxt, float r, float g, float b)
DPSsetrgbcolor(GSCTXT *ctxt, CGFloat r, CGFloat g, CGFloat b)
{
(ctxt->methods->DPSsetrgbcolor___)
(ctxt, @selector(DPSsetrgbcolor: : :), r, g, b);
@ -561,14 +561,14 @@ GSSetStrokeColorspace(GSCTXT *ctxt, NSDictionary * dict)
}
static inline void
GSSetFillColor(GSCTXT *ctxt, float * values)
GSSetFillColor(GSCTXT *ctxt, CGFloat * values)
{
(ctxt->methods->GSSetFillColor_)
(ctxt, @selector(GSSetFillColor:), values);
}
static inline void
GSSetStrokeColor(GSCTXT *ctxt, float * values)
GSSetStrokeColor(GSCTXT *ctxt, CGFloat * values)
{
(ctxt->methods->GSSetStrokeColor_)
(ctxt, @selector(GSSetStrokeColor:), values);
@ -579,14 +579,14 @@ GSSetStrokeColor(GSCTXT *ctxt, float * values)
/* Text operations */
/* ----------------------------------------------------------------------- */
static inline void
DPSashow(GSCTXT *ctxt, float x, float y, const char* s)
DPSashow(GSCTXT *ctxt, CGFloat x, CGFloat y, const char* s)
{
(ctxt->methods->DPSashow___)
(ctxt, @selector(DPSashow: : :), x, y, s);
}
static inline void
DPSawidthshow(GSCTXT *ctxt, float cx, float cy, int c, float ax, float ay, const char* s)
DPSawidthshow(GSCTXT *ctxt, CGFloat cx, CGFloat cy, int c, CGFloat ax, CGFloat ay, const char* s)
{
(ctxt->methods->DPSawidthshow______)
(ctxt, @selector(DPSawidthshow: : : : : :), cx, cy, c, ax, ay, s);
@ -607,28 +607,28 @@ DPSshow(GSCTXT *ctxt, const char* s)
}
static inline void
DPSwidthshow(GSCTXT *ctxt, float x, float y, int c, const char* s)
DPSwidthshow(GSCTXT *ctxt, CGFloat x, CGFloat y, int c, const char* s)
{
(ctxt->methods->DPSwidthshow____)
(ctxt, @selector(DPSwidthshow: : : :), x, y, c, s);
}
static inline void
DPSxshow(GSCTXT *ctxt, const char* s, const float* numarray, int size)
DPSxshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size)
{
(ctxt->methods->DPSxshow___)
(ctxt, @selector(DPSxshow: : :), s, numarray, size);
}
static inline void
DPSxyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size)
DPSxyshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size)
{
(ctxt->methods->DPSxyshow___)
(ctxt, @selector(DPSxyshow: : :), s, numarray, size);
}
static inline void
DPSyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size)
DPSyshow(GSCTXT *ctxt, const char* s, const CGFloat* numarray, int size)
{
(ctxt->methods->DPSyshow___)
(ctxt, @selector(DPSyshow: : :), s, numarray, size);
@ -636,7 +636,7 @@ DPSyshow(GSCTXT *ctxt, const char* s, const float* numarray, int size)
static inline void
GSSetCharacterSpacing(GSCTXT *ctxt, float extra)
GSSetCharacterSpacing(GSCTXT *ctxt, CGFloat extra)
{
(ctxt->methods->GSSetCharacterSpacing_)
(ctxt, @selector(GSSetCharacterSpacing:), extra);
@ -650,7 +650,7 @@ GSSetFont(GSCTXT *ctxt, NSFont* font)
}
static inline void
GSSetFontSize(GSCTXT *ctxt, float size)
GSSetFontSize(GSCTXT *ctxt, CGFloat size)
{
(ctxt->methods->GSSetFontSize_)
(ctxt, @selector(GSSetFontSize:), size);
@ -738,14 +738,14 @@ DPSinitgraphics(GSCTXT *ctxt)
}
static inline void
DPSsetgstate(GSCTXT *ctxt, int gst)
DPSsetgstate(GSCTXT *ctxt, NSInteger gst)
{
(ctxt->methods->DPSsetgstate_)
(ctxt, @selector(DPSsetgstate:), gst);
}
static inline int
static inline NSInteger
GSDefineGState(GSCTXT *ctxt)
{
return (ctxt->methods->GSDefineGState)
@ -753,14 +753,14 @@ GSDefineGState(GSCTXT *ctxt)
}
static inline void
GSUndefineGState(GSCTXT *ctxt, int gst)
GSUndefineGState(GSCTXT *ctxt, NSInteger gst)
{
(ctxt->methods->GSUndefineGState_)
(ctxt, @selector(GSUndefineGState:), gst);
}
static inline void
GSReplaceGState(GSCTXT *ctxt, int gst)
GSReplaceGState(GSCTXT *ctxt, NSInteger gst)
{
(ctxt->methods->GSReplaceGState_)
(ctxt, @selector(GSReplaceGState:), gst);
@ -770,7 +770,7 @@ GSReplaceGState(GSCTXT *ctxt, int gst)
/* Gstate operations */
/* ----------------------------------------------------------------------- */
static inline void
DPScurrentflat(GSCTXT *ctxt, float* flatness)
DPScurrentflat(GSCTXT *ctxt, CGFloat* flatness)
{
(ctxt->methods->DPScurrentflat_)
(ctxt, @selector(DPScurrentflat:), flatness);
@ -791,21 +791,21 @@ DPScurrentlinejoin(GSCTXT *ctxt, int* linejoin)
}
static inline void
DPScurrentlinewidth(GSCTXT *ctxt, float* width)
DPScurrentlinewidth(GSCTXT *ctxt, CGFloat* width)
{
(ctxt->methods->DPScurrentlinewidth_)
(ctxt, @selector(DPScurrentlinewidth:), width);
}
static inline void
DPScurrentmiterlimit(GSCTXT *ctxt, float* limit)
DPScurrentmiterlimit(GSCTXT *ctxt, CGFloat* limit)
{
(ctxt->methods->DPScurrentmiterlimit_)
(ctxt, @selector(DPScurrentmiterlimit:), limit);
}
static inline void
DPScurrentpoint(GSCTXT *ctxt, float* x, float* y)
DPScurrentpoint(GSCTXT *ctxt, CGFloat* x, CGFloat* y)
{
(ctxt->methods->DPScurrentpoint__)
(ctxt, @selector(DPScurrentpoint: :), x, y);
@ -819,21 +819,21 @@ DPScurrentstrokeadjust(GSCTXT *ctxt, int* b)
}
static inline void
DPSsetdash(GSCTXT *ctxt, const float* pat, int size, float offset)
DPSsetdash(GSCTXT *ctxt, const CGFloat* pat, NSInteger size, CGFloat offset)
{
(ctxt->methods->DPSsetdash___)
(ctxt, @selector(DPSsetdash: : :), pat, size, offset);
}
static inline void
DPSsetflat(GSCTXT *ctxt, float flatness)
DPSsetflat(GSCTXT *ctxt, CGFloat flatness)
{
(ctxt->methods->DPSsetflat_)
(ctxt, @selector(DPSsetflat:), flatness);
}
static inline void
DPSsethalftonephase(GSCTXT *ctxt, float x, float y)
DPSsethalftonephase(GSCTXT *ctxt, CGFloat x, CGFloat y)
{
(ctxt->methods->DPSsethalftonephase__)
(ctxt, @selector(DPSsethalftonephase: :), x, y);
@ -854,14 +854,14 @@ DPSsetlinejoin(GSCTXT *ctxt, int linejoin)
}
static inline void
DPSsetlinewidth(GSCTXT *ctxt, float width)
DPSsetlinewidth(GSCTXT *ctxt, CGFloat width)
{
(ctxt->methods->DPSsetlinewidth_)
(ctxt, @selector(DPSsetlinewidth:), width);
}
static inline void
DPSsetmiterlimit(GSCTXT *ctxt, float limit)
DPSsetmiterlimit(GSCTXT *ctxt, CGFloat limit)
{
(ctxt->methods->DPSsetmiterlimit_)
(ctxt, @selector(DPSsetmiterlimit:), limit);
@ -879,7 +879,7 @@ DPSsetstrokeadjust(GSCTXT *ctxt, int b)
/* Matrix operations */
/* ----------------------------------------------------------------------- */
static inline void
DPSconcat(GSCTXT *ctxt, const float* m)
DPSconcat(GSCTXT *ctxt, const CGFloat* m)
{
(ctxt->methods->DPSconcat_)
(ctxt, @selector(DPSconcat:), m);
@ -893,21 +893,21 @@ DPSinitmatrix(GSCTXT *ctxt)
}
static inline void
DPSrotate(GSCTXT *ctxt, float angle)
DPSrotate(GSCTXT *ctxt, CGFloat angle)
{
(ctxt->methods->DPSrotate_)
(ctxt, @selector(DPSrotate:), angle);
}
static inline void
DPSscale(GSCTXT *ctxt, float x, float y)
DPSscale(GSCTXT *ctxt, CGFloat x, CGFloat y)
{
(ctxt->methods->DPSscale__)
(ctxt, @selector(DPSscale: :), x, y);
}
static inline void
DPStranslate(GSCTXT *ctxt, float x, float y)
DPStranslate(GSCTXT *ctxt, CGFloat x, CGFloat y)
{
(ctxt->methods->DPStranslate__)
(ctxt, @selector(DPStranslate: :), x, y);
@ -940,21 +940,21 @@ GSConcatCTM(GSCTXT *ctxt, NSAffineTransform * ctm)
/* Paint operations */
/* ----------------------------------------------------------------------- */
static inline void
DPSarc(GSCTXT *ctxt, float x, float y, float r, float angle1, float angle2)
DPSarc(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2)
{
(ctxt->methods->DPSarc_____)
(ctxt, @selector(DPSarc: : : : :), x, y, r, angle1, angle2);
}
static inline void
DPSarcn(GSCTXT *ctxt, float x, float y, float r, float angle1, float angle2)
DPSarcn(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2)
{
(ctxt->methods->DPSarcn_____)
(ctxt, @selector(DPSarcn: : : : :), x, y, r, angle1, angle2);
}
static inline void
DPSarct(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float r)
DPSarct(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat r)
{
(ctxt->methods->DPSarct_____)
(ctxt, @selector(DPSarct: : : : :), x1, y1, x2, y2, r);
@ -975,7 +975,7 @@ DPSclosepath(GSCTXT *ctxt)
}
static inline void
DPScurveto(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float x3, float y3)
DPScurveto(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3)
{
(ctxt->methods->DPScurveto______)
(ctxt, @selector(DPScurveto: : : : : :), x1, y1, x2, y2, x3, y3);
@ -1017,14 +1017,14 @@ DPSinitclip(GSCTXT *ctxt)
}
static inline void
DPSlineto(GSCTXT *ctxt, float x, float y)
DPSlineto(GSCTXT *ctxt, CGFloat x, CGFloat y)
{
(ctxt->methods->DPSlineto__)
(ctxt, @selector(DPSlineto: :), x, y);
}
static inline void
DPSmoveto(GSCTXT *ctxt, float x, float y)
DPSmoveto(GSCTXT *ctxt, CGFloat x, CGFloat y)
{
(ctxt->methods->DPSmoveto__)
(ctxt, @selector(DPSmoveto: :), x, y);
@ -1038,35 +1038,35 @@ DPSnewpath(GSCTXT *ctxt)
}
static inline void
DPSpathbbox(GSCTXT *ctxt, float* llx, float* lly, float* urx, float* ury)
DPSpathbbox(GSCTXT *ctxt, CGFloat* llx, CGFloat* lly, CGFloat* urx, CGFloat* ury)
{
(ctxt->methods->DPSpathbbox____)
(ctxt, @selector(DPSpathbbox: : : :), llx, lly, urx, ury);
}
static inline void
DPSrcurveto(GSCTXT *ctxt, float x1, float y1, float x2, float y2, float x3, float y3)
DPSrcurveto(GSCTXT *ctxt, CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3)
{
(ctxt->methods->DPSrcurveto______)
(ctxt, @selector(DPSrcurveto: : : : : :), x1, y1, x2, y2, x3, y3);
}
static inline void
DPSrectclip(GSCTXT *ctxt, float x, float y, float w, float h)
DPSrectclip(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h)
{
(ctxt->methods->DPSrectclip____)
(ctxt, @selector(DPSrectclip: : : :), x, y, w, h);
}
static inline void
DPSrectfill(GSCTXT *ctxt, float x, float y, float w, float h)
DPSrectfill(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h)
{
(ctxt->methods->DPSrectfill____)
(ctxt, @selector(DPSrectfill: : : :), x, y, w, h);
}
static inline void
DPSrectstroke(GSCTXT *ctxt, float x, float y, float w, float h)
DPSrectstroke(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h)
{
(ctxt->methods->DPSrectstroke____)
(ctxt, @selector(DPSrectstroke: : : :), x, y, w, h);
@ -1080,14 +1080,14 @@ DPSreversepath(GSCTXT *ctxt)
}
static inline void
DPSrlineto(GSCTXT *ctxt, float x, float y)
DPSrlineto(GSCTXT *ctxt, CGFloat x, CGFloat y)
{
(ctxt->methods->DPSrlineto__)
(ctxt, @selector(DPSrlineto: :), x, y);
}
static inline void
DPSrmoveto(GSCTXT *ctxt, float x, float y)
DPSrmoveto(GSCTXT *ctxt, CGFloat x, CGFloat y)
{
(ctxt->methods->DPSrmoveto__)
(ctxt, @selector(DPSrmoveto: :), x, y);
@ -1166,21 +1166,22 @@ DPSsetoffset(GSCTXT *ctxt, short int x, short int y)
/* Graphics Extensions Ops */
/*-------------------------------------------------------------------------*/
static inline void
DPScomposite(GSCTXT *ctxt, float x, float y, float w, float h, int gstateNum, float dx, float dy, int op)
DPScomposite(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h,
NSInteger gstateNum, CGFloat dx, CGFloat dy, NSCompositingOperation op)
{
(ctxt->methods->DPScomposite________)
(ctxt, @selector(DPScomposite: : : : : : : :), x, y, w, h, gstateNum, dx, dy, op);
}
static inline void
DPScompositerect(GSCTXT *ctxt, float x, float y, float w, float h, int op)
DPScompositerect(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSCompositingOperation op)
{
(ctxt->methods->DPScompositerect_____)
(ctxt, @selector(DPScompositerect: : : : :), x, y, w, h, op);
}
static inline void
DPSdissolve(GSCTXT *ctxt, float x, float y, float w, float h, int gstateNum, float dx, float dy, float delta)
DPSdissolve(GSCTXT *ctxt, CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, CGFloat delta)
{
(ctxt->methods->DPSdissolve________)
(ctxt, @selector(DPSdissolve: : : : : : : :), x, y, w, h, gstateNum, dx, dy, delta);

2
Headers/AppKit/NSActionCell.h
View file

@ -36,7 +36,7 @@
@interface NSActionCell : NSCell
{
// Attributes
int _tag;
NSInteger _tag;
id _target;
SEL _action;
NSView *_control_view;

9
Headers/AppKit/NSAlert.h
View file

@ -42,11 +42,12 @@
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
typedef enum _NSAlertStyle {
enum _NSAlertStyle {
NSWarningAlertStyle = 0,
NSInformationalAlertStyle = 1,
NSCriticalAlertStyle = 2
} NSAlertStyle;
};
typedef NSUInteger NSAlertStyle;
enum {
NSAlertFirstButtonReturn = 1000,
@ -68,7 +69,7 @@ enum {
BOOL _shows_help;
id _modalDelegate;
SEL _didEndSelector;
int _result;
NSInteger _result;
}
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
@ -93,7 +94,7 @@ enum {
- (NSImage *) icon;
- (NSString *) informativeText;
- (NSString *) messageText;
- (int) runModal;
- (NSInteger) runModal;
- (void) setAlertStyle: (NSAlertStyle)style;
- (void) setDelegate: (id)delegate;
- (void) setHelpAnchor: (NSString *)anchor;

95
Headers/AppKit/NSApplication.h
View file

@ -40,6 +40,7 @@
#import <GNUstepBase/GSVersionMacros.h>
#import <AppKit/NSResponder.h>
#import <AppKit/NSUserInterfaceValidation.h>
#if defined(__cplusplus)
extern "C" {
@ -84,11 +85,12 @@ enum {
* NSTerminateLater.
* </example>
*/
typedef enum {
enum {
NSTerminateCancel = NO,
NSTerminateNow = YES,
NSTerminateLater
} NSApplicationTerminateReply;
};
typedef NSUInteger NSApplicationTerminateReply;
/**
* Type used by -requestUserAttention: when an applications opened. Possible values are:
@ -97,35 +99,60 @@ typedef enum {
* NSInformationalRequest;
* </example>
*/
typedef enum {
NSCriticalRequest,
NSInformationalRequest
} NSRequestUserAttentionType;
enum {
NSCriticalRequest = 0,
NSInformationalRequest = 10
};
typedef NSUInteger NSRequestUserAttentionType;
#define NSAppKitVersionNumber10_0 0
#define NSAppKitVersionNumber10_0 577
#define NSAppKitVersionNumber10_1 620
#define NSAppKitVersionNumber10_2 663
#define NSAppKitVersionNumber10_2_3 663.6
#define NSAppKitVersionNumber10_3 743
#define NSAppKitVersionNumber10_3_2 743.14
#define NSAppKitVersionNumber10_3_3 743.2
#define NSAppKitVersionNumber10_3_5 743.24
#define NSAppKitVersionNumber10_3_7 743.33
#define NSAppKitVersionNumber10_3_9 743.36
#define NSAppKitVersionNumber10_4 824
#define NSAppKitVersionNumber10_4_1 824.1
#define NSAppKitVersionNumber10_4_3 824.23
#define NSAppKitVersionNumber10_4_4 824.33
#define NSAppKitVersionNumber10_4_7 824.41
#define NSAppKitVersionNumber10_5 949
#define NSAppKitVersionNumber10_5_2 949.27
#define NSAppKitVersionNumber10_5_3 949.33
#define NSAppKitVersionNumber10_6 1038
#define NSAppKitVersionNumber10_7 1138
#define NSAppKitVersionNumber10_7_2 1138.23
APPKIT_EXPORT const double NSAppKitVersionNumber;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
typedef enum _NSApplicationDelegateReply
enum _NSApplicationDelegateReply
{
NSApplicationDelegateReplySuccess =0,
NSApplicationDelegateReplyCancel =1,
NSApplicationDelegateReplyFailure =2
} NSApplicationDelegateReply;
NSApplicationDelegateReplySuccess = 0,
NSApplicationDelegateReplyCancel = 1,
NSApplicationDelegateReplyFailure = 2
};
typedef NSUInteger NSApplicationDelegateReply;
typedef enum _NSApplicationPrintReply
enum _NSApplicationPrintReply
{
NSPrintingCancelled = NO,
NSPrintingSuccess = YES,
NSPrintingFailure,
NSPrintingReplyLater
} NSApplicationPrintReply;
};
typedef NSUInteger NSApplicationPrintReply;
#endif
APPKIT_EXPORT NSString *NSModalPanelRunLoopMode;
APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
@interface NSApplication : NSResponder <NSCoding>
@interface NSApplication : NSResponder <NSCoding,NSUserInterfaceValidations>
{
NSGraphicsContext *_default_context;
NSEvent *_current_event;
@ -201,17 +228,17 @@ APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
- (void) endModalSession: (NSModalSession)theSession;
- (BOOL) isRunning;
- (void) run;
- (int) runModalForWindow: (NSWindow*)theWindow;
- (int) runModalSession: (NSModalSession)theSession;
- (NSInteger) runModalForWindow: (NSWindow*)theWindow;
- (NSInteger) runModalSession: (NSModalSession)theSession;
- (NSWindow *) modalWindow;
- (void) sendEvent: (NSEvent*)theEvent;
- (void) stop: (id)sender;
- (void) stopModal;
- (void) stopModalWithCode: (int)returnCode;
- (void) stopModalWithCode: (NSInteger)returnCode;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (int) runModalForWindow: (NSWindow *)theWindow
relativeToWindow: (NSWindow *)docWindow;
- (NSInteger) runModalForWindow: (NSWindow *)theWindow
relativeToWindow: (NSWindow *)docWindow;
- (void) beginSheet: (NSWindow *)sheet
modalForWindow: (NSWindow *)docWindow
modalDelegate: (id)modalDelegate
@ -219,16 +246,16 @@ APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
contextInfo: (void *)contextInfo;
- (void) endSheet: (NSWindow *)sheet;
- (void) endSheet: (NSWindow *)sheet
returnCode: (int)returnCode;
returnCode: (NSInteger)returnCode;
#endif
/*
* Getting, removing, and posting events
*/
- (NSEvent*) currentEvent;
- (void) discardEventsMatchingMask: (unsigned int)mask
- (void) discardEventsMatchingMask: (NSUInteger)mask
beforeEvent: (NSEvent*)lastEvent;
- (NSEvent*) nextEventMatchingMask: (unsigned int)mask
- (NSEvent*) nextEventMatchingMask: (NSUInteger)mask
untilDate: (NSDate*)expiration
inMode: (NSString*)mode
dequeue: (BOOL)flag;
@ -275,7 +302,7 @@ APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
- (void) setWindowsNeedUpdate: (BOOL)flag;
- (void) updateWindows;
- (NSArray*) windows;
- (NSWindow*) windowWithWindowNumber: (int)windowNum;
- (NSWindow*) windowWithWindowNumber: (NSInteger)windowNum;
/*
* Showing Standard Panels
@ -367,8 +394,8 @@ APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
/*
* Methods for user attention requests
*/
- (void) cancelUserAttentionRequest: (int)request;
- (int) requestUserAttention: (NSRequestUserAttentionType)requestType;
- (void) cancelUserAttentionRequest: (NSInteger)request;
- (NSInteger) requestUserAttention: (NSRequestUserAttentionType)requestType;
#endif
@end
@ -413,13 +440,19 @@ APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
@end
/**
* This is a formal protocol that duplicates the informal protocol for
* [NSApplication] delegates. Your delegate does not need to implement the
* formal protocol; it is declared only for documentation purposes. Your
* This is now a formal optional protocol.
* Your delegate does not need to implement the full formal protocol. Your
* delegate should just implement the methods it needs to, which will allow
* <code>NSApp</code> to use default implementations in other cases.
*/
@protocol GSAppDelegateProtocol
@protocol NSApplicationDelegate <NSObject>
#ifdef __OBJC2__
@optional
#else
@end
@interface NSObject (NSApplicationDelegate)
#endif
/**
* Sender app (not necessarily this application) requests application to open
* file without bringing up its normal UI, for programmatic manipulation.
@ -596,12 +629,14 @@ APPKIT_EXPORT NSString *NSEventTrackingRunLoopMode;
- (BOOL) application: (NSApplication*)sender
delegateHandlesKey: (NSString*)key;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_1, GS_API_LATEST)
/**
* Method used on OS X to allow an application to override the standard menu
* obtained by right-clicking on the application's dock icon. <em>Called
* when the application uses Macintosh or Windows95 style menus.</em>
*/
- (NSMenu *) applicationDockMenu: (NSApplication*)sender;
#endif
/**
* Method used on OS X to allow delegate to handle event when user clicks on

2
Headers/AppKit/NSArrayController.h
View file

@ -40,7 +40,7 @@
@interface NSArrayController : NSObjectController
{
NSMutableArray *_arranged_objects;
NSArray *_arranged_objects;
NSIndexSet *_selection_indexes;
NSArray *_sort_descriptors;
NSPredicate *_filter_predicate;

66
Headers/AppKit/NSBezierPath.h
View file

@ -77,12 +77,12 @@ typedef enum {
NSWindingRule _windingRule;
NSLineCapStyle _lineCapStyle;
NSLineJoinStyle _lineJoinStyle;
float _lineWidth;
float _flatness;
float _miterLimit;
int _dash_count;
float _dash_phase;
float *_dash_pattern;
CGFloat _lineWidth;
CGFloat _flatness;
CGFloat _miterLimit;
NSInteger _dash_count;
CGFloat _dash_phase;
CGFloat *_dash_pattern;
NSRect _bounds;
NSRect _controlPointBounds;
NSImage *_cacheImage;
@ -128,18 +128,18 @@ typedef enum {
//
// Default path rendering parameters
//
+ (void)setDefaultMiterLimit:(float)limit;
+ (float)defaultMiterLimit;
+ (void)setDefaultFlatness:(float)flatness;
+ (float)defaultFlatness;
+ (void)setDefaultMiterLimit:(CGFloat)limit;
+ (CGFloat)defaultMiterLimit;
+ (void)setDefaultFlatness:(CGFloat)flatness;
+ (CGFloat)defaultFlatness;
+ (void)setDefaultWindingRule:(NSWindingRule)windingRule;
+ (NSWindingRule)defaultWindingRule;
+ (void)setDefaultLineCapStyle:(NSLineCapStyle)lineCapStyle;
+ (NSLineCapStyle)defaultLineCapStyle;
+ (void)setDefaultLineJoinStyle:(NSLineJoinStyle)lineJoinStyle;
+ (NSLineJoinStyle)defaultLineJoinStyle;
+ (void)setDefaultLineWidth:(float)lineWidth;
+ (float)defaultLineWidth;
+ (void)setDefaultLineWidth:(CGFloat)lineWidth;
+ (CGFloat)defaultLineWidth;
//
// Path construction
@ -164,20 +164,20 @@ typedef enum {
//
// Path rendering parameters
//
- (float)lineWidth;
- (void)setLineWidth:(float)lineWidth;
- (CGFloat)lineWidth;
- (void)setLineWidth:(CGFloat)lineWidth;
- (NSLineCapStyle)lineCapStyle;
- (void)setLineCapStyle:(NSLineCapStyle)lineCapStyle;
- (NSLineJoinStyle)lineJoinStyle;
- (void)setLineJoinStyle:(NSLineJoinStyle)lineJoinStyle;
- (NSWindingRule)windingRule;
- (void)setWindingRule:(NSWindingRule)windingRule;
- (void)setFlatness:(float)flatness;
- (float)flatness;
- (void)setMiterLimit:(float)limit;
- (float)miterLimit;
- (void)getLineDash:(float *)pattern count:(int *)count phase:(float *)phase;
- (void)setLineDash:(const float *)pattern count:(int)count phase:(float)phase;
- (void)setFlatness:(CGFloat)flatness;
- (CGFloat)flatness;
- (void)setMiterLimit:(CGFloat)limit;
- (CGFloat)miterLimit;
- (void)getLineDash:(CGFloat *)pattern count:(NSInteger *)count phase:(CGFloat *)phase;
- (void)setLineDash:(const CGFloat *)pattern count:(NSInteger)count phase:(CGFloat)phase;
//
// Path operations
@ -209,34 +209,34 @@ typedef enum {
//
// Elements
//
- (int)elementCount;
- (NSBezierPathElement)elementAtIndex:(int)index
- (NSInteger)elementCount;
- (NSBezierPathElement)elementAtIndex:(NSInteger)index
associatedPoints:(NSPoint *)points;
- (NSBezierPathElement)elementAtIndex:(int)index;
- (void)setAssociatedPoints:(NSPoint *)points atIndex:(int)index;
- (NSBezierPathElement)elementAtIndex:(NSInteger)index;
- (void)setAssociatedPoints:(NSPoint *)points atIndex:(NSInteger)index;
//
// Appending common paths
//
- (void)appendBezierPath:(NSBezierPath *)aPath;
- (void)appendBezierPathWithRect:(NSRect)aRect;
- (void)appendBezierPathWithPoints:(NSPoint *)points count:(int)count;
- (void)appendBezierPathWithPoints:(NSPoint *)points count:(NSInteger)count;
- (void)appendBezierPathWithOvalInRect:(NSRect)aRect;
- (void)appendBezierPathWithArcWithCenter:(NSPoint)center
radius:(float)radius
startAngle:(float)startAngle
endAngle:(float)endAngle
radius:(CGFloat)radius
startAngle:(CGFloat)startAngle
endAngle:(CGFloat)endAngle
clockwise:(BOOL)clockwise;
- (void)appendBezierPathWithArcWithCenter:(NSPoint)center
radius:(float)radius
startAngle:(float)startAngle
endAngle:(float)endAngle;
radius:(CGFloat)radius
startAngle:(CGFloat)startAngle
endAngle:(CGFloat)endAngle;
- (void)appendBezierPathWithArcFromPoint:(NSPoint)point1
toPoint:(NSPoint)point2
radius:(float)radius;
radius:(CGFloat)radius;
- (void)appendBezierPathWithGlyph:(NSGlyph)glyph inFont:(NSFont *)font;
- (void)appendBezierPathWithGlyphs:(NSGlyph *)glyphs
count:(int)count
count:(NSInteger)count
inFont:(NSFont *)font;
- (void)appendBezierPathWithPackedGlyphs:(const char *)packedGlyphs;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)

68
Headers/AppKit/NSBitmapImageRep.h
View file

@ -125,17 +125,17 @@ APPKIT_EXPORT NSString *NSImageEXIFData; // No GNUstep support yet; for reading
@interface NSBitmapImageRep : NSImageRep
{
// Attributes
unsigned int _bytesPerRow;
unsigned int _numColors;
unsigned int _bitsPerPixel;
unsigned short _compression;
float _comp_factor;
NSMutableDictionary *_properties;
BOOL _isPlanar;
unsigned char **_imagePlanes;
NSData *_imageData;
NSInteger _bytesPerRow;
NSInteger _numColors;
NSInteger _bitsPerPixel;
unsigned short _compression;
float _comp_factor;
NSMutableDictionary *_properties;
BOOL _isPlanar;
unsigned char **_imagePlanes;
NSData *_imageData;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
NSBitmapFormat _format;
NSBitmapFormat _format;
#else
unsigned int _format;
#endif
@ -149,18 +149,18 @@ APPKIT_EXPORT NSString *NSImageEXIFData; // No GNUstep support yet; for reading
- (id) initWithData: (NSData*)imageData;
- (id) initWithFocusedViewRect: (NSRect)rect;
- (id) initWithBitmapDataPlanes: (unsigned char**)planes
pixelsWide: (int)width
pixelsHigh: (int)height
bitsPerSample: (int)bitsPerSample
samplesPerPixel: (int)samplesPerPixel
pixelsWide: (NSInteger)width
pixelsHigh: (NSInteger)height
bitsPerSample: (NSInteger)bitsPerSample
samplesPerPixel: (NSInteger)samplesPerPixel
hasAlpha: (BOOL)alpha
isPlanar: (BOOL)isPlanar
colorSpaceName: (NSString*)colorSpaceName
bytesPerRow: (int)rowBytes
bitsPerPixel: (int)pixelBits;
bytesPerRow: (NSInteger)rowBytes
bitsPerPixel: (NSInteger)pixelBits;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void)colorizeByMappingGray:(float)midPoint
- (void)colorizeByMappingGray:(CGFloat)midPoint
toColor:(NSColor *)midPointColor
blackMapping:(NSColor *)shadowColor
whiteMapping:(NSColor *)lightColor;
@ -169,32 +169,32 @@ APPKIT_EXPORT NSString *NSImageEXIFData; // No GNUstep support yet; for reading
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_2, GS_API_LATEST)
- (int) incrementalLoadFromData: (NSData *)data complete: (BOOL)complete;
- (NSInteger) incrementalLoadFromData: (NSData *)data complete: (BOOL)complete;
- (id) initForIncrementalLoad;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (id) initWithBitmapDataPlanes: (unsigned char**)planes
pixelsWide: (int)width
pixelsHigh: (int)height
bitsPerSample: (int)bps
samplesPerPixel: (int)spp
pixelsWide: (NSInteger)width
pixelsHigh: (NSInteger)height
bitsPerSample: (NSInteger)bps
samplesPerPixel: (NSInteger)spp
hasAlpha: (BOOL)alpha
isPlanar: (BOOL)isPlanar
colorSpaceName: (NSString*)colorSpaceName
bitmapFormat: (NSBitmapFormat)bitmapFormat
bytesPerRow: (int)rowBytes
bitsPerPixel: (int)pixelBits;
bytesPerRow: (NSInteger)rowBytes
bitsPerPixel: (NSInteger)pixelBits;
#endif
//
// Getting Information about the Image
//
- (int) bitsPerPixel;
- (int) samplesPerPixel;
- (NSInteger) bitsPerPixel;
- (NSInteger) samplesPerPixel;
- (BOOL) isPlanar;
- (int) numberOfPlanes;
- (int) bytesPerPlane;
- (int) bytesPerRow;
- (NSInteger) numberOfPlanes;
- (NSInteger) bytesPerPlane;
- (NSInteger) bytesPerRow;
//
// Getting Image Data
@ -204,10 +204,10 @@ APPKIT_EXPORT NSString *NSImageEXIFData; // No GNUstep support yet; for reading
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (NSBitmapFormat) bitmapFormat;
- (void) getPixel: (unsigned int[])pixelData atX: (int)x y: (int)y;
- (void) setPixel: (unsigned int[])pixelData atX: (int)x y: (int)y;
- (NSColor*) colorAtX: (int)x y: (int)y;
- (void) setColor: (NSColor*)color atX: (int)x y: (int)y;
- (void) getPixel: (NSUInteger[])pixelData atX: (NSInteger)x y: (NSInteger)y;
- (void) setPixel: (NSUInteger[])pixelData atX: (NSInteger)x y: (NSInteger)y;
- (NSColor*) colorAtX: (NSInteger)x y: (NSInteger)y;
- (void) setColor: (NSColor*)color atX: (NSInteger)x y: (NSInteger)y;
#endif
//
@ -233,7 +233,7 @@ APPKIT_EXPORT NSString *NSImageEXIFData; // No GNUstep support yet; for reading
// Setting and Checking Compression Types
//
+ (void) getTIFFCompressionTypes: (const NSTIFFCompression**)list
count: (int*)numTypes;
count: (NSInteger*)numTypes;
+ (NSString*) localizedNameForTIFFCompressionType: (NSTIFFCompression)type;
- (BOOL) canBeCompressedUsing: (NSTIFFCompression)compression;
- (void) getCompression: (NSTIFFCompression*)compression

107
Headers/AppKit/NSBrowser.h
View file

@ -42,12 +42,13 @@
//@class NSBox;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
typedef enum _NSBrowserColumnResizingType
enum _NSBrowserColumnResizingType
{
NSBrowserNoColumnResizing,
NSBrowserAutoColumnResizing,
NSBrowserUserColumnResizing
} NSBrowserColumnResizingType;
};
typedef NSUInteger NSBrowserColumnResizingType;
#endif
@interface NSBrowser : NSControl <NSCoding>
@ -88,12 +89,12 @@ typedef enum _NSBrowserColumnResizingType
NSRect _scrollerRect;
int _alphaNumericalLastColumn;
int _maxVisibleColumns;
float _minColumnWidth;
CGFloat _minColumnWidth;
int _lastColumnLoaded;
int _firstVisibleColumn;
int _lastVisibleColumn;
NSString *_columnsAutosaveName;
NSBrowserColumnResizingType _columnResizing;
NSBrowserColumnResizingType _columnResizing;
}
//
@ -154,36 +155,36 @@ typedef enum _NSBrowserColumnResizingType
//
// Setting the NSBrowser's Appearance
//
- (int) maxVisibleColumns;
- (int) minColumnWidth;
- (NSInteger) maxVisibleColumns;
- (CGFloat) minColumnWidth;
- (BOOL) separatesColumns;
- (void) setMaxVisibleColumns: (int)columnCount;
- (void) setMinColumnWidth: (int)columnWidth;
- (void) setMaxVisibleColumns: (NSInteger)columnCount;
- (void) setMinColumnWidth: (CGFloat)columnWidth;
- (void) setSeparatesColumns: (BOOL)flag;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (float) columnWidthForColumnContentWidth: (float)columnContentWidth;
- (float) columnContentWidthForColumnWidth: (float)columnWidth;
- (CGFloat) columnWidthForColumnContentWidth: (CGFloat)columnContentWidth;
- (CGFloat) columnContentWidthForColumnWidth: (CGFloat)columnWidth;
#endif
//
// Manipulating Columns
//
- (void) addColumn;
- (int) columnOfMatrix: (NSMatrix *)matrix;
- (NSInteger) columnOfMatrix: (NSMatrix *)matrix;
- (void) displayAllColumns;
- (void) displayColumn: (int)column;
- (int) firstVisibleColumn;
- (void) displayColumn: (NSInteger)column;
- (NSInteger) firstVisibleColumn;
- (BOOL) isLoaded;
- (int) lastColumn;
- (int) lastVisibleColumn;
- (NSInteger) lastColumn;
- (NSInteger) lastVisibleColumn;
- (void) loadColumnZero;
- (int) numberOfVisibleColumns;
- (void) reloadColumn: (int)column;
- (NSInteger) numberOfVisibleColumns;
- (void) reloadColumn: (NSInteger)column;
- (void) selectAll: (id)sender;
- (void) selectRow: (int)row inColumn: (int)column;
- (int) selectedColumn;
- (int) selectedRowInColumn: (int)column;
- (void) setLastColumn: (int)column;
- (void) selectRow: (NSInteger)row inColumn: (NSInteger)column;
- (NSInteger) selectedColumn;
- (NSInteger) selectedRowInColumn: (NSInteger)column;
- (void) setLastColumn: (NSInteger)column;
- (void) validateVisibleColumns;
//
@ -191,25 +192,25 @@ typedef enum _NSBrowserColumnResizingType
//
- (void) drawTitle: (NSString *)title
inRect: (NSRect)aRect
ofColumn: (int)column;
ofColumn: (NSInteger)column;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void) drawTitleOfColumn: (int)column
- (void) drawTitleOfColumn: (NSInteger)column
inRect: (NSRect)aRect;
#endif
- (BOOL) isTitled;
- (void) setTitled: (BOOL)flag;
- (void) setTitle: (NSString *)aString
ofColumn: (int)column;
- (NSRect) titleFrameOfColumn: (int)column;
- (float) titleHeight;
- (NSString *) titleOfColumn: (int)column;
ofColumn: (NSInteger)column;
- (NSRect) titleFrameOfColumn: (NSInteger)column;
- (CGFloat) titleHeight;
- (NSString *) titleOfColumn: (NSInteger)column;
//
// Scrolling an NSBrowser
//
- (void) scrollColumnsLeftBy: (int)shiftAmount;
- (void) scrollColumnsRightBy: (int)shiftAmount;
- (void) scrollColumnToVisible: (int)column;
- (void) scrollColumnsLeftBy: (NSInteger)shiftAmount;
- (void) scrollColumnsRightBy: (NSInteger)shiftAmount;
- (void) scrollColumnToVisible: (NSInteger)column;
- (void) scrollViaScroller: (NSScroller *)sender;
- (void) updateScroller;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
@ -225,25 +226,25 @@ typedef enum _NSBrowserColumnResizingType
//
// Getting Matrices and Cells
//
- (id) loadedCellAtRow: (int)row
column: (int)column;
- (NSMatrix *) matrixInColumn: (int)column;
- (id) loadedCellAtRow: (NSInteger)row
column: (NSInteger)column;
- (NSMatrix *) matrixInColumn: (NSInteger)column;
- (id) selectedCell;
- (id) selectedCellInColumn: (int)column;
- (id) selectedCellInColumn: (NSInteger)column;
- (NSArray *) selectedCells;
//
// Getting Column Frames
//
- (NSRect) frameOfColumn: (int)column;
- (NSRect) frameOfInsideOfColumn: (int)column;
- (NSRect) frameOfColumn: (NSInteger)column;
- (NSRect) frameOfInsideOfColumn: (NSInteger)column;
//
// Manipulating Paths
//
- (NSString *) path;
- (NSString *) pathSeparator;
- (NSString *) pathToColumn: (int)column;
- (NSString *) pathToColumn: (NSInteger)column;
- (BOOL) setPath: (NSString *)path;
- (void) setPathSeparator: (NSString *)aString;
@ -260,8 +261,8 @@ typedef enum _NSBrowserColumnResizingType
- (void) setColumnResizingType:(NSBrowserColumnResizingType) type;
- (BOOL) prefersAllColumnUserResizing;
- (void) setPrefersAllColumnUserResizing: (BOOL)flag;
- (float) widthOfColumn: (int)column;
- (void) setWidth: (float)columnWidth ofColumn: (int)columnIndex;
- (CGFloat) widthOfColumn: (NSInteger)column;
- (void) setWidth: (CGFloat)columnWidth ofColumn: (NSInteger)columnIndex;
//
// Autosave names
@ -287,29 +288,29 @@ typedef enum _NSBrowserColumnResizingType
//
@interface NSObject (NSBrowserDelegate)
- (void) browser: (NSBrowser *)sender createRowsForColumn: (int)column
- (void) browser: (NSBrowser *)sender createRowsForColumn: (NSInteger)column
inMatrix: (NSMatrix *)matrix;
/** Returns YES iff */
- (BOOL) browser: (NSBrowser *)sender isColumnValid: (int)column;
- (int) browser: (NSBrowser *)sender numberOfRowsInColumn: (int)column;
- (BOOL) browser: (NSBrowser *)sender isColumnValid: (NSInteger)column;
- (NSInteger) browser: (NSBrowser *)sender numberOfRowsInColumn: (NSInteger)column;
- (BOOL) browser: (NSBrowser *)sender selectCellWithString: (NSString *)title
inColumn: (int)column;
- (BOOL) browser: (NSBrowser *)sender selectRow: (int)row inColumn: (int)column;
- (NSString *) browser: (NSBrowser *)sender titleOfColumn: (int)column;
inColumn: (NSInteger)column;
- (BOOL) browser: (NSBrowser *)sender selectRow: (NSInteger)row inColumn: (NSInteger)column;
- (NSString *) browser: (NSBrowser *)sender titleOfColumn: (NSInteger)column;
- (void) browser: (NSBrowser *)sender
willDisplayCell: (id)cell
atRow: (int)row
column: (int)column;
atRow: (NSInteger)row
column: (NSInteger)column;
- (void) browserDidScroll: (NSBrowser *)sender;
- (void) browserWillScroll: (NSBrowser *)sender;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (float) browser: (NSBrowser *)browser
shouldSizeColumn: (int)column
forUserResize: (BOOL)flag
toWidth: (float)width;
- (float) browser: (NSBrowser *)browser
sizeToFitWidthOfColumn: (int)column;
- (CGFloat) browser: (NSBrowser *)browser
shouldSizeColumn: (NSInteger)column
forUserResize: (BOOL)flag
toWidth: (CGFloat)width;
- (CGFloat) browser: (NSBrowser *)browser
sizeToFitWidthOfColumn: (NSInteger)column;
- (void) browserColumnConfigurationDidChange: (NSNotification *)notification;
#endif
@end

6
Headers/AppKit/NSCachedImageRep.h
View file

@ -51,9 +51,9 @@
* GNUstep extension
*/
- (id) initWithSize: (NSSize)aSize
pixelsWide: (int)pixelsWide
pixelsHigh: (int)pixelsHigh
depth: (int)aDepth
pixelsWide: (NSInteger)pixelsWide
pixelsHigh: (NSInteger)pixelsHigh
depth: (NSWindowDepth)aDepth
separate: (BOOL)separate
alpha: (BOOL)alpha;

51
Headers/AppKit/NSCell.h
View file

@ -49,11 +49,12 @@
@class NSText;
@class NSFormatter;
typedef enum _NSCellType {
enum _NSCellType {
NSNullCellType,
NSTextCellType,
NSImageCellType
} NSCellType;
};
typedef NSUInteger NSCellType;
enum {
NSAnyType,
@ -66,7 +67,7 @@ enum {
NSDateType
};
typedef enum {
enum {
NSNoImage = 0,
NSImageOnly,
NSImageLeft,
@ -74,9 +75,10 @@ typedef enum {
NSImageBelow,
NSImageAbove,
NSImageOverlaps
} NSCellImagePosition;
};
typedef NSUInteger NSCellImagePosition;
typedef enum _NSCellAttribute {
enum _NSCellAttribute {
NSCellDisabled,
NSCellState,
NSPushInCell,
@ -94,7 +96,8 @@ typedef enum _NSCellAttribute {
NSCellChangesContents,
NSCellIsInsetButton,
NSCellAllowsMixedState
} NSCellAttribute;
};
typedef NSUInteger NSCellAttribute;
enum {
NSNoCellMask = 0,
@ -113,10 +116,11 @@ enum {
* We try to do as in macosx.
*/
enum {
NSMixedState = -1,
NSOffState = 0,
NSOnState = 1,
NSMixedState = -1
NSOnState = 1
};
typedef NSUInteger NSCellStateValue;
/**
* <p>Enumeration of the ways that you can display an image in an
@ -131,7 +135,7 @@ enum {
* <p><code>NSScaleToFit</code>: The image is always resized (up
* or down) to fit exactly in the cell size.</p>
*/
typedef enum {
enum {
NSScaleProportionally = 0,
NSScaleToFit = 1,
NSScaleNone = 2,
@ -139,7 +143,8 @@ typedef enum {
NSImageScaleAxesIndependently = 1,
NSImageScaleNone = 2,
NSImageScaleProportionallyUpOrDown = 3
} NSImageScaling;
};
typedef NSUInteger NSImageScaling;
@interface NSCell : NSObject <NSCopying, NSCoding>
{
@ -188,8 +193,8 @@ typedef enum {
// Set while the cell is edited/selected
unsigned in_editing: 1;
} _cell;
unsigned int _mouse_down_flags;
unsigned int _action_mask;
NSUInteger _mouse_down_flags;
NSUInteger _action_mask;
NSFormatter *_formatter;
NSMenu *_menu;
id _represented_object;
@ -235,9 +240,9 @@ typedef enum {
//
// Setting Parameters
//
- (int)cellAttribute:(NSCellAttribute)aParameter;
- (NSInteger)cellAttribute:(NSCellAttribute)aParameter;
- (void)setCellAttribute:(NSCellAttribute)aParameter
to:(int)value;
to:(NSInteger)value;
//
// Setting the NSCell's Type
@ -312,7 +317,7 @@ typedef enum {
//
- (SEL)action;
- (BOOL)isContinuous;
- (int)sendActionOn:(int)mask;
- (NSInteger)sendActionOn:(NSInteger)mask;
- (void)setAction:(SEL)aSelector;
- (void)setContinuous:(BOOL)flag;
- (void)setTarget:(id)anObject;
@ -337,12 +342,12 @@ typedef enum {
- (void)setFormatter:(NSFormatter *)newFormatter;
- (id)formatter;
#endif
- (int)entryType;
- (NSInteger)entryType;
- (BOOL)isEntryAcceptable:(NSString *)aString;
- (void)setEntryType:(int)aType;
- (void)setEntryType:(NSInteger)aType;
- (void)setFloatingPointFormat:(BOOL)autoRange
left:(unsigned int)leftDigits
right:(unsigned int)rightDigits;
left:(NSUInteger)leftDigits
right:(NSUInteger)rightDigits;
//
// Menu
@ -411,7 +416,7 @@ typedef enum {
- (BOOL)continueTracking:(NSPoint)lastPoint
at:(NSPoint)currentPoint
inView:(NSView *)controlView;
- (int)mouseDownFlags;
- (NSInteger)mouseDownFlags;
- (void)getPeriodicDelay:(float *)delay
interval:(float *)interval;
- (BOOL)startTrackingAt:(NSPoint)startPoint
@ -486,8 +491,8 @@ typedef enum {
inView:(NSView *)controlView
editor:(NSText *)textObject
delegate:(id)anObject
start:(int)selStart
length:(int)selLength;
start:(NSInteger)selStart
length:(NSInteger)selLength;
- (void)endEditing:(NSText *)textObject;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (BOOL)sendsActionOnEndEditing;
@ -511,7 +516,7 @@ typedef enum {
- (void) _drawText: (NSString*)aString inFrame: (NSRect)cellFrame;
- (void) _drawAttributedText: (NSAttributedString*)aString
inFrame: (NSRect)aRect;
- (BOOL) _sendsActionOn:(int)eventTypeMask;
- (BOOL) _sendsActionOn:(NSUInteger)eventTypeMask;
- (NSAttributedString*) _drawAttributedString;
- (void) _drawBorderAndBackgroundWithFrame: (NSRect)cellFrame
inView: (NSView*)controlView;

15
Headers/AppKit/NSClipView.h
View file

@ -79,21 +79,6 @@
- (BOOL)drawsBackground;
#endif
/* Overridden NSView methods */
- (BOOL)acceptsFirstResponder;
- (BOOL)isFlipped;
- (void)rotateByAngle:(float)angle;
- (void)scaleUnitSquareToSize:(NSSize)newUnitSize;
- (void)setBoundsOrigin:(NSPoint)aPoint;
- (void)setBoundsRotation:(float)angle;
- (void)setBoundsSize:(NSSize)aSize;
- (void)setFrameSize:(NSSize)aSize;
- (void)setFrameOrigin:(NSPoint)aPoint;
- (void)setFrameRotation:(float)angle;
- (void)translateOriginToPoint:(NSPoint)aPoint;
- (void)viewBoundsChanged:(NSNotification*)aNotification;
- (void)viewFrameChanged:(NSNotification*)aNotification;
@end
#endif /* _GNUstep_H_NSClipView */

10
Headers/AppKit/NSColor.h
View file

@ -41,18 +41,20 @@
@class NSImage;
@class NSColorSpace;
typedef enum _NSControlTint {
enum _NSControlTint {
NSDefaultControlTint,
NSBlueControlTint,
NSGraphiteControlTint = 6,
NSClearControlTint
} NSControlTint;
};
typedef NSUInteger NSControlTint;
typedef enum _NSControlSize {
enum _NSControlSize {
NSRegularControlSize,
NSSmallControlSize,
NSMiniControlSize
} NSControlSize;
};
typedef NSUInteger NSControlSize;
/*
* NSColor is an abstract super class of the class cluster of the real colour classes.

34
Headers/AppKit/NSComboBox.h
View file

@ -45,11 +45,11 @@
- (NSSize) intercellSpacing;
- (void) setIntercellSpacing: (NSSize)aSize;
- (float) itemHeight;
- (void) setItemHeight: (float)itemHeight;
- (CGFloat) itemHeight;
- (void) setItemHeight: (CGFloat)itemHeight;
- (int) numberOfVisibleItems;
- (void) setNumberOfVisibleItems: (int)visibleItems;
- (NSInteger) numberOfVisibleItems;
- (void) setNumberOfVisibleItems: (NSInteger)visibleItems;
- (void) reloadData;
- (void) noteNumberOfItemsChanged;
@ -57,13 +57,13 @@
- (BOOL) usesDataSource;
- (void) setUsesDataSource: (BOOL)flag;
- (void) scrollItemAtIndexToTop: (int)index;
- (void) scrollItemAtIndexToVisible: (int)index;
- (void) scrollItemAtIndexToTop: (NSInteger)index;
- (void) scrollItemAtIndexToVisible: (NSInteger)index;
- (void) selectItemAtIndex: (int)index;
- (void) deselectItemAtIndex: (int)index;
- (int) indexOfSelectedItem;
- (int) numberOfItems;
- (void) selectItemAtIndex: (NSInteger)index;
- (void) deselectItemAtIndex: (NSInteger)index;
- (NSInteger) indexOfSelectedItem;
- (NSInteger) numberOfItems;
/* These two methods can only be used when usesDataSource is YES */
- (id) dataSource;
@ -72,14 +72,14 @@
/* These methods can only be used when usesDataSource is NO */
- (void) addItemWithObjectValue: (id)object;
- (void) addItemsWithObjectValues: (NSArray *)objects;
- (void) insertItemWithObjectValue: (id)object atIndex:(int)index;
- (void) insertItemWithObjectValue: (id)object atIndex:(NSInteger)index;
- (void) removeItemWithObjectValue: (id)object;
- (void) removeItemAtIndex: (int)index;
- (void) removeItemAtIndex: (NSInteger)index;
- (void) removeAllItems;
- (void) selectItemWithObjectValue: (id)object;
- (id) itemObjectValueAtIndex: (int)index;
- (id) itemObjectValueAtIndex: (NSInteger)index;
- (id) objectValueOfSelectedItem;
- (int) indexOfItemWithObjectValue: (id)object;
- (NSInteger) indexOfItemWithObjectValue: (id)object;
- (NSArray *) objectValues;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
@ -95,9 +95,9 @@
@end
@interface NSObject (NSComboBoxDataSource)
- (int) numberOfItemsInComboBox: (NSComboBox *)aComboBox;
- (id) comboBox: (NSComboBox *)aComboBox objectValueForItemAtIndex:(int)index;
- (unsigned int) comboBox: (NSComboBox *)aComboBox
- (NSInteger) numberOfItemsInComboBox: (NSComboBox *)aComboBox;
- (id) comboBox: (NSComboBox *)aComboBox objectValueForItemAtIndex:(NSInteger)index;
- (NSUInteger) comboBox: (NSComboBox *)aComboBox
indexOfItemWithStringValue: (NSString *)string;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
/* text completion */

34
Headers/AppKit/NSComboBoxCell.h
View file

@ -62,11 +62,11 @@
- (NSSize)intercellSpacing;
- (void)setIntercellSpacing:(NSSize)aSize;
- (float)itemHeight;
- (void)setItemHeight:(float)itemHeight;
- (CGFloat)itemHeight;
- (void)setItemHeight:(CGFloat)itemHeight;
- (int)numberOfVisibleItems;
- (void)setNumberOfVisibleItems:(int)visibleItems;
- (NSInteger)numberOfVisibleItems;
- (void)setNumberOfVisibleItems:(NSInteger)visibleItems;
- (void)reloadData;
- (void)noteNumberOfItemsChanged;
@ -74,13 +74,13 @@
- (BOOL)usesDataSource;
- (void)setUsesDataSource:(BOOL)flag;
- (void)scrollItemAtIndexToTop:(int)index;
- (void)scrollItemAtIndexToVisible:(int)index;
- (void)scrollItemAtIndexToTop:(NSInteger)index;
- (void)scrollItemAtIndexToVisible:(NSInteger)index;
- (void)selectItemAtIndex:(int)index;
- (void)deselectItemAtIndex:(int)index;
- (int)indexOfSelectedItem;
- (int)numberOfItems;
- (void)selectItemAtIndex:(NSInteger)index;
- (void)deselectItemAtIndex:(NSInteger)index;
- (NSInteger)indexOfSelectedItem;
- (NSInteger)numberOfItems;
/* These two methods can only be used when usesDataSource is YES */
- (id)dataSource;
@ -89,14 +89,14 @@
/* These methods can only be used when usesDataSource is NO */
- (void)addItemWithObjectValue:(id)object;
- (void)addItemsWithObjectValues:(NSArray *)objects;
- (void)insertItemWithObjectValue:(id)object atIndex:(int)index;
- (void)insertItemWithObjectValue:(id)object atIndex:(NSInteger)index;
- (void)removeItemWithObjectValue:(id)object;
- (void)removeItemAtIndex:(int)index;
- (void)removeItemAtIndex:(NSInteger)index;
- (void)removeAllItems;
- (void)selectItemWithObjectValue:(id)object;
- (id)itemObjectValueAtIndex:(int)index;
- (id)itemObjectValueAtIndex:(NSInteger)index;
- (id)objectValueOfSelectedItem;
- (int)indexOfItemWithObjectValue:(id)object;
- (NSInteger)indexOfItemWithObjectValue:(id)object;
- (NSArray *)objectValues;
- (BOOL) trackMouse: (NSEvent *)theEvent
@ -118,10 +118,10 @@
@end
@interface NSObject (NSComboBoxCellDataSource)
- (int)numberOfItemsInComboBoxCell:(NSComboBoxCell *)comboBoxCell;
- (NSInteger)numberOfItemsInComboBoxCell:(NSComboBoxCell *)comboBoxCell;
- (id)comboBoxCell:(NSComboBoxCell *)aComboBoxCell
objectValueForItemAtIndex:(int)index;
- (unsigned int)comboBoxCell:(NSComboBoxCell *)aComboBoxCell
objectValueForItemAtIndex:(NSInteger)index;
- (NSUInteger)comboBoxCell:(NSComboBoxCell *)aComboBoxCell
indexOfItemWithStringValue:(NSString *)string;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
/* text completion */

6
Headers/AppKit/NSControl.h
View file

@ -115,8 +115,8 @@
- (void)setAlignment:(NSTextAlignment)mode;
- (void)setFont:(NSFont *)fontObject;
- (void)setFloatingPointFormat:(BOOL)autoRange
left:(unsigned)leftDigits
right:(unsigned)rightDigits;
left:(NSUInteger)leftDigits
right:(NSUInteger)rightDigits;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void)setFormatter:(NSFormatter*)newFormatter;
- (id)formatter;
@ -155,7 +155,7 @@
- (BOOL)isContinuous;
- (BOOL)sendAction:(SEL)theAction
to:(id)theTarget;
- (int)sendActionOn:(int)mask;
- (NSInteger)sendActionOn:(NSInteger)mask;
- (void)setAction:(SEL)aSelector;
- (void)setContinuous:(BOOL)flag;
- (void)setTarget:(id)anObject;

2
Headers/AppKit/NSDataLinkPanel.h
View file

@ -42,7 +42,7 @@
- (void) orderFrontDataLinkPanel: (id)sender;
@end
@interface NSDataLinkPanel : NSPanel <NSCoding>
@interface NSDataLinkPanel : NSPanel
{
// Outlets
id _sourceField;

2
Headers/AppKit/NSDragging.h
View file

@ -50,7 +50,7 @@ enum _NSDragOperation {
NSDragOperationEvery = UINT_MAX
};
typedef unsigned int NSDragOperation;
typedef NSUInteger NSDragOperation;
@protocol NSDraggingInfo

132
Headers/AppKit/NSEvent.h
View file

@ -71,7 +71,7 @@
NSScrollWheel
</example>
*/
typedef enum _NSEventType {
enum _NSEventType {
// Note - order IS significant as ranges of values
// are used for testing for valid event types.
NSLeftMouseDown = 1,
@ -99,7 +99,8 @@ typedef enum _NSEventType {
NSOtherMouseDown = 25,
NSOtherMouseUp,
NSOtherMouseDragged
} NSEventType;
};
typedef NSUInteger NSEventType;
enum {
NSLeftMouseDownMask = (1 << NSLeftMouseDown),
@ -161,8 +162,10 @@ enum {
* Convert an NSEvent Type to it's respective Event Mask
*/
// FIXME: Should we use the inline trick from NSGeometry.h here?
static inline
unsigned int
static inline NSUInteger
NSEventMaskFromType(NSEventType type);
static inline NSUInteger
NSEventMaskFromType(NSEventType type)
{
return (1 << type);
@ -225,21 +228,21 @@ enum
{
NSEventType event_type;
NSPoint location_point;
unsigned int modifier_flags;
NSUInteger modifier_flags;
NSTimeInterval event_time;
int window_num;
NSGraphicsContext *event_context;
NSInteger window_num;
NSGraphicsContext *event_context;
union _MB_event_data
{
struct
{
int event_num;
short click;
short button;
NSInteger event_num;
NSInteger click;
NSInteger button;
float pressure;
float deltaX;
float deltaY;
float deltaZ;
CGFloat deltaX;
CGFloat deltaY;
CGFloat deltaZ;
} mouse;
struct
{
@ -250,34 +253,34 @@ enum
} key;
struct
{
int event_num;
int tracking_num;
NSInteger event_num;
NSInteger tracking_num;
void *user_data;
} tracking;
struct
{
short sub_type;
int data1;
int data2;
NSInteger data1;
NSInteger data2;
} misc;
} event_data;
}
+ (NSEvent*) enterExitEventWithType: (NSEventType)type
location: (NSPoint)location
modifierFlags: (unsigned int)flags
modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum
windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context
eventNumber: (int)eventNum
trackingNumber: (int)trackingNum
eventNumber: (NSInteger)eventNum
trackingNumber: (NSInteger)trackingNum
userData: (void *)userData;
+ (NSEvent*) keyEventWithType: (NSEventType)type
location: (NSPoint)location
modifierFlags: (unsigned int)flags
modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum
windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context
characters: (NSString *)keys
charactersIgnoringModifiers: (NSString *)ukeys
@ -286,41 +289,41 @@ enum
+ (NSEvent*) mouseEventWithType: (NSEventType)type
location: (NSPoint)location
modifierFlags: (unsigned int)flags
modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum
windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context
eventNumber: (int)eventNum
clickCount: (int)clickNum
eventNumber: (NSInteger)eventNum
clickCount: (NSInteger)clickNum
pressure: (float)pressureValue;
#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
+ (NSEvent*) mouseEventWithType: (NSEventType)type
location: (NSPoint)location
modifierFlags: (unsigned int)flags
modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum
windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context
eventNumber: (int)eventNum
clickCount: (int)clickNum
eventNumber: (NSInteger)eventNum
clickCount: (NSInteger)clickNum
pressure: (float)pressureValue
buttonNumber: (int)buttonNum
deltaX: (float)deltaX
deltaY: (float)deltaY
deltaZ: (float)deltaZ;
buttonNumber: (NSInteger)buttonNum
deltaX: (CGFloat)deltaX
deltaY: (CGFloat)deltaY
deltaZ: (CGFloat)deltaZ;
#endif
+ (NSPoint)mouseLocation;
+ (NSEvent*) otherEventWithType: (NSEventType)type
location: (NSPoint)location
modifierFlags: (unsigned int)flags
modifierFlags: (NSUInteger)flags
timestamp: (NSTimeInterval)time
windowNumber: (int)windowNum
windowNumber: (NSInteger)windowNum
context: (NSGraphicsContext*)context
subtype: (short)subType
data1: (int)data1
data2: (int)data2;
data1: (NSInteger)data1
data2: (NSInteger)data2;
+ (void) startPeriodicEventsAfterDelay: (NSTimeInterval)delaySeconds
withPeriod: (NSTimeInterval)periodSeconds;
@ -328,53 +331,53 @@ enum
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (int) buttonNumber;
- (NSInteger) buttonNumber;
#endif
- (NSString *) characters;
- (NSString *) charactersIgnoringModifiers;
- (int) clickCount;
- (NSInteger) clickCount;
- (NSGraphicsContext*) context;
- (int) data1;
- (int) data2;
- (NSInteger) data1;
- (NSInteger) data2;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (float)deltaX;
- (float)deltaY;
- (float)deltaZ;
- (CGFloat)deltaX;
- (CGFloat)deltaY;
- (CGFloat)deltaZ;
#endif
- (int) eventNumber;
- (NSInteger) eventNumber;
- (BOOL) isARepeat;
- (unsigned short) keyCode;
- (NSPoint) locationInWindow;
- (unsigned int) modifierFlags;
- (NSUInteger) modifierFlags;
- (float) pressure;
- (short) subtype;
- (NSTimeInterval) timestamp;
- (int) trackingNumber;
- (NSInteger) trackingNumber;
- (NSEventType) type;
- (void *) userData;
- (NSWindow *) window;
- (int) windowNumber;
- (NSInteger) windowNumber;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (int) absoluteX;
- (int) absoluteY;
- (int) absoluteZ;
- (unsigned int) buttonMask;
- (unsigned int) capabilityMask;
- (unsigned int) deviceID;
- (NSInteger) absoluteX;
- (NSInteger) absoluteY;
- (NSInteger) absoluteZ;
- (NSUInteger) buttonMask;
- (NSUInteger) capabilityMask;
- (NSUInteger) deviceID;
- (BOOL) isEnteringProximity;
- (unsigned int) pointingDeviceID;
- (unsigned int) pointingDeviceSerialNumber;
- (NSUInteger) pointingDeviceID;
- (NSUInteger) pointingDeviceSerialNumber;
- (NSPointingDeviceType) pointingDeviceType;
- (float) rotation;
- (unsigned int) systemTabletID;
- (unsigned int) tabletID;
- (NSUInteger) systemTabletID;
- (NSUInteger) tabletID;
- (float) tangentialPressure;
- (NSPoint) tilt;
- (unsigned long long) uniqueID;
- (id) vendorDefined;
- (unsigned int) vendorID;
- (unsigned int) vendorPointingDeviceType;
- (NSUInteger) vendorID;
- (NSUInteger) vendorPointingDeviceType;
#endif
@end
@ -454,11 +457,6 @@ enum {
NSModeSwitchFunctionKey = 0xF747
};
/*
* Convert an Event Mask Type to a Mask
*/
unsigned int NSEventMaskFromType(NSEventType type);
#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
typedef enum {
GSAppKitWindowMoved = 1,

17
Headers/AppKit/NSFont.h
View file

@ -81,7 +81,7 @@ APPKIT_EXPORT const CGFloat *NSFontIdentityMatrix;
{
NSString *fontName;
CGFloat matrix[6];
BOOL matrixExplicitlySet;
BOOL matrixExplicitlySet; // unused
BOOL screenFont;
id fontInfo;
@ -197,6 +197,10 @@ APPKIT_EXPORT const CGFloat *NSFontIdentityMatrix;
- (CGFloat) xHeight;
- (CGFloat) widthOfString: (NSString*)string;
- (CGFloat) defaultLineHeightForFont;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (CGFloat) leading;
#endif
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (NSUInteger) numberOfGlyphs;
@ -236,6 +240,17 @@ APPKIT_EXPORT const CGFloat *NSFontIdentityMatrix;
- (int) positionsForCompositeSequence: (NSGlyph*)glyphs
numberOfGlyphs: (int)numGlyphs
pointArray: (NSPoint*)points;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (void) getAdvancements: (NSSizeArray)advancements
forGlyphs: (const NSGlyph*)glyphs
count: (NSUInteger)count;
- (void) getAdvancements: (NSSizeArray)advancements
forPackedGlyphs: (const void*)glyphs
count: (NSUInteger)count;
- (void) getBoundingRects: (NSRectArray)bounds
forGlyphs: (const NSGlyph*)glyphs
count: (NSUInteger)count;
#endif
- (NSStringEncoding) mostCompatibleStringEncoding;

4
Headers/AppKit/NSFontPanel.h
View file

@ -64,8 +64,8 @@ enum {
BOOL _preview;
// store currently selected information
NSMutableArray *_familyList;
NSMutableArray *_faceList;
NSArray *_familyList;
NSArray *_faceList;
int _family;
int _face;
NSFontTraitMask _traits;

20
Headers/AppKit/NSForm.h
View file

@ -36,7 +36,7 @@
@class NSFormCell;
@class NSFont;
@interface NSForm : NSMatrix <NSCoding>
@interface NSForm : NSMatrix
{
BOOL _title_width_needs_update;
}
@ -45,22 +45,22 @@
//
- (NSFormCell*)addEntry:(NSString*)title;
- (NSFormCell*)insertEntry:(NSString*)title
atIndex:(int)index;
- (void)removeEntryAtIndex:(int)index;
- (void)setInterlineSpacing:(float)spacing;
atIndex:(NSInteger)index;
- (void)removeEntryAtIndex:(NSInteger)index;
- (void)setInterlineSpacing:(CGFloat)spacing;
//
// Finding Indices
//
- (int)indexOfCellWithTag:(int)aTag;
- (int)indexOfSelectedItem;
- (NSInteger)indexOfCellWithTag:(NSInteger)aTag;
- (NSInteger)indexOfSelectedItem;
//
// Modifying Graphic Attributes
//
- (void)setBezeled:(BOOL)flag;
- (void)setBordered:(BOOL)flag;
- (void)setTextAlignment:(int)aMode;
- (void)setTextAlignment:(NSTextAlignment)aMode;
- (void)setTextFont:(NSFont*)fontObject;
- (void)setTitleAlignment:(NSTextAlignment)aMode;
- (void)setTitleFont:(NSFont*)fontObject;
@ -72,17 +72,17 @@
//
// Getting a Cell
//
- (id)cellAtIndex:(int)index;
- (id)cellAtIndex:(NSInteger)index;
//
// Displaying a Cell
//
- (void)drawCellAtIndex:(int)index;
- (void)drawCellAtIndex:(NSInteger)index;
//
// Editing Text
//
- (void)selectTextAtIndex:(int)index;
- (void)selectTextAtIndex:(NSInteger)index;
//
// Resizing the Form

6
Headers/AppKit/NSFormCell.h
View file

@ -54,12 +54,12 @@
- (void)setTitle:(NSString*)aString;
- (void)setTitleAlignment:(NSTextAlignment)mode;
- (void)setTitleFont:(NSFont*)fontObject;
- (void)setTitleWidth:(float)width;
- (void)setTitleWidth:(CGFloat)width;
- (NSString*)title;
- (NSTextAlignment)titleAlignment;
- (NSFont*)titleFont;
- (float)titleWidth;
- (float)titleWidth:(NSSize)aSize;
- (CGFloat)titleWidth;
- (CGFloat)titleWidth:(NSSize)aSize;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
//

85
Headers/AppKit/NSGraphics.h
View file

@ -80,11 +80,11 @@ APPKIT_EXPORT const NSWindowDepth NSTwentyFourBitRGBDepth;
/*
* Gray Values
*/
APPKIT_EXPORT const float NSBlack;
APPKIT_EXPORT const float NSDarkGray;
APPKIT_EXPORT const float NSWhite;
APPKIT_EXPORT const float NSLightGray;
APPKIT_EXPORT const float NSGray;
APPKIT_EXPORT const CGFloat NSBlack;
APPKIT_EXPORT const CGFloat NSDarkGray;
APPKIT_EXPORT const CGFloat NSWhite;
APPKIT_EXPORT const CGFloat NSLightGray;
APPKIT_EXPORT const CGFloat NSGray;
/*
* Device Dictionary Keys
@ -101,37 +101,39 @@ APPKIT_EXPORT NSString *NSDeviceSize;
*/
APPKIT_EXPORT const NSWindowDepth *NSAvailableWindowDepths(void);
APPKIT_EXPORT NSWindowDepth NSBestDepth(NSString *colorSpace,
int bitsPerSample, int bitsPerPixel,
NSInteger bitsPerSample, NSInteger bitsPerPixel,
BOOL planar, BOOL *exactMatch);
APPKIT_EXPORT int NSBitsPerPixelFromDepth(NSWindowDepth depth);
APPKIT_EXPORT int NSBitsPerSampleFromDepth(NSWindowDepth depth);
APPKIT_EXPORT NSInteger NSBitsPerPixelFromDepth(NSWindowDepth depth);
APPKIT_EXPORT NSInteger NSBitsPerSampleFromDepth(NSWindowDepth depth);
APPKIT_EXPORT NSString *NSColorSpaceFromDepth(NSWindowDepth depth);
APPKIT_EXPORT int NSNumberOfColorComponents(NSString *colorSpaceName);
APPKIT_EXPORT NSInteger NSNumberOfColorComponents(NSString *colorSpaceName);
APPKIT_EXPORT BOOL NSPlanarFromDepth(NSWindowDepth depth);
/*
* Functions for getting information about windows.
*/
APPKIT_EXPORT void NSCountWindows(int *count);
APPKIT_EXPORT void NSWindowList(int size, int list[]);
APPKIT_EXPORT void NSCountWindows(NSInteger *count);
APPKIT_EXPORT void NSWindowList(NSInteger size, NSInteger list[]);
APPKIT_EXPORT void NSEraseRect(NSRect aRect);
APPKIT_EXPORT void NSHighlightRect(NSRect aRect);
APPKIT_EXPORT void NSRectClip(NSRect aRect);
APPKIT_EXPORT void NSRectClipList(const NSRect *rects, int count);
APPKIT_EXPORT void NSRectClipList(const NSRect *rects, NSInteger count);
APPKIT_EXPORT void NSRectFill(NSRect aRect);
APPKIT_EXPORT void NSRectFillList(const NSRect *rects, int count);
APPKIT_EXPORT void NSRectFillList(const NSRect *rects, NSInteger count);
APPKIT_EXPORT void NSRectFillListWithGrays(const NSRect *rects,
const float *grays,int count);
const CGFloat *grays,
NSInteger count);
/** Draws a set of edges of aRect. The sides array should contain
count edges, and grays the corresponding color. Edges are drawn
in the order given in the array, and subsequent edges are drawn
inside previous edges (thus, they will never overlap). */
APPKIT_EXPORT NSRect NSDrawTiledRects(NSRect aRect, const NSRect clipRect,
const NSRectEdge *sides,
const float *grays, int count);
const NSRectEdge *sides,
const CGFloat *grays,
NSInteger count);
APPKIT_EXPORT void NSDrawButton(const NSRect aRect, const NSRect clipRect);
APPKIT_EXPORT void NSDrawGrayBezel(const NSRect aRect, const NSRect clipRect);
@ -161,29 +163,34 @@ APPKIT_EXPORT void NSDottedFrameRect(NSRect aRect);
outside the given rectangle.
</p> */
APPKIT_EXPORT void NSFrameRect(const NSRect aRect);
APPKIT_EXPORT void NSFrameRectWithWidth(const NSRect aRect, float frameWidth);
APPKIT_EXPORT void NSFrameRectWithWidthUsingOperation(const NSRect aRect, float frameWidth,
APPKIT_EXPORT void NSFrameRectWithWidth(const NSRect aRect, CGFloat frameWidth);
APPKIT_EXPORT void NSFrameRectWithWidthUsingOperation(const NSRect aRect, CGFloat frameWidth,
NSCompositingOperation op);
APPKIT_EXPORT NSColor* NSReadPixel(NSPoint location);
APPKIT_EXPORT void NSCopyBitmapFromGState(int srcGstate, NSRect srcRect,
NSRect destRect);
APPKIT_EXPORT void NSCopyBits(int srcGstate, NSRect srcRect,
APPKIT_EXPORT void NSCopyBits(NSInteger srcGstate, NSRect srcRect,
NSPoint destPoint);
APPKIT_EXPORT void NSDrawBitmap(NSRect rect,
int pixelsWide,
int pixelsHigh,
int bitsPerSample,
int samplesPerPixel,
int bitsPerPixel,
int bytesPerRow,
NSInteger pixelsWide,
NSInteger pixelsHigh,
NSInteger bitsPerSample,
NSInteger samplesPerPixel,
NSInteger bitsPerPixel,
NSInteger bytesPerRow,
BOOL isPlanar,
BOOL hasAlpha,
NSString *colorSpaceName,
const unsigned char *const data[5]);
APPKIT_EXPORT void
NSDrawThreePartImage(NSRect aRect, NSImage *start, NSImage *middle,
NSImage *end, BOOL isVertical, NSCompositingOperation op,
CGFloat fraction, BOOL flipped);
APPKIT_EXPORT void
NSDrawNinePartImage(NSRect aRect, NSImage *topLeft, NSImage *topMiddle,
NSImage *topRight, NSImage *centerLeft,
@ -222,7 +229,7 @@ GSWViewIsFlipped(NSGraphicsContext *ctxt)
APPKIT_EXPORT NSArray* GSOrderedWindows(void);
APPKIT_EXPORT NSArray* GSAllWindows(void);
APPKIT_EXPORT NSWindow* GSWindowWithNumber(int num);
APPKIT_EXPORT NSWindow* GSWindowWithNumber(NSInteger num);
#endif
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
@ -232,32 +239,32 @@ APPKIT_EXPORT void NSConvertWindowNumberToGlobal(int winNum, unsigned int *globa
// Rectangle drawing
APPKIT_EXPORT NSRect NSDrawColorTiledRects(NSRect boundsRect, NSRect clipRect,
const NSRectEdge *sides,
NSColor **colors,
int count);
const NSRectEdge *sides,
NSColor **colors,
NSInteger count);
APPKIT_EXPORT void NSDrawDarkBezel(NSRect aRect, NSRect clipRect);
APPKIT_EXPORT void NSDrawLightBezel(NSRect aRect, NSRect clipRect);
APPKIT_EXPORT void NSRectFillListWithColors(const NSRect *rects,
NSColor **colors, int count);
NSColor **colors, NSInteger count);
APPKIT_EXPORT void NSRectFillUsingOperation(NSRect aRect,
NSCompositingOperation op);
APPKIT_EXPORT void NSRectFillListUsingOperation(const NSRect *rects,
int count,
NSCompositingOperation op);
NSInteger count,
NSCompositingOperation op);
APPKIT_EXPORT void NSRectFillListWithColorsUsingOperation(const NSRect *rects,
NSColor **colors,
int num,
NSCompositingOperation op);
NSColor **colors,
NSInteger num,
NSCompositingOperation op);
APPKIT_EXPORT void NSDrawWindowBackground(NSRect aRect);
// Context information
APPKIT_EXPORT void NSCountWindowsForContext(int context, int *count);
APPKIT_EXPORT void NSWindowListForContext(int context, int size, int **list);
APPKIT_EXPORT void NSCountWindowsForContext(NSInteger context, NSInteger *count);
APPKIT_EXPORT void NSWindowListForContext(NSInteger context, NSInteger size, NSInteger **list);
APPKIT_EXPORT int NSGetWindowServerMemory(int context, int *virtualMemory,
int *windowBackingMemory,
NSString **windowDumpStream);
int *windowBackingMemory,
NSString **windowDumpStream);
#endif

142
Headers/AppKit/NSGraphicsContext.h
View file

@ -53,13 +53,14 @@
/*
* Backing Store Types
*/
typedef enum _NSBackingStoreType
enum _NSBackingStoreType
{
NSBackingStoreRetained,
NSBackingStoreNonretained,
NSBackingStoreBuffered
} NSBackingStoreType;
};
typedef NSUInteger NSBackingStoreType;
/** NSCompositingOperation defines how an image is drawn or composited onto another.
* <list>
@ -79,7 +80,7 @@ typedef enum _NSBackingStoreType
* <item> NSCompositePlusLighter</item>
* </list>
*/
typedef enum _NSCompositingOperation
enum _NSCompositingOperation
{
NSCompositeClear,
@ -100,7 +101,8 @@ typedef enum _NSCompositingOperation
#if OS_API_VERSION(GS_API_NONE, GS_API_NONE)
, GSCompositeHighlight = 100
#endif
} NSCompositingOperation;
};
typedef NSUInteger NSCompositingOperation;
typedef int NSWindowDepth;
@ -191,7 +193,7 @@ typedef enum _GSColorSpace
+ (void) restoreGraphicsState;
+ (void) saveGraphicsState;
+ (void) setGraphicsState: (int)graphicsState;
+ (void) setGraphicsState: (NSInteger)graphicsState;
+ (void) setCurrentContext: (NSGraphicsContext*)context;
+ (NSGraphicsContext*) currentContext;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
@ -267,16 +269,16 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void);
/* ----------------------------------------------------------------------- */
/* Color operations */
/* ----------------------------------------------------------------------- */
- (void) DPScurrentalpha: (float*)a;
- (void) DPScurrentcmykcolor: (float*)c : (float*)m : (float*)y : (float*)k;
- (void) DPScurrentgray: (float*)gray;
- (void) DPScurrenthsbcolor: (float*)h : (float*)s : (float*)b;
- (void) DPScurrentrgbcolor: (float*)r : (float*)g : (float*)b;
- (void) DPSsetalpha: (float)a;
- (void) DPSsetcmykcolor: (float)c : (float)m : (float)y : (float)k;
- (void) DPSsetgray: (float)gray;
- (void) DPSsethsbcolor: (float)h : (float)s : (float)b;
- (void) DPSsetrgbcolor: (float)r : (float)g : (float)b;
- (void) DPScurrentalpha: (CGFloat*)a;
- (void) DPScurrentcmykcolor: (CGFloat*)c : (CGFloat*)m : (CGFloat*)y : (CGFloat*)k;
- (void) DPScurrentgray: (CGFloat*)gray;
- (void) DPScurrenthsbcolor: (CGFloat*)h : (CGFloat*)s : (CGFloat*)b;
- (void) DPScurrentrgbcolor: (CGFloat*)r : (CGFloat*)g : (CGFloat*)b;
- (void) DPSsetalpha: (CGFloat)a;
- (void) DPSsetcmykcolor: (CGFloat)c : (CGFloat)m : (CGFloat)y : (CGFloat)k;
- (void) DPSsetgray: (CGFloat)gray;
- (void) DPSsethsbcolor: (CGFloat)h : (CGFloat)s : (CGFloat)b;
- (void) DPSsetrgbcolor: (CGFloat)r : (CGFloat)g : (CGFloat)b;
- (void) GSSetPatterColor: (NSImage*)image;
@ -288,21 +290,21 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void);
/* ----------------------------------------------------------------------- */
/* Text operations */
/* ----------------------------------------------------------------------- */
- (void) DPSashow: (float)x : (float)y : (const char*)s;
- (void) DPSawidthshow: (float)cx : (float)cy : (int)c : (float)ax : (float)ay
: (const char*)s;
- (void) DPSashow: (CGFloat)x : (CGFloat)y : (const char*)s;
- (void) DPSawidthshow: (CGFloat)cx : (CGFloat)cy : (int)c
: (CGFloat)ax : (CGFloat)ay : (const char*)s;
- (void) DPScharpath: (const char*)s : (int)b;
- (void) appendBezierPathWithPackedGlyphs: (const char *)packedGlyphs
path: (NSBezierPath*)aPath;
- (void) DPSshow: (const char*)s;
- (void) DPSwidthshow: (float)x : (float)y : (int)c : (const char*)s;
- (void) DPSxshow: (const char*)s : (const float*)numarray : (int)size;
- (void) DPSxyshow: (const char*)s : (const float*)numarray : (int)size;
- (void) DPSyshow: (const char*)s : (const float*)numarray : (int)size;
- (void) DPSwidthshow: (CGFloat)x : (CGFloat)y : (int)c : (const char*)s;
- (void) DPSxshow: (const char*)s : (const CGFloat*)numarray : (int)size;
- (void) DPSxyshow: (const char*)s : (const CGFloat*)numarray : (int)size;
- (void) DPSyshow: (const char*)s : (const CGFloat*)numarray : (int)size;
- (void) GSSetCharacterSpacing: (float)extra;
- (void) GSSetCharacterSpacing: (CGFloat)extra;
- (void) GSSetFont: (void *)fontref;
- (void) GSSetFontSize: (float)size;
- (void) GSSetFontSize: (CGFloat)size;
- (NSAffineTransform *) GSGetTextCTM;
- (NSPoint) GSGetTextPosition;
- (void) GSSetTextCTM: (NSAffineTransform *)ctm;
@ -318,39 +320,39 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void);
- (void) DPSgrestore;
- (void) DPSgsave;
- (void) DPSinitgraphics;
- (void) DPSsetgstate: (int)gst;
- (void) DPSsetgstate: (NSInteger)gst;
- (int) GSDefineGState;
- (void) GSUndefineGState: (int)gst;
- (void) GSReplaceGState: (int)gst;
- (NSInteger) GSDefineGState;
- (void) GSUndefineGState: (NSInteger)gst;
- (void) GSReplaceGState: (NSInteger)gst;
/* ----------------------------------------------------------------------- */
/* Gstate operations */
/* ----------------------------------------------------------------------- */
- (void) DPScurrentflat: (float*)flatness;
- (void) DPScurrentflat: (CGFloat*)flatness;
- (void) DPScurrentlinecap: (int*)linecap;
- (void) DPScurrentlinejoin: (int*)linejoin;
- (void) DPScurrentlinewidth: (float*)width;
- (void) DPScurrentmiterlimit: (float*)limit;
- (void) DPScurrentpoint: (float*)x : (float*)y;
- (void) DPScurrentlinewidth: (CGFloat*)width;
- (void) DPScurrentmiterlimit: (CGFloat*)limit;
- (void) DPScurrentpoint: (CGFloat*)x : (CGFloat*)y;
- (void) DPScurrentstrokeadjust: (int*)b;
- (void) DPSsetdash: (const float*)pat : (int)size : (float)offset;
- (void) DPSsetflat: (float)flatness;
- (void) DPSsethalftonephase: (float)x : (float)y;
- (void) DPSsetdash: (const CGFloat*)pat : (NSInteger)size : (CGFloat)offset;
- (void) DPSsetflat: (CGFloat)flatness;
- (void) DPSsethalftonephase: (CGFloat)x : (CGFloat)y;
- (void) DPSsetlinecap: (int)linecap;
- (void) DPSsetlinejoin: (int)linejoin;
- (void) DPSsetlinewidth: (float)width;
- (void) DPSsetmiterlimit: (float)limit;
- (void) DPSsetlinewidth: (CGFloat)width;
- (void) DPSsetmiterlimit: (CGFloat)limit;
- (void) DPSsetstrokeadjust: (int)b;
/* ----------------------------------------------------------------------- */
/* Matrix operations */
/* ----------------------------------------------------------------------- */
- (void) DPSconcat: (const float*)m;
- (void) DPSconcat: (const CGFloat*)m;
- (void) DPSinitmatrix;
- (void) DPSrotate: (float)angle;
- (void) DPSscale: (float)x : (float)y;
- (void) DPStranslate: (float)x : (float)y;
- (void) DPSrotate: (CGFloat)angle;
- (void) DPSscale: (CGFloat)x : (CGFloat)y;
- (void) DPStranslate: (CGFloat)x : (CGFloat)y;
- (NSAffineTransform *) GSCurrentCTM;
- (void) GSSetCTM: (NSAffineTransform *)ctm;
@ -359,32 +361,32 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void);
/* ----------------------------------------------------------------------- */
/* Paint operations */
/* ----------------------------------------------------------------------- */
- (void) DPSarc: (float)x : (float)y : (float)r : (float)angle1
: (float)angle2;
- (void) DPSarcn: (float)x : (float)y : (float)r : (float)angle1
: (float)angle2;
- (void) DPSarct: (float)x1 : (float)y1 : (float)x2 : (float)y2 : (float)r;
- (void) DPSarc: (CGFloat)x : (CGFloat)y : (CGFloat)r : (CGFloat)angle1
: (CGFloat)angle2;
- (void) DPSarcn: (CGFloat)x : (CGFloat)y : (CGFloat)r : (CGFloat)angle1
: (CGFloat)angle2;
- (void) DPSarct: (CGFloat)x1 : (CGFloat)y1 : (CGFloat)x2 : (CGFloat)y2 : (CGFloat)r;
- (void) DPSclip;
- (void) DPSclosepath;
- (void) DPScurveto: (float)x1 : (float)y1 : (float)x2 : (float)y2
: (float)x3 : (float)y3;
- (void) DPScurveto: (CGFloat)x1 : (CGFloat)y1 : (CGFloat)x2 : (CGFloat)y2
: (CGFloat)x3 : (CGFloat)y3;
- (void) DPSeoclip;
- (void) DPSeofill;
- (void) DPSfill;
- (void) DPSflattenpath;
- (void) DPSinitclip;
- (void) DPSlineto: (float)x : (float)y;
- (void) DPSmoveto: (float)x : (float)y;
- (void) DPSlineto: (CGFloat)x : (CGFloat)y;
- (void) DPSmoveto: (CGFloat)x : (CGFloat)y;
- (void) DPSnewpath;
- (void) DPSpathbbox: (float*)llx : (float*)lly : (float*)urx : (float*)ury;
- (void) DPSrcurveto: (float)x1 : (float)y1 : (float)x2 : (float)y2
: (float)x3 : (float)y3;
- (void) DPSrectclip: (float)x : (float)y : (float)w : (float)h;
- (void) DPSrectfill: (float)x : (float)y : (float)w : (float)h;
- (void) DPSrectstroke: (float)x : (float)y : (float)w : (float)h;
- (void) DPSpathbbox: (CGFloat*)llx : (CGFloat*)lly : (CGFloat*)urx : (CGFloat*)ury;
- (void) DPSrcurveto: (CGFloat)x1 : (CGFloat)y1 : (CGFloat)x2 : (CGFloat)y2
: (CGFloat)x3 : (CGFloat)y3;
- (void) DPSrectclip: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h;
- (void) DPSrectfill: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h;
- (void) DPSrectstroke: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h;
- (void) DPSreversepath;
- (void) DPSrlineto: (float)x : (float)y;
- (void) DPSrmoveto: (float)x : (float)y;
- (void) DPSrlineto: (CGFloat)x : (CGFloat)y;
- (void) DPSrmoveto: (CGFloat)x : (CGFloat)y;
- (void) DPSstroke;
- (void) DPSshfill: (NSDictionary *)shaderDictionary;
@ -403,23 +405,23 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext(void);
/*-------------------------------------------------------------------------*/
/* Graphics Extensions Ops */
/*-------------------------------------------------------------------------*/
- (void) DPScomposite: (float)x : (float)y : (float)w : (float)h
: (int)gstateNum : (float)dx : (float)dy : (int)op;
- (void) DPScompositerect: (float)x : (float)y : (float)w : (float)h : (int)op;
- (void) DPSdissolve: (float)x : (float)y : (float)w : (float)h
: (int)gstateNum : (float)dx : (float)dy : (float)delta;
- (void) DPScomposite: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h
: (NSInteger)gstateNum : (CGFloat)dx : (CGFloat)dy : (NSCompositingOperation)op;
- (void) DPScompositerect: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h : (NSCompositingOperation)op;
- (void) DPSdissolve: (CGFloat)x : (CGFloat)y : (CGFloat)w : (CGFloat)h
: (NSInteger)gstateNum : (CGFloat)dx : (CGFloat)dy : (CGFloat)delta;
- (void) GScomposite: (int)gstateNum
- (void) GScomposite: (NSInteger)gstateNum
toPoint: (NSPoint)aPoint
fromRect: (NSRect)srcRect
operation: (NSCompositingOperation)op
fraction: (float)delta;
fraction: (CGFloat)delta;
- (BOOL) supportsDrawGState;
- (void) GSdraw: (int)gstateNum
- (void) GSdraw: (NSInteger)gstateNum
toPoint: (NSPoint)aPoint
fromRect: (NSRect)srcRect
operation: (NSCompositingOperation)op
fraction: (float)delta;
fraction: (CGFloat)delta;
- (void) GSDrawImage: (NSRect)rect : (void *)imageref;
/* ----------------------------------------------------------------------- */
@ -471,9 +473,9 @@ transform between current user space and image space for this image.</desc>
- (NSDictionary *) GSReadRect: (NSRect)rect;
/* Soon to be obsolete */
- (void) NSDrawBitmap: (NSRect) rect : (int) pixelsWide : (int) pixelsHigh
: (int) bitsPerSample : (int) samplesPerPixel
: (int) bitsPerPixel : (int) bytesPerRow : (BOOL) isPlanar
- (void) NSDrawBitmap: (NSRect) rect : (NSInteger) pixelsWide : (NSInteger) pixelsHigh
: (NSInteger) bitsPerSample : (NSInteger) samplesPerPixel
: (NSInteger) bitsPerPixel : (NSInteger) bytesPerRow : (BOOL) isPlanar
: (BOOL) hasAlpha : (NSString *) colorSpaceName
: (const unsigned char *const [5]) data;

2
Headers/AppKit/NSHelpPanel.h
View file

@ -42,7 +42,7 @@
- (void) orderFrontHelpPanel: (id)sender;
@end
@interface NSHelpPanel : NSPanel <NSCoding>
@interface NSHelpPanel : NSPanel
{
// Attributes
}

14
Headers/AppKit/NSImage.h
View file

@ -240,19 +240,19 @@ typedef enum {
fromRect: (NSRect)aRect
operation: (NSCompositingOperation)op;
- (void) dissolveToPoint: (NSPoint)aPoint
fraction: (float)aFloat;
fraction: (CGFloat)aFloat;
- (void) dissolveToPoint: (NSPoint)aPoint
fromRect: (NSRect)aRect
fraction: (float)aFloat;
fraction: (CGFloat)aFloat;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void) compositeToPoint: (NSPoint)aPoint
fromRect: (NSRect)srcRect
operation: (NSCompositingOperation)op
fraction: (float)delta;
fraction: (CGFloat)delta;
- (void) compositeToPoint: (NSPoint)aPoint
operation: (NSCompositingOperation)op
fraction: (float)delta;
fraction: (CGFloat)delta;
#endif
//
@ -332,7 +332,7 @@ typedef enum {
- (void) drawAtPoint: (NSPoint)point
fromRect: (NSRect)srcRect
operation: (NSCompositingOperation)op
fraction: (float)delta;
fraction: (CGFloat)delta;
/** <p>Takes the part of the receiver given by <code>srcRect</code> and
* draws it in <code>dstRect</code> in the current coordinate system,
@ -350,7 +350,7 @@ typedef enum {
- (void) drawInRect: (NSRect)dstRect
fromRect: (NSRect)srcRect
operation: (NSCompositingOperation)op
fraction: (float)delta;
fraction: (CGFloat)delta;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
@ -358,7 +358,7 @@ typedef enum {
- (void) drawInRect: (NSRect)dstRect
fromRect: (NSRect)srcRect
operation: (NSCompositingOperation)op
fraction: (float)delta
fraction: (CGFloat)delta
respectFlipped: (BOOL)respectFlipped
hints: (NSDictionary*)hints;

20
Headers/AppKit/NSImageRep.h
View file

@ -53,9 +53,9 @@ enum {
NSSize _size;
BOOL _hasAlpha;
BOOL _isOpaque;
int _bitsPerSample;
int _pixelsWide;
int _pixelsHigh;
NSInteger _bitsPerSample;
NSInteger _pixelsWide;
NSInteger _pixelsHigh;
}
//
@ -122,12 +122,12 @@ enum {
* <item>-setBitsPerSample:</item>
* </list>
*/
- (int)bitsPerSample;
- (NSInteger)bitsPerSample;
- (NSString *)colorSpaceName;
- (BOOL)hasAlpha;
- (BOOL)isOpaque;
- (int)pixelsHigh;
- (int)pixelsWide;
- (NSInteger)pixelsHigh;
- (NSInteger)pixelsWide;
- (void)setAlpha:(BOOL)flag;
/** Sets the number of bits for each component of a pixel.
@ -136,11 +136,11 @@ enum {
* <item>-bitsPerSample</item>
* </list>
*/
- (void)setBitsPerSample:(int)anInt;
- (void)setBitsPerSample:(NSInteger)anInt;
- (void)setColorSpaceName:(NSString *)aString;
- (void)setOpaque:(BOOL)flag;
- (void)setPixelsHigh:(int)anInt;
- (void)setPixelsWide:(int)anInt;
- (void)setPixelsHigh:(NSInteger)anInt;
- (void)setPixelsWide:(NSInteger)anInt;
//
// Drawing the Image
@ -160,7 +160,7 @@ enum {
- (BOOL) drawInRect: (NSRect)dstRect
fromRect: (NSRect)srcRect
operation: (NSCompositingOperation)op
fraction: (float)delta
fraction: (CGFloat)delta
respectFlipped: (BOOL)respectFlipped
hints: (NSDictionary*)hints;
#endif

6
Headers/AppKit/NSInputManager.h
View file

@ -40,7 +40,7 @@
@class NSImage;
@protocol NSTextInput
- (void) setMarkedText: (id)aString selectedRange: (NSRange)selRange;
- (void) setMarkedText: (id)aString selectedRange: (NSRange)selRange;
- (BOOL) hasMarkedText;
- (NSRange) markedRange;
- (NSRange) selectedRange;
@ -49,8 +49,8 @@
- (NSAttributedString *) attributedSubstringFromRange: (NSRange)theRange;
- (unsigned int) characterIndexForPoint: (NSPoint)thePoint;
- (long) conversationIdentifier;
- (NSUInteger) characterIndexForPoint: (NSPoint)thePoint;
- (NSInteger) conversationIdentifier;
- (void) doCommandBySelector: (SEL)aSelector;
- (NSRect) firstRectForCharacterRange: (NSRange)theRange;
- (void) insertText: (id)aString;

22
Headers/AppKit/NSLayoutManager.h
View file

@ -122,9 +122,9 @@ typedef enum {
- (unsigned int) glyphIndexForPoint: (NSPoint)aPoint
inTextContainer: (NSTextContainer *)aTextContainer;
- (unsigned int) glyphIndexForPoint: (NSPoint)point
- (NSUInteger) glyphIndexForPoint: (NSPoint)point
inTextContainer: (NSTextContainer *)container
fractionOfDistanceThroughGlyph: (float *)partialFraction;
fractionOfDistanceThroughGlyph: (CGFloat *)partialFraction;
/*
@ -171,6 +171,24 @@ GNUstep extension.
originalCharacterIndex: (unsigned int)original
distance: (float)distance;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
- (void) ensureGlyphsForGlyphRange: (NSRange)glyphRange;
- (void) ensureGlyphsForCharacterRange: (NSRange)charRange;
- (void) ensureLayoutForGlyphRange: (NSRange)glyphRange;
- (void) ensureLayoutForCharacterRange: (NSRange)charRange;
- (void) ensureLayoutForTextContainer: (NSTextContainer*)container;
- (void) ensureLayoutForBoundingRect: (NSRect)bounds
inTextContainer: (NSTextContainer*)container;
- (void) invalidateLayoutForCharacterRange: (NSRange)charRange
actualCharacterRange: (NSRangePointer)actualCharRange;
- (void) invalidateGlyphsOnLayoutInvalidationForGlyphRange: (NSRange)glyphRange;
- (BOOL) allowsNonContiguousLayout;
- (void) setAllowsNonContiguousLayout: (BOOL)flag;
- (BOOL) hasNonContiguousLayout;
#endif
@end

104
Headers/AppKit/NSMatrix.h
View file

@ -99,15 +99,15 @@ typedef enum _NSMatrixMode {
*/
- (id) initWithFrame: (NSRect)frameRect;
- (id) initWithFrame: (NSRect)frameRect
mode: (int)aMode
mode: (NSMatrixMode)aMode
cellClass: (Class)classId
numberOfRows: (int)rowsHigh
numberOfColumns: (int)colsWide;
numberOfRows: (NSInteger)rowsHigh
numberOfColumns: (NSInteger)colsWide;
- (id) initWithFrame: (NSRect)frameRect
mode: (int)aMode
mode: (NSMatrixMode)aMode
prototype: (NSCell *)aCell
numberOfRows: (int)rowsHigh
numberOfColumns: (int)colsWide;
numberOfRows: (NSInteger)rowsHigh
numberOfColumns: (NSInteger)colsWide;
/*
* Setting the Selection Mode
@ -138,49 +138,49 @@ typedef enum _NSMatrixMode {
- (void) addColumnWithCells: (NSArray *)cellArray;
- (void) addRow;
- (void) addRowWithCells: (NSArray *)cellArray;
- (NSRect) cellFrameAtRow: (int)row
column: (int)column;
- (NSRect) cellFrameAtRow: (NSInteger)row
column: (NSInteger)column;
- (NSSize) cellSize;
- (void) getNumberOfRows: (int *)rowCount
columns: (int *)columnCount;
- (void) insertColumn: (int)column;
- (void) insertColumn: (int)column withCells: (NSArray *)cellArray;
- (void) insertRow: (int)row;
- (void) insertRow: (int)row withCells: (NSArray *)cellArray;
- (void) getNumberOfRows: (NSInteger *)rowCount
columns: (NSInteger *)columnCount;
- (void) insertColumn: (NSInteger)column;
- (void) insertColumn: (NSInteger)column withCells: (NSArray *)cellArray;
- (void) insertRow: (NSInteger)row;
- (void) insertRow: (NSInteger)row withCells: (NSArray *)cellArray;
- (NSSize) intercellSpacing;
- (NSCell *) makeCellAtRow: (int)row
column: (int)column;
- (NSCell *) makeCellAtRow: (NSInteger)row
column: (NSInteger)column;
- (void) putCell: (NSCell *)newCell
atRow: (int)row
column: (int)column;
- (void) removeColumn: (int)column;
- (void) removeRow: (int)row;
- (void) renewRows: (int)newRows
columns: (int)newColumns;
atRow: (NSInteger)row
column: (NSInteger)column;
- (void) removeColumn: (NSInteger)column;
- (void) removeRow: (NSInteger)row;
- (void) renewRows: (NSInteger)newRows
columns: (NSInteger)newColumns;
- (void) setCellSize: (NSSize)aSize;
- (void) setIntercellSpacing: (NSSize)aSize;
- (void) sortUsingFunction: (int (*)(id element1, id element2, void *userData))comparator
- (void) sortUsingFunction: (NSComparisonResult (*)(id element1, id element2, void *userData))comparator
context: (void *)context;
- (void) sortUsingSelector: (SEL)comparator;
- (int) numberOfColumns;
- (int) numberOfRows;
- (NSInteger) numberOfColumns;
- (NSInteger) numberOfRows;
/*
* Finding Matrix Coordinates
*/
- (BOOL) getRow: (int *)row
column: (int *)column
- (BOOL) getRow: (NSInteger *)row
column: (NSInteger *)column
forPoint: (NSPoint)aPoint;
- (BOOL) getRow: (int *)row
column: (int *)column
- (BOOL) getRow: (NSInteger *)row
column: (NSInteger *)column
ofCell: (NSCell *)aCell;
/*
* Modifying Individual Cells
*/
- (void) setState: (int)value
atRow: (int)row
column: (int)column;
- (void) setState: (NSInteger)value
atRow: (NSInteger)row
column: (NSInteger)column;
/*
* Selecting Cells
@ -188,24 +188,24 @@ typedef enum _NSMatrixMode {
- (void) deselectAllCells;
- (void) deselectSelectedCell;
- (void) selectAll: (id)sender;
- (void) selectCellAtRow: (int)row
column: (int)column;
- (BOOL) selectCellWithTag: (int)anInt;
- (void) selectCellAtRow: (NSInteger)row
column: (NSInteger)column;
- (BOOL) selectCellWithTag: (NSInteger)anInt;
- (id) selectedCell;
- (NSArray *) selectedCells;
- (int) selectedColumn;
- (int) selectedRow;
- (void) setSelectionFrom: (int)startPos
to: (int)endPos
anchor: (int)anchorPos
- (NSInteger) selectedColumn;
- (NSInteger) selectedRow;
- (void) setSelectionFrom: (NSInteger)startPos
to: (NSInteger)endPos
anchor: (NSInteger)anchorPos
highlight: (BOOL)flag;
/*
* Finding Cells
*/
- (id) cellAtRow: (int)row
column: (int)column;
- (id) cellWithTag: (int)anInt;
- (id) cellAtRow: (NSInteger)row
column: (NSInteger)column;
- (id) cellWithTag: (NSInteger)anInt;
- (NSArray *) cells;
/*
@ -224,8 +224,8 @@ typedef enum _NSMatrixMode {
* Editing Text in Cells
*/
- (void) selectText: (id)sender;
- (id) selectTextAtRow: (int)row
column: (int)column;
- (id) selectTextAtRow: (NSInteger)row
column: (NSInteger)column;
- (void) textDidBeginEditing: (NSNotification *)aNotification;
- (void) textDidChange: (NSNotification *)aNotification;
- (void) textDidEndEditing: (NSNotification *)aNotification;
@ -262,19 +262,19 @@ typedef enum _NSMatrixMode {
* Scrolling
*/
- (BOOL) isAutoscroll;
- (void) scrollCellToVisibleAtRow: (int)row
column: (int)column;
- (void) scrollCellToVisibleAtRow: (NSInteger)row
column: (NSInteger)column;
- (void) setAutoscroll: (BOOL)flag;
- (void) setScrollable: (BOOL)flag;
/*
* Displaying
*/
- (void) drawCellAtRow: (int)row
column: (int)column;
- (void) drawCellAtRow: (NSInteger)row
column: (NSInteger)column;
- (void) highlightCell: (BOOL)flag
atRow: (int)row
column: (int)column;
atRow: (NSInteger)row
column: (NSInteger)column;
/*
*Target and Action
@ -296,7 +296,7 @@ typedef enum _NSMatrixMode {
*/
- (BOOL) acceptsFirstMouse: (NSEvent *)theEvent;
- (void) mouseDown: (NSEvent *)theEvent;
- (int) mouseDownFlags;
- (NSInteger) mouseDownFlags;
- (BOOL) performKeyEquivalent: (NSEvent *)theEvent;
/*

36
Headers/AppKit/NSMenu.h
View file

@ -65,12 +65,12 @@
* version and the transient version are on the screen.
* A value of -1 means that no item will be highlighted.
*/
- (void) setHighlightedItemIndex: (int)index;
- (void) setHighlightedItemIndex: (NSInteger)index;
/** Returns the currently highlighted item. Returns -1
* if no item is highlighted.
*/
- (int) highlightedItemIndex;
- (NSInteger) highlightedItemIndex;
/** This should ensure that if there is an attached
* submenu this submenu will be detached.
@ -122,7 +122,7 @@
*/
- (NSPoint) locationForSubmenu: (NSMenu *)aSubmenu;
- (void) performActionWithHighlightingForItemAtIndex: (int)index; //????
- (void) performActionWithHighlightingForItemAtIndex: (NSInteger)index; //????
/** <p>This is method is responsible for handling all events while
* the user is interacting with this menu. It should pass on this
@ -434,29 +434,29 @@
/** Returns the index of item anObject.
*/
- (int) indexOfItem: (id <NSMenuItem>)anObject;
- (NSInteger) indexOfItem: (id <NSMenuItem>)anObject;
/** Returns the index of an item with the tag aTag.
*/
- (int) indexOfItemWithTag: (int)aTag;
- (NSInteger) indexOfItemWithTag: (NSInteger)aTag;
/** Returns the index of an item with the target anObject
* and the actionSelector.
*/
- (int) indexOfItemWithTarget: (id)anObject
- (NSInteger) indexOfItemWithTarget: (id)anObject
andAction: (SEL)actionSelector;
/** Returns the index of an item with the represented object anObject.
*/
- (int) indexOfItemWithRepresentedObject: (id)anObject;
- (NSInteger) indexOfItemWithRepresentedObject: (id)anObject;
/** Returns the index of an item with the submenu anObject.
*/
- (int) indexOfItemWithSubmenu: (NSMenu *)anObject;
- (NSInteger) indexOfItemWithSubmenu: (NSMenu *)anObject;
/** Returns the index of an item with the title aTitle.
*/
- (int) indexOfItemWithTitle: (NSString *)aTitle;
- (NSInteger) indexOfItemWithTitle: (NSString *)aTitle;
/** <init/>
*/
@ -465,7 +465,7 @@
/** Insert newItem at position index.
*/
- (void) insertItem: (id <NSMenuItem>)newItem
atIndex: (int)index;
atIndex: (NSInteger)index;
/** Inserts a new menu item at position index.
* <p>See Also:
@ -477,7 +477,7 @@
- (id <NSMenuItem>) insertItemWithTitle: (NSString *)aString
action: (SEL)aSelector
keyEquivalent: (NSString *)charCode
atIndex: (unsigned int)index;
atIndex: (NSInteger)index;
/** Returns if this menu is attached to its supermenu,
* return nil if it does not have a parent menu.
@ -500,7 +500,7 @@
/** Returns an item located at index.
*/
- (id <NSMenuItem>) itemAtIndex: (int)index;
- (id <NSMenuItem>) itemAtIndex: (NSInteger)index;
/** Informs the menu that the specified item has changed.
*/
@ -514,7 +514,7 @@
* <item>[(NSMenuItem)-tag]</item>
* </list>
*/
- (id <NSMenuItem>) itemWithTag: (int)aTag;
- (id <NSMenuItem>) itemWithTag: (NSInteger)aTag;
/** Returns an item with aString as its title.
*/
@ -543,7 +543,7 @@
/** Returns the numbers of items on the menu
*/
- (int) numberOfItems;
- (NSInteger) numberOfItems;
/** Simulates a mouse click on item located at index.
* <p>See Also:
@ -553,7 +553,7 @@
* <item>-indexOfItemWithTitle:</item>
* </list>
*/
- (void) performActionForItemAtIndex: (int)index;
- (void) performActionForItemAtIndex: (NSInteger)index;
/** Looks for a menu item that responds to theEvent on the receiver. If
* the receiver is a submenu, the method is performed on it.
@ -566,7 +566,7 @@
/** Removes item at position index.
*/
- (void) removeItemAtIndex: (int)index;
- (void) removeItemAtIndex: (NSInteger)index;
/** Sets if a menu does autoenable.
*/
@ -668,10 +668,10 @@
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
@interface NSObject (NSMenuDelegate)
- (void) menuNeedsUpdate: (NSMenu *)menu;
- (int) numberOfItemsInMenu: (NSMenu *)menu;
- (NSInteger) numberOfItemsInMenu: (NSMenu *)menu;
- (BOOL) menu: (NSMenu *)menu
updateItem: (NSMenuItem *)item
atIndex: (int)index
atIndex: (NSInteger)index
shouldCancel: (BOOL)shouldCancel;
- (BOOL) menuHasKeyEquivalent: (NSMenu *)menu
forEvent: (NSEvent *)event

4
Headers/AppKit/NSMenuItem.h
View file

@ -107,7 +107,7 @@
Returns the indentation level, a number between 0 and 15.
</p>
*/
- (int)indentationLevel;
- (NSInteger)indentationLevel;
#endif
/**
@ -219,7 +219,7 @@
- (void) setImage: (NSImage*)menuImage;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (void)setIndentationLevel: (int)level;
- (void)setIndentationLevel: (NSInteger)level;
#endif
/**

18
Headers/AppKit/NSMenuItemCell.h
View file

@ -50,11 +50,11 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*);
BOOL _needs_display;
char _pad[1];
float _imageWidth;
float _titleWidth;
float _keyEquivalentWidth;
float _stateImageWidth;
float _menuItemHeight;
CGFloat _imageWidth;
CGFloat _titleWidth;
CGFloat _keyEquivalentWidth;
CGFloat _stateImageWidth;
CGFloat _menuItemHeight;
NSImage *_imageToDisplay;
NSString *_titleToDisplay;
@ -76,10 +76,10 @@ typedef void (*DrawingIMP)(id, SEL, NSRect, NSView*);
- (void)setNeedsDisplay:(BOOL)flag;
- (BOOL)needsDisplay;
- (float)imageWidth;
- (float)titleWidth;
- (float)keyEquivalentWidth;
- (float)stateImageWidth;
- (CGFloat)imageWidth;
- (CGFloat)titleWidth;
- (CGFloat)keyEquivalentWidth;
- (CGFloat)stateImageWidth;
- (NSRect)imageRectForBounds:(NSRect)cellFrame;
- (NSRect)keyEquivalentRectForBounds:(NSRect)cellFrame;

20
Headers/AppKit/NSMenuView.h
View file

@ -164,24 +164,24 @@
/**
Highlights item with at index. If index is -1 all highlighing is removed.
*/
- (void) setHighlightedItemIndex: (int)index;
- (void) setHighlightedItemIndex: (NSInteger)index;
/**
Returns the index of the highlighted item. Returns -1 if there is no
highlighted item.
*/
- (int) highlightedItemIndex;
- (NSInteger) highlightedItemIndex;
/**
Replaces item cell at index with cell. Highlighting of item is preserved.
*/
- (void) setMenuItemCell: (NSMenuItemCell *)cell
forItemAtIndex: (int)index;
forItemAtIndex: (NSInteger)index;
/**
Returns cell associated with item at index.
*/
- (NSMenuItemCell *) menuItemCellForItemAtIndex: (int)index;
- (NSMenuItemCell *) menuItemCellForItemAtIndex: (NSInteger)index;
/**
Returns menu view associated with visible attached submenu.
@ -261,7 +261,7 @@
Attach submenu if the item at index is a submenu. It will figure out
if the new submenu should be transient or not.
*/
- (void) attachSubmenuForItemAtIndex: (int)index;
- (void) attachSubmenuForItemAtIndex: (NSInteger)index;
/***********************************************************************
* Calculating menu geometry
@ -333,18 +333,18 @@
Returns frame rectangle of menu item cell. It is smaller by 1 pixel
in width than menu window (dark gray border).
*/
- (NSRect) rectOfItemAtIndex: (int)index;
- (NSRect) rectOfItemAtIndex: (NSInteger)index;
/**
Returns the index of the item below point. Returns -1 if mouse is
not above a menu item.
*/
- (int) indexOfItemAtPoint: (NSPoint)point;
- (NSInteger) indexOfItemAtPoint: (NSPoint)point;
/**
Calls setNeedsDisplayInRect: for rectangle occupied by item at index.
*/
- (void) setNeedsDisplayForItemAtIndex: (int)index;
- (void) setNeedsDisplayForItemAtIndex: (NSInteger)index;
/**
Returns the correct frame origin for aSubmenu based on the location
@ -363,12 +363,12 @@
- (void) setWindowFrameForAttachingToRect: (NSRect)screenRect
onScreen: (NSScreen *)screen
preferredEdge: (NSRectEdge)edge
popUpSelectedItem: (int)selectedItemIndex;
popUpSelectedItem: (NSInteger)selectedItemIndex;
/***********************************************************************
* Event handling
***********************************************************************/
- (void) performActionWithHighlightingForItemAtIndex: (int)index;
- (void) performActionWithHighlightingForItemAtIndex: (NSInteger)index;
/**
This method is responsible for tracking the mouse while this menu

4
Headers/AppKit/NSOpenGL.h
View file

@ -86,10 +86,10 @@ typedef enum {
NSOpenGLGOResetLibrary = 504
} NSOpenGLGlobalOption;
@interface NSOpenGLPixelFormat : NSObject
@interface NSOpenGLPixelFormat : NSObject <NSCoding>
{
}
- (void)getValues:(long *)vals
- (void)getValues:(int *)vals
forAttribute:(NSOpenGLPixelFormatAttribute)attrib
forVirtualScreen:(int)screen;
- (id)initWithAttributes:(NSOpenGLPixelFormatAttribute *)attribs;

6
Headers/AppKit/NSOpenPanel.h
View file

@ -7,9 +7,9 @@
Author: Scott Christley <scottc@net-community.com>
Date: 1996
Author: Daniel Bðhringer <boehring@biomed.ruhr-uni-bochum.de>
Author: Daniel Böhringer <boehring@biomed.ruhr-uni-bochum.de>
Date: August 1998
Source by Daniel Bðhringer integrated into Scott Christley's preliminary
Source by Daniel Böhringer integrated into Scott Christley's preliminary
implementation by Felipe A. Rodriguez <far@ix.netcom.com>
Author: Nicola Pero <n.pero@mi.flashnet.it>
@ -43,7 +43,7 @@
@class NSString;
@class NSArray;
@interface NSOpenPanel : NSSavePanel <NSCoding>
@interface NSOpenPanel : NSSavePanel
{
BOOL _canChooseDirectories;
BOOL _canChooseFiles;

8
Headers/AppKit/NSOutlineView.h
View file

@ -96,13 +96,13 @@
- (BOOL) outlineView: (NSOutlineView *)outlineView
acceptDrop: (id <NSDraggingInfo>)info
item: (id)item
childIndex: (int)index;
childIndex: (NSInteger)index;
/**
* Implementation of this method is required. Returns the child at
* the specified index for the given item.
*/
- (id) outlineView: (NSOutlineView *)outlineView
child: (int)index
child: (NSInteger)index
ofItem: (id)item;
/**
* This is a required method. Returns whether or not the outline view
@ -121,7 +121,7 @@
* This is a required method. Returns the number of children of
* the given item.
*/
- (int) outlineView: (NSOutlineView *)outlineView
- (NSInteger) outlineView: (NSOutlineView *)outlineView
numberOfChildrenOfItem: (id)item;
/**
@ -154,7 +154,7 @@
- (NSDragOperation) outlineView: (NSOutlineView*)outlineView
validateDrop: (id <NSDraggingInfo>)info
proposedItem: (id)item
proposedChildIndex: (int)index;
proposedChildIndex: (NSInteger)index;
/**
* Causes the outline view to write the specified items to the pastboard.

4
Headers/AppKit/NSPageLayout.h
View file

@ -78,8 +78,8 @@ enum {
//
// Running the Panel
//
- (int)runModal;
- (int)runModalWithPrintInfo:(NSPrintInfo *)printInfo;
- (NSInteger)runModal;
- (NSInteger)runModalWithPrintInfo:(NSPrintInfo *)printInfo;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void)beginSheetWithPrintInfo:(NSPrintInfo *)printInfo
modalForWindow:(NSWindow *)docWindow

52
Headers/AppKit/NSPanel.h
View file

@ -116,33 +116,33 @@ APPKIT_EXPORT id NSGetInformationalAlertPanel(NSString *title,
//
// Create and Run an Attention Panel
//
APPKIT_EXPORT int NSRunAlertPanel(NSString *title,
NSString *msg,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton, ...);
APPKIT_EXPORT NSInteger NSRunAlertPanel(NSString *title,
NSString *msg,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton, ...);
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
APPKIT_EXPORT int NSRunCriticalAlertPanel(NSString *title,
NSString *msg,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton, ...);
APPKIT_EXPORT NSInteger NSRunCriticalAlertPanel(NSString *title,
NSString *msg,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton, ...);
APPKIT_EXPORT int NSRunInformationalAlertPanel(NSString *title,
NSString *msg,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton, ...);
APPKIT_EXPORT NSInteger NSRunInformationalAlertPanel(NSString *title,
NSString *msg,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton, ...);
#endif
#if OS_API_VERSION(GS_API_ONE, GS_API_ONE)
APPKIT_EXPORT int NSRunLocalizedAlertPanel(NSString *table,
NSString *title,
NSString *msg,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton, ...);
APPKIT_EXPORT NSInteger NSRunLocalizedAlertPanel(NSString *table,
NSString *title,
NSString *msg,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton, ...);
#endif
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
@ -182,11 +182,11 @@ APPKIT_EXPORT void NSBeginInformationalAlertSheet(NSString *title,
void *contextInfo,
NSString *msg, ...);
APPKIT_EXPORT int GSRunExceptionPanel(NSString *title,
NSException *exception,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton);
APPKIT_EXPORT NSInteger GSRunExceptionPanel(NSString *title,
NSException *exception,
NSString *defaultButton,
NSString *alternateButton,
NSString *otherButton);
#endif

60
Headers/AppKit/NSParagraphStyle.h
View file

@ -43,20 +43,22 @@ typedef enum _NSTextTabType {
NSDecimalTabStopType
} NSTextTabType;
typedef enum _NSLineBreakMode { /* What to do with long lines */
enum _NSLineBreakMode { /* What to do with long lines */
NSLineBreakByWordWrapping = 0, /* Wrap at word boundaries, default */
NSLineBreakByCharWrapping, /* Wrap at character boundaries */
NSLineBreakByClipping, /* Simply clip */
NSLineBreakByTruncatingHead, /* Truncate at head of line: "...wxyz" */
NSLineBreakByTruncatingTail, /* Truncate at tail of line: "abcd..." */
NSLineBreakByTruncatingMiddle /* Truncate middle of line: "ab...yz" */
} NSLineBreakMode;
};
typedef NSUInteger NSLineBreakMode;
typedef enum _NSWritingDirection {
enum _NSWritingDirection {
NSWritingDirectionNaturalDirection,
NSWritingDirectionLeftToRight,
NSWritingDirectionRightToLeft
} NSWritingDirection;
};
typedef NSInteger NSWritingDirection;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
APPKIT_EXPORT NSString *NSTabColumnTerminatorsAttributeName;
@ -70,13 +72,13 @@ APPKIT_EXPORT NSString *NSTabColumnTerminatorsAttributeName;
float _location;
}
- (id) initWithType: (NSTextTabType)type location: (float)loc;
- (float) location;
- (id) initWithType: (NSTextTabType)type location: (CGFloat)loc;
- (CGFloat) location;
- (NSTextTabType) tabStopType;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (id) initWithTextAlignment: (NSTextAlignment)align
location: (float)loc
location: (CGFloat)loc
options: (NSDictionary *)options;
- (NSTextAlignment) alignment;
- (NSDictionary *) options;
@ -115,12 +117,12 @@ APPKIT_EXPORT NSString *NSTabColumnTerminatorsAttributeName;
* Can't be negative. This value is included in the line fragment
* heights in layout manager.
*/
- (float) lineSpacing;
- (CGFloat) lineSpacing;
/*
* Distance between the bottom of this paragraph and top of next.
*/
- (float) paragraphSpacing;
- (CGFloat) paragraphSpacing;
- (NSTextAlignment) alignment;
@ -132,18 +134,18 @@ APPKIT_EXPORT NSString *NSTabColumnTerminatorsAttributeName;
/*
* Distance from margin to front edge of paragraph
*/
- (float) headIndent;
- (CGFloat) headIndent;
/*
* Distance from margin to back edge of paragraph; if negative or 0,
* from other margin
*/
- (float) tailIndent;
- (CGFloat) tailIndent;
/*
* Distance from margin to edge appropriate for text direction
*/
- (float) firstLineHeadIndent;
- (CGFloat) firstLineHeadIndent;
/*
* Distance from margin to tab stops
@ -155,12 +157,12 @@ APPKIT_EXPORT NSString *NSTabColumnTerminatorsAttributeName;
* of ascenders; basically the line fragment height. Does not include
* lineSpacing (which is added after this computation).
*/
- (float) minimumLineHeight;
- (CGFloat) minimumLineHeight;
/*
* 0 implies no maximum.
*/
- (float) maximumLineHeight;
- (CGFloat) maximumLineHeight;
- (NSLineBreakMode) lineBreakMode;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_2, GS_API_LATEST)
@ -173,12 +175,12 @@ APPKIT_EXPORT NSString *NSTabColumnTerminatorsAttributeName;
- (NSWritingDirection) baseWritingDirection;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (float) defaultTabInterval;
- (float) lineHeightMultiple;
- (float) paragraphSpacingBefore;
- (CGFloat) defaultTabInterval;
- (CGFloat) lineHeightMultiple;
- (CGFloat) paragraphSpacingBefore;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (int) headerLevel;
- (NSInteger) headerLevel;
- (float) hyphenationFactor;
- (NSArray *) textBlocks;
- (NSArray *) textLists;
@ -191,15 +193,15 @@ APPKIT_EXPORT NSString *NSTabColumnTerminatorsAttributeName;
{
}
- (void) setLineSpacing: (float)aFloat;
- (void) setParagraphSpacing: (float)aFloat;
- (void) setLineSpacing: (CGFloat)aFloat;
- (void) setParagraphSpacing: (CGFloat)aFloat;
- (void) setAlignment: (NSTextAlignment)newAlignment;
- (void) setFirstLineHeadIndent: (float)aFloat;
- (void) setHeadIndent: (float)aFloat;
- (void) setTailIndent: (float)aFloat;
- (void) setFirstLineHeadIndent: (CGFloat)aFloat;
- (void) setHeadIndent: (CGFloat)aFloat;
- (void) setTailIndent: (CGFloat)aFloat;
- (void) setLineBreakMode: (NSLineBreakMode)mode;
- (void) setMinimumLineHeight: (float)aFloat;
- (void) setMaximumLineHeight: (float)aFloat;
- (void) setMinimumLineHeight: (CGFloat)aFloat;
- (void) setMaximumLineHeight: (CGFloat)aFloat;
- (void) addTabStop: (NSTextTab*)anObject;
- (void) removeTabStop: (NSTextTab*)anObject;
- (void) setTabStops: (NSArray*)array;
@ -209,12 +211,12 @@ APPKIT_EXPORT NSString *NSTabColumnTerminatorsAttributeName;
- (void) setBaseWritingDirection: (NSWritingDirection)direction;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (void) setDefaultTabInterval: (float)interval;
- (void) setLineHeightMultiple: (float)factor;
- (void) setParagraphSpacingBefore: (float)spacing;
- (void) setDefaultTabInterval: (CGFloat)interval;
- (void) setLineHeightMultiple: (CGFloat)factor;
- (void) setParagraphSpacingBefore: (CGFloat)spacing;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (void) setHeaderLevel: (int)level;
- (void) setHeaderLevel: (NSInteger)level;
- (void) setHyphenationFactor: (float)factor;
- (void) setTextBlocks: (NSArray *)blocks;
- (void) setTextLists: (NSArray *)lists;

24
Headers/AppKit/NSPopUpButton.h
View file

@ -59,31 +59,31 @@
- (void)addItemWithTitle:(NSString *)title;
- (void)addItemsWithTitles:(NSArray *)itemTitles;
- (void)insertItemWithTitle:(NSString *)title
atIndex:(int)index;
atIndex:(NSInteger)index;
- (void)removeAllItems;
- (void)removeItemWithTitle:(NSString *)title;
- (void)removeItemAtIndex:(int)index;
- (void)removeItemAtIndex:(NSInteger)index;
- (id <NSMenuItem>)selectedItem;
- (NSString *)titleOfSelectedItem;
- (int)indexOfSelectedItem;
- (NSInteger)indexOfSelectedItem;
- (void)selectItem:(id <NSMenuItem>)anObject;
- (void)selectItemAtIndex:(int)index;
- (void)selectItemAtIndex:(NSInteger)index;
- (void)selectItemWithTitle:(NSString *)title;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (BOOL) selectItemWithTag: (NSInteger)tag;
#endif
- (int)numberOfItems;
- (NSInteger)numberOfItems;
- (NSArray *)itemArray;
- (id <NSMenuItem>)itemAtIndex:(int)index;
- (NSString *)itemTitleAtIndex:(int)index;
- (id <NSMenuItem>)itemAtIndex:(NSInteger)index;
- (NSString *)itemTitleAtIndex:(NSInteger)index;
- (NSArray *)itemTitles;
- (id <NSMenuItem>)itemWithTitle:(NSString *)title;
- (id <NSMenuItem>)lastItem;
- (int)indexOfItem:(id <NSMenuItem>)anObject;
- (int)indexOfItemWithTag:(int)tag;
- (int)indexOfItemWithTitle:(NSString *)title;
- (int)indexOfItemWithRepresentedObject:(id)anObject;
- (int)indexOfItemWithTarget:(id)target
- (NSInteger)indexOfItem:(id <NSMenuItem>)anObject;
- (NSInteger)indexOfItemWithTag:(NSInteger)tag;
- (NSInteger)indexOfItemWithTitle:(NSString *)title;
- (NSInteger)indexOfItemWithRepresentedObject:(id)anObject;
- (NSInteger)indexOfItemWithTarget:(id)target
andAction:(SEL)actionSelector;
- (void)setPreferredEdge:(NSRectEdge)edge;
- (NSRectEdge)preferredEdge;

24
Headers/AppKit/NSPopUpButtonCell.h
View file

@ -74,7 +74,7 @@ typedef enum {
/**
* Index of the currently selected item in the reciever.
*/
- (int) indexOfSelectedItem;
- (NSInteger) indexOfSelectedItem;
/**
* Synchronizes the title and the selected item. This sets
@ -90,7 +90,7 @@ typedef enum {
/**
* Select item at the given index.
*/
- (void) selectItemAtIndex: (int)index;
- (void) selectItemAtIndex: (NSInteger)index;
/**
* Select the item with the given title.
@ -194,7 +194,7 @@ typedef enum {
* index, it, and all items after it are advanced one position. Index needs
* to be within the valid range for the array of items in the popup button.
*/
- (void) insertItemWithTitle: (NSString*)title atIndex: (int)index;
- (void) insertItemWithTitle: (NSString*)title atIndex: (NSInteger)index;
/**
* Remove a given item based on its title.
@ -205,7 +205,7 @@ typedef enum {
* Remove a given item based on its index, must be a valid index within the
* range for the item array of this popup.
*/
- (void) removeItemAtIndex: (int)index;
- (void) removeItemAtIndex: (NSInteger)index;
/**
* Purges all items from the popup.
@ -221,38 +221,38 @@ typedef enum {
/**
* Number of items in the reciever.
*/
- (int) numberOfItems;
- (NSInteger) numberOfItems;
/**
* Return the index of item in the item array of the reciever.
*/
- (int) indexOfItem: (id<NSMenuItem>)item;
- (NSInteger) indexOfItem: (id<NSMenuItem>)item;
/**
* Return index of the item with the given title.
*/
- (int) indexOfItemWithTitle: (NSString*)title;
- (NSInteger) indexOfItemWithTitle: (NSString*)title;
/**
* Return index of the item with a tag equal to aTag.
*/
- (int) indexOfItemWithTag: (int)tag;
- (NSInteger) indexOfItemWithTag: (NSInteger)tag;
/**
* Index of the item whose menu item's representedObject is equal to obj.
*/
- (int) indexOfItemWithRepresentedObject: (id)obj;
- (NSInteger) indexOfItemWithRepresentedObject: (id)obj;
/**
* Index of the item in the reciever whose target and action
* are equal to aTarget and actionSelector.
*/
- (int) indexOfItemWithTarget: (id)aTarget andAction: (SEL)actionSelector;
- (NSInteger) indexOfItemWithTarget: (id)aTarget andAction: (SEL)actionSelector;
/**
* Return the item at index.
*/
- (id <NSMenuItem>) itemAtIndex: (int)index;
- (id <NSMenuItem>) itemAtIndex: (NSInteger)index;
/**
* Return the item with title.
@ -269,7 +269,7 @@ typedef enum {
/**
* Set item title at the given index in the reciever.
*/
- (NSString*) itemTitleAtIndex: (int)index;
- (NSString*) itemTitleAtIndex: (NSInteger)index;
/**
* Returns an array containing all of the current item titles.

121
Headers/AppKit/NSPopover.h Normal file
View file

@ -0,0 +1,121 @@
/*
NSPopover.h
The popover class
Copyright (C) 2013 Free Software Foundation, Inc.
Author: Gregory Casamento <greg.casamento@gmail.com>
Date: 2013
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 Lesser 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef _GNUstep_H_NSPopover
#define _GNUstep_H_NSPopover
#import <Foundation/NSGeometry.h>
#import <AppKit/NSNibDeclarations.h>
#import <AppKit/NSResponder.h>
/* Keys */
APPKIT_EXPORT NSString *NSPopoverCloseReasonKey;
APPKIT_EXPORT NSString *NSPopoverCloseReasonStandard;
APPKIT_EXPORT NSString *NSPopoverCloseReasonDetachToWindow;
/* Notifications */
APPKIT_EXPORT NSString *NSPopoverWillShowNotification;
APPKIT_EXPORT NSString *NSPopoverDidShowNotification;
APPKIT_EXPORT NSString *NSPopoverWillCloseNotification;
APPKIT_EXPORT NSString *NSPopoverDidCloseNotification;
/* Constants and enums */
enum {
NSPopoverAppearanceMinimal = 0,
NSPopoverAppearanceHUD = 1
};
typedef NSInteger NSPopoverAppearance;
enum {
NSPopoverBehaviorApplicationDefined = 0,
NSPopoverBehaviorTransient = 1,
NSPopoverBehaviorSemitransient = 2
};
typedef NSInteger NSPopoverBehavior;
/* Forward declarations */
@class NSViewController, NSWindow, NSView, NSNotification;
@protocol NSPopoverDelegate;
/* Class */
@interface NSPopover : NSResponder
{
BOOL _animates;
NSPopoverAppearance _appearance;
NSPopoverBehavior _behavior;
NSSize _contentSize;
IBOutlet NSViewController *_contentViewController;
id _delegate;
NSRect _positioningRect;
BOOL _shown;
NSWindow *_realWindow;
}
/* Properties */
- (void)setAnimates:(BOOL)flag;
- (BOOL)animates;
- (void)setAppearance: (NSPopoverAppearance)value;
- (NSPopoverAppearance)appearance;
- (void)setBehavior:(NSPopoverBehavior)value;
- (NSPopoverBehavior)behavior;
- (void)setContentSize:(NSSize)value;
- (NSSize)contentSize;
- (void)setContentViewController:(NSViewController *)controller;
- (NSViewController *)contentViewController;
- (void)setDelegate:(id)value;
- (id)delegate;
- (void)setPositioningRect:(NSRect)value;
- (NSRect)positioningRect;
- (BOOL)isShown;
/* Methods */
- (void)close;
- (IBAction)performClose:(id)sender;
- (void)showRelativeToRect:(NSRect)positioningRect
ofView:(NSView *)positioningView
preferredEdge:(NSRectEdge)preferredEdge;
@end
/* Delegate */
@protocol NSPopoverDelegate
#ifdef __OBJC2__
@optional
#else
@end
@interface NSObject (NSPopoverDelegate)
#endif
- (NSWindow *)detachableWindowForPopover:(NSPopover *)popover;
- (void)popoverDidClose:(NSNotification *)notification;
- (void)popoverDidShow:(NSNotification *)notification;
- (BOOL)popoverShouldClose:(NSPopover *)popover;
- (void)popoverWillClose:(NSNotification *)notification;
- (void)popoverWillShow:(NSNotification *)notification;
@end
#endif

10
Headers/AppKit/NSRulerMarker.h
View file

@ -45,14 +45,14 @@
NSImage *_image;
id <NSCopying> _representedObject;
NSPoint _imageOrigin;
float _location;
CGFloat _location;
BOOL _isMovable;
BOOL _isRemovable;
BOOL _isDragging;
}
- (id)initWithRulerView:(NSRulerView *)aRulerView
markerLocation:(float)location
markerLocation:(CGFloat)location
image:(NSImage *)anImage
imageOrigin:(NSPoint)imageOrigin;
@ -64,15 +64,15 @@
- (void)setImageOrigin:(NSPoint)aPoint;
- (NSPoint)imageOrigin;
- (NSRect)imageRectInRuler;
- (float)thicknessRequiredInRuler;
- (CGFloat)thicknessRequiredInRuler;
- (void)setMovable:(BOOL)flag;
- (BOOL)isMovable;
- (void)setRemovable:(BOOL)flag;
- (BOOL)isRemovable;
- (void)setMarkerLocation:(float)location;
- (float)markerLocation;
- (void)setMarkerLocation:(CGFloat)location;
- (CGFloat)markerLocation;
- (void)setRepresentedObject:(id <NSCopying>)anObject;
- (id <NSCopying>)representedObject;

50
Headers/AppKit/NSRulerView.h
View file

@ -58,12 +58,12 @@ typedef enum {
NSScrollView *_scrollView;
NSView *_clientView; // Not retained
NSView *_accessoryView;
float _originOffset;
CGFloat _originOffset;
NSMutableArray *_markers;
NSRulerOrientation _orientation;
float _ruleThickness;
float _reservedThicknessForAccessoryView;
float _reservedThicknessForMarkers;
CGFloat _ruleThickness;
CGFloat _reservedThicknessForAccessoryView;
CGFloat _reservedThicknessForMarkers;
/* Cached values. It's a little expensive to calculate them and they
* change only when the unit or the originOffset is changed or when
@ -80,12 +80,12 @@ typedef enum {
NSString *_labelFormat;
}
- (id) initWithScrollView: (NSScrollView *)aScrollView
orientation: (NSRulerOrientation)o;
- (id) initWithScrollView:(NSScrollView *)aScrollView
orientation:(NSRulerOrientation)o;
+ (void) registerUnitWithName: (NSString *)uName
+ (void) registerUnitWithName:(NSString *)uName
abbreviation:(NSString *)abbreviation
unitToPointsConversionFactor:(float)conversionFactor
unitToPointsConversionFactor:(CGFloat)conversionFactor
stepUpCycle:(NSArray *)stepUpCycle
stepDownCycle:(NSArray *)stepDownCycle;
@ -98,8 +98,8 @@ typedef enum {
- (void) setAccessoryView: (NSView *)aView;
- (NSView *) accessoryView;
- (void) setOriginOffset: (float)offset;
- (float) originOffset;
- (void) setOriginOffset: (CGFloat)offset;
- (CGFloat) originOffset;
- (void) setMarkers: (NSArray *)newMarkers;
- (NSArray *) markers;
@ -108,7 +108,7 @@ typedef enum {
- (BOOL) trackMarker: (NSRulerMarker *)aMarker
withMouseEvent: (NSEvent *)theEvent;
- (void) moveRulerlineFromLocation: (float)oldLoc toLocation: (float)newLoc;
- (void) moveRulerlineFromLocation: (CGFloat)oldLoc toLocation: (CGFloat)newLoc;
- (void) drawHashMarksAndLabelsInRect: (NSRect)aRect;
- (void) drawMarkersInRect: (NSRect)aRect;
@ -119,14 +119,14 @@ typedef enum {
- (void) setOrientation: (NSRulerOrientation)o;
- (NSRulerOrientation) orientation;
- (void) setReservedThicknessForAccessoryView: (float)thickness;
- (float) reservedThicknessForAccessoryView;
- (void) setReservedThicknessForMarkers: (float)thickness;
- (float) reservedThicknessForMarkers;
- (void) setRuleThickness: (float)thickness;
- (float) ruleThickness;
- (float) requiredThickness;
- (float) baselineLocation;
- (void) setReservedThicknessForAccessoryView: (CGFloat)thickness;
- (CGFloat) reservedThicknessForAccessoryView;
- (void) setReservedThicknessForMarkers: (CGFloat)thickness;
- (CGFloat) reservedThicknessForMarkers;
- (void) setRuleThickness: (CGFloat)thickness;
- (CGFloat) ruleThickness;
- (CGFloat) requiredThickness;
- (CGFloat) baselineLocation;
- (BOOL) isFlipped;
@end
@ -159,13 +159,13 @@ typedef enum {
- (BOOL)rulerView: (NSRulerView *)aRulerView
shouldRemoveMarker: (NSRulerMarker *)aMarker;
- (float)rulerView: (NSRulerView *)aRulerView
willAddMarker: (NSRulerMarker *)aMarker
atLocation: (float)location;
- (CGFloat)rulerView: (NSRulerView *)aRulerView
willAddMarker: (NSRulerMarker *)aMarker
atLocation: (CGFloat)location;
- (float)rulerView: (NSRulerView *)aRulerView
willMoveMarker: (NSRulerMarker *)aMarker
toLocation: (float)location;
- (CGFloat)rulerView: (NSRulerView *)aRulerView
willMoveMarker: (NSRulerMarker *)aMarker
toLocation: (CGFloat)location;
- (void)rulerView: (NSRulerView *)aRulerView
willSetClientView: (NSView *)newClient;

24
Headers/AppKit/NSScrollView.h
View file

@ -121,21 +121,21 @@
- (BOOL)rulersVisible;
/* Setting scrolling behavior */
- (void)setLineScroll:(float)aFloat;
- (float)lineScroll;
- (void)setPageScroll:(float)aFloat;
- (float)pageScroll;
- (void)setLineScroll:(CGFloat)aFloat;
- (CGFloat)lineScroll;
- (void)setPageScroll:(CGFloat)aFloat;
- (CGFloat)pageScroll;
- (void)setScrollsDynamically:(BOOL)flag;
- (BOOL)scrollsDynamically;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (float) horizontalLineScroll;
- (float) horizontalPageScroll;
- (float) verticalLineScroll;
- (float) verticalPageScroll;
- (void) setHorizontalLineScroll: (float)aFloat;
- (void) setHorizontalPageScroll: (float)aFloat;
- (void) setVerticalLineScroll: (float)aFloat;
- (void) setVerticalPageScroll: (float)aFloat;
- (CGFloat) horizontalLineScroll;
- (CGFloat) horizontalPageScroll;
- (CGFloat) verticalLineScroll;
- (CGFloat) verticalPageScroll;
- (void) setHorizontalLineScroll: (CGFloat)aFloat;
- (void) setHorizontalPageScroll: (CGFloat)aFloat;
- (void) setVerticalLineScroll: (CGFloat)aFloat;
- (void) setVerticalPageScroll: (CGFloat)aFloat;
/* Setting the background drawing */
- (void)setDrawsBackground:(BOOL)flag;
- (BOOL)drawsBackground;

20
Headers/AppKit/NSScroller.h
View file

@ -37,16 +37,17 @@
@class NSEvent;
typedef enum _NSScrollArrowPosition {
enum _NSScrollArrowPosition {
#if OS_API_VERSION(MAC_OS_X_VERSION_10_1, GS_API_LATEST)
NSScrollerArrowsDefaultSetting = 0,
#endif
NSScrollerArrowsMaxEnd = 0,
NSScrollerArrowsMinEnd,
NSScrollerArrowsNone
} NSScrollArrowPosition;
};
typedef NSUInteger NSScrollArrowPosition;
typedef enum _NSScrollerPart {
enum _NSScrollerPart {
NSScrollerNoPart = 0,
NSScrollerDecrementPage,
NSScrollerKnob,
@ -54,18 +55,21 @@ typedef enum _NSScrollerPart {
NSScrollerDecrementLine,
NSScrollerIncrementLine,
NSScrollerKnobSlot
} NSScrollerPart;
};
typedef NSUInteger NSScrollerPart;
typedef enum _NSScrollerUsablePart {
enum _NSScrollerUsablePart {
NSNoScrollerParts = 0,
NSOnlyScrollerArrows,
NSAllScrollerParts
} NSUsableScrollerParts;
};
typedef NSUInteger NSUsableScrollerParts;
typedef enum _NSScrollerArrow {
enum _NSScrollerArrow {
NSScrollerIncrementArrow = 0,
NSScrollerDecrementArrow
} NSScrollerArrow;
};
typedef NSUInteger NSScrollerArrow;
@interface NSScroller : NSControl <NSCoding>
{

46
Headers/AppKit/NSSegmentedCell.h
View file

@ -46,7 +46,7 @@ typedef enum {
@interface NSSegmentedCell : NSActionCell
{
@private
int _selected_segment;
NSInteger _selected_segment;
int _key_selection;
NSMutableArray *_items;
struct {
@ -62,14 +62,14 @@ typedef enum {
}
// Specifying number of segments...
- (void) setSegmentCount: (int) count;
- (int) segmentCount;
- (void) setSegmentCount: (NSInteger) count;
- (NSInteger) segmentCount;
// Specifying selected segment...
- (void) setSelectedSegment: (int) segment;
- (void) setSelected: (BOOL)flag forSegment: (int)segment;
- (int) selectedSegment;
- (void) selectSegmentWithTag: (int) tag;
- (void) setSelectedSegment: (NSInteger) segment;
- (void) setSelected: (BOOL)flag forSegment: (NSInteger)segment;
- (NSInteger) selectedSegment;
- (void) selectSegmentWithTag: (NSInteger)tag;
- (void) makeNextSegmentKey;
- (void) makePreviousSegmentKey;
@ -78,24 +78,24 @@ typedef enum {
- (NSSegmentSwitchTracking) trackingMode;
// Working with individual segments...
- (void) setWidth: (float)width forSegment: (int)segment;
- (float) widthForSegment: (int)segment;
- (void) setImage: (NSImage *)image forSegment: (int)segment;
- (NSImage *) imageForSegment: (int)segment;
- (void) setLabel: (NSString *)label forSegment: (int)segment;
- (NSString *) labelForSegment: (int)segment;
- (BOOL) isSelectedForSegment: (int)segment;
- (void) setEnabled: (BOOL)flag forSegment: (int)segment;
- (BOOL) isEnabledForSegment: (int)segment;
- (void) setMenu: (NSMenu *)menu forSegment: (int)segment;
- (NSMenu *) menuForSegment: (int)segment;
- (void) setToolTip: (NSString *) toolTip forSegment: (int)segment;
- (NSString *) toolTipForSegment: (int)segment;
- (void) setTag: (int)tag forSegment: (int)segment;
- (int) tagForSegment: (int)segment;
- (void) setWidth: (CGFloat)width forSegment: (NSInteger)segment;
- (CGFloat) widthForSegment: (NSInteger)segment;
- (void) setImage: (NSImage *)image forSegment: (NSInteger)segment;
- (NSImage *) imageForSegment: (NSInteger)segment;
- (void) setLabel: (NSString *)label forSegment: (NSInteger)segment;
- (NSString *) labelForSegment: (NSInteger)segment;
- (BOOL) isSelectedForSegment: (NSInteger)segment;
- (void) setEnabled: (BOOL)flag forSegment: (NSInteger)segment;
- (BOOL) isEnabledForSegment: (NSInteger)segment;
- (void) setMenu: (NSMenu *)menu forSegment: (NSInteger)segment;
- (NSMenu *) menuForSegment: (NSInteger)segment;
- (void) setToolTip: (NSString *) toolTip forSegment: (NSInteger)segment;
- (NSString *) toolTipForSegment: (NSInteger)segment;
- (void) setTag: (NSInteger)tag forSegment: (NSInteger)segment;
- (NSInteger) tagForSegment: (NSInteger)segment;
// Drawing custom content
- (void) drawSegment: (int)segment
- (void) drawSegment: (NSInteger)segment
inFrame: (NSRect)frame
withView: (NSView *)view;

34
Headers/AppKit/NSSegmentedControl.h
View file

@ -43,27 +43,27 @@ typedef enum _NSSegmentStyle {
@interface NSSegmentedControl : NSControl
// Specifying number of segments...
- (void) setSegmentCount: (int) count;
- (int) segmentCount;
- (void) setSegmentCount: (NSInteger)count;
- (NSInteger) segmentCount;
// Specifying selected segment...
- (void) setSelectedSegment: (int) segment;
- (int) selectedSegment;
- (void) selectSegmentWithTag: (int) tag;
- (void) setSelectedSegment: (NSInteger)segment;
- (NSInteger) selectedSegment;
- (void) selectSegmentWithTag: (NSInteger)tag;
// Working with individual segments...
- (void) setWidth: (float)width forSegment: (int)segment;
- (float) widthForSegment: (int)segment;
- (void) setImage: (NSImage *)image forSegment: (int)segment;
- (NSImage *) imageForSegment: (int)segment;
- (void) setLabel: (NSString *)label forSegment: (int)segment;
- (NSString *) labelForSegment: (int)segment;
- (void) setMenu: (NSMenu *)menu forSegment: (int)segment;
- (NSMenu *) menuForSegment: (int)segment;
- (void) setSelected: (BOOL)flag forSegment: (int)segment;
- (BOOL) isSelectedForSegment: (int)segment;
- (void) setEnabled: (BOOL)flag forSegment: (int)segment;
- (BOOL) isEnabledForSegment: (int)segment;
- (void) setWidth: (CGFloat)width forSegment: (NSInteger)segment;
- (CGFloat) widthForSegment: (NSInteger)segment;
- (void) setImage: (NSImage *)image forSegment: (NSInteger)segment;
- (NSImage *) imageForSegment: (NSInteger)segment;
- (void) setLabel: (NSString *)label forSegment: (NSInteger)segment;
- (NSString *) labelForSegment: (NSInteger)segment;
- (void) setMenu: (NSMenu *)menu forSegment: (NSInteger)segment;
- (NSMenu *) menuForSegment: (NSInteger)segment;
- (void) setSelected: (BOOL)flag forSegment: (NSInteger)segment;
- (BOOL) isSelectedForSegment: (NSInteger)segment;
- (void) setEnabled: (BOOL)flag forSegment: (NSInteger)segment;
- (BOOL) isEnabledForSegment: (NSInteger)segment;
// Setting the style of the segments
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)

6
Headers/AppKit/NSSlider.h
View file

@ -42,11 +42,11 @@
// appearance
- (double) altIncrementValue;
- (NSImage*) image;
- (int) isVertical;
- (float) knobThickness;
- (NSInteger) isVertical;
- (CGFloat) knobThickness;
- (void) setAltIncrementValue: (double)increment;
- (void) setImage: (NSImage*)backgroundImage;
- (void) setKnobThickness: (float)aFloat;
- (void) setKnobThickness: (CGFloat)aFloat;
// title
- (NSString*) title;

6
Headers/AppKit/NSSliderCell.h
View file

@ -79,8 +79,8 @@ typedef enum _NSSliderType
- (void) drawKnob: (NSRect)knobRect;
/* Asking about the cell's appearance */
- (float) knobThickness;
- (int) isVertical;
- (CGFloat) knobThickness;
- (NSInteger) isVertical;
- (NSString*) title;
- (id) titleCell;
- (NSColor*) titleColor;
@ -88,7 +88,7 @@ typedef enum _NSSliderType
- (NSSliderType) sliderType;
/* Changing the cell's appearance */
- (void) setKnobThickness: (float)thickness;
- (void) setKnobThickness: (CGFloat)thickness;
- (void) setTitle: (NSString*)title;
- (void) setTitleCell: (NSCell*)aCell;
- (void) setTitleColor: (NSColor*)color;

24
Headers/AppKit/NSSplitView.h
View file

@ -108,13 +108,13 @@ typedef NSInteger NSSplitViewDividerStyle;
resizeSubviewsWithOldSize: (NSSize)oldSize;
- (void) splitView: (NSSplitView *)sender
constrainMinCoordinate: (float *)min
maxCoordinate: (float *)max
ofSubviewAt: (int)offset;
constrainMinCoordinate: (CGFloat *)min
maxCoordinate: (CGFloat *)max
ofSubviewAt: (NSInteger)offset;
- (float) splitView: (NSSplitView *)sender
constrainSplitPosition: (float)proposedPosition
ofSubviewAt: (int)offset;
- (CGFloat) splitView: (NSSplitView *)sender
constrainSplitPosition: (CGFloat)proposedPosition
ofSubviewAt: (NSInteger)offset;
- (void) splitViewWillResizeSubviews: (NSNotification *)notification;
- (void) splitViewDidResizeSubviews: (NSNotification *)notification;
@ -123,13 +123,13 @@ constrainSplitPosition: (float)proposedPosition
- (BOOL) splitView: (NSSplitView *)sender
canCollapseSubview: (NSView *)subview;
- (float) splitView: (NSSplitView *)sender
constrainMaxCoordinate: (float)proposedMax
ofSubviewAt: (int)offset;
- (CGFloat) splitView: (NSSplitView *)sender
constrainMaxCoordinate: (CGFloat)proposedMax
ofSubviewAt: (NSInteger)offset;
- (float) splitView: (NSSplitView *)sender
constrainMinCoordinate: (float)proposedMin
ofSubviewAt: (int)offset;
- (CGFloat) splitView: (NSSplitView *)sender
constrainMinCoordinate: (CGFloat)proposedMin
ofSubviewAt: (NSInteger)offset;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)

14
Headers/AppKit/NSTableColumn.h
View file

@ -89,12 +89,12 @@ enum {
/*
* Controlling size & visibility
*/
- (void) setWidth: (float)newWidth;
- (float) width;
- (void) setMinWidth: (float)minWidth;
- (float) minWidth;
- (void) setMaxWidth: (float)maxWidth;
- (float) maxWidth;
- (void) setWidth: (CGFloat)newWidth;
- (CGFloat) width;
- (void) setMinWidth: (CGFloat)minWidth;
- (CGFloat) minWidth;
- (void) setMaxWidth: (CGFloat)maxWidth;
- (CGFloat) maxWidth;
- (void) setResizable: (BOOL)flag;
- (BOOL) isResizable;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
@ -122,7 +122,7 @@ enum {
#endif
- (void) setDataCell: (NSCell *)aCell;
- (NSCell *) dataCell;
- (NSCell *) dataCellForRow: (int)row;
- (NSCell *) dataCellForRow: (NSInteger)row;
/*
* Sorting
*/

10
Headers/AppKit/NSTableHeaderView.h
View file

@ -49,13 +49,13 @@
/*
* Checking altered columns
*/
- (int) draggedColumn;
- (float) draggedDistance;
- (int) resizedColumn;
- (NSInteger) draggedColumn;
- (CGFloat) draggedDistance;
- (NSInteger) resizedColumn;
/*
* Utility methods
*/
- (int) columnAtPoint: (NSPoint)aPoint;
- (NSRect) headerRectOfColumn: (int)columnIndex;
- (NSInteger) columnAtPoint: (NSPoint)aPoint;
- (NSRect) headerRectOfColumn: (NSInteger)columnIndex;
@end
#endif

111
Headers/AppKit/NSTableView.h
View file

@ -49,10 +49,12 @@ typedef enum _NSTableViewDropOperation {
} NSTableViewDropOperation;
enum {
NSTableViewGridNone = 0,
NSTableViewSolidVerticalGridLineMask = 1,
NSTableViewSolidHorizontalGridLineMask = 2
NSTableViewGridNone = 0,
NSTableViewSolidVerticalGridLineMask = 1 << 0,
NSTableViewSolidHorizontalGridLineMask = 1 << 1,
NSTableViewDashedHorizontalGridLineMask = 1 << 3
};
typedef NSUInteger NSTableViewGridLineStyle;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
typedef enum _NSTableViewColumnAutoresizingStyle
@ -66,6 +68,7 @@ typedef enum _NSTableViewColumnAutoresizingStyle
} NSTableViewColumnAutoresizingStyle;
#endif
@interface NSTableView : NSControl <NSUserInterfaceValidations>
{
/*
@ -157,8 +160,8 @@ typedef enum _NSTableViewColumnAutoresizingStyle
/* Target-action */
- (void) setDoubleAction: (SEL)aSelector;
- (SEL) doubleAction;
- (int) clickedColumn;
- (int) clickedRow;
- (NSInteger) clickedColumn;
- (NSInteger) clickedRow;
/* Configuration */
- (void) setAllowsColumnReordering: (BOOL)flag;
@ -175,8 +178,8 @@ typedef enum _NSTableViewColumnAutoresizingStyle
/* Drawing Attributes */
- (void) setIntercellSpacing: (NSSize)aSize;
- (NSSize) intercellSpacing;
- (void) setRowHeight: (float)rowHeight;
- (float) rowHeight;
- (void) setRowHeight: (CGFloat)rowHeight;
- (CGFloat) rowHeight;
- (void) setBackgroundColor: (NSColor *)aColor;
- (NSColor *) backgroundColor;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
@ -187,34 +190,34 @@ typedef enum _NSTableViewColumnAutoresizingStyle
/* Columns */
- (void) addTableColumn: (NSTableColumn *)aColumn;
- (void) removeTableColumn: (NSTableColumn *)aColumn;
- (void) moveColumn: (int)columnIndex toColumn: (int)newIndex;
- (void) moveColumn: (NSInteger)columnIndex toColumn: (NSInteger)newIndex;
- (NSArray *) tableColumns;
- (int) columnWithIdentifier: (id)identifier;
- (NSInteger) columnWithIdentifier: (id)identifier;
- (NSTableColumn *) tableColumnWithIdentifier: (id)anObject;
/* Selecting Columns and Rows */
- (void) selectColumn: (int) columnIndex byExtendingSelection: (BOOL)flag;
- (void) selectRow: (int) rowIndex byExtendingSelection: (BOOL)flag;
- (void) selectColumn: (NSInteger) columnIndex byExtendingSelection: (BOOL)flag;
- (void) selectRow: (NSInteger) rowIndex byExtendingSelection: (BOOL)flag;
- (void) selectColumnIndexes: (NSIndexSet *)indexes byExtendingSelection: (BOOL)extend;
- (void) selectRowIndexes: (NSIndexSet *)indexes byExtendingSelection: (BOOL)extend;
- (NSIndexSet *) selectedColumnIndexes;
- (NSIndexSet *) selectedRowIndexes;
- (void) deselectColumn: (int)columnIndex;
- (void) deselectRow: (int)rowIndex;
- (int) numberOfSelectedColumns;
- (int) numberOfSelectedRows;
- (int) selectedColumn;
- (int) selectedRow;
- (BOOL) isColumnSelected: (int)columnIndex;
- (BOOL) isRowSelected: (int)rowIndex;
- (void) deselectColumn: (NSInteger)columnIndex;
- (void) deselectRow: (NSInteger)rowIndex;
- (NSInteger) numberOfSelectedColumns;
- (NSInteger) numberOfSelectedRows;
- (NSInteger) selectedColumn;
- (NSInteger) selectedRow;
- (BOOL) isColumnSelected: (NSInteger)columnIndex;
- (BOOL) isRowSelected: (NSInteger)rowIndex;
- (NSEnumerator *) selectedColumnEnumerator;
- (NSEnumerator *) selectedRowEnumerator;
- (void) selectAll: (id)sender;
- (void) deselectAll: (id)sender;
/* Table Dimensions */
- (int) numberOfColumns;
- (int) numberOfRows;
- (NSInteger) numberOfColumns;
- (NSInteger) numberOfRows;
/* Grid Drawing attributes */
- (void) setDrawsGrid: (BOOL)flag;
@ -222,18 +225,24 @@ typedef enum _NSTableViewColumnAutoresizingStyle
- (void) setGridColor: (NSColor *)aColor;
- (NSColor *) gridColor;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (void) setGridStyleMask: (unsigned int)gridType;
- (unsigned int) gridStyleMask;
- (void) setGridStyleMask: (NSTableViewGridLineStyle)gridType;
- (NSTableViewGridLineStyle) gridStyleMask;
#endif
/* Proving Cells */
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
- (NSCell *) preparedCellAtColumn: (NSInteger)columnIndex row: (NSInteger)rowIndex;
#endif
/* Editing Cells */
/* ALL TODOS */
- (void) editColumn: (int)columnIndex
row: (int)rowIndex
- (void) editColumn: (NSInteger)columnIndex
row: (NSInteger)rowIndex
withEvent: (NSEvent *)theEvent
select: (BOOL)flag;
- (int) editedRow;
- (int) editedColumn;
- (NSInteger) editedRow;
- (NSInteger) editedColumn;
/* Auxiliary Components */
- (void) setHeaderView: (NSTableHeaderView*)aHeaderView;
@ -242,17 +251,17 @@ typedef enum _NSTableViewColumnAutoresizingStyle
- (NSView*) cornerView;
/* Layout */
- (NSRect) rectOfColumn: (int)columnIndex;
- (NSRect) rectOfRow: (int)rowIndex;
- (NSRect) rectOfColumn: (NSInteger)columnIndex;
- (NSRect) rectOfRow: (NSInteger)rowIndex;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
- (NSIndexSet *) columnIndexesInRect: (NSRect)aRect;
#endif
- (NSRange) columnsInRect: (NSRect)aRect;
- (NSRange) rowsInRect: (NSRect)aRect;
- (int) columnAtPoint: (NSPoint)aPoint;
- (int) rowAtPoint: (NSPoint)aPoint;
- (NSRect) frameOfCellAtColumn: (int)columnIndex
row: (int)rowIndex;
- (NSInteger) columnAtPoint: (NSPoint)aPoint;
- (NSInteger) rowAtPoint: (NSPoint)aPoint;
- (NSRect) frameOfCellAtColumn: (NSInteger)columnIndex
row: (NSInteger)rowIndex;
- (void) setAutoresizesAllColumnsToFit: (BOOL)flag;
- (BOOL) autoresizesAllColumnsToFit;
- (void) sizeLastColumnToFit;
@ -265,7 +274,7 @@ typedef enum _NSTableViewColumnAutoresizingStyle
#endif
/* Drawing */
- (void) drawRow: (int)rowIndex clipRect: (NSRect)clipRect;
- (void) drawRow: (NSInteger)rowIndex clipRect: (NSRect)clipRect;
- (void) drawGridInClipRect: (NSRect)aRect;
- (void) highlightSelectionInClipRect: (NSRect)clipRect;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
@ -273,8 +282,8 @@ typedef enum _NSTableViewColumnAutoresizingStyle
#endif
/* Scrolling */
- (void) scrollRowToVisible: (int)rowIndex;
- (void) scrollColumnToVisible: (int)columnIndex;
- (void) scrollRowToVisible: (NSInteger)rowIndex;
- (void) scrollColumnToVisible: (NSInteger)columnIndex;
/* Text delegate methods */
- (BOOL) textShouldBeginEditing: (NSText *)textObject;
@ -309,7 +318,7 @@ typedef enum _NSTableViewColumnAutoresizingStyle
- (NSImage*) dragImageForRows: (NSArray*)dragRows
event: (NSEvent*)dragEvent
dragImageOffset: (NSPoint*)dragImageOffset;
- (void) setDropRow: (int)row
- (void) setDropRow: (NSInteger)row
dropOperation: (NSTableViewDropOperation)operation;
- (void) setVerticalMotionCanBeginDrag: (BOOL)flag;
- (BOOL) verticalMotionCanBeginDrag;
@ -333,8 +342,8 @@ typedef enum _NSTableViewColumnAutoresizingStyle
@end /* interface of NSTableView */
@interface NSTableView (GNUPrivate)
- (void) _sendDoubleActionForColumn: (int)columnIndex;
- (void) _selectColumn: (int)columnIndex
- (void) _sendDoubleActionForColumn: (NSInteger)columnIndex;
- (void) _selectColumn: (NSInteger)columnIndex
modifiers: (unsigned int)modifiers;
@end
@ -347,23 +356,23 @@ typedef enum _NSTableViewColumnAutoresizingStyle
/**
* Returns the number of records that the data source manages for <em>aTableView</em>.
*/
- (int) numberOfRowsInTableView: (NSTableView *)aTableView;
- (NSInteger) numberOfRowsInTableView: (NSTableView *)aTableView;
- (id) tableView: (NSTableView *)aTableView
objectValueForTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex;
row: (NSInteger)rowIndex;
- (void) tableView: (NSTableView *)aTableView
setObjectValue: (id)anObject
forTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex;
row: (NSInteger)rowIndex;
/* Dragging */
- (BOOL) tableView: (NSTableView*)tableView
acceptDrop: (id <NSDraggingInfo>)info
row: (int)row
row: (NSInteger)row
dropOperation: (NSTableViewDropOperation)operation;
- (NSDragOperation) tableView: (NSTableView*)tableView
validateDrop: (id <NSDraggingInfo>)info
proposedRow: (int)row
proposedRow: (NSInteger)row
proposedDropOperation: (NSTableViewDropOperation)operation;
- (BOOL) tableView: (NSTableView*)tableView
writeRows: (NSArray*)rows
@ -406,32 +415,32 @@ mouseDownInHeaderOfTableColumn: (NSTableColumn *)tableColumn;
#endif
- (BOOL)tableView: (NSTableView *)aTableView
shouldEditTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex;
row: (NSInteger)rowIndex;
- (BOOL) tableView: (NSTableView *)aTableView
shouldSelectRow: (int)rowIndex;
shouldSelectRow: (NSInteger)rowIndex;
- (BOOL) tableView: (NSTableView *)aTableView
shouldSelectTableColumn: (NSTableColumn *)aTableColumn;
- (void) tableView: (NSTableView *)aTableView
willDisplayCell: (id)aCell
forTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex;
row: (NSInteger)rowIndex;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
- (NSCell *) tableView: (NSTableView *)aTableView
dataCellForTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex;
row: (NSInteger)rowIndex;
#endif
- (void) tableViewColumnDidMove: (NSNotification *)aNotification;
- (void) tableViewColumnDidResize: (NSNotification *)aNotification;
- (void) tableViewSelectionDidChange: (NSNotification *)aNotification;
- (void) tableViewSelectionIsChanging: (NSNotification *)aNotification;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (float) tableView: (NSTableView *)tableView
heightOfRow: (int)row;
- (CGFloat) tableView: (NSTableView *)tableView
heightOfRow: (NSInteger)row;
- (NSString *) tableView: (NSTableView *)tableView
toolTipForCell: (NSCell *)cell
rect: (NSRect *)rect
tableColumn: (NSTableColumn *)col
row: (int)row
row: (NSInteger)row
mouseLocation: (NSPoint)mouse;
#endif
@end

6
Headers/AppKit/NSText.h
View file

@ -85,7 +85,9 @@ enum {
NSLeftTextMovement = 0x13,
NSRightTextMovement = 0x14,
NSUpTextMovement = 0x15,
NSDownTextMovement = 0x16
NSDownTextMovement = 0x16,
NSCancelTextMovement = 0x17,
NSOtherTextMovement = 0
};
enum {
@ -286,7 +288,7 @@ enum {
@interface NSText (GNUstepExtensions)
- (unsigned) textLength; /* PRIMITIVE */
- (NSUInteger) textLength; /* PRIMITIVE */
@end

26
Headers/AppKit/NSTextContainer.h
View file

@ -74,20 +74,22 @@ whenever this happens.
@class GSLayoutManager;
@class NSTextView;
typedef enum {
enum {
NSLineSweepLeft,
NSLineSweepRight,
NSLineSweepDown,
NSLineSweepUp
} NSLineSweepDirection;
};
typedef NSUInteger NSLineSweepDirection;
typedef enum {
NSLineMoveLeft,
NSLineMoveRight,
NSLineMoveDown,
NSLineMoveUp,
NSLineDoesntMove
} NSLineMovementDirection;
enum {
NSLineDoesntMove,
NSLineMovesLeft,
NSLineMovesRight,
NSLineMovesDown,
NSLineMovesUp
};
typedef NSUInteger NSLineMovementDirection;
@interface NSTextContainer : NSObject
{
@ -95,7 +97,7 @@ typedef enum {
id _textView;
NSRect _containerRect;
float _lineFragmentPadding;
CGFloat _lineFragmentPadding;
BOOL _observingFrameChanges;
BOOL _widthTracksTextView;
@ -258,8 +260,8 @@ Line fragment padding<br />
The line fragment padding is an amount of space left empty at each end of
a line fragment rectangle by the standard typesetter. The default is 0.0.
*/
- (void) setLineFragmentPadding: (float)aFloat;
- (float) lineFragmentPadding;
- (void) setLineFragmentPadding: (CGFloat)aFloat;
- (CGFloat) lineFragmentPadding;
@end

50
Headers/AppKit/NSTextTable.h
View file

@ -72,14 +72,14 @@ typedef enum _NSTextBlockVerticalAlignment
@interface NSTextBlock : NSObject <NSCoding, NSCopying>
{
NSColor *_backgroundColor;
NSColor *_borderColorForEdge[NSMaxYEdge + 1];
NSTextBlockVerticalAlignment _verticalAlignment;
NSColor *_backgroundColor;
NSColor *_borderColorForEdge[NSMaxYEdge + 1];
NSTextBlockVerticalAlignment _verticalAlignment;
// The following ivars come in pairs
float _value[NSTextBlockMaximumHeight + 1];
NSTextBlockValueType _valueType[NSTextBlockMaximumHeight + 1];
float _width[NSTextBlockMargin + 1][NSMaxYEdge + 1];
NSTextBlockValueType _widthType[NSTextBlockMargin + 1][NSMaxYEdge + 1];
CGFloat _value[NSTextBlockMaximumHeight + 1];
NSTextBlockValueType _valueType[NSTextBlockMaximumHeight + 1];
CGFloat _width[NSTextBlockMargin + 1][NSMaxYEdge + 1];
NSTextBlockValueType _widthType[NSTextBlockMargin + 1][NSMaxYEdge + 1];
}
- (NSColor *) backgroundColor;
@ -88,7 +88,7 @@ typedef enum _NSTextBlockVerticalAlignment
inRect: (NSRect)rect
textContainer: (NSTextContainer *)container
characterRange: (NSRange)range;
- (float) contentWidth;
- (CGFloat) contentWidth;
- (NSTextBlockValueType) contentWidthValueType;
- (void) drawBackgroundWithFrame: (NSRect)rect
inView: (NSView *)view
@ -102,22 +102,22 @@ typedef enum _NSTextBlockVerticalAlignment
- (void) setBackgroundColor: (NSColor *)color;
- (void) setBorderColor: (NSColor *)color;
- (void) setBorderColor: (NSColor *)color forEdge: (NSRectEdge)edge;
- (void) setContentWidth: (float)val type: (NSTextBlockValueType)type;
- (void) setValue: (float)val
- (void) setContentWidth: (CGFloat)val type: (NSTextBlockValueType)type;
- (void) setValue: (CGFloat)val
type: (NSTextBlockValueType)type
forDimension: (NSTextBlockDimension)dimension;
- (void) setVerticalAlignment: (NSTextBlockVerticalAlignment)alignment;
- (void) setWidth: (float)val
- (void) setWidth: (CGFloat)val
type: (NSTextBlockValueType)type
forLayer: (NSTextBlockLayer)layer;
- (void) setWidth: (float)val
- (void) setWidth: (CGFloat)val
type: (NSTextBlockValueType)type
forLayer: (NSTextBlockLayer)layer
edge: (NSRectEdge)edge;
- (float) valueForDimension: (NSTextBlockDimension)dimension;
- (CGFloat) valueForDimension: (NSTextBlockDimension)dimension;
- (NSTextBlockValueType) valueTypeForDimension: (NSTextBlockDimension)dimension;
- (NSTextBlockVerticalAlignment) verticalAlignment;
- (float) widthForLayer: (NSTextBlockLayer)layer edge: (NSRectEdge)edge;
- (CGFloat) widthForLayer: (NSTextBlockLayer)layer edge: (NSRectEdge)edge;
- (NSTextBlockValueType) widthValueTypeForLayer: (NSTextBlockLayer)layer
edge: (NSRectEdge)edge;
@end
@ -129,10 +129,10 @@ typedef enum _NSTextTableLayoutAlgorithm {
@interface NSTextTable : NSTextBlock
{
NSTextTableLayoutAlgorithm _layoutAlgorithm;
unsigned int _numberOfColumns;
BOOL _collapsesBorders;
BOOL _hidesEmptyCells;
NSTextTableLayoutAlgorithm _layoutAlgorithm;
NSUInteger _numberOfColumns;
BOOL _collapsesBorders;
BOOL _hidesEmptyCells;
}
- (NSRect) boundsRectForBlock: (NSTextTableBlock *)block
@ -148,7 +148,7 @@ typedef enum _NSTextTableLayoutAlgorithm {
layoutManager: (NSLayoutManager *)manager;
- (BOOL) hidesEmptyCells;
- (NSTextTableLayoutAlgorithm) layoutAlgorithm;
- (unsigned int) numberOfColumns;
- (NSUInteger) numberOfColumns;
- (NSRect) rectForBlock: (NSTextTableBlock *)block
layoutAtPoint: (NSPoint)start
inRect: (NSRect)rect
@ -157,17 +157,17 @@ typedef enum _NSTextTableLayoutAlgorithm {
- (void) setCollapsesBorders: (BOOL)flag;
- (void) setHidesEmptyCells: (BOOL)flag;
- (void) setLayoutAlgorithm: (NSTextTableLayoutAlgorithm)algorithm;
- (void) setNumberOfColumns: (unsigned int)numCols;
- (void) setNumberOfColumns: (NSUInteger)numCols;
@end
@interface NSTextTableBlock : NSTextBlock
{
NSTextTable *_table;
int _row;
int _rowSpan;
int _col;
int _colSpan;
NSTextTable *_table;
int _row;
int _rowSpan;
int _col;
int _colSpan;
}
- (id) initWithTable: (NSTextTable *)table

84
Headers/AppKit/NSTextView.h
View file

@ -46,22 +46,23 @@
@class NSRulerView,NSRulerMarker;
typedef enum _NSSelectionGranularity {
enum _NSSelectionGranularity {
NSSelectByCharacter = 0,
NSSelectByWord = 1,
NSSelectByParagraph = 2,
} NSSelectionGranularity;
};
typedef NSUInteger NSSelectionGranularity;
/* TODO: this looks like a mosx extension, not a GNUstep extension. should
double-check */
typedef enum _NSSelectionAffinity {
enum _NSSelectionAffinity {
NSSelectionAffinityUpstream = 0,
NSSelectionAffinityDownstream = 1,
} NSSelectionAffinity;
};
typedef NSUInteger NSSelectionAffinity;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
typedef enum _NSFindPanelAction
enum _NSFindPanelAction
{
NSFindPanelActionShowFindPanel = 1,
NSFindPanelActionNext,
@ -76,7 +77,8 @@ typedef enum _NSFindPanelAction
NSFindPanelActionSelectAll,
NSFindPanelActionSelectAllInSelection
#endif
} NSFindPanelAction;
};
typedef NSUInteger NSFindPanelAction;
#endif
/*
@ -162,14 +164,12 @@ therefore be stored in the NSLayoutManager to avoid problems.
/* shared by all text views attached to one NSTextStorage */
int _spellCheckerDocumentTag;
NSInteger _spellCheckerDocumentTag;
NSColor *_backgroundColor;
NSSize _minSize;
NSSize _maxSize;
/* The following is the object used when posting notifications.
It is usually `self' - but in the case of multiple textviews
@ -177,7 +177,6 @@ therefore be stored in the NSLayoutManager to avoid problems.
might or might not be `self'. This must *not* be retained. */
NSTextView *_notifObject;
/* other members of the text network */
NSTextContainer *_textContainer;
NSLayoutManager *_layoutManager;
@ -204,7 +203,6 @@ therefore be stored in the NSLayoutManager to avoid problems.
BOOL _drawInsertionPointNow;
//#endif
/* Stores the insertion point rect - updated by
updateInsertionPointStateAndRestartTimer: - we must make sure we
call the method every time that the insertion point rect might
@ -218,12 +216,13 @@ therefore be stored in the NSLayoutManager to avoid problems.
NSLayoutManager tries to maintain the original horizontal position when
moving up/down.)
*/
unsigned int _originalInsertionPointCharacterIndex;
NSUInteger _originalInsertionPointCharacterIndex;
/*
0=no information (_originalInsertionPointCharacterIndex undefined)
1=horizontal
2=vertical
* GSInsertionPointMovementDirection
* 0=no information (_originalInsertionPointCharacterIndex undefined)
* 1=horizontal
* 2=vertical
*/
int _currentInsertionPointMovementDirection;
@ -485,26 +484,6 @@ user/programmatic changes of the text.
@interface NSTextView (leftovers)
/*** Ruler support ***/
-(void) rulerView: (NSRulerView *)ruler didMoveMarker: (NSRulerMarker *)marker;
-(void) rulerView: (NSRulerView *)ruler didRemoveMarker: (NSRulerMarker *)marker;
-(void) rulerView: (NSRulerView *)ruler didAddMarker: (NSRulerMarker *)marker;
-(BOOL) rulerView: (NSRulerView *)ruler shouldMoveMarker: (NSRulerMarker *)marker;
-(BOOL) rulerView: (NSRulerView *)ruler shouldRemoveMarker: (NSRulerMarker *)marker;
-(BOOL) rulerView: (NSRulerView *)ruler shouldAddMarker: (NSRulerMarker *)marker;
-(float) rulerView: (NSRulerView *)ruler
willMoveMarker: (NSRulerMarker *)marker
toLocation: (float)location;
-(float) rulerView: (NSRulerView *)ruler
willAddMarker: (NSRulerMarker *)marker
atLocation: (float)location;
-(void) rulerView: (NSRulerView *)ruler
handleMouseDown: (NSEvent *)event;
/*** Fine display control ***/
/* Like -setNeedsDisplayInRect: (NSView), bit if flag is YES, won't do any
@ -542,8 +521,8 @@ already been laid out. */
-(NSImage *) dragImageForSelectionWithEvent: (NSEvent *)event
origin: (NSPoint *)origin; /* mosx */
-(unsigned int) dragOperationForDraggingInfo: (id <NSDraggingInfo>)dragInfo
type: (NSString *)type; /* mosx */
-(NSDragOperation) dragOperationForDraggingInfo: (id <NSDraggingInfo>)dragInfo
type: (NSString *)type; /* mosx */
-(BOOL) dragSelectionWithEvent: (NSEvent *)event
offset: (NSSize)mouseOffset
slideBack: (BOOL)slideBack; /* mosx */
@ -580,7 +559,7 @@ already been laid out. */
/*** Spell checking ***/
-(int) spellCheckerDocumentTag;
-(NSInteger) spellCheckerDocumentTag;
/*** Smart copy/paste/delete support ***/
@ -606,7 +585,7 @@ already been laid out. */
-(void) setTypingAttributes: (NSDictionary *)attrs;
- (void) clickedOnLink: (id)link
atIndex: (unsigned int)charIndex;
atIndex: (NSUInteger)charIndex;
-(void) updateRuler;
-(void) updateFontPanel;
@ -632,10 +611,10 @@ already been laid out. */
- (void) complete: (id)sender;
- (NSArray *) completionsForPartialWordRange: (NSRange)range
indexOfSelectedItem: (int *)index;
indexOfSelectedItem: (NSInteger *)index;
- (void) insertCompletion: (NSString *)word
forPartialWordRange: (NSRange)range
movement: (int)movement
movement: (NSInteger)movement
isFinal: (BOOL)flag;
- (void) performFindPanelAction: (id)sender;
@ -675,7 +654,13 @@ for that text view has been invalidated.
layout manager. */
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
@protocol NSTextViewDelegate <NSObject>
#ifdef __OBJC2__
@optional
#else
@end
@interface NSObject (NSTextViewDelegate)
#endif
-(void) textView: (NSTextView *)textView
clickedOnCell: (id <NSTextAttachmentCell>)cell
@ -683,12 +668,12 @@ layout manager. */
-(void) textView: (NSTextView *)textView
clickedOnCell: (id <NSTextAttachmentCell>)cell
inRect: (NSRect)cellFrame
atIndex: (unsigned)charIndex;
atIndex: (NSUInteger)charIndex;
-(BOOL) textView: (NSTextView *)textView clickedOnLink: (id)link;
-(BOOL) textView: (NSTextView *)textView
clickedOnLink: (id)link
atIndex: (unsigned)charIndex;
atIndex: (NSUInteger)charIndex;
-(void) textView: (NSTextView *)textView
doubleClickedOnCell: (id <NSTextAttachmentCell>)cell
@ -696,16 +681,17 @@ doubleClickedOnCell: (id <NSTextAttachmentCell>)cell
-(void) textView: (NSTextView *)textView
doubleClickedOnCell: (id <NSTextAttachmentCell>)cell
inRect: (NSRect)cellFrame
atIndex: (unsigned)charIndex;
atIndex: (NSUInteger)charIndex;
-(void) textView: (NSTextView *)view
draggedCell: (id <NSTextAttachmentCell>)cell
inRect: (NSRect)rect event:(NSEvent *)event;
inRect: (NSRect)rect
event:(NSEvent *)event;
-(void) textView: (NSTextView *)view
draggedCell: (id <NSTextAttachmentCell>)cell
inRect: (NSRect)rect
event: (NSEvent *)event
atIndex: (unsigned)charIndex;
atIndex: (NSUInteger)charIndex;
-(NSRange) textView: (NSTextView *)textView
willChangeSelectionFromCharacterRange: (NSRange)oldSelectedCharRange
@ -729,10 +715,10 @@ replacementString will be nil. */
- (NSArray *) textView: (NSTextView *)textView
completions: (NSArray *)words
forPartialWordRange: (NSRange)range
indexOfSelectedItem: (int *)index;
indexOfSelectedItem: (NSInteger *)index;
- (NSString *) textView: (NSTextView *)textView
willDisplayToolTip: (NSString *)tooltip
forCharacterAtIndex: (unsigned int)index;
forCharacterAtIndex: (NSUInteger)index;
- (void) textViewDidChangeTypingAttributes: (NSNotification *)notification;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)

2
Headers/AppKit/NSToolbar.h
View file

@ -74,7 +74,7 @@ APPKIT_EXPORT NSString *NSToolbarWillAddItemNotification;
@interface NSToolbar : NSObject
{
NSMutableDictionary *_configurationDictionary;
NSDictionary *_configurationDictionary;
id _delegate;
NSString *_identifier;
NSString *_selectedItemIdentifier;

29
Headers/AppKit/NSView.h
View file

@ -53,8 +53,8 @@
@class NSView;
@class NSWindow;
typedef int NSTrackingRectTag;
typedef int NSToolTipTag;
typedef NSInteger NSTrackingRectTag;
typedef NSInteger NSToolTipTag;
/** Describes the type of border used by an NSView.
<list>
@ -64,12 +64,13 @@ typedef int NSToolTipTag;
<item>NSGrooveBorder</item>
</list>
*/
typedef enum _NSBorderType {
enum _NSBorderType {
NSNoBorder,
NSLineBorder,
NSBezelBorder,
NSGrooveBorder
} NSBorderType;
};
typedef NSUInteger NSBorderType;
/*
* autoresize constants which NSView uses in
@ -115,7 +116,7 @@ PACKAGE_SCOPE
@protected
NSRect _invalidRect;
NSRect _visibleRect;
int _gstate;
NSInteger _gstate;
void *_nextKeyView;
void *_previousKeyView;
@ -124,7 +125,7 @@ PACKAGE_SCOPE
* Flags for internal use by NSView and it's subclasses.
*/
struct _rFlagsType {
unsigned flipped_view:1; /* Deprecated and unused. */
unsigned flipped_view:1; /* Flipped state the last time we checked. */
unsigned has_subviews:1; /* The view has subviews. */
unsigned has_currects:1; /* The view has cursor rects. */
unsigned has_trkrects:1; /* The view has tracking rects. */
@ -149,7 +150,7 @@ PACKAGE_SCOPE
BOOL _is_hidden;
BOOL _in_live_resize;
unsigned int _autoresizingMask;
NSUInteger _autoresizingMask;
NSFocusRingType _focusRingType;
NSRect _autoresizingFrameError;
}
@ -176,7 +177,7 @@ PACKAGE_SCOPE
#endif
- (void) replaceSubview: (NSView*)oldView
with: (NSView*)newView;
- (void) sortSubviewsUsingFunction: (int (*)(id ,id ,void*))compare
- (void) sortSubviewsUsingFunction: (NSComparisonResult (*)(id ,id ,void*))compare
context: (void*)context;
- (NSArray*) subviews;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
@ -266,8 +267,8 @@ PACKAGE_SCOPE
- (void) resizeSubviewsWithOldSize: (NSSize)oldSize;
- (void) setAutoresizesSubviews: (BOOL)flag;
- (BOOL) autoresizesSubviews;
- (void) setAutoresizingMask: (unsigned int)mask;
- (unsigned int) autoresizingMask;
- (void) setAutoresizingMask: (NSUInteger)mask;
- (NSUInteger) autoresizingMask;
- (void) resizeWithOldSuperviewSize: (NSSize)oldSize;
/*
@ -328,7 +329,7 @@ PACKAGE_SCOPE
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (BOOL) wantsDefaultClipping;
- (BOOL) needsToDrawRect: (NSRect)aRect;
- (void) getRectsBeingDrawn: (const NSRect **)rects count: (int *)count;
- (void) getRectsBeingDrawn: (const NSRect **)rects count: (NSInteger *)count;
/*
* Live resize support
@ -339,7 +340,7 @@ PACKAGE_SCOPE
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (BOOL) preservesContentDuringLiveResize;
- (void) getRectsExposedDuringLiveResize: (NSRect[4])exposedRects count: (int *)count;
- (void) getRectsExposedDuringLiveResize: (NSRect[4])exposedRects count: (NSInteger *)count;
- (NSRect) rectPreservedDuringLiveResize;
#endif
@ -349,7 +350,7 @@ PACKAGE_SCOPE
*/
- (void) allocateGState;
- (void) releaseGState;
- (int) gState;
- (NSInteger) gState;
- (void) renewGState;
- (void) setUpGState;
@ -536,7 +537,7 @@ PACKAGE_SCOPE
- (BOOL) knowsPageRange: (NSRange*)range;
#endif
- (NSPoint) locationOfPrintRect: (NSRect)aRect;
- (NSRect) rectForPage: (int)page;
- (NSRect) rectForPage: (NSInteger)page;
- (CGFloat) widthAdjustLimit;
/*

77
Headers/AppKit/NSWindow.h
View file

@ -104,21 +104,23 @@ enum {
NSMiniWindowMask = 128 /* GNUstep extension - miniwindows */
};
typedef enum _NSSelectionDirection {
enum _NSSelectionDirection {
NSDirectSelection,
NSSelectingNext,
NSSelectingPrevious
} NSSelectionDirection;
};
typedef NSUInteger NSSelectionDirection;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_2, GS_API_LATEST)
typedef enum _NSWindowButton
enum _NSWindowButton
{
NSWindowCloseButton = 0,
NSWindowMiniaturizeButton,
NSWindowZoomButton,
NSWindowToolbarButton,
NSWindowDocumentIconButton
} NSWindowButton;
};
typedef NSUInteger NSWindowButton;
#endif
APPKIT_EXPORT NSSize NSIconSize;
@ -179,9 +181,9 @@ PACKAGE_SCOPE
id _lastRightMouseDownView;
id _lastOtherMouseDownView;
id _lastDragView;
int _lastDragOperationMask;
int _windowNum;
int _gstate;
NSInteger _lastDragOperationMask;
NSInteger _windowNum;
NSInteger _gstate;
id _defaultButtonCell;
NSGraphicsContext *_context;
@ -195,8 +197,8 @@ PACKAGE_SCOPE
NSPoint _lastPoint;
@protected
NSBackingStoreType _backingType;
unsigned _styleMask;
int _windowLevel;
NSUInteger _styleMask;
NSInteger _windowLevel;
PACKAGE_SCOPE
NSRect _rectNeedingFlush;
NSMutableArray *_rectsBeingDrawn;
@ -205,8 +207,8 @@ PACKAGE_SCOPE
NSWindowDepth _depthLimit;
NSWindowController *_windowController;
int _counterpart;
float _alphaValue;
NSInteger _counterpart;
CGFloat _alphaValue;
NSMutableArray *_children;
NSWindow *_parent;
@ -276,7 +278,7 @@ PACKAGE_SCOPE
* Both rectangles are expressed in screen coordinates.
*/
+ (NSRect) contentRectForFrameRect: (NSRect)aRect
styleMask: (unsigned int)aStyle;
styleMask: (NSUInteger)aStyle;
/**
* Returns the rectangle which would be used for the on-screen frame of
@ -285,15 +287,15 @@ PACKAGE_SCOPE
* Both rectangles are expressed in screen coordinates.
*/
+ (NSRect) frameRectForContentRect: (NSRect)aRect
styleMask: (unsigned int)aStyle;
styleMask: (NSUInteger)aStyle;
/**
* Returns the smallest frame width that will fit the given title
* and style. This is the on-screen width of the window including
* decorations.
*/
+ (float) minFrameWidthWithTitle: (NSString *)aTitle
styleMask: (unsigned int)aStyle;
+ (CGFloat) minFrameWidthWithTitle: (NSString *)aTitle
styleMask: (NSUInteger)aStyle;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
- (NSRect) contentRectForFrameRect: (NSRect)frameRect;
@ -303,7 +305,7 @@ PACKAGE_SCOPE
* Initializing and getting a new NSWindow object
*/
- (id) initWithContentRect: (NSRect)contentRect
styleMask: (unsigned int)aStyle
styleMask: (NSUInteger)aStyle
backing: (NSBackingStoreType)bufferingType
defer: (BOOL)flag;
@ -314,7 +316,7 @@ PACKAGE_SCOPE
* the window style mask.
*/
- (id) initWithContentRect: (NSRect)contentRect
styleMask: (unsigned int)aStyle
styleMask: (NSUInteger)aStyle
backing: (NSBackingStoreType)bufferingType
defer: (BOOL)flag
screen: (NSScreen*)aScreen;
@ -331,6 +333,19 @@ PACKAGE_SCOPE
*/
- (NSPoint) convertScreenToBase: (NSPoint)aPoint;
/**
* Converts aRect from the coordinate system of the screen
* to the coordinate system of the window.
*/
- (NSRect) convertRectFromScreen: (NSRect)aRect;
/**
* Converts aRect from the window coordinate system to a rect in
* the screen coordinate system.
*/
- (NSRect) convertRectToScreen: (NSRect)aRect;
/**
* Returns the frame of the receiver ... the rectangular area that the window
* (including any border, title, and other decorations) occupies on screen.
@ -380,7 +395,7 @@ PACKAGE_SCOPE
- (NSPoint) cascadeTopLeftFromPoint: (NSPoint)topLeftPoint;
- (void) center;
- (int) resizeFlags;
- (NSInteger) resizeFlags;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void) setFrame: (NSRect)frameRect
display: (BOOL)displayFlag
@ -446,10 +461,10 @@ PACKAGE_SCOPE
- (void) orderFrontRegardless;
- (void) orderOut: (id)sender;
- (void) orderWindow: (NSWindowOrderingMode)place
relativeTo: (int)otherWin;
relativeTo: (NSInteger)otherWin;
- (BOOL) isVisible;
- (int) level;
- (void) setLevel: (int)newLevel;
- (NSInteger) level;
- (void) setLevel: (NSInteger)newLevel;
- (void) becomeKeyWindow;
- (void) becomeMainWindow;
@ -497,8 +512,8 @@ PACKAGE_SCOPE
/*
* Window device attributes
*/
- (int) windowNumber;
- (int) gState;
- (NSInteger) windowNumber;
- (NSInteger) gState;
- (NSDictionary*) deviceDescription;
- (NSBackingStoreType) backingType;
- (void) setBackingType: (NSBackingStoreType)type;
@ -506,7 +521,7 @@ PACKAGE_SCOPE
- (void) setOneShot: (BOOL)flag;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)
- (NSGraphicsContext*) graphicsContext;
- (float) userSpaceScaleFactor;
- (CGFloat) userSpaceScaleFactor;
#endif
@ -547,12 +562,12 @@ PACKAGE_SCOPE
* Aiding event handling
*/
- (NSEvent*) currentEvent;
- (NSEvent*) nextEventMatchingMask: (unsigned int)mask;
- (NSEvent*) nextEventMatchingMask: (unsigned int)mask
- (NSEvent*) nextEventMatchingMask: (NSUInteger)mask;
- (NSEvent*) nextEventMatchingMask: (NSUInteger)mask
untilDate: (NSDate*)expiration
inMode: (NSString*)mode
dequeue: (BOOL)deqFlag;
- (void) discardEventsMatchingMask: (unsigned int)mask
- (void) discardEventsMatchingMask: (NSUInteger)mask
beforeEvent: (NSEvent*)lastEvent;
- (void) postEvent: (NSEvent*)event
atStart: (BOOL)flag;
@ -673,12 +688,12 @@ PACKAGE_SCOPE
- (void) setContentView: (NSView*)aView;
- (void) setBackgroundColor: (NSColor*)color;
- (NSColor*) backgroundColor;
- (unsigned int) styleMask;
- (NSUInteger) styleMask;
#if OS_API_VERSION(GS_API_MACOSX, GS_API_LATEST)
- (void) setHasShadow: (BOOL)hasShadow;
- (BOOL) hasShadow;
- (void) setAlphaValue: (float)windowAlpha;
- (float) alphaValue;
- (void) setAlphaValue: (CGFloat)windowAlpha;
- (CGFloat) alphaValue;
- (void) setOpaque: (BOOL)isOpaque;
- (BOOL) isOpaque;
#endif
@ -726,7 +741,7 @@ PACKAGE_SCOPE
*/
#if OS_API_VERSION(MAC_OS_X_VERSION_10_2, GS_API_LATEST)
+ (NSButton *) standardWindowButton: (NSWindowButton)button
forStyleMask: (unsigned int) mask;
forStyleMask: (NSUInteger) mask;
- (NSButton *) standardWindowButton: (NSWindowButton)button;
#endif
#if OS_API_VERSION(MAC_OS_X_VERSION_10_4, GS_API_LATEST)

185
Headers/AppKit/PSOperators.h
View file

@ -39,43 +39,43 @@
/* Color operations */
/* ----------------------------------------------------------------------- */
static inline void
PScurrentalpha(float* a)
PScurrentalpha(CGFloat* a)
__attribute__((unused));
static inline void
PScurrentcmykcolor(float* c, float* m, float* y, float* k)
PScurrentcmykcolor(CGFloat* c, CGFloat* m, CGFloat* y, CGFloat* k)
__attribute__((unused));
static inline void
PScurrentgray(float* gray)
PScurrentgray(CGFloat* gray)
__attribute__((unused));
static inline void
PScurrenthsbcolor(float* h, float* s, float* b)
PScurrenthsbcolor(CGFloat* h, CGFloat* s, CGFloat* b)
__attribute__((unused));
static inline void
PScurrentrgbcolor(float* r, float* g, float* b)
PScurrentrgbcolor(CGFloat* r, CGFloat* g, CGFloat* b)
__attribute__((unused));
static inline void
PSsetalpha(float a)
PSsetalpha(CGFloat a)
__attribute__((unused));
static inline void
PSsetcmykcolor(float c, float m, float y, float k)
PSsetcmykcolor(CGFloat c, CGFloat m, CGFloat y, CGFloat k)
__attribute__((unused));
static inline void
PSsetgray(float gray)
PSsetgray(CGFloat gray)
__attribute__((unused));
static inline void
PSsethsbcolor(float h, float s, float b)
PSsethsbcolor(CGFloat h, CGFloat s, CGFloat b)
__attribute__((unused));
static inline void
PSsetrgbcolor(float r, float g, float b)
PSsetrgbcolor(CGFloat r, CGFloat g, CGFloat b)
__attribute__((unused));
@ -84,11 +84,11 @@ __attribute__((unused));
/* Text operations */
/* ----------------------------------------------------------------------- */
static inline void
PSashow(float x, float y, const char* s)
PSashow(CGFloat x, CGFloat y, const char* s)
__attribute__((unused));
static inline void
PSawidthshow(float cx, float cy, int c, float ax, float ay, const char* s)
PSawidthshow(CGFloat cx, CGFloat cy, int c, CGFloat ax, CGFloat ay, const char* s)
__attribute__((unused));
static inline void
@ -100,19 +100,19 @@ PSshow(const char* s)
__attribute__((unused));
static inline void
PSwidthshow(float x, float y, int c, const char* s)
PSwidthshow(CGFloat x, CGFloat y, int c, const char* s)
__attribute__((unused));
static inline void
PSxshow(const char* s, const float* numarray, int size)
PSxshow(const char* s, const CGFloat* numarray, int size)
__attribute__((unused));
static inline void
PSxyshow(const char* s, const float* numarray, int size)
PSxyshow(const char* s, const CGFloat* numarray, int size)
__attribute__((unused));
static inline void
PSyshow(const char* s, const float* numarray, int size)
PSyshow(const char* s, const CGFloat* numarray, int size)
__attribute__((unused));
@ -133,7 +133,7 @@ PSinitgraphics()
__attribute__((unused));
static inline void
PSsetgstate(int gst)
PSsetgstate(NSInteger gst)
__attribute__((unused));
@ -142,7 +142,7 @@ __attribute__((unused));
/* Gstate operations */
/* ----------------------------------------------------------------------- */
static inline void
PScurrentflat(float* flatness)
PScurrentflat(CGFloat* flatness)
__attribute__((unused));
static inline void
@ -154,15 +154,15 @@ PScurrentlinejoin(int* linejoin)
__attribute__((unused));
static inline void
PScurrentlinewidth(float* width)
PScurrentlinewidth(CGFloat* width)
__attribute__((unused));
static inline void
PScurrentmiterlimit(float* limit)
PScurrentmiterlimit(CGFloat* limit)
__attribute__((unused));
static inline void
PScurrentpoint(float* x, float* y)
PScurrentpoint(CGFloat* x, CGFloat* y)
__attribute__((unused));
static inline void
@ -170,15 +170,15 @@ PScurrentstrokeadjust(int* b)
__attribute__((unused));
static inline void
PSsetdash(const float* pat, int size, float offset)
PSsetdash(const CGFloat* pat, NSInteger size, CGFloat offset)
__attribute__((unused));
static inline void
PSsetflat(float flatness)
PSsetflat(CGFloat flatness)
__attribute__((unused));
static inline void
PSsethalftonephase(float x, float y)
PSsethalftonephase(CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
@ -190,11 +190,11 @@ PSsetlinejoin(int linejoin)
__attribute__((unused));
static inline void
PSsetlinewidth(float width)
PSsetlinewidth(CGFloat width)
__attribute__((unused));
static inline void
PSsetmiterlimit(float limit)
PSsetmiterlimit(CGFloat limit)
__attribute__((unused));
static inline void
@ -206,7 +206,7 @@ __attribute__((unused));
/* Matrix operations */
/* ----------------------------------------------------------------------- */
static inline void
PSconcat(const float* m)
PSconcat(const CGFloat* m)
__attribute__((unused));
static inline void
@ -214,15 +214,15 @@ PSinitmatrix()
__attribute__((unused));
static inline void
PSrotate(float angle)
PSrotate(CGFloat angle)
__attribute__((unused));
static inline void
PSscale(float x, float y)
PSscale(CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
PStranslate(float x, float y)
PStranslate(CGFloat x, CGFloat y)
__attribute__((unused));
@ -231,15 +231,15 @@ __attribute__((unused));
/* Paint operations */
/* ----------------------------------------------------------------------- */
static inline void
PSarc(float x, float y, float r, float angle1, float angle2)
PSarc(CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2)
__attribute__((unused));
static inline void
PSarcn(float x, float y, float r, float angle1, float angle2)
PSarcn(CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2)
__attribute__((unused));
static inline void
PSarct(float x1, float y1, float x2, float y2, float r)
PSarct(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat r)
__attribute__((unused));
static inline void
@ -251,7 +251,7 @@ PSclosepath()
__attribute__((unused));
static inline void
PScurveto(float x1, float y1, float x2, float y2, float x3, float y3)
PScurveto(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3)
__attribute__((unused));
static inline void
@ -275,11 +275,11 @@ PSinitclip()
__attribute__((unused));
static inline void
PSlineto(float x, float y)
PSlineto(CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
PSmoveto(float x, float y)
PSmoveto(CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
@ -287,23 +287,23 @@ PSnewpath()
__attribute__((unused));
static inline void
PSpathbbox(float* llx, float* lly, float* urx, float* ury)
PSpathbbox(CGFloat* llx, CGFloat* lly, CGFloat* urx, CGFloat* ury)
__attribute__((unused));
static inline void
PSrcurveto(float x1, float y1, float x2, float y2, float x3, float y3)
PSrcurveto(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3)
__attribute__((unused));
static inline void
PSrectclip(float x, float y, float w, float h)
PSrectclip(CGFloat x, CGFloat y, CGFloat w, CGFloat h)
__attribute__((unused));
static inline void
PSrectfill(float x, float y, float w, float h)
PSrectfill(CGFloat x, CGFloat y, CGFloat w, CGFloat h)
__attribute__((unused));
static inline void
PSrectstroke(float x, float y, float w, float h)
PSrectstroke(CGFloat x, CGFloat y, CGFloat w, CGFloat h)
__attribute__((unused));
static inline void
@ -311,11 +311,11 @@ PSreversepath()
__attribute__((unused));
static inline void
PSrlineto(float x, float y)
PSrlineto(CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
PSrmoveto(float x, float y)
PSrmoveto(CGFloat x, CGFloat y)
__attribute__((unused));
static inline void
@ -331,15 +331,15 @@ __attribute__((unused));
/* Graphics Extensions Ops */
/*-------------------------------------------------------------------------*/
static inline void
PScomposite(float x, float y, float w, float h, int gstateNum, float dx, float dy, int op)
PScomposite(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, NSCompositingOperation op)
__attribute__((unused));
static inline void
PScompositerect(float x, float y, float w, float h, int op)
PScompositerect(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSCompositingOperation op)
__attribute__((unused));
static inline void
PSdissolve(float x, float y, float w, float h, int gstateNum, float dx, float dy, float delta)
PSdissolve(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, CGFloat delta)
__attribute__((unused));
@ -360,61 +360,61 @@ __attribute__((unused));
/* Color operations */
/* ----------------------------------------------------------------------- */
static inline void
PScurrentalpha(float* a)
PScurrentalpha(CGFloat* a)
{
DPScurrentalpha(DEFCTXT, a);
}
static inline void
PScurrentcmykcolor(float* c, float* m, float* y, float* k)
PScurrentcmykcolor(CGFloat* c, CGFloat* m, CGFloat* y, CGFloat* k)
{
DPScurrentcmykcolor(DEFCTXT, c, m, y, k);
}
static inline void
PScurrentgray(float* gray)
PScurrentgray(CGFloat* gray)
{
DPScurrentgray(DEFCTXT, gray);
}
static inline void
PScurrenthsbcolor(float* h, float* s, float* b)
PScurrenthsbcolor(CGFloat* h, CGFloat* s, CGFloat* b)
{
DPScurrenthsbcolor(DEFCTXT, h, s, b);
}
static inline void
PScurrentrgbcolor(float* r, float* g, float* b)
PScurrentrgbcolor(CGFloat* r, CGFloat* g, CGFloat* b)
{
DPScurrentrgbcolor(DEFCTXT, r, g, b);
}
static inline void
PSsetalpha(float a)
PSsetalpha(CGFloat a)
{
DPSsetalpha(DEFCTXT, a);
}
static inline void
PSsetcmykcolor(float c, float m, float y, float k)
PSsetcmykcolor(CGFloat c, CGFloat m, CGFloat y, CGFloat k)
{
DPSsetcmykcolor(DEFCTXT, c, m, y, k);
}
static inline void
PSsetgray(float gray)
PSsetgray(CGFloat gray)
{
DPSsetgray(DEFCTXT, gray);
}
static inline void
PSsethsbcolor(float h, float s, float b)
PSsethsbcolor(CGFloat h, CGFloat s, CGFloat b)
{
DPSsethsbcolor(DEFCTXT, h, s, b);
}
static inline void
PSsetrgbcolor(float r, float g, float b)
PSsetrgbcolor(CGFloat r, CGFloat g, CGFloat b)
{
DPSsetrgbcolor(DEFCTXT, r, g, b);
}
@ -437,13 +437,13 @@ PSwindowlist(int __attribute__((unused)) d,
/* Text operations */
/* ----------------------------------------------------------------------- */
static inline void
PSashow(float x, float y, const char* s)
PSashow(CGFloat x, CGFloat y, const char* s)
{
DPSashow(DEFCTXT, x, y, s);
}
static inline void
PSawidthshow(float cx, float cy, int c, float ax, float ay, const char* s)
PSawidthshow(CGFloat cx, CGFloat cy, int c, CGFloat ax, CGFloat ay, const char* s)
{
DPSawidthshow(DEFCTXT, cx, cy, c, ax, ay, s);
}
@ -461,25 +461,25 @@ PSshow(const char* s)
}
static inline void
PSwidthshow(float x, float y, int c, const char* s)
PSwidthshow(CGFloat x, CGFloat y, int c, const char* s)
{
DPSwidthshow(DEFCTXT, x, y, c, s);
}
static inline void
PSxshow(const char* s, const float* numarray, int size)
PSxshow(const char* s, const CGFloat* numarray, int size)
{
DPSxshow(DEFCTXT, s, numarray, size);
}
static inline void
PSxyshow(const char* s, const float* numarray, int size)
PSxyshow(const char* s, const CGFloat* numarray, int size)
{
DPSxyshow(DEFCTXT, s, numarray, size);
}
static inline void
PSyshow(const char* s, const float* numarray, int size)
PSyshow(const char* s, const CGFloat* numarray, int size)
{
DPSyshow(DEFCTXT, s, numarray, size);
}
@ -508,7 +508,7 @@ PSinitgraphics()
}
static inline void
PSsetgstate(int gst)
PSsetgstate(NSInteger gst)
{
DPSsetgstate(DEFCTXT, gst);
}
@ -519,7 +519,7 @@ PSsetgstate(int gst)
/* Gstate operations */
/* ----------------------------------------------------------------------- */
static inline void
PScurrentflat(float* flatness)
PScurrentflat(CGFloat* flatness)
{
DPScurrentflat(DEFCTXT, flatness);
}
@ -537,19 +537,19 @@ PScurrentlinejoin(int* linejoin)
}
static inline void
PScurrentlinewidth(float* width)
PScurrentlinewidth(CGFloat* width)
{
DPScurrentlinewidth(DEFCTXT, width);
}
static inline void
PScurrentmiterlimit(float* limit)
PScurrentmiterlimit(CGFloat* limit)
{
DPScurrentmiterlimit(DEFCTXT, limit);
}
static inline void
PScurrentpoint(float* x, float* y)
PScurrentpoint(CGFloat* x, CGFloat* y)
{
DPScurrentpoint(DEFCTXT, x, y);
}
@ -561,19 +561,19 @@ PScurrentstrokeadjust(int* b)
}
static inline void
PSsetdash(const float* pat, int size, float offset)
PSsetdash(const CGFloat* pat, NSInteger size, CGFloat offset)
{
DPSsetdash(DEFCTXT, pat, size, offset);
}
static inline void
PSsetflat(float flatness)
PSsetflat(CGFloat flatness)
{
DPSsetflat(DEFCTXT, flatness);
}
static inline void
PSsethalftonephase(float x, float y)
PSsethalftonephase(CGFloat x, CGFloat y)
{
DPSsethalftonephase(DEFCTXT, x, y);
}
@ -591,13 +591,13 @@ PSsetlinejoin(int linejoin)
}
static inline void
PSsetlinewidth(float width)
PSsetlinewidth(CGFloat width)
{
DPSsetlinewidth(DEFCTXT, width);
}
static inline void
PSsetmiterlimit(float limit)
PSsetmiterlimit(CGFloat limit)
{
DPSsetmiterlimit(DEFCTXT, limit);
}
@ -613,7 +613,7 @@ PSsetstrokeadjust(int b)
/* Matrix operations */
/* ----------------------------------------------------------------------- */
static inline void
PSconcat(const float* m)
PSconcat(const CGFloat* m)
{
DPSconcat(DEFCTXT, m);
}
@ -625,19 +625,19 @@ PSinitmatrix()
}
static inline void
PSrotate(float angle)
PSrotate(CGFloat angle)
{
DPSrotate(DEFCTXT, angle);
}
static inline void
PSscale(float x, float y)
PSscale(CGFloat x, CGFloat y)
{
DPSscale(DEFCTXT, x, y);
}
static inline void
PStranslate(float x, float y)
PStranslate(CGFloat x, CGFloat y)
{
DPStranslate(DEFCTXT, x, y);
}
@ -648,19 +648,19 @@ PStranslate(float x, float y)
/* Paint operations */
/* ----------------------------------------------------------------------- */
static inline void
PSarc(float x, float y, float r, float angle1, float angle2)
PSarc(CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2)
{
DPSarc(DEFCTXT, x, y, r, angle1, angle2);
}
static inline void
PSarcn(float x, float y, float r, float angle1, float angle2)
PSarcn(CGFloat x, CGFloat y, CGFloat r, CGFloat angle1, CGFloat angle2)
{
DPSarcn(DEFCTXT, x, y, r, angle1, angle2);
}
static inline void
PSarct(float x1, float y1, float x2, float y2, float r)
PSarct(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat r)
{
DPSarct(DEFCTXT, x1, y1, x2, y2, r);
}
@ -678,7 +678,7 @@ PSclosepath()
}
static inline void
PScurveto(float x1, float y1, float x2, float y2, float x3, float y3)
PScurveto(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3)
{
DPScurveto(DEFCTXT, x1, y1, x2, y2, x3, y3);
}
@ -714,13 +714,13 @@ PSinitclip()
}
static inline void
PSlineto(float x, float y)
PSlineto(CGFloat x, CGFloat y)
{
DPSlineto(DEFCTXT, x, y);
}
static inline void
PSmoveto(float x, float y)
PSmoveto(CGFloat x, CGFloat y)
{
DPSmoveto(DEFCTXT, x, y);
}
@ -732,31 +732,31 @@ PSnewpath()
}
static inline void
PSpathbbox(float* llx, float* lly, float* urx, float* ury)
PSpathbbox(CGFloat* llx, CGFloat* lly, CGFloat* urx, CGFloat* ury)
{
DPSpathbbox(DEFCTXT, llx, lly, urx, ury);
}
static inline void
PSrcurveto(float x1, float y1, float x2, float y2, float x3, float y3)
PSrcurveto(CGFloat x1, CGFloat y1, CGFloat x2, CGFloat y2, CGFloat x3, CGFloat y3)
{
DPSrcurveto(DEFCTXT, x1, y1, x2, y2, x3, y3);
}
static inline void
PSrectclip(float x, float y, float w, float h)
PSrectclip(CGFloat x, CGFloat y, CGFloat w, CGFloat h)
{
DPSrectclip(DEFCTXT, x, y, w, h);
}
static inline void
PSrectfill(float x, float y, float w, float h)
PSrectfill(CGFloat x, CGFloat y, CGFloat w, CGFloat h)
{
DPSrectfill(DEFCTXT, x, y, w, h);
}
static inline void
PSrectstroke(float x, float y, float w, float h)
PSrectstroke(CGFloat x, CGFloat y, CGFloat w, CGFloat h)
{
DPSrectstroke(DEFCTXT, x, y, w, h);
}
@ -768,13 +768,13 @@ PSreversepath()
}
static inline void
PSrlineto(float x, float y)
PSrlineto(CGFloat x, CGFloat y)
{
DPSrlineto(DEFCTXT, x, y);
}
static inline void
PSrmoveto(float x, float y)
PSrmoveto(CGFloat x, CGFloat y)
{
DPSrmoveto(DEFCTXT, x, y);
}
@ -796,19 +796,20 @@ PSshfill(NSDictionary *shaderDictionary)
/* Graphics Extensions Ops */
/*-------------------------------------------------------------------------*/
static inline void
PScomposite(float x, float y, float w, float h, int gstateNum, float dx, float dy, int op)
PScomposite(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum,
CGFloat dx, CGFloat dy, NSCompositingOperation op)
{
DPScomposite(DEFCTXT, x, y, w, h, gstateNum, dx, dy, op);
}
static inline void
PScompositerect(float x, float y, float w, float h, int op)
PScompositerect(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSCompositingOperation op)
{
DPScompositerect(DEFCTXT, x, y, w, h, op);
}
static inline void
PSdissolve(float x, float y, float w, float h, int gstateNum, float dx, float dy, float delta)
PSdissolve(CGFloat x, CGFloat y, CGFloat w, CGFloat h, NSInteger gstateNum, CGFloat dx, CGFloat dy, CGFloat delta)
{
DPSdissolve(DEFCTXT, x, y, w, h, gstateNum, dx, dy, delta);
}

1
Images/GNUmakefile
View file

@ -79,6 +79,7 @@ Images_RESOURCE_FILES = \
common_Home.tiff \
common_HomeDirectory.tiff \
common_ImageFolder.tiff \
common_Info.tiff\
common_LeftTabStop.tiff \
common_LibraryFolder.tiff \
common_MiniWindowTile.tiff \

72
Images/common_Info.svg Normal file
View file

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="48"
height="48"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="New document 1">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="-92.525361"
inkscape:cy="29.471973"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:window-width="1074"
inkscape:window-height="589"
inkscape:window-x="131"
inkscape:window-y="68"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-181.04,-365.04218)">
<text
xml:space="preserve"
style="font-size:47.44845581px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Italic"
x="197.02121"
y="405.1272"
id="text2985"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan2987"
x="197.02121"
y="405.1272"
style="font-style:italic;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:URW Palladio L;-inkscape-font-specification:URW Palladio L Bold Italic">i</tspan></text>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
Images/common_Info.tiff Normal file
View file

Binary file not shown.

79
Images/nsmapping.strings
View file

@ -1,34 +1,59 @@
/* This file contains the mapping of the OPENSTEP names of the images to the
actual files where the GNUstep keeps them. The format is the "strings"
format and content is trivial. */
/* This file maps the old OPENSTEP and GNUstep names of the images to the
standard theme image names (declared as constants in GSTheme.h) or icon
names (declared as constants in their related header).
NSApplicationIcon = GNUstep;
NSSwitch = common_SwitchOff;
NSHighlightedSwitch = common_SwitchOn;
NSRadioButton = common_RadioOff;
NSHighlightedRadioButton = common_RadioOn;
AppleMenuImage = GNUstepMenuImage;
NSMenuCheckmark = common_2DCheckMark;
NSMenuArrow = common_3DArrowRight;
NSMenuMixedState = common_2DDash;
NSComboArrow = common_ComboBoxEllipsis;
GSClosedHandCursor = common_ClosedHandCursor;
GSOpenHandCursor = common_OpenHandCursor;
GSDragCopyCursor = common_copyCursor;
GSDragLinkCursor = common_linkCursor;
GSOperationNotAllowedCursor = common_noCursor;
For now, the GNUstep names also represent the actual file names in the
Images directory. As a result, this mapping is also used to access the
image files at loading time. In the long run, the images could just be
renamed to the standard theme image names (without breaking compatibility
with existing applications and themes, since NSImage checks this mapping
in +imageNamed:).
The format is the "strings" format and content is trivial. */
/* We do not remap the application icon to GNUstep */
/* GNUstep = NSApplicationIcon; */
common_SwitchOff = GSSwitch;
NSSwitch = GSSwitch;
common_SwitchOn = GSSwitchSelected;
NSHighlightedSwitch = GSSwitchSelected;
common_RadioOff = GSRadio;
NSRadioButton = GSRadio;
common_RadioOn = GSRadioSelected;
NSHighlightedRadioButton = GSRadioSelected;
GNUstepMenuImage = GSApplicationMenuIcon;
AppleMenuImage = GSApplicationMenuIcon;
common_3DArrowRight = GSMenuArrow;
NSMenuArrow = GSMenuArrow;
common_2DCheckMark = GSMenuSelected;
NSMenuCheckmark = GSMenuSelected;
common_2DDash = GSMenuMixed;
NSMenuMixedState = GSMenuMixed;
common_ComboBoxEllipsis = GSComboArrow;
NSComboArrow = GSComboArrow;
common_ClosedHandCursor = GSClosedHandCursor;
common_OpenHandCursor = GSOpenHandCursor;
common_copyCursor = GSDragCopyCursor;
common_linkCursor = GSDragLinkCursor;
common_noCursor = GSOperationNotAllowedCursor;
/* Toolbar images */
NSToolbarCustomizeToolbarItemImage = common_ToolbarCustomizeToolbarItem;
NSToolbarPrint = common_Printer;
NSToolbarShowColors = common_ToolbarShowColorsItem;
NSToolbarShowFonts = common_ToolbarShowFontsItem;
common_ToolbarCustomizeToolbarItem = NSToolbarCustomizeToolbarItemImage;
common_Printer = NSToolbarPrint;
common_ToolbarShowColorsItem = NSToolbarShowColors;
common_ToolbarShowFontsItem = NSToolbarShowFonts;
/* Misc. */
NSColorPanel = common_ToolbarShowColorsItem;
NSComputer = common_Root_PC;
NSStopProgressTemplate = GSStop;
NSFontPanel = common_ToolbarShowFontsItem;
NSFolder = common_Folder;
common_ToolbarShowColorsItem = NSColorPanel;
common_Root_PC = NSComputer;
GSStop = NSStopProgressTemplate;
common_ToolbarShowFontsItem = NSFontPanel;
common_Folder = NSFolder;
common_Info = NSInfo;

341
Resources/English.lproj/Localizable.strings
View file

@ -1,35 +1,35 @@
/***
English.lproj/Localizable.strings
updated by make_strings 2011-01-15 12:04:36 +0100
updated by make_strings 2013-02-08 11:57:22 +0100
add comments above this one
***/
/*** Keys found in multiple places ***/
/* File: ../Source/GSNibLoading.m:192 */
/* File: ../Source/GSNibLoading.m:193 */
/* Comment: Info */
/* File: ../Source/NSApplication.m:2841 */
/* File: ../Source/NSApplication.m:2878 */
/* Comment: Title of the Info Panel */
/* File: ../Source/NSMenu.m:258 */
"Info" = "Info";
/* File: ../Source/GSNibLoading.m:175 */
/* File: ../Source/GSNibLoading.m:176 */
/* Comment: Quit */
/* File: ../Source/NSApplication.m:3432 */
/* File: ../Source/NSApplication.m:4142 */
/* File: ../Source/NSDocumentController.m:1040 */
/* File: ../Source/NSApplication.m:3442 */
/* File: ../Source/NSApplication.m:4207 */
/* File: ../Source/NSDocumentController.m:1049 */
"Quit" = "Quit";
/* File: ../Source/NSAlert.m:384 */
/* File: ../Source/NSDocument.m:474 */
/* File: ../Source/NSDocument.m:815 */
/* File: ../Source/NSDocument.m:1658 */
/* File: ../Source/NSDocumentController.m:946 */
/* File: ../Source/NSDocumentController.m:978 */
/* File: ../Source/NSSavePanel.m:303 */
/* File: ../Source/NSSavePanel.m:1277 */
/* File: ../Source/NSSavePanel.m:1347 */
/* File: ../Source/NSDocument.m:1660 */
/* File: ../Source/NSDocumentController.m:955 */
/* File: ../Source/NSDocumentController.m:987 */
/* File: ../Source/NSSavePanel.m:317 */
/* File: ../Source/NSSavePanel.m:1306 */
/* File: ../Source/NSSavePanel.m:1379 */
"Cancel" = "Cancel";
/* File: ../Source/NSAlert.m:389 */
@ -38,110 +38,93 @@ add comments above this one
/* File: ../Source/NSDocument.m:474 */
/* File: ../Source/NSDocument.m:815 */
/* File: ../Source/NSDocument.m:1184 */
/* File: ../Source/NSSavePanel.m:424 */
/* File: ../Source/NSSavePanel.m:1274 */
/* File: ../Source/NSSavePanel.m:1313 */
/* File: ../Source/NSSavePanel.m:1323 */
/* File: ../Source/NSSavePanel.m:1334 */
/* File: ../Source/NSSavePanel.m:1345 */
/* File: ../Source/NSDocument.m:1183 */
/* File: ../Source/NSSavePanel.m:434 */
/* File: ../Source/NSSavePanel.m:1303 */
/* File: ../Source/NSSavePanel.m:1342 */
/* File: ../Source/NSSavePanel.m:1355 */
/* File: ../Source/NSSavePanel.m:1366 */
/* File: ../Source/NSSavePanel.m:1377 */
"Save" = "Save";
/* File: ../Source/NSDocument.m:1180 */
/* File: ../Source/NSSavePanel.m:898 */
"Save As" = "Save As";
/* File: ../Source/GSHelpManagerPanel.m:101 */
/* File: ../Source/NSAlert.m:1833 */
/* File: ../Source/NSPrintOperation.m:681 */
/* File: ../Source/NSPrintPanel.m:289 */
/* File: ../Source/NSSavePanel.m:319 */
/* File: ../Source/NSAlert.m:1830 */
/* File: ../Source/NSPrintOperation.m:678 */
/* File: ../Source/NSPrintPanel.m:408 */
/* File: ../Source/NSSavePanel.m:333 */
"OK" = "OK";
/* File: ../Source/GSPrintOperation.m:159 */
/* File: ../Source/NSSavePanel.m:1325 */
/* File: ../Source/NSSavePanel.m:1336 */
/* File: ../Source/GSPrintOperation.m:157 */
/* File: ../Source/NSSavePanel.m:1357 */
/* File: ../Source/NSSavePanel.m:1368 */
"Dismiss" = "Dismiss";
/* File: ../Source/GSPrintOperation.m:157 */
/* File: ../Source/NSFontPanel.m:698 */
/* File: ../Source/GSPrintOperation.m:155 */
/* File: ../Source/NSFontPanel.m:706 */
"Preview" = "Preview";
/* File: ../Source/NSDocument.m:1656 */
/* File: ../Source/NSDocument.m:1658 */
/* File: ../Source/NSFontPanel.m:688 */
/* File: ../Source/NSDocument.m:1660 */
/* File: ../Source/NSFontPanel.m:696 */
"Revert" = "Revert";
/* File: ../Source/NSColorPanel.m:234 */
/* File: ../Source/NSColorPanel.m:244 */
/* File: ../Source/NSToolbarItem.m:1076 */
"Colors" = "Colors";
/* File: ../Source/NSPageLayout.m:979 */
/* File: ../Source/NSPageLayout.m:1050 */
/* File: ../Source/NSPrintPanel.m:458 */
/* File: ../Source/NSPrintPanel.m:504 */
/* File: ../Source/NSPrintPanel.m:630 */
/* File: ../Source/NSPrintPanel.m:676 */
"Unknown" = "Unknown";
/* File: ../Source/GSHelpManagerPanel.m:70 */
/* File: ../Source/NSHelpPanel.m:151 */
/* File: ../Source/NSHelpPanel.m:154 */
"Help" = "Help";
/* File: ../Source/Functions.m:83 */
/* Flag: untranslated */
/* File: ../Source/NSApplication.m:999 */
/* Flag: unmatched */
/* File: ../Source/NSDocument.m:1109 */
/* File: ../Source/NSPrintPanel.m:350 */
"File Type" = "File Type";
/* File: ../Source/GSCharacterPanel.m:173 */
/* File: ../Source/NSPageLayout.m:971 */
"Name" = "Name";
/* File: ../Source/GSCharacterPanel.m:154 */
/* File: ../Source/NSFontPanel.m:738 */
"Character Panel" = "Character Panel";
/*** Strings from ../Source/Functions.m ***/
/* File: ../Source/Functions.m:85 */
"Cannot load the main model file '%@'"
= "Cannot load the main model file '%@'";
/* File: ../Source/NSPrintPanel.m:471 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:606 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:613 */
/* Flag: untranslated */
"Manual" = "Manual";
/*** Unmatched/untranslated keys ***/
/* File: ../Source/GSThemeInspector.m:141 */
/* Flag: untranslated */
"Version: %@" = "Version: %@";
/* File: ../Source/NSPrintOperation.m:680 */
/* Flag: untranslated */
"Error" = "Error";
/* File: ../Source/NSPrintOperation.m:680 */
/* Flag: untranslated */
"Printing error: %@" = "Printing error: %@";
/* File: ../Source/NSPrintPanel.m:160 */
/* Flag: untranslated */
"Print Panel" = "Print Panel";
/* File: ../Source/NSSpellChecker.m:748 */
/* Flag: untranslated */
"Guess" = "Guess";
/*** Strings from ../Source/GSCharacterPanel.m ***/
/* File: ../Source/GSCharacterPanel.m:182 */
"Code Point" = "Code Point";
/* File: ../Source/GSCharacterPanel.m:191 */
"Unicode Block" = "Unicode Block";
/*** Strings from ../Source/GSInfoPanel.m ***/
/* File: ../Source/GSInfoPanel.m:434 */
/* File: ../Source/GSInfoPanel.m:451 */
"Author: " = "Author: ";
/* File: ../Source/GSInfoPanel.m:438 */
/* File: ../Source/GSInfoPanel.m:455 */
"Authors: " = "Authors: ";
/* File: ../Source/GSInfoPanel.m:380 */
/* File: ../Source/GSInfoPanel.m:396 */
"Copyright Information Not Available"
= "Copyright Information Not Available";
/* File: ../Source/GSInfoPanel.m:465 */
/* File: ../Source/GSInfoPanel.m:192 */
/* File: ../Source/GSInfoPanel.m:482 */
/* File: ../Source/GSInfoPanel.m:187 */
"Current theme" = "Current theme";
/* File: ../Source/GSInfoPanel.m:338 */
/* File: ../Source/GSInfoPanel.m:339 */
"Release: " = "Release: ";
/*** Strings from ../Source/GSPrintOperation.m ***/
/* File: ../Source/GSPrintOperation.m:158 */
/* File: ../Source/GSPrintOperation.m:156 */
"Problem running the preview application '%@' perhaps you need to set your NSPreviewApp user default"
= "Problem running the preview application '%@' perhaps you need to set your NSPreviewApp user default";
@ -149,25 +132,42 @@ add comments above this one
/*** Strings from ../Source/GSTextFinder.m ***/
/* File: ../Source/GSTextFinder.m:408 */
"%d replaced" = "%d replaced";
/* File: ../Source/GSTextFinder.m:332 */
/* File: ../Source/GSTextFinder.m:381 */
/* File: ../Source/GSTextFinder.m:332 */
"Not found" = "Not found";
/*** Strings from ../Source/GSThemeDrawing.m ***/
/* File: ../Source/GSThemeDrawing.m:185 */
"?" = "?";
/*** Strings from ../Source/GSThemeInspector.m ***/
/* File: ../Source/GSThemeInspector.m:141 */
"Version: %@" = "Version: %@";
/*** Strings from ../Source/GSThemePanel.m ***/
/* File: ../Source/GSThemePanel.m:228 */
/* File: ../Source/GSThemePanel.m:229 */
/* File: ../Source/GSThemePanel.m:197 */
"Make this the default theme" = "Make this the default theme";
/* File: ../Source/GSThemePanel.m:233 */
/* File: ../Source/GSThemePanel.m:193 */
/* File: ../Source/GSThemePanel.m:234 */
"Revert default theme" = "Revert default theme";
/* File: ../Source/GSThemePanel.m:115 */
"Themes" = "Themes";
/*** Strings from ../Source/GSToolbarView.m ***/
/* File: ../Source/GSToolbarView.m:894 */
"Customize Toolbar" = "Customize Toolbar";
/*** Strings from ../Source/NSAlert.m ***/
/* File: ../Source/NSAlert.m:2003 */
/* File: ../Source/NSAlert.m:2000 */
"Alert" = "Alert";
/* File: ../Source/NSAlert.m:2001 */
"No information" = "No information";
/*** Strings from ../Source/NSApplication.m ***/
@ -186,66 +186,64 @@ add comments above this one
"Critical Error in %@" = "Critical Error in %@";
/* File: ../Source/NSApplication.m:141 */
"Debug" = "Debug";
/* File: ../Source/NSApplication.m:4138 */
/* File: ../Source/NSApplication.m:4203 */
"Hide" = "Hide";
/* File: ../Source/NSApplication.m:1213 */
/* File: ../Source/NSApplication.m:1198 */
"Problem during launch app notification: %@"
= "Problem during launch app notification: %@";
/* File: ../Source/NSApplication.m:4132 */
/* File: ../Source/NSApplication.m:4197 */
"Show" = "Show";
/* File: ../Source/NSApplication.m:304 */
"Unable to find backend %@" = "Unable to find backend %@";
/* File: ../Source/NSApplication.m:946 */
/* File: ../Source/NSApplication.m:972 */
"[NSApplication -init] called more than once"
= "[NSApplication -init] called more than once";
/* File: ../Source/NSApplication.m:3290 */
/* File: ../Source/NSApplication.m:3315 */
"reported exception - %@" = "reported exception - %@";
/*** Strings from ../Source/NSAttributedString.m ***/
/* File: ../Source/NSAttributedString.m:1062 */
/* File: ../Source/NSAttributedString.m:1083 */
/* Comment: Error description */
/* File: ../Source/NSAttributedString.m:1039 */
/* File: ../Source/NSAttributedString.m:1060 */
/* Comment: Error description */
"Could not create data for type." = "Could not create data for type.";
/* File: ../Source/NSAttributedString.m:906 */
/* File: ../Source/NSAttributedString.m:927 */
/* Comment: Error description */
"Could not load data from URL." = "Could not load data from URL.";
/* File: ../Source/NSAttributedString.m:842 */
/* File: ../Source/NSAttributedString.m:863 */
/* Comment: Error description */
"Could not load data." = "Could not load data.";
/* File: ../Source/NSAttributedString.m:762 */
/* Comment: Error description */
"No data specified for data loading."
= "No data specified for data loading.";
/* File: ../Source/NSAttributedString.m:1012 */
/* Comment: Error description */
/* File: ../Source/NSAttributedString.m:802 */
/* File: ../Source/NSAttributedString.m:1033 */
/* Comment: Error description */
"No type specified for data." = "No type specified for data.";
/*** Strings from ../Source/NSBitmapImageRep.m ***/
/* File: ../Source/NSBitmapImageRep.m:1656 */
/* File: ../Source/NSBitmapImageRep.m:1645 */
"CCITTFAX3 Compression" = "CCITTFAX3 Compression";
/* File: ../Source/NSBitmapImageRep.m:1657 */
/* File: ../Source/NSBitmapImageRep.m:1646 */
"CCITTFAX4 Compression" = "CCITTFAX4 Compression";
/* File: ../Source/NSBitmapImageRep.m:1659 */
/* File: ../Source/NSBitmapImageRep.m:1648 */
"JPEG Compression" = "JPEG Compression";
/* File: ../Source/NSBitmapImageRep.m:1658 */
/* File: ../Source/NSBitmapImageRep.m:1647 */
"LZW Compression" = "LZW Compression";
/* File: ../Source/NSBitmapImageRep.m:1660 */
/* File: ../Source/NSBitmapImageRep.m:1649 */
"NEXT Compression" = "NEXT Compression";
/* File: ../Source/NSBitmapImageRep.m:1655 */
/* File: ../Source/NSBitmapImageRep.m:1644 */
"No Compression" = "No Compression";
/* File: ../Source/NSBitmapImageRep.m:1662 */
/* File: ../Source/NSBitmapImageRep.m:1651 */
"Old JPEG Compression" = "Old JPEG Compression";
/* File: ../Source/NSBitmapImageRep.m:1661 */
/* File: ../Source/NSBitmapImageRep.m:1650 */
"PackBits Compression" = "PackBits Compression";
/*** Strings from ../Source/NSColorPanel.m ***/
/* File: ../Source/NSColorPanel.m:298 */
/* File: ../Source/NSColorPanel.m:308 */
"Opacity" = "Opacity";
@ -271,7 +269,7 @@ add comments above this one
/*** Strings from ../Source/NSDocument.m ***/
/* File: ../Source/NSDocument.m:1657 */
/* File: ../Source/NSDocument.m:1659 */
"%@ has been edited. Are you sure you want to undo changes?"
= "%@ has been edited. Are you sure you want to undo changes?";
/* File: ../Source/NSDocument.m:473 */
@ -287,51 +285,51 @@ add comments above this one
"Could not load file %@." = "Could not load file %@.";
/* File: ../Source/NSDocument.m:813 */
"File Error" = "File Error";
/* File: ../Source/NSDocument.m:1109 */
"File Type" = "File Type";
/* File: ../Source/NSDocument.m:141 */
/* File: ../Source/NSDocument.m:118 */
/* File: ../Source/NSDocument.m:141 */
"Load failed" = "Load failed";
/* File: ../Source/NSDocument.m:1181 */
/* File: ../Source/NSDocument.m:1179 */
"Save As" = "Save As";
/* File: ../Source/NSDocument.m:1180 */
"Save To" = "Save To";
/* File: ../Source/NSDocument.m:569 */
"Untitled-%d" = "Untitled-%d";
/*** Strings from ../Source/NSDocumentController.m ***/
/* File: ../Source/NSDocumentController.m:1673 */
/* File: ../Source/NSDocumentController.m:1692 */
"Clear List" = "Clear List";
/* File: ../Source/NSDocumentController.m:1047 */
/* File: ../Source/NSDocumentController.m:1056 */
"Power Off" = "Power Off";
/* File: ../Source/NSDocumentController.m:957 */
/* File: ../Source/NSDocumentController.m:999 */
/* File: ../Source/NSDocumentController.m:966 */
/* File: ../Source/NSDocumentController.m:1008 */
"Quit Anyway" = "Quit Anyway";
/* File: ../Source/NSDocumentController.m:997 */
/* File: ../Source/NSDocumentController.m:955 */
/* File: ../Source/NSDocumentController.m:1006 */
/* File: ../Source/NSDocumentController.m:964 */
"Review Unsaved" = "Review Unsaved";
/* File: ../Source/NSDocumentController.m:954 */
/* File: ../Source/NSDocumentController.m:1004 */
/* File: ../Source/NSDocumentController.m:963 */
/* File: ../Source/NSDocumentController.m:1013 */
"You have unsaved documents" = "You have unsaved documents";
/*** Strings from ../Source/NSFontPanel.m ***/
/* File: ../Source/NSFontPanel.m:1108 */
/* File: ../Source/NSFontPanel.m:1138 */
"Family" = "Family";
/* File: ../Source/NSFontPanel.m:544 */
/* File: ../Source/NSFontPanel.m:553 */
"Font Panel" = "Font Panel";
/* File: ../Source/NSFontPanel.m:569 */
/* File: ../Source/NSFontPanel.m:578 */
"Font preview" = "Font preview";
/* File: ../Source/NSFontPanel.m:239 */
/* File: ../Source/NSFontPanel.m:241 */
"Multiple fonts selected" = "Multiple fonts selected";
/* File: ../Source/NSFontPanel.m:794 */
/* File: ../Source/NSFontPanel.m:818 */
"NoFace" = "NoFace";
/* File: ../Source/NSFontPanel.m:786 */
/* File: ../Source/NSFontPanel.m:810 */
"NoFamily" = "NoFamily";
/* File: ../Source/NSFontPanel.m:711 */
/* File: ../Source/NSFontPanel.m:719 */
"Set" = "Set";
/* File: ../Source/NSFontPanel.m:630 */
/* File: ../Source/NSFontPanel.m:639 */
"Size" = "Size";
/* File: ../Source/NSFontPanel.m:1112 */
/* File: ../Source/NSFontPanel.m:1142 */
"Typeface" = "Typeface";
@ -341,13 +339,13 @@ add comments above this one
/*** Strings from ../Source/NSOpenPanel.m ***/
/* File: ../Source/NSOpenPanel.m:93 */
/* File: ../Source/NSOpenPanel.m:92 */
"Open" = "Open";
/*** Strings from ../Source/NSPageLayout.m ***/
/* File: ../Source/NSPageLayout.m:744 */
/* File: ../Source/NSPageLayout.m:746 */
/* File: ../Source/NSPageLayout.m:749 */
/* File: ../Source/NSPageLayout.m:747 */
"(none)" = "(none)";
/* File: ../Source/NSPageLayout.m:976 */
"Bottom Margin" = "Bottom Margin";
@ -357,8 +355,6 @@ add comments above this one
"Landscape" = "Landscape";
/* File: ../Source/NSPageLayout.m:977 */
"Left Margin" = "Left Margin";
/* File: ../Source/NSPageLayout.m:971 */
"Name" = "Name";
/* File: ../Source/NSPageLayout.m:973 */
"Orientation" = "Orientation";
/* File: ../Source/NSPageLayout.m:1028 */
@ -371,58 +367,95 @@ add comments above this one
"Top Margin" = "Top Margin";
/*** Strings from ../Source/NSPrintOperation.m ***/
/* File: ../Source/NSPrintOperation.m:677 */
"Error" = "Error";
/* File: ../Source/NSPrintOperation.m:677 */
"Printing error: %@" = "Printing error: %@";
/*** Strings from ../Source/NSPrintPanel.m ***/
/* File: ../Source/NSPrintPanel.m:173 */
/* File: ../Source/NSPrintPanel.m:179 */
"1 up" = "1 up";
/* File: ../Source/NSPrintPanel.m:173 */
/* File: ../Source/NSPrintPanel.m:179 */
"2 up" = "2 up";
/* File: ../Source/NSPrintPanel.m:173 */
/* File: ../Source/NSPrintPanel.m:179 */
"4 up" = "4 up";
/* File: ../Source/NSPrintPanel.m:173 */
/* File: ../Source/NSPrintPanel.m:179 */
"6 up" = "6 up";
/* File: ../Source/NSPrintPanel.m:174 */
/* File: ../Source/NSPrintPanel.m:180 */
"8 up" = "8 up";
/* File: ../Source/NSPrintPanel.m:288 */
/* File: ../Source/NSPrintPanel.m:407 */
"Faxing of print file not implemented"
= "Faxing of print file not implemented";
/* File: ../Source/NSPrintPanel.m:288 */
/* File: ../Source/NSPrintPanel.m:643 */
/* File: ../Source/NSPrintPanel.m:781 */
/* File: ../Source/NSPrintPanel.m:774 */
"Manual" = "Manual";
/* File: ../Source/NSPrintPanel.m:145 */
"Print Panel" = "Print Panel";
/* File: ../Source/NSPrintPanel.m:407 */
"Sorry" = "Sorry";
/*** Strings from ../Source/NSSavePanel.m ***/
/* File: ../Source/NSSavePanel.m:239 */
/* File: ../Source/NSSavePanel.m:423 */
/* File: ../Source/NSSavePanel.m:276 */
"Home" = "Home";
/* File: ../Source/NSSavePanel.m:292 */
"Mount" = "Mount";
/* File: ../Source/NSSavePanel.m:433 */
/* File: ../Source/NSSavePanel.m:250 */
"Name:" = "Name:";
/* File: ../Source/NSSavePanel.m:1315 */
/* File: ../Source/NSSavePanel.m:1344 */
"No" = "No";
/* File: ../Source/NSSavePanel.m:1713 */
/* File: ../Source/NSSavePanel.m:1761 */
"Reading Directory " = "Reading Directory ";
/* File: ../Source/NSSavePanel.m:1347 */
/* File: ../Source/NSSavePanel.m:1379 */
"Replace" = "Replace";
/* File: ../Source/NSSavePanel.m:1324 */
/* File: ../Source/NSSavePanel.m:241 */
"Show Hidden Files" = "Show Hidden Files";
/* File: ../Source/NSSavePanel.m:1356 */
"The directory '%@' could not be created."
= "The directory '%@' could not be created.";
/* File: ../Source/NSSavePanel.m:1314 */
/* File: ../Source/NSSavePanel.m:1343 */
"The directory '%@' does not exist, do you want to create it?"
= "The directory '%@' does not exist, do you want to create it?";
/* File: ../Source/NSSavePanel.m:1346 */
/* File: ../Source/NSSavePanel.m:1378 */
"The file '%@' in '%@' exists. Replace it?"
= "The file '%@' in '%@' exists. Replace it?";
/* File: ../Source/NSSavePanel.m:1335 */
/* File: ../Source/NSSavePanel.m:1367 */
"The path '%@' is not a directory." = "The path '%@' is not a directory.";
/* File: ../Source/NSSavePanel.m:1270 */
/* File: ../Source/NSSavePanel.m:1262 */
/* File: ../Source/NSSavePanel.m:308 */
"Unmount" = "Unmount";
/* File: ../Source/NSSavePanel.m:1299 */
/* File: ../Source/NSSavePanel.m:1291 */
"Use .%@" = "Use .%@";
/* File: ../Source/NSSavePanel.m:1315 */
/* File: ../Source/NSSavePanel.m:1344 */
"Yes" = "Yes";
/* File: ../Source/NSSavePanel.m:1269 */
/* File: ../Source/NSSavePanel.m:1298 */
"You cannot save this document with extension '.%@'.\nThe required extension is '.%@'."
= "You cannot save this document with extension '.%@'.\nThe required extension is '.%@'.";
/* File: ../Source/NSSavePanel.m:1261 */
/* File: ../Source/NSSavePanel.m:1290 */
"You have used the extension '.%@'.\nThe standard extension is '.%@'.'"
= "You have used the extension '.%@'.\nThe standard extension is '.%@'.'";
/*** Strings from ../Source/NSSpellChecker.m ***/
/* File: ../Source/NSSpellChecker.m:731 */
"Guess" = "Guess";
/*** Strings from ../Source/NSTextView.m ***/
/* File: ../Source/NSTextView.m:651 */
"Copy" = "Copy";
/* File: ../Source/NSTextView.m:650 */
"Cut" = "Cut";
/* File: ../Source/NSTextView.m:5847 */
"No Suggestions" = "No Suggestions";
/* File: ../Source/NSTextView.m:652 */
"Paste" = "Paste";
/*** Strings from ../Source/NSToolbarItem.m ***/
/* File: ../Source/NSToolbarItem.m:1122 */
"Customize" = "Customize";
@ -439,7 +472,7 @@ add comments above this one
/*** Strings from ../Source/NSWindow.m ***/
/* File: ../Source/NSWindow.m:5053 */
/* File: ../Source/NSWindow.m:5192 */
"Hide Toolbar" = "Hide Toolbar";
/* File: ../Source/NSWindow.m:5055 */
/* File: ../Source/NSWindow.m:5194 */
"Show Toolbar" = "Show Toolbar";

BIN
Resources/Esperanto.lproj/Localizable.strings
View file

Binary file not shown.

459
Resources/French.lproj/Localizable.strings
View file

@ -5,7 +5,7 @@
/***
French.lproj/Localizable.strings
updated by make_strings 2010-03-15 23:05:53 +0100
updated by make_strings 2013-02-08 11:56:02 +0100
add comments above this one
***/
@ -13,179 +13,271 @@ add comments above this one
/*** Keys found in multiple places ***/
/* File: ../Source/GSHelpManagerPanel.m:101 */
/* File: ../Source/NSAlert.m:1736 */
/* File: ../Source/NSPrintOperation.m:681 */
/* File: ../Source/NSPrintPanel.m:288 */
/* File: ../Source/NSSavePanel.m:317 */
/* File: ../Source/NSAlert.m:1830 */
/* File: ../Source/NSPrintOperation.m:678 */
/* File: ../Source/NSPrintPanel.m:408 */
/* File: ../Source/NSSavePanel.m:333 */
"OK" = "OK";
/* File: ../Source/GSNibLoading.m:187 */
/* File: ../Source/GSNibLoading.m:193 */
/* Comment: Info */
/* File: ../Source/NSApplication.m:2799 */
/* File: ../Source/NSApplication.m:2878 */
/* Comment: Title of the Info Panel */
/* File: ../Source/NSMenu.m:237 */
/* File: ../Source/NSMenu.m:258 */
"Info" = "Info";
/* File: ../Source/GSNibLoading.m:170 */
/* File: ../Source/GSNibLoading.m:176 */
/* Comment: Quit */
/* File: ../Source/NSApplication.m:3397 */
/* File: ../Source/NSDocumentController.m:1036 */
/* File: ../Source/NSApplication.m:3442 */
/* File: ../Source/NSApplication.m:4207 */
/* File: ../Source/NSDocumentController.m:1049 */
"Quit" = "Quitter";
/* File: ../Source/GSPrintOperation.m:159 */
/* File: ../Source/NSSavePanel.m:1312 */
/* File: ../Source/NSSavePanel.m:1323 */
/* File: ../Source/GSPrintOperation.m:157 */
/* File: ../Source/NSSavePanel.m:1357 */
/* File: ../Source/NSSavePanel.m:1368 */
"Dismiss" = "Abandonner";
/* File: ../Source/NSAlert.m:1819 */
/* File: ../Source/NSDocument.m:468 */
/* File: ../Source/NSDocument.m:809 */
/* File: ../Source/NSDocument.m:1609 */
/* File: ../Source/NSDocumentController.m:942 */
/* File: ../Source/NSDocumentController.m:974 */
/* File: ../Source/NSSavePanel.m:301 */
/* File: ../Source/NSSavePanel.m:1264 */
/* File: ../Source/NSSavePanel.m:1334 */
/* File: ../Source/NSAlert.m:384 */
/* File: ../Source/NSDocument.m:474 */
/* File: ../Source/NSDocument.m:815 */
/* File: ../Source/NSDocument.m:1660 */
/* File: ../Source/NSDocumentController.m:955 */
/* File: ../Source/NSDocumentController.m:987 */
/* File: ../Source/NSSavePanel.m:317 */
/* File: ../Source/NSSavePanel.m:1306 */
/* File: ../Source/NSSavePanel.m:1379 */
"Cancel" = "Annuler";
/* File: ../Source/NSAlert.m:1823 */
/* File: ../Source/NSDocument.m:468 */
/* File: ../Source/NSAlert.m:389 */
/* File: ../Source/NSDocument.m:474 */
"Don't Save" = "Fermer sans enregistrer";
/* File: ../Source/NSDocument.m:468 */
/* File: ../Source/NSDocument.m:809 */
/* File: ../Source/NSDocument.m:1163 */
/* File: ../Source/NSSavePanel.m:416 */
/* File: ../Source/NSSavePanel.m:1261 */
/* File: ../Source/NSSavePanel.m:1300 */
/* File: ../Source/NSSavePanel.m:1310 */
/* File: ../Source/NSSavePanel.m:1321 */
/* File: ../Source/NSSavePanel.m:1332 */
/* File: ../Source/NSDocument.m:474 */
/* File: ../Source/NSDocument.m:815 */
/* File: ../Source/NSDocument.m:1183 */
/* File: ../Source/NSSavePanel.m:434 */
/* File: ../Source/NSSavePanel.m:1303 */
/* File: ../Source/NSSavePanel.m:1342 */
/* File: ../Source/NSSavePanel.m:1355 */
/* File: ../Source/NSSavePanel.m:1366 */
/* File: ../Source/NSSavePanel.m:1377 */
"Save" = "Enregistrer";
/* File: ../Source/NSDocument.m:1159 */
/* File: ../Source/NSSavePanel.m:890 */
"Save As" = "Enregistrer sous";
/* File: ../Source/GSHelpManagerPanel.m:70 */
/* File: ../Source/NSHelpPanel.m:153 */
/* File: ../Source/NSHelpPanel.m:154 */
"Help" = "Aide";
/* File: ../Source/GSPrintOperation.m:157 */
/* File: ../Source/NSFontPanel.m:698 */
/* File: ../Source/GSPrintOperation.m:155 */
/* File: ../Source/NSFontPanel.m:706 */
"Preview" = "Aper\U00E7u";
/* File: ../Source/NSDocument.m:1607 */
/* File: ../Source/NSDocument.m:1609 */
/* File: ../Source/NSFontPanel.m:688 */
/* File: ../Source/NSDocument.m:1658 */
/* File: ../Source/NSDocument.m:1660 */
/* File: ../Source/NSFontPanel.m:696 */
"Revert" = "R\U00E9tablir";
/* File: ../Source/NSColorPanel.m:227 */
/* File: ../Source/NSToolbarItem.m:1050 */
/* File: ../Source/NSColorPanel.m:244 */
/* File: ../Source/NSToolbarItem.m:1076 */
"Colors" = "Couleurs";
/* File: ../Source/NSPageLayout.m:989 */
/* File: ../Source/NSPageLayout.m:1060 */
/* File: ../Source/NSPrintPanel.m:457 */
/* File: ../Source/NSPrintPanel.m:503 */
/* File: ../Source/NSPageLayout.m:979 */
/* File: ../Source/NSPageLayout.m:1050 */
/* File: ../Source/NSPrintPanel.m:630 */
/* File: ../Source/NSPrintPanel.m:676 */
"Unknown" = "Inconnu";
/* File: ../Source/NSDocument.m:1109 */
/* File: ../Source/NSPrintPanel.m:350 */
"File Type" = "Type de fichier";
/* File: ../Source/GSCharacterPanel.m:173 */
/* File: ../Source/NSPageLayout.m:971 */
"Name" = "Nom";
/* File: ../Source/GSCharacterPanel.m:154 */
/* Flag: untranslated */
/* File: ../Source/NSFontPanel.m:738 */
/* Flag: untranslated */
"Character Panel" = "Character Panel";
/* File: ../Source/GSTextFinder.m:332 */
/* Flag: untranslated */
/* File: ../Source/GSTextFinder.m:381 */
/* Flag: untranslated */
"Not found" = "Not found";
/*** Unmatched/untranslated keys ***/
/* File: ../Source/GSInfoPanel.m:338 */
/* File: ../Source/GSCharacterPanel.m:182 */
/* Flag: untranslated */
"Code Point" = "Code Point";
/* File: ../Source/GSCharacterPanel.m:191 */
/* Flag: untranslated */
"Unicode Block" = "Unicode Block";
/* File: ../Source/GSInfoPanel.m:339 */
/* Flag: untranslated */
"Release: " = "Release: ";
/* File: ../Source/NSFontPanel.m:786 */
/* File: ../Source/GSTextFinder.m:408 */
/* Flag: untranslated */
"%d replaced" = "%d replaced";
/* File: ../Source/GSToolbarView.m:894 */
/* Flag: untranslated */
"Customize Toolbar" = "Customize Toolbar";
/* File: ../Source/NSAlert.m:2001 */
/* Flag: untranslated */
"No information" = "No information";
/* File: ../Source/NSApplication.m:4197 */
/* Flag: untranslated */
"Show" = "Show";
/* File: ../Source/NSApplication.m:4203 */
/* Flag: untranslated */
"Hide" = "Hide";
/* File: ../Source/NSFontPanel.m:810 */
/* Flag: untranslated */
"NoFamily" = "NoFamily";
/* File: ../Source/NSFontPanel.m:794 */
/* File: ../Source/NSFontPanel.m:818 */
/* Flag: untranslated */
"NoFace" = "NoFace";
/* File: ../Source/NSFontPanel.m:1112 */
/* File: ../Source/NSFontPanel.m:1142 */
/* Flag: untranslated */
"Typeface" = "Typeface";
/* File: ../Source/NSPrintPanel.m:172 */
/* Flag: untranslated */
"1 up" = "1 up";
/* File: ../Source/NSPrintPanel.m:172 */
/* Flag: untranslated */
"2 up" = "2 up";
/* File: ../Source/NSPrintPanel.m:172 */
/* Flag: untranslated */
"4 up" = "4 up";
/* File: ../Source/NSPrintPanel.m:172 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"6 up" = "6 up";
/* File: ../Source/NSPrintPanel.m:173 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"1 up" = "1 up";
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"2 up" = "2 up";
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"4 up" = "4 up";
/* File: ../Source/NSPrintPanel.m:180 */
/* Flag: untranslated */
"8 up" = "8 up";
/* File: ../Source/NSPrintPanel.m:287 */
/* File: ../Source/NSPrintPanel.m:407 */
/* Flag: untranslated */
"Faxing of print file not implemented"
= "Faxing of print file not implemented";
/* File: ../Source/NSSavePanel.m:1248 */
/* File: ../Source/NSSavePanel.m:241 */
/* Flag: untranslated */
"Show Hidden Files" = "Show Hidden Files";
/* File: ../Source/NSSavePanel.m:276 */
/* Flag: untranslated */
"Home" = "Home";
/* File: ../Source/NSSavePanel.m:292 */
/* Flag: untranslated */
"Mount" = "Mount";
/* File: ../Source/NSSavePanel.m:308 */
/* Flag: untranslated */
"Unmount" = "Unmount";
/* File: ../Source/NSSavePanel.m:1290 */
/* Flag: untranslated */
"You have used the extension '.%@'.\nThe standard extension is '.%@'.'"
= "You have used the extension '.%@'.\nThe standard extension is '.%@'.'";
/* File: ../Source/NSSavePanel.m:1256 */
/* File: ../Source/NSSavePanel.m:1298 */
/* Flag: untranslated */
"You cannot save this document with extension '.%@'.\nThe required extension is '.%@'."
= "You cannot save this document with extension '.%@'.\nThe required extension is '.%@'.";
/* File: ../Source/NSSpellChecker.m:741 */
/* File: ../Source/NSSpellChecker.m:731 */
/* Flag: untranslated */
"Guess" = "Guess";
/* File: ../Source/NSTextView.m:650 */
/* Flag: untranslated */
"Cut" = "Cut";
/* File: ../Source/NSTextView.m:651 */
/* Flag: untranslated */
"Copy" = "Copy";
/* File: ../Source/NSTextView.m:652 */
/* Flag: untranslated */
"Paste" = "Paste";
/* File: ../Source/NSTextView.m:5847 */
/* Flag: untranslated */
"No Suggestions" = "No Suggestions";
/* File: ../Source/NSToolbarItem.m:949 */
/* Flag: untranslated */
"Separator" = "Separator";
/*** Strings from ../Source/Functions.m ***/
/* File: ../Source/Functions.m:85 */
"Cannot load the main model file '%@'"
= "Impossible de charger le fichier mod\U00E8le principal '%@'";
/*** Strings from ../Source/GSInfoPanel.m ***/
/* File: ../Source/GSInfoPanel.m:434 */
/* File: ../Source/GSInfoPanel.m:451 */
"Author: " = "Auteur: ";
/* File: ../Source/GSInfoPanel.m:438 */
/* File: ../Source/GSInfoPanel.m:455 */
"Authors: " = "Auteurs: ";
/* File: ../Source/GSInfoPanel.m:380 */
/* File: ../Source/GSInfoPanel.m:396 */
"Copyright Information Not Available"
= "Informations de Copyright Non Disponibles";
/* File: ../Source/GSInfoPanel.m:192 */
/* File: ../Source/GSInfoPanel.m:465 */
/* File: ../Source/GSInfoPanel.m:482 */
/* File: ../Source/GSInfoPanel.m:187 */
"Current theme" = "Th\U00E8me actuel";
/*** Strings from ../Source/GSPrintOperation.m ***/
/* File: ../Source/GSPrintOperation.m:158 */
/* File: ../Source/GSPrintOperation.m:156 */
"Problem running the preview application '%@' perhaps you need to set your NSPreviewApp user default"
= "Probl\U00E8me lors du lancement de l'application de pr\U00E9visualisation '%@', peut-\U00EAtre devriez-vous d\U00E9finir la valeur de NSPreviewApp";
/*** Strings from ../Source/GSThemeDrawing.m ***/
/* File: ../Source/GSThemeDrawing.m:185 */
"?" = "?";
/*** Strings from ../Source/GSThemeInspector.m ***/
/* File: ../Source/GSThemeInspector.m:140 */
/* File: ../Source/GSThemeInspector.m:141 */
"Version: %@" = "Version: %@";
/*** Strings from ../Source/GSThemePanel.m ***/
/* File: ../Source/GSThemePanel.m:227 */
/* File: ../Source/GSThemePanel.m:196 */
/* File: ../Source/GSThemePanel.m:197 */
/* File: ../Source/GSThemePanel.m:229 */
"Make this the default theme" = "Utiliser ce th\U00E8me par d\U00E9fault";
/* File: ../Source/GSThemePanel.m:232 */
/* File: ../Source/GSThemePanel.m:192 */
/* File: ../Source/GSThemePanel.m:193 */
/* File: ../Source/GSThemePanel.m:234 */
"Revert default theme" = "Revenir au th\U00E8me par d\U00E9fault";
/* File: ../Source/GSThemePanel.m:114 */
/* File: ../Source/GSThemePanel.m:115 */
"Themes" = "Th\U00E8mes";
/*** Strings from ../Source/NSAlert.m ***/
/* File: ../Source/NSAlert.m:1912 */
/* File: ../Source/NSAlert.m:2000 */
"Alert" = "Attention";
@ -201,254 +293,247 @@ add comments above this one
/* File: ../Source/NSApplication.m:316 */
"Can't load object file from backend at path %@"
= "Impossible de charger le fichier objet du backend de chemin %@";
/* File: ../Source/NSApplication.m:1000 */
"Cannot load the main model file '%@'"
= "Impossible de charger le fichier mod\U00E8le principal '%@'";
/* File: ../Source/NSApplication.m:135 */
"Critical Error in %@" = "Erreur critique dans %@";
/* File: ../Source/NSApplication.m:141 */
"Debug" = "D\U00E9boguer";
/* File: ../Source/NSApplication.m:1180 */
/* File: ../Source/NSApplication.m:1198 */
"Problem during launch app notification: %@"
= "Probl\U00E8me lors de la notification du lancement de l'application : %@";
/* File: ../Source/NSApplication.m:304 */
"Unable to find backend %@" = "Impossible de trouver le backend %@";
/* File: ../Source/NSApplication.m:924 */
/* File: ../Source/NSApplication.m:972 */
"[NSApplication -init] called more than once"
= "[NSApplication -init] appell\U00E9e plus d'une fois";
/* File: ../Source/NSApplication.m:3255 */
/* File: ../Source/NSApplication.m:3315 */
"reported exception - %@" = "Exception signal\U00E9e - %@";
/*** Strings from ../Source/NSAttributedString.m ***/
/* File: ../Source/NSAttributedString.m:997 */
/* File: ../Source/NSAttributedString.m:1083 */
/* Comment: Error description */
/* File: ../Source/NSAttributedString.m:1020 */
/* File: ../Source/NSAttributedString.m:1060 */
/* Comment: Error description */
"Could not create data for type."
= "Impossible de cr\U00E9er des donn\U00E9es pour ce type.";
/* File: ../Source/NSAttributedString.m:868 */
/* File: ../Source/NSAttributedString.m:927 */
/* Comment: Error description */
"Could not load data from URL."
= "Impossible de charger des donn\U00E9es depuis l'URL.";
/* File: ../Source/NSAttributedString.m:811 */
/* File: ../Source/NSAttributedString.m:863 */
/* Comment: Error description */
"Could not load data." = "Impossible de charger les donn\U00E9es.";
/* File: ../Source/NSAttributedString.m:761 */
/* File: ../Source/NSAttributedString.m:762 */
/* Comment: Error description */
"No data specified for data loading."
= "Pas de donn\U00E9es sp\U00E9cifi\U00E9es.";
/* File: ../Source/NSAttributedString.m:970 */
/* Comment: Error description */
/* File: ../Source/NSAttributedString.m:771 */
/* File: ../Source/NSAttributedString.m:1033 */
/* Comment: Error description */
"No type specified for data."
= "Aucun type pr\U00E9cis\U00E9 pour les donn\U00E9es.";
/*** Strings from ../Source/NSBitmapImageRep.m ***/
/* File: ../Source/NSBitmapImageRep.m:1656 */
/* File: ../Source/NSBitmapImageRep.m:1645 */
"CCITTFAX3 Compression" = "Compression CCITTFAX3";
/* File: ../Source/NSBitmapImageRep.m:1657 */
/* File: ../Source/NSBitmapImageRep.m:1646 */
"CCITTFAX4 Compression" = "Compression CCITTFAX4";
/* File: ../Source/NSBitmapImageRep.m:1659 */
/* File: ../Source/NSBitmapImageRep.m:1648 */
"JPEG Compression" = "Compression JPEG";
/* File: ../Source/NSBitmapImageRep.m:1658 */
/* File: ../Source/NSBitmapImageRep.m:1647 */
"LZW Compression" = "Compression LZW";
/* File: ../Source/NSBitmapImageRep.m:1660 */
/* File: ../Source/NSBitmapImageRep.m:1649 */
"NEXT Compression" = "Compression NEXT";
/* File: ../Source/NSBitmapImageRep.m:1655 */
/* File: ../Source/NSBitmapImageRep.m:1644 */
"No Compression" = "Pas de compression";
/* File: ../Source/NSBitmapImageRep.m:1662 */
/* File: ../Source/NSBitmapImageRep.m:1651 */
"Old JPEG Compression" = "Ancienne compression JPEG";
/* File: ../Source/NSBitmapImageRep.m:1661 */
/* File: ../Source/NSBitmapImageRep.m:1650 */
"PackBits Compression" = "Compression PackBits";
/*** Strings from ../Source/NSColorPanel.m ***/
/* File: ../Source/NSColorPanel.m:290 */
/* File: ../Source/NSColorPanel.m:308 */
"Opacity" = "Opacit\U00E9";
/*** Strings from ../Source/NSColorSpace.m ***/
/* File: ../Source/NSColorSpace.m:141 */
/* Comment: color space */
"CMYK" = "CMYK";
/* File: ../Source/NSColorSpace.m:145 */
/* Comment: color space */
"DeviceN" = "DeviceN";
/* File: ../Source/NSColorSpace.m:137 */
/* Comment: color space */
"Grayscale" = "Niveaux de gris";
/* File: ../Source/NSColorSpace.m:143 */
/* Comment: color space */
"LAB" = "LAB";
"CMYK" = "CMYK";
/* File: ../Source/NSColorSpace.m:147 */
/* Comment: color space */
"DeviceN" = "DeviceN";
/* File: ../Source/NSColorSpace.m:139 */
/* Comment: color space */
"Grayscale" = "Niveaux de gris";
/* File: ../Source/NSColorSpace.m:145 */
/* Comment: color space */
"LAB" = "LAB";
/* File: ../Source/NSColorSpace.m:141 */
/* Comment: color space */
"RGB" = "RGB";
/* File: ../Source/NSColorSpace.m:135 */
/* File: ../Source/NSColorSpace.m:137 */
/* Comment: color space */
"unknown" = "inconnu";
/*** Strings from ../Source/NSDocument.m ***/
/* File: ../Source/NSDocument.m:1608 */
/* File: ../Source/NSDocument.m:1659 */
"%@ has been edited. Are you sure you want to undo changes?"
= "%@ a \U00E9t\U00E9 modifi\U00E9. Etes-vous s\U00FBr de vouloir annuler les modifications ?";
/* File: ../Source/NSDocument.m:467 */
/* File: ../Source/NSDocument.m:473 */
"%@ has changed. Save?" = "%@ a \U00E9t\U00E9 modifi\U00E9. Enregistrer ?";
/* File: ../Source/NSDocument.m:808 */
/* File: ../Source/NSDocument.m:814 */
"Can't create backup file. Save anyways?"
= "Impossible de cr\U00E9er le fichier de sauvegarde. Enregistrer quand m\U006Dme ?";
/* File: ../Source/NSDocument.m:466 */
/* File: ../Source/NSDocument.m:472 */
"Close" = "Fermer";
/* File: ../Source/NSDocument.m:136 */
/* File: ../Source/NSDocument.m:142 */
"Could not load URL %@." = "Impossible de charger l'URL %@.";
/* File: ../Source/NSDocument.m:113 */
/* File: ../Source/NSDocument.m:119 */
"Could not load file %@." = "Impossible de charger le fichier %@.";
/* File: ../Source/NSDocument.m:807 */
/* File: ../Source/NSDocument.m:813 */
"File Error" = "Erreur fichier";
/* File: ../Source/NSDocument.m:1090 */
"File Type" = "Type de fichier";
/* File: ../Source/NSDocument.m:135 */
/* File: ../Source/NSDocument.m:112 */
/* File: ../Source/NSDocument.m:141 */
/* File: ../Source/NSDocument.m:118 */
"Load failed" = "Erreur lors du chargement";
/* File: ../Source/NSDocument.m:1160 */
/* File: ../Source/NSDocument.m:1179 */
"Save As" = "Enregistrer sous";
/* File: ../Source/NSDocument.m:1180 */
"Save To" = "Enregistrer une copie sous";
/* File: ../Source/NSDocument.m:563 */
/* File: ../Source/NSDocument.m:569 */
"Untitled-%d" = "SansTitre-%d";
/*** Strings from ../Source/NSDocumentController.m ***/
/* File: ../Source/NSDocumentController.m:1631 */
/* File: ../Source/NSDocumentController.m:1692 */
"Clear List" = "Vider la liste";
/* File: ../Source/NSDocumentController.m:1043 */
/* File: ../Source/NSDocumentController.m:1056 */
"Power Off" = "Eteindre";
/* File: ../Source/NSDocumentController.m:995 */
/* File: ../Source/NSDocumentController.m:953 */
/* File: ../Source/NSDocumentController.m:1008 */
/* File: ../Source/NSDocumentController.m:966 */
"Quit Anyway" = "Quitter sans enregistrer";
/* File: ../Source/NSDocumentController.m:993 */
/* File: ../Source/NSDocumentController.m:951 */
/* File: ../Source/NSDocumentController.m:1006 */
/* File: ../Source/NSDocumentController.m:964 */
"Review Unsaved" = "Passer en revue";
/* File: ../Source/NSDocumentController.m:1000 */
/* File: ../Source/NSDocumentController.m:950 */
/* File: ../Source/NSDocumentController.m:1013 */
/* File: ../Source/NSDocumentController.m:963 */
"You have unsaved documents"
= "Certains documents ne sont pas sauvegard\U00E9s";
/*** Strings from ../Source/NSFontPanel.m ***/
/* File: ../Source/NSFontPanel.m:1108 */
/* File: ../Source/NSFontPanel.m:1138 */
"Family" = "Famille";
/* File: ../Source/NSFontPanel.m:544 */
/* File: ../Source/NSFontPanel.m:553 */
"Font Panel" = "Choix d'une police";
/* File: ../Source/NSFontPanel.m:569 */
/* File: ../Source/NSFontPanel.m:578 */
"Font preview" = "Aper\U00E7u";
/* File: ../Source/NSFontPanel.m:239 */
/* File: ../Source/NSFontPanel.m:241 */
"Multiple fonts selected" = "Plusieurs polices s\U00E9lectionn\U00E9es";
/* File: ../Source/NSFontPanel.m:711 */
/* File: ../Source/NSFontPanel.m:719 */
"Set" = "Appliquer";
/* File: ../Source/NSFontPanel.m:630 */
/* File: ../Source/NSFontPanel.m:639 */
"Size" = "Taille";
/*** Strings from ../Source/NSMenu.m ***/
/* File: ../Source/NSMenu.m:238 */
/* File: ../Source/NSMenu.m:259 */
"Services" = "Services";
/*** Strings from ../Source/NSOpenPanel.m ***/
/* File: ../Source/NSOpenPanel.m:93 */
/* File: ../Source/NSOpenPanel.m:92 */
"Open" = "Ouvrir";
/*** Strings from ../Source/NSPageLayout.m ***/
/* File: ../Source/NSPageLayout.m:756 */
/* File: ../Source/NSPageLayout.m:754 */
/* File: ../Source/NSPageLayout.m:749 */
/* File: ../Source/NSPageLayout.m:747 */
"(none)" = "(aucun)";
/* File: ../Source/NSPageLayout.m:986 */
/* File: ../Source/NSPageLayout.m:976 */
"Bottom Margin" = "Marge basse";
/* File: ../Source/NSPageLayout.m:982 */
/* File: ../Source/NSPageLayout.m:972 */
"Dimensions" = "Dimensions";
/* File: ../Source/NSPageLayout.m:1042 */
/* File: ../Source/NSPageLayout.m:1032 */
"Landscape" = "Paysage";
/* File: ../Source/NSPageLayout.m:987 */
/* File: ../Source/NSPageLayout.m:977 */
"Left Margin" = "Marge gauche";
/* File: ../Source/NSPageLayout.m:981 */
"Name" = "Nom";
/* File: ../Source/NSPageLayout.m:983 */
/* File: ../Source/NSPageLayout.m:973 */
"Orientation" = "Orientation";
/* File: ../Source/NSPageLayout.m:1038 */
/* File: ../Source/NSPageLayout.m:1028 */
"Portrait" = "Portrait";
/* File: ../Source/NSPageLayout.m:988 */
/* File: ../Source/NSPageLayout.m:978 */
"Right Margin" = "Marge droite";
/* File: ../Source/NSPageLayout.m:984 */
/* File: ../Source/NSPageLayout.m:974 */
"Scale" = "Echelle";
/* File: ../Source/NSPageLayout.m:985 */
/* File: ../Source/NSPageLayout.m:975 */
"Top Margin" = "Marge haute";
/*** Strings from ../Source/NSPrintOperation.m ***/
/* File: ../Source/NSPrintOperation.m:680 */
/* File: ../Source/NSPrintOperation.m:677 */
"Error" = "Erreur";
/* File: ../Source/NSPrintOperation.m:680 */
/* File: ../Source/NSPrintOperation.m:677 */
"Printing error: %@" = "Erreur d'impression: %@";
/*** Strings from ../Source/NSPrintPanel.m ***/
/* File: ../Source/NSPrintPanel.m:470 */
/* File: ../Source/NSPrintPanel.m:612 */
/* File: ../Source/NSPrintPanel.m:605 */
/* File: ../Source/NSPrintPanel.m:781 */
/* File: ../Source/NSPrintPanel.m:774 */
/* File: ../Source/NSPrintPanel.m:643 */
"Manual" = "Manuel";
/* File: ../Source/NSPrintPanel.m:159 */
/* File: ../Source/NSPrintPanel.m:145 */
"Print Panel" = "Impression";
/* File: ../Source/NSPrintPanel.m:287 */
/* File: ../Source/NSPrintPanel.m:407 */
"Sorry" = "D\U00E9sol\U00E9";
/*** Strings from ../Source/NSSavePanel.m ***/
/* File: ../Source/NSSavePanel.m:415 */
/* File: ../Source/NSSavePanel.m:237 */
/* File: ../Source/NSSavePanel.m:433 */
/* File: ../Source/NSSavePanel.m:250 */
"Name:" = "Nom:";
/* File: ../Source/NSSavePanel.m:1302 */
/* File: ../Source/NSSavePanel.m:1344 */
"No" = "Non";
/* File: ../Source/NSSavePanel.m:1705 */
/* File: ../Source/NSSavePanel.m:1761 */
"Reading Directory " = "Lecture du r\U00E9pertoire ";
/* File: ../Source/NSSavePanel.m:1334 */
/* File: ../Source/NSSavePanel.m:1379 */
"Replace" = "Remplacer";
/* File: ../Source/NSSavePanel.m:1311 */
/* File: ../Source/NSSavePanel.m:1356 */
"The directory '%@' could not be created."
= "Impossible de cr\U00E9er le r\U00E9pertoire '%@'.";
/* File: ../Source/NSSavePanel.m:1301 */
/* File: ../Source/NSSavePanel.m:1343 */
"The directory '%@' does not exist, do you want to create it?"
= "Le r\U00E9pertoire '%@' n'existe pas, voulez-vous le cr\U00E9er ?";
/* File: ../Source/NSSavePanel.m:1333 */
/* File: ../Source/NSSavePanel.m:1378 */
"The file '%@' in '%@' exists. Replace it?"
= "Le fichier '%@' existe dans '%@'. Voulez-vous le remplacer ?";
/* File: ../Source/NSSavePanel.m:1322 */
/* File: ../Source/NSSavePanel.m:1367 */
"The path '%@' is not a directory."
= "Le chemin '%@' n'est pas un r\U00E9pertoire.";
/* File: ../Source/NSSavePanel.m:1257 */
/* File: ../Source/NSSavePanel.m:1249 */
/* File: ../Source/NSSavePanel.m:1299 */
/* File: ../Source/NSSavePanel.m:1291 */
"Use .%@" = "Utiliser .%@";
/* File: ../Source/NSSavePanel.m:1302 */
/* File: ../Source/NSSavePanel.m:1344 */
"Yes" = "Oui";
/*** Strings from ../Source/NSToolbarItem.m ***/
/* File: ../Source/NSToolbarItem.m:1096 */
/* File: ../Source/NSToolbarItem.m:1122 */
"Customize" = "Personnaliser";
/* File: ../Source/NSToolbarItem.m:1000 */
/* File: ../Source/NSToolbarItem.m:1021 */
"Flexible Space" = "Espace souple";
/* File: ../Source/NSToolbarItem.m:1073 */
/* File: ../Source/NSToolbarItem.m:1099 */
"Fonts" = "Polices";
/* File: ../Source/NSToolbarItem.m:1119 */
/* File: ../Source/NSToolbarItem.m:1145 */
"Print..." = "Imprimer...";
/* File: ../Source/NSToolbarItem.m:976 */
/* File: ../Source/NSToolbarItem.m:991 */
"Space" = "Espace";
/*** Strings from ../Source/NSWindow.m ***/
/* File: ../Source/NSWindow.m:5023 */
/* File: ../Source/NSWindow.m:5192 */
"Hide Toolbar" = "Cacher la barre d'outils";
/* File: ../Source/NSWindow.m:5025 */
/* File: ../Source/NSWindow.m:5194 */
"Show Toolbar" = "Afficher la barre d'outils";

378
Resources/German.lproj/Localizable.strings
View file

@ -8,206 +8,166 @@
/***
German.lproj/Localizable.strings
updated by make_strings 2011-01-15 11:41:00 +0100
updated by make_strings 2013-02-08 11:57:22 +0100
add comments above this one
***/
/*** Keys found in multiple places ***/
/* File: ../Source/GSPrintOperation.m:159 */
/* File: ../Source/NSSavePanel.m:1325 */
/* File: ../Source/NSSavePanel.m:1336 */
/* File: ../Source/GSPrintOperation.m:157 */
/* File: ../Source/NSSavePanel.m:1357 */
/* File: ../Source/NSSavePanel.m:1368 */
"Dismiss" = "Verwerfen";
/* File: ../Source/GSNibLoading.m:192 */
/* File: ../Source/GSNibLoading.m:193 */
/* Comment: Info */
/* File: ../Source/NSApplication.m:2841 */
/* File: ../Source/NSApplication.m:2878 */
/* Comment: Title of the Info Panel */
/* File: ../Source/NSMenu.m:258 */
"Info" = "Information";
/* File: ../Source/GSNibLoading.m:175 */
/* File: ../Source/GSNibLoading.m:176 */
/* Comment: Quit */
/* File: ../Source/NSApplication.m:3432 */
/* File: ../Source/NSApplication.m:4142 */
/* Flag: untranslated */
/* File: ../Source/NSDocumentController.m:1040 */
/* File: ../Source/NSApplication.m:3442 */
/* File: ../Source/NSApplication.m:4207 */
/* File: ../Source/NSDocumentController.m:1049 */
"Quit" = "Beenden";
/* File: ../Source/NSDocument.m:474 */
/* File: ../Source/NSDocument.m:815 */
/* File: ../Source/NSDocument.m:1184 */
/* File: ../Source/NSSavePanel.m:424 */
/* File: ../Source/NSSavePanel.m:1274 */
/* File: ../Source/NSSavePanel.m:1313 */
/* File: ../Source/NSSavePanel.m:1323 */
/* File: ../Source/NSSavePanel.m:1334 */
/* File: ../Source/NSSavePanel.m:1345 */
/* File: ../Source/NSDocument.m:1183 */
/* File: ../Source/NSSavePanel.m:434 */
/* File: ../Source/NSSavePanel.m:1303 */
/* File: ../Source/NSSavePanel.m:1342 */
/* File: ../Source/NSSavePanel.m:1355 */
/* File: ../Source/NSSavePanel.m:1366 */
/* File: ../Source/NSSavePanel.m:1377 */
"Save" = "Speichern";
/* File: ../Source/NSAlert.m:384 */
/* File: ../Source/NSDocument.m:474 */
/* File: ../Source/NSDocument.m:815 */
/* File: ../Source/NSDocument.m:1658 */
/* File: ../Source/NSDocumentController.m:946 */
/* File: ../Source/NSDocumentController.m:978 */
/* File: ../Source/NSSavePanel.m:303 */
/* File: ../Source/NSSavePanel.m:1277 */
/* File: ../Source/NSSavePanel.m:1347 */
/* File: ../Source/NSDocument.m:1660 */
/* File: ../Source/NSDocumentController.m:955 */
/* File: ../Source/NSDocumentController.m:987 */
/* File: ../Source/NSSavePanel.m:317 */
/* File: ../Source/NSSavePanel.m:1306 */
/* File: ../Source/NSSavePanel.m:1379 */
"Cancel" = "Abbrechen";
/* File: ../Source/NSDocument.m:1180 */
/* File: ../Source/NSSavePanel.m:898 */
"Save As" = "Speichern als";
/* File: ../Source/GSHelpManagerPanel.m:101 */
/* File: ../Source/NSAlert.m:1833 */
/* File: ../Source/NSPrintOperation.m:681 */
/* File: ../Source/NSPrintPanel.m:289 */
/* File: ../Source/NSSavePanel.m:319 */
/* File: ../Source/NSAlert.m:1830 */
/* File: ../Source/NSPrintOperation.m:678 */
/* File: ../Source/NSPrintPanel.m:408 */
/* File: ../Source/NSSavePanel.m:333 */
"OK" = "Ok";
/* File: ../Source/NSAlert.m:389 */
/* File: ../Source/NSDocument.m:474 */
"Don't Save" = "Nicht speichern";
/* File: ../Source/GSPrintOperation.m:157 */
/* File: ../Source/NSFontPanel.m:698 */
/* File: ../Source/GSPrintOperation.m:155 */
/* File: ../Source/NSFontPanel.m:706 */
"Preview" = "Vorschau";
/* File: ../Source/NSDocument.m:1656 */
/* File: ../Source/NSDocument.m:1658 */
/* File: ../Source/NSFontPanel.m:688 */
/* File: ../Source/NSDocument.m:1660 */
/* File: ../Source/NSFontPanel.m:696 */
"Revert" = "Zur\U00FCcksetzen";
/* File: ../Source/NSColorPanel.m:234 */
/* File: ../Source/NSColorPanel.m:244 */
/* File: ../Source/NSToolbarItem.m:1076 */
"Colors" = "Farben";
/* File: ../Source/NSPageLayout.m:979 */
/* File: ../Source/NSPageLayout.m:1050 */
/* File: ../Source/NSPrintPanel.m:458 */
/* File: ../Source/NSPrintPanel.m:504 */
/* File: ../Source/NSPrintPanel.m:630 */
/* File: ../Source/NSPrintPanel.m:676 */
"Unknown" = "Unbekannt";
/* File: ../Source/GSHelpManagerPanel.m:70 */
/* File: ../Source/NSHelpPanel.m:151 */
/* File: ../Source/NSHelpPanel.m:154 */
"Help" = "Hilfe";
/* File: ../Source/GSThemePanel.m:193 */
/* File: ../Source/GSThemePanel.m:233 */
"Revert default theme" = "Standard Thema wiederherstellen";
/* File: ../Source/NSDocument.m:1109 */
/* File: ../Source/NSPrintPanel.m:350 */
"File Type" = "Dateityp";
/* File: ../Source/GSThemePanel.m:197 */
/* File: ../Source/GSThemePanel.m:228 */
"Make this the default theme" = "Zum Standard Thema machen";
/* File: ../Source/GSCharacterPanel.m:173 */
/* File: ../Source/NSPageLayout.m:971 */
"Name" = "Name";
/* File: ../Source/Functions.m:83 */
/* Flag: untranslated */
/* File: ../Source/NSApplication.m:999 */
/* Flag: unmatched */
"Cannot load the main model file '%@'"
= "Kann Haupt-Model-Datei \U00BB%@\U00AB nicht laden";
/* File: ../Source/NSPrintPanel.m:471 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:606 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:613 */
/* Flag: untranslated */
"Manual" = "Manual";
/* File: ../Source/GSCharacterPanel.m:154 */
/* File: ../Source/NSFontPanel.m:738 */
"Character Panel" = "Zeichenauswahl";
/*** Unmatched/untranslated keys ***/
/* File: ../Source/NSFontPanel.m:786 */
/* Flag: untranslated */
"NoFamily" = "NoFamily";
/* File: ../Source/NSFontPanel.m:794 */
/* Flag: untranslated */
"NoFace" = "NoFace";
/* File: ../Source/NSFontPanel.m:1108 */
/* Flag: untranslated */
"Family" = "Family";
/* File: ../Source/NSFontPanel.m:1112 */
/* Flag: untranslated */
"Typeface" = "Typeface";
/* File: ../Source/NSPageLayout.m:974 */
/* Flag: untranslated */
"Scale" = "Scale";
/* File: ../Source/NSPrintOperation.m:680 */
/* Flag: untranslated */
"Error" = "Error";
/* File: ../Source/NSPrintOperation.m:680 */
/* Flag: untranslated */
"Printing error: %@" = "Printing error: %@";
/* File: ../Source/NSPrintPanel.m:160 */
/* Flag: untranslated */
"Print Panel" = "Print Panel";
/* File: ../Source/NSPrintPanel.m:173 */
/* Flag: untranslated */
"1 up" = "1 up";
/* File: ../Source/NSPrintPanel.m:173 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"2 up" = "2 up";
/* File: ../Source/NSPrintPanel.m:173 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"4 up" = "4 up";
/* File: ../Source/NSPrintPanel.m:173 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"6 up" = "6 up";
/* File: ../Source/NSPrintPanel.m:174 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"1 up" = "1 up";
/* File: ../Source/NSPrintPanel.m:180 */
/* Flag: untranslated */
"8 up" = "8 up";
/* File: ../Source/NSPrintPanel.m:288 */
/* File: ../Source/NSSavePanel.m:276 */
/* Flag: untranslated */
"Sorry" = "Sorry";
"Home" = "Home";
/* File: ../Source/NSPrintPanel.m:288 */
/* File: ../Source/NSSavePanel.m:292 */
/* Flag: untranslated */
"Faxing of print file not implemented"
= "Faxing of print file not implemented";
"Mount" = "Mount";
/* File: ../Source/NSSavePanel.m:1713 */
/* File: ../Source/NSSavePanel.m:308 */
/* Flag: untranslated */
"Reading Directory " = "Reading Directory ";
"Unmount" = "Unmount";
/* File: ../Source/NSSpellChecker.m:748 */
/* Flag: untranslated */
"Guess" = "Guess";
/*** Strings from ../Source/Functions.m ***/
/* File: ../Source/Functions.m:85 */
"Cannot load the main model file '%@'"
= "Kann Haupt-Model-Datei \U00BB%@\U00AB nicht laden";
/*** Strings from ../Source/GSCharacterPanel.m ***/
/* File: ../Source/GSCharacterPanel.m:182 */
"Code Point" = "Code Point";
/* File: ../Source/GSCharacterPanel.m:191 */
"Unicode Block" = "Unicode Block";
/*** Strings from ../Source/GSInfoPanel.m ***/
/* File: ../Source/GSInfoPanel.m:434 */
/* File: ../Source/GSInfoPanel.m:451 */
"Author: " = "Autor: ";
/* File: ../Source/GSInfoPanel.m:438 */
/* File: ../Source/GSInfoPanel.m:455 */
"Authors: " = "Autoren: ";
/* File: ../Source/GSInfoPanel.m:380 */
/* File: ../Source/GSInfoPanel.m:396 */
"Copyright Information Not Available"
= "Copyright Information nicht verf\U00FCgbar";
/* File: ../Source/GSInfoPanel.m:192 */
/* File: ../Source/GSInfoPanel.m:465 */
/* File: ../Source/GSInfoPanel.m:482 */
/* File: ../Source/GSInfoPanel.m:187 */
"Current theme" = "Aktuelles Thema";
/* File: ../Source/GSInfoPanel.m:338 */
/* File: ../Source/GSInfoPanel.m:339 */
"Release: " = "Release: ";
/*** Strings from ../Source/GSPrintOperation.m ***/
/* File: ../Source/GSPrintOperation.m:158 */
/* File: ../Source/GSPrintOperation.m:156 */
"Problem running the preview application '%@' perhaps you need to set your NSPreviewApp user default"
= "Vorschau-Anwendung \U00BB%@\U00AB kann nicht ausgef\U00FChrt werden. Vielleicht muss der Default-Eintrag NSPreviewApp gesetzt werden";
@ -220,19 +180,37 @@ add comments above this one
"Not found" = "Nicht gefunden";
/*** Strings from ../Source/GSThemeDrawing.m ***/
/* File: ../Source/GSThemeDrawing.m:185 */
"?" = "?";
/*** Strings from ../Source/GSThemeInspector.m ***/
/* File: ../Source/GSThemeInspector.m:141 */
"Version: %@" = "Version: %@";
/*** Strings from ../Source/GSThemePanel.m ***/
/* File: ../Source/GSThemePanel.m:229 */
/* File: ../Source/GSThemePanel.m:197 */
"Make this the default theme" = "Zum Standard Thema machen";
/* File: ../Source/GSThemePanel.m:234 */
/* File: ../Source/GSThemePanel.m:193 */
"Revert default theme" = "Standard Thema wiederherstellen";
/* File: ../Source/GSThemePanel.m:115 */
"Themes" = "Themen";
/*** Strings from ../Source/GSToolbarView.m ***/
/* File: ../Source/GSToolbarView.m:894 */
"Customize Toolbar" = "Toolbar anpassen";
/*** Strings from ../Source/NSAlert.m ***/
/* File: ../Source/NSAlert.m:2003 */
/* File: ../Source/NSAlert.m:2000 */
"Alert" = "Hinweis";
/* File: ../Source/NSAlert.m:2001 */
"No information" = "Keine Information";
/*** Strings from ../Source/NSApplication.m ***/
@ -251,69 +229,67 @@ add comments above this one
"Critical Error in %@" = "Kritischer Fehler in %@";
/* File: ../Source/NSApplication.m:141 */
"Debug" = "Debug";
/* File: ../Source/NSApplication.m:4138 */
/* File: ../Source/NSApplication.m:4203 */
"Hide" = "Ausblenden";
/* File: ../Source/NSApplication.m:1213 */
/* File: ../Source/NSApplication.m:1198 */
"Problem during launch app notification: %@"
= "Problem beim Starten von App-Notifikation: %@";
/* File: ../Source/NSApplication.m:4132 */
/* File: ../Source/NSApplication.m:4197 */
"Show" = "Anzeigen";
/* File: ../Source/NSApplication.m:304 */
"Unable to find backend %@" = "Backend %@ nicht gefunden";
/* File: ../Source/NSApplication.m:946 */
/* File: ../Source/NSApplication.m:972 */
"[NSApplication -init] called more than once"
= "[NSApplication -init] mehrfach aufgerufen";
/* File: ../Source/NSApplication.m:3290 */
/* File: ../Source/NSApplication.m:3315 */
"reported exception - %@" = "meldet Ausnahme - %@";
/*** Strings from ../Source/NSAttributedString.m ***/
/* File: ../Source/NSAttributedString.m:1039 */
/* File: ../Source/NSAttributedString.m:1060 */
/* Comment: Error description */
/* File: ../Source/NSAttributedString.m:1062 */
/* File: ../Source/NSAttributedString.m:1083 */
/* Comment: Error description */
"Could not create data for type."
= "F\U00FCr den Typ konnten keine Daten erzeugt werden.";
/* File: ../Source/NSAttributedString.m:906 */
/* File: ../Source/NSAttributedString.m:927 */
/* Comment: Error description */
"Could not load data from URL."
= "Die Daten konnten nicht vom URL geladen werden.";
/* File: ../Source/NSAttributedString.m:842 */
/* File: ../Source/NSAttributedString.m:863 */
/* Comment: Error description */
"Could not load data." = "Die Daten konnten nicht geladen werden.";
/* File: ../Source/NSAttributedString.m:762 */
/* Comment: Error description */
"No data specified for data loading."
= "Es wurden keine Daten zum Laden angegeben.";
/* File: ../Source/NSAttributedString.m:802 */
/* Comment: Error description */
/* File: ../Source/NSAttributedString.m:1012 */
/* File: ../Source/NSAttributedString.m:1033 */
/* Comment: Error description */
"No type specified for data."
= "F\U00FCr die Daten wurde kein Typ angegeben.";
/*** Strings from ../Source/NSBitmapImageRep.m ***/
/* File: ../Source/NSBitmapImageRep.m:1656 */
/* File: ../Source/NSBitmapImageRep.m:1645 */
"CCITTFAX3 Compression" = "CCITTFAX3-Kompression";
/* File: ../Source/NSBitmapImageRep.m:1657 */
/* File: ../Source/NSBitmapImageRep.m:1646 */
"CCITTFAX4 Compression" = "CCITTFAX4-Kompression";
/* File: ../Source/NSBitmapImageRep.m:1659 */
/* File: ../Source/NSBitmapImageRep.m:1648 */
"JPEG Compression" = "JPEG-Kompression";
/* File: ../Source/NSBitmapImageRep.m:1658 */
/* File: ../Source/NSBitmapImageRep.m:1647 */
"LZW Compression" = "LZW-Kompression";
/* File: ../Source/NSBitmapImageRep.m:1660 */
/* File: ../Source/NSBitmapImageRep.m:1649 */
"NEXT Compression" = "NEXT-Kompression";
/* File: ../Source/NSBitmapImageRep.m:1655 */
/* File: ../Source/NSBitmapImageRep.m:1644 */
"No Compression" = "Keine Kompression";
/* File: ../Source/NSBitmapImageRep.m:1662 */
/* File: ../Source/NSBitmapImageRep.m:1651 */
"Old JPEG Compression" = "alte JPEG-Kompression";
/* File: ../Source/NSBitmapImageRep.m:1661 */
/* File: ../Source/NSBitmapImageRep.m:1650 */
"PackBits Compression" = "PackBits-Kompression";
/*** Strings from ../Source/NSColorPanel.m ***/
/* File: ../Source/NSColorPanel.m:298 */
/* File: ../Source/NSColorPanel.m:308 */
"Opacity" = "Deckkraft";
@ -339,7 +315,7 @@ add comments above this one
/*** Strings from ../Source/NSDocument.m ***/
/* File: ../Source/NSDocument.m:1657 */
/* File: ../Source/NSDocument.m:1659 */
"%@ has been edited. Are you sure you want to undo changes?"
= "%@ wurde ge\U00E4ndert. Wollen Sie die \U00C4nderungen wirklich verwerfen?";
/* File: ../Source/NSDocument.m:473 */
@ -355,44 +331,52 @@ add comments above this one
"Could not load file %@." = "Konnte Datei %@ nicht laden.";
/* File: ../Source/NSDocument.m:813 */
"File Error" = "Dateifehler";
/* File: ../Source/NSDocument.m:1109 */
"File Type" = "Dateityp";
/* File: ../Source/NSDocument.m:118 */
/* File: ../Source/NSDocument.m:141 */
/* File: ../Source/NSDocument.m:118 */
"Load failed" = "Laden fehlgeschlagen";
/* File: ../Source/NSDocument.m:1181 */
/* File: ../Source/NSDocument.m:1179 */
"Save As" = "Speichern als";
/* File: ../Source/NSDocument.m:1180 */
"Save To" = "Speichern in";
/* File: ../Source/NSDocument.m:569 */
"Untitled-%d" = "unbenannt-%d";
/*** Strings from ../Source/NSDocumentController.m ***/
/* File: ../Source/NSDocumentController.m:1673 */
/* File: ../Source/NSDocumentController.m:1692 */
"Clear List" = "Liste l\U00F6schen";
/* File: ../Source/NSDocumentController.m:1047 */
/* File: ../Source/NSDocumentController.m:1056 */
"Power Off" = "Aus";
/* File: ../Source/NSDocumentController.m:957 */
/* File: ../Source/NSDocumentController.m:999 */
/* File: ../Source/NSDocumentController.m:1008 */
/* File: ../Source/NSDocumentController.m:966 */
"Quit Anyway" = "Dennoch beenden";
/* File: ../Source/NSDocumentController.m:997 */
/* File: ../Source/NSDocumentController.m:955 */
/* File: ../Source/NSDocumentController.m:1006 */
/* File: ../Source/NSDocumentController.m:964 */
"Review Unsaved" = "Ansehen";
/* File: ../Source/NSDocumentController.m:1004 */
/* File: ../Source/NSDocumentController.m:954 */
/* File: ../Source/NSDocumentController.m:1013 */
/* File: ../Source/NSDocumentController.m:963 */
"You have unsaved documents" = "Sie haben ungespeicherte Dokumente";
/*** Strings from ../Source/NSFontPanel.m ***/
/* File: ../Source/NSFontPanel.m:544 */
/* File: ../Source/NSFontPanel.m:1138 */
"Family" = "Familie";
/* File: ../Source/NSFontPanel.m:553 */
"Font Panel" = "Schriftartauswahl";
/* File: ../Source/NSFontPanel.m:569 */
/* File: ../Source/NSFontPanel.m:578 */
"Font preview" = "Voransicht";
/* File: ../Source/NSFontPanel.m:239 */
/* File: ../Source/NSFontPanel.m:241 */
"Multiple fonts selected" = "Mehrere Schriftarten ausgew\U00E4hlt";
/* File: ../Source/NSFontPanel.m:711 */
/* File: ../Source/NSFontPanel.m:818 */
"NoFace" = "KeinStil";
/* File: ../Source/NSFontPanel.m:810 */
"NoFamily" = "KeineFamilie";
/* File: ../Source/NSFontPanel.m:719 */
"Set" = "Setzen";
/* File: ../Source/NSFontPanel.m:630 */
/* File: ../Source/NSFontPanel.m:639 */
"Size" = "Gr\U00F6sse";
/* File: ../Source/NSFontPanel.m:1142 */
"Typeface" = "Stil";
/*** Strings from ../Source/NSMenu.m ***/
@ -401,13 +385,13 @@ add comments above this one
/*** Strings from ../Source/NSOpenPanel.m ***/
/* File: ../Source/NSOpenPanel.m:93 */
/* File: ../Source/NSOpenPanel.m:92 */
"Open" = "\U00D6ffnen";
/*** Strings from ../Source/NSPageLayout.m ***/
/* File: ../Source/NSPageLayout.m:744 */
/* File: ../Source/NSPageLayout.m:746 */
/* File: ../Source/NSPageLayout.m:749 */
/* File: ../Source/NSPageLayout.m:747 */
"(none)" = "(keine)";
/* File: ../Source/NSPageLayout.m:976 */
"Bottom Margin" = "Unterer Rand";
@ -417,50 +401,90 @@ add comments above this one
"Landscape" = "Querformat";
/* File: ../Source/NSPageLayout.m:977 */
"Left Margin" = "Linker Rand";
/* File: ../Source/NSPageLayout.m:971 */
"Name" = "Name";
/* File: ../Source/NSPageLayout.m:973 */
"Orientation" = "Orientierung";
/* File: ../Source/NSPageLayout.m:1028 */
"Portrait" = "Hochformat";
/* File: ../Source/NSPageLayout.m:978 */
"Right Margin" = "Rechter Rand";
/* File: ../Source/NSPageLayout.m:974 */
"Scale" = "Schriftgrad";
/* File: ../Source/NSPageLayout.m:975 */
"Top Margin" = "Oberer Rand";
/*** Strings from ../Source/NSPrintOperation.m ***/
/* File: ../Source/NSPrintOperation.m:677 */
"Error" = "Fehler";
/* File: ../Source/NSPrintOperation.m:677 */
"Printing error: %@" = "Druckerfehler: %@";
/*** Strings from ../Source/NSPrintPanel.m ***/
/* File: ../Source/NSPrintPanel.m:407 */
"Faxing of print file not implemented" = "Faxen ist nicht implementiert";
/* File: ../Source/NSPrintPanel.m:781 */
/* File: ../Source/NSPrintPanel.m:774 */
/* File: ../Source/NSPrintPanel.m:643 */
"Manual" = "Manuell";
/* File: ../Source/NSPrintPanel.m:145 */
"Print Panel" = "Druckfenster";
/* File: ../Source/NSPrintPanel.m:407 */
"Sorry" = "Entschuldigung";
/*** Strings from ../Source/NSSavePanel.m ***/
/* File: ../Source/NSSavePanel.m:239 */
/* File: ../Source/NSSavePanel.m:423 */
/* File: ../Source/NSSavePanel.m:433 */
/* File: ../Source/NSSavePanel.m:250 */
"Name:" = "Name:";
/* File: ../Source/NSSavePanel.m:1315 */
/* File: ../Source/NSSavePanel.m:1344 */
"No" = "Nein";
/* File: ../Source/NSSavePanel.m:1347 */
/* File: ../Source/NSSavePanel.m:1761 */
"Reading Directory " = "Lese Verzeichnis ";
/* File: ../Source/NSSavePanel.m:1379 */
"Replace" = "\U00DCberschreiben";
/* File: ../Source/NSSavePanel.m:1324 */
/* File: ../Source/NSSavePanel.m:241 */
"Show Hidden Files" = "Versteckte Dateien anzeigen";
/* File: ../Source/NSSavePanel.m:1356 */
"The directory '%@' could not be created."
= "Das Verzeichnis \U00BB%@\U00AB konnte nicht erstellt werden.";
/* File: ../Source/NSSavePanel.m:1314 */
/* File: ../Source/NSSavePanel.m:1343 */
"The directory '%@' does not exist, do you want to create it?"
= "Das Verzeichnis \U00BB%@\U00AB existiert nicht. Wollen Sie es anlegen?";
/* File: ../Source/NSSavePanel.m:1346 */
/* File: ../Source/NSSavePanel.m:1378 */
"The file '%@' in '%@' exists. Replace it?"
= "Die Datei \U00BB%@\U00AB in \U00BB%@\U00AB existiert bereits. \U00DCberschreiben?";
/* File: ../Source/NSSavePanel.m:1335 */
/* File: ../Source/NSSavePanel.m:1367 */
"The path '%@' is not a directory." = "\U00BB%@\U00AB ist kein Verzeichnis.";
/* File: ../Source/NSSavePanel.m:1270 */
/* File: ../Source/NSSavePanel.m:1262 */
/* File: ../Source/NSSavePanel.m:1299 */
/* File: ../Source/NSSavePanel.m:1291 */
"Use .%@" = ".%@ verwenden";
/* File: ../Source/NSSavePanel.m:1315 */
/* File: ../Source/NSSavePanel.m:1344 */
"Yes" = "Ja";
/* File: ../Source/NSSavePanel.m:1269 */
/* File: ../Source/NSSavePanel.m:1298 */
"You cannot save this document with extension '.%@'.\nThe required extension is '.%@'."
= "Sie k\U00F6nnen das Dokument nicht mit der Erweiterung \U00BB.%@\U00AB speichern.\nDie notwendige Erweiterung ist \U00BB.%@\U00AB.";
/* File: ../Source/NSSavePanel.m:1261 */
/* File: ../Source/NSSavePanel.m:1290 */
"You have used the extension '.%@'.\nThe standard extension is '.%@'.'"
= "Sie haben die Erweiterung \U00BB.%@\U00AB benutzt.\nDie Standarderweiterung ist \U00BB.%@\U00AB.";
/*** Strings from ../Source/NSSpellChecker.m ***/
/* File: ../Source/NSSpellChecker.m:731 */
"Guess" = "Raten";
/*** Strings from ../Source/NSTextView.m ***/
/* File: ../Source/NSTextView.m:651 */
"Copy" = "Kopieren";
/* File: ../Source/NSTextView.m:650 */
"Cut" = "Ausschneiden";
/* File: ../Source/NSTextView.m:5847 */
"No Suggestions" = "Kein Vorschlag";
/* File: ../Source/NSTextView.m:652 */
"Paste" = "Einf\U00FCgen";
/*** Strings from ../Source/NSToolbarItem.m ***/
/* File: ../Source/NSToolbarItem.m:1122 */
"Customize" = "Anpassen";
@ -477,7 +501,7 @@ add comments above this one
/*** Strings from ../Source/NSWindow.m ***/
/* File: ../Source/NSWindow.m:5053 */
/* File: ../Source/NSWindow.m:5192 */
"Hide Toolbar" = "Toolbar ausblenden";
/* File: ../Source/NSWindow.m:5055 */
/* File: ../Source/NSWindow.m:5194 */
"Show Toolbar" = "Toolbar anzeigen";

585
Resources/Italian.lproj/Localizable.strings
View file

@ -2,515 +2,566 @@
* Date: September 2002
* Translator: Maurizio Boriani <baux@gnu.org>
* Date: April 2006
* Trnalsator: Riccardo Mottola <rm@gnu.org>
* Translator: Riccardo Mottola <rm@gnu.org>
*/
/***
Italian.lproj/Localizable.strings
updated by make_strings 2010-01-11 19:43:33 +0100
updated by make_strings 2013-02-08 11:55:53 +0100
add comments above this one
***/
/*** Keys found in multiple places ***/
/* File: ../Source/NSDocument.m:468 */
/* File: ../Source/NSDocument.m:803 */
/* File: ../Source/NSDocument.m:1137 */
/* File: ../Source/NSSavePanel.m:414 */
/* File: ../Source/NSSavePanel.m:1258 */
/* File: ../Source/NSSavePanel.m:1297 */
/* File: ../Source/NSSavePanel.m:1307 */
/* File: ../Source/NSSavePanel.m:1318 */
/* File: ../Source/NSSavePanel.m:1329 */
/* File: ../Source/NSDocument.m:474 */
/* File: ../Source/NSDocument.m:815 */
/* File: ../Source/NSDocument.m:1183 */
/* File: ../Source/NSSavePanel.m:434 */
/* File: ../Source/NSSavePanel.m:1303 */
/* File: ../Source/NSSavePanel.m:1342 */
/* File: ../Source/NSSavePanel.m:1355 */
/* File: ../Source/NSSavePanel.m:1366 */
/* File: ../Source/NSSavePanel.m:1377 */
"Save" = "Salva";
/* File: ../Source/NSAlert.m:1805 */
/* File: ../Source/NSDocument.m:468 */
/* File: ../Source/NSDocument.m:803 */
/* File: ../Source/NSDocument.m:1581 */
/* File: ../Source/NSDocumentController.m:942 */
/* File: ../Source/NSDocumentController.m:974 */
/* File: ../Source/NSSavePanel.m:299 */
/* File: ../Source/NSSavePanel.m:1261 */
/* File: ../Source/NSSavePanel.m:1331 */
/* File: ../Source/NSAlert.m:384 */
/* File: ../Source/NSDocument.m:474 */
/* File: ../Source/NSDocument.m:815 */
/* File: ../Source/NSDocument.m:1660 */
/* File: ../Source/NSDocumentController.m:955 */
/* File: ../Source/NSDocumentController.m:987 */
/* File: ../Source/NSSavePanel.m:317 */
/* File: ../Source/NSSavePanel.m:1306 */
/* File: ../Source/NSSavePanel.m:1379 */
"Cancel" = "Cancella";
/* File: ../Source/NSDocument.m:1133 */
/* File: ../Source/NSSavePanel.m:887 */
"Save As" = "Salva con nome";
/* File: ../Source/GSNibLoading.m:187 */
/* File: ../Source/GSNibLoading.m:193 */
/* Comment: Info */
/* Flag: untranslated */
/* File: ../Source/NSApplication.m:2783 */
/* File: ../Source/NSApplication.m:2878 */
/* Comment: Title of the Info Panel */
/* File: ../Source/NSMenu.m:235 */
/* Flag: untranslated */
/* File: ../Source/NSMenu.m:258 */
"Info" = "Info";
/* File: ../Source/GSNibLoading.m:170 */
/* File: ../Source/GSNibLoading.m:176 */
/* Comment: Quit */
/* File: ../Source/NSApplication.m:3381 */
/* File: ../Source/NSDocumentController.m:1036 */
/* File: ../Source/NSApplication.m:3442 */
/* File: ../Source/NSApplication.m:4207 */
/* File: ../Source/NSDocumentController.m:1049 */
"Quit" = "Esci";
/* File: ../Source/GSPrintOperation.m:159 */
/* File: ../Source/NSSavePanel.m:1309 */
/* File: ../Source/NSSavePanel.m:1320 */
/* File: ../Source/GSPrintOperation.m:157 */
/* File: ../Source/NSSavePanel.m:1357 */
/* File: ../Source/NSSavePanel.m:1368 */
"Dismiss" = "Dismetti";
/* File: ../Source/GSPrintOperation.m:157 */
/* File: ../Source/NSFontPanel.m:697 */
/* Flag: untranslated */
/* File: ../Source/GSPrintOperation.m:155 */
/* File: ../Source/NSFontPanel.m:706 */
"Preview" = "Anteprima";
/* File: ../Source/GSHelpManagerPanel.m:101 */
/* Flag: untranslated */
/* File: ../Source/NSAlert.m:1722 */
/* Flag: untranslated */
/* File: ../Source/NSPrintOperation.m:681 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:285 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:315 */
/* Flag: untranslated */
/* File: ../Source/NSAlert.m:1830 */
/* File: ../Source/NSPrintOperation.m:678 */
/* File: ../Source/NSPrintPanel.m:408 */
/* File: ../Source/NSSavePanel.m:333 */
"OK" = "OK";
/* File: ../Source/NSAlert.m:1809 */
/* File: ../Source/NSDocument.m:468 */
/* File: ../Source/NSAlert.m:389 */
/* File: ../Source/NSDocument.m:474 */
"Don't Save" = "Non salvare";
/* File: ../Source/NSDocument.m:1579 */
/* File: ../Source/NSDocument.m:1581 */
/* File: ../Source/NSFontPanel.m:687 */
/* File: ../Source/NSDocument.m:1658 */
/* File: ../Source/NSDocument.m:1660 */
/* File: ../Source/NSFontPanel.m:696 */
"Revert" = "Ritorna a com'era prima";
/* File: ../Source/GSHelpManagerPanel.m:70 */
/* Flag: untranslated */
/* File: ../Source/NSHelpPanel.m:153 */
/* File: ../Source/NSHelpPanel.m:154 */
"Help" = "Aiuto";
/* File: ../Source/GSInfoPanel.m:192 */
/* Flag: untranslated */
/* File: ../Source/GSInfoPanel.m:465 */
"Current theme" = "Tema corrente";
/* File: ../Source/GSThemePanel.m:192 */
/* Flag: untranslated */
/* File: ../Source/GSThemePanel.m:232 */
"Revert default theme" = "Ripristina tema predefinito";
/* File: ../Source/GSThemePanel.m:196 */
/* Flag: untranslated */
/* File: ../Source/GSThemePanel.m:227 */
"Make this the default theme" = "Imposta come tema predefinito";
/* File: ../Source/NSAttributedString.m:768 */
/* File: ../Source/NSAttributedString.m:1060 */
/* Comment: Error description */
/* Flag: untranslated */
/* File: ../Source/NSAttributedString.m:965 */
/* File: ../Source/NSAttributedString.m:1083 */
/* Comment: Error description */
/* Flag: untranslated */
"No type specified for data." = "No type specified for data.";
"Could not create data for type." = "Impossibile generare i dati per il tipo dati.";
/* File: ../Source/NSAttributedString.m:991 */
/* Comment: Error description */
/* Flag: untranslated */
/* File: ../Source/NSAttributedString.m:1014 */
/* Comment: Error description */
/* Flag: untranslated */
"Could not create data for type." = "Could not create data for type.";
/* File: ../Source/NSColorPanel.m:227 */
/* Flag: untranslated */
/* File: ../Source/NSToolbarItem.m:1050 */
/* File: ../Source/NSColorPanel.m:244 */
/* File: ../Source/NSToolbarItem.m:1076 */
"Colors" = "Colori";
/* File: ../Source/NSPageLayout.m:754 */
/* Flag: untranslated */
/* File: ../Source/NSPageLayout.m:756 */
"(none)" = "(nessuno)";
/* File: ../Source/NSPageLayout.m:989 */
/* Flag: untranslated */
/* File: ../Source/NSPageLayout.m:1060 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:454 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:500 */
/* File: ../Source/NSPageLayout.m:979 */
/* File: ../Source/NSPageLayout.m:1050 */
/* File: ../Source/NSPrintPanel.m:630 */
/* File: ../Source/NSPrintPanel.m:676 */
"Unknown" = "Sconosciuto";
/* File: ../Source/NSPrintPanel.m:467 */
/* File: ../Source/NSPrintPanel.m:643 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:602 */
/* File: ../Source/NSPrintPanel.m:774 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:609 */
/* File: ../Source/NSPrintPanel.m:781 */
/* Flag: untranslated */
"Manual" = "Manual";
/* File: ../Source/NSSavePanel.m:236 */
/* File: ../Source/NSSavePanel.m:1291 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:413 */
"Name:" = "Nome:";
/* File: ../Source/NSSavePanel.m:1246 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1254 */
/* File: ../Source/NSSavePanel.m:1299 */
/* Flag: untranslated */
"Use .%@" = "Use .%@";
/* File: ../Source/NSDocument.m:1109 */
/* File: ../Source/NSPrintPanel.m:350 */
"File Type" = "Tipo Archivio";
/* File: ../Source/GSCharacterPanel.m:173 */
/* File: ../Source/NSPageLayout.m:971 */
"Name" = "Nome";
/* File: ../Source/GSCharacterPanel.m:154 */
/* File: ../Source/NSFontPanel.m:738 */
"Character Panel" = "Pannello Caratteri";
/* File: ../Source/GSTextFinder.m:332 */
/* File: ../Source/GSTextFinder.m:381 */
"Not found" = "Non trovato";
/*** Unmatched/untranslated keys ***/
/* File: ../Source/GSInfoPanel.m:338 */
/* File: ../Source/GSCharacterPanel.m:182 */
/* Flag: untranslated */
"Code Point" = "Code Point";
/* File: ../Source/GSCharacterPanel.m:191 */
/* Flag: untranslated */
"Unicode Block" = "Unicode Block";
/* File: ../Source/GSInfoPanel.m:339 */
/* Flag: untranslated */
"Release: " = "Release: ";
/* File: ../Source/GSInfoPanel.m:380 */
/* Flag: untranslated */
/* File: ../Source/GSInfoPanel.m:396 */
"Copyright Information Not Available"
= "Copyright Information Not Available";
= "Informazioni di Copyright non disponibili";
/* File: ../Source/GSInfoPanel.m:434 */
"Author: " = "Autore: ";
/* File: ../Source/GSTextFinder.m:408 */
"%d replaced" = "%d rimpiazzati";
/* File: ../Source/GSInfoPanel.m:438 */
"Authors: " = "Autori: ";
/* File: ../Source/GSThemeDrawing.m:185 */
"?" = "?";
/* File: ../Source/GSThemeInspector.m:140 */
"Version: %@" = "Versione: %@";
/* File: ../Source/GSToolbarView.m:894 */
"Customize Toolbar" = "Personalizza barra strumenti";
/* File: ../Source/GSThemePanel.m:114 */
"Themes" = "Temi";
/* File: ../Source/NSAlert.m:2001 */
"No information" = "Nessuna informazione";
/* File: ../Source/NSAlert.m:1898 */
"Alert" = "Attenzione";
/* File: ../Source/NSApplication.m:4197 */
"Show" = "Mostra";
/* File: ../Source/NSAttributedString.m:759 */
/* File: ../Source/NSApplication.m:4203 */
"Hide" = "Nascondi";
/* File: ../Source/NSAttributedString.m:762 */
/* Comment: Error description */
/* Flag: untranslated */
"No data specified for data loading."
= "No data specified for data loading.";
/* File: ../Source/NSAttributedString.m:807 */
/* File: ../Source/NSAttributedString.m:863 */
/* Comment: Error description */
/* Flag: untranslated */
"Could not load data." = "Could not load data.";
/* File: ../Source/NSAttributedString.m:864 */
/* File: ../Source/NSAttributedString.m:1033 */
/* Comment: Error description */
"Could not load data from URL." = "Impossibile caricare dati dall'URL.";
/* Flag: untranslated */
"No type specified for data." = "No type specified for data.";
/* File: ../Source/NSColorPanel.m:289 */
/* File: ../Source/NSColorPanel.m:308 */
/* Flag: untranslated */
"Opacity" = "Opacity";
/* File: ../Source/NSColorSpace.m:135 */
/* Comment: color space */
/* Flag: untranslated */
"unknown" = "unknown";
/* File: ../Source/NSColorSpace.m:137 */
/* Comment: color space */
"Grayscale" = "Scala di grigi";
/* File: ../Source/NSColorSpace.m:139 */
/* Comment: color space */
"RGB" = "RGB";
/* File: ../Source/NSColorSpace.m:141 */
/* Comment: color space */
"CMYK" = "CMYK";
/* File: ../Source/NSColorSpace.m:143 */
/* Comment: color space */
/* Flag: untranslated */
"LAB" = "LAB";
"unknown" = "sconosciuto";
/* File: ../Source/NSColorSpace.m:145 */
/* Comment: color space */
"LAB" = "LAB";
/* File: ../Source/NSColorSpace.m:147 */
/* Comment: color space */
/* Flag: untranslated */
"DeviceN" = "DeviceN";
/* File: ../Source/NSDocument.m:1064 */
/* Flag: untranslated */
"File Type" = "File Type";
/* File: ../Source/NSDocumentController.m:1631 */
/* File: ../Source/NSDocumentController.m:1692 */
/* Flag: untranslated */
"Clear List" = "Clear List";
/* File: ../Source/NSFontPanel.m:239 */
/* File: ../Source/NSFontPanel.m:241 */
/* Flag: untranslated */
"Multiple fonts selected" = "Multiple fonts selected";
/* File: ../Source/NSFontPanel.m:544 */
/* File: ../Source/NSFontPanel.m:553 */
/* Flag: untranslated */
"Font Panel" = "Font Panel";
/* File: ../Source/NSFontPanel.m:568 */
/* File: ../Source/NSFontPanel.m:578 */
/* Flag: untranslated */
"Font preview" = "Font preview";
/* File: ../Source/NSFontPanel.m:629 */
/* Flag: untranslated */
"Size" = "Size";
/* File: ../Source/NSFontPanel.m:639 */
"Size" = "Dimensione";
/* File: ../Source/NSFontPanel.m:710 */
/* File: ../Source/NSFontPanel.m:719 */
/* Flag: untranslated */
"Set" = "Set";
/* File: ../Source/NSFontPanel.m:785 */
/* File: ../Source/NSFontPanel.m:810 */
/* Flag: untranslated */
"NoFamily" = "NoFamily";
/* File: ../Source/NSFontPanel.m:793 */
/* File: ../Source/NSFontPanel.m:818 */
/* Flag: untranslated */
"NoFace" = "NoFace";
/* File: ../Source/NSFontPanel.m:1107 */
/* Flag: untranslated */
"Family" = "Family";
/* File: ../Source/NSFontPanel.m:1138 */
"Family" = "Famiglia";
/* File: ../Source/NSFontPanel.m:1111 */
/* File: ../Source/NSFontPanel.m:1142 */
/* Flag: untranslated */
"Typeface" = "Typeface";
/* File: ../Source/NSMenu.m:236 */
"Services" = "Servizi";
/* File: ../Source/NSOpenPanel.m:92 */
/* Flag: untranslated */
"Open" = "Apri";
/* File: ../Source/NSPageLayout.m:981 */
/* Flag: untranslated */
"Name" = "Name";
/* File: ../Source/NSPageLayout.m:972 */
"Dimensions" = "Dimensioni";
/* File: ../Source/NSPageLayout.m:982 */
/* Flag: untranslated */
"Dimensions" = "Dimensions";
/* File: ../Source/NSPageLayout.m:983 */
/* File: ../Source/NSPageLayout.m:973 */
/* Flag: untranslated */
"Orientation" = "Orientation";
/* File: ../Source/NSPageLayout.m:984 */
/* File: ../Source/NSPageLayout.m:974 */
/* Flag: untranslated */
"Scale" = "Scale";
/* File: ../Source/NSPageLayout.m:985 */
"Top Margin" = "Margine Superiore";
/* File: ../Source/NSPrintPanel.m:145 */
"Print Panel" = "Pannello Stampa";
/* File: ../Source/NSPageLayout.m:986 */
"Bottom Margin" = "Margine Inferiore";
/* File: ../Source/NSPageLayout.m:987 */
"Left Margin" = "Margine Sinistro";
/* File: ../Source/NSPageLayout.m:988 */
"Right Margin" = "Margine Destro";
/* File: ../Source/NSPageLayout.m:1038 */
"Portrait" = "Verticale";
/* File: ../Source/NSPageLayout.m:1042 */
"Landscape" = "Orizzontale";
/* File: ../Source/NSPrintOperation.m:680 */
"Error" = "Errore";
/* File: ../Source/NSPrintOperation.m:680 */
"Printing error: %@" = "Errore di stampa: %@";
/* File: ../Source/NSPrintPanel.m:169 */
/* Flag: untranslated */
"1 up" = "1 up";
/* File: ../Source/NSPrintPanel.m:169 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"2 up" = "2 up";
/* File: ../Source/NSPrintPanel.m:169 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"4 up" = "4 up";
/* File: ../Source/NSPrintPanel.m:169 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"6 up" = "6 up";
/* File: ../Source/NSPrintPanel.m:170 */
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"1 up" = "1 up";
/* File: ../Source/NSPrintPanel.m:180 */
/* Flag: untranslated */
"8 up" = "8 up";
/* File: ../Source/NSPrintPanel.m:284 */
/* File: ../Source/NSPrintPanel.m:407 */
/* Flag: untranslated */
"Sorry" = "Sorry";
/* File: ../Source/NSPrintPanel.m:284 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:407 */
"Faxing of print file not implemented"
= "Faxing of print file not implemented";
= "Invio fax stampa non implementato";
/* File: ../Source/NSSavePanel.m:1245 */
/* File: ../Source/NSSavePanel.m:241 */
/* Flag: untranslated */
"Show Hidden Files" = "Show Hidden Files";
/* File: ../Source/NSSavePanel.m:276 */
/* Flag: untranslated */
"Home" = "Home";
/* File: ../Source/NSSavePanel.m:292 */
"Mount" = "Monta";
/* File: ../Source/NSSavePanel.m:308 */
"Unmount" = "Smonta";
/* File: ../Source/NSSavePanel.m:1290 */
/* Flag: untranslated */
"You have used the extension '.%@'.\nThe standard extension is '.%@'.'"
= "You have used the extension '.%@'.\nThe standard extension is '.%@'.'";
/* File: ../Source/NSSavePanel.m:1253 */
/* File: ../Source/NSSavePanel.m:1298 */
/* Flag: untranslated */
"You cannot save this document with extension '.%@'.\nThe required extension is '.%@'."
= "You cannot save this document with extension '.%@'.\nThe required extension is '.%@'.";
/* File: ../Source/NSSavePanel.m:1299 */
/* File: ../Source/NSSavePanel.m:1344 */
/* Flag: untranslated */
"No" = "No";
/* File: ../Source/NSSavePanel.m:1702 */
/* File: ../Source/NSSavePanel.m:1761 */
/* Flag: untranslated */
"Reading Directory " = "Reading Directory ";
/* File: ../Source/NSToolbarItem.m:976 */
/* File: ../Source/NSSpellChecker.m:731 */
/* Flag: untranslated */
"Guess" = "Guess";
/* File: ../Source/NSTextView.m:650 */
/* Flag: untranslated */
"Cut" = "Cut";
/* File: ../Source/NSTextView.m:651 */
/* Flag: untranslated */
"Copy" = "Copy";
/* File: ../Source/NSTextView.m:652 */
/* Flag: untranslated */
"Paste" = "Paste";
/* File: ../Source/NSTextView.m:5847 */
/* Flag: untranslated */
"No Suggestions" = "No Suggestions";
/* File: ../Source/NSToolbarItem.m:949 */
/* Flag: untranslated */
"Separator" = "Separator";
/* File: ../Source/NSToolbarItem.m:991 */
/* Flag: untranslated */
"Space" = "Space";
/* File: ../Source/NSToolbarItem.m:1000 */
/* File: ../Source/NSToolbarItem.m:1021 */
/* Flag: untranslated */
"Flexible Space" = "Flexible Space";
/* File: ../Source/NSToolbarItem.m:1073 */
/* File: ../Source/NSToolbarItem.m:1099 */
/* Flag: untranslated */
"Fonts" = "Fonts";
/* File: ../Source/NSToolbarItem.m:1096 */
/* File: ../Source/NSToolbarItem.m:1122 */
/* Flag: untranslated */
"Customize" = "Customize";
/* File: ../Source/NSToolbarItem.m:1119 */
/* File: ../Source/NSToolbarItem.m:1145 */
/* Flag: untranslated */
"Print..." = "Print...";
/* File: ../Source/NSWindow.m:4982 */
/* File: ../Source/NSWindow.m:5192 */
/* Flag: untranslated */
"Hide Toolbar" = "Hide Toolbar";
/* File: ../Source/NSWindow.m:4984 */
/* File: ../Source/NSWindow.m:5194 */
/* Flag: untranslated */
"Show Toolbar" = "Show Toolbar";
/*** Strings from ../Source/Functions.m ***/
/* File: ../Source/Functions.m:85 */
"Cannot load the main model file '%@'"
= "Non \U00E8 possibile caricare il model file principale '%@'";
/*** Strings from ../Source/GSInfoPanel.m ***/
/* File: ../Source/GSInfoPanel.m:451 */
"Author: " = "Autore: ";
/* File: ../Source/GSInfoPanel.m:455 */
"Authors: " = "Autori: ";
/* File: ../Source/GSInfoPanel.m:482 */
/* File: ../Source/GSInfoPanel.m:187 */
"Current theme" = "Tema corrente";
/*** Strings from ../Source/GSPrintOperation.m ***/
/* File: ../Source/GSPrintOperation.m:158 */
/* File: ../Source/GSPrintOperation.m:156 */
"Problem running the preview application '%@' perhaps you need to set your NSPreviewApp user default"
= "Errore nell'esecuzione dell'applicazione Anteprima '%@' Dovresti impostare l'applicativo predefinito in NSPreviewApp defaults";
/*** Strings from ../Source/GSThemeInspector.m ***/
/* File: ../Source/GSThemeInspector.m:141 */
"Version: %@" = "Versione: %@";
/*** Strings from ../Source/GSThemePanel.m ***/
/* File: ../Source/GSThemePanel.m:229 */
/* File: ../Source/GSThemePanel.m:197 */
"Make this the default theme" = "Imposta come tema predefinito";
/* File: ../Source/GSThemePanel.m:193 */
/* File: ../Source/GSThemePanel.m:234 */
"Revert default theme" = "Ripristina tema predefinito";
/* File: ../Source/GSThemePanel.m:115 */
"Themes" = "Temi";
/*** Strings from ../Source/NSAlert.m ***/
/* File: ../Source/NSAlert.m:2000 */
"Alert" = "Attenzione";
/*** Strings from ../Source/NSApplication.m ***/
/* File: ../Source/NSApplication.m:137 */
/* File: ../Source/NSApplication.m:138 */
"Abort" = "Interrompi";
/* File: ../Source/NSApplication.m:322 */
/* File: ../Source/NSApplication.m:323 */
"Backend at path %@ doesn't contain the GSBackend class"
= "Il backend a %@ non contiene la classe GSBackend";
/* File: ../Source/NSApplication.m:310 */
/* File: ../Source/NSApplication.m:311 */
"Can't create NSBundle object for backend at path %@"
= "Impossibile a creare l'oggetto NSBundle per il backend a %@";
/* File: ../Source/NSApplication.m:315 */
/* File: ../Source/NSApplication.m:316 */
"Can't load object file from backend at path %@"
= "Impossibile caricare il file oggetto dal backend a %@";
/* File: ../Source/NSApplication.m:999 */
"Cannot load the main model file '%@'"
= "Non \U00E8 possibile caricare il model file principale '%@'";
/* File: ../Source/NSApplication.m:134 */
/* File: ../Source/NSApplication.m:135 */
"Critical Error in %@" = "Errore critico in %@";
/* File: ../Source/NSApplication.m:140 */
/* File: ../Source/NSApplication.m:141 */
"Debug" = "Debugga";
/* File: ../Source/NSApplication.m:1179 */
/* File: ../Source/NSApplication.m:1198 */
"Problem during launch app notification: %@"
= "Problema durante il lancio dell'applicazione: %@";
/* File: ../Source/NSApplication.m:303 */
/* File: ../Source/NSApplication.m:304 */
"Unable to find backend %@" = "Non si riesce a trovare il backend %@";
/* File: ../Source/NSApplication.m:923 */
/* File: ../Source/NSApplication.m:972 */
"[NSApplication -init] called more than once"
= "[NSApplication -init] chiamata pi\U00F9 di una volta";
/* File: ../Source/NSApplication.m:3239 */
/* File: ../Source/NSApplication.m:3315 */
"reported exception - %@" = "riportata una exception - %@";
/*** Strings from ../Source/NSAttributedString.m ***/
/* File: ../Source/NSAttributedString.m:927 */
/* Comment: Error description */
"Could not load data from URL." = "Impossibile caricare dati dall'URL.";
/*** Strings from ../Source/NSBitmapImageRep.m ***/
/* File: ../Source/NSBitmapImageRep.m:1656 */
/* File: ../Source/NSBitmapImageRep.m:1645 */
"CCITTFAX3 Compression" = "Compressione CCITTFAX3";
/* File: ../Source/NSBitmapImageRep.m:1657 */
/* File: ../Source/NSBitmapImageRep.m:1646 */
"CCITTFAX4 Compression" = "Compressione CCITTFAX4";
/* File: ../Source/NSBitmapImageRep.m:1659 */
/* File: ../Source/NSBitmapImageRep.m:1648 */
"JPEG Compression" = "Compressione JPEG";
/* File: ../Source/NSBitmapImageRep.m:1658 */
/* File: ../Source/NSBitmapImageRep.m:1647 */
"LZW Compression" = "Compressione LZW";
/* File: ../Source/NSBitmapImageRep.m:1660 */
/* File: ../Source/NSBitmapImageRep.m:1649 */
"NEXT Compression" = "Compressione NEXT";
/* File: ../Source/NSBitmapImageRep.m:1655 */
/* File: ../Source/NSBitmapImageRep.m:1644 */
"No Compression" = "Non compresso";
/* File: ../Source/NSBitmapImageRep.m:1662 */
/* File: ../Source/NSBitmapImageRep.m:1651 */
"Old JPEG Compression" = "Vecchia compressione JPEG";
/* File: ../Source/NSBitmapImageRep.m:1661 */
/* File: ../Source/NSBitmapImageRep.m:1650 */
"PackBits Compression" = "Compressione PackBits";
/*** Strings from ../Source/NSColorSpace.m ***/
/* File: ../Source/NSColorSpace.m:143 */
/* Comment: color space */
"CMYK" = "CMYK";
/* File: ../Source/NSColorSpace.m:139 */
/* Comment: color space */
"Grayscale" = "Scala di grigi";
/* File: ../Source/NSColorSpace.m:141 */
/* Comment: color space */
"RGB" = "RGB";
/*** Strings from ../Source/NSDocument.m ***/
/* File: ../Source/NSDocument.m:1580 */
/* File: ../Source/NSDocument.m:1659 */
"%@ has been edited. Are you sure you want to undo changes?"
= "%@ \U00E8 stato modificato. Sei sicuro che vuoi annullare i cambiamenti?";
/* File: ../Source/NSDocument.m:467 */
/* File: ../Source/NSDocument.m:473 */
"%@ has changed. Save?" = "%@ \U00E8 cambiato. Salvare?";
/* File: ../Source/NSDocument.m:802 */
/* File: ../Source/NSDocument.m:814 */
"Can't create backup file. Save anyways?"
= "Non si pu\U00F2 create un file di backup. Lo devo salvare lo stesso?";
/* File: ../Source/NSDocument.m:466 */
/* File: ../Source/NSDocument.m:472 */
"Close" = "Chiudi";
/* File: ../Source/NSDocument.m:136 */
/* File: ../Source/NSDocument.m:142 */
"Could not load URL %@." = "Non \U00E8 stato possibile caricare lo URL %@.";
/* File: ../Source/NSDocument.m:113 */
/* File: ../Source/NSDocument.m:119 */
"Could not load file %@."
= "Non \U00E8 stato possibile caricare il file %@.";
/* File: ../Source/NSDocument.m:801 */
/* File: ../Source/NSDocument.m:813 */
"File Error" = "Errore con un file";
/* File: ../Source/NSDocument.m:135 */
/* File: ../Source/NSDocument.m:112 */
/* File: ../Source/NSDocument.m:141 */
/* File: ../Source/NSDocument.m:118 */
"Load failed" = "Caricamento non riuscito";
/* File: ../Source/NSDocument.m:1134 */
/* File: ../Source/NSDocument.m:1179 */
"Save As" = "Salva con nome";
/* File: ../Source/NSDocument.m:1180 */
"Save To" = "Salva in";
/* File: ../Source/NSDocument.m:563 */
/* File: ../Source/NSDocument.m:569 */
"Untitled-%d" = "Senza-Titolo-%d";
/*** Strings from ../Source/NSDocumentController.m ***/
/* File: ../Source/NSDocumentController.m:1043 */
/* File: ../Source/NSDocumentController.m:1056 */
"Power Off" = "Spegni";
/* File: ../Source/NSDocumentController.m:995 */
/* File: ../Source/NSDocumentController.m:953 */
/* File: ../Source/NSDocumentController.m:1008 */
/* File: ../Source/NSDocumentController.m:966 */
"Quit Anyway" = "Esci comunque";
/* File: ../Source/NSDocumentController.m:993 */
/* File: ../Source/NSDocumentController.m:951 */
/* File: ../Source/NSDocumentController.m:1006 */
/* File: ../Source/NSDocumentController.m:964 */
"Review Unsaved" = "Rivisita documenti non salvati";
/* File: ../Source/NSDocumentController.m:1000 */
/* File: ../Source/NSDocumentController.m:950 */
/* File: ../Source/NSDocumentController.m:1013 */
/* File: ../Source/NSDocumentController.m:963 */
"You have unsaved documents" = "Ci sono documenti non salvati";
/*** Strings from ../Source/NSMenu.m ***/
/* File: ../Source/NSMenu.m:259 */
"Services" = "Servizi";
/*** Strings from ../Source/NSPageLayout.m ***/
/* File: ../Source/NSPageLayout.m:749 */
/* File: ../Source/NSPageLayout.m:747 */
"(none)" = "(nessuno)";
/* File: ../Source/NSPageLayout.m:976 */
"Bottom Margin" = "Margine Inferiore";
/* File: ../Source/NSPageLayout.m:1032 */
"Landscape" = "Orizzontale";
/* File: ../Source/NSPageLayout.m:977 */
"Left Margin" = "Margine Sinistro";
/* File: ../Source/NSPageLayout.m:1028 */
"Portrait" = "Verticale";
/* File: ../Source/NSPageLayout.m:978 */
"Right Margin" = "Margine Destro";
/* File: ../Source/NSPageLayout.m:975 */
"Top Margin" = "Margine Superiore";
/*** Strings from ../Source/NSPrintOperation.m ***/
/* File: ../Source/NSPrintOperation.m:677 */
"Error" = "Errore";
/* File: ../Source/NSPrintOperation.m:677 */
"Printing error: %@" = "Errore di stampa: %@";
/*** Strings from ../Source/NSSavePanel.m ***/
/* File: ../Source/NSSavePanel.m:1331 */
/* File: ../Source/NSSavePanel.m:250 */
/* File: ../Source/NSSavePanel.m:433 */
"Name:" = "Nome:";
/* File: ../Source/NSSavePanel.m:1379 */
"Replace" = "Sostituisci";
/* File: ../Source/NSSavePanel.m:1308 */
/* File: ../Source/NSSavePanel.m:1356 */
"The directory '%@' could not be created."
= "La directory '%@' non puo' essere creata.";
/* File: ../Source/NSSavePanel.m:1298 */
/* File: ../Source/NSSavePanel.m:1343 */
"The directory '%@' does not exist, do you want to create it?"
= "La directory '%@' non esiste, la vuoi creare?";
/* File: ../Source/NSSavePanel.m:1330 */
/* File: ../Source/NSSavePanel.m:1378 */
"The file '%@' in '%@' exists. Replace it?"
= "Il file '%@' in '%@' esiste. Vuoi sostituirlo?";
/* File: ../Source/NSSavePanel.m:1319 */
/* File: ../Source/NSSavePanel.m:1367 */
"The path '%@' is not a directory."
= "Il percorso non '%@' non è una directory.";
/* File: ../Source/NSSavePanel.m:1299 */
/* File: ../Source/NSSavePanel.m:1344 */
"Yes" = "Sì";

651
Resources/Lojban.lproj/Localizable.strings
View file

@ -1,286 +1,721 @@
/***
Lojban.lproj/Localizable.strings
updated by make_strings 2006-03-25 13:09:21 +0100
updated by make_strings 2013-02-08 11:55:53 +0100
add comments above this one
***/
/*** Keys found in multiple places ***/
/* File: ../Source/GSPrintOperation.m:158 */
/* File: ../Source/GSPrintOperation.m:157 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1147 */
/* File: ../Source/NSSavePanel.m:1357 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1158 */
/* File: ../Source/NSSavePanel.m:1368 */
/* Flag: untranslated */
"Dismiss" = "e'i nai";
/* File: ../Source/NSApplication.m:2615 */
/* File: ../Source/GSNibLoading.m:193 */
/* Comment: Info */
/* Flag: untranslated */
/* File: ../Source/NSApplication.m:2878 */
/* Comment: Title of the Info Panel */
/* Flag: untranslated */
/* File: ../Source/NSMenu.m:236 */
/* Comment: Info */
/* File: ../Source/NSMenu.m:258 */
/* Flag: untranslated */
/* File: ../Source/NSMenu.m:302 */
/* Comment: Info */
/* Flag: untranslated */
"Info" = "skisu";
"Info" = "Info";
/* File: ../Source/NSApplication.m:3092 */
/* File: ../Source/GSNibLoading.m:176 */
/* Comment: Quit */
/* Flag: untranslated */
/* File: ../Source/NSDocumentController.m:558 */
/* File: ../Source/NSApplication.m:3442 */
/* Flag: untranslated */
/* File: ../Source/NSApplication.m:4207 */
/* Flag: untranslated */
/* File: ../Source/NSDocumentController.m:1049 */
/* Flag: untranslated */
"Quit" = "fanmo";
/* File: ../Source/NSDocument.m:102 */
/* File: ../Source/NSDocument.m:118 */
/* Flag: untranslated */
/* File: ../Source/NSDocument.m:128 */
/* File: ../Source/NSDocument.m:141 */
/* Flag: untranslated */
"Load failed" = "na'e tcidu";
/* File: ../Source/NSDocument.m:283 */
/* File: ../Source/NSDocument.m:474 */
/* Flag: untranslated */
/* File: ../Source/NSDocument.m:510 */
/* File: ../Source/NSDocument.m:815 */
/* Flag: untranslated */
/* File: ../Source/NSDocument.m:694 */
/* File: ../Source/NSDocument.m:1183 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1135 */
/* File: ../Source/NSSavePanel.m:434 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1145 */
/* File: ../Source/NSSavePanel.m:1303 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1156 */
/* File: ../Source/NSSavePanel.m:1342 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1167 */
/* File: ../Source/NSSavePanel.m:1355 */
/* Flag: untranslated */
"Save" = "cisca";
/* File: ../Source/NSSavePanel.m:1366 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1377 */
/* Flag: untranslated */
"Save" = "Save";
/* File: ../Source/NSDocument.m:283 */
/* File: ../Source/NSAlert.m:384 */
/* Flag: untranslated */
/* File: ../Source/NSDocument.m:694 */
/* File: ../Source/NSDocument.m:474 */
/* Flag: untranslated */
/* File: ../Source/NSDocument.m:825 */
/* File: ../Source/NSDocument.m:815 */
/* Flag: untranslated */
/* File: ../Source/NSDocumentController.m:487 */
/* File: ../Source/NSDocument.m:1660 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1169 */
/* File: ../Source/NSDocumentController.m:955 */
/* Flag: untranslated */
"Cancel" = "vimcu";
/* File: ../Source/NSDocumentController.m:987 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:317 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1306 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1379 */
/* Flag: untranslated */
"Cancel" = "Cancel";
/* File: ../Source/NSDocument.m:506 */
/* File: ../Source/NSDocument.m:1658 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:855 */
/* File: ../Source/NSDocument.m:1660 */
/* Flag: untranslated */
"Save As" = "ciska fi ma";
/* File: ../Source/NSFontPanel.m:696 */
/* Flag: untranslated */
"Revert" = "Revert";
/* File: ../Source/NSDocument.m:823 */
/* File: ../Source/GSPrintOperation.m:155 */
/* Flag: untranslated */
/* File: ../Source/NSDocument.m:825 */
/* File: ../Source/NSFontPanel.m:706 */
/* Flag: untranslated */
"Revert" = "xruti";
"Preview" = "Preview";
/* File: ../Source/GSHelpManagerPanel.m:101 */
/* Flag: untranslated */
/* File: ../Source/NSAlert.m:1830 */
/* Flag: untranslated */
/* File: ../Source/NSPrintOperation.m:678 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:408 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:333 */
/* Flag: untranslated */
"OK" = "OK";
/* File: ../Source/NSAlert.m:389 */
/* Flag: untranslated */
/* File: ../Source/NSDocument.m:474 */
/* Flag: untranslated */
"Don't Save" = "na'e ciska";
/* File: ../Source/NSDocumentController.m:963 */
/* Flag: untranslated */
/* File: ../Source/NSDocumentController.m:1013 */
/* Flag: untranslated */
"You have unsaved documents" = "You have unsaved documents";
/* File: ../Source/NSDocumentController.m:964 */
/* Flag: untranslated */
/* File: ../Source/NSDocumentController.m:1006 */
/* Flag: untranslated */
"Review Unsaved" = "Review Unsaved";
/* File: ../Source/NSDocumentController.m:966 */
/* Flag: untranslated */
/* File: ../Source/NSDocumentController.m:1008 */
/* Flag: untranslated */
"Quit Anyway" = "Quit Anyway";
/* File: ../Source/GSCharacterPanel.m:154 */
/* Flag: untranslated */
/* File: ../Source/NSFontPanel.m:738 */
/* Flag: untranslated */
"Character Panel" = "Character Panel";
/* File: ../Source/GSCharacterPanel.m:173 */
/* Flag: untranslated */
/* File: ../Source/NSPageLayout.m:971 */
/* Flag: untranslated */
"Name" = "Name";
/* File: ../Source/GSHelpManagerPanel.m:70 */
/* Flag: untranslated */
/* File: ../Source/NSHelpPanel.m:154 */
/* Flag: untranslated */
"Help" = "Help";
/* File: ../Source/GSInfoPanel.m:187 */
/* Flag: untranslated */
/* File: ../Source/GSInfoPanel.m:482 */
/* Flag: untranslated */
"Current theme" = "Current theme";
/* File: ../Source/GSTextFinder.m:332 */
/* Flag: untranslated */
/* File: ../Source/GSTextFinder.m:381 */
/* Flag: untranslated */
"Not found" = "Not found";
/* File: ../Source/GSThemePanel.m:193 */
/* Flag: untranslated */
/* File: ../Source/GSThemePanel.m:234 */
/* Flag: untranslated */
"Revert default theme" = "Revert default theme";
/* File: ../Source/GSThemePanel.m:197 */
/* Flag: untranslated */
/* File: ../Source/GSThemePanel.m:229 */
/* Flag: untranslated */
"Make this the default theme" = "Make this the default theme";
/* File: ../Source/NSAttributedString.m:1060 */
/* Comment: Error description */
/* Flag: untranslated */
/* File: ../Source/NSAttributedString.m:1083 */
/* Comment: Error description */
/* Flag: untranslated */
"Could not create data for type." = "Could not create data for type.";
/* File: ../Source/NSColorPanel.m:244 */
/* Flag: untranslated */
/* File: ../Source/NSToolbarItem.m:1076 */
/* Flag: untranslated */
"Colors" = "Colors";
/* File: ../Source/NSDocument.m:1109 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:350 */
/* Flag: untranslated */
"File Type" = "File Type";
/* File: ../Source/NSPageLayout.m:747 */
/* Flag: untranslated */
/* File: ../Source/NSPageLayout.m:749 */
/* Flag: untranslated */
"(none)" = "(none)";
/* File: ../Source/NSPageLayout.m:979 */
/* Flag: untranslated */
/* File: ../Source/NSPageLayout.m:1050 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:630 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:676 */
/* Flag: untranslated */
"Unknown" = "Unknown";
/* File: ../Source/NSPrintPanel.m:643 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:774 */
/* Flag: untranslated */
/* File: ../Source/NSPrintPanel.m:781 */
/* Flag: untranslated */
"Manual" = "Manual";
/* File: ../Source/NSSavePanel.m:250 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:433 */
/* Flag: untranslated */
"Name:" = "Name:";
/* File: ../Source/NSSavePanel.m:1291 */
/* Flag: untranslated */
/* File: ../Source/NSSavePanel.m:1299 */
/* Flag: untranslated */
"Use .%@" = "Use .%@";
/*** Unmatched/untranslated keys ***/
/* File: ../Source/GSPrintOperation.m:156 */
/* File: ../Source/Functions.m:85 */
/* Flag: untranslated */
"Preview" = "viska";
"Cannot load the main model file '%@'"
= "Cannot load the main model file '%@'";
/* File: ../Source/GSPrintOperation.m:157 */
/* File: ../Source/GSCharacterPanel.m:182 */
/* Flag: untranslated */
"Code Point" = "Code Point";
/* File: ../Source/GSCharacterPanel.m:191 */
/* Flag: untranslated */
"Unicode Block" = "Unicode Block";
/* File: ../Source/GSInfoPanel.m:339 */
/* Flag: untranslated */
"Release: " = "Release: ";
/* File: ../Source/GSInfoPanel.m:396 */
/* Flag: untranslated */
"Copyright Information Not Available"
= "Copyright Information Not Available";
/* File: ../Source/GSInfoPanel.m:451 */
/* Flag: untranslated */
"Author: " = "Author: ";
/* File: ../Source/GSInfoPanel.m:455 */
/* Flag: untranslated */
"Authors: " = "Authors: ";
/* File: ../Source/GSPrintOperation.m:156 */
/* Flag: untranslated */
"Problem running the preview application '%@' perhaps you need to set your NSPreviewApp user default"
= "zo'e nabmi le samru'e gy. %@ gy. do nitcu cu jarpu'i la gy. NSPreviewApp gy. defaults gy.";
/* File: ../Source/NSAlert.m:1264 */
/* File: ../Source/GSTextFinder.m:408 */
/* Flag: untranslated */
"OK" = "i'a";
"%d replaced" = "%d replaced";
/* File: ../Source/NSApplication.m:117 */
/* File: ../Source/GSThemeDrawing.m:185 */
/* Flag: untranslated */
"?" = "?";
/* File: ../Source/GSThemeInspector.m:141 */
/* Flag: untranslated */
"Version: %@" = "Version: %@";
/* File: ../Source/GSThemePanel.m:115 */
/* Flag: untranslated */
"Themes" = "Themes";
/* File: ../Source/GSToolbarView.m:894 */
/* Flag: untranslated */
"Customize Toolbar" = "Customize Toolbar";
/* File: ../Source/NSAlert.m:2000 */
/* Flag: untranslated */
"Alert" = "Alert";
/* File: ../Source/NSAlert.m:2001 */
/* Flag: untranslated */
"No information" = "No information";
/* File: ../Source/NSApplication.m:135 */
/* Flag: untranslated */
"Critical Error in %@" = "la gy. %@ gy. srera.";
/* File: ../Source/NSApplication.m:120 */
/* File: ../Source/NSApplication.m:138 */
/* Flag: untranslated */
"Abort" = "spofu";
/* File: ../Source/NSApplication.m:123 */
/* File: ../Source/NSApplication.m:141 */
/* Flag: untranslated */
"Debug" = "faksre'i";
/* File: ../Source/NSApplication.m:277 */
/* File: ../Source/NSApplication.m:304 */
/* Flag: untranslated */
"Unable to find backend %@" = "na'e facki la gy. backend %@ gy.";
/* File: ../Source/NSApplication.m:284 */
/* File: ../Source/NSApplication.m:311 */
/* Flag: untranslated */
"Can't create NSBundle object for backend at path %@"
= "finti fe le sibdai gy. NSBundle gy. le datnyveiste gy. %@ gy.";
/* File: ../Source/NSApplication.m:289 */
/* File: ../Source/NSApplication.m:316 */
/* Flag: untranslated */
"Can't load object file from backend at path %@"
= "na'e tcidu fe le datnyvei la gy. backend %@ gy.";
/* File: ../Source/NSApplication.m:296 */
/* File: ../Source/NSApplication.m:323 */
/* Flag: untranslated */
"Backend at path %@ doesn't contain the GSBackend class"
= "gy. backend %@ gy. kunti gy. GSBackend gy.";
/* File: ../Source/NSApplication.m:304 */
/* Flag: untranslated */
"Can't find backend context" = "na'e facki le vanbi gy. backend gy.";
/* File: ../Source/NSApplication.m:897 */
/* File: ../Source/NSApplication.m:972 */
/* Flag: untranslated */
"[NSApplication -init] called more than once"
= "clacpe fe gy. [NSApplication -init] gy. du'eroi";
/* File: ../Source/NSApplication.m:951 */
/* Flag: untranslated */
"Cannot load the main model file '%@'"
= "na'e tcidu fe le datnyvei gy. main model %@ gy.";
/* File: ../Source/NSApplication.m:1083 */
/* File: ../Source/NSApplication.m:1198 */
/* Flag: untranslated */
"Problem during launch app notification: %@"
= "zo'e nabmi le samru'e cu notci gy. %@ gy.";
/* File: ../Source/NSApplication.m:3070 */
/* File: ../Source/NSApplication.m:3315 */
/* Flag: untranslated */
"reported exception - %@" = "le nafmupli gy. %@ gy.";
/* File: ../Source/NSBitmapImageRep.m:831 */
/* File: ../Source/NSApplication.m:4197 */
/* Flag: untranslated */
"Show" = "Show";
/* File: ../Source/NSApplication.m:4203 */
/* Flag: untranslated */
"Hide" = "Hide";
/* File: ../Source/NSAttributedString.m:762 */
/* Comment: Error description */
/* Flag: untranslated */
"No data specified for data loading."
= "No data specified for data loading.";
/* File: ../Source/NSAttributedString.m:863 */
/* Comment: Error description */
/* Flag: untranslated */
"Could not load data." = "Could not load data.";
/* File: ../Source/NSAttributedString.m:927 */
/* Comment: Error description */
/* Flag: untranslated */
"Could not load data from URL." = "Could not load data from URL.";
/* File: ../Source/NSAttributedString.m:1033 */
/* Comment: Error description */
/* Flag: untranslated */
"No type specified for data." = "No type specified for data.";
/* File: ../Source/NSBitmapImageRep.m:1644 */
/* Flag: untranslated */
"No Compression" = "na'e jdika";
/* File: ../Source/NSBitmapImageRep.m:832 */
/* File: ../Source/NSBitmapImageRep.m:1645 */
/* Flag: untranslated */
"CCITTFAX3 Compression" = "le djika gy. CCITTFAX3 gy.";
/* File: ../Source/NSBitmapImageRep.m:833 */
/* File: ../Source/NSBitmapImageRep.m:1646 */
/* Flag: untranslated */
"CCITTFAX4 Compression" = "le jdika gy. CCITTFAX4 gy.";
/* File: ../Source/NSBitmapImageRep.m:834 */
/* File: ../Source/NSBitmapImageRep.m:1647 */
/* Flag: untranslated */
"LZW Compression" = "le jdika gy. LZW gy.";
/* File: ../Source/NSBitmapImageRep.m:835 */
/* File: ../Source/NSBitmapImageRep.m:1648 */
/* Flag: untranslated */
"JPEG Compression" = "le jdika gy. JPEG gy.";
/* File: ../Source/NSBitmapImageRep.m:836 */
/* File: ../Source/NSBitmapImageRep.m:1649 */
/* Flag: untranslated */
"NEXT Compression" = "le jdika gy. NEXT gy.";
/* File: ../Source/NSBitmapImageRep.m:837 */
/* File: ../Source/NSBitmapImageRep.m:1650 */
/* Flag: untranslated */
"PackBits Compression" = "le jdika gy. PackBits gy.";
/* File: ../Source/NSBitmapImageRep.m:838 */
/* File: ../Source/NSBitmapImageRep.m:1651 */
/* Flag: untranslated */
"Old JPEG Compression" = "le jdika le clare'i gy. JPEG gy.";
/* File: ../Source/NSDocument.m:103 */
/* File: ../Source/NSColorPanel.m:308 */
/* Flag: untranslated */
"Opacity" = "Opacity";
/* File: ../Source/NSColorSpace.m:137 */
/* Comment: color space */
/* Flag: untranslated */
"unknown" = "unknown";
/* File: ../Source/NSColorSpace.m:139 */
/* Comment: color space */
/* Flag: untranslated */
"Grayscale" = "Grayscale";
/* File: ../Source/NSColorSpace.m:141 */
/* Comment: color space */
/* Flag: untranslated */
"RGB" = "RGB";
/* File: ../Source/NSColorSpace.m:143 */
/* Comment: color space */
/* Flag: untranslated */
"CMYK" = "CMYK";
/* File: ../Source/NSColorSpace.m:145 */
/* Comment: color space */
/* Flag: untranslated */
"LAB" = "LAB";
/* File: ../Source/NSColorSpace.m:147 */
/* Comment: color space */
/* Flag: untranslated */
"DeviceN" = "DeviceN";
/* File: ../Source/NSDocument.m:119 */
/* Flag: untranslated */
"Could not load file %@." = "na'e tcidu le datnyvei gy. %@. gy.";
/* File: ../Source/NSDocument.m:129 */
/* File: ../Source/NSDocument.m:142 */
/* Flag: untranslated */
"Could not load URL %@." = "na'e tcidu la gy. URL %@ gy.";
/* File: ../Source/NSDocument.m:281 */
/* File: ../Source/NSDocument.m:472 */
/* Flag: untranslated */
"Close" = "fanmo";
/* File: ../Source/NSDocument.m:282 */
/* File: ../Source/NSDocument.m:473 */
/* Flag: untranslated */
"%@ has changed. Save?" = "la gy. %@ gy. cenba .i do ciska mo";
/* File: ../Source/NSDocument.m:283 */
/* Flag: untranslated */
"Don't Save" = "na'e ciska";
/* File: ../Source/NSDocument.m:361 */
/* File: ../Source/NSDocument.m:569 */
/* Flag: untranslated */
"Untitled-%d" = "nae-cmene-%d";
/* File: ../Source/NSDocument.m:507 */
/* Flag: untranslated */
"Save To" = "ciska fe mo";
/* File: ../Source/NSDocument.m:692 */
/* File: ../Source/NSDocument.m:813 */
/* Flag: untranslated */
"File Error" = "le datnyvei srera";
/* File: ../Source/NSDocument.m:693 */
/* File: ../Source/NSDocument.m:814 */
/* Flag: untranslated */
"Can't create backup file. Save anyways?"
= "na'e finti fe fukdat'i .i do ciska mo";
/* File: ../Source/NSDocument.m:824 */
/* File: ../Source/NSDocument.m:1179 */
/* Flag: untranslated */
"Save As" = "ciska fi ma";
/* File: ../Source/NSDocument.m:1180 */
/* Flag: untranslated */
"Save To" = "ciska fe mo";
/* File: ../Source/NSDocument.m:1659 */
/* Flag: untranslated */
"%@ has been edited. Are you sure you want to undo changes?"
= "la gy. %@ gy. cenba .i do xruti le cenba mo?";
/* File: ../Source/NSDocumentController.m:499 */
/* Flag: untranslated */
"You have unsaved documents" = "na'e ciska le xusnoi";
/* File: ../Source/NSDocumentController.m:500 */
/* Flag: untranslated */
"Review Unsaved" = "do catlu le na'e ciska";
/* File: ../Source/NSDocumentController.m:502 */
/* Flag: untranslated */
"Quit Anyway" = "birti fe le fanmo";
/* File: ../Source/NSDocumentController.m:565 */
/* File: ../Source/NSDocumentController.m:1056 */
/* Flag: untranslated */
"Power Off" = "ganlo";
/* File: ../Source/NSSavePanel.m:1136 */
/* File: ../Source/NSDocumentController.m:1692 */
/* Flag: untranslated */
"Clear List" = "Clear List";
/* File: ../Source/NSFontPanel.m:241 */
/* Flag: untranslated */
"Multiple fonts selected" = "Multiple fonts selected";
/* File: ../Source/NSFontPanel.m:553 */
/* Flag: untranslated */
"Font Panel" = "Font Panel";
/* File: ../Source/NSFontPanel.m:578 */
/* Flag: untranslated */
"Font preview" = "Font preview";
/* File: ../Source/NSFontPanel.m:639 */
/* Flag: untranslated */
"Size" = "Size";
/* File: ../Source/NSFontPanel.m:719 */
/* Flag: untranslated */
"Set" = "Set";
/* File: ../Source/NSFontPanel.m:810 */
/* Flag: untranslated */
"NoFamily" = "NoFamily";
/* File: ../Source/NSFontPanel.m:818 */
/* Flag: untranslated */
"NoFace" = "NoFace";
/* File: ../Source/NSFontPanel.m:1138 */
/* Flag: untranslated */
"Family" = "Family";
/* File: ../Source/NSFontPanel.m:1142 */
/* Flag: untranslated */
"Typeface" = "Typeface";
/* File: ../Source/NSMenu.m:259 */
/* Flag: untranslated */
"Services" = "Services";
/* File: ../Source/NSOpenPanel.m:92 */
/* Flag: untranslated */
"Open" = "Open";
/* File: ../Source/NSPageLayout.m:972 */
/* Flag: untranslated */
"Dimensions" = "Dimensions";
/* File: ../Source/NSPageLayout.m:973 */
/* Flag: untranslated */
"Orientation" = "Orientation";
/* File: ../Source/NSPageLayout.m:974 */
/* Flag: untranslated */
"Scale" = "Scale";
/* File: ../Source/NSPageLayout.m:975 */
/* Flag: untranslated */
"Top Margin" = "Top Margin";
/* File: ../Source/NSPageLayout.m:976 */
/* Flag: untranslated */
"Bottom Margin" = "Bottom Margin";
/* File: ../Source/NSPageLayout.m:977 */
/* Flag: untranslated */
"Left Margin" = "Left Margin";
/* File: ../Source/NSPageLayout.m:978 */
/* Flag: untranslated */
"Right Margin" = "Right Margin";
/* File: ../Source/NSPageLayout.m:1028 */
/* Flag: untranslated */
"Portrait" = "Portrait";
/* File: ../Source/NSPageLayout.m:1032 */
/* Flag: untranslated */
"Landscape" = "Landscape";
/* File: ../Source/NSPrintOperation.m:677 */
/* Flag: untranslated */
"Error" = "Error";
/* File: ../Source/NSPrintOperation.m:677 */
/* Flag: untranslated */
"Printing error: %@" = "Printing error: %@";
/* File: ../Source/NSPrintPanel.m:145 */
/* Flag: untranslated */
"Print Panel" = "Print Panel";
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"1 up" = "1 up";
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"2 up" = "2 up";
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"6 up" = "6 up";
/* File: ../Source/NSPrintPanel.m:179 */
/* Flag: untranslated */
"4 up" = "4 up";
/* File: ../Source/NSPrintPanel.m:180 */
/* Flag: untranslated */
"8 up" = "8 up";
/* File: ../Source/NSPrintPanel.m:407 */
/* Flag: untranslated */
"Sorry" = "Sorry";
/* File: ../Source/NSPrintPanel.m:407 */
/* Flag: untranslated */
"Faxing of print file not implemented"
= "Faxing of print file not implemented";
/* File: ../Source/NSSavePanel.m:241 */
/* Flag: untranslated */
"Show Hidden Files" = "Show Hidden Files";
/* File: ../Source/NSSavePanel.m:276 */
/* Flag: untranslated */
"Home" = "Home";
/* File: ../Source/NSSavePanel.m:292 */
/* Flag: untranslated */
"Mount" = "Mount";
/* File: ../Source/NSSavePanel.m:308 */
/* Flag: untranslated */
"Unmount" = "Unmount";
/* File: ../Source/NSSavePanel.m:1290 */
/* Flag: untranslated */
"You have used the extension '.%@'.\nThe standard extension is '.%@'.'"
= "You have used the extension '.%@'.\nThe standard extension is '.%@'.'";
/* File: ../Source/NSSavePanel.m:1298 */
/* Flag: untranslated */
"You cannot save this document with extension '.%@'.\nThe required extension is '.%@'."
= "You cannot save this document with extension '.%@'.\nThe required extension is '.%@'.";
/* File: ../Source/NSSavePanel.m:1343 */
/* Flag: untranslated */
"The directory '%@' does not exist, do you want to create it?"
= "na'e zasti le datnyvei gy. %@ gy. .i do finti mo";
/* File: ../Source/NSSavePanel.m:1137 */
/* Flag: untranslated */
"Yes" = "go'i";
/* File: ../Source/NSSavePanel.m:1137 */
/* File: ../Source/NSSavePanel.m:1344 */
/* Flag: untranslated */
"No" = "nago'i";
/* File: ../Source/NSSavePanel.m:1146 */
/* File: ../Source/NSSavePanel.m:1344 */
/* Flag: untranslated */
"Yes" = "go'i";
/* File: ../Source/NSSavePanel.m:1356 */
/* Flag: untranslated */
"The directory '%@' could not be created."
= "na'e finti le datnyveiste gy. %@ gy.";
/* File: ../Source/NSSavePanel.m:1157 */
/* File: ../Source/NSSavePanel.m:1367 */
/* Flag: untranslated */
"The path '%@' is not a directory." = "ne'e datnyveiste la gy. %@ gy.";
/* File: ../Source/NSSavePanel.m:1168 */
/* File: ../Source/NSSavePanel.m:1378 */
/* Flag: untranslated */
"The file '%@' in '%@' exists. Replace it?"
= "zasti le datnyvei gy. %@ gy. la gy. %@ gy. .i do basti mo";
/* File: ../Source/NSSavePanel.m:1169 */
/* File: ../Source/NSSavePanel.m:1379 */
/* Flag: untranslated */
"Replace" = "basti";
/* File: ../Source/NSSavePanel.m:1761 */
/* Flag: untranslated */
"Reading Directory " = "Reading Directory ";
/* File: ../Source/NSSpellChecker.m:731 */
/* Flag: untranslated */
"Guess" = "Guess";
/* File: ../Source/NSTextView.m:650 */
/* Flag: untranslated */
"Cut" = "Cut";
/* File: ../Source/NSTextView.m:651 */
/* Flag: untranslated */
"Copy" = "Copy";
/* File: ../Source/NSTextView.m:652 */
/* Flag: untranslated */
"Paste" = "Paste";
/* File: ../Source/NSTextView.m:5847 */
/* Flag: untranslated */
"No Suggestions" = "No Suggestions";
/* File: ../Source/NSToolbarItem.m:949 */
/* Flag: untranslated */
"Separator" = "Separator";
/* File: ../Source/NSToolbarItem.m:991 */
/* Flag: untranslated */
"Space" = "Space";
/* File: ../Source/NSToolbarItem.m:1021 */
/* Flag: untranslated */
"Flexible Space" = "Flexible Space";
/* File: ../Source/NSToolbarItem.m:1099 */
/* Flag: untranslated */
"Fonts" = "Fonts";
/* File: ../Source/NSToolbarItem.m:1122 */
/* Flag: untranslated */
"Customize" = "Customize";
/* File: ../Source/NSToolbarItem.m:1145 */
/* Flag: untranslated */
"Print..." = "Print...";
/* File: ../Source/NSWindow.m:5192 */
/* Flag: untranslated */
"Hide Toolbar" = "Hide Toolbar";
/* File: ../Source/NSWindow.m:5194 */
/* Flag: untranslated */
"Show Toolbar" = "Show Toolbar";

1446
Resources/Spanish.lproj/Localizable.strings
View file

File diff suppressed because it is too large Load diff

240
Source/Functions.m
View file

@ -118,11 +118,11 @@ NSAvailableWindowDepths(void)
}
NSWindowDepth
NSBestDepth(NSString *colorSpace, int bitsPerSample, int bitsPerPixel,
NSBestDepth(NSString *colorSpace, NSInteger bitsPerSample, NSInteger bitsPerPixel,
BOOL planar, BOOL *exactMatch)
{
int components = NSNumberOfColorComponents(colorSpace);
int index = 0;
NSInteger components = NSNumberOfColorComponents(colorSpace);
NSInteger index = 0;
const NSWindowDepth *depths = NSAvailableWindowDepths();
NSWindowDepth bestDepth = NSDefaultDepth;
@ -167,11 +167,11 @@ NSBestDepth(NSString *colorSpace, int bitsPerSample, int bitsPerPixel,
return bestDepth;
}
int
NSInteger
NSBitsPerPixelFromDepth(NSWindowDepth depth)
{
int bps = NSBitsPerSampleFromDepth(depth);
int spp = 0;
NSInteger bps = NSBitsPerSampleFromDepth(depth);
NSInteger spp = 0;
if (depth & _GSRGBBitValue)
{
@ -188,7 +188,7 @@ NSBitsPerPixelFromDepth(NSWindowDepth depth)
return (spp * bps);
}
int
NSInteger
NSBitsPerSampleFromDepth(NSWindowDepth depth)
{
NSWindowDepth bitValue = 0;
@ -253,10 +253,10 @@ NSColorSpaceFromDepth(NSWindowDepth depth)
return colorSpace;
}
int
NSInteger
NSNumberOfColorComponents(NSString *colorSpaceName)
{
int components = 1;
NSInteger components = 1;
/*
* These are the only exceptions to the above.
@ -302,9 +302,9 @@ void NSCopyBitmapFromGState(int srcGstate, NSRect srcRect, NSRect destRect)
NSLog(@"NSCopyBitmapFromGState not implemented");
}
void NSCopyBits(int srcGstate, NSRect srcRect, NSPoint destPoint)
void NSCopyBits(NSInteger srcGstate, NSRect srcRect, NSPoint destPoint)
{
float x, y, w, h;
CGFloat x, y, w, h;
NSGraphicsContext *ctxt = GSCurrentContext();
x = NSMinX(srcRect);
@ -317,12 +317,12 @@ void NSCopyBits(int srcGstate, NSRect srcRect, NSPoint destPoint)
}
void NSDrawBitmap(NSRect rect,
int pixelsWide,
int pixelsHigh,
int bitsPerSample,
int samplesPerPixel,
int bitsPerPixel,
int bytesPerRow,
NSInteger pixelsWide,
NSInteger pixelsHigh,
NSInteger bitsPerSample,
NSInteger samplesPerPixel,
NSInteger bitsPerPixel,
NSInteger bytesPerRow,
BOOL isPlanar,
BOOL hasAlpha,
NSString *colorSpaceName,
@ -350,8 +350,8 @@ void NSDrawBitmap(NSRect rect,
/**
* Tiles an image in a rect, starting from the lower-left-hand corner
*/
static void GSDrawRepeatingImage(NSRect aRect, NSImage *image, NSCompositingOperation op,
CGFloat fraction, BOOL flipped)
static void GSDrawRepeatingImage2D(NSRect aRect, NSImage *image, NSCompositingOperation op,
CGFloat fraction, BOOL flipped)
{
const NSSize imageSize = [image size];
if (imageSize.width <= 0 ||
@ -394,6 +394,115 @@ static void GSDrawRepeatingImage(NSRect aRect, NSImage *image, NSCompositingOper
[NSGraphicsContext restoreGraphicsState];
}
static void GSDrawRepeatingImage1D(NSRect aRect, NSImage *image, BOOL isVertical,
NSCompositingOperation op,
CGFloat fraction, BOOL flipped)
{
const NSSize imageSize = [image size];
if (imageSize.width <= 0 ||
imageSize.height <= 0)
{
return;
}
[NSGraphicsContext saveGraphicsState];
NSRectClip(aRect);
{
const NSInteger num = isVertical ?
ceil(aRect.size.height / imageSize.height)
: ceil(aRect.size.width / imageSize.width);
NSInteger i;
if (num > 0)
{
for (i = 0; i < num; i++)
{
NSRect drawRect;
if (isVertical)
{
drawRect.size = NSMakeSize(aRect.size.width, imageSize.height);
drawRect.origin = NSMakePoint(aRect.origin.x,
flipped ? (NSMaxY(aRect) - ((i + 1) * imageSize.height))
: (aRect.origin.y + (i * imageSize.height)));
}
else
{
drawRect.size = NSMakeSize(imageSize.width, aRect.size.height);
drawRect.origin = NSMakePoint(aRect.origin.x + (i * imageSize.width),
aRect.origin.y);
}
[image drawInRect: drawRect
fromRect: NSZeroRect
operation: op
fraction: fraction
respectFlipped: YES
hints: nil];
}
}
}
[NSGraphicsContext restoreGraphicsState];
}
void NSDrawThreePartImage(NSRect aRect, NSImage *start, NSImage *middle,
NSImage *end, BOOL isVertical, NSCompositingOperation op,
CGFloat fraction, BOOL flipped)
{
NSRect startRect, middleRect, endRect;
NSView *focusView = [NSView focusView];
if (nil != focusView)
{
aRect = [focusView centerScanRect: aRect];
}
[NSGraphicsContext saveGraphicsState];
// Protects against the case when the smallest source image is larger than aRect
NSRectClip(aRect);
if (isVertical)
{
startRect.size = NSMakeSize(aRect.size.width,
[start size].height);
endRect.size = NSMakeSize(aRect.size.width,
[end size].height);
middleRect.size = NSMakeSize(aRect.size.width,
MAX(0, aRect.size.height -
startRect.size.height -
endRect.size.height));
endRect.origin = aRect.origin;
middleRect.origin = NSMakePoint(aRect.origin.x, NSMaxY(endRect));
startRect.origin = NSMakePoint(aRect.origin.x, NSMaxY(middleRect));
}
else
{
startRect.size = NSMakeSize([start size].width,
aRect.size.height);
endRect.size = NSMakeSize([end size].width,
aRect.size.height);
middleRect.size = NSMakeSize(MAX(0, aRect.size.width -
startRect.size.width -
endRect.size.width),
aRect.size.height);
startRect.origin = aRect.origin;
middleRect.origin = NSMakePoint(NSMaxX(startRect), aRect.origin.y);
endRect.origin = NSMakePoint(NSMaxX(middleRect), aRect.origin.y);
}
[start drawInRect: startRect fromRect: NSZeroRect operation: op fraction: fraction respectFlipped: YES hints: nil];
GSDrawRepeatingImage1D(middleRect, middle, isVertical, op, fraction, flipped);
[end drawInRect: endRect fromRect: NSZeroRect operation: op fraction: fraction respectFlipped: YES hints: nil];
[NSGraphicsContext restoreGraphicsState]; // Restore clipping region
}
void NSDrawNinePartImage(NSRect aRect, NSImage *topLeft, NSImage *topMiddle,
NSImage *topRight, NSImage *centerLeft,
NSImage *centerMiddle, NSImage *centerRight,
@ -494,13 +603,13 @@ void NSDrawNinePartImage(NSRect aRect, NSImage *topLeft, NSImage *topMiddle,
// Draw the images left-to-right, bottom-to-top
[bottomLeft drawInRect: bottomLeftRect fromRect: NSZeroRect operation: op fraction: fraction respectFlipped: YES hints: nil];
GSDrawRepeatingImage(bottomMiddleRect, bottomMiddle, op, fraction, flipped);
GSDrawRepeatingImage2D(bottomMiddleRect, bottomMiddle, op, fraction, flipped);
[bottomRight drawInRect: bottomRightRect fromRect: NSZeroRect operation: op fraction: fraction respectFlipped: YES hints: nil];
GSDrawRepeatingImage(centerLeftRect, centerLeft, op, fraction, flipped);
GSDrawRepeatingImage(centerMiddleRect, centerMiddle, op, fraction, flipped);
GSDrawRepeatingImage(centerRightRect, centerRight, op, fraction, flipped);
GSDrawRepeatingImage2D(centerLeftRect, centerLeft, op, fraction, flipped);
GSDrawRepeatingImage2D(centerMiddleRect, centerMiddle, op, fraction, flipped);
GSDrawRepeatingImage2D(centerRightRect, centerRight, op, fraction, flipped);
[topLeft drawInRect: topLeftRect fromRect: NSZeroRect operation: op fraction: fraction respectFlipped: YES hints: nil];
GSDrawRepeatingImage(topMiddleRect, topMiddle, op, fraction, flipped);
GSDrawRepeatingImage2D(topMiddleRect, topMiddle, op, fraction, flipped);
[topRight drawInRect: topRightRect fromRect: NSZeroRect operation: op fraction: fraction respectFlipped: YES hints: nil];
}
@ -535,9 +644,9 @@ void NSRectClip(NSRect aRect)
DPSnewpath(ctxt);
}
void NSRectClipList(const NSRect *rects, int count)
void NSRectClipList(const NSRect *rects, NSInteger count)
{
int i;
NSInteger i;
NSRect union_rect;
if (count == 0)
@ -562,16 +671,16 @@ void NSRectFill(NSRect aRect)
NSWidth(aRect), NSHeight(aRect));
}
void NSRectFillList(const NSRect *rects, int count)
void NSRectFillList(const NSRect *rects, NSInteger count)
{
NSGraphicsContext *ctxt = GSCurrentContext();
GSRectFillList(ctxt, rects, count);
}
void
NSRectFillListWithColors(const NSRect *rects, NSColor **colors, int count)
NSRectFillListWithColors(const NSRect *rects, NSColor **colors, NSInteger count)
{
int i;
NSInteger i;
NSGraphicsContext *ctxt = GSCurrentContext();
DPSgsave(ctxt);
@ -584,10 +693,10 @@ NSRectFillListWithColors(const NSRect *rects, NSColor **colors, int count)
DPSgrestore(ctxt);
}
void NSRectFillListWithGrays(const NSRect *rects, const float *grays,
int count)
void NSRectFillListWithGrays(const NSRect *rects, const CGFloat *grays,
NSInteger count)
{
int i;
NSInteger i;
NSGraphicsContext *ctxt = GSCurrentContext();
DPSgsave(ctxt);
@ -610,10 +719,10 @@ void NSRectFillUsingOperation(NSRect aRect, NSCompositingOperation op)
void
NSRectFillListUsingOperation(const NSRect *rects, int count,
NSRectFillListUsingOperation(const NSRect *rects, NSInteger count,
NSCompositingOperation op)
{
int i;
NSInteger i;
for (i = 0; i < count; i++)
{
@ -624,10 +733,10 @@ NSRectFillListUsingOperation(const NSRect *rects, int count,
void
NSRectFillListWithColorsUsingOperation(const NSRect *rects,
NSColor **colors,
int num,
NSInteger num,
NSCompositingOperation op)
{
int i;
NSInteger i;
NSGraphicsContext *ctxt = GSCurrentContext();
DPSgsave(ctxt);
@ -646,7 +755,7 @@ NSRectFillListWithColorsUsingOperation(const NSRect *rects,
// TODO: Should we retire NSDottedFrameRect in favor of NSFocusRingFrameRect?
void NSDottedFrameRect(const NSRect aRect)
{
float dot_dash[] = {1.0, 1.0};
CGFloat dot_dash[] = {1.0, 1.0};
NSGraphicsContext *ctxt = GSCurrentContext();
DPSgsave(ctxt);
DPSsetgray(ctxt, NSBlack);
@ -679,7 +788,7 @@ void NSFrameRect(const NSRect aRect)
NSFrameRectWithWidth(aRect, 1.0);
}
void NSFrameRectWithWidth(const NSRect aRect, float frameWidth)
void NSFrameRectWithWidth(const NSRect aRect, CGFloat frameWidth)
{
NSRectEdge sides[] = {NSMaxXEdge, NSMinYEdge, NSMinXEdge, NSMaxYEdge};
NSRect remainder = aRect;
@ -694,7 +803,7 @@ void NSFrameRectWithWidth(const NSRect aRect, float frameWidth)
}
void
NSFrameRectWithWidthUsingOperation(NSRect aRect, float frameWidth,
NSFrameRectWithWidthUsingOperation(NSRect aRect, CGFloat frameWidth,
NSCompositingOperation op)
{
NSRectEdge sides[] = {NSMaxXEdge, NSMinYEdge, NSMinXEdge, NSMaxYEdge};
@ -712,9 +821,9 @@ NSFrameRectWithWidthUsingOperation(NSRect aRect, float frameWidth,
NSRect
NSDrawTiledRects(NSRect aRect, const NSRect clipRect,
const NSRectEdge *sides,
const float *grays, int count)
const CGFloat *grays, NSInteger count)
{
int i;
NSInteger i;
NSRect slice;
NSRect remainder = aRect;
NSRect rects[count];
@ -740,9 +849,9 @@ NSDrawTiledRects(NSRect aRect, const NSRect clipRect,
NSRect
NSDrawColorTiledRects(NSRect boundsRect, NSRect clipRect,
const NSRectEdge *sides, NSColor **colors,
int count)
NSInteger count)
{
int i;
NSInteger i;
NSRect slice;
NSRect remainder = boundsRect;
NSRect rects[count];
@ -774,9 +883,9 @@ NSDrawButton(const NSRect aRect, const NSRect clipRect)
NSRectEdge down_sides[] = {NSMaxXEdge, NSMaxYEdge,
NSMinXEdge, NSMinYEdge,
NSMaxXEdge, NSMaxYEdge};
float grays[] = {NSBlack, NSBlack,
NSWhite, NSWhite,
NSDarkGray, NSDarkGray};
CGFloat grays[] = {NSBlack, NSBlack,
NSWhite, NSWhite,
NSDarkGray, NSDarkGray};
NSRect rect;
NSGraphicsContext *ctxt = GSCurrentContext();
@ -804,8 +913,8 @@ NSDrawGrayBezel(const NSRect aRect, const NSRect clipRect)
NSMaxXEdge, NSMinYEdge, NSMinXEdge, NSMaxYEdge};
NSRectEdge down_sides[] = {NSMaxXEdge, NSMaxYEdge, NSMinXEdge, NSMinYEdge,
NSMaxXEdge, NSMaxYEdge, NSMinXEdge, NSMinYEdge};
float grays[] = {NSWhite, NSWhite, NSDarkGray, NSDarkGray,
NSLightGray, NSLightGray, NSBlack, NSBlack};
CGFloat grays[] = {NSWhite, NSWhite, NSDarkGray, NSDarkGray,
NSLightGray, NSLightGray, NSBlack, NSBlack};
NSRect rect;
NSGraphicsContext *ctxt = GSCurrentContext();
@ -843,8 +952,8 @@ NSDrawGroove(const NSRect aRect, const NSRect clipRect)
NSMaxXEdge, NSMinYEdge, NSMaxXEdge, NSMinYEdge};
NSRectEdge down_sides[] = {NSMinXEdge, NSMinYEdge, NSMinXEdge, NSMinYEdge,
NSMaxXEdge, NSMaxYEdge, NSMaxXEdge, NSMaxYEdge};
float grays[] = {NSDarkGray, NSDarkGray, NSWhite, NSWhite,
NSWhite, NSWhite, NSDarkGray, NSDarkGray};
CGFloat grays[] = {NSDarkGray, NSDarkGray, NSWhite, NSWhite,
NSWhite, NSWhite, NSDarkGray, NSDarkGray};
NSRect rect;
NSGraphicsContext *ctxt = GSCurrentContext();
@ -873,8 +982,8 @@ NSDrawWhiteBezel(const NSRect aRect, const NSRect clipRect)
NSMaxYEdge, NSMaxXEdge, NSMinYEdge, NSMinXEdge};
NSRectEdge down_sides[] = {NSMinYEdge, NSMaxXEdge, NSMaxYEdge, NSMinXEdge,
NSMinYEdge, NSMaxXEdge, NSMaxYEdge, NSMinXEdge};
float grays[] = {NSDarkGray, NSWhite, NSWhite, NSDarkGray,
NSDarkGray, NSLightGray, NSLightGray, NSDarkGray};
CGFloat grays[] = {NSDarkGray, NSWhite, NSWhite, NSDarkGray,
NSDarkGray, NSLightGray, NSLightGray, NSDarkGray};
NSRect rect;
NSGraphicsContext *ctxt = GSCurrentContext();
@ -905,8 +1014,8 @@ NSDrawDarkBezel(NSRect aRect, NSRect clipRect)
NSMaxXEdge, NSMaxYEdge, NSMinXEdge, NSMinYEdge};
// FIXME: The actual colour used for the 3 + 4 line
// (and the two additional points) is a bit darker.
float grays[] = {NSWhite, NSWhite, NSLightGray, NSLightGray,
NSLightGray, NSLightGray, NSBlack, NSBlack};
CGFloat grays[] = {NSWhite, NSWhite, NSLightGray, NSLightGray,
NSLightGray, NSLightGray, NSBlack, NSBlack};
NSRect rect;
NSGraphicsContext *ctxt = GSCurrentContext();
DPSgsave(ctxt);
@ -943,8 +1052,8 @@ NSDrawLightBezel(NSRect aRect, NSRect clipRect)
NSMaxXEdge, NSMinYEdge, NSMinXEdge, NSMaxYEdge};
NSRectEdge down_sides[] = {NSMaxXEdge, NSMaxYEdge, NSMinXEdge, NSMinYEdge,
NSMaxXEdge, NSMaxYEdge, NSMinXEdge, NSMinYEdge};
float grays[] = {NSWhite, NSWhite, NSGray, NSGray,
NSBlack, NSBlack, NSBlack, NSBlack};
CGFloat grays[] = {NSWhite, NSWhite, NSGray, NSGray,
NSBlack, NSBlack, NSBlack, NSBlack};
NSRect rect;
NSGraphicsContext *ctxt = GSCurrentContext();
DPSgsave(ctxt);
@ -983,9 +1092,9 @@ NSDrawFramePhoto(const NSRect aRect, const NSRect clipRect)
NSRectEdge down_sides[] = {NSMaxXEdge, NSMaxYEdge,
NSMinXEdge, NSMinYEdge,
NSMaxXEdge, NSMaxYEdge};
float grays[] = {NSDarkGray, NSDarkGray,
NSDarkGray, NSDarkGray,
NSBlack, NSBlack};
CGFloat grays[] = {NSDarkGray, NSDarkGray,
NSDarkGray, NSDarkGray,
NSBlack, NSBlack};
NSRect rect;
NSGraphicsContext *ctxt = GSCurrentContext();
@ -1018,10 +1127,10 @@ NSDrawWindowBackground(NSRect aRect)
DPSgrestore(ctxt);
}
float
CGFloat
NSLinkFrameThickness(void)
{
return 1;
return 1.0;
}
void
@ -1053,8 +1162,8 @@ void
NSConvertGlobalToWindowNumber(int globalNum, unsigned int *winNum)
{
NSArray *windows = GSAllWindows();
unsigned count = [windows count];
unsigned i;
NSUInteger count = [windows count];
NSUInteger i;
for (i = 0; i < count; i++)
{
@ -1076,7 +1185,7 @@ NSConvertWindowNumberToGlobal(int winNum, unsigned int *globalNum)
}
void
NSCountWindowsForContext(int context, int *count)
NSCountWindowsForContext(NSInteger context, NSInteger *count)
{
// TODO
*count = 0;
@ -1089,7 +1198,7 @@ NSShowSystemInfoPanel(NSDictionary *options)
}
void
NSWindowListForContext(int context, int size, int **list)
NSWindowListForContext(NSInteger context, NSInteger size, NSInteger **list)
{
// TODO
}
@ -1101,4 +1210,3 @@ NSGetWindowServerMemory(int context, int *virtualMemory,
// TODO
return -1;
}

3
Source/GNUmakefile
View file

@ -132,6 +132,7 @@ NSOutlineView.m \
NSPageLayout.m \
NSPanel.m \
NSParagraphStyle.m \
NSPopover.m \
NSPopUpButton.m \
NSPopUpButtonCell.m \
NSPrinter.m \
@ -193,6 +194,7 @@ NSWindow.m \
NSWindowController.m \
NSWorkspace.m \
GSAnimator.m \
GSAutocompleteWindow.m \
GSDisplayServer.m \
GSHelpManagerPanel.m \
GSInfoPanel.m \
@ -341,6 +343,7 @@ NSPageLayout.h \
NSPanel.h \
NSParagraphStyle.h \
NSPasteboard.h \
NSPopover.h \
NSPopUpButton.h \
NSPopUpButtonCell.h \
NSPrintInfo.h \

72
Source/GSAutocompleteWindow.h Normal file
View file

@ -0,0 +1,72 @@
/*
Copyright (C) 2013 Free Software Foundation, Inc.
Author: German A. Arias <german@xelalug.org>
Date: 2013
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 Lesser 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#import <AppKit/NSPanel.h>
@class GSAutocompleteView;
@class NSArray;
@class NSString;
@class NSNotification;
@class NSNotificationCenter;
@class NSTableColumn;
@class NSTableView;
@class NSTextView;
@interface GSAutocompleteWindow : NSPanel
{
BOOL _stopped;
NSRange _range;
NSTextView *_textView;
GSAutocompleteView *_tableView;
//Retained
NSString *_originalWord;
NSArray *_words;
}
+ (GSAutocompleteWindow *) defaultWindow;
- (void) layout;
- (void) computePosition;
- (void) displayForTextView: (NSTextView *)textView;
- (NSArray *) words;
- (void) runModalWindow;
- (void) runLoop;
- (void) onWindowEdited: (NSNotification *)notification;
- (void) reloadData;
- (void) updateTextViewWithMovement: (NSInteger)movement isFinal: (BOOL)flag;
- (void) clickItem: (id)sender;
- (void) moveUpSelection;
- (void) moveDownSelection;
// Delegate
- (int) numberOfRowsInTableView: (NSTableView*)aTableView;
- (id) tableView: (NSTableView*)aTableView
objectValueForTableColumn: (NSTableColumn*)aTableColumn
row: (int)rowIndex;
@end

503
Source/GSAutocompleteWindow.m Normal file
View file

@ -0,0 +1,503 @@
/*
Copyright (C) 2013 Free Software Foundation, Inc.
Author: German A. Arias <german@xelalug.org>
Date: 2013
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 Lesser 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; see the file COPYING.LIB.
If not, see <http://www.gnu.org/licenses/> or write to the
Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#import <Foundation/NSAutoreleasePool.h>
#import <Foundation/NSRunLoop.h>
#import <Foundation/NSNotification.h>
#import "AppKit/NSApplication.h"
#import "AppKit/NSBox.h"
#import "AppKit/NSEvent.h"
#import "AppKit/NSScreen.h"
#import "AppKit/NSScrollView.h"
#import "AppKit/NSTableView.h"
#import "AppKit/NSTableColumn.h"
#import "AppKit/NSText.h"
#import "AppKit/NSTextView.h"
#import "GNUstepGUI/GSTheme.h"
#import "GSAutocompleteWindow.h"
static GSAutocompleteWindow *gsWindow = nil;
@interface NSTextView (Additions)
- (NSRect) rectForCharacterRange: (NSRange)aRange;
@end
@interface GSAutocompleteView : NSTableView
{
}
@end
@implementation GSAutocompleteView
- (BOOL) acceptsFirstMouse: (NSEvent *)event
{
return YES;
}
@end
@implementation GSAutocompleteWindow
+ (GSAutocompleteWindow *) defaultWindow
{
if (gsWindow == nil)
gsWindow = [[self alloc] initWithContentRect: NSMakeRect(0,0,200,200)
styleMask: NSBorderlessWindowMask
backing: NSBackingStoreNonretained
defer: YES];
return gsWindow;
}
- (id) initWithContentRect: (NSRect)contentRect
styleMask: (NSUInteger)aStyle
backing: (NSBackingStoreType)bufferingType
defer: (BOOL)flag
{
NSBox *box;
NSScrollView *scrollView;
NSTableColumn *column;
NSCell *cell;
self = [super initWithContentRect: contentRect
styleMask: aStyle
backing: bufferingType
defer: flag];
if (nil == self)
return self;
// Init vars
_words = nil;
_originalWord = nil;
[self setLevel: NSPopUpMenuWindowLevel];
[self setBecomesKeyOnlyIfNeeded: YES];
box = [[NSBox alloc] initWithFrame: contentRect];
[box setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[box setBorderType: NSLineBorder];
[box setTitlePosition: NSNoTitle];
[box setContentViewMargins: NSMakeSize(0, 0)];
[self setContentView: box];
[box release];
_tableView = [[GSAutocompleteView alloc]
initWithFrame: NSMakeRect(0, 0, 100, 100)];
[_tableView setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[_tableView setDrawsGrid: NO];
[_tableView setAllowsEmptySelection: YES];
[_tableView setAllowsMultipleSelection: NO];
[_tableView setAutoresizesAllColumnsToFit: YES];
[_tableView setHeaderView: nil];
[_tableView setCornerView: nil];
column = [[NSTableColumn alloc] initWithIdentifier: @"content"];
cell = [[NSCell alloc] initTextCell: @""];
[column setDataCell: cell];
[cell release];
[_tableView addTableColumn: column];
[column release];
[_tableView setDataSource: self];
[_tableView setDelegate: self];
[_tableView setAction: @selector(clickItem:)];
[_tableView setTarget: self];
scrollView = [[NSScrollView alloc] initWithFrame:
NSMakeRect(contentRect.origin.x,
contentRect.origin.y,
contentRect.size.width,
contentRect.size.height)];
[scrollView setHasVerticalScroller: YES];
[scrollView setDocumentView: _tableView];
[_tableView release];
[box setContentView: scrollView];
[scrollView release];
return self;
}
- (void) dealloc
{
/* Don't release _words and _originalWord, since these are
* released when the autocomplete is final or canceled.
*/
[super dealloc];
}
- (BOOL) canBecomeKeyWindow
{
return YES;
}
- (void) layout
{
NSSize bsize = [[GSTheme theme] sizeForBorderType: NSLineBorder];
CGFloat windowWidth, windowHeight;
NSInteger num = [_words count];
NSUInteger widest = 0;
NSCell *cell;
NSString *word, *widestWord = nil;
NSEnumerator *enumerator;
/* If the suggested words are more than 10,
* we limit the window to show 10.
*/
if (num > 10)
{
num = 10;
}
/* Lookup the widest word to calculate the width
* of the window.
*/
enumerator = [_words objectEnumerator];
while ((word = [enumerator nextObject]))
{
if ([word length] > widest)
{
widest = [word length];
widestWord = word;
}
}
// Width
cell = [[_tableView tableColumnWithIdentifier: @"content"] dataCell];
windowWidth = 1.1*[cell _sizeText: widestWord].width
+ [NSScroller scrollerWidth] + 2*bsize.width;
//Height
windowHeight = 2*bsize.height + [_tableView rowHeight]*num
+ [_tableView intercellSpacing].height;
[self setFrame: NSMakeRect(0, 0, windowWidth, windowHeight) display: NO];
}
- (void) computePosition
{
NSRect screenFrame;
NSRect rect;
NSRect stringRect;
NSPoint point;
rect = [self frame];
screenFrame = [[[_textView window] screen] frame];
// Get the rectangle to draw the current word.
stringRect = [_textView rectForCharacterRange: _range];
// Convert the origin point to screen coordinates.
point = [[_textView window] convertBaseToScreen:
[_textView convertRect: stringRect toView: nil].origin];
// Calculate the origin point to the window.
rect.origin.x = point.x - [NSScroller scrollerWidth] - 4;
rect.origin.y = point.y - rect.size.height;
// If part of the window is off screen, change the origin point.
if (screenFrame.size.width < (rect.origin.x + rect.size.width))
{
rect.origin.x = screenFrame.size.width - rect.size.width;
}
else if (rect.origin.x < 0)
{
rect.origin.x = 0;
}
// If no space under the string, we display the window over this.
if (rect.origin.y < 0)
{
rect.origin.y = point.y + stringRect.size.height;
}
[self setFrame: rect display: NO];
}
- (NSArray *) words
{
return _words;
}
- (void) displayForTextView: (NSTextView *)textView
{
_textView = textView;
_range = [_textView rangeForUserCompletion];
[self reloadData];
if ([_words count] > 0)
{
[self runModalWindow];
}
else
{
[self close];
}
}
- (void) runModalWindow
{
NSWindow *onWindow;
NSNotificationCenter *notificationCenter;
onWindow = [_textView window];
notificationCenter = [NSNotificationCenter defaultCenter];
// Get the appropriate notifications to cancel the autocomplete.
[notificationCenter addObserver: self selector: @selector(onWindowEdited:)
name: NSWindowWillCloseNotification object: onWindow];
[notificationCenter addObserver: self selector: @selector(onWindowEdited:)
name: NSWindowWillMiniaturizeNotification object: onWindow];
// The notification below don't seems to work.
[notificationCenter addObserver: self selector: @selector(onWindowEdited:)
name: NSWindowWillMoveNotification object: onWindow];
// FIX ME: The notification below doesn't exist currently
// [nc addObserver: self selector: @selector(onWindowEdited:)
// name: NSWindowWillResizeNotification object: onWindow];
// FIXME: The code below must be removed when the notifications over will work
[notificationCenter addObserver: self selector: @selector(onWindowEdited:)
name: NSWindowDidMoveNotification object: onWindow];
[notificationCenter addObserver: self selector: @selector(onWindowEdited:)
name: NSWindowDidResizeNotification object: onWindow];
// End of the code to remove
[self orderFront: self];
[self makeFirstResponder: _tableView];
[self runLoop];
[notificationCenter removeObserver: self name: nil object: onWindow];
[self close];
[onWindow makeFirstResponder: _textView];
}
- (void) runLoop
{
NSEvent *event;
NSDate *limit = [NSDate distantFuture];
unichar key;
CREATE_AUTORELEASE_POOL (pool);
_stopped = NO;
while (YES)
{
event = [NSApp nextEventMatchingMask: NSAnyEventMask
untilDate: limit
inMode: NSDefaultRunLoopMode
dequeue: YES];
if ([event type] == NSLeftMouseDown
|| [event type] == NSRightMouseDown)
{
if ([event window] != self)
{
[self updateTextViewWithMovement: NSCancelTextMovement
isFinal: NO];
break;
}
else
{
[NSApp sendEvent: event];
}
}
else if ([event type] == NSKeyDown)
{
key = [[event characters] characterAtIndex: 0];
if (key == NSUpArrowFunctionKey)
{
[self moveUpSelection];
[self updateTextViewWithMovement: NSUpTextMovement
isFinal: NO];
}
else if (key == NSDownArrowFunctionKey)
{
[self moveDownSelection];
[self updateTextViewWithMovement: NSDownTextMovement
isFinal: NO];
}
else if (key == NSEnterCharacter ||
key == NSCarriageReturnCharacter ||
key == NSNewlineCharacter)
{
[self clickItem: self];
break;
}
else if (key == 0x001b ||
key == NSRightArrowFunctionKey ||
key == NSLeftArrowFunctionKey)
{
[self updateTextViewWithMovement: NSCancelTextMovement
isFinal: NO];
break;
}
else
{
// First remove the selected text.
[_textView replaceCharactersInRange: [_textView selectedRange]
withString: @""];
// Send the even to update the text container.
[NSApp sendEvent: event];
// Reload data.
[self reloadData];
}
}
else
{
[NSApp sendEvent: event];
}
if (_stopped)
break;
}
[pool drain];
}
- (void) onWindowEdited: (NSNotification *)notification
{
_stopped = YES;
[self updateTextViewWithMovement: NSCancelTextMovement
isFinal: NO];
}
- (void) reloadData
{
_range = [_textView rangeForUserCompletion];
if (_range.location == NSNotFound || _range.length == 0)
{
_stopped = YES;
}
else
{
NSInteger index = 0;
NSString *word;
NSArray *newWords;
word = [[_textView string] substringWithRange: _range];
ASSIGN(_originalWord, word);
newWords = [_textView completionsForPartialWordRange: _range
indexOfSelectedItem: &index];
if ([newWords count] > 0)
{
ASSIGN(_words, newWords);
[_tableView reloadData];
[self layout];
[self computePosition];
[_tableView selectRow: index byExtendingSelection: NO];
[_tableView scrollRowToVisible: index];
[self updateTextViewWithMovement: NSOtherTextMovement
isFinal: NO];
}
else
{
[_tableView reloadData];
_stopped = YES;
[self updateTextViewWithMovement: NSCancelTextMovement
isFinal: NO];
}
}
}
- (void) updateTextViewWithMovement: (NSInteger)movement
isFinal: (BOOL)flag
{
NSString *word;
if (movement != NSCancelTextMovement)
{
NSInteger rowIndex = [_tableView selectedRow];
word = [[_words objectAtIndex: rowIndex] description];
}
else
{
word = _originalWord;
}
[_textView insertCompletion: word
forPartialWordRange: _range
movement: movement
isFinal: flag];
// Release _words and _originalWords if
// autocomplete is final or canceled.
if ( (flag) ||
(movement == NSCancelTextMovement) )
{
ASSIGN(_originalWord, nil);
ASSIGN(_words, nil);
}
}
// Action method
- (void) clickItem: (id)sender
{
[self updateTextViewWithMovement: NSOtherTextMovement
isFinal: YES];
_stopped = YES;
}
// Key actions methods
- (void) moveUpSelection
{
NSInteger index = [_tableView selectedRow] - 1;
if (index > -1 && index < [_tableView numberOfRows])
{
[_tableView selectRow: index byExtendingSelection: NO];
[_tableView scrollRowToVisible: index];
}
}
- (void) moveDownSelection
{
NSInteger index = [_tableView selectedRow] + 1;
if (index > -1 && index < [_tableView numberOfRows])
{
[_tableView selectRow: index byExtendingSelection: NO];
[_tableView scrollRowToVisible: index];
}
}
// Delegate
- (int) numberOfRowsInTableView: (NSTableView *)aTableView
{
return [_words count];
}
- (id) tableView: (NSTableView *)aTableView
objectValueForTableColumn: (NSTableColumn *)aTableColumn
row: (int)rowIndex
{
return [[_words objectAtIndex: rowIndex] description];
}
@end

10
Source/GSCharacterPanel.m
View file

@ -42,24 +42,18 @@
#import "GNUstepGUI/GSCharacterPanel.h"
#import "GSGuiPrivate.h"
#if defined(HAVE_UNICODE_UCHAR_H) && defined(HAVE_UNICODE_USTRING_H)
#include <unicode/uchar.h>
#include <unicode/ustring.h>
#endif
@implementation NSApplication (CharacterPanel)
- (void) orderFrontCharacterPalette: (id)sender
{
#if defined(HAVE_UNICODE_UCHAR_H) && defined(HAVE_UNICODE_USTRING_H)
[[GSCharacterPanel sharedCharacterPanel] orderFront: sender];
#endif
}
@end
#if defined(HAVE_UNICODE_UCHAR_H) && defined(HAVE_UNICODE_USTRING_H)
#include <unicode/uchar.h>
#include <unicode/ustring.h>
@interface GSVerticallyCenteredTextFieldCell : NSTextFieldCell
{

7
Source/GSDisplayServer.m
View file

@ -819,7 +819,7 @@ GSCurrentServer(void)
}
/** Sets the transparancy value for the whole window */
- (void) setalpha: (float)alpha: (int) win
- (void) setalpha: (float)alpha : (int) win
{
//[self subclassResponsibility: _cmd];
}
@ -944,6 +944,11 @@ GSCurrentServer(void)
[self subclassResponsibility: _cmd];
}
- (void) setIgnoreMouse: (BOOL)ignoreMouse : (int)win
{
// Do nothing if not overridden by subclass
}
@end
/* ----------------------------------------------------------------------- */

24
Source/GSDragView.m
View file

@ -108,7 +108,7 @@
[self setExcludedFromWindowsMenu: YES];
}
- (void) orderWindow: (NSWindowOrderingMode)place relativeTo: (int)otherWin
- (void) orderWindow: (NSWindowOrderingMode)place relativeTo: (NSInteger)otherWin
{
[super orderWindow: place relativeTo: otherWin];
[self setLevel: NSPopUpMenuWindowLevel];
@ -359,12 +359,12 @@ static GSDragView *sharedDragView = nil;
- (NSWindow*) windowAcceptingDnDunder: (NSPoint)mouseLocation
windowRef: (int*)mouseWindowRef
{
int win;
NSInteger win;
*mouseWindowRef = 0;
win = [GSServerForWindow(_window) findWindowAt: mouseLocation
windowRef: mouseWindowRef
excluding: [_window windowNumber]];
windowRef: mouseWindowRef
excluding: [_window windowNumber]];
return GSWindowWithNumber(win);
}
@ -389,7 +389,7 @@ static GSDragView *sharedDragView = nil;
mousePosition: (NSPoint)mPoint
imagePosition: (NSPoint)iPoint
{
NSSize imageSize;
NSSize imageSize;
if (anImage == nil)
{
@ -433,7 +433,7 @@ static GSDragView *sharedDragView = nil;
*/
- (BOOL) _updateOperationMask: (NSEvent*) theEvent
{
unsigned int mod = [theEvent modifierFlags];
NSUInteger mod = [theEvent modifierFlags];
NSDragOperation oldOperationMask = operationMask;
if (operationMask == NSDragOperationIgnoresModifiers)
@ -497,7 +497,7 @@ static GSDragView *sharedDragView = nil;
NSDebugLLog (@"NSDragging",
@"drag, operation, target mask = (%x, %x, %x), dnd aware = %d\n",
dragMask, operationMask, targetMask,
(unsigned int)dragMask, (unsigned int)operationMask, (unsigned int)targetMask,
(targetWindowRef != 0));
if (cursors == nil)
@ -580,7 +580,7 @@ static GSDragView *sharedDragView = nil;
NSEvent *e;
NSGraphicsContext *context = GSCurrentContext();
// FIXME: Should store this once
int dragWindowRef = (int)(intptr_t)[GSServerForWindow(_window) windowDevice: [_window windowNumber]];
NSInteger dragWindowRef = (NSInteger)(intptr_t)[GSServerForWindow(_window) windowDevice: [_window windowNumber]];
eventLocation = [dWindow convertScreenToBase: eventLocation];
e = [NSEvent otherEventWithType: NSAppKitDefined
@ -623,7 +623,7 @@ static GSDragView *sharedDragView = nil;
// Use eWindow for coordination transformation
NSWindow *eWindow = [theEvent window];
NSDate *theDistantFuture = [NSDate distantFuture];
unsigned int eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
NSUInteger eventMask = NSLeftMouseDownMask | NSLeftMouseUpMask
| NSLeftMouseDraggedMask | NSMouseMovedMask
| NSPeriodicMask | NSAppKitDefinedMask | NSFlagsChangedMask;
NSPoint startPoint;
@ -878,7 +878,7 @@ static GSDragView *sharedDragView = nil;
}
break;
default:
NSLog(@"Internal: dropped event (%d) during dragging", [theEvent type]);
NSLog(@"Internal: dropped event (%d) during dragging", (int)[theEvent type]);
}
}
@ -1074,7 +1074,7 @@ static GSDragView *sharedDragView = nil;
{
NSDebugLLog (@"NSDragging",
@"Unexpected event type: %d during slide",
[theEvent type]);
(int)[theEvent type]);
}
newPosition.x = (screenPoint.x + ((float) steps - 1.0)
* dragPosition.x) / ((float) steps);

62
Source/GSHorizontalTypesetter.m
View file

@ -315,20 +315,31 @@ including gi will have been cached.
struct GSHorizontalTypesetter_line_frag_s
{
NSRect rect;
float last_used;
CGFloat last_used;
unsigned int last_glyph; /* last_glyph+1, actually */
};
typedef struct GSHorizontalTypesetter_line_frag_s line_frag_t;
/*
Apple uses this as the maximum width of an NSTextContainer.
For bigger values the width gets ignored.
*/
#define LARGE_SIZE 1e7
-(void) fullJustifyLine: (line_frag_t *)lf : (int)num_line_frags
{
unsigned int i, start;
float extra_space, delta;
CGFloat extra_space, delta;
unsigned int num_spaces;
NSString *str = [curTextStorage string];
glyph_cache_t *g;
unichar ch;
if (lf->rect.size.width >= LARGE_SIZE)
{
return;
}
for (start = 0; num_line_frags; num_line_frags--, lf++)
{
num_spaces = 0;
@ -361,13 +372,17 @@ typedef struct GSHorizontalTypesetter_line_frag_s line_frag_t;
}
}
-(void) rightAlignLine: (line_frag_t *)lf : (int)num_line_frags
{
unsigned int i;
float delta;
CGFloat delta;
glyph_cache_t *g;
if (lf->rect.size.width >= LARGE_SIZE)
{
return;
}
for (i = 0, g = cache; num_line_frags; num_line_frags--, lf++)
{
delta = lf->rect.size.width - lf->last_used;
@ -380,9 +395,14 @@ typedef struct GSHorizontalTypesetter_line_frag_s line_frag_t;
-(void) centerAlignLine: (line_frag_t *)lf : (int)num_line_frags
{
unsigned int i;
float delta;
CGFloat delta;
glyph_cache_t *g;
if (lf->rect.size.width >= LARGE_SIZE)
{
return;
}
for (i = 0, g = cache; num_line_frags; num_line_frags--, lf++)
{
delta = (lf->rect.size.width - lf->last_used) / 2.0;
@ -402,7 +422,7 @@ typedef struct GSHorizontalTypesetter_line_frag_s line_frag_t;
NSSize shift;
int i;
unsigned int g, g2, first;
float container_height;
CGFloat container_height;
/*
Ask the layout manager for soft-invalidated layout for the current
glyph. If there is a set of line frags starting at the current glyph,
@ -459,10 +479,10 @@ typedef struct GSHorizontalTypesetter_line_frag_s line_frag_t;
- (NSRect)_getProposedRectFor: (BOOL)newParagraph
withLineHeight: (float) line_height
withLineHeight: (CGFloat) line_height
{
float hindent;
float tindent = [curParagraphStyle tailIndent];
CGFloat hindent;
CGFloat tindent = [curParagraphStyle tailIndent];
if (newParagraph)
hindent = [curParagraphStyle firstLineHeadIndent];
@ -502,11 +522,11 @@ Return values 0, 1, 2 are mostly the same as from
NSRect rect, remain;
/* Baseline and line height handling. */
float line_height; /* Current line height. */
float max_line_height; /* Maximum line height (usually from the paragraph style). */
float baseline; /* Baseline position (0 is top of line-height, positive is down). */
float ascender; /* Amount of space we want above the baseline (always>=0). */
float descender; /* Amount of space we want below the baseline (always>=0). */
CGFloat line_height; /* Current line height. */
CGFloat max_line_height; /* Maximum line height (usually from the paragraph style). */
CGFloat baseline; /* Baseline position (0 is top of line-height, positive is down). */
CGFloat ascender; /* Amount of space we want above the baseline (always>=0). */
CGFloat descender; /* Amount of space we want below the baseline (always>=0). */
/*
These are values for the line as a whole. We start out by initializing
for the first glyph on the line and then update these as we add more
@ -567,7 +587,7 @@ Return values 0, 1, 2 are mostly the same as from
r = [curTextContainer lineFragmentRectForProposedRect: r
sweepDirection: NSLineSweepRight
movementDirection: NSLineMoveDown
movementDirection: NSLineMovesDown
remainingRect: &remain];
if (!NSIsEmptyRect(r))
@ -583,7 +603,7 @@ Return values 0, 1, 2 are mostly the same as from
/* Set up our initial baseline info. */
{
float min = [curParagraphStyle minimumLineHeight];
CGFloat min = [curParagraphStyle minimumLineHeight];
max_line_height = [curParagraphStyle maximumLineHeight];
/* sanity */
@ -620,7 +640,7 @@ Return values 0, 1, 2 are mostly the same as from
#define WANT_LINE_HEIGHT(h) \
do { \
float __new_height = (h); \
CGFloat __new_height = (h); \
if (max_line_height > 0 && __new_height > max_line_height) \
__new_height = max_line_height; \
if (__new_height > line_height) \
@ -649,7 +669,7 @@ restart: ;
{
rect = [curTextContainer lineFragmentRectForProposedRect: remain
sweepDirection: NSLineSweepRight
movementDirection: line_frags_num?NSLineDoesntMove:NSLineMoveDown
movementDirection: line_frags_num?NSLineDoesntMove:NSLineMovesDown
remainingRect: &remain];
if (NSIsEmptyRect(rect))
break;
@ -686,7 +706,7 @@ restart: ;
NSFont *f = cache->font;
float f_ascender = [f ascender], f_descender = -[f descender];
CGFloat f_ascender = [f ascender], f_descender = -[f descender];
NSGlyph last_glyph = NSNullGlyph;
NSPoint last_p;
@ -761,7 +781,7 @@ restart: ;
(TODO?) */
if (g->font != f)
{
float new_height;
CGFloat new_height;
f = g->font;
f_ascender = [f ascender];
f_descender = -[f descender];
@ -867,7 +887,7 @@ restart: ;
/* Baseline adjustments. */
{
float y = 0;
CGFloat y = 0;
/* Attributes are up-side-down in our coordinate system. */
if (g->attributes.superscript)

162
Source/GSLayoutManager.m
View file

@ -43,7 +43,7 @@
#import "GNUstepGUI/GSLayoutManager_internal.h"
/* TODO: is using rand() here ok? */
static int random_level(void)
static inline int random_level(void)
{
int i;
for (i = 0; i < SKIP_LIST_DEPTH - 2; i++)
@ -82,31 +82,6 @@ static glyph_run_t *run_insert(glyph_run_head_t **context, int level)
return r;
}
/*
* Remove the run r from the context of the skip list and free it.
* The context does not point at r, but to the run immediately before r.
* context[0]->next == r
*/
static void run_remove(glyph_run_head_t **context, glyph_run_t *r)
{
glyph_run_head_t *h;
int i;
// Free the glyphs
if (r->glyphs)
free(r->glyphs);
h = &r->head;
if (h->next)
((glyph_run_t *)h->next)->prev = r->prev;
for (i = 0; i <= r->level; i++)
context[i]->next = context[i]->next->next;
h -= r->level;
free(h);
}
/*
* Free the glphys of a run.
*/
@ -121,6 +96,30 @@ static inline void run_free_glyphs(glyph_run_t *r)
}
}
/*
* Remove the run r from the context of the skip list and free it.
* The context does not point at r, but to the run immediately before r.
* context[0]->next == r
*/
static inline void run_remove(glyph_run_head_t **context, glyph_run_t *r)
{
glyph_run_head_t *h;
int i;
// Free the glyphs
run_free_glyphs(r);
h = &r->head;
if (h->next)
((glyph_run_t *)h->next)->prev = r->prev;
for (i = 0; i <= r->level; i++)
context[i]->next = context[i]->next->next;
h -= r->level;
free(h);
}
/* Recalculates char_length, glyph_length, and complete for a
glyph_run_head_t. All "children" of this head must have valid values. */
static void run_fix_head(glyph_run_head_t *h)
@ -175,6 +174,7 @@ Private method used internally by GSLayoutManager for sanity checking.
{
/* set up attributes for this run */
NSNumber *n;
NSFont *font;
r->explicit_kern = !![attributes objectForKey: NSKernAttributeName];
@ -184,7 +184,7 @@ Private method used internally by GSLayoutManager for sanity checking.
else
r->ligature = 1;
r->font = [typesetter fontForCharactersWithAttributes: attributes];
font = [typesetter fontForCharactersWithAttributes: attributes];
/* TODO: it might be useful to change this slightly:
Returning a nil font from -fontForCharactersWithAttributes: causes those
characters to not be displayed (ie. no glyphs are generated).
@ -192,10 +192,10 @@ Private method used internally by GSLayoutManager for sanity checking.
How would glyph<->char mapping be handled? Map the entire run to one
NSNullGlyph?
*/
if (!r->font)
r->font = [NSFont userFontOfSize: 0];
r->font = [self substituteFontForFont: r->font];
r->font = [r->font retain];
if (font == nil)
font = [NSFont userFontOfSize: 0];
font = [self substituteFontForFont: font];
ASSIGN(r->font, font);
}
-(void) _run_free_attributes: (glyph_run_t *)r
@ -355,9 +355,9 @@ Private method used internally by GSLayoutManager for sanity checking.
{
if (glyph_pos)
*glyph_pos = cached_pos;
if (char_pos)
if (char_pos)
*char_pos = cached_cpos;
return cached_run;
return cached_run;
}
}
@ -418,8 +418,6 @@ Private method used internally by GSLayoutManager for sanity checking.
* glyph_pos and char_pos, when supplied, will contain the starting
* glyph/character index for this run.
*/
#define run_for_character_index(a,b,c,d) [self run_for_character_index: a : c : d]
- (glyph_run_t *)run_for_character_index: (unsigned int)charIndex
: (unsigned int *)glyph_pos
: (unsigned int *)char_pos
@ -771,7 +769,7 @@ Fills in all glyph holes up to last. only looking at levels below level
unsigned int pos, cpos;
int lo, hi, mid, i;
r = run_for_character_index(target, glyphs, &pos, &cpos);
r = [self run_for_character_index: target : &pos : &cpos];
if (!r)
{
[NSException raise: NSRangeException
@ -1273,6 +1271,13 @@ places where we switch.
[self _sanityChecks];
// [self _glyphDumpRuns];
if ((range.location == 0) && (range.length >= [_textStorage length]))
{
// Full invalidation
[self _invalidateEverything];
return;
}
/*
Find out what range we actually need to invalidate. This depends on how
context affects glyph generation.
@ -1718,32 +1723,40 @@ places where we switch.
- (void) deleteGlyphsInRange: (NSRange)aRange
{
/* See invalidateGlyphsForCharacterRange:changeInLength:actualCharacterRange:
glyph_run_t *r;
glyph_run_t *run;
unsigned int pos, cpos;
unsigned int glyphIndex;
unsigned int lastGlyphIndex;
glyph_run_head_t *context[SKIP_LIST_DEPTH];
glyphIndex = NSMinRange(aRange);
while (glyphIndex < NSMaxRange(aRange))
lastGlyphIndex = NSMaxRange(aRange) - 1;
while (glyphIndex <= lastGlyphIndex)
{
if (glyphs->glyph_length <= glyphIndex)
run = run_for_glyph_index(glyphIndex, glyphs, &pos, &cpos);
if (!run)
{
[NSException raise: NSRangeException
format: @"%s glyph index out of range", __PRETTY_FUNCTION__];
return;
}
r = run_for_glyph_index(glyphIndex, glyphs, &pos, &cpos);
if (!r)
{
[NSException raise: NSRangeException
format: @"%s glyph index out of range", __PRETTY_FUNCTION__];
return;
}
glyphIndex += r->head.glyph_length;
run_free_glyphs(r);
// FIXME: Need to invalidate the entries above this one.
// FIXME: remove all invalid glyphs from run
if ((pos == 0) && (lastGlyphIndex >= glyphIndex - pos + run->head.glyph_length))
{
run_free_glyphs(run);
}
else
{
if (lastGlyphIndex >= glyphIndex - pos + run->head.glyph_length)
{
}
r->head.glyph_length = len;
}
// FIXME: Need to invalidate the entries above this one.
// FIXME Cache this value
glyphIndex += r->head.glyph_length - pos;
}
*/
NSLog(@"Internal method %s called", __PRETTY_FUNCTION__);
@ -1863,6 +1876,12 @@ places where we switch.
[self _invalidateLayoutFromContainer: 0];
}
-(void) _invalidateEverything
{
[self _freeLayout];
[self _freeGlyphs];
[self _initGlyphs];
}
-(void) _doLayout
{
@ -2035,7 +2054,6 @@ places where we switch.
}
}
-(void) _didInvalidateLayout
{
int i;
@ -2043,7 +2061,8 @@ places where we switch.
for (tc = textcontainers, i = 0; i < num_textcontainers; i++, tc++)
{
tc->was_invalidated = NO;
// FIXME: This value never gets used
tc->was_invalidated = YES;
}
}
@ -2603,9 +2622,11 @@ forStartOfGlyphRange: (NSRange)glyphRange
NSLog(@"%s: doesn't own text container", __PRETTY_FUNCTION__);
return NSMakeRect(0, 0, 0, 0);
}
[self _doLayoutToContainer: i];
tc = textcontainers + i;
if (!tc->complete)
{
[self _doLayoutToContainer: i];
tc = textcontainers + i;
}
if (tc->usedRectValid)
return tc->usedRect;
@ -2740,15 +2761,16 @@ forStartOfGlyphRange: (NSRange)glyphRange
[self _didInvalidateLayout];
}
- (unsigned int) firstUnlaidCharacterIndex
{
return layout_char;
}
- (unsigned int) firstUnlaidGlyphIndex
{
return layout_glyph;
}
-(void) getFirstUnlaidCharacterIndex: (unsigned int *)cindex
glyphIndex: (unsigned int *)gindex
{
@ -2758,7 +2780,6 @@ forStartOfGlyphRange: (NSRange)glyphRange
*gindex = [self firstUnlaidGlyphIndex];
}
-(void) setExtraLineFragmentRect: (NSRect)linefrag
usedRect: (NSRect)used
textContainer: (NSTextContainer *)tc
@ -2932,16 +2953,6 @@ forStartOfGlyphRange: (NSRange)glyphRange
[super dealloc];
}
-(void) _invalidateEverything
{
[self _freeLayout];
[self _freeGlyphs];
[self _initGlyphs];
}
/**
* Sets the text storage for the layout manager.
* Use -replaceTextStorage: instead as a rule. - this method is really
@ -3039,6 +3050,7 @@ See [NSTextView -setTextContainer:] for more information about these calls.
{
return usesScreenFonts;
}
- (void) setUsesScreenFonts: (BOOL)flag
{
flag = !!flag;
@ -3085,6 +3097,7 @@ See [NSTextView -setTextContainer:] for more information about these calls.
[self _invalidateEverything];
[self _didInvalidateLayout];
}
- (BOOL) showsInvisibleCharacters
{
return showsInvisibleCharacters;
@ -3099,6 +3112,7 @@ See [NSTextView -setTextContainer:] for more information about these calls.
[self _invalidateEverything];
[self _didInvalidateLayout];
}
- (BOOL) showsControlCharacters
{
return showsControlCharacters;
@ -3130,7 +3144,6 @@ has).
here.
*/
[self _invalidateLayoutFromContainer: 0];
[self _didInvalidateLayout];
}
@ -3184,7 +3197,7 @@ forStartingGlyphAtIndex: (NSUInteger)glyph
//NSLog(@"Insert %d glyphs at %d for index %d", length, glyph, index);
run = run_for_character_index(index, glyphs, &gpos, &cpos);
run = [self run_for_character_index: index : &gpos : &cpos];
if (!run)
{
[NSException raise: NSRangeException
@ -3193,6 +3206,15 @@ forStartingGlyphAtIndex: (NSUInteger)glyph
}
len = glyph - gpos + length;
if (len < 0)
{
NSLog(@"Insert %d glyphs at %d for index %d", (int)length, (int)glyph, (int)index);
NSLog(@"Found gpos %d cpos %d len %d", gpos, cpos, len);
[NSException raise: NSRangeException
format: @"%s glyph index out of range", __PRETTY_FUNCTION__];
return;
}
if (!run->glyphs)
{
run->glyphs = malloc(sizeof(glyph_t) * len);
@ -3227,7 +3249,7 @@ forStartingGlyphAtIndex: (NSUInteger)glyph
unsigned int gpos, cpos;
NSSize advances[length];
run = run_for_character_index(index, glyphs, &gpos, &cpos);
run = [self run_for_character_index: index : &gpos : &cpos];
if (!run)
{
[NSException raise: NSRangeException

4
Source/GSMemoryPanel.m
View file

@ -310,14 +310,14 @@ static GSMemoryPanel *sharedGSMemoryPanel = nil;
[super dealloc];
}
- (int) numberOfRowsInTableView: (NSTableView *)aTableView
- (NSInteger) numberOfRowsInTableView: (NSTableView *)aTableView
{
return [array count];
}
- (id) tableView: (NSTableView *)aTableView
objectValueForTableColumn: (NSTableColumn *)aTableColumn
row:(int)rowIndex
row:(NSInteger)rowIndex
{
GSMemoryPanelEntry *entry = [array objectAtIndex: rowIndex];
id identifier = [aTableColumn identifier];

51
Source/GSNibLoading.m
View file

@ -49,15 +49,6 @@
#import <Foundation/NSSet.h>
#import <Foundation/NSString.h>
// FIXME: Used for NSKeyedArchiver access. All this should be moved into base.
/*
* Setup for inline operation of arrays.
*/
#define GSI_ARRAY_RETAIN(A, X) RETAIN((X).obj)
#define GSI_ARRAY_RELEASE(A, X) RELEASE((X).obj)
#define GSI_ARRAY_TYPES GSUNION_OBJ
#include <GNUstepBase/GSIArray.h>
#import "GNUstepGUI/GSNibLoading.h"
#import "AppKit/NSApplication.h"
#import "AppKit/NSImage.h"
@ -73,8 +64,6 @@
static BOOL _isInInterfaceBuilder = NO;
@interface NSKeyedUnarchiver (NSClassSwapperPrivate)
- (BOOL) replaceObject: (id)oldObj withObject: (id)newObj;
- (NSDictionary *)keyMap;
- (Class) replacementClassForClassName: (NSString *)className;
@end
@ -1093,6 +1082,9 @@ static BOOL _isInInterfaceBuilder = NO;
NSEnumerator *en = nil;
id v = nil;
// Tell the decoder that the object gets replaced before decoding subviews
[(NSKeyedUnarchiver *)coder replaceObject: self withObject: _view];
prevKeyView = [coder decodeObjectForKey: @"NSPreviousKeyView"];
nextKeyView = [coder decodeObjectForKey: @"NSNextKeyView"];
if (nextKeyView != nil)
@ -1184,7 +1176,7 @@ static BOOL _isInInterfaceBuilder = NO;
NSStringFromClass([coder class])];
}
return _view;
return (id)_view;
}
- (void) encodeWithCoder: (NSCoder *)coder
@ -1287,38 +1279,6 @@ static BOOL _isInInterfaceBuilder = NO;
* nib reading.
*/
@implementation NSKeyedUnarchiver (NSClassSwapperPrivate)
/**
* This method is used to replace oldObj with newObj
* in the map that is maintained in NSKeyedUnarchiver.
*/
- (BOOL) replaceObject: (id)oldObj withObject: (id)newObj
{
unsigned int i = 0;
unsigned int count = GSIArrayCount(_objMap);
for (i = 0; i < count; i++)
{
id obj = GSIArrayItemAtIndex(_objMap, i).obj;
if (obj == oldObj)
break;
}
if (i < count)
{
GSIArraySetItemAtIndex(_objMap, (GSIArrayItem)newObj, i);
return YES;
}
return NO;
}
/**
* This method is private and is purely for debugging purposes.
*/
- (NSDictionary *)keyMap
{
return _keyMap;
}
/**
* This method returns the class which replaces the class named
* by className. It uses the classes map to do this.
@ -2342,7 +2302,7 @@ static BOOL _isInInterfaceBuilder = NO;
}
RELEASE(self);
return dn;
return (id)dn;
}
@end
@ -2375,7 +2335,6 @@ static BOOL _isInInterfaceBuilder = NO;
- (id) initWithCoder: (NSCoder *)coder
{
// NSLog(@"NSPSMatrix = %@",[(NSKeyedUnarchiver *)coder keyMap]);
return self;
}
@end

28
Source/GSPDFPrintOperation.m
View file

@ -38,6 +38,7 @@
#import <Foundation/NSPathUtilities.h>
#import <Foundation/NSTask.h>
#import <Foundation/NSProcessInfo.h>
#import <Foundation/NSValue.h>
#import "AppKit/NSPrintInfo.h"
#import "AppKit/NSView.h"
#import "GNUstepGUI/GSPDFPrintOperation.h"
@ -101,7 +102,9 @@
return _context;
info = [[self printInfo] dictionary];
// TODO: Instead we should support NSGraphicsContext writing to an
// NSMutableData directly.
[info setObject: _path
forKey: @"NSOutputFile"];
@ -114,14 +117,31 @@
- (void) _print
{
// TODO: Copied-and-pasted from GSEPSPrintOperation. Factor out.
/* Save this for the view to look at. Seems like there should
be a better way to pass it to beginDocument */
[[[self printInfo] dictionary] setObject: [NSValue valueWithRect: _rect]
forKey: @"NSPrintSheetBounds"];
[_view beginDocument];
[_view beginPageInRect: _rect
atPlacement: NSMakePoint(0,0)];
[_view displayRectIgnoringOpacity: _rect inContext: [self context]];
[_view endPage];
[_view endDocument];
// FIXME: Output comes out up-side-down
}
- (BOOL)deliverResult
{
if (_data != nil && _path != nil && [_data length])
return [_data writeToFile: _path atomically: NO];
// FIXME Until we can create PDF we shoud convert the file with GhostScript
if (_data != nil && _path != nil)
{
[_data setData: [NSData dataWithContentsOfFile: _path]];
}
return YES;
}

Some files were not shown because too many files have changed in this diff Show more