#if wxUSE_MDI
-#include "wx/mdi.h"
-#include "wx/menu.h"
-#include "wx/settings.h"
-#include "wx/log.h"
+#ifndef WX_PRECOMP
+ #include "wx/mdi.h"
+ #include "wx/log.h"
+ #include "wx/menu.h"
+ #include "wx/settings.h"
+ #include "wx/statusbr.h"
+#endif
#include "wx/mac/private.h"
#include "wx/mac/uma.h"
}
bool wxMDIParentFrame::Create(wxWindow *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)
{
// this style can be used to prevent a window from having the standard MDI
// "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->Append(IDM_WINDOWICONS, wxT("&Arrange Icons"));
m_windowMenu->Append(IDM_WINDOWNEXT, wxT("&Next"));
}
-
+
wxFrame::Create( parent , id , title , pos , size , style , name ) ;
m_parentFrameActive = true;
-
+
OnCreateClient();
-
+
return true;
}
wxMDIParentFrame::~wxMDIParentFrame()
{
DestroyChildren();
+
// already deleted by DestroyChildren()
m_clientWindow = NULL ;
-
+
delete m_windowMenu;
}
-
void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
{
wxFrame::SetMenuBar( menu_bar ) ;
void wxMDIParentFrame::GetRectForTopLevelChildren(int *x, int *y, int *w, int *h)
{
- if(x)
+ if (x)
*x = 0;
- if(y)
+ if (y)
*y = 0;
- wxDisplaySize(w,h);
+
+ wxDisplaySize(w, h);
}
void wxMDIParentFrame::AddChild(wxWindowBase *child)
void wxMDIParentFrame::MacActivate(long timestamp, bool activating)
{
- wxLogTrace(TRACE_MDI, wxT("MDI PARENT=%p MacActivate(0x%08lx,%s)"),this,timestamp,activating?wxT("ACTIV"):wxT("deact"));
- if(activating)
+ wxLogTrace(TRACE_MDI, wxT("MDI PARENT=%p MacActivate(0x%08lx,%s)"), this, timestamp, activating ? wxT("ACTIV") : wxT("deact"));
+
+ if (activating)
{
- if(s_macDeactivateWindow && s_macDeactivateWindow->GetParent()==this)
+ if (s_macDeactivateWindow && s_macDeactivateWindow->GetParent() == this)
{
wxLogTrace(TRACE_MDI, wxT("child had been scheduled for deactivation, rehighlighting"));
+
UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true);
- wxLogTrace(TRACE_MDI, wxT("done highliting child"));
+
+ wxLogTrace(TRACE_MDI, wxT("finished highliting child"));
+
s_macDeactivateWindow = NULL;
}
- else if(s_macDeactivateWindow == this)
+ else if (s_macDeactivateWindow == this)
{
wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"), this);
+
s_macDeactivateWindow = NULL;
}
else // window to deactivate is NULL or is not us or one of our kids
{
// activate kid instead
- if(m_currentChild)
- m_currentChild->MacActivate(timestamp,activating);
+ if (m_currentChild)
+ m_currentChild->MacActivate(timestamp, activating);
else
- wxFrame::MacActivate(timestamp,activating);
+ 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;
- if(m_currentChild)
- m_currentChild->MacActivate(timestamp,activating);
- wxFrame::MacActivate(timestamp,activating);
+ if (m_currentChild)
+ m_currentChild->MacActivate(timestamp, activating);
+ 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 MDI Parent deactivation"));
+
s_macDeactivateWindow = this;
}
}
wxMDIClientWindow *wxMDIParentFrame::OnCreateClient()
{
m_clientWindow = new wxMDIClientWindow( this );
+
return m_clientWindow;
}
void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
{
// TODO
-
+
// Propagate the event to the non-top-level children
wxFrame::OnSysColourChanged(event);
}
if ( win->IsShown()
&& !wxDynamicCast(win, wxMDIChildFrame)
#if wxUSE_STATUSBAR
- && win != GetStatusBar()
-#endif // wxUSE_STATUSBAR
- && win != GetClientWindow() )
+ && win != (wxWindow*) GetStatusBar()
+#endif
+ && win != GetClientWindow() )
{
// if we have a non-MDI child, do remain visible so that it could
// be used
// don't make the window visible now but remember that we should
// have had done it
m_shouldBeShown = true;
+
return false;
}
}
}
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
m_windowId = (int)NewControlId();
-
- if (parent) parent->AddChild(this);
-
+
+ if (parent)
+ parent->AddChild(this);
+
MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
-
+
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
wxModelessWindows.Append(this);
+
return false;
}
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;
}
projects / wxWidgets.git / blobdiff