Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup - reformat (take 2)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2006-01-06 21:17:18 +00:00
parent 5a7d70fe89
commit bb64b8bdd5
1 changed files with 30 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/mac/carbon/mdi.cpp
View File

@@ -367,11 +367,12 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
if (parent) if (parent)
parent->AddChild(this); parent->AddChild(this);
MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
return false; return false;
} }
@@ -387,29 +388,35 @@ void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
void wxMDIChildFrame::MacActivate(long timestamp, bool activating) 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); wxMDIParentFrame *mdiparent = wxDynamicCast(m_parent, wxMDIParentFrame);
wxASSERT(mdiparent); 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")); wxLogTrace(TRACE_MDI, wxT("parent had been scheduled for deactivation, rehighlighting"));
UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true); UMAHighlightAndActivateWindow((WindowRef)s_macDeactivateWindow->MacGetWindowRef(), true);
wxLogTrace(TRACE_MDI, wxT("done highliting parent"));
wxLogTrace(TRACE_MDI, wxT("finished highliting parent"));
s_macDeactivateWindow = NULL; s_macDeactivateWindow = NULL;
} }
else if((mdiparent->m_currentChild==this) || !s_macDeactivateWindow) else if ((mdiparent->m_currentChild == this) || !s_macDeactivateWindow)
mdiparent->wxFrame::MacActivate(timestamp,activating); mdiparent->wxFrame::MacActivate(timestamp, activating);
if(mdiparent->m_currentChild && mdiparent->m_currentChild!=this) if (mdiparent->m_currentChild && mdiparent->m_currentChild != this)
mdiparent->m_currentChild->wxFrame::MacActivate(timestamp,false); mdiparent->m_currentChild->wxFrame::MacActivate(timestamp, false);
mdiparent->m_currentChild = this; mdiparent->m_currentChild = this;
if(s_macDeactivateWindow==this) if (s_macDeactivateWindow == this)
{ {
wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"),this); wxLogTrace(TRACE_MDI, wxT("Avoided deactivation/activation of this=%p"), this);
s_macDeactivateWindow=NULL;
s_macDeactivateWindow = NULL;
} }
else else
wxFrame::MacActivate(timestamp, activating); wxFrame::MacActivate(timestamp, activating);
@@ -417,18 +424,19 @@ void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
else else
{ {
// We were scheduled for deactivation, and now we do it. // We were scheduled for deactivation, and now we do it.
if(s_macDeactivateWindow==this) if (s_macDeactivateWindow == this)
{ {
s_macDeactivateWindow = NULL; s_macDeactivateWindow = NULL;
wxFrame::MacActivate(timestamp,activating); wxFrame::MacActivate(timestamp, activating);
if(mdiparent->m_currentChild==this) if (mdiparent->m_currentChild == this)
mdiparent->wxFrame::MacActivate(timestamp,activating); mdiparent->wxFrame::MacActivate(timestamp, activating);
} }
else // schedule ourselves for deactivation else // schedule ourselves for deactivation
{ {
if(s_macDeactivateWindow) if (s_macDeactivateWindow)
wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"),s_macDeactivateWindow); wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"), s_macDeactivateWindow);
wxLogTrace(TRACE_MDI, wxT("Scheduling delayed deactivation")); wxLogTrace(TRACE_MDI, wxT("Scheduling delayed deactivation"));
s_macDeactivateWindow = this; s_macDeactivateWindow = this;
} }
} }
@@ -464,10 +472,11 @@ wxMDIClientWindow::~wxMDIClientWindow()
bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style) 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; return false;
wxModelessWindows.Append(this); wxModelessWindows.Append(this);
return true; return true;
} }