X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45e0dc94770d598a1cc84d83730d470dd1cfbcca..27813df1f79323884ce5e3ec9a730f5d3da03f95:/src/os2/toplevel.cpp diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp index 6be4e147df..badfc61835 100644 --- a/src/os2/toplevel.cpp +++ b/src/os2/toplevel.cpp @@ -36,6 +36,7 @@ #include "wx/intl.h" #include "wx/frame.h" #include "wx/control.h" + #include "wx/containr.h" // wxSetFocusToChild() #endif //WX_PRECOMP #include "wx/os2/private.h" @@ -57,6 +58,15 @@ extern void wxAssociateWinWithHandle( HWND hWnd ,wxWindowOS2* pWin ); bool wxTopLevelWindowOS2::m_sbInitialized = FALSE; +wxWindow* wxTopLevelWindowOS2::m_spHiddenParent = NULL; + +// ============================================================================ +// wxTopLevelWindowOS2 implementation +// ============================================================================ + +BEGIN_EVENT_TABLE(wxTopLevelWindowOS2, wxTopLevelWindowBase) + EVT_ACTIVATE(wxTopLevelWindowOS2::OnActivate) +END_EVENT_TABLE() // ============================================================================ // wxTopLevelWindowMSW implementation @@ -69,21 +79,21 @@ MRESULT EXPENTRY wxDlgProc( HWND WXUNUSED(hWnd) ,MPARAM WXUNUSED(lParam) ) { - if (uMessage == WM_INITDLG) + switch(uMessage) { - // - // For this message, returning TRUE tells system to set focus to the - // first control in the dialog box. - // - return (MRESULT)TRUE; - } - else - { - // - // For all the other ones, FALSE means that we didn't process the - // message - // - return (MRESULT)FALSE; + case WM_INITDLG: + // + // For this message, returning TRUE tells system to set focus to + // the first control in the dialog box, but we set the focus + // ourselves, however in OS/2 we must return true to enable the dialog + // + return (MRESULT)TRUE; + default: + // + // For all the other ones, FALSE means that we didn't process the + // message + // + return (MRESULT)FALSE; } } // end of wxDlgProc @@ -110,24 +120,83 @@ void wxTopLevelWindowOS2::Init() m_hFrame = NULLHANDLE; memset(&m_vSwp, 0, sizeof(SWP)); memset(&m_vSwpClient, 0, sizeof(SWP)); + m_pWinLastFocused = (wxWindow *)NULL; } // end of wxTopLevelWindowIOS2::Init -long wxTopLevelWindowOS2::OS2GetCreateWindowFlags( - long* plExflags +void wxTopLevelWindowOS2::OnActivate( + wxActivateEvent& rEvent +) +{ + if (rEvent.GetActive()) + { + // + // Restore focus to the child which was last focused + // + wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), m_hWnd); + + wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent() + : NULL; + if (!pParent) + { + pParent = this; + } + + wxSetFocusToChild( pParent + ,&m_pWinLastFocused + ); + } + else // deactivating + { + // + // Remember the last focused child if it is our child + // + m_pWinLastFocused = FindFocus(); + + // + // So we NULL it out if it's a child from some other frame + // + wxWindow* pWin = m_pWinLastFocused; + + while (pWin) + { + if (pWin->IsTopLevel()) + { + if (pWin != this) + { + m_pWinLastFocused = NULL; + } + break; + } + pWin = pWin->GetParent(); + } + + wxLogTrace(_T("focus"), + _T("wxTLW %08x deactivated, last focused: %08x."), + m_hWnd, + m_pWinLastFocused ? GetHwndOf(m_pWinLastFocused) + : NULL); + rEvent.Skip(); + } +} // end of wxTopLevelWindowOS2::OnActivate + +WXDWORD wxTopLevelWindowOS2::OS2GetStyle( + long lStyle +, WXDWORD* pdwExflags ) const { - long lStyle = GetWindowStyle(); - long lMsflags = 0; + long lMsflags = wxWindow::OS2GetStyle( (lStyle & ~wxBORDER_MASK) | wxBORDER_NONE + ,pdwExflags + ); if (lStyle == wxDEFAULT_FRAME_STYLE) - lMsflags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | - FCF_MINMAX | FCF_TASKLIST; + lMsflags |= FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | + FCF_MINMAX | FCF_TASKLIST; else { if ((lStyle & wxCAPTION) == wxCAPTION) - lMsflags = FCF_TASKLIST; + lMsflags |= FCF_TASKLIST; else - lMsflags = FCF_NOMOVEWITHOWNER; + lMsflags |= FCF_NOMOVEWITHOWNER; if ((lStyle & wxVSCROLL) == wxVSCROLL) lMsflags |= FCF_VERTSCROLL; @@ -156,7 +225,7 @@ long wxTopLevelWindowOS2::OS2GetCreateWindowFlags( if ((lStyle & wxTHICK_FRAME) == 0) lMsflags |= FCF_BORDER; if (lStyle & wxFRAME_TOOL_WINDOW) - *plExflags = kFrameToolWindow; + *pdwExflags = kFrameToolWindow; if (lStyle & wxSTAY_ON_TOP) lMsflags |= FCF_SYSMODAL; @@ -164,6 +233,46 @@ long wxTopLevelWindowOS2::OS2GetCreateWindowFlags( return lMsflags; } // end of wxTopLevelWindowOS2::OS2GetCreateWindowFlags +WXHWND wxTopLevelWindowOS2::OS2GetParent() const +{ + // + // For the frames without wxFRAME_FLOAT_ON_PARENT style we should use NULL + // parent HWND or it would be always on top of its parent which is not what + // we usually want (in fact, we only want it for frames with the + // wxFRAME_FLOAT_ON_PARENT flag) + // + wxWindow* pParent; + + if (HasFlag(wxFRAME_FLOAT_ON_PARENT) ) + { + pParent = GetParent(); + + // this flag doesn't make sense then and will be ignored + wxASSERT_MSG( pParent, + _T("wxFRAME_FLOAT_ON_PARENT but no parent?") ); + } + else // don't float on parent, must not be owned + { + pParent = NULL; + } + if (HasFlag(wxFRAME_NO_TASKBAR) && !pParent) + { + if (!m_spHiddenParent) + { + m_spHiddenParent = new wxTopLevelWindowOS2(NULL, -1, _T("")); + + // + // We shouldn't leave it in wxTopLevelWindows or we wouldn't + // terminate the app when the last user-created frame is deleted -- + // see ~wxTopLevelWindowMSW + // + wxTopLevelWindows.DeleteObject(m_spHiddenParent); + } + pParent = m_spHiddenParent; + } + return pParent ? pParent->GetHWND() : NULL; +} // end of wxTopLevelWindowOS2::OS2GetParent + bool wxTopLevelWindowOS2::CreateDialog( ULONG ulDlgTemplate , const wxString& rsTitle @@ -289,8 +398,9 @@ bool wxTopLevelWindowOS2::CreateDialog( ,nY ,nWidth ,nHeight - ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW + ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW | SWP_ACTIVATE ); + ::WinQueryWindowPos(GetHwnd(), GetSwp()); m_hFrame = m_hWnd; SubclassWin(m_hWnd); return TRUE; @@ -302,8 +412,8 @@ bool wxTopLevelWindowOS2::CreateFrame( , const wxSize& rSize ) { - long lExflags; - long lFlags = OS2GetCreateWindowFlags(&lExflags); + WXDWORD lExflags; + WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags); long lStyle = GetWindowStyleFlag(); int nX = rPos.x; int nY = rPos.y; @@ -483,169 +593,53 @@ bool wxTopLevelWindowOS2::Create( wxTopLevelWindowOS2::~wxTopLevelWindowOS2() { - wxTopLevelWindows.DeleteObject(this); - - if (wxModelessWindows.Find(this)) - wxModelessWindows.DeleteObject(this); - - // - // If this is the last top-level window, exit. - // - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) + if (this == m_spHiddenParent) { - wxTheApp->SetTopWindow(NULL); - if ( wxTheApp->GetExitOnFrameDelete() ) - { - ::WinPostMsg(NULL, WM_QUIT, 0, 0); - } - } -} // end of wxTopLevelWindowOS2::~wxTopLevelWindowOS2 - -// -// IF we have child controls in the Frame's client we need to alter -// the y position, because, OS/2 controls are positioned relative to -// wxWindows orgin (top left) not the OS/2 origin (bottom left) -// -void wxTopLevelWindowOS2::AlterChildPos() -{ - // - // OS/2 is the only OS concerned about this - // - wxWindow* pChild = NULL; - wxControl* pCtrl = NULL; - RECTL vRect; - SWP vSwp; - - if (GetAutoLayout) // - // Auto layouts taken care of elsewhere + // Stop [infinite] recursion which would otherwise happen when we do + // "delete ms_hiddenParent" below -- and we're not interested in doing + // anything of the rest below for that window because the rest of + // wxWindows doesn't even know about it // return; - - ::WinQueryWindowRect(GetHwnd(), &vRect); - for (wxWindowList::Node* pNode = GetChildren().GetFirst(); - pNode; - pNode = pNode->GetNext()) - { - wxWindow* pChild = pNode->GetData(); - - ::WinQueryWindowPos(pChild->GetHWND(), &vSwp); - vSwp.y += (vRect.yTop - m_vSwpClient.cy); - if (pChild->IsKindOf(CLASSINFO(wxControl))) - { - pCtrl = wxDynamicCast(pChild, wxControl); - // - // Must deal with controls that have margins like ENTRYFIELD. The SWP - // struct of such a control will have and origin offset from its intended - // position by the width of the margins. - // - vSwp.y -= pCtrl->GetYComp(); - vSwp.x -= pCtrl->GetXComp(); - } - ::WinSetWindowPos( pChild->GetHWND() - ,HWND_TOP - ,vSwp.x - ,vSwp.y - ,vSwp.cx - ,vSwp.cy - ,SWP_MOVE - ); - ::WinQueryWindowPos(pChild->GetHWND(), &vSwp); - pChild = NULL; } - ::WinQueryWindowPos(GetHwnd(), &m_vSwpClient); -} // end of wxTopLevelWindowOS2::AlterChildPos -void wxTopLevelWindowOS2::UpdateInternalSize( - wxWindow* pChild -, int nChildWidth -, int nChildHeight -) -{ - int nWidthAdjust = 0; - int nHeightAdjust = 0; - int nPosX; - int nPosY; - bool bNewYSize = FALSE; - bool bNewXSize = FALSE; + if (wxModelessWindows.Find(this)) + wxModelessWindows.DeleteObject(this); // - // Under OS/2, if we have a srolled window as the child, the - // scrollbars will be SIBLINGS of the scrolled window. So, in - // order to be able to display the scrollbars properly we have to - // resize the scrolled window. Of course, that means dealing with - // child windows of that window as well, because OS/2 does not - // tend to put them in the right place. + // After destroying an owned window, Windows activates the next top level + // window in Z order but it may be different from our owner (to reproduce + // this simply Alt-TAB to another application and back before closing the + // owned frame) whereas we always want to yield activation to our parent // - if (nChildHeight != m_vSwpClient.cy) - bNewYSize = TRUE; - if (nChildWidth != m_vSwpClient.cx) - bNewXSize = TRUE; - if (bNewXSize || bNewYSize) - pChild->SetSize( 0 - ,0 - ,nChildWidth - ,nChildHeight - ); - if(bNewYSize) + if (HasFlag(wxFRAME_FLOAT_ON_PARENT)) { - // - // This is needed SetSize will mess up the OS/2 child window - // positioning because we position in wxWindows coordinates, - // not OS/2 coordinates. - // - pChild->MoveChildren(m_vSwpClient.cy - nChildHeight); - pChild->Refresh(); - } + wxWindow* pParent = GetParent(); - if (pChild->GetScrollBarHorz() != NULLHANDLE || - pChild->GetScrollBarVert() != NULLHANDLE) - { - if (bNewXSize || bNewYSize) + if (pParent) { - pChild->GetSize( &nChildWidth - ,&nChildHeight - ); - if (pChild->GetScrollBarHorz() != NULLHANDLE) - nHeightAdjust = 20; - if (pChild->GetScrollBarVert() != NULLHANDLE) - nWidthAdjust = 20; - pChild->GetPosition( &nPosX - ,&nPosY - ); - ::WinSetWindowPos( pChild->GetHWND() + ::WinSetWindowPos( GetHwndOf(pParent) ,HWND_TOP - ,nPosX - ,nPosY + nHeightAdjust - ,nChildWidth - nWidthAdjust - ,nChildHeight - nHeightAdjust - ,SWP_MOVE | SWP_SIZE + ,0, 0, 0, 0 + ,SWP_ZORDER ); } - if (bNewYSize && !m_sbInitialized) - { - // - // Only need to readjust child control positions of - // scrolled windows once on initialization. After that - // the sizing takes care of things itself. - // - pChild->MoveChildren(nHeightAdjust); - m_sbInitialized = TRUE; - } - if (bNewXSize || bNewYSize) - { - // - // Always refresh to keep scollbars visible. They are - // children of the Toplevel window, not the child panel. - // - pChild->Refresh(); - } } + // - // This brings the internal "last size" up to date. + // If this is the last top-level window, we're going to exit and we should + // delete ms_hiddenParent now to avoid leaking it // - ::WinQueryWindowPos(GetHwnd(), &m_vSwpClient); -} // end of wxTopLevelWindowOS2::UpdateInternalSize + if (IsLastBeforeExit()) + { + if (m_spHiddenParent) + { + delete m_spHiddenParent; + m_spHiddenParent = NULL; + } + } +} // end of wxTopLevelWindowOS2::~wxTopLevelWindowOS2 // ---------------------------------------------------------------------------- // wxTopLevelWindowOS2 client size @@ -738,7 +732,13 @@ bool wxTopLevelWindowOS2::Show( m_bIconized = vSwp.fl & SWP_MINIMIZE; ::WinQueryWindowPos(m_hWnd, &m_vSwpClient); ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + ::WinQueryWindowPos(m_hWnd, &vSwp); ::WinEnableWindow(m_hFrame, TRUE); + + // + // Deal with children + // + MoveChildren(m_vSwpClient.cy - vSwp.cy); vEvent.SetEventObject(this); GetEventHandler()->ProcessEvent(vEvent); } @@ -753,15 +753,6 @@ bool wxTopLevelWindowOS2::Show( ::WinQueryWindowPos(hWndParent, &vSwp); m_bIconized = vSwp.fl & SWP_MINIMIZE; - if (hWndParent) - ::WinSetWindowPos( hWndParent - ,HWND_TOP - ,vSwp.x - ,vSwp.y - ,vSwp.cx - ,vSwp.cy - ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE - ); ::WinEnableWindow(hWndParent, TRUE); } } @@ -959,17 +950,26 @@ bool wxTopLevelWindowOS2::ShowFullScreen( void wxTopLevelWindowOS2::SetIcon( const wxIcon& rIcon ) +{ + SetIcons(wxIconBundle(rIcon)); +} // end of wxTopLevelWindowOS2::SetIcon + +void wxTopLevelWindowOS2::SetIcons( + const wxIconBundle& rIcons +) { // // This sets m_icon // - wxTopLevelWindowBase::SetIcon(rIcon); + wxTopLevelWindowBase::SetIcons(rIcons); + + const wxIcon& vIcon = rIcons.GetIcon(wxSize(32, 32)); - if (m_icon.Ok()) + if (vIcon.Ok() && vIcon.GetWidth() == 32 && vIcon.GetHeight() == 32) { ::WinSendMsg( m_hFrame ,WM_SETICON - ,(MPARAM)((HPOINTER)m_icon.GetHICON()) + ,(MPARAM)((HPOINTER)vIcon.GetHICON()) ,NULL ); ::WinSendMsg( m_hFrame