Replace APPKIT_DECLARE with APPKIT_EXPORT

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14289 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2002-08-16 03:27:05 +00:00
parent bc77b5db89
commit 22f15da30b
5 changed files with 60 additions and 54 deletions

View file

@ -3,6 +3,12 @@
* configure.ac: Add NetBSD header/ldflag support (Patch from * configure.ac: Add NetBSD header/ldflag support (Patch from
Peter Cooper). Cleanup freebsd support. Peter Cooper). Cleanup freebsd support.
* Headers/gnustep/gui/GSDisplayServer.h: Replace APPKIT_DECLARE
with APPKIT_EXPORT.
* Headers/gnustep/gui/NSGraphics.h: Idem.
* Headers/gnustep/gui/NSGraphicsContext.h: Idem.
* Headers/gnustep/gui/NSPanel.h: Idem.
Fri Aug 9 12:12:18 2002 Georg Fleischmann <georg@vhf.de> Fri Aug 9 12:12:18 2002 Georg Fleischmann <georg@vhf.de>
* Source/NSWindow.m ([-setFrameFromString:]), * Source/NSWindow.m ([-setFrameFromString:]),

View file

@ -45,13 +45,13 @@
@class GSDisplayServer; @class GSDisplayServer;
#ifndef NO_GNUSTEP #ifndef NO_GNUSTEP
APPKIT_DECLARE GSDisplayServer * GSServerForWindow(NSWindow *window); APPKIT_EXPORT GSDisplayServer * GSServerForWindow(NSWindow *window);
APPKIT_DECLARE GSDisplayServer * GSCurrentServer(void); APPKIT_EXPORT GSDisplayServer * GSCurrentServer(void);
/* Display attributes */ /* Display attributes */
APPKIT_DECLARE NSString * GSDisplayName; APPKIT_EXPORT NSString * GSDisplayName;
APPKIT_DECLARE NSString * GSDisplayNumber; APPKIT_EXPORT NSString * GSDisplayNumber;
APPKIT_DECLARE NSString * GSScreenNumber; APPKIT_EXPORT NSString * GSScreenNumber;
@interface GSDisplayServer : NSObject @interface GSDisplayServer : NSObject
{ {

View file

@ -1,4 +1,4 @@
/*
NSGraphics.h NSGraphics.h
Copyright (C) 1996 Free Software Foundation, Inc. Copyright (C) 1996 Free Software Foundation, Inc.
@ -88,22 +88,22 @@ APPKIT_EXPORT NSString *NSDeviceSize;
/* /*
* Get Information About Color Space and Window Depth * Get Information About Color Space and Window Depth
*/ */
APPKIT_DECLARE const NSWindowDepth *NSAvailableWindowDepths(void); APPKIT_EXPORT const NSWindowDepth *NSAvailableWindowDepths(void);
APPKIT_DECLARE NSWindowDepth NSBestDepth(NSString *colorSpace, APPKIT_EXPORT NSWindowDepth NSBestDepth(NSString *colorSpace,
int bitsPerSample, int bitsPerPixel, int bitsPerSample, int bitsPerPixel,
BOOL planar, BOOL *exactMatch); BOOL planar, BOOL *exactMatch);
APPKIT_DECLARE int NSBitsPerPixelFromDepth(NSWindowDepth depth); APPKIT_EXPORT int NSBitsPerPixelFromDepth(NSWindowDepth depth);
APPKIT_DECLARE int NSBitsPerSampleFromDepth(NSWindowDepth depth); APPKIT_EXPORT int NSBitsPerSampleFromDepth(NSWindowDepth depth);
APPKIT_DECLARE NSString *NSColorSpaceFromDepth(NSWindowDepth depth); APPKIT_EXPORT NSString *NSColorSpaceFromDepth(NSWindowDepth depth);
APPKIT_DECLARE int NSNumberOfColorComponents(NSString *colorSpaceName); APPKIT_EXPORT int NSNumberOfColorComponents(NSString *colorSpaceName);
APPKIT_DECLARE BOOL NSPlanarFromDepth(NSWindowDepth depth); APPKIT_EXPORT BOOL NSPlanarFromDepth(NSWindowDepth depth);
/* /*
* Functions for getting information about windows. * Functions for getting information about windows.
*/ */
APPKIT_DECLARE void NSCountWindows(int *count); APPKIT_EXPORT void NSCountWindows(int *count);
APPKIT_DECLARE void NSWindowList(int size, int list[]); APPKIT_EXPORT void NSWindowList(int size, int list[]);
APPKIT_EXPORT void NSEraseRect(NSRect aRect); APPKIT_EXPORT void NSEraseRect(NSRect aRect);
APPKIT_EXPORT void NSHighlightRect(NSRect aRect); APPKIT_EXPORT void NSHighlightRect(NSRect aRect);
@ -114,7 +114,7 @@ APPKIT_EXPORT void NSRectFillList(const NSRect *rects, int count);
APPKIT_EXPORT void NSRectFillListWithGrays(const NSRect *rects, APPKIT_EXPORT void NSRectFillListWithGrays(const NSRect *rects,
const float *grays,int count); const float *grays,int count);
APPKIT_DECLARE NSRect NSDrawTiledRects(NSRect aRect,const NSRect clipRect, APPKIT_EXPORT NSRect NSDrawTiledRects(NSRect aRect,const NSRect clipRect,
const NSRectEdge * sides, const NSRectEdge * sides,
const float *grays, int count); const float *grays, int count);
@ -202,41 +202,41 @@ GSWViewIsFlipped(NSGraphicsContext *ctxt)
@class NSArray; @class NSArray;
@class NSWindow; @class NSWindow;
APPKIT_DECLARE NSArray* GSAllWindows(); APPKIT_EXPORT NSArray* GSAllWindows();
APPKIT_DECLARE NSWindow* GSWindowWithNumber(int num); APPKIT_EXPORT NSWindow* GSWindowWithNumber(int num);
#endif #endif
#ifndef STRICT_OPENSTEP #ifndef STRICT_OPENSTEP
// Window operations // Window operations
APPKIT_DECLARE void NSConvertGlobalToWindowNumber(int globalNum, unsigned int *winNum); APPKIT_EXPORT void NSConvertGlobalToWindowNumber(int globalNum, unsigned int *winNum);
APPKIT_DECLARE void NSConvertWindowNumberToGlobal(int winNum, unsigned int *globalNum); APPKIT_EXPORT void NSConvertWindowNumberToGlobal(int winNum, unsigned int *globalNum);
// Rectangle drawing // Rectangle drawing
APPKIT_DECLARE NSRect NSDrawColorTiledRects(NSRect boundsRect, NSRect clipRect, APPKIT_EXPORT NSRect NSDrawColorTiledRects(NSRect boundsRect, NSRect clipRect,
const NSRectEdge *sides, const NSRectEdge *sides,
NSColor **colors, NSColor **colors,
int count); int count);
APPKIT_DECLARE void NSDrawDarkBezel(NSRect aRect, NSRect clipRect); APPKIT_EXPORT void NSDrawDarkBezel(NSRect aRect, NSRect clipRect);
APPKIT_DECLARE void NSDrawLightBezel(NSRect aRect, NSRect clipRect); APPKIT_EXPORT void NSDrawLightBezel(NSRect aRect, NSRect clipRect);
APPKIT_DECLARE void NSRectFillListWithColors(const NSRect *rects, APPKIT_EXPORT void NSRectFillListWithColors(const NSRect *rects,
NSColor **colors, int count); NSColor **colors, int count);
APPKIT_DECLARE void NSRectFillUsingOperation(NSRect aRect, APPKIT_EXPORT void NSRectFillUsingOperation(NSRect aRect,
NSCompositingOperation op); NSCompositingOperation op);
APPKIT_DECLARE void NSRectFillListUsingOperation(const NSRect *rects, APPKIT_EXPORT void NSRectFillListUsingOperation(const NSRect *rects,
int count, int count,
NSCompositingOperation op); NSCompositingOperation op);
APPKIT_DECLARE void NSRectFillListWithColorsUsingOperation(const NSRect *rects, APPKIT_EXPORT void NSRectFillListWithColorsUsingOperation(const NSRect *rects,
NSColor **colors, NSColor **colors,
int num, int num,
NSCompositingOperation op); NSCompositingOperation op);
APPKIT_DECLARE void NSDrawWindowBackground(NSRect aRect); APPKIT_EXPORT void NSDrawWindowBackground(NSRect aRect);
// Context information // Context information
APPKIT_DECLARE void NSCountWindowsForContext(int context, int *count); APPKIT_EXPORT void NSCountWindowsForContext(int context, int *count);
APPKIT_DECLARE void NSWindowListForContext(int context, int size, int list[][]); APPKIT_EXPORT void NSWindowListForContext(int context, int size, int list[][]);
APPKIT_DECLARE int NSGetWindowServerMemory(int context, int *virtualMemory, APPKIT_EXPORT int NSGetWindowServerMemory(int context, int *virtualMemory,
int *windowBackingMemory, int *windowBackingMemory,
NSString **windowDumpStream); NSString **windowDumpStream);

View file

@ -181,7 +181,7 @@ typedef enum _GSColorSpace
@end @end
#ifndef NO_GNUSTEP #ifndef NO_GNUSTEP
APPKIT_DECLARE NSGraphicsContext *GSCurrentContext(); APPKIT_EXPORT NSGraphicsContext *GSCurrentContext();
@interface NSGraphicsContext (GNUstep) @interface NSGraphicsContext (GNUstep)
+ (void) setDefaultContextClass: (Class)defaultContextClass; + (void) setDefaultContextClass: (Class)defaultContextClass;
@ -390,17 +390,17 @@ APPKIT_EXPORT NSString *NSGraphicsContextPSFormat;
APPKIT_EXPORT NSString *NSGraphicsContextRepresentationFormatAttributeName; APPKIT_EXPORT NSString *NSGraphicsContextRepresentationFormatAttributeName;
/* Colorspace constants */ /* Colorspace constants */
APPKIT_DECLARE NSString *GSColorSpaceName; APPKIT_EXPORT NSString *GSColorSpaceName;
APPKIT_DECLARE NSString *GSColorSpaceWhitePoint; APPKIT_EXPORT NSString *GSColorSpaceWhitePoint;
APPKIT_DECLARE NSString *GSColorSpaceBlackPoint; APPKIT_EXPORT NSString *GSColorSpaceBlackPoint;
APPKIT_DECLARE NSString *GSColorSpaceGamma; APPKIT_EXPORT NSString *GSColorSpaceGamma;
APPKIT_DECLARE NSString *GSColorSpaceMatrix; APPKIT_EXPORT NSString *GSColorSpaceMatrix;
APPKIT_DECLARE NSString *GSColorSpaceRange; APPKIT_EXPORT NSString *GSColorSpaceRange;
APPKIT_DECLARE NSString *GSColorSpaceComponents; APPKIT_EXPORT NSString *GSColorSpaceComponents;
APPKIT_DECLARE NSString *GSColorSpaceProfile; APPKIT_EXPORT NSString *GSColorSpaceProfile;
APPKIT_DECLARE NSString *GSAlternateColorSpace; APPKIT_EXPORT NSString *GSAlternateColorSpace;
APPKIT_DECLARE NSString *GSBaseColorSpace; APPKIT_EXPORT NSString *GSBaseColorSpace;
APPKIT_DECLARE NSString *GSColorSpaceColorTable; APPKIT_EXPORT NSString *GSColorSpaceColorTable;
#endif /* _NSGraphicsContext_h_INCLUDE */ #endif /* _NSGraphicsContext_h_INCLUDE */

View file

@ -85,20 +85,20 @@ enum {
// //
// Create an Attention Panel without Running It Yet // Create an Attention Panel without Running It Yet
// //
APPKIT_DECLARE id NSGetAlertPanel(NSString *title, APPKIT_EXPORT id NSGetAlertPanel(NSString *title,
NSString *msg, NSString *msg,
NSString *defaultButton, NSString *defaultButton,
NSString *alternateButton, NSString *alternateButton,
NSString *otherButton, ...); NSString *otherButton, ...);
#ifndef STRICT_OPENSTEP #ifndef STRICT_OPENSTEP
APPKIT_DECLARE id NSGetCriticalAlertPanel(NSString *title, APPKIT_EXPORT id NSGetCriticalAlertPanel(NSString *title,
NSString *msg, NSString *msg,
NSString *defaultButton, NSString *defaultButton,
NSString *alternateButton, NSString *alternateButton,
NSString *otherButton, ...); NSString *otherButton, ...);
APPKIT_DECLARE id NSGetInformationalAlertPanel(NSString *title, APPKIT_EXPORT id NSGetInformationalAlertPanel(NSString *title,
NSString *msg, NSString *msg,
NSString *defaultButton, NSString *defaultButton,
NSString *alternateButton, NSString *alternateButton,
@ -108,20 +108,20 @@ APPKIT_DECLARE id NSGetInformationalAlertPanel(NSString *title,
// //
// Create and Run an Attention Panel // Create and Run an Attention Panel
// //
APPKIT_DECLARE int NSRunAlertPanel(NSString *title, APPKIT_EXPORT int NSRunAlertPanel(NSString *title,
NSString *msg, NSString *msg,
NSString *defaultButton, NSString *defaultButton,
NSString *alternateButton, NSString *alternateButton,
NSString *otherButton, ...); NSString *otherButton, ...);
#ifndef STRICT_OPENSTEP #ifndef STRICT_OPENSTEP
APPKIT_DECLARE int NSRunCriticalAlertPanel(NSString *title, APPKIT_EXPORT int NSRunCriticalAlertPanel(NSString *title,
NSString *msg, NSString *msg,
NSString *defaultButton, NSString *defaultButton,
NSString *alternateButton, NSString *alternateButton,
NSString *otherButton, ...); NSString *otherButton, ...);
APPKIT_DECLARE int NSRunInformationalAlertPanel(NSString *title, APPKIT_EXPORT int NSRunInformationalAlertPanel(NSString *title,
NSString *msg, NSString *msg,
NSString *defaultButton, NSString *defaultButton,
NSString *alternateButton, NSString *alternateButton,
@ -129,7 +129,7 @@ APPKIT_DECLARE int NSRunInformationalAlertPanel(NSString *title,
#endif #endif
#ifndef STRICT_MACOS_X #ifndef STRICT_MACOS_X
APPKIT_DECLARE int NSRunLocalizedAlertPanel(NSString *table, APPKIT_EXPORT int NSRunLocalizedAlertPanel(NSString *table,
NSString *title, NSString *title,
NSString *msg, NSString *msg,
NSString *defaultButton, NSString *defaultButton,
@ -141,7 +141,7 @@ APPKIT_DECLARE int NSRunLocalizedAlertPanel(NSString *table,
// //
// New alert interface of Mac OS X // New alert interface of Mac OS X
// //
APPKIT_DECLARE void NSBeginAlertSheet(NSString *title, APPKIT_EXPORT void NSBeginAlertSheet(NSString *title,
NSString *defaultButton, NSString *defaultButton,
NSString *alternateButton, NSString *alternateButton,
NSString *otherButton, NSString *otherButton,
@ -152,7 +152,7 @@ APPKIT_DECLARE void NSBeginAlertSheet(NSString *title,
void *contextInfo, void *contextInfo,
NSString *msg, ...); NSString *msg, ...);
APPKIT_DECLARE void NSBeginCriticalAlertSheet(NSString *title, APPKIT_EXPORT void NSBeginCriticalAlertSheet(NSString *title,
NSString *defaultButton, NSString *defaultButton,
NSString *alternateButton, NSString *alternateButton,
NSString *otherButton, NSString *otherButton,
@ -163,7 +163,7 @@ APPKIT_DECLARE void NSBeginCriticalAlertSheet(NSString *title,
void *contextInfo, void *contextInfo,
NSString *msg, ...); NSString *msg, ...);
APPKIT_DECLARE void NSBeginInformationalAlertSheet(NSString *title, APPKIT_EXPORT void NSBeginInformationalAlertSheet(NSString *title,
NSString *defaultButton, NSString *defaultButton,
NSString *alternateButton, NSString *alternateButton,
NSString *otherButton, NSString *otherButton,
@ -179,6 +179,6 @@ APPKIT_DECLARE void NSBeginInformationalAlertSheet(NSString *title,
// //
// Release an Attention Panel // Release an Attention Panel
// //
APPKIT_DECLARE void NSReleaseAlertPanel(id panel); APPKIT_EXPORT void NSReleaseAlertPanel(id panel);
#endif // _GNUstep_H_NSPanel #endif // _GNUstep_H_NSPanel