Move Objective-C interfaces into separate header files in preparation for being able...

No new or changed code.  Work on behalf of Software 2000 Ltd.

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

diff --git a/include/wx/cocoa/objc/NSMenu.h b/include/wx/cocoa/objc/NSMenu.h
new file mode 100644 (file)
index 0000000..88df420
--- /dev/null
+++ b/include/wx/cocoa/objc/NSMenu.h
@@ -0,0 +1,28 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cocoa/objc/NSMenu.h
+// Purpose:     wxPoserNSMenu class
+// Author:      David Elliott
+// Modified by:
+// Created:     2007/04/20 (move from NSMenu.mm)
+// RCS-ID:      $Id$
+// Copyright:   (c) 2002 David Elliott
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef __WX_COCOA_OBJC_NSMENU_H__
+#define __WX_COCOA_OBJC_NSMENU_H__
+
+#import <AppKit/NSMenu.h>
+
+// ============================================================================
+// @class wxPoserNSMenu
+// ============================================================================
+@interface wxPoserNSMenu : NSMenu
+{
+}
+
+- (void)dealloc;
+
+@end // wxPoserNSMenu
+
+#endif //ndef __WX_COCOA_OBJC_NSMENU_H__

diff --git a/include/wx/cocoa/objc/NSView.h b/include/wx/cocoa/objc/NSView.h
new file mode 100644 (file)
index 0000000..58c4f51
--- /dev/null
+++ b/include/wx/cocoa/objc/NSView.h
@@ -0,0 +1,40 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cocoa/objc/NSView.h
+// Purpose:     wxPoserNSView class
+// Author:      David Elliott
+// Modified by:
+// Created:     2007/04/20 (move from NSView.mm)
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 David Elliott
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef __WX_COCOA_OBJC_NSVIEW_H__
+#define __WX_COCOA_OBJC_NSVIEW_H__
+
+#import <AppKit/NSView.h>
+
+// ============================================================================
+// @class wxPoserNSView
+// ============================================================================
+@interface wxPoserNSView : NSView
+{
+}
+
+- (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;
+@end // wxPoserNSView
+
+#endif //ndef __WX_COCOA_OBJC_NSVIEW_H__

diff --git a/include/wx/cocoa/objc/NSWindow.h b/include/wx/cocoa/objc/NSWindow.h
new file mode 100644 (file)
index 0000000..9110925
--- /dev/null
+++ b/include/wx/cocoa/objc/NSWindow.h
@@ -0,0 +1,24 @@
+///////////////////////////////////////////////////////////////////////////////
+// Name:        wx/cocoa/objc/NSWindow.h
+// Purpose:     wxPoserNSWindow class
+// Author:      David Elliott
+// Modified by:
+// Created:     2007/04/20 (move from NSWindow.mm)
+// RCS-ID:      $Id$
+// Copyright:   (c) 2003 David Elliott
+// Licence:     wxWindows licence
+///////////////////////////////////////////////////////////////////////////////
+
+#import <AppKit/NSWindow.h>
+
+// ============================================================================
+// @class wxPoserNSWindow
+// ============================================================================
+@interface wxPoserNSWindow : NSWindow
+{
+}
+
+- (BOOL)canBecomeKeyWindow;
+- (BOOL)canBecomeMainWindow;
+@end // wxPoserNSwindow
+

diff --git a/src/cocoa/NSMenu.mm b/src/cocoa/NSMenu.mm
index ef19045c4502460691423c933cd81fc892bb6157..40226cd5a2b7c2736dd6f678c8197d5554cd47c3 100644 (file)
--- a/src/cocoa/NSMenu.mm
+++ b/src/cocoa/NSMenu.mm
@@ -19,18 +19,11 @@
 #include "wx/cocoa/ObjcPose.h"
 
 #import <Foundation/NSNotification.h>
 #include "wx/cocoa/ObjcPose.h"
 
 #import <Foundation/NSNotification.h>

-#import <AppKit/NSMenu.h>
+#include "wx/cocoa/objc/NSMenu.h"

 
 // ============================================================================
 // @class wxPoserNSMenu
 // ============================================================================
 
 // ============================================================================
 // @class wxPoserNSMenu
 // ============================================================================

-@interface wxPoserNSMenu : NSMenu
-{
-}
-
-- (void)dealloc;
-
-@end // wxPoserNSMenu

 
 WX_IMPLEMENT_POSER(wxPoserNSMenu);
 @implementation wxPoserNSMenu : NSMenu
 
 WX_IMPLEMENT_POSER(wxPoserNSMenu);
 @implementation wxPoserNSMenu : NSMenu

diff --git a/src/cocoa/NSView.mm b/src/cocoa/NSView.mm
index 72c68998689456aef19bd57569c14ca9492be65d..db8d47e61863673a685f82d5af0a67464e3afadd 100644 (file)
--- a/src/cocoa/NSView.mm
+++ b/src/cocoa/NSView.mm
@@ -4,7 +4,7 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/02/15

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2003 David Elliott
 // Licence:     wxWidgets licence
 /////////////////////////////////////////////////////////////////////////////


@@ -25,9 +25,9 @@
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/NSView.h"
 
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/NSView.h"
 

-#import <AppKit/NSView.h>

 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>

+#include "wx/cocoa/objc/NSView.h"

 
 // ----------------------------------------------------------------------------
 // globals
 
 // ----------------------------------------------------------------------------
 // globals


@@ -56,26 +56,6 @@ void wxCocoaNSView::DisassociateNSView(WX_NSView cocoaNSView)
 // ============================================================================
 // @class wxPoserNSView
 // ============================================================================
 // ============================================================================
 // @class wxPoserNSView
 // ============================================================================

-@interface wxPoserNSView : NSView
-{
-}
-
-- (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;
-@end // wxPoserNSView
-

 WX_IMPLEMENT_POSER(wxPoserNSView);
 @implementation wxPoserNSView : NSView
 
 WX_IMPLEMENT_POSER(wxPoserNSView);
 @implementation wxPoserNSView : NSView
 

diff --git a/src/cocoa/NSWindow.mm b/src/cocoa/NSWindow.mm
index 792f701b1911049f545b70f11728d6e86d8de7b9..2a75aac9c07e177c89167a98b31f1ce174c8f76b 100644 (file)
--- a/src/cocoa/NSWindow.mm
+++ b/src/cocoa/NSWindow.mm
@@ -26,9 +26,9 @@
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/NSWindow.h"
 
 #include "wx/cocoa/ObjcPose.h"
 #include "wx/cocoa/NSWindow.h"
 

-#import <AppKit/NSWindow.h>

 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSNotification.h>
 #import <Foundation/NSString.h>

+#include "wx/cocoa/objc/NSWindow.h"

 
 // ============================================================================
 // @class wxNSWindowDelegate
 
 // ============================================================================
 // @class wxNSWindowDelegate


@@ -189,14 +189,6 @@ wxMenuBar* wxCocoaNSWindow::GetAppMenuBar(wxCocoaNSWindow *win)
 // ============================================================================
 // @class wxPoserNSWindow
 // ============================================================================
 // ============================================================================
 // @class wxPoserNSWindow
 // ============================================================================

-@interface wxPoserNSWindow : NSWindow
-{
-}
-
-- (BOOL)canBecomeKeyWindow;
-- (BOOL)canBecomeMainWindow;
-@end // wxPoserNSwindow
-

 WX_IMPLEMENT_POSER(wxPoserNSWindow);
 @implementation wxPoserNSWindow : NSWindow
 
 WX_IMPLEMENT_POSER(wxPoserNSWindow);
 @implementation wxPoserNSWindow : NSWindow