corrected wxList::Node declarations

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

diff --git a/src/mac/carbon/frame.cpp b/src/mac/carbon/frame.cpp
index 9c06869fcbe0e13c3465fc4a6c83fe18c7a7fc57..7f1860a837a605dfcc91e3e140b98b93ff758e54 100644 (file)
--- a/src/mac/carbon/frame.cpp
+++ b/src/mac/carbon/frame.cpp
@@ -23,14 +23,13 @@
 #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
 BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
 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_ACTIVATE(wxFrame::OnActivate)
  // EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight)
   EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged)


@@ -38,7 +37,7 @@ BEGIN_EVENT_TABLE(wxFrame, wxFrameBase)
 //  EVT_CLOSE(wxFrame::OnCloseWindow)
 END_EVENT_TABLE()
 
 //  EVT_CLOSE(wxFrame::OnCloseWindow)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow)

 #endif
 
 #if wxUSE_NATIVE_STATUSBAR
 #endif
 
 #if wxUSE_NATIVE_STATUSBAR


@@ -54,6 +53,14 @@ bool wxFrame::m_useNativeStatusBar = FALSE;
 
 void wxFrame::Init()
 {
 
 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_iconized = FALSE;
 
 #if wxUSE_TOOLTIPS


@@ -94,28 +101,15 @@ bool wxFrame::Create(wxWindow *parent,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-  m_frameMenuBar = NULL;
+  SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

 
 

-#if wxUSE_TOOLBAR
-  m_frameToolBar = NULL ;
-#endif
-  m_frameStatusBar = NULL;
-
-  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 ) ;
   

-       m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
+       m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
+       SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;

 
   wxModelessWindows.Append(this);
 
 
   wxModelessWindows.Append(this);
 


@@ -125,23 +119,9 @@ bool wxFrame::Create(wxWindow *parent,
 wxFrame::~wxFrame()
 {
   m_isBeingDeleted = TRUE;
 wxFrame::~wxFrame()
 {
   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);

 }
 
 
 }
 
 


@@ -152,7 +132,8 @@ bool wxFrame::Enable(bool enable)
 
        if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
        {
 
        if ( m_frameMenuBar && m_frameMenuBar == wxMenuBar::MacGetInstalledMenuBar() )
        {

-               for ( int i = 0 ; i < m_frameMenuBar->GetMenuCount() ; ++ i )
+               int iMaxMenu = m_frameMenuBar->GetMenuCount(); 
+               for ( int i = 0 ; i < iMaxMenu ; ++ i )

                {
                        m_frameMenuBar->EnableTop( i , enable ) ;
                }
                {
                        m_frameMenuBar->EnableTop( i , enable ) ;
                }


@@ -160,39 +141,6 @@ 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,
     const wxString& name)
 
 wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id,
     const wxString& name)


@@ -221,24 +169,10 @@ 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.
 void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // Responds to colour changes, and passes event on to children.
 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 )


@@ -259,37 +193,70 @@ void wxFrame::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
-           )
+            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 )

         {
         {

-            child->SetFocus();
-            break;
+            parent = this;

         }
         }

+
+       wxSetFocusToChild(parent, &m_winLastFocused);
+
+           if ( m_frameMenuBar != NULL )
+           {
+               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();
+           }
+       }
+}
+
+void wxFrame::DetachMenuBar()
+{
+    if ( m_frameMenuBar )
+    {
+        m_frameMenuBar->UnsetInvokingWindow();

     }
     }

-    
-    if ( m_frameMenuBar != NULL )
+
+    wxFrameBase::DetachMenuBar();
+}
+
+void wxFrame::AttachMenuBar( wxMenuBar *menuBar )
+{
+    wxFrameBase::AttachMenuBar(menuBar);
+
+    if (m_frameMenuBar)

     {
     {

-       m_frameMenuBar->MacInstallMenuBar() ;
+        m_frameMenuBar->SetInvokingWindow( this );

     }
 }
 
     }
 }
 


@@ -298,7 +265,7 @@ void wxFrame::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);


@@ -307,8 +274,10 @@ 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 wxFrame::DoSetClientSize(int clientwidth, int clientheight)