Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

[wxWidgets.git] / include / wx / univ / frame.h

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index bfb03bf9a47d852ea57e6956fb443f800668cb37..e30d470a491bb30f023b3c9ebfda8983874792dd 100644 (file)
--- a/include/wx/univ/frame.h
+++ b/include/wx/univ/frame.h
@@ -12,7 +12,7 @@
 #ifndef _WX_UNIV_FRAME_H_
 #define _WX_UNIV_FRAME_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "univframe.h"
 #endif
 
@@ -20,7 +20,7 @@
 // wxFrame
 // ----------------------------------------------------------------------------
 
-class wxFrame : public wxFrameBase
+class WXDLLEXPORT wxFrame : public wxFrameBase
 {
 public:
     wxFrame() {}
@@ -34,7 +34,7 @@ public:
     {
         Create(parent, id, title, pos, size, style, name);
     }
-            
+
     bool Create(wxWindow *parent,
                 wxWindowID id,
                 const wxString& title,
@@ -46,6 +46,27 @@ public:
     virtual wxPoint GetClientAreaOrigin() const;
     virtual bool Enable(bool enable = TRUE);
 
+#if wxUSE_STATUSBAR
+    virtual wxStatusBar* CreateStatusBar(int number = 1,
+                                         long style = wxST_SIZEGRIP,
+                                         wxWindowID id = 0,
+                                         const wxString& name = wxStatusLineNameStr);
+#endif // wxUSE_STATUSBAR
+
+#if wxUSE_TOOLBAR
+    // create main toolbar bycalling OnCreateToolBar()
+    virtual wxToolBar* CreateToolBar(long style = -1,
+                                     wxWindowID id = -1,
+                                     const wxString& name = wxToolBarNameStr);
+    virtual void PositionToolBar();
+#endif // wxUSE_TOOLBAR
+
+    virtual int GetMinWidth() const;
+    virtual int GetMinHeight() const;
+
+    // sends wxSizeEvent to itself (used after attaching xxxBar)
+    virtual void SendSizeEvent();
+
 protected:
     void OnSize(wxSizeEvent& event);
 
@@ -55,6 +76,8 @@ protected:
 #if wxUSE_MENUS
     // override to update menu bar position when the frame size changes
     virtual void PositionMenuBar();
+    virtual void DetachMenuBar();
+    virtual void AttachMenuBar(wxMenuBar *menubar);
 #endif // wxUSE_MENUS
 
 #if wxUSE_STATUSBAR