fix Alt-letter navigation with spin controls (bug 672974)

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

diff --git a/src/mac/mdi.cpp b/src/mac/mdi.cpp
index 598f62c3f5470f3921db8c9066b6b183a2ee93d4..1d9e43f170c86a14636671a306d98c522ddd3356 100644 (file)
--- a/src/mac/mdi.cpp
+++ b/src/mac/mdi.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mdi.cpp
 // Purpose:     MDI classes
 /////////////////////////////////////////////////////////////////////////////
 // Name:        mdi.cpp
 // Purpose:     MDI classes

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

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

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

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:       wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -17,7 +17,9 @@
 #include "wx/menu.h"
 #include "wx/settings.h"
 
 #include "wx/menu.h"
 #include "wx/settings.h"
 

-extern wxList wxModelessWindows;
+#include "wx/mac/private.h"
+
+extern wxWindowList wxModelessWindows;

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)


@@ -36,10 +38,29 @@ END_EVENT_TABLE()
 
 #endif
 
 
 #endif
 

+static const int IDM_WINDOWTILE  = 4001;
+static const int IDM_WINDOWTILEHOR  = 4001;
+static const int IDM_WINDOWCASCADE = 4002;
+static const int IDM_WINDOWICONS = 4003;
+static const int IDM_WINDOWNEXT = 4004;
+static const int IDM_WINDOWTILEVERT = 4005;
+static const int IDM_WINDOWPREV = 4006;
+
+// This range gives a maximum of 500 MDI children. Should be enough :-)
+static const int wxFIRST_MDI_CHILD = 4100;
+static const int wxLAST_MDI_CHILD = 4600;
+
+// Status border dimensions
+static const int wxTHICK_LINE_BORDER = 3;
+

 // Parent frame
 
 wxMDIParentFrame::wxMDIParentFrame()
 {
 // Parent frame
 
 wxMDIParentFrame::wxMDIParentFrame()
 {

+    m_clientWindow = NULL;
+    m_currentChild = NULL;
+    m_windowMenu = (wxMenu*) NULL;
+    m_parentFrameActive = TRUE;

 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,


@@ -50,80 +71,121 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
            long style,
            const wxString& name)
 {
            long style,
            const wxString& name)
 {

-    if (!parent)
-        wxTopLevelWindows.Append(this);
-
-    SetName(name);
-    m_windowStyle = style;
-
-    if (parent) parent->AddChild(this);
-
-    if ( id > -1 )
-        m_windowId = id;
-    else
-        m_windowId = (int)NewControlId();
-
-    // TODO: create MDI parent frame
-
-    wxModelessWindows.Append(this);
-
+    m_clientWindow = NULL;
+    m_currentChild = NULL;
+    
+    // this style can be used to prevent a window from having the standard MDI
+    // "Window" menu
+    if ( style & wxFRAME_NO_WINDOW_MENU )
+    {
+        m_windowMenu = (wxMenu *)NULL;
+        style -= wxFRAME_NO_WINDOW_MENU ;
+    }
+    else // normal case: we have the window menu, so construct it
+    {
+        m_windowMenu = new wxMenu;
+        
+        m_windowMenu->Append(IDM_WINDOWCASCADE, wxT("&Cascade"));
+        m_windowMenu->Append(IDM_WINDOWTILEHOR, wxT("Tile &Horizontally"));
+        m_windowMenu->Append(IDM_WINDOWTILEVERT, wxT("Tile &Vertically"));
+        m_windowMenu->AppendSeparator();
+        m_windowMenu->Append(IDM_WINDOWICONS, wxT("&Arrange Icons"));
+        m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
+    }
+    
+    wxFrame::Create( parent , id , title , wxPoint( 2000 , 2000 ) , size , style , name ) ;
+    m_parentFrameActive = TRUE;
+    
+    OnCreateClient();
+    

     return TRUE;
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     return TRUE;
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {

+    DestroyChildren();
+    // already delete by DestroyChildren()
+    m_frameToolBar = NULL;
+    m_frameStatusBar = NULL;
+    m_clientWindow = NULL ;
+    
+    if (m_windowMenu)
+    {
+        delete m_windowMenu;
+        m_windowMenu = (wxMenu*) NULL;
+    }
+    
+    if ( m_clientWindow )
+    {
+        delete m_clientWindow;
+        m_clientWindow = NULL ;
+    }

 }
 
 }
 

+

 // Get size *available for subwindows* i.e. excluding menu bar.
 void wxMDIParentFrame::DoGetClientSize(int *x, int *y) const
 {
 // Get size *available for subwindows* i.e. excluding menu bar.
 void wxMDIParentFrame::DoGetClientSize(int *x, int *y) const
 {

-   wxFrame::DoGetClientSize( x , y ) ;
+    wxDisplaySize( x , y ) ;

 }
 
 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
 }
 
 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {

-       wxFrame::SetMenuBar( menu_bar ) ;
+    wxFrame::SetMenuBar( menu_bar ) ;

 }
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 {
 #if wxUSE_CONSTRAINTS
     if (GetAutoLayout())
 }
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 {
 #if wxUSE_CONSTRAINTS
     if (GetAutoLayout())

-      Layout();
+        Layout();

 #endif
     int x = 0;
     int y = 0;
     int width, height;
     GetClientSize(&width, &height);
 #endif
     int x = 0;
     int y = 0;
     int width, height;
     GetClientSize(&width, &height);

-
+    

     if ( GetClientWindow() )
         GetClientWindow()->SetSize(x, y, width, height);
 }
 
 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
 {
     if ( GetClientWindow() )
         GetClientWindow()->SetSize(x, y, width, height);
 }
 
 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
 {

-       // Do nothing
+    if ( m_currentChild && event.GetActive() )
+    {
+        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_currentChild->GetId());
+        event.SetEventObject( m_currentChild );
+        m_currentChild->GetEventHandler()->ProcessEvent(event) ;
+    }
+    else if ( event.GetActive() )
+    {
+        if ( m_frameMenuBar != NULL )
+        {
+            m_frameMenuBar->MacInstallMenuBar() ;
+        }
+        
+    }

 }
 
 // Returns the active MDI child window
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
 }
 
 // Returns the active MDI child window
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {

-    // TODO
-    return NULL;
+    return m_currentChild ;

 }
 
 // Create the client window class (don't Create the window,
 // just return a new class)
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {
 }
 
 // Create the client window class (don't Create the window,
 // just return a new class)
 wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
 {

-       return new wxMDIClientWindow ;
+    m_clientWindow = new wxMDIClientWindow( this );
+    return m_clientWindow;

 }
 
 // Responds to colour changes, and passes event on to children.
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     // TODO
 }
 
 // Responds to colour changes, and passes event on to children.
 void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     // TODO

-
+    

     // Propagate the event to the non-top-level children
     wxFrame::OnSysColourChanged(event);
 }
     // Propagate the event to the non-top-level children
     wxFrame::OnSysColourChanged(event);
 }


@@ -157,70 +219,70 @@ void wxMDIParentFrame::ActivatePrevious()
 // Child frame
 
 wxMDIChildFrame::wxMDIChildFrame()
 // Child frame
 
 wxMDIChildFrame::wxMDIChildFrame()

+{
+    Init() ;
+}
+void wxMDIChildFrame::Init()

 {
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 {
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,

-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos,
-           const wxSize& size,
-           long style,
-           const wxString& name)
+                             wxWindowID id,
+                             const wxString& title,
+                             const wxPoint& pos,
+                             const wxSize& size,
+                             long style,
+                             const wxString& name)

 {
     SetName(name);
 {
     SetName(name);

-
+    

     if ( id > -1 )
         m_windowId = id;
     else
         m_windowId = (int)NewControlId();
     if ( id > -1 )
         m_windowId = id;
     else
         m_windowId = (int)NewControlId();

-
+    

     if (parent) parent->AddChild(this);
     if (parent) parent->AddChild(this);

-
-    // TODO: create child frame
-
+    
+    MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
+    
+    m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;
+    SetThemeWindowBackground( (WindowRef) m_macWindow , m_macWindowBackgroundTheme , false ) ;
+    

     wxModelessWindows.Append(this);
     return FALSE;
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
     wxModelessWindows.Append(this);
     return FALSE;
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {

-}
-
-// Set the client size (i.e. leave the calculation of borders etc.
-// to wxWindows)
-void wxMDIChildFrame::SetClientSize(int width, int height)
-{
-    // TODO
-}
-
-void wxMDIChildFrame::GetPosition(int *x, int *y) const
-{
-    // TODO
+    DestroyChildren();
+    // already delete by DestroyChildren()
+    m_frameToolBar = NULL;
+    m_frameStatusBar = NULL;

 }
 
 void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
 }
 
 void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
 {

-       return wxFrame::SetMenuBar( menu_bar ) ;
+    return wxFrame::SetMenuBar( menu_bar ) ;

 }
 
 // MDI operations
 void wxMDIChildFrame::Maximize()
 {
 }
 
 // MDI operations
 void wxMDIChildFrame::Maximize()
 {

-    // TODO
+    wxFrame::Maximize() ;

 }
 
 void wxMDIChildFrame::Restore()
 {
 }
 
 void wxMDIChildFrame::Restore()
 {

-    // TODO
+    wxFrame::Restore() ;

 }
 
 void wxMDIChildFrame::Activate()
 {
 }
 
 void wxMDIChildFrame::Activate()
 {

-    // TODO

 }
 
 }
 

-// Client window
+//-----------------------------------------------------------------------------
+// wxMDIClientWindow
+//-----------------------------------------------------------------------------

 
 wxMDIClientWindow::wxMDIClientWindow()
 {
 
 wxMDIClientWindow::wxMDIClientWindow()
 {


@@ -228,14 +290,22 @@ wxMDIClientWindow::wxMDIClientWindow()
 
 wxMDIClientWindow::~wxMDIClientWindow()
 {
 
 wxMDIClientWindow::~wxMDIClientWindow()
 {

+    DestroyChildren();

 }
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
 }
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {

-    // TODO create client window
-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
-
-    return FALSE;
+    
+    m_windowId = (int)NewControlId();
+    
+    if ( parent )
+    {
+        parent->AddChild(this);
+    }
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);
+    
+    wxModelessWindows.Append(this);
+    return TRUE;

 }
 
 // Explicitly call default scroll behaviour
 }
 
 // Explicitly call default scroll behaviour