X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0dd9b9e2be1809f484b6447ad9525fa5b404ad95..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/toplevel.cpp?ds=inline diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 57e85c3913..f87a982735 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -507,9 +507,6 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, { bool ret wxDUMMY_INITIALIZE(false); - // init our fields - Init(); - wxSize sizeReal = size; if ( !sizeReal.IsFullySpecified() ) { @@ -660,10 +657,14 @@ bool wxTopLevelWindowMSW::Show(bool show) } else // just show { - if ( GetWindowStyle() & wxFRAME_TOOL_WINDOW ) - nShowCmd = SW_SHOWNA; - else - nShowCmd = SW_SHOW; + // we shouldn't use SW_SHOW which also activates the window for + // tool frames (as they shouldn't steal focus from the main window) + // nor for the currently disabled windows as they would be enabled + // as a side effect + if ( HasFlag(wxFRAME_TOOL_WINDOW) || !IsEnabled() ) + nShowCmd = SW_SHOWNA; + else + nShowCmd = SW_SHOW; } } else // hide @@ -965,25 +966,26 @@ wxString wxTopLevelWindowMSW::GetTitle() const return GetLabel(); } -void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons) +void wxTopLevelWindowMSW::DoSelectAndSetIcon(const wxIconBundle& icons, + int smX, + int smY, + int i) { - wxTopLevelWindowBase::SetIcons(icons); + const wxSize size(::GetSystemMetrics(smX), ::GetSystemMetrics(smY)); -#if !defined(__WXMICROWIN__) - const wxIcon& sml = icons.GetIconOfExactSize(16); - if( sml.Ok() ) + const wxIcon icon = icons.GetIconOfExactSize(size); + if ( icon.Ok() ) { - ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_SMALL, - (LPARAM)GetHiconOf(sml) ); + ::SendMessage(GetHwnd(), WM_SETICON, i, (LPARAM)GetHiconOf(icon)); } +} - const wxIcon& big = icons.GetIconOfExactSize(32); - if( big.Ok() ) - { - ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG, - (LPARAM)GetHiconOf(big) ); - } -#endif // !__WXMICROWIN__ +void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons) +{ + wxTopLevelWindowBase::SetIcons(icons); + + DoSelectAndSetIcon(icons, SM_CXSMICON, SM_CYSMICON, ICON_SMALL); + DoSelectAndSetIcon(icons, SM_CXICON, SM_CYICON, ICON_BIG); } bool wxTopLevelWindowMSW::EnableCloseButton(bool enable) @@ -1171,56 +1173,16 @@ bool wxTopLevelWindowMSW::CanSetTransparent() } -void wxTopLevelWindowMSW::Freeze() -{ - if ( !m_frozenness++) { - if (IsShown()) { - for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *child = node->GetData(); - if ( child->IsTopLevel() ) - continue; - else - child->Freeze(); - } - } - } -} - -void wxTopLevelWindowMSW::Thaw() +void wxTopLevelWindowMSW::DoFreeze() { - wxASSERT_MSG( m_frozenness > 0, _T("Thaw() without matching Freeze()") ); - if ( --m_frozenness == 0 ) - { - if ( IsShown() ) { - for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) - { - wxWindow *child = node->GetData(); - if ( child->IsTopLevel() ) - continue; - else - child->Thaw(); - } - } - } + // do nothing: freezing toplevel window causes paint and mouse events + // to go through it any TLWs under it, so the best we can do is to freeze + // all children -- and wxWindowBase::Freeze() does that } - -void wxTopLevelWindowMSW::AddChild(wxWindowBase *child ) +void wxTopLevelWindowMSW::DoThaw() { - //adding a child while frozen will assert when thawn, - // so freeze it - if (child && !child->IsTopLevel() && IsFrozen()) { - //need to match our current freeze level - for (unsigned int ii=0;ii< m_frozenness;ii++) { - child->Freeze(); - } - } - wxTopLevelWindowBase::AddChild(child); + // intentionally empty -- see DoFreeze() } @@ -1236,7 +1198,7 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) { // restore focus to the child which was last focused unless we already // have it - wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd); + wxLogTrace(_T("focus"), _T("wxTLW %p activated."), m_hWnd); wxWindow *winFocus = FindFocus(); if ( !winFocus || wxGetTopLevelParent(winFocus) != this ) @@ -1269,10 +1231,9 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) } wxLogTrace(_T("focus"), - _T("wxTLW %08x deactivated, last focused: %08x."), - (int) m_hWnd, - (int) (m_winLastFocused ? GetHwndOf(m_winLastFocused) - : NULL)); + _T("wxTLW %p deactivated, last focused: %p."), + m_hWnd, + m_winLastFocused ? GetHwndOf(m_winLastFocused) : NULL); event.Skip(); }