Added automatic dialog scrolling ability

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

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 503efaaa610fbec6c484d2fa690888eddd3c5577..58a00ae186b50cad1700e7d0b280d047bab1212a 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -1,20 +1,21 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.cpp
+// Name:        src/mac/carbon/mdi.cpp

 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Purpose:     MDI classes
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:       wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_MDI
 
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 
 #if wxUSE_MDI
 

+#include "wx/mdi.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/mdi.h"

     #include "wx/log.h"
     #include "wx/menu.h"
     #include "wx/settings.h"
     #include "wx/log.h"
     #include "wx/menu.h"
     #include "wx/settings.h"


@@ -31,30 +32,52 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)

-  EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
-  EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
+    EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
+    EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)

 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
 END_EVENT_TABLE()
 
 BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)

-  EVT_SCROLL(wxMDIClientWindow::OnScroll)
+    EVT_SCROLL(wxMDIClientWindow::OnScroll)

 END_EVENT_TABLE()
 
 static const wxChar *TRACE_MDI = _T("mdi");
 
 END_EVENT_TABLE()
 
 static const wxChar *TRACE_MDI = _T("mdi");
 

-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_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;
+// others

 
 

-// Status border dimensions
-static const int wxTHICK_LINE_BORDER = 3;
+void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
+{
+#if 1 // TODO REMOVE
+    if ( inWindowRef )
+    {
+//        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
+//        if ( inActivate != isHighlighted )
+#ifndef __LP64__
+        GrafPtr port ;
+        GetPort( &port ) ;
+        SetPortWindowPort( inWindowRef ) ;
+#endif
+        HiliteWindow( inWindowRef , inActivate ) ;
+        ControlRef control = NULL ;
+        ::GetRootControl( inWindowRef , &control ) ;
+        if ( control )
+        {
+            if ( inActivate )
+                ::ActivateControl( control ) ;
+            else
+                ::DeactivateControl( control ) ;
+        }
+#ifndef __LP64__
+        SetPort( port ) ;
+#endif
+    }
+#endif
+}

 
 // ----------------------------------------------------------------------------
 // Parent frame
 
 // ----------------------------------------------------------------------------
 // Parent frame


@@ -131,6 +154,9 @@ void wxMDIParentFrame::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h
 
 void wxMDIParentFrame::AddChild(wxWindowBase *child)
 {
 
 void wxMDIParentFrame::AddChild(wxWindowBase *child)
 {

+    // moved this to front, so that we don't run into unset m_parent problems later
+    wxFrame::AddChild(child);
+

     if ( !m_currentChild )
     {
         m_currentChild = wxDynamicCast(child, wxMDIChildFrame);
     if ( !m_currentChild )
     {
         m_currentChild = wxDynamicCast(child, wxMDIChildFrame);


@@ -142,8 +168,6 @@ void wxMDIParentFrame::AddChild(wxWindowBase *child)
             m_shouldBeShown = true;
         }
     }
             m_shouldBeShown = true;
         }
     }

-
-    wxFrame::AddChild(child);

 }
 
 void wxMDIParentFrame::RemoveChild(wxWindowBase *child)
 }
 
 void wxMDIParentFrame::RemoveChild(wxWindowBase *child)


@@ -350,19 +374,19 @@ 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
+    if ( id == wxID_ANY )

         m_windowId = (int)NewControlId();
         m_windowId = (int)NewControlId();

+    else
+        m_windowId = id;

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


@@ -373,7 +397,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
     wxModelessWindows.Append(this);
 
 
     wxModelessWindows.Append(this);
 

-    return false;
+    return true;

 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()


@@ -487,9 +511,8 @@ void wxMDIClientWindow::DoGetClientSize(int *x, int *y) const
 }
 
 // Explicitly call default scroll behaviour
 }
 
 // Explicitly call default scroll behaviour

-void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
+void wxMDIClientWindow::OnScroll(wxScrollEvent& WXUNUSED(event))

 {
 }
 
 #endif // wxUSE_MDI
 {
 }
 
 #endif // wxUSE_MDI

-