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 4419dea5bd7101208eb0c6730939e02befa446d9..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_
 
 #ifndef _WX_UNIV_FRAME_H_
 #define _WX_UNIV_FRAME_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "univframe.h"
 #endif
 
     #pragma interface "univframe.h"
 #endif
 


@@ -55,17 +55,20 @@ public:
 
 #if wxUSE_TOOLBAR
     // create main toolbar bycalling OnCreateToolBar()
 
 #if wxUSE_TOOLBAR
     // create main toolbar bycalling OnCreateToolBar()

-    virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
+    virtual wxToolBar* CreateToolBar(long style = -1,

                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
 
                                      wxWindowID id = -1,
                                      const wxString& name = wxToolBarNameStr);
     virtual void PositionToolBar();
 #endif // wxUSE_TOOLBAR
 

-protected:
-    void OnSize(wxSizeEvent& event);
+    virtual int GetMinWidth() const;
+    virtual int GetMinHeight() const;

 
     // sends wxSizeEvent to itself (used after attaching xxxBar)
 
     // sends wxSizeEvent to itself (used after attaching xxxBar)

-    void SendSizeEvent();
+    virtual void SendSizeEvent();
+
+protected:
+    void OnSize(wxSizeEvent& event);

 
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);
 
     virtual void DoGetClientSize(int *width, int *height) const;
     virtual void DoSetClientSize(int width, int height);