mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-22 13:10:59 +00:00
Minor fixes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@2068 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Scott Christley
parent
4db99dfd1c
commit
debc412a06
5 changed files with 49 additions and 123 deletions
|
|
@ -1,3 +1,12 @@
|
|||
Thu Jan 30 12:34:30 1997 Scott Christley <scottc@net-community.com>
|
||||
|
||||
* Headers/gnustep/gui/NSDragging.h (NSDraggingInfo): Define
|
||||
protocol before it is used by the NSObject category.
|
||||
* Headers/gnustep/dps/DPSOperators.h: Eliminate unneeded code.
|
||||
* Source/NSControl.m (-copyWithZone:): New method.
|
||||
* Source/NSFontManager.m (-fontWithFamily:traits:weight:size:):
|
||||
Add log error message when requesting invalid font.
|
||||
|
||||
Wed Jan 29 07:44:32 1997 Simon Frankau <sgf@frankau.demon.co.uk>
|
||||
|
||||
* Headers/gnustep/gui/NSCStringText.h: New file.
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
Copyright (C) 1996 Free Software Foundation, Inc.
|
||||
|
||||
Author: Scott Christley <scottc@net-community.com>
|
||||
Date: September, 1995
|
||||
Date: September 1995
|
||||
|
||||
This file is part of the GNUstep GUI Library.
|
||||
|
||||
|
|
@ -33,107 +33,8 @@
|
|||
#ifdef HAVE_DPSCLIENT
|
||||
|
||||
#include <DPS/dpsclient.h>
|
||||
|
||||
#else
|
||||
|
||||
#include <Foundation/NSObject.h>
|
||||
#include <DPSClient/TypesandConstants.h>
|
||||
#include <Foundation/NSGeometry.h>
|
||||
|
||||
@class NSColor;
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Drawing operators
|
||||
//
|
||||
// path an arc in counterclockwise direction
|
||||
void
|
||||
PSarc(float x, float y, float radius, float angle1, float angle2);
|
||||
|
||||
// path an arc in clockwise direction
|
||||
void
|
||||
PSarcn(float x, float y, float radius, float angle1, float angle2);
|
||||
|
||||
// path a Bezier curve
|
||||
void
|
||||
PScurveto(float x1, float y1, float x2, float y2, float x3, float y3);
|
||||
|
||||
// path a line
|
||||
void
|
||||
PSlineto(float x, float y);
|
||||
|
||||
// set current point
|
||||
void
|
||||
PSmoveto(float x, float y);
|
||||
|
||||
// path a Bezier curve relative to current point
|
||||
void
|
||||
PSrcurveto(float x1, float y1, float x2, float y2, float x3, float y3);
|
||||
|
||||
// path a line relative to current point
|
||||
void
|
||||
PSrlineto(float x, float y);
|
||||
|
||||
// set current point relative to current point
|
||||
void
|
||||
PSrmoveto(float x, float y);
|
||||
|
||||
// path a text string
|
||||
void
|
||||
PSshow(char *string);
|
||||
|
||||
//
|
||||
// Path operators
|
||||
//
|
||||
// close the path
|
||||
void
|
||||
PSclosepath();
|
||||
|
||||
// start new path
|
||||
void
|
||||
PSnewpath();
|
||||
|
||||
// fill the path
|
||||
void
|
||||
PSfill();
|
||||
|
||||
// stroke the path
|
||||
void
|
||||
PSstroke();
|
||||
|
||||
//
|
||||
// Graphic state operators
|
||||
//
|
||||
// get current line width
|
||||
float
|
||||
PScurrentlinewidth();
|
||||
|
||||
// set current line width
|
||||
void
|
||||
PSsetlinewidth(float width);
|
||||
|
||||
// get current point in path
|
||||
NSPoint
|
||||
PScurrentpoint();
|
||||
|
||||
// flush graphic operations
|
||||
void
|
||||
PSflushgraphics();
|
||||
|
||||
// set the color
|
||||
void
|
||||
PSsetcolor(NSColor *c);
|
||||
|
||||
//
|
||||
// Convenience operations
|
||||
//
|
||||
// path a rectangle
|
||||
void
|
||||
PSrectstroke(float x, float y, float width, float height);
|
||||
|
||||
// path and fill a rectangle
|
||||
void
|
||||
PSrectfill(float x, float y, float width, float height);
|
||||
#include <DPS/psops.h>
|
||||
|
||||
#endif /* HAVE_DPSCLIENT */
|
||||
|
||||
#endif /* _GNUstep_H_DPSOperators */
|
||||
|
|
|
|||
|
|
@ -30,30 +30,10 @@
|
|||
|
||||
#include <AppKit/stdappkit.h>
|
||||
|
||||
@class NSDragOperation;
|
||||
@class NSWindow;
|
||||
@class NSPoint;
|
||||
@class NSPasteBoard;
|
||||
@class NSImage;
|
||||
|
||||
@interface NSObject (NSDraggingDestination)
|
||||
|
||||
//
|
||||
// Before the Image is Released
|
||||
//
|
||||
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
|
||||
- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender;
|
||||
- (void)draggingExited:(id <NSDraggingInfo>)sender;
|
||||
|
||||
//
|
||||
// After the Image is Released
|
||||
//
|
||||
- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender;
|
||||
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
|
||||
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender;
|
||||
|
||||
@end
|
||||
|
||||
@protocol NSDraggingInfo
|
||||
|
||||
//
|
||||
|
|
@ -79,6 +59,24 @@
|
|||
|
||||
@end
|
||||
|
||||
@interface NSObject (NSDraggingDestination)
|
||||
|
||||
//
|
||||
// Before the Image is Released
|
||||
//
|
||||
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
|
||||
- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender;
|
||||
- (void)draggingExited:(id <NSDraggingInfo>)sender;
|
||||
|
||||
//
|
||||
// After the Image is Released
|
||||
//
|
||||
- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender;
|
||||
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
|
||||
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender;
|
||||
|
||||
@end
|
||||
|
||||
@interface NSObject (NSDraggingSource)
|
||||
|
||||
//
|
||||
|
|
|
|||
|
|
@ -97,6 +97,21 @@ NSString *NSControlTextDidChangeNotification;
|
|||
[super dealloc];
|
||||
}
|
||||
|
||||
//
|
||||
// Creating copies
|
||||
//
|
||||
- copyWithZone:(NSZone *)zone
|
||||
{
|
||||
id c;
|
||||
c = [super copyWithZone: zone];
|
||||
|
||||
NSLog(@"NSControl: copyWithZone\n");
|
||||
|
||||
// make sure the new copy also has a new copy of the cell
|
||||
[c setCell: [cell copy]];
|
||||
return c;
|
||||
}
|
||||
|
||||
//
|
||||
// Setting the Control's Cell
|
||||
//
|
||||
|
|
|
|||
|
|
@ -247,7 +247,10 @@ id GNUSTEP_GUI_FONT_PANEL_FACTORY;
|
|||
return f;
|
||||
}
|
||||
else
|
||||
return nil;
|
||||
{
|
||||
NSLog(@"Invalid font request\n");
|
||||
return nil;
|
||||
}
|
||||
}
|
||||
|
||||
//
|
||||
|
|
|
|||
Loading…
Reference in a new issue