Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index ce38ec90d308da3d288d5c4295ce2bad78f3875b..eaea567261999902f4fb3683147bd9ce9cfe2df4 100644 (file)
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        frame.h
+// Name:        wx/osx/frame.h
 // Purpose:     wxFrame class
 // Author:      Stefan Csomor
 // Modified by:
@@ -12,15 +12,10 @@
 #ifndef _WX_FRAME_H_
 #define _WX_FRAME_H_
 
-#include "wx/window.h"
 #include "wx/toolbar.h"
 #include "wx/accel.h"
 #include "wx/icon.h"
 
-WXDLLIMPEXP_DATA_CORE(extern const char) wxToolBarNameStr[];
-
-class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-class WXDLLIMPEXP_FWD_CORE wxStatusBar;
 class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
 
 class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
@@ -64,7 +59,6 @@ public:
     // event handlers
     void OnActivate(wxActivateEvent& event);
     void OnSysColourChanged(wxSysColourChangedEvent& event);
-    void OnSize(wxSizeEvent& event);
 
     // Toolbar
 #if wxUSE_TOOLBAR
@@ -89,6 +83,8 @@ public:
 
     void PositionBars();
 
+    // internal response to size events
+    virtual void MacOnInternalSize() { PositionBars(); }
 
 protected:
     // common part of all ctors