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

More CGFloat, NSUInteger and NSInteger changes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@36148 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2013-02-16 00:08:33 +00:00
parent 9a8f8f4e07
commit a4abfc354f
22 changed files with 391 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/NSWindow.m
View file

@ -554,7 +554,7 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
location = [_window mouseLocationOutsideOfEventStream];
if (NSEqualPoints(location, lastLocation) == NO)
{
NSPoint origin = [_window frame].origin;
NSPoint origin = [_window frame].origin;
origin.x += (location.x - lastLocation.x);
origin.y += (location.y - lastLocation.y);
@ -729,7 +729,7 @@ static NSNotificationCenter *nc = nil;
styleMask: aStyle];
}
+ (float) minFrameWidthWithTitle: (NSString *)aTitle
+ (CGFloat) minFrameWidthWithTitle: (NSString *)aTitle
styleMask: (NSUInteger)aStyle
{
if (!windowDecorator)
@ -1156,11 +1156,11 @@ many times.
- (id) initWithWindowRef: (void *)windowRef
{
NSRect contentRect;
unsigned aStyle;
unsigned int aStyle;
NSBackingStoreType bufferingType;
NSScreen* aScreen;
int screen;
int winNum;
NSInteger winNum;
GSDisplayServer *srv = GSCurrentServer();
// Get the properties for the underlying window
@ -1337,7 +1337,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
// FIXME
}
- (void) setAlphaValue: (float)windowAlpha
- (void) setAlphaValue: (CGFloat)windowAlpha
{
_alphaValue = windowAlpha;
if (_windowNum)
@ -1346,7 +1346,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
}
}
- (float) alphaValue
- (CGFloat) alphaValue
{
return _alphaValue;
}
@ -1380,7 +1380,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
return _context;
}
- (float) userSpaceScaleFactor
- (CGFloat) userSpaceScaleFactor
{
if (_styleMask & NSUnscaledWindowMask)
{
@ -2102,7 +2102,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
- (NSRect) constrainFrameRect: (NSRect)frameRect toScreen: (NSScreen*)screen
{
NSRect screenRect = [screen visibleFrame];
float difference;
CGFloat difference;
/* Move top edge of the window inside the screen */
difference = NSMaxY (frameRect) - NSMaxY (screenRect);
@ -3968,8 +3968,8 @@ resetCursorRectsForView(NSView *theView)
switch (sub)
{
case GSAppKitWindowMoved:
_frame.origin.x = (float)[theEvent data1];
_frame.origin.y = (float)[theEvent data2];
_frame.origin.x = (CGFloat)[theEvent data1];
_frame.origin.y = (CGFloat)[theEvent data2];
NSDebugLLog(@"Moving", @"Move event: %d %@",
(int)_windowNum, NSStringFromPoint(_frame.origin));
if (_autosaveName != nil)
@ -4705,14 +4705,14 @@ current key view.<br />
// if toolbar is showing, adjust saved frame to add the toolbar back in
if ([_toolbar isVisible])
{
float toolbarHeight = [[_toolbar _toolbarView] frame].size.height;
CGFloat toolbarHeight = [[_toolbar _toolbarView] frame].size.height;
fRect.size.height += toolbarHeight;
fRect.origin.y -= toolbarHeight;
}
// if window has a menu, adjust saved frame to add the menu back in
if ([_wv hasMenu])
{
float menuBarHeight = [[GSTheme theme] menuHeightForWindow: self];
CGFloat menuBarHeight = [[GSTheme theme] menuHeightForWindow: self];
fRect.size.height += menuBarHeight;
fRect.origin.y -= menuBarHeight;
}
@ -4860,14 +4860,14 @@ current key view.<br />
// if toolbar is showing, adjust saved frame to not include the toolbar
if ([_toolbar isVisible])
{
float toolbarHeight = [[_toolbar _toolbarView] frame].size.height;
CGFloat toolbarHeight = [[_toolbar _toolbarView] frame].size.height;
fRect.size.height -= toolbarHeight;
fRect.origin.y += toolbarHeight;
}
// if window has a menu, adjust saved frame to not include the menu
if ([_wv hasMenu])
{
float menuBarHeight = [[GSTheme theme] menuHeightForWindow: self];
CGFloat menuBarHeight = [[GSTheme theme] menuHeightForWindow: self];
fRect.size.height -= menuBarHeight;
fRect.origin.y += menuBarHeight;
}