fixed maximization handling

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

diff --git a/src/mac/frame.cpp b/src/mac/frame.cpp
index 2a4ee0b9689f259274e136a115da0e1f11206e7a..f9f0d2bec6c18873146f7bd5bccfb9f0d39aed8d 100644 (file)
--- a/src/mac/frame.cpp
+++ b/src/mac/frame.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        frame.cpp

-// Purpose:     wxFrame
+// Purpose:     wxFrameMac

 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98
 // Author:      AUTHOR
 // Modified by:
 // Created:     ??/??/98


@@ -14,7 +14,7 @@
 #endif
 
 #include "wx/frame.h"
 #endif
 
 #include "wx/frame.h"

-#include "wx/mac/statusbr.h"
+#include "wx/statusbr.h"

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


@@ -25,26 +25,28 @@
 
 #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(wxFrame, wxFrameBase)
-//  EVT_SIZE(wxFrame::OnSize)
-  EVT_ACTIVATE(wxFrame::OnActivate)
- // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
-  EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)
-//  EVT_IDLE(wxFrame::OnIdle)
-//  EVT_CLOSE(wxFrame::OnCloseWindow)
+BEGIN_EVENT_TABLE(wxFrameMac, wxFrameBase)
+  EVT_ACTIVATE(wxFrameMac::OnActivate)
+ // EVT_MENU_HIGHLIGHT_ALL(wxFrameMac::OnMenuHighlight)
+  EVT_SYS_COLOUR_CHANGED(wxFrameMac::OnSysColourChanged)
+//  EVT_IDLE(wxFrameMac::OnIdle)
+//  EVT_CLOSE(wxFrameMac::OnCloseWindow)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrameMac, wxWindow)
+#endif
+#ifndef __WXUNIVERSAL__
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMac)

 #endif
 
 #if wxUSE_NATIVE_STATUSBAR
 #endif
 
 #if wxUSE_NATIVE_STATUSBAR

-bool wxFrame::m_useNativeStatusBar = TRUE;
+bool wxFrameMac::m_useNativeStatusBar = TRUE;

 #else
 #else

-bool wxFrame::m_useNativeStatusBar = FALSE;
+bool wxFrameMac::m_useNativeStatusBar = FALSE;

 #endif
 
 #define WX_MAC_STATUSBAR_HEIGHT 15 
 #endif
 
 #define WX_MAC_STATUSBAR_HEIGHT 15 


@@ -52,8 +54,16 @@ bool wxFrame::m_useNativeStatusBar = FALSE;
 // creation/destruction
 // ----------------------------------------------------------------------------
 
 // creation/destruction
 // ----------------------------------------------------------------------------
 

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

 {
 {

+  m_frameMenuBar = NULL;
+
+#if wxUSE_TOOLBAR
+  m_frameToolBar = NULL ;
+#endif
+  m_frameStatusBar = NULL;
+  m_winLastFocused = NULL ;
+

     m_iconized = FALSE;
 
 #if wxUSE_TOOLTIPS
     m_iconized = FALSE;
 
 #if wxUSE_TOOLTIPS


@@ -61,7 +71,7 @@ void wxFrame::Init()
 #endif
 }
 
 #endif
 }
 

-wxPoint wxFrame::GetClientAreaOrigin() const
+wxPoint wxFrameMac::GetClientAreaOrigin() const

 {
        // on mac we are at position -1,-1 with the control
     wxPoint pt(0, 0);
 {
        // on mac we are at position -1,-1 with the control
     wxPoint pt(0, 0);


@@ -86,7 +96,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const
     return pt;
 }
 
     return pt;
 }
 

-bool wxFrame::Create(wxWindow *parent,
+bool wxFrameMac::Create(wxWindow *parent,

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


@@ -94,24 +104,10 @@ bool wxFrame::Create(wxWindow *parent,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-  m_frameMenuBar = NULL;
-
-#if wxUSE_TOOLBAR
-  m_frameToolBar = NULL ;
-#endif
-  m_frameStatusBar = NULL;
-

   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 
   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);
+    if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
+        return FALSE;

 
   MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
   
 
   MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
   


@@ -122,30 +118,16 @@ bool wxFrame::Create(wxWindow *parent,
   return TRUE;
 }
 
   return TRUE;
 }
 

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

 {
   m_isBeingDeleted = TRUE;
 {
   m_isBeingDeleted = TRUE;

-  wxTopLevelWindows.DeleteObject(this);

 
   DeleteAllBars();
 
 
   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);

 }
 
 
 }
 
 

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

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


@@ -160,41 +142,8 @@ bool wxFrame::Enable(bool enable)
 
     return TRUE;
 }
 
     return TRUE;
 }

-// Equivalent to maximize/restore in Windows
-void wxFrame::Maximize(bool maximize)
-{
-    // TODO
-}
-
-bool wxFrame::IsIconized() const
-{
-    // TODO
-    return FALSE;
-}
-
-void wxFrame::Iconize(bool iconize)
-{
-    // TODO
-}

 
 

-// Is the frame maximized?
-bool wxFrame::IsMaximized(void) const
-{
-    // TODO
-    return FALSE;
-}
-
-void wxFrame::Restore()
-{
-    // TODO
-}
-
-void wxFrame::SetIcon(const wxIcon& icon)
-{
-   wxFrameBase::SetIcon(icon);
-}
-
-wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
+wxStatusBar *wxFrameMac::OnCreateStatusBar(int number, long style, wxWindowID id,

     const wxString& name)
 {
     wxStatusBar *statusBar = NULL;
     const wxString& name)
 {
     wxStatusBar *statusBar = NULL;


@@ -206,7 +155,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     return statusBar;
 }
 
     return statusBar;
 }
 

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

 {
   if (m_frameStatusBar )
   {
 {
   if (m_frameStatusBar )
   {


@@ -221,22 +170,8 @@ void wxFrame::PositionStatusBar()
    }
 }
 
    }
 }
 

-void wxFrame::SetMenuBar(wxMenuBar *menuBar)
-{
-    if (!menuBar)
-    {
-        return;
-    }
-  
-    m_frameMenuBar = NULL;
-    m_frameMenuBar = menuBar;
-    m_frameMenuBar->MacInstallMenuBar() ;
-    m_frameMenuBar->Attach(this);
-}
-
-

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

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

 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();
 {
     SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
     Refresh();


@@ -255,45 +190,57 @@ void wxFrame::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 wxFrame::OnActivate(wxActivateEvent& event)
+void wxFrameMac::OnActivate(wxActivateEvent& event)

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

-        event.Skip();
-        return;
-    }
+       // remember the last focused child if it is our child
+        m_winLastFocused = FindFocus();

 
 

-    for ( wxWindowList::Node *node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        // FIXME all this is totally bogus - we need to do the same as wxPanel,
-        //       but how to do it without duplicating the code?
+        // so we NULL it out if it's a child from some other frame
+        wxWindow *win = m_winLastFocused;
+        while ( win )
+        {
+            if ( win->IsTopLevel() )
+            {
+                if ( win != this )
+                {
+                    m_winLastFocused = NULL;
+                }

 
 

-        // restore focus
-        wxWindow *child = node->GetData();
+                break;
+            }

 
 

-        if ( !child->IsTopLevel()
-#if wxUSE_TOOLBAR
-             && !wxDynamicCast(child, wxToolBar)
-#endif // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
-             && !wxDynamicCast(child, wxStatusBar)
-#endif // wxUSE_STATUSBAR
-           )
-        {
-            child->SetFocus();
-            return;
+            win = win->GetParent();

         }
         }

+
+        event.Skip();

     }
     }

+       else
+       {
+        // restore focus to the child which was last focused
+        wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+                                            : NULL;
+        if ( !parent )
+        {
+            parent = this;
+        }
+
+       wxSetFocusToChild(parent, &m_winLastFocused);
+
+           if ( m_frameMenuBar != NULL )
+           {
+               m_frameMenuBar->MacInstallMenuBar() ;
+           }
+       }

 }
 
 }
 

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

 {
        wxWindow::DoGetClientSize( x , y ) ;
 
 #if wxUSE_STATUSBAR
 {
        wxWindow::DoGetClientSize( x , y ) ;
 
 #if wxUSE_STATUSBAR

-  if ( GetStatusBar() )
+  if ( GetStatusBar() && y )

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


@@ -302,11 +249,13 @@ void wxFrame::DoGetClientSize(int *x, int *y) const
 #endif // wxUSE_STATUSBAR
 
   wxPoint pt(GetClientAreaOrigin());
 #endif // wxUSE_STATUSBAR
 
   wxPoint pt(GetClientAreaOrigin());

-  *y -= pt.y;
-  *x -= pt.x;
+  if ( y )
+    *y -= pt.y;
+  if ( x ) 
+    *x -= pt.x;

 }
 
 }
 

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

 {
        int currentclientwidth , currentclientheight ;
        int currentwidth , currentheight ;
 {
        int currentclientwidth , currentclientheight ;
        int currentwidth , currentheight ;


@@ -326,7 +275,7 @@ void wxFrame::DoSetClientSize(int clientwidth, int clientheight)
 
 
 #if wxUSE_TOOLBAR
 
 
 #if wxUSE_TOOLBAR

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

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


@@ -336,7 +285,7 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam
     return m_frameToolBar;
 }
 
     return m_frameToolBar;
 }
 

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

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