don't include headers not needed when wxUSE_GUI == 0

[wxWidgets.git] / src / mac / carbon / frame.cpp

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index fb3d2fee9f79b875a906301a1dff3005d2dabec2..ac1391d4de21a1d35396a719306b8bbc7a0ea142 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp

-// Purpose:     wxFrameMac
-// Author:      AUTHOR
+// Purpose:     wxFrame
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
+// Copyright:   (c) Stefan Csomor

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -23,81 +23,46 @@
 #include "wx/settings.h"
 #include "wx/app.h"
 
 #include "wx/settings.h"
 #include "wx/app.h"
 

-#include <wx/mac/uma.h>
+#include "wx/mac/uma.h"

 
 

-extern wxList wxModelessWindows;
+extern wxWindowList wxModelessWindows;

 extern wxList wxPendingDelete;
 
 #if !USE_SHARED_LIBRARY
 extern wxList wxPendingDelete;
 
 #if !USE_SHARED_LIBRARY

-BEGIN_EVENT_TABLE(wxFrameMac, wxFrameBase)
-//  EVT_SIZE(wxFrameMac::OnSize)
-  EVT_ACTIVATE(wxFrameMac::OnActivate)
- // EVT_MENU_HIGHLIGHT_ALL(wxFrameMac::OnMenuHighlight)
-  EVT_SYS_COLOUR_CHANGED(wxFrameMac::OnSysColourChanged)
-//  EVT_IDLE(wxFrameMac::OnIdle)
-//  EVT_CLOSE(wxFrameMac::OnCloseWindow)
+BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
+  EVT_ACTIVATE(wxFrame::OnActivate)
+ // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
+  EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
+//  EVT_IDLE(wxFrame::OnIdle)
+//  EVT_CLOSE(wxFrame::OnCloseWindow)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrameMac, wxWindow)
-#endif
-#ifndef __WXUNIVERSAL__
-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMac)
-#endif
-
-#if wxUSE_NATIVE_STATUSBAR
-bool wxFrameMac::m_useNativeStatusBar = TRUE;
-#else
-bool wxFrameMac::m_useNativeStatusBar = FALSE;
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 #endif
 
 #endif
 

-#define WX_MAC_STATUSBAR_HEIGHT 15 
+#define WX_MAC_STATUSBAR_HEIGHT 18 

 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // creation/destruction
 // ----------------------------------------------------------------------------
 

-void wxFrameMac::Init()
+void wxFrame::Init()

 {
 {

-  m_frameMenuBar = NULL;
-
+    m_frameMenuBar = NULL;
+    

 #if wxUSE_TOOLBAR
 #if wxUSE_TOOLBAR

-  m_frameToolBar = NULL ;
+    m_frameToolBar = NULL ;

 #endif
 #endif

-  m_frameStatusBar = NULL;
-  m_winLastFocused = NULL ;
-
+    m_frameStatusBar = NULL;
+    m_winLastFocused = NULL ;
+    

     m_iconized = FALSE;
     m_iconized = FALSE;

-
+    

 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
 }
 
 #if wxUSE_TOOLTIPS
     m_hwndToolTip = 0;
 #endif
 }
 

-wxPoint wxFrameMac::GetClientAreaOrigin() const
-{
-       // on mac we are at position -1,-1 with the control
-    wxPoint pt(0, 0);
-
-#if wxUSE_TOOLBAR
-    if ( GetToolBar() )
-    {
-        int w, h;
-        GetToolBar()->GetSize(& w, & h);
-
-        if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL )
-        {
-            pt.x += w - 1;
-        }
-        else
-        {
-            pt.y += h - 1 ;
-        }
-    }
-#endif // wxUSE_TOOLBAR
-
-    return pt;
-}
-
-bool wxFrameMac::Create(wxWindow *parent,
+bool wxFrame::Create(wxWindow *parent,

            wxWindowID id,
            const wxString& title,
            const wxPoint& pos,
            wxWindowID id,
            const wxString& title,
            const wxPoint& pos,


@@ -105,143 +70,68 @@ bool wxFrameMac::Create(wxWindow *parent,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-  SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
-
-  if ( id > -1 )
-    m_windowId = id;
-  else
-    m_windowId = (int)NewControlId();
-
-  if (parent) parent->AddChild(this);
-
-  if (!parent)
-    wxTopLevelWindows.Append(this);
-
-  MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
-  
-       m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
-
-  wxModelessWindows.Append(this);
-
-  return TRUE;
+    
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return FALSE;
+    
+    wxModelessWindows.Append(this);
+    
+    return TRUE;

 }
 
 }
 

-wxFrameMac::~wxFrameMac()
+wxFrame::~wxFrame()

 {
 {

-  m_isBeingDeleted = TRUE;
-  wxTopLevelWindows.DeleteObject(this);
-
-  DeleteAllBars();
-
-/* Check if it's the last top-level window */
-
-  if (wxTheApp && (wxTopLevelWindows.Number() == 0))
-  {
-    wxTheApp->SetTopWindow(NULL);
-
-    if (wxTheApp->GetExitOnFrameDelete())
-    {
-       wxTheApp->ExitMainLoop() ;
-    }
-  }
-
-  wxModelessWindows.DeleteObject(this);
+    m_isBeingDeleted = TRUE;
+    DeleteAllBars();

 }
 
 
 }
 
 

-bool wxFrameMac::Enable(bool enable)
+bool wxFrame::Enable(bool enable)

 {
     if ( !wxWindow::Enable(enable) )
         return FALSE;
 
 {
     if ( !wxWindow::Enable(enable) )
         return FALSE;
 

-       if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
-       {
-               for ( int i = 0 ; i < m_frameMenuBar->GetMenuCount() ; ++ i )
-               {
-                       m_frameMenuBar->EnableTop( i , enable ) ;
-               }
-       }
+    if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
+    {
+         int iMaxMenu = m_frameMenuBar->GetMenuCount(); 
+        for ( int i = 0 ; i < iMaxMenu ; ++ i )
+        {
+            m_frameMenuBar->EnableTop( i , enable ) ;
+        }
+    }

 
     return TRUE;
 }
 
     return TRUE;
 }

-// Equivalent to maximize/restore in Windows
-void wxFrameMac::Maximize(bool maximize)
-{
-    // TODO
-}
-
-bool wxFrameMac::IsIconized() const
-{
-    // TODO
-    return FALSE;
-}
-
-void wxFrameMac::Iconize(bool iconize)
-{
-    // TODO
-}
-
-// Is the frame maximized?
-bool wxFrameMac::IsMaximized(void) const
-{
-    // TODO
-    return FALSE;
-}
-
-void wxFrameMac::Restore()
-{
-    // TODO
-}
-
-void wxFrameMac::SetIcon(const wxIcon& icon)
-{
-   wxFrameBase::SetIcon(icon);
-}

 
 

-wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id,
+wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,

     const wxString& name)
 {
     wxStatusBar *statusBar = NULL;
 
     statusBar = new wxStatusBar(this, id,
         style, name);
     const wxString& name)
 {
     wxStatusBar *statusBar = NULL;
 
     statusBar = new wxStatusBar(this, id,
         style, name);

-       statusBar->SetSize( 100 , 15 ) ;
+    statusBar->SetSize( 100 , WX_MAC_STATUSBAR_HEIGHT ) ;

     statusBar->SetFieldsCount(number);
     return statusBar;
 }
 
     statusBar->SetFieldsCount(number);
     return statusBar;
 }
 

-void wxFrameMac::PositionStatusBar()
-{
-  if (m_frameStatusBar )
-  {
-    int w, h;
-    GetClientSize(&w, &h);
-    int sw, sh;
-    m_frameStatusBar->GetSize(&sw, &sh);
-
-    // Since we wish the status bar to be directly under the client area,
-    // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
-    m_frameStatusBar->SetSize(0, h, w, sh);
-   }
-}
-
-void wxFrameMac::SetMenuBar(wxMenuBar *menuBar)
+void wxFrame::PositionStatusBar()

 {
 {

-    if (!menuBar)
+    if (m_frameStatusBar && m_frameStatusBar->IsShown() )

     {
     {

-        return;
+        int w, h;
+        GetClientSize(&w, &h);
+        
+        // Since we wish the status bar to be directly under the client area,
+        // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS.
+        m_frameStatusBar->SetSize(0, h, w, WX_MAC_STATUSBAR_HEIGHT);

     }
     }

-  
-    m_frameMenuBar = menuBar;
-//    m_frameMenuBar->MacInstallMenuBar() ;
-    m_frameMenuBar->Attach((wxFrame *)this);

 }
 
 }
 

-

 // Responds to colour changes, and passes event on to children.
 // Responds to colour changes, and passes event on to children.

-void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event)
+void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)

 {
 {

-    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+    SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

     Refresh();
 
     if ( m_frameStatusBar )
     Refresh();
 
     if ( m_frameStatusBar )


@@ -258,99 +148,132 @@ void wxFrameMac::OnSysColourChanged(wxSysColourChangedEvent& event)
 
 // Default activation behaviour - set the focus for the first child
 // subwindow found.
 
 // Default activation behaviour - set the focus for the first child
 // subwindow found.

-void wxFrameMac::OnActivate(wxActivateEvent& event)
+void wxFrame::OnActivate(wxActivateEvent& event)

 {
     if ( !event.GetActive() )
     {
 {
     if ( !event.GetActive() )
     {

-       // remember the last focused child
+       // remember the last focused child if it is our child

         m_winLastFocused = FindFocus();
         m_winLastFocused = FindFocus();

-        while ( m_winLastFocused )
+
+        // so we NULL it out if it's a child from some other frame
+        wxWindow *win = m_winLastFocused;
+        while ( win )

         {
         {

-            if ( GetChildren().Find(m_winLastFocused) )
+            if ( win->IsTopLevel() )
+            {
+                if ( win != this )
+                {
+                    m_winLastFocused = NULL;
+                }
+

                 break;
                 break;

+            }

 
 

-            m_winLastFocused = m_winLastFocused->GetParent();
+            win = win->GetParent();

         }
 
         event.Skip();
     }
         }
 
         event.Skip();
     }

-       else
-       {
-/*
-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
+    else

     {
     {

-        // FIXME all this is totally bogus - we need to do the same as wxPanel,
-        //       but how to do it without duplicating the code?
+        // restore focus to the child which was last focused
+        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+                                            : NULL;
+        if ( !parent )
+        {
+            parent = this;
+        }

 
 

-        // restore focus
-        wxWindow *child = node->GetData();
+        wxSetFocusToChild(parent, &m_winLastFocused);

 
 

-        if ( !child->IsTopLevel() && child->AcceptsFocus()
-#if wxUSE_TOOLBAR
-             && !wxDynamicCast(child, wxToolBar)
-#endif // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
-             && !wxDynamicCast(child, wxStatusBar)
-#endif // wxUSE_STATUSBAR
-           )
+        if ( m_frameMenuBar != NULL )

         {
         {

-            child->SetFocus();
-            break;
+            m_frameMenuBar->MacInstallMenuBar() ;

         }
         }

+        else if (wxTheApp->GetTopWindow() && wxTheApp->GetTopWindow()->IsKindOf(CLASSINFO(wxFrame)))
+        {
+            // Trying toplevel frame menbar
+            if( ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar() )
+                ((wxFrame*)wxTheApp->GetTopWindow())->GetMenuBar()->MacInstallMenuBar();
+         }

     }
     }

-   */
-       wxSetFocusToChild(this, &m_winLastFocused);
-
-           if ( m_frameMenuBar != NULL )
-           {
-               m_frameMenuBar->MacInstallMenuBar() ;
-           }
-       }

 }
 
 }
 

-void wxFrameMac::DoGetClientSize(int *x, int *y) const
+void wxFrame::DetachMenuBar()

 {
 {

-       wxWindow::DoGetClientSize( x , y ) ;
+    if ( m_frameMenuBar )
+    {
+        m_frameMenuBar->UnsetInvokingWindow();
+    }
+
+    wxFrameBase::DetachMenuBar();
+}
+
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
+{
+    wxFrameBase::AttachMenuBar(menuBar);

 
 

+    if (m_frameMenuBar)
+    {
+        m_frameMenuBar->SetInvokingWindow( this );
+    }
+}
+
+void wxFrame::DoGetClientSize(int *x, int *y) const
+{
+    wxTopLevelWindow::DoGetClientSize( x , y ) ;
+    

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

-  if ( GetStatusBar() && y )
-  {
-    int statusX, statusY;
-    GetStatusBar()->GetClientSize(&statusX, &statusY);
-    *y -= statusY;
-  }
+    if ( GetStatusBar() && GetStatusBar()->IsShown() && y )
+    {
+        if ( y) *y -= WX_MAC_STATUSBAR_HEIGHT;
+    }

 #endif // wxUSE_STATUSBAR
 #endif // wxUSE_STATUSBAR

+    
+#if wxUSE_TOOLBAR
+    wxToolBar *toolbar = GetToolBar();
+    if ( toolbar && toolbar->IsShown() )
+    {
+        int w, h;
+        toolbar->GetSize(&w, &h);

 
 

-  wxPoint pt(GetClientAreaOrigin());
-  if ( y )
-    *y -= pt.y;
-  if ( x ) 
-    *x -= pt.x;
+        if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL )
+        {
+            if ( x )  *x -= w;
+        }
+        else
+        {
+            if ( y )  *y -= h;
+        }
+    }
+#endif // wxUSE_TOOLBAR

 }
 
 }
 

-void wxFrameMac::DoSetClientSize(int clientwidth, int clientheight)
+void wxFrame::DoSetClientSize(int clientwidth, int clientheight)

 {
 {

-       int currentclientwidth , currentclientheight ;
-       int currentwidth , currentheight ;
-       
-       GetClientSize( &currentclientwidth , &currentclientheight ) ;
-       GetSize( &currentwidth , &currentheight ) ;
-       
-       // find the current client size
+    int currentclientwidth , currentclientheight ;
+    int currentwidth , currentheight ;
+    
+    GetClientSize( &currentclientwidth , &currentclientheight ) ;
+    if ( clientwidth == -1 )
+        clientwidth = currentclientwidth ;
+    if ( clientheight == -1 )
+        clientheight = currentclientheight ;
+    GetSize( &currentwidth , &currentheight ) ;
+    
+    // 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 ) ;
+    DoSetSize( -1 , -1 , currentwidth + clientwidth - currentclientwidth ,
+        currentheight + clientheight - currentclientheight , wxSIZE_USE_EXISTING ) ;

 }
 
 
 #if wxUSE_TOOLBAR
 }
 
 
 #if wxUSE_TOOLBAR

-wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString& name)
+wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name)

 {
     if ( wxFrameBase::CreateToolBar(style, id, name) )
     {
 {
     if ( wxFrameBase::CreateToolBar(style, id, name) )
     {


@@ -360,14 +283,13 @@ wxToolBar* wxFrameMac::CreateToolBar(long style, wxWindowID id, const wxString&
     return m_frameToolBar;
 }
 
     return m_frameToolBar;
 }
 

-void wxFrameMac::PositionToolBar()
+void wxFrame::PositionToolBar()

 {
     int cw, ch;
 
 {
     int cw, ch;
 

-       cw = m_width ;
-       ch = m_height ;
+    GetSize( &cw , &ch ) ;

 
 

-    if ( GetStatusBar() )
+    if ( GetStatusBar() && GetStatusBar()->IsShown())

     {
       int statusX, statusY;
       GetStatusBar()->GetClientSize(&statusX, &statusY);
     {
       int statusX, statusY;
       GetStatusBar()->GetClientSize(&statusX, &statusY);


@@ -376,20 +298,21 @@ void wxFrameMac::PositionToolBar()
 
     if (GetToolBar())
     {
 
     if (GetToolBar())
     {

-        int tw, th;
+        int tx, ty, tw, th;
+        tx = ty = 0 ;
+        

         GetToolBar()->GetSize(& tw, & th);
         GetToolBar()->GetSize(& tw, & th);

-

         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
             // means, pretend we don't have toolbar/status bar, so we
             // have the original client size.
         if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL)
         {
             // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS
             // means, pretend we don't have toolbar/status bar, so we
             // have the original client size.

-            GetToolBar()->SetSize(-1, -1, tw, ch + 2 , wxSIZE_NO_ADJUSTMENTS | wxSIZE_ALLOW_MINUS_ONE );
+            GetToolBar()->SetSize(tx , ty , tw, ch , wxSIZE_NO_ADJUSTMENTS );

         }
         else
         {
             // Use the 'real' position
         }
         else
         {
             // Use the 'real' position

-            GetToolBar()->SetSize(-1, -1, cw + 2, th, wxSIZE_NO_ADJUSTMENTS | wxSIZE_ALLOW_MINUS_ONE );
+            GetToolBar()->SetSize(tx , ty , cw , th, wxSIZE_NO_ADJUSTMENTS );

         }
     }
 }
         }
     }
 }