fixing toolbar support, adding iphone

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

diff --git a/src/osx/carbon/frame.cpp b/src/osx/carbon/frame.cpp
index 87843156b54256d21864a3cbb04770ac1ef5477d..90fd33a3c6b7faeae892dc0cce34303c22ac3252 100644 (file)
--- a/src/osx/carbon/frame.cpp
+++ b/src/osx/carbon/frame.cpp
@@ -78,11 +78,11 @@ wxPoint wxFrame::GetClientAreaOrigin() const
         int w, h;
         toolbar->GetSize(&w, &h);
 
-        if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
+        if ( toolbar->HasFlag(wxTB_LEFT) )
         {
             pt.x += w;
         }
-        else
+        else if ( HasFlag(wxTB_TOP) )
         {
 #if !wxOSX_USE_NATIVE_TOOLBAR
             pt.y += h;
@@ -337,17 +337,20 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
     if ( m_frameToolBar == toolbar )
         return ;
 
+#ifndef __WXOSX_IPHONE__
 #if wxOSX_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )
         m_frameToolBar->MacInstallNativeToolbar( false ) ;
 #endif
-
+#endif
     m_frameToolBar = toolbar ;
 
+#ifndef __WXOSX_IPHONE__
 #if wxOSX_USE_NATIVE_TOOLBAR
     if ( toolbar )
         toolbar->MacInstallNativeToolbar( true ) ;
 #endif
+#endif
 }
 
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
@@ -375,6 +378,12 @@ void wxFrame::PositionToolBar()
     }
 #endif
 
+#ifdef __WXOSX_IPHONE__
+    // TODO integrate this in a better way, on iphone the status bar is not a child of the content view
+    // but the toolbar is
+    ch -= 20;
+#endif
+
     if (GetToolBar())
     {
         int tx, ty, tw, th;