From fda38b7fa2d6abf3ee9d717b535d7be57468d230 Mon Sep 17 00:00:00 2001
From: fredkiefer <fredkiefer@72102866-910b-0410-8b05-ffd578937521>
Date: Tue, 30 Dec 2008 23:56:35 +0000
Subject: [PATCH] Add validation for toggle toolbar method.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27471 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog         |  5 +++++
 Source/NSWindow.m | 25 ++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dc15e520d..b8b1d76f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-31 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSWindow.m (-validateMenuItem:): Add validation for
+	toolbar toggle method.
+
 2008-12-30 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSPrintOperation.m (_setupPrintInfo): Initialize
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 3e78b80f8..2299b3372 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -74,6 +74,7 @@
 #include "AppKit/NSTextFieldCell.h"
 #include "AppKit/NSView.h"
 #include "AppKit/NSWindow.h"
+#include "AppKit/NSWindow+Toolbar.h"
 #include "AppKit/NSWindowController.h"
 #include "AppKit/PSOperators.h"
 #include "GNUstepGUI/GSTrackingRect.h"
@@ -4754,7 +4755,7 @@ current key view.<br />
  * Menu item validation
  */
 
-- (BOOL)validateMenuItem: (NSMenuItem *)anItem
+- (BOOL) validateMenuItem: (NSMenuItem *)anItem
 {
   BOOL result = YES;
   SEL  action = [anItem action];
@@ -4813,6 +4814,28 @@ current key view.<br />
             }
         }
     }
+  else if (sel_eq(action, @selector(toggleToolbarShown:)))
+    {
+      NSToolbar *toolbar = [self toolbar];
+
+      if (toolbar == nil)
+        {
+          result = NO;
+        }
+      else
+        {
+          if ([toolbar isVisible])
+            {
+              [anItem setTitle: _(@"Hide Toolbar")];
+              result = YES;
+            }
+          else
+            {
+              [anItem setTitle: _(@"Show Toolbar")];
+              result = YES;
+            }
+        }
+    }
     
   return result;
 }