From 2dd988224756050cdd2fe43326215cb221baa82f Mon Sep 17 00:00:00 2001
From: qmathe <qmathe@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 2 Apr 2004 15:40:49 +0000
Subject: [PATCH] Moved NSWindow+Toolbar.h to Headers/AppKit

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@19003 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                         |  8 +++++-
 Headers/AppKit/AppKit.h           |  1 +
 Headers/AppKit/NSWindow+Toolbar.h | 45 +++++++++++++++++++++++++++++++
 Source/GNUmakefile                |  1 +
 Source/NSWindow+Toolbar.m         |  2 +-
 5 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 Headers/AppKit/NSWindow+Toolbar.h

diff --git a/ChangeLog b/ChangeLog
index e4dbe78f6..32dd60cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-02  Quentin Mathe <qmathe@club-internet.fr>
+
+        * Source/NSWindow+Toolbar.h: Moved into Headers/AppKit
+	* Headers/AppKit/AppKit.h: Include NSWindow+Toolbar.h now
+	* Source/GNUMakefile: Modified to reflect this change
+
 2004-03-29 18:25  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/NSTextView.m (-setSelectedRange:affinity:stillSelecting:):
@@ -10,7 +16,7 @@
 	Added ivars _selectedColumns and _selectedRows to NSMutableIndexSet.
 	* Source/NSTableView.m: 
 	* Source/NSOutlineView.m: 
-	Chnaged all the uses of these ivars and started to restructure the
+	Changed all the uses of these ivars and started to restructure the
 	row selection code. Also removed some (not all) dead code.
 	
 2004-03-23 23:52  Alexander Malmberg <alexander@malmberg.org>
diff --git a/Headers/AppKit/AppKit.h b/Headers/AppKit/AppKit.h
index eacea61e3..e53ddfbe0 100644
--- a/Headers/AppKit/AppKit.h
+++ b/Headers/AppKit/AppKit.h
@@ -149,6 +149,7 @@
 #include <AppKit/NSTextStorage.h>
 #include <AppKit/NSUserInterfaceValidation.h>
 #include <AppKit/NSWindowController.h>
+#include <AppKit/NSWindow+Toolbar.h>
 #include <AppKit/NSToolbar.h>
 #include <AppKit/NSToolbarItem.h>
 #endif
diff --git a/Headers/AppKit/NSWindow+Toolbar.h b/Headers/AppKit/NSWindow+Toolbar.h
new file mode 100644
index 000000000..8c6fcc4cd
--- /dev/null
+++ b/Headers/AppKit/NSWindow+Toolbar.h
@@ -0,0 +1,45 @@
+/*
+   NSWindow+Toolbar.h
+
+   The window toolbar category
+
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+   Author:  Quentin Mathe <qmathe@club-internet.fr>
+   Date: January 2004
+
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#ifndef _GNUstep_H_NSWindow_Toolbar
+#define _GNUstep_H_NSWindow_Toolbar
+
+#include "AppKit/NSWindow.h"
+
+@class NSToolbar;
+
+@interface NSWindow (Toolbar)
+- (void) runToolbarCustomizationPalette: (id)sender;
+- (void) toggleToolbarShown: (id)sender;
+- (NSView *) contentViewWithoutToolbar;
+- (NSToolbar *) toolbar;
+- (void) setContentViewWithoutToolbar: (NSView *)contentViewWithoutToolbar;
+- (void) setToolbar: (NSToolbar*)toolbar;
+@end
+
+#endif
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index d672b3981..eaa419c01 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -307,6 +307,7 @@ NSToolbarItem.h \
 NSView.h \
 NSWindow.h \
 NSWindowController.h \
+NSWindow+Toolbar.h \
 NSWorkspace.h \
 NSAttributedString.h \
 NSColorPicking.h \
diff --git a/Source/NSWindow+Toolbar.m b/Source/NSWindow+Toolbar.m
index eaa256568..8502afaf7 100644
--- a/Source/NSWindow+Toolbar.m
+++ b/Source/NSWindow+Toolbar.m
@@ -28,7 +28,7 @@
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 
-#include "NSWindow+Toolbar.h"
+#include "AppKit/NSWindow+Toolbar.h"
 #include "AppKit/NSView.h"
 #include "AppKit/NSToolbar.h"
 #include "GNUstepGUI/GSToolbarView.h"