--- CVS/core/gui/Source/NSMenuView.m	Mon Mar 31 22:42:31 2003
+++ CVS.build/core/gui/Source/NSMenuView.m	Mon Mar 31 16:12:26 2003
@@ -37,6 +37,7 @@
 #include <AppKit/NSButton.h>
 #include <AppKit/NSWindow.h>
 #include <AppKit/PSOperators.h>
+#include <AppKit/NSTitleView.h>
 
 #include <Foundation/NSDebug.h>
 
@@ -453,7 +454,7 @@
   if (![_menu _ownedByPopUp] && !_titleView)
     {
       // Add title view. If this menu not owned by popup
-      _titleView = [[NSMenuWindowTitleView alloc] init];
+      _titleView = [[NSTitleView alloc] init];
       [self addSubview: _titleView];
       [_titleView release];
     }
@@ -464,15 +465,15 @@
       _titleView = nil;
     }
   
-  if ([_titleView menu] == nil && _titleView)
-    [_titleView setMenu: _menu];
+  if ([_titleView owner] == nil && _titleView)
+    [_titleView setOwner: _menu];
   
   // Resize it anyway.
   [self sizeToFit];
   
   if ([_menu isTornOff] && ![_menu isTransient])
     {
-      [_titleView addCloseButton];
+      [_titleView addCloseButtonWithAction: @selector (_performMenuClose:)];
     }
   else
     {