From c0a656abd013af049406bf6927295dda4e4f7884 Mon Sep 17 00:00:00 2001 From: Fred Kiefer Date: Sat, 19 Jan 2008 21:48:37 +0000 Subject: [PATCH] Avoid compiler warnings on Windows. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25985 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 10 ++++++++++ Source/GSFontInfo.m | 1 + Source/NSFontDescriptor.m | 1 + Source/NSMenu.m | 4 ++-- Source/NSTextBlock.m | 1 + Source/NSWindow.m | 1 + 6 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a5aaba454..abdb41e3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-01-19 Fred Kiefer + + * Source/GSFontInfo.m: + * Source/NSFontDescriptor.m, + * Source/NSTextBlock.m, + * Source/NSWindow.m: + Add imports to avoid warnings on Windows. + * Source/NSMenu.m (-_organizeMenu): Change type of appItem to + avoid compiler warning on Windows. + 2008-01-19 Fred Kiefer * Headers/Additions/GNUstepGUI/GSDisplayServer.h diff --git a/Source/GSFontInfo.m b/Source/GSFontInfo.m index df230bd06..655efd0e7 100644 --- a/Source/GSFontInfo.m +++ b/Source/GSFontInfo.m @@ -30,6 +30,7 @@ #include #include "GNUstepGUI/GSFontInfo.h" +#include #include #include #include diff --git a/Source/NSFontDescriptor.m b/Source/NSFontDescriptor.m index 7cd75a69b..633491fa5 100644 --- a/Source/NSFontDescriptor.m +++ b/Source/NSFontDescriptor.m @@ -33,6 +33,7 @@ #include #include #include +#include #include #include diff --git a/Source/NSMenu.m b/Source/NSMenu.m index ee9f9bb2b..f555dcd52 100644 --- a/Source/NSMenu.m +++ b/Source/NSMenu.m @@ -213,10 +213,10 @@ static BOOL menuBarVisible = YES; { NSString *appTitle; NSMenu *appMenu; - NSMenuItem *appItem; + id appItem; appTitle = [[NSProcessInfo processInfo] processName]; - appItem = (NSMenuItem *)[self itemWithTitle: appTitle]; + appItem = [self itemWithTitle: appTitle]; appMenu = [appItem submenu]; if (_menu.horizontal == YES) diff --git a/Source/NSTextBlock.m b/Source/NSTextBlock.m index 266d23a23..f91217ee7 100644 --- a/Source/NSTextBlock.m +++ b/Source/NSTextBlock.m @@ -29,6 +29,7 @@ #include #include +#include "AppKit/NSColor.h" #include "AppKit/NSTextTable.h" @implementation NSTextBlock diff --git a/Source/NSWindow.m b/Source/NSWindow.m index 9e4997cac..c0292c959 100644 --- a/Source/NSWindow.m +++ b/Source/NSWindow.m @@ -52,6 +52,7 @@ #include #include "AppKit/NSApplication.h" +#include "AppKit/NSButton.h" #include "AppKit/NSButtonCell.h" #include "AppKit/NSCachedImageRep.h" #include "AppKit/NSColor.h"