/////////////////////////////////////////////////////////////////////////////
-// 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
-// Licence: wxWindows licence
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/wxprec.h"
#if wxUSE_MDI
+#include "wx/mdi.h"
+
#ifndef WX_PRECOMP
- #include "wx/mdi.h"
#include "wx/log.h"
#include "wx/menu.h"
#include "wx/settings.h"
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)
- EVT_SCROLL(wxMDIClientWindow::OnScroll)
+ EVT_SCROLL(wxMDIClientWindow::OnScroll)
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_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
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);
m_shouldBeShown = true;
}
}
-
- wxFrame::AddChild(child);
}
void wxMDIParentFrame::RemoveChild(wxWindowBase *child)
if ( win->IsShown()
&& !wxDynamicCast(win, wxMDIChildFrame)
#if wxUSE_STATUSBAR
- && win != GetStatusBar()
+ && win != (wxWindow*) GetStatusBar()
#endif
&& win != GetClientWindow() )
{
}
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);
- if ( id > -1 )
- m_windowId = id;
- else
+ if ( id == wxID_ANY )
m_windowId = (int)NewControlId();
+ else
+ m_windowId = id;
if (parent)
parent->AddChild(this);
+ MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
-
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
wxModelessWindows.Append(this);
- return false;
+
+ return true;
}
wxMDIChildFrame::~wxMDIChildFrame()
void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
{
- wxLogTrace(TRACE_MDI, wxT("MDI child=%p MacActivate(0x%08lx,%s)"),this,timestamp,activating?wxT("ACTIV"):wxT("deact"));
+ wxLogTrace(TRACE_MDI, wxT("MDI child=%p MacActivate(0x%08lx,%s)"),this, timestamp, activating ? wxT("ACTIV") : wxT("deact"));
+
wxMDIParentFrame *mdiparent = wxDynamicCast(m_parent, wxMDIParentFrame);
wxASSERT(mdiparent);
- if(activating)
+
+ if (activating)
{
- if(s_macDeactivateWindow == m_parent)
+ if (s_macDeactivateWindow == m_parent)
{
wxLogTrace(TRACE_MDI, wxT("parent had been scheduled for deactivation, rehighlighting"));
+
UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true);
- wxLogTrace(TRACE_MDI, wxT("done highliting parent"));
+
+ wxLogTrace(TRACE_MDI, wxT("finished highliting parent"));
+
s_macDeactivateWindow = NULL;
}
- else if((mdiparent->m_currentChild==this) || !s_macDeactivateWindow)
- mdiparent->wxFrame::MacActivate(timestamp,activating);
-
- if(mdiparent->m_currentChild && mdiparent->m_currentChild!=this)
- mdiparent->m_currentChild->wxFrame::MacActivate(timestamp,false);
+ else if ((mdiparent->m_currentChild == this) || !s_macDeactivateWindow)
+ mdiparent->wxFrame::MacActivate(timestamp, activating);
+
+ if (mdiparent->m_currentChild && mdiparent->m_currentChild != this)
+ mdiparent->m_currentChild->wxFrame::MacActivate(timestamp, false);
mdiparent->m_currentChild = this;
- if(s_macDeactivateWindow==this)
+ if (s_macDeactivateWindow == this)
{
- wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"),this);
- s_macDeactivateWindow=NULL;
+ wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"), this);
+
+ s_macDeactivateWindow = NULL;
}
else
wxFrame::MacActivate(timestamp, activating);
else
{
// We were scheduled for deactivation, and now we do it.
- if(s_macDeactivateWindow==this)
+ if (s_macDeactivateWindow == this)
{
s_macDeactivateWindow = NULL;
- wxFrame::MacActivate(timestamp,activating);
- if(mdiparent->m_currentChild==this)
- mdiparent->wxFrame::MacActivate(timestamp,activating);
+ wxFrame::MacActivate(timestamp, activating);
+ if (mdiparent->m_currentChild == this)
+ mdiparent->wxFrame::MacActivate(timestamp, activating);
}
else // schedule ourselves for deactivation
{
- if(s_macDeactivateWindow)
- wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"),s_macDeactivateWindow);
+ if (s_macDeactivateWindow)
+ wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"), s_macDeactivateWindow);
wxLogTrace(TRACE_MDI, wxT("Scheduling delayed deactivation"));
+
s_macDeactivateWindow = this;
}
}
bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
{
- if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style))
+ if ( !wxWindow::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, style) )
return false;
-
+
wxModelessWindows.Append(this);
+
return true;
}
}
// Explicitly call default scroll behaviour
-void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
+void wxMDIClientWindow::OnScroll(wxScrollEvent& WXUNUSED(event))
{
}
#endif // wxUSE_MDI
-
projects / wxWidgets.git / blobdiff