mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-30 04:40:37 +00:00
* move DPSOperators.h to XDPS.
* move GPS headers into a new backend. * define GSContext.h/GSContext.m as abstract super for all drawing destinations (eliminates the need for DPS, GPS, DGS at the root of the AppKit) add appropriate defintion to various classes. * NSMatrix.m add abstract backend code from xraw (eliminate backend). * NSSlider.m add abstract backend code from xraw (eliminate backend). * NSSliderCell.m add abstract backend code from xraw (eliminate backend). * NSSplitView.m add abstract backend code from xraw (eliminate backend). replace private divider highlight method with NSHighlightRect() * NSWindow.m add class method to create backend specific window view. * NSTextField.m add abstract backend code from xraw (eliminate backend). * NSForm.m add abstract backend code from xraw (eliminate backend). * NSFormCell.m add abstract backend code from xraw (eliminate backend). * NSColorWell.m add abstract backend code from xraw (eliminate backend). * NSButton.m add abstract backend code from xraw (eliminate backend). * NSControl.m add abstract backend code from xraw (eliminate backend). * NSBox.m add abstract backend code from xraw (eliminate backend). * NSBrowser.m add abstract backend code from xraw (eliminate backend). * NSBrowserCell.m add abstract backend code from xraw (eliminate backend). git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3321 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
fb25d335f4
commit
4dd58372f6
53 changed files with 2429 additions and 5144 deletions
|
@ -41,7 +41,7 @@
|
|||
#include <AppKit/NSEvent.h>
|
||||
#include <AppKit/NSApplication.h>
|
||||
#include <AppKit/NSWindow.h>
|
||||
#include <AppKit/GPSDrawContext.h>
|
||||
#include <AppKit/GSContext.h>
|
||||
|
||||
@implementation NSEvent
|
||||
|
||||
|
@ -68,7 +68,7 @@ static NSString *timerKey = @"NSEventTimersKey";
|
|||
modifierFlags:(unsigned int)flags
|
||||
timestamp:(NSTimeInterval)time
|
||||
windowNumber:(int)windowNum
|
||||
context:(GPSDrawContext *)context
|
||||
context:(GSContext *)context
|
||||
eventNumber:(int)eventNum
|
||||
trackingNumber:(int)trackingNum
|
||||
userData:(void *)userData
|
||||
|
@ -97,7 +97,7 @@ NSEvent *e = [[[NSEvent alloc] init] autorelease];
|
|||
modifierFlags:(unsigned int)flags
|
||||
timestamp:(NSTimeInterval)time
|
||||
windowNumber:(int)windowNum
|
||||
context:(GPSDrawContext *)context
|
||||
context:(GSContext *)context
|
||||
characters:(NSString *)keys
|
||||
charactersIgnoringModifiers:(NSString *)ukeys
|
||||
isARepeat:(BOOL)repeatKey
|
||||
|
@ -129,7 +129,7 @@ NSEvent *e = [[[NSEvent alloc] init] autorelease];
|
|||
modifierFlags:(unsigned int)flags
|
||||
timestamp:(NSTimeInterval)time
|
||||
windowNumber:(int)windowNum
|
||||
context:(GPSDrawContext *)context
|
||||
context:(GSContext *)context
|
||||
eventNumber:(int)eventNum
|
||||
clickCount:(int)clickNum
|
||||
pressure:(float)pressureValue
|
||||
|
@ -160,7 +160,7 @@ NSEvent *e = [[[NSEvent alloc] init] autorelease]; // do nothing if
|
|||
modifierFlags:(unsigned int)flags
|
||||
timestamp:(NSTimeInterval)time
|
||||
windowNumber:(int)windowNum
|
||||
context:(GPSDrawContext *)context
|
||||
context:(GSContext *)context
|
||||
subtype:(short)subType
|
||||
data1:(int)data1
|
||||
data2:(int)data2
|
||||
|
@ -284,7 +284,7 @@ NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];
|
|||
//
|
||||
// Getting General Event Information
|
||||
//
|
||||
- (GPSDrawContext *)context
|
||||
- (GSContext *)context
|
||||
{
|
||||
return event_context;
|
||||
}
|
||||
|
@ -374,10 +374,10 @@ NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];
|
|||
// Make sure it is one of the right event types
|
||||
if ((event_type != NSLeftMouseDown) && (event_type != NSLeftMouseUp) &&
|
||||
(event_type != NSRightMouseDown) && (event_type != NSRightMouseUp) &&
|
||||
(event_type != NSLeftMouseDragged) && (event_type != NSRightMouseDragged) &&
|
||||
(event_type != NSMouseMoved) &&
|
||||
(event_type != NSMouseEntered) && (event_type != NSMouseExited))
|
||||
return 0;
|
||||
(event_type != NSLeftMouseDragged) && (event_type != NSRightMouseDragged)
|
||||
&& (event_type != NSMouseMoved) && (event_type != NSMouseEntered) &&
|
||||
(event_type != NSMouseExited))
|
||||
return 0;
|
||||
|
||||
if ((event_type == NSMouseEntered) || (event_type == NSMouseExited))
|
||||
return event_data.tracking.event_num;
|
||||
|
@ -390,9 +390,9 @@ NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];
|
|||
// Make sure it is one of the right event types
|
||||
if ((event_type != NSLeftMouseDown) && (event_type != NSLeftMouseUp) &&
|
||||
(event_type != NSRightMouseDown) && (event_type != NSRightMouseUp) &&
|
||||
(event_type != NSLeftMouseDragged) && (event_type != NSRightMouseDragged) &&
|
||||
(event_type != NSMouseMoved))
|
||||
return 0;
|
||||
(event_type != NSLeftMouseDragged) && (event_type != NSRightMouseDragged)
|
||||
&& (event_type != NSMouseMoved))
|
||||
return 0;
|
||||
|
||||
return event_data.mouse.pressure;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue