Remove wxNonControlNSControl from trunk. Leave in 2.8 because it removes

symbols (although theoretically no one could have ever linked against them).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/cocoa/control.mm

@@ -29,155 +29,6 @@
 
 #include <math.h>
 
-@interface wxNonControlNSControl : NSControl
-{
-}
-
-- (void)drawRect: (NSRect)rect;
-- (void)mouseDown:(NSEvent *)theEvent;
-- (void)mouseDragged:(NSEvent *)theEvent;
-- (void)mouseUp:(NSEvent *)theEvent;
-- (void)mouseMoved:(NSEvent *)theEvent;
-- (void)mouseEntered:(NSEvent *)theEvent;
-- (void)mouseExited:(NSEvent *)theEvent;
-- (void)rightMouseDown:(NSEvent *)theEvent;
-- (void)rightMouseDragged:(NSEvent *)theEvent;
-- (void)rightMouseUp:(NSEvent *)theEvent;
-- (void)otherMouseDown:(NSEvent *)theEvent;
-- (void)otherMouseDragged:(NSEvent *)theEvent;
-- (void)otherMouseUp:(NSEvent *)theEvent;
-- (void)resetCursorRects;
-- (void)viewDidMoveToWindow;
-- (void)viewWillMoveToWindow:(NSWindow *)newWindow;
-@end // wxNonControlNSControl
-WX_DECLARE_GET_OBJC_CLASS(wxNonControlNSControl,NSControl)
-
-@implementation wxNonControlNSControl : NSControl
-
-- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
-{
-    bool acceptsFirstMouse = false;
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if(!win || !win->Cocoa_acceptsFirstMouse(acceptsFirstMouse, theEvent))
-        acceptsFirstMouse = [super acceptsFirstMouse:theEvent];
-    return acceptsFirstMouse;
-}
-
-- (void)drawRect: (NSRect)rect
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_drawRect(rect) )
-        [super drawRect:rect];
-}
-
-- (void)mouseDown:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_mouseDown(theEvent) )
-        [super mouseDown:theEvent];
-}
-
-- (void)mouseDragged:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_mouseDragged(theEvent) )
-        [super mouseDragged:theEvent];
-}
-
-- (void)mouseUp:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_mouseUp(theEvent) )
-        [super mouseUp:theEvent];
-}
-
-- (void)mouseMoved:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_mouseMoved(theEvent) )
-        [super mouseMoved:theEvent];
-}
-
-- (void)mouseEntered:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_mouseEntered(theEvent) )
-        [super mouseEntered:theEvent];
-}
-
-- (void)mouseExited:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_mouseExited(theEvent) )
-        [super mouseExited:theEvent];
-}
-
-- (void)rightMouseDown:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_rightMouseDown(theEvent) )
-        [super rightMouseDown:theEvent];
-}
-
-- (void)rightMouseDragged:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_rightMouseDragged(theEvent) )
-        [super rightMouseDragged:theEvent];
-}
-
-- (void)rightMouseUp:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_rightMouseUp(theEvent) )
-        [super rightMouseUp:theEvent];
-}
-
-- (void)otherMouseDown:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_otherMouseDown(theEvent) )
-        [super otherMouseDown:theEvent];
-}
-
-- (void)otherMouseDragged:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_otherMouseDragged(theEvent) )
-        [super otherMouseDragged:theEvent];
-}
-
-- (void)otherMouseUp:(NSEvent *)theEvent
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_otherMouseUp(theEvent) )
-        [super otherMouseUp:theEvent];
-}
-
-- (void)resetCursorRects
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_resetCursorRects() )
-        [super resetCursorRects];
-}
-
-- (void)viewDidMoveToWindow
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_viewDidMoveToWindow() )
-        [super viewDidMoveToWindow];
-}
-
-- (void)viewWillMoveToWindow:(NSWindow *)newWindow
-{
-    wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa(self);
-    if( !win || !win->Cocoa_viewWillMoveToWindow(newWindow) )
-        [super viewWillMoveToWindow:newWindow];
-}
-
-@end // wxNonControlNSControl
-WX_IMPLEMENT_GET_OBJC_CLASS(wxNonControlNSControl,NSControl)
-
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 BEGIN_EVENT_TABLE(wxControl, wxControlBase)
 END_EVENT_TABLE()

src/cocoa/mbarman.mm

@@ -28,6 +28,11 @@
 #import <AppKit/NSApplication.h>
 #import <AppKit/NSWindow.h>
 
+#define wxUSE_FSCRIPT 1
+#if wxUSE_FSCRIPT
+    #import <FScript/FScriptMenuItem.h>
+#endif
+
 // Declare setAppleMenu: in an NSApplication category since Tiger and later
 // releases support it but don't declare it as it's considered deprecated.
 @interface NSApplication(wxDeprecatedMethodsWeWantToUse)
@@ -109,6 +114,17 @@ WX_IMPLEMENT_GET_OBJC_CLASS(wxMenuBarManagerObserver,NSObject)
 // ============================================================================
 wxMenuBarManager *wxMenuBarManager::sm_mbarmanInstance = NULL;
 
+static void AddFScriptItem(NSMenu *menu)
+#if wxUSE_FSCRIPT
+{
+    NSMenuItem *item = [[FScriptMenuItem alloc] init];
+    [menu addItem: item];
+    [item release];
+}
+#else
+{}
+#endif
+
 wxMenuBarManager::wxMenuBarManager()
 {
     m_observer = [[WX_GET_OBJC_CLASS(wxMenuBarManagerObserver) alloc]
@@ -149,6 +165,7 @@ wxMenuBarManager::wxMenuBarManager()
 
 /**/[m_menuApp addItemWithTitle:@"Preferences..." action:nil keyEquivalent:@""];
 /**/[m_menuApp addItem: [NSMenuItem separatorItem]];
+/**/AddFScriptItem(m_menuApp);
 /**/menuitem = [[NSMenuItem alloc] initWithTitle: @"Services" action:nil keyEquivalent:@""];
     [menuitem setSubmenu:m_menuServices];
     [m_menuApp addItem: menuitem];