set eol-style

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

diff --git a/include/wx/cocoa/toplevel.h b/include/wx/cocoa/toplevel.h
index 821d77d462bdb9aaaaf11a225bcf9959e7f0956b..4a4780e9b65c297173210df0d082a80e085cf3d6 100644 (file)
--- a/include/wx/cocoa/toplevel.h
+++ b/include/wx/cocoa/toplevel.h
@@ -15,7 +15,7 @@
 #include "wx/hashmap.h"
 #include "wx/cocoa/NSWindow.h"
 
 #include "wx/hashmap.h"
 #include "wx/cocoa/NSWindow.h"
 

-class WXDLLEXPORT wxMenuBar;
+class WXDLLIMPEXP_FWD_CORE wxMenuBar;

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


@@ -28,7 +28,9 @@ class WXDLLEXPORT wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected
 // initialization
 // ------------------------------------------------------------------------
 public:
 // initialization
 // ------------------------------------------------------------------------
 public:

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

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


@@ -37,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);


@@ -100,15 +103,17 @@ public:
     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;