X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29a99be398541dd5a592b7532d30c2d54b188378..a92b0cfd2bd0bef75b43c071df0b0e028f360d8e:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index d697f9ca5d..bc13037ef5 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" @@ -44,7 +53,14 @@ extern wxWindowList wxModelessWindows; extern wxList WXDLLEXPORT wxPendingDelete; extern wxChar wxFrameClassName[]; + +#if wxUSE_MENUS_NATIVE extern wxMenu *wxCurrentPopupMenu; +#endif + +extern void wxAssociateWinWithHandle( HWND hWnd + ,wxWindowOS2* pWin + ); // ---------------------------------------------------------------------------- // event tables @@ -64,6 +80,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) // ---------------------------------------------------------------------------- // static class members // ---------------------------------------------------------------------------- +#if wxUSE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR bool wxFrame::m_bUseNativeStatusBar = TRUE; @@ -71,6 +88,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) bool wxFrame::m_bUseNativeStatusBar = FALSE; #endif +#endif //wxUSE_STATUSBAR + // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- @@ -89,7 +108,27 @@ void wxFrame::Init() m_nFsStatusBarHeight = 0; m_nFsToolBarHeight = 0; m_bFsIsMaximized = FALSE; + m_bWasMinimized = FALSE; m_bFsIsShowing = FALSE; + m_bIsShown = FALSE; + m_pWinLastFocused = (wxWindow *)NULL; + + m_hFrame = NULL; + m_hTitleBar = NULL; + m_hHScroll = NULL; + m_hVScroll = NULL; + + // + // Initialize SWP's + // + memset(&m_vSwp, 0, sizeof(SWP)); + memset(&m_vSwpClient, 0, sizeof(SWP)); + memset(&m_vSwpTitleBar, 0, sizeof(SWP)); + memset(&m_vSwpMenuBar, 0, sizeof(SWP)); + memset(&m_vSwpHScroll, 0, sizeof(SWP)); + memset(&m_vSwpVScroll, 0, sizeof(SWP)); + memset(&m_vSwpStatusBar, 0, sizeof(SWP)); + memset(&m_vSwpToolBar, 0, sizeof(SWP)); } // end of wxFrame::Init bool wxFrame::Create( @@ -106,12 +145,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)); @@ -125,37 +170,33 @@ bool wxFrame::Create( m_bIconized = FALSE; - // - // We pass NULL as parent to MSWCreate because frames with parents behave - // very strangely under Win95 shell. - // Alteration by JACS: keep normal Windows behaviour (float on top of parent) - // with this ulStyle. - // 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() { m_isBeingDeleted = TRUE; + wxTopLevelWindows.DeleteObject(this); DeleteAllBars(); @@ -166,9 +207,10 @@ wxFrame::~wxFrame() if (wxTheApp->GetExitOnFrameDelete()) { - ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0); + ::WinPostMsg(NULL, WM_QUIT, 0, 0); } } + wxModelessWindows.DeleteObject(this); // @@ -195,6 +237,53 @@ wxFrame::~wxFrame() } } // end of wxFrame::~wxFrame +// +// 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 wxFrame::AlterChildPos() +{ + // + // OS/2 is the only OS concerned about this + // + wxWindow* pChild = NULL; + wxControl* pCtrl = NULL; + RECTL vRect; + SWP vSwp; + + ::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; + } +} // end of wxFrame::AlterChildPos + // // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. // @@ -203,42 +292,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; - HWND hWndClient; + ::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! // - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &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 // @@ -251,44 +317,39 @@ void wxFrame::DoSetClientSize( ) { HWND hWnd = GetHwnd(); - HWND hWndClient; RECTL vRect; RECTL vRect2; - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); - - ::WinQueryWindowRect(hWnd, &vRect2); + ::WinQueryWindowRect(GetHwnd(), &vRect); + ::WinQueryWindowRect(GetHwnd(), &vRect2); // // Find the difference between the entire window (title bar and all) // and the client area; add this to the new client size to move the // window. Remember OS/2's backwards y coord system! // - int nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight + nWidth; - int nActualHeight = vRect2.yTop + vRect2.yTop - vRect.yTop + nHeight; + int nActualWidth = vRect2.xRight - vRect2.xLeft - vRect.xRight; + int nActualHeight = vRect2.yTop + vRect2.yTop - vRect.yTop; #if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - int nStatusX; - int nStatusY; + wxStatusBar* pStatusBar = GetStatusBar(); - GetStatusBar()->GetClientSize( &nStatusX - ,&nStatusY - ); - nActualHeight += nStatusY; + if (pStatusBar && pStatusBar->IsShown()) + { + nActualHeight += pStatusBar->GetSize().y; } + #endif // wxUSE_STATUSBAR wxPoint vPoint(GetClientAreaOrigin()); - nActualWidth += vPoint.y; - nActualHeight += vPoint.x; + + nActualWidth += vPoint.x; + nActualHeight += vPoint.y; POINTL vPointl; vPointl.x = vRect2.xLeft; - vPoint.y = vRect2.yTop; + vPointl.y = vRect2.yTop; ::WinSetWindowPos( hWnd ,HWND_TOP @@ -315,7 +376,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 @@ -328,16 +389,10 @@ void wxFrame::DoGetPosition( RECTL vRect; POINTL vPoint; - ::WinQueryWindowRect(GetHwnd(), &vRect); - vPoint.x = vRect.xLeft; - - // - // OS/2 is backwards [WIN32 it is vRect.yTop] - // - vPoint.y = vRect.yBottom; + ::WinQueryWindowRect(m_hFrame, &vRect); - *pX = vPoint.x; - *pY = vPoint.y; + *pX = vRect.xRight - vRect.xLeft; + *pY = vRect.yTop - vRect.yBottom; } // end of wxFrame::DoGetPosition // ---------------------------------------------------------------------------- @@ -345,31 +400,40 @@ void wxFrame::DoGetPosition( // ---------------------------------------------------------------------------- void wxFrame::DoShowWindow( - int nShowCmd + int bShowCmd ) { - ::WinShowWindow(GetHwnd(), nShowCmd); - m_bIconized = nShowCmd == SWP_MINIMIZE; + ::WinShowWindow(m_hFrame, (BOOL)bShowCmd); + m_bIconized = bShowCmd == SWP_MINIMIZE; } // end of wxFrame::DoShowWindow bool wxFrame::Show( bool bShow ) { - DoShowWindow(bShow ? SWP_SHOW : SWP_HIDE); + int nShowCmd; + SWP vSwp; + + if (bShow) + { + nShowCmd = SWP_SHOW; + } + else // hide + { + nShowCmd = SWP_HIDE; + } + + DoShowWindow(nShowCmd); if (bShow) { wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId); - ::WinSetWindowPos( (HWND) GetHWND() - ,HWND_TOP - ,0 - ,0 - ,0 - ,0 - ,SWP_ZORDER - ); + ::WinQueryWindowPos(m_hFrame, &vSwp); + m_bIconized = vSwp.fl & SWP_MINIMIZE; + ::WinQueryWindowPos(m_hWnd, &m_vSwpClient); + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + ::WinEnableWindow(m_hFrame, TRUE); vEvent.SetEventObject(this); GetEventHandler()->ProcessEvent(vEvent); } @@ -382,15 +446,18 @@ bool wxFrame::Show( { HWND hWndParent = GetHwndOf(GetParent()); + ::WinQueryWindowPos(hWndParent, &vSwp); + m_bIconized = vSwp.fl & SWP_MINIMIZE; if (hWndParent) ::WinSetWindowPos( hWndParent ,HWND_TOP - ,0 - ,0 - ,0 - ,0 - ,SWP_ZORDER + ,vSwp.x + ,vSwp.y + ,vSwp.cx + ,vSwp.cy + ,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE ); + ::WinEnableWindow(hWndParent, TRUE); } } return TRUE; @@ -417,9 +484,8 @@ void wxFrame::Restore() bool wxFrame::IsIconized() const { SWP vSwp; - bool bIconic; - ::WinQueryWindowPos(GetHwnd(), &vSwp); + ::WinQueryWindowPos(m_hFrame, &vSwp); if (vSwp.fl & SWP_MINIMIZE) ((wxFrame*)this)->m_bIconized = TRUE; @@ -434,7 +500,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 @@ -444,13 +510,18 @@ void wxFrame::SetIcon( { wxFrameBase::SetIcon(rIcon); - if (m_icon.Ok()) + if ((m_icon.GetHICON()) != NULLHANDLE) { - WinSendMsg( GetHwnd() - ,WM_SETICON - ,(MPARAM)((HICON)m_icon.GetHICON()) - ,NULL - ); + ::WinSendMsg( m_hFrame + ,WM_SETICON + ,(MPARAM)((HPOINTER)m_icon.GetHICON()) + ,NULL + ); + ::WinSendMsg( m_hFrame + ,WM_UPDATEFRAME + ,(MPARAM)FCF_ICON + ,(MPARAM)0 + ); } } // end of wxFrame::SetIcon @@ -463,51 +534,88 @@ wxStatusBar* wxFrame::OnCreateStatusBar( ) { wxStatusBar* pStatusBar = NULL; + SWP vSwp; + ERRORID vError; + wxString sError; pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber ,lulStyle ,vId ,rName - ); + ); + + if( !pStatusBar ) + return NULL; + + ::WinSetParent( pStatusBar->GetHWND() + ,m_hFrame + ,FALSE + ); + ::WinSetOwner( pStatusBar->GetHWND() + ,m_hFrame + ); + // + // to show statusbar + // + if(::WinIsWindowShowing(m_hFrame)) + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + return pStatusBar; } // end of wxFrame::OnCreateStatusBar void wxFrame::PositionStatusBar() { + SWP vSwp; + ERRORID vError; + wxString sError; + // // Native status bar positions itself // if (m_frameStatusBar) { int nWidth; - int nHeight; + int nY; int nStatbarWidth; int nStatbarHeight; HWND hWndClient; RECTL vRect; + RECTL vFRect; - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); + ::WinQueryWindowRect(m_hFrame, &vRect); + nY = vRect.yTop; + ::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; + nY = nY - (vRect.yBottom - vFRect.yBottom); m_frameStatusBar->GetSize( &nStatbarWidth ,&nStatbarHeight ); + nY= nY - nStatbarHeight; // // 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 + ,nY ,nWidth ,nStatbarHeight ); + if (!::WinQueryWindowPos(m_frameStatusBar->GetHWND(), &vSwp)) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error setting parent for StautsBar. Error: %s\n", sError); + return; + } } } // end of wxFrame::PositionStatusBar #endif // wxUSE_STATUSBAR +#if wxUSE_MENUS_NATIVE void wxFrame::DetachMenuBar() { if (m_frameMenuBar) @@ -521,47 +629,117 @@ void wxFrame::SetMenuBar( wxMenuBar* pMenuBar ) { + ERRORID vError; + wxString sError; + HWND hTitlebar = NULLHANDLE; + HWND hHScroll = NULLHANDLE; + HWND hVScroll = NULLHANDLE; + HWND hMenuBar = NULLHANDLE; + SWP vSwp; + SWP vSwpTitlebar; + SWP vSwpVScroll; + SWP vSwpHScroll; + SWP vSwpMenu; + if (!pMenuBar) { DetachMenuBar(); - return; + + // + // Actually remove the menu from the frame + // + m_hMenu = (WXHMENU)0; + InternalSetMenuBar(); + } + else // set new non NULL menu bar + { + m_frameMenuBar = NULL; + + // + // Can set a menubar several times. + // TODO: how to prevent a memory leak if you have a currently-unattached + // menubar? wxWindows assumes that the frame will delete the menu (otherwise + // there are problems for MDI). + // + if (pMenuBar->GetHMenu()) + { + m_hMenu = pMenuBar->GetHMenu(); + } + else + { + pMenuBar->Detach(); + m_hMenu = pMenuBar->Create(); + if (!m_hMenu) + return; + } + InternalSetMenuBar(); + m_frameMenuBar = pMenuBar; + pMenuBar->Attach((wxFrame*)this); } +} // end of wxFrame::SetMenuBar + +void wxFrame::AttachMenuBar( + wxMenuBar* pMenubar +) +{ + wxFrameBase::AttachMenuBar(pMenubar); - m_frameMenuBar = NULL; + m_frameMenuBar = pMenubar; - // Can set a menubar several times. - // TODO: how to prevent a memory leak if you have a currently-unattached - // menubar? wxWindows assumes that the frame will delete the menu (otherwise - // there are problems for MDI). - if (pMenuBar->GetHMenu()) + if (!pMenubar) { - m_hMenu = pMenuBar->GetHMenu(); + // + // Actually remove the menu from the frame + // + m_hMenu = (WXHMENU)0; + InternalSetMenuBar(); } - else + else // Set new non NULL menu bar { - pMenuBar->Detach(); + // + // Can set a menubar several times. + // + if (pMenubar->GetHMenu()) + { + m_hMenu = pMenubar->GetHMenu(); + } + else + { + if (pMenubar->IsAttached()) + pMenubar->Detach(); - m_hMenu = pMenuBar->Create(); + m_hMenu = pMenubar->Create(); - if (!m_hMenu) - return; + if (!m_hMenu) + return; + } + InternalSetMenuBar(); } - - InternalSetMenuBar(); - - m_frameMenuBar = pMenuBar; - pMenuBar->Attach(this); -} // end of wxFrame::SetMenuBar +} // end of wxFrame::AttachMenuBar void wxFrame::InternalSetMenuBar() { + ERRORID vError; + wxString sError; + // + // Set the parent and owner of the menubar to be the frame + // + if (!::WinSetParent(m_hMenu, m_hFrame, FALSE)) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error setting parent for submenu. Error: %s\n", sError); + } - ::WinPostMsg( GetHwnd() - ,WM_UPDATEFRAME - ,(MPARAM)FCF_MENU - ,NULL - ); + if (!::WinSetOwner(m_hMenu, m_hFrame)) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error setting parent for submenu. Error: %s\n", sError); + } + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); } // end of wxFrame::InternalSetMenuBar +#endif // wxUSE_MENUS_NATIVE // // Responds to colour changes, and passes event on to children @@ -573,6 +751,7 @@ void wxFrame::OnSysColourChanged( SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); +#if wxUSE_STATUSBAR if (m_frameStatusBar) { wxSysColourChangedEvent vEvent2; @@ -580,6 +759,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 @@ -593,86 +773,136 @@ bool wxFrame::ShowFullScreen( , long lStyle ) { - /* - // TODO - if (show) + if (bShow) { if (IsFullScreen()) return FALSE; - m_fsIsShowing = TRUE; - m_fsStyle = style; + m_bFsIsShowing = TRUE; + m_lFsStyle = lStyle; + +#if wxUSE_TOOLBAR + wxToolBar* pTheToolBar = GetToolBar(); +#endif //wxUSE_TOOLBAR - wxToolBar *theToolBar = GetToolBar(); - wxStatusBar *theStatusBar = GetStatusBar(); +#if wxUSE_STATUSBAR + wxStatusBar* pTheStatusBar = GetStatusBar(); +#endif //wxUSE_STATUSBAR - int dummyWidth; + int nDummyWidth; - if (theToolBar) - theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight); - if (theStatusBar) - theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight); +#if wxUSE_TOOLBAR + if (pTheToolBar) + pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight); +#endif //wxUSE_TOOLBAR - // zap the toolbar, menubar, and statusbar +#if wxUSE_STATUSBAR + if (pTheStatusBar) + pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight); +#endif //wxUSE_STATUSBAR - if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar) +#if wxUSE_TOOLBAR + // + // Zap the toolbar, menubar, and statusbar + // + if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar) { - theToolBar->SetSize(-1,0); - theToolBar->Show(FALSE); + pTheToolBar->SetSize(-1,0); + pTheToolBar->Show(FALSE); } +#endif //wxUSE_TOOLBAR - if (style & wxFULLSCREEN_NOMENUBAR) - SetMenu((HWND)GetHWND(), (HMENU) NULL); + if (lStyle & wxFULLSCREEN_NOMENUBAR) + { + ::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 - if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar) + // + if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar) { - m_fsStatusBarFields = theStatusBar->GetFieldsCount(); + m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount(); SetStatusBar((wxStatusBar*) NULL); - delete theStatusBar; + delete pTheStatusBar; } else - m_fsStatusBarFields = 0; + m_nFsStatusBarFields = 0; +#endif //wxUSE_STATUSBAR - // zap the frame borders + // + // Zap the frame borders + // - // save the 'normal' window style - m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE); + // + // Save the 'normal' window style + // + m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE); - // save the old position, width & height, maximize state - m_fsOldSize = GetRect(); - m_fsIsMaximized = IsMaximized(); + // + // Save the old position, width & height, maximize state + // + m_vFsOldSize = GetRect(); + m_bFsIsMaximized = IsMaximized(); - // decide which window style flags to turn off - LONG newStyle = m_fsOldWindowStyle; - LONG offFlags = 0; + // + // Decide which window style flags to turn off + // + LONG lNewStyle = m_lFsOldWindowStyle; + LONG lOffFlags = 0; - if (style & wxFULLSCREEN_NOBORDER) - offFlags |= WS_BORDER; - if (style & wxFULLSCREEN_NOCAPTION) - offFlags |= (WS_CAPTION | WS_SYSMENU); + if (lStyle & wxFULLSCREEN_NOBORDER) + lOffFlags |= FCF_BORDER; + if (lStyle & wxFULLSCREEN_NOCAPTION) + lOffFlags |= (FCF_TASKLIST | FCF_SYSMENU); - newStyle &= (~offFlags); + lNewStyle &= (~lOffFlags); - // change our window style to be compatible with full-screen mode - SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle); + // + // Change our window style to be compatible with full-screen mode + // + ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle); - // resize to the size of the desktop - int width, height; + // + // Resize to the size of the desktop + int nWidth; + int nHeight; - RECT rect; - ::GetWindowRect(GetDesktopWindow(), &rect); - width = rect.right - rect.left; - height = rect.bottom - rect.top; + RECTL vRect; - SetSize(width, height); + ::WinQueryWindowRect(HWND_DESKTOP, &vRect); + nWidth = vRect.xRight - vRect.xLeft; + // + // Rmember OS/2 is backwards! + // + nHeight = vRect.yTop - vRect.yBottom; - // now flush the window style cache and actually go full-screen - SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED); + SetSize( nWidth + ,nHeight + ); - wxSizeEvent event(wxSize(width, height), GetId()); - GetEventHandler()->ProcessEvent(event); + // + // Now flush the window style cache and actually go full-screen + // + ::WinSetWindowPos( (HWND) GetParent()->GetHWND() + ,HWND_TOP + ,0 + ,0 + ,nWidth + ,nHeight + ,SWP_SIZE | SWP_SHOW + ); + wxSizeEvent vEvent( wxSize( nWidth + ,nHeight + ) + ,GetId() + ); + + GetEventHandler()->ProcessEvent(vEvent); return TRUE; } else @@ -680,35 +910,51 @@ bool wxFrame::ShowFullScreen( if (!IsFullScreen()) return FALSE; - m_fsIsShowing = FALSE; + m_bFsIsShowing = FALSE; - wxToolBar *theToolBar = GetToolBar(); +#if wxUSE_TOOLBAR + wxToolBar* pTheToolBar = GetToolBar(); - // restore the toolbar, menubar, and statusbar - if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR)) + // + // Restore the toolbar, menubar, and statusbar + // + if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR)) { - theToolBar->SetSize(-1, m_fsToolBarHeight); - theToolBar->Show(TRUE); + pTheToolBar->SetSize(-1, m_nFsToolBarHeight); + pTheToolBar->Show(TRUE); } +#endif //wxUSE_TOOLBAR - if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0)) +#if wxUSE_STATUSBAR + if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0)) { - CreateStatusBar(m_fsStatusBarFields); - PositionStatusBar(); + CreateStatusBar(m_nFsStatusBarFields); +// PositionStatusBar(); } +#endif //wxUSE_STATUSBAR - if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) - SetMenu((HWND)GetHWND(), (HMENU)m_hMenu); - - Maximize(m_fsIsMaximized); - SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle); - SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y, - m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED); + if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 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( m_hFrame + ,QWL_STYLE + ,(ULONG)m_lFsOldWindowStyle + ); + ::WinSetWindowPos( (HWND) GetParent()->GetHWND() + ,HWND_TOP + ,m_vFsOldSize.x + ,m_vFsOldSize.y + ,m_vFsOldSize.width + ,m_vFsOldSize.height + ,SWP_SIZE | SWP_SHOW + ); return TRUE; } -*/ - return TRUE; } // end of wxFrame::ShowFullScreen // @@ -727,88 +973,173 @@ bool wxFrame::OS2Create( , long ulStyle ) { - ULONG ulPmFlags = 0; - ULONG ulExtraFlags = 0; - ULONG ulTempFlags = FCF_TITLEBAR | - FCF_SYSMENU | - FCF_MINBUTTON | - FCF_MAXBUTTON | - FCF_SIZEBORDER | - FCF_ICON | - FCF_MENU | - FCF_ACCELTABLE | - FCF_SHELLPOSITION | - FCF_TASKLIST; + ULONG ulCreateFlags = 0L; + ULONG ulStyleFlags = 0L; + ULONG ulExtraFlags = 0L; + FRAMECDATA vFrameCtlData; + HWND hParent = 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); - if ((ulStyle & wxCAPTION) == wxCAPTION) - ulPmFlags = FCF_TASKLIST; + if (pParent) + hParent = GetWinHwnd(pParent); + else + hParent = HWND_DESKTOP; + + if (ulStyle == wxDEFAULT_FRAME_STYLE) + ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | + FCF_MINMAX | FCF_TASKLIST; else - ulPmFlags = FCF_NOMOVEWITHOWNER; - - if (ulStyle & wxMINIMIZE_BOX) - ulPmFlags |= FCF_MINBUTTON; - if (ulStyle & wxMAXIMIZE_BOX) - ulPmFlags |= FCF_MAXBUTTON; - if (ulStyle & wxTHICK_FRAME) - ulPmFlags |= FCF_DLGBORDER; - if (ulStyle & wxSYSTEM_MENU) - ulPmFlags |= FCF_SYSMENU; + { + if ((ulStyle & wxCAPTION) == wxCAPTION) + ulCreateFlags = FCF_TASKLIST; + else + ulCreateFlags = FCF_NOMOVEWITHOWNER; + + if ((ulStyle & wxVSCROLL) == wxVSCROLL) + ulCreateFlags |= FCF_VERTSCROLL; + if ((ulStyle & wxHSCROLL) == wxHSCROLL) + ulCreateFlags |= FCF_HORZSCROLL; + if (ulStyle & wxMINIMIZE_BOX) + ulCreateFlags |= FCF_MINBUTTON; + if (ulStyle & wxMAXIMIZE_BOX) + ulCreateFlags |= FCF_MAXBUTTON; + if (ulStyle & wxTHICK_FRAME) + ulCreateFlags |= FCF_DLGBORDER; + if (ulStyle & wxSYSTEM_MENU) + ulCreateFlags |= FCF_SYSMENU; + if (ulStyle & wxCAPTION) + ulCreateFlags |= FCF_TASKLIST; + if (ulStyle & wxCLIP_CHILDREN) + { + // Invalid for frame windows under PM + } + + if (ulStyle & wxTINY_CAPTION_VERT) + ulCreateFlags |= FCF_TASKLIST; + if (ulStyle & wxTINY_CAPTION_HORIZ) + ulCreateFlags |= FCF_TASKLIST; + + if ((ulStyle & wxTHICK_FRAME) == 0) + ulCreateFlags |= FCF_BORDER; + if (ulStyle & wxFRAME_TOOL_WINDOW) + ulExtraFlags = kFrameToolWindow; + + if (ulStyle & wxSTAY_ON_TOP) + ulCreateFlags |= FCF_SYSMODAL; + } if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE)) - ulPmFlags |= WS_MINIMIZED; + ulStyleFlags |= WS_MINIMIZED; if (ulStyle & wxMAXIMIZE) - ulPmFlags |= WS_MAXIMIZED; - if (ulStyle & wxCAPTION) - ulPmFlags |= FCF_TASKLIST; - if (ulStyle & wxCLIP_CHILDREN) + ulStyleFlags |= WS_MAXIMIZED; + + // + // Clear the visible flag, we always call show + // + ulStyleFlags &= (unsigned long)~WS_VISIBLE; + m_bIconized = FALSE; + + // + // Set the frame control block + // + vFrameCtlData.cb = sizeof(vFrameCtlData); + vFrameCtlData.flCreateFlags = ulCreateFlags; + vFrameCtlData.hmodResources = 0L; + vFrameCtlData.idResources = 0; + + // + // 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. + // + + 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) { - // Invalid for frame windows under PM + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error creating frame. Error: %s\n", sError); + return FALSE; } // - // Keep this in wxFrame because it saves recoding this function - // in wxTinyFrame + // wxWindow class' m_hWnd set here and needed associations // -#if wxUSE_ITSY_BITSY - if (ulStyle & wxTINY_CAPTION_VERT) - ulExtraFlags |= kVertCaption; - if (ulStyle & wxTINY_CAPTION_HORIZ) - ulExtraFlags |= kHorzCaption; -#else - if (ulStyle & wxTINY_CAPTION_VERT) - ulPmFlags |= FCF_TASKLIST; - if (ulStyle & wxTINY_CAPTION_HORIZ) - ulPmFlags |= FCF_TASKLIST; -#endif - if ((ulStyle & wxTHICK_FRAME) == 0) - ulPmFlags |= FCF_BORDER; - if (ulStyle & wxFRAME_TOOL_WINDOW) - ulExtraFlags = kFrameToolWindow; + m_hFrame = hFrame; + m_hWnd = hClient; + wxAssociateWinWithHandle(m_hWnd, this); + wxAssociateWinWithHandle(m_hFrame, this); - if (ulStyle & wxSTAY_ON_TOP) - ulPmFlags |= FCF_SYSMODAL; + m_backgroundColour.Set(wxString("GREY")); + + 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; + } - if (ulPmFlags & ulTempFlags) - ulPmFlags = FCF_STANDARD; // - // Clear the visible flag, we always call show + // 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 // - ulPmFlags &= (unsigned long)~WS_VISIBLE; - m_bIconized = FALSE; - if ( !wxWindow::OS2Create( nId - ,pParent - ,zWclass - ,pWxWin - ,zTitle - ,nX - ,nY - ,nWidth - ,nHeight - ,ulPmFlags - ,NULL - ,ulExtraFlags)) + m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(m_hFrame, (PFNWP)wxFrameMainWndProc); + + // + // Now size everything. If adding a menu the client will need to be resized. + // + + if (pParent) { + nY = pParent->GetSize().y - (nY + nHeight); + } + else + { + RECTL vRect; + + ::WinQueryWindowRect(HWND_DESKTOP, &vRect); + nY = vRect.yTop - (nY + nHeight); + } + if (!::WinSetWindowPos( m_hFrame + ,HWND_TOP + ,nX + ,nY + ,nWidth + ,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; } return TRUE; @@ -822,27 +1153,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 @@ -858,6 +1213,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const { wxPoint vPoint(0, 0); +#if wxUSE_TOOLBAR if (GetToolBar()) { int nWidth; @@ -877,6 +1233,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const vPoint.y += nHeight; } } +#endif //wxUSE_TOOLBAR return vPoint; } // end of wxFrame::GetClientAreaOrigin @@ -907,8 +1264,7 @@ void wxFrame::PositionToolBar() HWND hWndClient; RECTL vRect; - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); + ::WinQueryWindowRect(GetHwnd(), &vRect); #if wxUSE_STATUSBAR if (GetStatusBar()) @@ -924,12 +1280,12 @@ void wxFrame::PositionToolBar() } #endif // wxUSE_STATUSBAR - if ( GetToolBar() ) + if ( m_frameToolBar ) { int nToolbarWidth; int nToolbarHeight; - GetToolBar()->GetSize( &nToolbarWidth + m_frameToolBar->GetSize( &nToolbarWidth ,&nToolbarHeight ); @@ -973,10 +1329,30 @@ void wxFrame::IconizeChildFrames( pNode = pNode->GetNext() ) { wxWindow* pWin = pNode->GetData(); + wxFrame* pFrame = wxDynamicCast(pWin, wxFrame); - if (pWin->IsKindOf(CLASSINFO(wxFrame)) ) + if ( pFrame +#if wxUSE_MDI_ARCHITECTURE + && !wxDynamicCast(pFrame, wxMDIChildFrame) +#endif // wxUSE_MDI_ARCHITECTURE + ) { - ((wxFrame *)pWin)->Iconize(bIconize); + // + // We don't want to restore the child frames which had been + // iconized even before we were iconized, so save the child frame + // status when iconizing the parent frame and check it when + // restoring it. + // + if (bIconize) + { + pFrame->m_bWasMinimized = pFrame->IsIconized(); + } + + // + // This test works for both iconizing and restoring + // + if (!pFrame->m_bWasMinimized) + pFrame->Iconize(bIconize); } } } // end of wxFrame::IconizeChildFrames @@ -992,18 +1368,20 @@ bool wxFrame::OS2TranslateMessage( WXMSG* pMsg ) { - if (wxWindow::OS2TranslateMessage(pMsg)) - return TRUE; // // try the menu bar accels // wxMenuBar* pMenuBar = GetMenuBar(); - if (!pMenuBar ) + if (!pMenuBar) return FALSE; +#if wxUSE_ACCEL && wxUSE_MENUS_NATIVE const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable(); - return rAcceleratorTable.Translate(this, pMsg); + return rAcceleratorTable.Translate(GetHWND(), pMsg); +#else + return FALSE; +#endif //wxUSE_ACCEL } // end of wxFrame::OS2TranslateMessage // --------------------------------------------------------------------------- @@ -1013,7 +1391,7 @@ bool wxFrame::HandlePaint() { RECTL vRect; - if (::WinQueryUpdateRect(GetHwnd(), &vRect)) + if (::WinQueryUpdateRect(GetHWND(), &vRect)) { if (m_bIconized) { @@ -1023,7 +1401,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; @@ -1044,8 +1422,7 @@ bool wxFrame::HandlePaint() HWND hWndClient; RECTL vRect3; - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect3); + ::WinQueryWindowRect(GetHwnd(), &vRect3); static const int nIconWidth = 32; static const int nIconHeight = 32; @@ -1059,7 +1436,40 @@ bool wxFrame::HandlePaint() } else { - return wxWindow::HandlePaint(); + if (!wxWindow::HandlePaint()) + { + HPS hPS; + RECTL vRect; + + hPS = ::WinBeginPaint( GetHwnd() + ,NULLHANDLE + ,&vRect + ); + if(hPS) + { + ::GpiCreateLogColorTable( hPS + ,0L + ,LCOLF_CONSECRGB + ,0L + ,(LONG)wxTheColourDatabase->m_nSize + ,(PLONG)wxTheColourDatabase->m_palTable + ); + ::GpiCreateLogColorTable( hPS + ,0L + ,LCOLF_RGB + ,0L + ,0L + ,NULL + ); + + ::WinFillRect( hPS + ,&vRect + ,GetBackgroundColour().GetPixel() + ); + ::WinEndPaint(hPS); + } + } + return TRUE; } } else @@ -1092,6 +1502,7 @@ bool wxFrame::HandleSize( // restore all child frames too // IconizeChildFrames(FALSE); + (void)SendIconizeEvent(FALSE); // // fall through @@ -1106,6 +1517,7 @@ bool wxFrame::HandleSize( // Iconize all child frames too // IconizeChildFrames(TRUE); + (void)SendIconizeEvent(); m_bIconized = TRUE; break; } @@ -1130,7 +1542,10 @@ bool wxFrame::HandleSize( #endif // wxUSE_NATIVE_STATUSBAR PositionStatusBar(); +#if wxUSE_TOOLBAR PositionToolBar(); +#endif // wxUSE_TOOLBAR + wxSizeEvent vEvent( wxSize( nX ,nY ) @@ -1139,6 +1554,7 @@ bool wxFrame::HandleSize( vEvent.SetEventObject(this); bProcessed = GetEventHandler()->ProcessEvent(vEvent); + AlterChildPos(); } return bProcessed; } // end of wxFrame::HandleSize @@ -1165,8 +1581,9 @@ bool wxFrame::HandleCommand( // // Handle here commands from menus and accelerators // - if (nCmd == 0 || nCmd == 1) + if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR) { +#if wxUSE_MENUS_NATIVE if (wxCurrentPopupMenu) { wxMenu* pPopupMenu = wxCurrentPopupMenu; @@ -1176,7 +1593,9 @@ bool wxFrame::HandleCommand( return pPopupMenu->OS2Command( nCmd ,nId ); + return TRUE; } +#endif if (ProcessCommand(nId)) { @@ -1192,36 +1611,157 @@ bool wxFrame::HandleMenuSelect( , WXHMENU hMenu ) { - int nMenuItem; + if( !nFlags ) + { + MENUITEM mItem; + MRESULT rc; + + rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem); + + if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR))) + { + wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nItem); + + vEvent.SetEventObject(this); + GetEventHandler()->ProcessEvent(vEvent); // return value would be ignored by PM + } + } + return TRUE; +} // end of wxFrame::HandleMenuSelect + +// --------------------------------------------------------------------------- +// 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; - if (nFlags == 0xFFFF && hMenu == 0) + pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); + switch (ulMsg) { - // - // Menu was removed from screen - // - nMenuItem = -1; + 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); } - else if (!(nFlags & MIS_SUBMENU) && !(nFlags & MIS_SEPARATOR)) + 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()) { - nMenuItem = nItem; + pWnd->SetHWND((WXHWND) hWnd); + rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam ); + pWnd->SetHWND(0); } 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 (pWnd) + rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam); + else + rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); } - wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nMenuItem); - - vEvent.SetEventObject(this); - return GetEventHandler()->ProcessEvent(vEvent); -} // end of wxFrame::HandleMenuSelect - -// --------------------------------------------------------------------------- -// the window proc for wxFrame -// --------------------------------------------------------------------------- + return rc; +} // end of wxFrameWndProc MRESULT wxFrame::OS2WindowProc( WXUINT uMessage @@ -1242,7 +1782,23 @@ 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; @@ -1254,6 +1810,7 @@ MRESULT wxFrame::OS2WindowProc( ,&hWnd ,&wCmd ); + bProcessed = HandleCommand( wId ,wCmd ,(WXHWND)hWnd @@ -1277,11 +1834,23 @@ MRESULT wxFrame::OS2WindowProc( ,wFlags ,hMenu ); + mRc = (MRESULT)TRUE; } break; - case WM_PAINT: - bProcessed = HandlePaint(); + 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. + + lParam = MRFROM2SHORT( nScxnew - 20 + ,nScynew - 30 + ); + } + bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam); + mRc = (MRESULT)FALSE; break; case CM_QUERYDRAGIMAGE: @@ -1289,17 +1858,13 @@ MRESULT wxFrame::OS2WindowProc( HPOINTER hIcon; if (m_icon.Ok()) - hIcon = (HPOINTER)::WinSendMsg(GetHwnd(), WM_QUERYICON, 0L, 0L); + hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L); else hIcon = (HPOINTER)m_hDefaultIcon; mRc = (MRESULT)hIcon; bProcessed = mRc != 0; } break; - - case WM_SIZE: - bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam); - break; } if (!bProcessed ) @@ -1307,6 +1872,65 @@ MRESULT wxFrame::OS2WindowProc( ,wParam ,lParam ); - return (MRESULT)0; + return (MRESULT)mRc; } // wxFrame::OS2WindowProc +void wxFrame::SetClient(WXHWND c_Hwnd) +{ + // Duh...nothing to do under OS/2 +} + +void wxFrame::SetClient( + wxWindow* pWindow +) +{ + wxWindow* pOldClient = this->GetClient(); + bool bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus()); + + if(pOldClient == pWindow) // nothing to do + return; + if(pWindow == NULL) // just need to remove old client + { + if(pOldClient == NULL) // nothing to do + return; + + if(bClientHasFocus ) + this->SetFocus(); + + 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->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0); + return; + } + + // + // Else need to change client + // + if(bClientHasFocus) + this->SetFocus(); + + ::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() +{ + return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT)); +}