gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 18:50:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed all uses of @defs() from -gui, so it now compiles cleanly with the non-fragile ABI. All ivars that must be accessed from other classes are now wrapped in PACKAGE_SCOPE. With clang, this expands to @package, with GCC it expands to @public.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@30045 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
theraven 2010-03-27 00:01:03 +00:00
parent b06fb57e31
commit 14205ea54b
12 changed files with 61 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Source/NSWindow.m
View file

@ -596,12 +596,6 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
*/
@implementation NSWindow
typedef struct NSView_struct
{
@defs(NSView)
} *NSViewPtr;
/*
* Class variables
*/
@ -2548,14 +2542,14 @@ discardCursorRectsForView(NSView *theView)
{
if (theView != nil)
{
if (((NSViewPtr)theView)->_rFlags.has_currects)
if (theView->_rFlags.has_currects)
{
[theView discardCursorRects];
}
if (((NSViewPtr)theView)->_rFlags.has_subviews)
if (theView->_rFlags.has_subviews)
{
NSArray *s = ((NSViewPtr)theView)->_sub_views;
NSArray *s = theView->_sub_views;
unsigned count = [s count];
if (count)
@ -2585,7 +2579,7 @@ discardCursorRectsForView(NSView *theView)
- (void) invalidateCursorRectsForView: (NSView*)aView
{
if (((NSViewPtr)aView)->_rFlags.valid_rects)
if (aView->_rFlags.valid_rects)
{
[aView discardCursorRects];
@ -2616,9 +2610,9 @@ resetCursorRectsForView(NSView *theView)
{
[theView resetCursorRects];
if (((NSViewPtr)theView)->_rFlags.has_subviews)
if (theView->_rFlags.has_subviews)
{
NSArray *s = ((NSViewPtr)theView)->_sub_views;
NSArray *s = theView->_sub_views;
unsigned count = [s count];
if (count)
@ -3340,9 +3334,9 @@ resetCursorRectsForView(NSView *theView)
- (void) _checkTrackingRectangles: (NSView*)theView
forEvent: (NSEvent*)theEvent
{
if (((NSViewPtr)theView)->_rFlags.has_trkrects)
if (theView->_rFlags.has_trkrects)
{
NSArray *tr = ((NSViewPtr)theView)->_tracking_rects;
NSArray *tr = theView->_tracking_rects;
unsigned count = [tr count];
/*
@ -3433,9 +3427,9 @@ resetCursorRectsForView(NSView *theView)
/*
* Check tracking rectangles for the subviews
*/
if (((NSViewPtr)theView)->_rFlags.has_subviews)
if (theView->_rFlags.has_subviews)
{
NSArray *sb = ((NSViewPtr)theView)->_sub_views;
NSArray *sb = theView->_sub_views;
unsigned count = [sb count];
if (count > 0)
@ -3455,9 +3449,9 @@ resetCursorRectsForView(NSView *theView)
- (void) _checkCursorRectangles: (NSView*)theView forEvent: (NSEvent*)theEvent
{
if (((NSViewPtr)theView)->_rFlags.valid_rects)
if (theView->_rFlags.valid_rects)
{
NSArray *tr = ((NSViewPtr)theView)->_cursor_rects;
NSArray *tr = theView->_cursor_rects;
unsigned count = [tr count];
// Loop through cursor rectangles
@ -3523,9 +3517,9 @@ resetCursorRectsForView(NSView *theView)
/*
* Check cursor rectangles for the subviews
*/
if (((NSViewPtr)theView)->_rFlags.has_subviews)
if (theView->_rFlags.has_subviews)
{
NSArray *sb = ((NSViewPtr)theView)->_sub_views;
NSArray *sb = theView->_sub_views;
unsigned count = [sb count];
if (count > 0)
@ -4064,7 +4058,7 @@ resetCursorRectsForView(NSView *theView)
while (v != nil)
{
if (((NSViewPtr)v)->_rFlags.has_draginfo != 0
if (v->_rFlags.has_draginfo != 0
&& GSViewAcceptsDrag(v, dragInfo))
break;
v = [v superview];