avoid a bug in Carbon headers

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

diff --git a/include/wx/univ/frame.h b/include/wx/univ/frame.h
index 6e9b24f1d5112130306a71b586a1014b888caa11..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
 


@@ -53,12 +53,22 @@ public:
                                          const wxString& name = wxStatusLineNameStr);
 #endif // wxUSE_STATUSBAR
 
                                          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

 
 

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