diff --git a/ChangeLog b/ChangeLog
index a62fee5e3..d9dce3008 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-23  Quentin Mathe <qmathe@club-internet.fr>
+
+        * Source/NSWindow.m: NSToolbar related methods removed.
+	* Headers/AppKit/NSWindow.h: same (NSToolbar related ivars still 
+	present).
+
 2004-03-22 18:06  Alexander Malmberg <alexander@malmberg.org>
 
 	* Source/NSView.m (-lockFocusInRect:): Don't convert the clipping
diff --git a/Headers/AppKit/NSWindow.h b/Headers/AppKit/NSWindow.h
index 81e51904f..a62e2e6a5 100644
--- a/Headers/AppKit/NSWindow.h
+++ b/Headers/AppKit/NSWindow.h
@@ -55,7 +55,7 @@
 @class NSPasteboard;
 @class NSScreen;
 @class NSText;
-@class NSToolbar;
+@class NSToolbar; 
 @class NSView;
 @class NSWindowController;
 @class NSCachedImageRep;
@@ -138,9 +138,9 @@ APPKIT_EXPORT NSSize NSTokenSize;
   NSWindowController *_windowController;
   int		_counterpart;
   float         _alphaValue;
-
-  NSToolbar    *_toolbar;
-  id            _toolbarView;
+  
+  NSToolbar    *_toolbar; // Not used (see NSWindow+Toolbar now)
+  id            _toolbarView; // Not used (see NSWindow+Toolbar now)
   NSCachedImageRep *_cachedImage;
   NSPoint       _cachedImageOrigin;
 
@@ -177,6 +177,7 @@ APPKIT_EXPORT NSSize NSTokenSize;
   id _defaultButtonCell;
   void          *_reserved_1;
   void          *_reserved_2;
+  
 }
 
 /*
@@ -514,10 +515,6 @@ APPKIT_EXPORT NSSize NSTokenSize;
 
 #ifndef STRICT_OPENSTEP
 - (NSArray *) drawers;
-- (void) setToolbar: (NSToolbar*)toolbar;
-- (NSToolbar *) toolbar;
-- (void) toggleToolbarShown: (id)sender;
-- (void) runToolbarCustomizationPalette: (id)sender;
 - (id) initWithWindowRef: (void *)windowRef;
 - (void *)windowRef;
 - (void*) windowHandle;
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 4bc11ad5a..895bc7e71 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -4067,29 +4067,6 @@ Code shared with [NSPanel -sendEvent:], remember to update both places.
   return nil;
 }
 
-- (void) setToolbar: (NSToolbar*)toolbar
-{
-  // assign and setup the toolbar...
-  ASSIGN(_toolbar, toolbar);
-  _toolbarView = [GSToolbarView initWithToolbar: _toolbar];
-  
-}
-
-- (NSToolbar *) toolbar
-{
-  return _toolbar;
-}
-
-- (void) toggleToolbarShown: (id)sender
-{
-  [_toolbar setVisible: [_toolbar isVisible]];
-}
-
-- (void) runToolbarCustomizationPalette: (id)sender
-{
-  [_toolbar runCustomizationPalette: sender];
-}
-
 - (id) initWithWindowRef: (void *)windowRef
 {
   // TODO