X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a85245b1c2c2b3f49658b2b49f3cbfc5ff9efdd4..819a3b6ff9b43ef31413d0a0541c961e09f81e98:/src/mac/carbon/frame.cpp

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 8bc1e3bdc9..d414c78a6b 100644
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        frame.cpp
+// Name:        src/mac/carbon/frame.cpp
 // Purpose:     wxFrame
 // Author:      Stefan Csomor
 // Modified by:
@@ -9,26 +9,24 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "frame.h"
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/frame.h"
-#include "wx/statusbr.h"
-#include "wx/toolbar.h"
-#include "wx/menuitem.h"
-#include "wx/menu.h"
-#include "wx/dcclient.h"
-#include "wx/dialog.h"
-#include "wx/settings.h"
-#include "wx/app.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/dcclient.h"
+    #include "wx/menu.h"
+    #include "wx/dialog.h"
+    #include "wx/settings.h"
+    #include "wx/toolbar.h"
+    #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
+#endif // WX_PRECOMP
 
 #include "wx/mac/uma.h"
 
 extern wxWindowList wxModelessWindows;
-extern wxList wxPendingDelete;
 
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
   EVT_ACTIVATE(wxFrame::OnActivate)
@@ -41,25 +39,14 @@ END_EVENT_TABLE()
 IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)
 
 #define WX_MAC_STATUSBAR_HEIGHT 18
+
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 void wxFrame::Init()
 {
-    m_frameMenuBar = NULL;
-
-#if wxUSE_TOOLBAR
-    m_frameToolBar = NULL ;
-#endif
-    m_frameStatusBar = NULL;
-    m_winLastFocused = NULL ;
-
-    m_iconized = false;
-
-#if wxUSE_TOOLTIPS
-    m_hwndToolTip = 0;
-#endif
+    m_winLastFocused = NULL;
 }
 
 bool wxFrame::Create(wxWindow *parent,
@@ -89,14 +76,14 @@ wxFrame::~wxFrame()
 wxPoint wxFrame::GetClientAreaOrigin() const
 {
     wxPoint pt = wxTopLevelWindow::GetClientAreaOrigin();
-    
+
 #if wxUSE_TOOLBAR && !defined(__WXUNIVERSAL__)
     wxToolBar *toolbar = GetToolBar();
     if ( toolbar && toolbar->IsShown() )
     {
         int w, h;
         toolbar->GetSize(&w, &h);
-        
+
         if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
         {
             pt.x += w;
@@ -108,8 +95,8 @@ wxPoint wxFrame::GetClientAreaOrigin() const
 #endif
         }
     }
-#endif // wxUSE_TOOLBAR
-    
+#endif
+
     return pt;
 }
 
@@ -120,7 +107,7 @@ bool wxFrame::Enable(bool enable)
 
     if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
     {
-         int iMaxMenu = m_frameMenuBar->GetMenuCount();
+        int iMaxMenu = m_frameMenuBar->GetMenuCount();
         for ( int i = 0 ; i < iMaxMenu ; ++ i )
         {
             m_frameMenuBar->EnableTop( i , enable ) ;
@@ -133,12 +120,12 @@ bool wxFrame::Enable(bool enable)
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name)
 {
-    wxStatusBar *statusBar = NULL;
+    wxStatusBar *statusBar;
 
-    statusBar = new wxStatusBar(this, id,
-        style, name);
-    statusBar->SetSize( 100 , WX_MAC_STATUSBAR_HEIGHT ) ;
+    statusBar = new wxStatusBar(this, id, style, name);
+    statusBar->SetSize(100, WX_MAC_STATUSBAR_HEIGHT);
     statusBar->SetFieldsCount(number);
+
     return statusBar;
 }
 
@@ -164,6 +151,7 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
     if ( m_frameStatusBar )
     {
         wxSysColourChangedEvent event2;
+
         event2.SetEventObject( m_frameStatusBar );
         m_frameStatusBar->ProcessEvent(event2);
     }
@@ -172,7 +160,6 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
     wxWindow::OnSysColourChanged(event);
 }
 
-
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
 void wxFrame::OnActivate(wxActivateEvent& event)
@@ -189,9 +176,7 @@ void wxFrame::OnActivate(wxActivateEvent& event)
             if ( win->IsTopLevel() )
             {
                 if ( win != this )
-                {
                     m_winLastFocused = NULL;
-                }
 
                 break;
             }
@@ -204,58 +189,70 @@ void wxFrame::OnActivate(wxActivateEvent& event)
     else
     {
         // restore focus to the child which was last focused
-        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
-                                            : NULL;
-        if ( !parent )
-        {
+        wxWindow *parent = m_winLastFocused
+            ? m_winLastFocused->GetParent()
+            : NULL;
+
+        if (parent == NULL)
             parent = this;
-        }
 
         wxSetFocusToChild(parent, &m_winLastFocused);
 
-        if ( m_frameMenuBar != NULL )
+        if (m_frameMenuBar != NULL)
         {
-            m_frameMenuBar->MacInstallMenuBar() ;
+            m_frameMenuBar->MacInstallMenuBar();
         }
-        else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)))
+        else
         {
-            // Trying toplevel frame menbar
-            if( ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar() )
-                ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
-         }
+            wxFrame *tlf = wxDynamicCast( wxTheApp->GetTopWindow(), wxFrame );
+            if (tlf != NULL)
+            {
+                // Trying top-level frame membar
+                if (tlf->GetMenuBar())
+                    tlf->GetMenuBar()->MacInstallMenuBar();
+            }
+        }
     }
 }
 
 void wxFrame::DetachMenuBar()
 {
     if ( m_frameMenuBar )
-    {
         m_frameMenuBar->UnsetInvokingWindow();
-    }
 
     wxFrameBase::DetachMenuBar();
 }
 
 void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
 {
-    wxFrameBase::AttachMenuBar(menuBar);
+    wxFrame* tlf = wxDynamicCast( wxFindWinFromMacWindow( FrontNonFloatingWindow() ) , wxFrame );
+    bool makeCurrent = false;
+
+    // if this is already the current menubar or we are the frontmost window
+    if ( (tlf == this) || (m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar()) )
+        makeCurrent = true;
+    // or there is an app-level menubar like MDI
+    else if ( tlf && (tlf->GetMenuBar() == NULL) && (((wxFrame*)wxTheApp->GetTopWindow()) == this) )
+        makeCurrent = true;
+
+    wxFrameBase::AttachMenuBar( menuBar );
 
     if (m_frameMenuBar)
     {
         m_frameMenuBar->SetInvokingWindow( this );
+        if (makeCurrent)
+            m_frameMenuBar->MacInstallMenuBar();
     }
 }
 
 void wxFrame::DoGetClientSize(int *x, int *y) const
 {
-    wxTopLevelWindow::DoGetClientSize( x , y ) ;
+    wxTopLevelWindow::DoGetClientSize( x , y );
 
 #if wxUSE_STATUSBAR
     if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
-    {
         *y -= WX_MAC_STATUSBAR_HEIGHT;
-    }
-#endif // wxUSE_STATUSBAR
+#endif
 
 #if wxUSE_TOOLBAR
     wxToolBar *toolbar = GetToolBar();
@@ -266,16 +263,18 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
 
         if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
         {
-            if ( x )  *x -= w;
+            if ( x )
+                *x -= w;
         }
         else
         {
 #if !wxMAC_USE_NATIVE_TOOLBAR
-            if ( y )  *y -= h;
+            if ( y )
+                *y -= h;
 #endif
         }
     }
-#endif // wxUSE_TOOLBAR
+#endif
 }
 
 bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const
@@ -283,12 +282,12 @@ bool wxFrame::MacIsChildOfClientArea( const wxWindow* child ) const
 #if wxUSE_STATUSBAR
     if ( child == GetStatusBar() )
         return false ;
-#endif // wxUSE_STATUSBAR
+#endif
 
 #if wxUSE_TOOLBAR
     if ( child == GetToolBar() )
         return false ;
-#endif // wxUSE_TOOLBAR
+#endif
 
     return wxFrameBase::MacIsChildOfClientArea( child ) ;
 }
@@ -307,27 +306,25 @@ void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
 
     // find the current client size
 
-  // Find the difference between the entire window (title bar and all)
-  // and the client area; add this to the new client size to move the
-  // window
-
+    // Find the difference between the entire window (title bar and all) and
+    // the client area; add this to the new client size to move the window
     DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
         currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;
 }
 
-
 #if wxUSE_TOOLBAR
 void wxFrame::SetToolBar(wxToolBar *toolbar)
 {
     if ( m_frameToolBar == toolbar )
         return ;
-    
+
 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( m_frameToolBar )
-        m_frameToolBar->MacInstallNativeToolbar(false) ;
+        m_frameToolBar->MacInstallNativeToolbar( false ) ;
 #endif
-    
+
     m_frameToolBar = toolbar ;
+
 #if wxMAC_USE_NATIVE_TOOLBAR
     if ( toolbar )
         toolbar->MacInstallNativeToolbar( true ) ;
@@ -337,9 +334,7 @@ void wxFrame::SetToolBar(wxToolBar *toolbar)
 wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)
 {
     if ( wxFrameBase::CreateToolBar(style, id, name) )
-    {
         PositionToolBar();
-    }
 
     return m_frameToolBar;
 }
@@ -349,20 +344,25 @@ void wxFrame::PositionToolBar()
     int cw, ch;
 
     GetSize( &cw , &ch ) ;
+            
+    int statusX = 0 ;
+    int statusY = 0 ;
 
-    if ( GetStatusBar() && GetStatusBar()->IsShown())
+#if wxUSE_STATUSBAR
+    if (GetStatusBar() && GetStatusBar()->IsShown())
     {
-      int statusX, statusY;
-      GetStatusBar()->GetClientSize(&statusX, &statusY);
-      ch -= statusY;
+        GetStatusBar()->GetClientSize(&statusX, &statusY);
+        ch -= statusY;
     }
+#endif
 
+#if wxUSE_TOOLBAR
     if (GetToolBar())
     {
         int tx, ty, tw, th;
-        tx = ty = 0 ;
 
-        GetToolBar()->GetSize(& tw, & th);
+        tx = ty = 0 ;
+        GetToolBar()->GetSize(&tw, &th);
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
@@ -370,6 +370,15 @@ void wxFrame::PositionToolBar()
             // have the original client size.
             GetToolBar()->SetSize(tx , ty , tw, ch , wxSIZE_NO_ADJUSTMENTS );
         }
+        else if (GetToolBar()->GetWindowStyleFlag() & wxTB_BOTTOM)
+        {
+            //FIXME: this positions the tool bar almost correctly, but still it doesn't work right yet,
+            //as 1) the space for the 'old' top toolbar is still taken up, and 2) the toolbar
+            //doesn't extend it's width to the width of the frame.
+            tx = 0;
+            ty = ch - (th + statusY);
+            GetToolBar()->SetSize(tx, ty, cw, th, wxSIZE_NO_ADJUSTMENTS );
+        }
         else
         {
 #if !wxMAC_USE_NATIVE_TOOLBAR
@@ -378,5 +387,17 @@ void wxFrame::PositionToolBar()
 #endif
         }
     }
+#endif
+}
+
+void wxFrame::PositionBars()
+{
+#if wxUSE_STATUSBAR
+    PositionStatusBar();
+#endif
+#if wxUSE_TOOLBAR
+    PositionToolBar();
+#endif
 }
+
 #endif