From cf65596987068748d43533e5154fe1c503de7213 Mon Sep 17 00:00:00 2001
From: michael <michael@72102866-910b-0410-8b05-ffd578937521>
Date: Wed, 28 Apr 1999 03:52:36 +0000
Subject: [PATCH] Modified NSFont.m to include helper methods.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4152 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                    | 12 ++++++++++++
 Headers/gnustep/gui/NSFont.h |  7 +++++++
 Source/NSFont.m              | 38 ++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 486314b47..812c51ab7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1999-04-27  Michael Hanni  <mhanni@sprintmail.com>
+
+	Changes based on report by Tim Bissell <Tim.Bissell@dresdnerkb.com>
+	* Source/NSFont.m: implemented new methods:
+		+ (NSFont *)titleBarFontOfSize:(float)fontSize;
+		+ (NSFont *)menuFontOfSize:(float)fontSize;
+		+ (NSFont *)messageFontOfSize:(float)fontSize;
+		+ (NSFont *)paletteFontOfSize:(float)fontSize;
+		+ (NSFont *)toolTipsFontOfSize:(float)fontSize;
+		+ (NSFont *)controlContentFontOfSize:(float)fontSize;  
+	* Headers/AppKit/NSFont.h: ditto.
+
 Tue Apr 27 15:48:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	* Source/NSApplication.m: Load image specified in Info-gnustep.plist
diff --git a/Headers/gnustep/gui/NSFont.h b/Headers/gnustep/gui/NSFont.h
index a35f38f01..595ddcb05 100644
--- a/Headers/gnustep/gui/NSFont.h
+++ b/Headers/gnustep/gui/NSFont.h
@@ -67,6 +67,13 @@ extern const float *NSFontIdentityMatrix;
 + (NSFont *)userFixedPitchFontOfSize:(float)fontSize;
 + (NSFont *)userFontOfSize:(float)fontSize;
 
++ (NSFont *)titleBarFontOfSize:(float)fontSize;
++ (NSFont *)menuFontOfSize:(float)fontSize;
++ (NSFont *)messageFontOfSize:(float)fontSize;
++ (NSFont *)paletteFontOfSize:(float)fontSize;
++ (NSFont *)toolTipsFontOfSize:(float)fontSize;
++ (NSFont *)controlContentFontOfSize:(float)fontSize;
+
 //
 // Setting the Font
 //
diff --git a/Source/NSFont.m b/Source/NSFont.m
index dfb842567..6fde0ef3d 100644
--- a/Source/NSFont.m
+++ b/Source/NSFont.m
@@ -88,11 +88,13 @@ void setNSFont(NSString* key, NSFont* font)
 
 /* Getting the preferred user fonts */
 
+// This is deprecated in MacOSX
 + (NSFont*)boldSystemFontOfSize:(float)fontSize
 {
   return getNSFont (@"NSBoldFont", @"Helvetica-Bold", fontSize);
 }
 
+// This is deprecated in MacOSX
 + (NSFont*)systemFontOfSize:(float)fontSize
 {
   return getNSFont (@"NSFont", @"Helvetica", fontSize);
@@ -120,6 +122,42 @@ void setNSFont(NSString* key, NSFont* font)
   setNSFont (@"NSUserFont", font);
 }
 
+/* Getting various fonts */
+
+#ifndef STRICT_OPENSTEP
++ (NSFont *)controlContentFontOfSize:(float)fontSize
+{
+  return [NSFont fontWithName:@"Helvetica" size:fontSize];
+}
+
++ (NSFont *)menuFontOfSize:(float)fontSize
+{
+  return [NSFont fontWithName:@"Helvetica" size:fontSize];
+}
+
++ (NSFont *)titleBarFontOfSize:(float)fontSize
+{
+  return [self boldSystemFontOfSize:fontSize];
+}
+
++ (NSFont *)messageFontOfSize:(float)fontSize
+{
+  return [self systemFontOfSize:fontSize];
+}
+
++ (NSFont *)paletteFontOfSize:(float)fontSize
+{
+  // Not sure on this one.
+  return [self boldSystemFontOfSize:fontSize];
+}
+
++ (NSFont *)toolTipsFontOfSize:(float)fontSize
+{
+  // Not sure on this one.
+  return [NSFont fontWithName:@"Helvetica" size:fontSize];
+}
+#endif
+
 /* The following method should be rewritten in the backend and it has to be
    called as part of the implementation. */
 + (NSFont*)fontWithName:(NSString*)name