move Read/Write() to common code, there was almost nothing platform-specific in it

[wxWidgets.git] / include / wx / cocoa / NSWindow.h

diff --git a/include/wx/cocoa/NSWindow.h b/include/wx/cocoa/NSWindow.h
index 65f702041b81afdf9f7611c3dc6d2cd2764f7eaa..2a8e1a2e7a58cb25596bd9412a755233f8fd1a1e 100644 (file)
--- a/include/wx/cocoa/NSWindow.h
+++ b/include/wx/cocoa/NSWindow.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16
 // Author:      David Elliott
 // Modified by:
 // Created:     2003/03/16

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

 // Copyright:   (c) 2003 David Elliott
 // Copyright:   (c) 2003 David Elliott

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSWINDOW_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_NSWINDOW_H__


@@ -17,20 +17,22 @@
 
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 
 
 WX_DECLARE_OBJC_HASHMAP(NSWindow);
 

-class WXDLLEXPORT wxMenuBar;
-class WXDLLEXPORT wxTopLevelWindowCocoa;
+class WXDLLIMPEXP_FWD_CORE wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowCocoa;

 
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
 
 
 DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem);
 DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate);
 

-class wxCocoaNSWindow
+class WXDLLIMPEXP_CORE wxCocoaNSWindow

 {
 /* NSWindow is a rather special case and requires some extra attention */
     WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow)
 public:
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
     void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);
 {
 /* NSWindow is a rather special case and requires some extra attention */
     WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow)
 public:
     void AssociateNSWindow(WX_NSWindow cocoaNSWindow);
     void DisassociateNSWindow(WX_NSWindow cocoaNSWindow);

-    virtual bool Cocoa_canBecomeMainWindow(bool &canBecome)
+    virtual bool Cocoa_canBecomeKeyWindow(bool &WXUNUSED(canBecome))
+    {   return false; }
+    virtual bool Cocoa_canBecomeMainWindow(bool &WXUNUSED(canBecome))

     {   return false; }
     virtual bool CocoaDelegate_windowShouldClose(void) = 0;
     virtual void CocoaDelegate_windowWillClose(void) = 0;
     {   return false; }
     virtual bool CocoaDelegate_windowShouldClose(void) = 0;
     virtual void CocoaDelegate_windowWillClose(void) = 0;