X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b3ed311352212a92f1a20f250fc1da325739b91..4b7b750dd1ffd0d26b78728adb613b282a37c058:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index 9de5fdf513..838197f4d4 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -13,6 +13,15 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP + #include "wx/defs.h" + #include "wx/object.h" + #include "wx/dynarray.h" + #include "wx/list.h" + #include "wx/hash.h" + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/event.h" #include "wx/setup.h" #include "wx/frame.h" #include "wx/menu.h" @@ -46,6 +55,10 @@ extern wxList WXDLLEXPORT wxPendingDelete; extern wxChar wxFrameClassName[]; extern wxMenu *wxCurrentPopupMenu; +extern void wxAssociateWinWithHandle( HWND hWnd + ,wxWindow* pWin + ); + // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- @@ -64,6 +77,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) // ---------------------------------------------------------------------------- // static class members // ---------------------------------------------------------------------------- +#if wxUSE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR bool wxFrame::m_bUseNativeStatusBar = TRUE; @@ -71,6 +85,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) bool wxFrame::m_bUseNativeStatusBar = FALSE; #endif +#endif //wxUSE_STATUSBAR + // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- @@ -93,6 +109,11 @@ void wxFrame::Init() m_bIsShown = FALSE; m_pWinLastFocused = (wxWindow *)NULL; + m_hFrame = NULL; + m_hTitleBar = NULL; + m_hHScroll = NULL; + m_hVScroll = NULL; + // // Initialize SWP's // @@ -120,12 +141,18 @@ bool wxFrame::Create( int nY = rPos.y; int nWidth = rSize.x; int nHeight = rSize.y; + bool bOk = FALSE; SetName(rsName); m_windowStyle = lulStyle; m_frameMenuBar = NULL; +#if wxUSE_TOOLBAR m_frameToolBar = NULL; +#endif //wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR m_frameStatusBar = NULL; +#endif //wxUSE_STATUSBAR SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); @@ -142,23 +169,24 @@ bool wxFrame::Create( if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0) pParent = NULL; - if (!pParent) - wxTopLevelWindows.Append(this); - - OS2Create( m_windowId - ,pParent - ,wxFrameClassName - ,this - ,rsTitle - ,nX - ,nY - ,nWidth - ,nHeight - ,lulStyle - ); - - wxModelessWindows.Append(this); - return TRUE; + bOk = OS2Create( m_windowId + ,pParent + ,wxFrameClassName + ,this + ,rsTitle + ,nX + ,nY + ,nWidth + ,nHeight + ,lulStyle + ); + if (bOk) + { + if (!pParent) + wxTopLevelWindows.Append(this); + wxModelessWindows.Append(this); + } + return(bOk); } // end of wxFrame::Create wxFrame::~wxFrame() @@ -213,40 +241,19 @@ void wxFrame::DoGetClientSize( , int* pY ) const { - // - // OS/2 PM's coordinates go from bottom-left not - // top-left thus the += instead of the -= - // RECTL vRect; + ::WinQueryWindowRect(GetHwnd(), &vRect); // - // PM has no GetClientRect that inherantly knows about the client window - // We have to explicitly go fetch it! + // No need to use statusbar code as in WIN32 as the FORMATFRAME + // window procedure ensures PM knows about the new frame client + // size internally. A ::WinQueryWindowRect is all that is needed! // - ::WinQueryWindowRect(GetHwnd(), &vRect); - -#if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - int nStatusX; - int nStatusY; - - GetStatusBar()->GetClientSize( &nStatusX - ,&nStatusY - ); - vRect.yBottom += nStatusY; - } -#endif // wxUSE_STATUSBAR - - wxPoint vPoint(GetClientAreaOrigin()); - - vRect.yBottom += vPoint.y; - vRect.xRight -= vPoint.x; if (pX) - *pX = vRect.xRight; + *pX = vRect.xRight - vRect.xLeft; if (pY) - *pY = vRect.yBottom; + *pY = vRect.yTop - vRect.yBottom; } // end of wxFrame::DoGetClientSize // @@ -263,8 +270,7 @@ void wxFrame::DoSetClientSize( RECTL vRect2; ::WinQueryWindowRect(GetHwnd(), &vRect); - - ::WinQueryWindowRect(GetHWND(), &vRect2); + ::WinQueryWindowRect(GetHwnd(), &vRect2); // // Find the difference between the entire window (title bar and all) @@ -321,7 +327,7 @@ void wxFrame::DoGetSize( { RECTL vRect; - ::WinQueryWindowRect(GetHWND(), &vRect); + ::WinQueryWindowRect(m_hFrame, &vRect); *pWidth = vRect.xRight - vRect.xLeft; *pHeight = vRect.yTop - vRect.yBottom; } // end of wxFrame::DoGetSize @@ -334,16 +340,10 @@ void wxFrame::DoGetPosition( RECTL vRect; POINTL vPoint; - ::WinQueryWindowRect(GetHWND(), &vRect); - vPoint.x = vRect.xLeft; + ::WinQueryWindowRect(m_hFrame, &vRect); - // - // OS/2 is backwards [WIN32 it is vRect.yTop] - // - vPoint.y = vRect.yBottom; - - *pX = vPoint.x; - *pY = vPoint.y; + *pX = vRect.xRight - vRect.xLeft; + *pY = vRect.yTop - vRect.yBottom; } // end of wxFrame::DoGetPosition // ---------------------------------------------------------------------------- @@ -354,7 +354,7 @@ void wxFrame::DoShowWindow( int bShowCmd ) { - ::WinShowWindow(GetHWND(), (BOOL)bShowCmd); + ::WinShowWindow(m_hFrame, (BOOL)bShowCmd); m_bIconized = bShowCmd == SWP_MINIMIZE; } // end of wxFrame::DoShowWindow @@ -370,10 +370,10 @@ bool wxFrame::Show( { wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId); - ::WinQueryWindowPos(GetHWND(), &vSwp); + ::WinQueryWindowPos(m_hFrame, &vSwp); m_bIconized = vSwp.fl & SWP_MINIMIZE; - ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0); - ::WinEnableWindow(GetHWND(), TRUE); + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + ::WinEnableWindow(m_hFrame, TRUE); vEvent.SetEventObject(this); GetEventHandler()->ProcessEvent(vEvent); } @@ -425,7 +425,7 @@ bool wxFrame::IsIconized() const { SWP vSwp; - ::WinQueryWindowPos(GetHwnd(), &vSwp); + ::WinQueryWindowPos(m_hFrame, &vSwp); if (vSwp.fl & SWP_MINIMIZE) ((wxFrame*)this)->m_bIconized = TRUE; @@ -440,7 +440,7 @@ bool wxFrame::IsMaximized() const SWP vSwp; bool bIconic; - ::WinQueryWindowPos(GetHWND(), &vSwp); + ::WinQueryWindowPos(m_hFrame, &vSwp); return (vSwp.fl & SWP_MAXIMIZE); } // end of wxFrame::IsMaximized @@ -452,12 +452,12 @@ void wxFrame::SetIcon( if ((m_icon.GetHICON()) != NULLHANDLE) { - ::WinSendMsg( GetHWND() + ::WinSendMsg( m_hFrame ,WM_SETICON ,(MPARAM)((HPOINTER)m_icon.GetHICON()) ,NULL ); - ::WinSendMsg( GetHWND() + ::WinSendMsg( m_hFrame ,WM_UPDATEFRAME ,(MPARAM)FCF_ICON ,(MPARAM)0 @@ -487,12 +487,19 @@ wxStatusBar* wxFrame::OnCreateStatusBar( if( !pStatusBar ) return NULL; - // + ::WinSetParent( pStatusBar->GetHWND() + ,m_hFrame + ,FALSE + ); + ::WinSetOwner( pStatusBar->GetHWND() + ,m_hFrame + ); + // // to show statusbar // - if( ::WinIsWindowShowing(GetHWND()) ) - ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0); - + if(::WinIsWindowShowing(m_hFrame)) + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + return pStatusBar; } // end of wxFrame::OnCreateStatusBar @@ -508,15 +515,17 @@ void wxFrame::PositionStatusBar() if (m_frameStatusBar) { int nWidth; - int nHeight; int nStatbarWidth; int nStatbarHeight; HWND hWndClient; RECTL vRect; + RECTL vFRect; - ::WinQueryWindowRect(GetHwnd(), &vRect); + ::WinQueryWindowRect(m_hFrame, &vRect); + ::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2); + vFRect = vRect; + ::WinCalcFrameRect(m_hFrame, &vRect, TRUE); nWidth = vRect.xRight - vRect.xLeft; - nHeight = vRect.yTop - vRect.yBottom; m_frameStatusBar->GetSize( &nStatbarWidth ,&nStatbarHeight @@ -526,8 +535,8 @@ void wxFrame::PositionStatusBar() // Since we wish the status bar to be directly under the client area, // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS. // - m_frameStatusBar->SetSize( 0 - ,nHeight + m_frameStatusBar->SetSize( vRect.xLeft - vFRect.xLeft + ,vRect.yBottom - vFRect.yBottom ,nWidth ,nStatbarHeight ); @@ -535,21 +544,7 @@ void wxFrame::PositionStatusBar() { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); - wxLogError("Error setting parent for submenu. Error: %s\n", sError); - return; - } - if (!::WinSetWindowPos( m_frameStatusBar->GetHWND() - ,HWND_TOP - ,vSwp.x - ,vSwp.y - ,nStatbarWidth - ,nStatbarHeight - ,SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_ZORDER - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError("Error setting parent for submenu. Error: %s\n", sError); + wxLogError("Error setting parent for StautsBar. Error: %s\n", sError); return; } } @@ -571,8 +566,6 @@ void wxFrame::SetMenuBar( { ERRORID vError; wxString sError; - HWND hClient = NULLHANDLE; - HWND hFrame = NULLHANDLE; HWND hTitlebar = NULLHANDLE; HWND hHScroll = NULLHANDLE; HWND hVScroll = NULLHANDLE; @@ -618,27 +611,6 @@ void wxFrame::SetMenuBar( m_frameMenuBar = pMenuBar; pMenuBar->Attach(this); } - - // - // Now resize the client to fit the new frame - // - WinQueryWindowPos(GetHWND(), &vSwp); - hTitlebar = WinWindowFromID(GetHWND(), FID_TITLEBAR); - WinQueryWindowPos(hTitlebar, &vSwpTitlebar); - hHScroll = WinWindowFromID(GetHWND(), FID_HORZSCROLL); - WinQueryWindowPos(hHScroll, &vSwpHScroll); - hVScroll = WinWindowFromID(GetHWND(), FID_VERTSCROLL); - WinQueryWindowPos(hVScroll, &vSwpVScroll); - hMenuBar = WinWindowFromID(GetHWND(), FID_MENU); - WinQueryWindowPos(hMenuBar, &vSwpMenu); - WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,SV_CXSIZEBORDER/2 - ,(SV_CYSIZEBORDER/2) + vSwpHScroll.cy/2 - ,vSwp.cx - ((SV_CXSIZEBORDER + 1) + vSwpVScroll.cx) - ,vSwp.cy - ((SV_CYSIZEBORDER + 1) + vSwpTitlebar.cy + vSwpMenu.cy + vSwpHScroll.cy/2) - ,SWP_SIZE | SWP_MOVE - ); } // end of wxFrame::SetMenuBar void wxFrame::InternalSetMenuBar() @@ -648,20 +620,20 @@ void wxFrame::InternalSetMenuBar() // // Set the parent and owner of the menubar to be the frame // - if (!::WinSetParent(m_hMenu, GetHWND(), FALSE)) + if (!::WinSetParent(m_hMenu, m_hFrame, FALSE)) { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); wxLogError("Error setting parent for submenu. Error: %s\n", sError); } - if (!::WinSetOwner(m_hMenu, GetHWND())) + if (!::WinSetOwner(m_hMenu, m_hFrame)) { vError = ::WinGetLastError(vHabmain); sError = wxPMErrorToStr(vError); wxLogError("Error setting parent for submenu. Error: %s\n", sError); } - WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); } // end of wxFrame::InternalSetMenuBar // @@ -674,6 +646,7 @@ void wxFrame::OnSysColourChanged( SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); +#if wxUSE_STATUSBAR if (m_frameStatusBar) { wxSysColourChangedEvent vEvent2; @@ -681,6 +654,7 @@ void wxFrame::OnSysColourChanged( vEvent2.SetEventObject(m_frameStatusBar); m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2); } +#endif //wxUSE_STATUSBAR // // Propagate the event to the non-top-level children @@ -702,16 +676,27 @@ bool wxFrame::ShowFullScreen( m_bFsIsShowing = TRUE; m_lFsStyle = lStyle; +#if wxUSE_TOOLBAR wxToolBar* pTheToolBar = GetToolBar(); +#endif //wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR wxStatusBar* pTheStatusBar = GetStatusBar(); +#endif //wxUSE_STATUSBAR int nDummyWidth; +#if wxUSE_TOOLBAR if (pTheToolBar) pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight); +#endif //wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR if (pTheStatusBar) pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight); +#endif //wxUSE_STATUSBAR +#if wxUSE_TOOLBAR // // Zap the toolbar, menubar, and statusbar // @@ -720,14 +705,16 @@ bool wxFrame::ShowFullScreen( pTheToolBar->SetSize(-1,0); pTheToolBar->Show(FALSE); } +#endif //wxUSE_TOOLBAR if (lStyle & wxFULLSCREEN_NOMENUBAR) { - ::WinSetParent(m_hMenu, GetHWND(), FALSE); - ::WinSetOwner(m_hMenu, GetHWND()); - ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); + ::WinSetParent(m_hMenu, m_hFrame, FALSE); + ::WinSetOwner(m_hMenu, m_hFrame); + ::WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); } +#if wxUSE_STATUSBAR // // Save the number of fields in the statusbar // @@ -739,6 +726,7 @@ bool wxFrame::ShowFullScreen( } else m_nFsStatusBarFields = 0; +#endif //wxUSE_STATUSBAR // // Zap the frame borders @@ -747,16 +735,16 @@ bool wxFrame::ShowFullScreen( // // Save the 'normal' window style // - m_lFsOldWindowStyle = ::WinQueryWindowULong((HWND)GetHWND(), QWL_STYLE); + m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE); // - // Save the old position, width & height, maximize state + // Save the old position, width & height, maximize state // m_vFsOldSize = GetRect(); m_bFsIsMaximized = IsMaximized(); // - // Decide which window style flags to turn off + // Decide which window style flags to turn off // LONG lNewStyle = m_lFsOldWindowStyle; LONG lOffFlags = 0; @@ -771,7 +759,7 @@ bool wxFrame::ShowFullScreen( // // Change our window style to be compatible with full-screen mode // - ::WinSetWindowULong((HWND)GetHWND(), QWL_STYLE, (ULONG)lNewStyle); + ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle); // // Resize to the size of the desktop @@ -819,6 +807,7 @@ bool wxFrame::ShowFullScreen( m_bFsIsShowing = FALSE; +#if wxUSE_TOOLBAR wxToolBar* pTheToolBar = GetToolBar(); // @@ -829,22 +818,25 @@ bool wxFrame::ShowFullScreen( pTheToolBar->SetSize(-1, m_nFsToolBarHeight); pTheToolBar->Show(TRUE); } +#endif //wxUSE_TOOLBAR +#if wxUSE_STATUSBAR if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0)) { CreateStatusBar(m_nFsStatusBarFields); // PositionStatusBar(); } +#endif //wxUSE_STATUSBAR if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) { - ::WinSetParent(m_hMenu, GetHWND(), FALSE); - ::WinSetOwner(m_hMenu, GetHWND()); - ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); + ::WinSetParent(m_hMenu, m_hFrame, FALSE); + ::WinSetOwner(m_hMenu, m_hFrame); + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); } Maximize(m_bFsIsMaximized); - ::WinSetWindowULong( (HWND)GetHWND() + ::WinSetWindowULong( m_hFrame ,QWL_STYLE ,(ULONG)m_lFsOldWindowStyle ); @@ -881,14 +873,16 @@ bool wxFrame::OS2Create( ULONG ulExtraFlags = 0L; FRAMECDATA vFrameCtlData; HWND hParent = NULLHANDLE; - HWND hClient = NULLHANDLE; - HWND hFrame = NULLHANDLE; HWND hTitlebar = NULLHANDLE; HWND hHScroll = NULLHANDLE; HWND hVScroll = NULLHANDLE; + HWND hFrame = NULLHANDLE; + HWND hClient = NULLHANDLE; SWP vSwp[10]; RECTL vRect[10]; USHORT uCtlCount; + ERRORID vError; + wxString sError; m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON); @@ -959,37 +953,66 @@ bool wxFrame::OS2Create( vFrameCtlData.idResources = 0; // - // Create the frame window + // Create the frame window: We break ranks with other ports now + // and instead of calling down into the base wxWindow class' OS2Create + // we do all our own stuff here. We will set the needed pieces + // of wxWindow manually, here. // - if (!wxWindow::OS2Create( hParent - ,WC_FRAME - ,(PSZ)zTitle - ,0 - ,0, 0, 0, 0 - ,NULLHANDLE - ,HWND_TOP - ,(ULONG)nId - ,(PVOID)&vFrameCtlData - ,NULL - )) + hFrame = ::WinCreateStdWindow( hParent + ,ulStyleFlags // frame-window style + ,&ulCreateFlags // window style + ,(PSZ)zWclass // class name + ,(PSZ)zTitle // window title + ,0L // default client style + ,NULLHANDLE // resource in executable file + ,0 // resource id + ,&hClient // receives client window handle + ); + if (!hFrame) { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error creating frame. Error: %s\n", sError); return FALSE; } - // - // Now need to subclass window. // + // wxWindow class' m_hWnd set here and needed associations + // + m_hFrame = hFrame; + m_hWnd = hClient; + wxAssociateWinWithHandle(m_hWnd, this); + wxAssociateWinWithHandle(m_hFrame, this); + + m_backgroundColour.Set(wxString("GREY")); - //SubclassWin(GetHWND()); + LONG lColor = (LONG)m_backgroundColour.GetPixel(); + + if (!::WinSetPresParam( m_hWnd + ,PP_BACKGROUNDCOLOR + ,sizeof(LONG) + ,(PVOID)&lColor + )) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error creating frame. Error: %s\n", sError); + return FALSE; + } + + // + // Now need to subclass window. Instead of calling the SubClassWin in wxWindow + // we manually subclass here because we don't want to use the main wxWndProc + // by default + // + m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(m_hFrame, (PFNWP)wxFrameMainWndProc); -// ::WinCreateWindow(GetHWND(), WC_LISTBOX, "", WS_VISIBLE, 0, 0, -// 0, 0, GetHWND(), HWND_TOP, FID_CLIENT, NULL, NULL); // // Now size everything. If adding a menu the client will need to be resized. // - if (!::WinSetWindowPos( GetHWND() + if (!::WinSetWindowPos( m_hFrame ,HWND_TOP ,nX ,nY @@ -997,20 +1020,29 @@ bool wxFrame::OS2Create( ,nHeight ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER )) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error sizing frame. Error: %s\n", sError); return FALSE; -/* - uCtlCount = SHORT1FROMMP(::WinSendMsg(GetHWND(), WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect)); - for (int i = 0; i < uCtlCount; i++) + } + // + // We may have to be smarter here when variable sized toolbars are added! + // + if (!::WinSetWindowPos( m_hWnd + ,HWND_TOP + ,nX // + 20 + ,nY // + 20 + ,nWidth // - 60 + ,nHeight // - 60 + ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER + )) { - if (vSwp[i].hwnd == GetHWND()) - memcpy(&m_vSwp, &vSwp[i], sizeof(SWP)); - else if (vSwp[i].hwnd == m_hVScroll) - memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP)); - else if (vSwp[i].hwnd == m_hHScroll) - memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP)); - else if (vSwp[i].hwnd == m_hTitleBar) - memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP)); - }*/ + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error sizing client. Error: %s\n", sError); + return FALSE; + } return TRUE; } // end of wxFrame::OS2Create @@ -1022,27 +1054,51 @@ void wxFrame::OnActivate( wxActivateEvent& rEvent ) { - for (wxWindowList::Node* pNode = GetChildren().GetFirst(); - pNode; - pNode = pNode->GetNext()) + if ( rEvent.GetActive() ) { - // FIXME all this is totally bogus - we need to do the same as wxPanel, - // but how to do it without duplicating the code? + // restore focus to the child which was last focused + wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); - // restore focus - wxWindow* pChild = pNode->GetData(); + wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent() + : NULL; + if (!pParent) + { + pParent = this; + } - if (!pChild->IsTopLevel() + wxSetFocusToChild( pParent + ,&m_pWinLastFocused + ); + } + else // deactivating + { + // + // Remember the last focused child if it is our child + // + m_pWinLastFocused = FindFocus(); + + for (wxWindowList::Node* pNode = GetChildren().GetFirst(); + pNode; + pNode = pNode->GetNext()) + { + // FIXME all this is totally bogus - we need to do the same as wxPanel, + // but how to do it without duplicating the code? + + // restore focus + wxWindow* pChild = pNode->GetData(); + + if (!pChild->IsTopLevel() #if wxUSE_TOOLBAR - && !wxDynamicCast(pChild, wxToolBar) + && !wxDynamicCast(pChild, wxToolBar) #endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR - && !wxDynamicCast(pChild, wxStatusBar) + && !wxDynamicCast(pChild, wxStatusBar) #endif // wxUSE_STATUSBAR - ) - { - pChild->SetFocus(); - return; + ) + { + pChild->SetFocus(); + return; + } } } } // end of wxFrame::OnActivate @@ -1058,6 +1114,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const { wxPoint vPoint(0, 0); +#if wxUSE_TOOLBAR if (GetToolBar()) { int nWidth; @@ -1077,6 +1134,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const vPoint.y += nHeight; } } +#endif //wxUSE_TOOLBAR return vPoint; } // end of wxFrame::GetClientAreaOrigin @@ -1123,12 +1181,12 @@ void wxFrame::PositionToolBar() } #endif // wxUSE_STATUSBAR - if ( GetToolBar() ) + if ( m_frameToolBar ) { int nToolbarWidth; int nToolbarHeight; - GetToolBar()->GetSize( &nToolbarWidth + m_frameToolBar->GetSize( &nToolbarWidth ,&nToolbarHeight ); @@ -1199,8 +1257,12 @@ bool wxFrame::OS2TranslateMessage( if (!pMenuBar ) return FALSE; +#if wxUSE_ACCEL const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable(); return rAcceleratorTable.Translate(GetHWND(), pMsg); +#else + return FALSE; +#endif //wxUSE_ACCEL } // end of wxFrame::OS2TranslateMessage // --------------------------------------------------------------------------- @@ -1220,7 +1282,7 @@ bool wxFrame::HandlePaint() HPOINTER hIcon; if (m_icon.Ok()) - hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L); + hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L); else hIcon = (HPOINTER)m_hDefaultIcon; @@ -1255,15 +1317,7 @@ bool wxFrame::HandlePaint() } else { -/* DosBeep(500,500); - HPS hPS; - RECTL vRect; - - hPS = WinBeginPaint(GetHwnd(), 0L, &vRect); - WinFillRect(hPS, &vRect, SYSCLR_WINDOW); - WinEndPaint(hPS);*/ - - return wxWindow::HandlePaint(); + return(wxWindow::HandlePaint()); } } else @@ -1296,6 +1350,7 @@ bool wxFrame::HandleSize( // restore all child frames too // IconizeChildFrames(FALSE); + (void)SendIconizeEvent(FALSE); // // fall through @@ -1310,6 +1365,7 @@ bool wxFrame::HandleSize( // Iconize all child frames too // IconizeChildFrames(TRUE); + (void)SendIconizeEvent(); m_bIconized = TRUE; break; } @@ -1333,8 +1389,11 @@ bool wxFrame::HandleSize( } #endif // wxUSE_NATIVE_STATUSBAR -// PositionStatusBar(); + PositionStatusBar(); +#if wxUSE_TOOLBAR PositionToolBar(); +#endif // wxUSE_TOOLBAR + wxSizeEvent vEvent( wxSize( nX ,nY ) @@ -1396,36 +1455,12 @@ bool wxFrame::HandleMenuSelect( , WXHMENU hMenu ) { -// int nMenuItem; - -/* This is wrong section according to IBM's documentation - if (nFlags == 0xFFFF && hMenu == 0) - { - // - // Menu was removed from screen - // - nMenuItem = -1; - } - else if (!(nFlags & MIS_SUBMENU) && !(nFlags & MIS_SEPARATOR)) - { - nMenuItem = nItem; - } - else - { - // - // Don't give hints for separators (doesn't make sense) nor for the - // items opening popup menus (they don't have them anyhow) - // - return FALSE; - } -*/ - if( !nFlags ) { MENUITEM mItem; MRESULT rc; - rc = WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem); + rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem); if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR))) { @@ -1439,8 +1474,138 @@ bool wxFrame::HandleMenuSelect( } // end of wxFrame::HandleMenuSelect // --------------------------------------------------------------------------- -// the window proc for wxFrame +// Main Frame window proc // --------------------------------------------------------------------------- +MRESULT EXPENTRY wxFrameMainWndProc( + HWND hWnd +, ULONG ulMsg +, MPARAM wParam +, MPARAM lParam +) +{ + MRESULT rc = (MRESULT)0; + bool bProcessed = FALSE; + wxFrame* pWnd = NULL; + + pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); + switch (ulMsg) + { + case WM_QUERYFRAMECTLCOUNT: + if(pWnd && pWnd->m_fnOldWndProc) + { + USHORT uItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam)); + + rc = MRFROMSHORT(uItemCount); + } + break; + + case WM_FORMATFRAME: +///////////////////////////////////////////////////////////////////////////////// +// Applications that subclass frame controls may find that the frame is already +// subclassed the number of frame controls is variable. +// The WM_FORMATFRAME and WM_QUERYFRAMECTLCOUNT messages must always be +// subclassed by calling the previous window procedure and modifying its result. +//////////////////////////////////////////////////////////////////////////////// + { + int nItemCount; + int i; + PSWP pSWP = NULL; + SWP vSwpStb; + RECTL vRectl; + RECTL vRstb; + int nHeight=0; + + pSWP = (PSWP)PVOIDFROMMP(wParam); + nItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam)); + if(pWnd->m_frameStatusBar) + { + ::WinQueryWindowRect(pWnd->m_frameStatusBar->GetHWND(), &vRstb); + pWnd->m_frameStatusBar->GetSize(NULL, &nHeight); + ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl); + ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2); + vRstb = vRectl; + ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE); + + vSwpStb.x = vRectl.xLeft - vRstb.xLeft; + vSwpStb.y = vRectl.yBottom - vRstb.yBottom; + vSwpStb.cx = vRectl.xRight - vRectl.xLeft - 1; //?? -1 ?? + vSwpStb.cy = nHeight; + vSwpStb.fl = SWP_SIZE |SWP_MOVE | SWP_SHOW; + vSwpStb.hwnd = pWnd->m_frameStatusBar->GetHWND(); + vSwpStb.hwndInsertBehind = HWND_TOP; + } + ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl); + ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2); + ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE); + ::WinMapWindowPoints(HWND_DESKTOP, pWnd->m_hFrame, (PPOINTL)&vRectl, 2); + for(i = 0; i < nItemCount; i++) + { + if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd) + { + pSWP[i].x = vRectl.xLeft; + pSWP[i].y = vRectl.yBottom + nHeight; + pSWP[i].cx = vRectl.xRight - vRectl.xLeft; + pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight; + pSWP[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW; + pSWP[i].hwndInsertBehind = HWND_TOP; + } + } + bProcessed = TRUE; + rc = MRFROMSHORT(nItemCount); + } + break; + + default: + if(pWnd && pWnd->m_fnOldWndProc) + rc = pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam); + else + rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); + } + return rc; +} // end of wxFrameMainWndProc + +MRESULT EXPENTRY wxFrameWndProc( + HWND hWnd +, ULONG ulMsg +, MPARAM wParam +, MPARAM lParam +) +{ + // + // Trace all ulMsgs - useful for the debugging + // + HWND parentHwnd; + wxFrame* pWnd = NULL; + + parentHwnd = WinQueryWindow(hWnd,QW_PARENT); + pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); + + // + // When we get the first message for the HWND we just created, we associate + // it with wxWindow stored in wxWndHook + // + + MRESULT rc = (MRESULT)0; + bool bProcessed = FALSE; + + // + // Stop right here if we don't have a valid handle in our wxWindow object. + // + if (pWnd && !pWnd->GetHWND()) + { + pWnd->SetHWND((WXHWND) hWnd); + rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam ); + pWnd->SetHWND(0); + } + else + { + if (pWnd) + rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam); + else + rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); + } + return rc; +} // end of wxFrameWndProc MRESULT wxFrame::OS2WindowProc( WXUINT uMessage @@ -1461,18 +1626,34 @@ MRESULT wxFrame::OS2WindowProc( bProcessed = !Close(); break; - case WM_COMMAND: + case WM_PAINT: + bProcessed = HandlePaint(); + mRc = (MRESULT)FALSE; + break; + + case WM_ERASEBACKGROUND: + // + // Returning TRUE to requests PM to paint the window background + // in SYSCLR_WINDOW. We capture this here because the PS returned + // in Frames is the PS for the whole frame, which we can't really + // use at all. If you want to paint a different background, do it + // in an OnPaint using a wxPaintDC. + // + mRc = (MRESULT)(TRUE); + break; + + case WM_COMMAND: { WORD wId; WORD wCmd; WXHWND hWnd; UnpackCommand( (WXWPARAM)wParam - ,(WXLPARAM)lParam - ,&wId - ,&hWnd - ,&wCmd - ); + ,(WXLPARAM)lParam + ,&wId + ,&hWnd + ,&wCmd + ); bProcessed = HandleCommand( wId ,wCmd @@ -1501,17 +1682,19 @@ MRESULT wxFrame::OS2WindowProc( } break; - case WM_PAINT: - bProcessed = HandlePaint(); - break; + case WM_SIZE: + { + SHORT nScxold = SHORT1FROMMP(wParam); // Old horizontal size. + SHORT nScyold = SHORT2FROMMP(wParam); // Old vertical size. + SHORT nScxnew = SHORT1FROMMP(lParam); // New horizontal size. + SHORT nScynew = SHORT2FROMMP(lParam); // New vertical size. - case WM_ERASEBACKGROUND: - // - // Return TRUE to request PM to paint the window background - // in SYSCLR_WINDOW. - // - bProcessed = TRUE; - mRc = (MRESULT)(TRUE); + lParam = MRFROM2SHORT( nScxnew - 20 + ,nScynew - 30 + ); + } + bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam); + mRc = (MRESULT)FALSE; break; case CM_QUERYDRAGIMAGE: @@ -1526,85 +1709,6 @@ MRESULT wxFrame::OS2WindowProc( bProcessed = mRc != 0; } break; - - case WM_SIZE: - bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam); - break; - - case WM_QUERYFRAMECTLCOUNT: - { - USHORT itemCount = SHORT1FROMMR(OS2GetOldWndProc()(GetHWND(), uMessage, wParam, lParam)); - if(m_frameStatusBar) - ++itemCount; - bProcessed = TRUE; - mRc = MRFROMSHORT( itemCount ); - } - break; - - case WM_FORMATFRAME: - { - PSWP pSWP = 0; - USHORT usClient = 0; - SWP swp; - USHORT itemCount; - char s[128]; - - itemCount = SHORT1FROMMR(OS2GetOldWndProc()(GetHWND(), uMessage, wParam, lParam)); - pSWP = (PSWP)PVOIDFROMMP( wParam ); - - while(pSWP[usClient].hwnd != WinWindowFromID(GetHWND(), FID_CLIENT) - && usClient < itemCount) - usClient++; - - if(m_frameStatusBar) - { - int height; - - m_frameStatusBar->GetSize(NULL, &height); - - if(usClient == itemCount) - { - // frame has no client window - // using another method of calculation - RECTL wRectl; - - ::WinQueryWindowRect(GetHWND(), &wRectl); - ::WinMapWindowPoints(GetHWND(), HWND_DESKTOP, (PPOINTL)&wRectl, 2); - ::WinCalcFrameRect(GetHWND(), &wRectl, TRUE); - ::WinMapWindowPoints(HWND_DESKTOP, GetHWND(), (PPOINTL)&wRectl, 2); - - pSWP[itemCount].x = wRectl.xLeft; - pSWP[itemCount].y = wRectl.yBottom; - pSWP[itemCount].cx = wRectl.xRight - wRectl.xLeft - 1; - pSWP[itemCount].cy = height; - pSWP[itemCount].fl = SWP_SIZE | - SWP_MOVE | - SWP_SHOW; - pSWP[itemCount].hwnd = m_frameStatusBar->GetHWND(); - pSWP[itemCount].hwndInsertBehind = HWND_TOP; - ++itemCount; - } - else - { - pSWP[itemCount].x = pSWP[usClient].x; - pSWP[itemCount].y = pSWP[usClient].y; - pSWP[itemCount].cx = pSWP[usClient].cx; - pSWP[itemCount].cy = height; - pSWP[itemCount].fl = SWP_SIZE | - SWP_MOVE | - SWP_SHOW; - pSWP[itemCount].hwnd = m_frameStatusBar->GetHWND(); - pSWP[itemCount].hwndInsertBehind = HWND_TOP; - pSWP[usClient].cy -= height; - pSWP[usClient].y += height; - - ++itemCount; - } - } - bProcessed = TRUE; - mRc = MRFROMSHORT(itemCount); - } - break; } if (!bProcessed ) @@ -1615,63 +1719,62 @@ MRESULT wxFrame::OS2WindowProc( return (MRESULT)mRc; } // wxFrame::OS2WindowProc - void wxFrame::SetClient(WXHWND c_Hwnd) { - // Are we really need to implement it? + // Duh...nothing to do under OS/2 } -void wxFrame::SetClient(wxWindow* c_Window) +void wxFrame::SetClient( + wxWindow* pWindow +) { - wxWindow *oldClient = this->GetClient(); - bool clientHasFocus = oldClient && (oldClient == wxWindow::FindFocus()); + wxWindow* pOldClient = this->GetClient(); + bool bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus()); - if(oldClient == c_Window) // nothing to do + if(pOldClient == pWindow) // nothing to do return; + if(pWindow == NULL) // just need to remove old client + { + if(pOldClient == NULL) // nothing to do + return; - if(c_Window == NULL) // just need to remove old client - { - if(oldClient == NULL) // nothing to do - return; - - if( clientHasFocus ) + if(bClientHasFocus ) this->SetFocus(); - oldClient->Enable( FALSE ); - oldClient->Show( FALSE ); - ::WinSetWindowUShort(oldClient->GetHWND(), QWS_ID, (USHORT)oldClient->GetId()); + pOldClient->Enable( FALSE ); + pOldClient->Show( FALSE ); + ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId()); // to avoid OS/2 bug need to update frame - ::WinSendMsg((HWND)this->GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0); + ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0); return; - } + } - // else need to change client - if( clientHasFocus ) + // + // Else need to change client + // + if(bClientHasFocus) this->SetFocus(); - ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE); - if( oldClient ) - { - oldClient->Enable( FALSE ); - oldClient->Show( FALSE ); - ::WinSetWindowUShort(oldClient->GetHWND(), QWS_ID, (USHORT)oldClient->GetId()); - } - - c_Window->Reparent( this ); - ::WinSetWindowUShort(c_Window->GetHWND(), QWS_ID, FID_CLIENT); - - ::WinEnableWindowUpdate((HWND)GetHWND(), TRUE); - c_Window->Enable(); - c_Window->Show(); // ensure client is showing - - if( this->IsShown() ) - { - this->Show(); - ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0); - } + ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE); + if(pOldClient) + { + pOldClient->Enable(FALSE); + pOldClient->Show(FALSE); + ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId()); + } + pWindow->Reparent(this); + ::WinSetWindowUShort(pWindow->GetHWND(), QWS_ID, FID_CLIENT); + ::WinEnableWindowUpdate((HWND)GetHWND(), TRUE); + pWindow->Enable(); + pWindow->Show(); // ensure client is showing + if( this->IsShown() ) + { + this->Show(); + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + } } -wxWindow *wxFrame::GetClient() +wxWindow* wxFrame::GetClient() { - return wxFindWinFromHandle((WXHWND)::WinWindowFromID(GetHWND(), FID_CLIENT)); + return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT)); }