* Clean up the includes and use wxprec.h

* Wrap toolbar related code in wxUSE_TOOLBAR
* m_frameToolBar was used where m_frameStatusBar should have been.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/frame.mm b/src/cocoa/frame.mm
index 4f3d12062faf5b22c873faca9ca3e7f52e2ecedc..d4b5fbfa8387d24585dddf996e47557f3fb0647b 100644 (file)
--- a/src/cocoa/frame.mm
+++ b/src/cocoa/frame.mm
@@ -9,13 +9,17 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/frame.h"
-#include "wx/menu.h"
+#include "wx/wxprec.h"
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/frame.h"
+    #include "wx/menu.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+#endif // WX_PRECOMP
+

 #include "wx/menuitem.h"
 #include "wx/menuitem.h"

-#include "wx/app.h"
-#include "wx/log.h"
-#include "wx/statusbr.h"
-#include "wx/toolbar.h"

 
 #include "wx/cocoa/autorelease.h"
 
 
 #include "wx/cocoa/autorelease.h"
 


@@ -95,8 +99,10 @@ void wxFrame::CocoaSetWxWindowSize(int width, int height)
 {
     if(m_frameStatusBar)
         height += m_frameStatusBar->GetSize().y;
 {
     if(m_frameStatusBar)
         height += m_frameStatusBar->GetSize().y;

+#if wxUSE_TOOLBAR

     if(m_frameToolBar)
         height += m_frameToolBar->GetSize().y;
     if(m_frameToolBar)
         height += m_frameToolBar->GetSize().y;

+#endif //wxUSE_TOOLBAR

     wxTopLevelWindow::CocoaSetWxWindowSize(width,height);
 }
 
     wxTopLevelWindow::CocoaSetWxWindowSize(width,height);
 }
 


@@ -121,6 +127,7 @@ void wxFrame::UpdateFrameNSView()
     }
     NSRect frameRect = [m_frameNSView frame];
     float tbarheight = 0.0;
     }
     NSRect frameRect = [m_frameNSView frame];
     float tbarheight = 0.0;

+#if wxUSE_TOOLBAR

     if(m_frameToolBar)
     {
         NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview();
     if(m_frameToolBar)
     {
         NSView *tbarNSView = m_frameToolBar->GetNSViewForSuperview();


@@ -135,6 +142,7 @@ void wxFrame::UpdateFrameNSView()
         [tbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMinYMargin];
         tbarheight = tbarRect.size.height;
     }
         [tbarNSView setAutoresizingMask: NSViewWidthSizable|NSViewMinYMargin];
         tbarheight = tbarRect.size.height;
     }

+#endif //wxUSE_TOOLBAR

     float sbarheight = 0.0;
     if(m_frameStatusBar)
     {
     float sbarheight = 0.0;
     if(m_frameStatusBar)
     {


@@ -170,7 +178,7 @@ void wxFrame::SetStatusBar(wxStatusBar *statusbar)
         [m_frameStatusBar->GetNSViewForSuperview() removeFromSuperview];
         [m_frameStatusBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
         if(m_frameStatusBar->GetParent())
         [m_frameStatusBar->GetNSViewForSuperview() removeFromSuperview];
         [m_frameStatusBar->GetNSViewForSuperview() setAutoresizingMask: NSViewMinYMargin];
         if(m_frameStatusBar->GetParent())

-            m_frameStatusBar->GetParent()->CocoaAddChild(m_frameToolBar);
+            m_frameStatusBar->GetParent()->CocoaAddChild(m_frameStatusBar);

     }
     m_frameStatusBar = statusbar;
     if(m_frameStatusBar)
     }
     m_frameStatusBar = statusbar;
     if(m_frameStatusBar)


@@ -194,6 +202,7 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
     return m_frameStatusBar;
 }
 
     return m_frameStatusBar;
 }
 

+#if wxUSE_TOOLBAR

 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
     if(m_frameToolBar)
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
     if(m_frameToolBar)


@@ -223,6 +232,7 @@ wxToolBar* wxFrame::CreateToolBar(long style,
     UpdateFrameNSView();
     return m_frameToolBar;
 }
     UpdateFrameNSView();
     return m_frameToolBar;
 }

+#endif // wxUSE_TOOLBAR

 
 void wxFrame::PositionStatusBar()
 {
 
 void wxFrame::PositionStatusBar()
 {