Updated html files, removed old simplify xsl and shell script

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

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index ae5e610a111f1213583f6b33e4ecc617cfb6fb13..7cc666b111d8dd0d4ee1a9a52f4cf2e94747107b 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__


@@ -67,7 +67,10 @@ public:
     virtual void CocoaDelegate_windowDidResignKey(void);
     virtual void CocoaDelegate_windowDidBecomeMain(void);
     virtual void CocoaDelegate_windowDidResignMain(void);
     virtual void CocoaDelegate_windowDidResignKey(void);
     virtual void CocoaDelegate_windowDidBecomeMain(void);
     virtual void CocoaDelegate_windowDidResignMain(void);

+    virtual void CocoaDelegate_wxMenuItemAction(struct objc_object *sender);
+    virtual bool CocoaDelegate_validateMenuItem(struct objc_object *sender);

     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);
     virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win);

+    static void DeactivatePendingWindow();

 protected:
     void SetNSWindow(WX_NSWindow cocoaNSWindow);
     WX_NSWindow m_cocoaNSWindow;
 protected:
     void SetNSWindow(WX_NSWindow cocoaNSWindow);
     WX_NSWindow m_cocoaNSWindow;


@@ -75,10 +78,12 @@ protected:
     virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView);
     static unsigned int NSWindowStyleForWxStyle(long style);
 
     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;