Oops, I left an extra { in there.

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

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index cb45fd5ca53a79e94ca47bb68427e639f48cc0d4..20ca43150a7b209ba4f8268af392759f42b0d0c2 100644 (file)
--- a/include/wx/cocoa/toplevel.h
+++ b/include/wx/cocoa/toplevel.h
@@ -15,13 +15,15 @@
 #include "wx/hashmap.h"
 #include "wx/cocoa/NSWindow.h"
 
 #include "wx/hashmap.h"
 #include "wx/cocoa/NSWindow.h"
 

+class WXDLLEXPORT wxMenuBar;
+

 // ========================================================================
 // wxTopLevelWindowCocoa
 // ========================================================================
 class WXDLLEXPORT wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected wxCocoaNSWindow
 {
 // ========================================================================
 // wxTopLevelWindowCocoa
 // ========================================================================
 class WXDLLEXPORT wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected wxCocoaNSWindow
 {

-    DECLARE_CLASS(wxTopLevelWindowCocoa);

     DECLARE_EVENT_TABLE();
     DECLARE_EVENT_TABLE();

+    DECLARE_NO_COPY_CLASS(wxTopLevelWindowCocoa);

 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------


@@ -60,12 +62,18 @@ protected:
 public:
     inline WX_NSWindow GetNSWindow() { return m_cocoaNSWindow; }
     virtual void Cocoa_close(void);
 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 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() { return NULL; }

 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);

 
 // ------------------------------------------------------------------------
 // Implementation
 
 // ------------------------------------------------------------------------
 // Implementation


@@ -83,6 +91,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;