mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 02:10:48 +00:00
Fixes for compilation errors.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4446 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
5dc712706c
commit
db24d2a2f8
5 changed files with 15 additions and 4 deletions
|
@ -32,6 +32,7 @@
|
|||
#include <Foundation/NSString.h>
|
||||
|
||||
#include <AppKit/NSBox.h>
|
||||
#include <AppKit/NSColor.h>
|
||||
#include <AppKit/NSGraphics.h>
|
||||
#include <AppKit/NSTextFieldCell.h>
|
||||
|
||||
|
|
|
@ -32,6 +32,7 @@
|
|||
|
||||
#include <AppKit/NSBrowserCell.h>
|
||||
#include <AppKit/NSTextFieldCell.h>
|
||||
#include <AppKit/NSColor.h>
|
||||
#include <AppKit/NSImage.h>
|
||||
#include <AppKit/NSEvent.h>
|
||||
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
|
||||
#include <AppKit/NSColor.h>
|
||||
#include <AppKit/NSFont.h>
|
||||
#include <AppKit/NSGraphics.h>
|
||||
#include <AppKit/NSImage.h>
|
||||
#include <AppKit/NSTabView.h>
|
||||
#include <AppKit/NSTabViewItem.h>
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
#include <AppKit/NSColor.h>
|
||||
#include <AppKit/NSFont.h>
|
||||
#include <AppKit/NSImage.h>
|
||||
#include <AppKit/NSTabViewItem.h>
|
||||
|
|
|
@ -1227,13 +1227,13 @@ typedef enum
|
|||
|
||||
if([self drawsBackground]) // clean up the remaining area under text of us
|
||||
{ float lowestY=0;
|
||||
NSRect frame=[self frame];
|
||||
NSRect f=[self frame];
|
||||
|
||||
if([lineLayoutInformation count]) lowestY=NSMaxY([[lineLayoutInformation lastObject] lineRect]);
|
||||
|
||||
if(![lineLayoutInformation count] || (lowestY < NSMaxY(frame) && frame.size.height<= [self minSize].height))
|
||||
if(![lineLayoutInformation count] || (lowestY < NSMaxY(f) && f.size.height<= [self minSize].height))
|
||||
{ [[self backgroundColor] set];
|
||||
NSRectFill(NSMakeRect(0,lowestY,frame.size.width,NSMaxY(frame)-lowestY));
|
||||
NSRectFill(NSMakeRect(0,lowestY,f.size.width,NSMaxY(f)-lowestY));
|
||||
if(![lineLayoutInformation count] || [[lineLayoutInformation lastObject] type] == LineLayoutInfoType_Paragraph)
|
||||
[self drawSelectionAsRange:[self selectedRange]];
|
||||
}
|
||||
|
@ -1869,7 +1869,13 @@ static unsigned _relocLayoutArray(NSMutableArray *lineLayoutInformation,NSArray
|
|||
|
||||
if(!lineLayoutInformation) lineLayoutInformation=[[NSMutableArray alloc] init];
|
||||
else
|
||||
{ ghostArray=[lineLayoutInformation subarrayWithRange:NSMakeRange(aLine,[lineLayoutInformation count]-aLine)]; // remember old array for optimization purposes
|
||||
{
|
||||
NSLog(@"aLine = %d, count = %d\n", (int)aLine,
|
||||
(int)[lineLayoutInformation count]);
|
||||
|
||||
ghostArray=[lineLayoutInformation
|
||||
subarrayWithRange:NSMakeRange(aLine,[lineLayoutInformation count]-aLine)];
|
||||
// remember old array for optimization purposes
|
||||
prevArrayEnum=[ghostArray seekableEnumerator]; // every time an object is added to lineLayoutInformation a nextObject has to be performed on prevArrayEnum!
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue