gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 18:11:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:gnustep/libs-gui

Browse source
This commit is contained in:
Gregory John Casamento 2022-08-09 01:25:59 -04:00
commit bd3c954807
10 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2022-06-12 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSImageCell.m,
* Source/NSAccessibilityCustomAction.m,
* Source/NSStackView.m,
* Source/NSGridView.m: Fix compiler warnings
2022-03-31 Riccardo Mottola <rm@gnu.org>
* Headers/Additions/GNUstepGUI/GSTheme.h

1
Source/NSAccessibilityCustomAction.m
View file

@ -22,6 +22,7 @@
Boston, MA 02110 USA.
*/
#import <Foundation/NSString.h>
#import "AppKit/NSAccessibilityCustomAction.h"
@implementation NSAccessibilityCustomAction

6
Source/NSGridView.m
View file

@ -251,13 +251,7 @@
NSUInteger c = 0;
NSUInteger r = 0;
NSUInteger rc = [views count], cc = 0;
if (rc > 0)
{
cc = [[views objectAtIndex: 0] count];
}
FOR_IN(NSArray*, row, views)
{
NSGridRow *gr = [[NSGridRow alloc] init];

9
Source/NSImageCell.m
View file

@ -65,23 +65,24 @@
- (id) initImageCell: (NSImage*)anImage
{
if (self = [super initImageCell: anImage])
self = [super initImageCell: anImage];
if (self != nil)
{
[self setRefusesFirstResponder: YES];
}
return self;
}
- (void) setImage:(NSImage *)anImage
- (void) setImage: (NSImage *)anImage
{
[super setImage:anImage];
[super setImage: anImage];
if (anImage)
_original_image_size = [anImage size];
else
_original_image_size = NSMakeSize(1,1);
}
- (void)setObjectValue:(id)object
- (void) setObjectValue: (id)object
{
if ((object == nil) || ([object isKindOfClass:[NSImage class]]))
{

2
Source/NSStackView.m
View file

@ -174,7 +174,6 @@
CGFloat x = 0.0;
CGFloat y = 0.0;
CGFloat newHeight = 0.0;
CGFloat newWidth = 0.0;
NSUInteger i = 0;
// Advance vertically or horizontally depending on orientation...
@ -205,7 +204,6 @@
}
newFrame.size.width += sp;
newWidth = newFrame.size.width;
}
[self setFrame: newFrame];

4
Tests/gui/NSView/NSView_bounds_scale.m
View file

@ -94,7 +94,7 @@ int main(int argc, char **argv)
CGFloat ts[6];
int passed = 1;
START_SET("NView GNUstep bounds_scale")
START_SET("NSView GNUstep bounds_scale")
NS_DURING
{
@ -201,7 +201,7 @@ int main(int argc, char **argv)
pass(passed,"NSView -scaleUnitSquareToSize works");
testHopeful = NO;
END_SET("NView GNUstep bounds_scale")
END_SET("NSView GNUstep bounds_scale")
DESTROY(arp);
return 0;

4
Tests/gui/NSView/NSView_convertRect.m
View file

@ -97,7 +97,7 @@ int main(int argc, char **argv)
NSView *view1,*view2;
int passed=1;
START_SET("NView GNUstep converRect")
START_SET("NSView GNUstep converRect")
NS_DURING
{
@ -142,7 +142,7 @@ int main(int argc, char **argv)
pass(passed,"NSView -convertRect:fromView: and -convertRect:toView: work");
END_SET("NView GNUstep converRect")
END_SET("NSView GNUstep converRect")
DESTROY(arp);
return 0;

4
Tests/gui/NSView/NSView_frame_bounds.m
View file

@ -54,7 +54,7 @@ int main(int argc, char **argv)
NSView *view1;
int passed = 1;
START_SET("NView GNUstep frame_bounds")
START_SET("NSView GNUstep frame_bounds")
NS_DURING
{
@ -122,7 +122,7 @@ int main(int argc, char **argv)
pass(passed,"NSView -frame and -bounds work");
END_SET("NView GNUstep frame_bounds")
END_SET("NSView GNUstep frame_bounds")
DESTROY(arp);
return 0;

4
Tests/gui/NSView/NSView_frame_rotation.m
View file

@ -18,7 +18,7 @@ int main(int argc, char **argv)
NSView *view;
int passed;
START_SET("NView GNUstep frame_rotation")
START_SET("NSView GNUstep frame_rotation")
NS_DURING
{
@ -66,7 +66,7 @@ int main(int argc, char **argv)
pass(passed,"-frameRotation/-setFrameRotation work");
END_SET("NView GNUstep frame_rotation")
END_SET("NSView GNUstep frame_rotation")
DESTROY(arp);
return 0;

4
Tests/gui/NSView/scrollRectToVisible.m
View file

@ -30,7 +30,7 @@ int main(int argc, char **argv)
NSView *v=[[NSView alloc] initWithFrame: NSMakeRect(0,0,100,100)];
[cv setDocumentView: v];
START_SET("NView GNUstep scrollRectToVisible")
START_SET("NSView GNUstep scrollRectToVisible")
NS_DURING
{
@ -97,7 +97,7 @@ int main(int argc, char **argv)
[v scrollRectToVisible: NSMakeRect(15,15,5,5)];
TEST(NSMakeRect(10,10,10,10),"12");
END_SET("NView GNUstep scrollRectToVisible")
END_SET("NSView GNUstep scrollRectToVisible")
DESTROY(arp);