Add some missing commas. Fixes #11443

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

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index cb45fd5ca53a79e94ca47bb68427e639f48cc0d4..0e850d63434f8f3c303d375129604a4a1d5a92de 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,18 +15,22 @@
 #include "wx/hashmap.h"
 #include "wx/cocoa/NSWindow.h"
 
 #include "wx/hashmap.h"
 #include "wx/cocoa/NSWindow.h"
 

+class WXDLLIMPEXP_FWD_CORE wxMenuBar;
+

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

-class WXDLLEXPORT wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected wxCocoaNSWindow
+class WXDLLIMPEXP_CORE wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected wxCocoaNSWindow

 {
 {

-    DECLARE_CLASS(wxTopLevelWindowCocoa);

     DECLARE_EVENT_TABLE();
     DECLARE_EVENT_TABLE();

+    DECLARE_NO_COPY_CLASS(wxTopLevelWindowCocoa);

 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 public:
 // ------------------------------------------------------------------------
 // initialization
 // ------------------------------------------------------------------------
 public:

-    inline wxTopLevelWindowCocoa() { Init(); }
+    inline wxTopLevelWindowCocoa()
+    :   wxCocoaNSWindow(this)
+    {   Init(); }

 
     inline wxTopLevelWindowCocoa(wxWindow *parent,
                         wxWindowID winid,
 
     inline wxTopLevelWindowCocoa(wxWindow *parent,
                         wxWindowID winid,


@@ -35,6 +39,7 @@ public:
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
                         const wxString& name = wxFrameNameStr)
                         const wxSize& size = wxDefaultSize,
                         long style = wxDEFAULT_FRAME_STYLE,
                         const wxString& name = wxFrameNameStr)

+    :   wxCocoaNSWindow(this)

     {
         Init();
         Create(parent, winid, title, pos, size, style, name);
     {
         Init();
         Create(parent, winid, title, pos, size, style, name);


@@ -59,18 +64,30 @@ 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 void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem sender);
+    virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem sender);
+    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 NSRect MakeInitialNSWindowContentRect(const wxPoint& pos, const wxSize& size, unsigned int cocoaStyleMask);

 
 

+    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,18 +100,21 @@ 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;

+    virtual void SetTitle( const wxString& title);
+    virtual wxString GetTitle() const;

 
 

+    // Default button (item)
+    wxWindow *SetDefaultItem(wxWindow *win);

 
 // Things I may/may not do
 
 // Things I may/may not do

-//    virtual void SetIcon(const wxIcon& icon);
-//    virtual void SetIcons(const wxIconBundle& icons) { SetIcon( icons.GetIcon( -1 ) ); }
+//    virtual void SetIcons(const wxIconBundle& icons);

 //    virtual void Clear() ;
 //    virtual void Raise();
 //    virtual void Lower();
 //    virtual void Clear() ;
 //    virtual void Raise();
 //    virtual void Lower();

-//    virtual void SetTitle( const wxString& title);

 protected:
     // is the frame currently iconized?
     bool m_iconized;
 protected:
     // is the frame currently iconized?
     bool m_iconized;


@@ -106,6 +126,6 @@ protected:
 };
 
 // list of all frames and modeless dialogs
 };
 
 // list of all frames and modeless dialogs

-extern WXDLLEXPORT_DATA(wxWindowList) wxModelessWindows;
+extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows;

 
 #endif // __WX_COCOA_TOPLEVEL_H__
 
 #endif // __WX_COCOA_TOPLEVEL_H__