renamed wxWave to wxSound

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

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index 9af31a2e519560590d4c6cb0b2012b4fe24cbaec..8276028e6761e9a3827b77d2924649a81ee00e2a 100644 (file)
--- a/include/wx/cocoa/toplevel.h
+++ b/include/wx/cocoa/toplevel.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/08
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/08

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

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

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

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_TOPLEVEL_H__
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_TOPLEVEL_H__


@@ -15,6 +15,8 @@
 #include "wx/hashmap.h"
 #include "wx/cocoa/NSWindow.h"
 
 #include "wx/hashmap.h"
 #include "wx/cocoa/NSWindow.h"
 

+class WXDLLEXPORT wxMenuBar;
+

 // ========================================================================
 // wxTopLevelWindowCocoa
 // ========================================================================
 // ========================================================================
 // wxTopLevelWindowCocoa
 // ========================================================================


@@ -59,18 +61,27 @@ protected:
 // ------------------------------------------------------------------------
 public:
     inline WX_NSWindow GetNSWindow() { return m_cocoaNSWindow; }
 // ------------------------------------------------------------------------
 public:
     inline WX_NSWindow GetNSWindow() { return m_cocoaNSWindow; }

-    virtual void Cocoa_close(void);
-    virtual bool Cocoa_windowShouldClose(void);
-    virtual void Cocoa_wxMenuItemAction(wxMenuItem& item);
+    virtual void CocoaDelegate_windowWillClose(void);
+    virtual bool CocoaDelegate_windowShouldClose(void);
+    virtual void CocoaDelegate_windowDidBecomeKey(void);
+    virtual void CocoaDelegate_windowDidResignKey(void);
+    virtual void CocoaDelegate_windowDidBecomeMain(void);
+    virtual void CocoaDelegate_windowDidResignMain(void);
+    virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
+    static void DeactivatePendingWindow();

 protected:
     void SetNSWindow(WX_NSWindow cocoaNSWindow);
     WX_NSWindow m_cocoaNSWindow;
     static wxCocoaNSWindowHash sm_cocoaHash;
 protected:
     void SetNSWindow(WX_NSWindow cocoaNSWindow);
     WX_NSWindow m_cocoaNSWindow;
     static wxCocoaNSWindowHash sm_cocoaHash;

+    virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);
+    static unsigned int NSWindowStyleForWxStyle(long style);

 
 

+    static wxTopLevelWindowCocoa *sm_cocoaDeactivateWindow;

 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:
 // ------------------------------------------------------------------------
 // Implementation
 // ------------------------------------------------------------------------
 public:

+    virtual bool Destroy();

     // Pure virtuals
     virtual void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;
     // Pure virtuals
     virtual void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;


@@ -83,6 +94,7 @@ public:
     virtual bool Show( bool show = true );
     virtual bool Close( bool force = false );
     virtual void OnCloseWindow(wxCloseEvent& event);
     virtual bool Show( bool show = true );
     virtual bool Close( bool force = false );
     virtual void OnCloseWindow(wxCloseEvent& event);

+    virtual void CocoaSetWxWindowSize(int width, int height);

     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetPosition(int *x, int *y) const;
     virtual void DoMoveWindow(int x, int y, int width, int height);
     virtual void DoGetSize(int *width, int *height) const;
     virtual void DoGetPosition(int *x, int *y) const;