X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f6bcfd974ef26faf6f91a62cac09827e09463fd1..d6c9c1b71e069396bbe3850862de9aa10e6812e0:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index f3faceb427..d1b66cd195 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -64,6 +64,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) // ---------------------------------------------------------------------------- // static class members // ---------------------------------------------------------------------------- +#if wxUSE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR bool wxFrame::m_bUseNativeStatusBar = TRUE; @@ -71,6 +72,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) bool wxFrame::m_bUseNativeStatusBar = FALSE; #endif +#endif //wxUSE_STATUSBAR + // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- @@ -90,6 +93,8 @@ void wxFrame::Init() m_nFsToolBarHeight = 0; m_bFsIsMaximized = FALSE; m_bFsIsShowing = FALSE; + m_bIsShown = FALSE; + m_pWinLastFocused = (wxWindow *)NULL; // // Initialize SWP's @@ -122,8 +127,13 @@ bool wxFrame::Create( 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)); @@ -162,6 +172,7 @@ bool wxFrame::Create( wxFrame::~wxFrame() { m_isBeingDeleted = TRUE; + wxTopLevelWindows.DeleteObject(this); DeleteAllBars(); @@ -172,9 +183,10 @@ wxFrame::~wxFrame() if (wxTheApp->GetExitOnFrameDelete()) { - ::WinPostMsg(m_hFrame, WM_QUIT, 0, 0); + ::WinPostMsg(NULL, WM_QUIT, 0, 0); } } + wxModelessWindows.DeleteObject(this); // @@ -260,7 +272,7 @@ void wxFrame::DoSetClientSize( ::WinQueryWindowRect(GetHwnd(), &vRect); - ::WinQueryWindowRect(m_hFrame, &vRect2); + ::WinQueryWindowRect(GetHWND(), &vRect2); // // Find the difference between the entire window (title bar and all) @@ -290,9 +302,9 @@ void wxFrame::DoSetClientSize( POINTL vPointl; vPointl.x = vRect2.xLeft; - vPoint.y = vRect2.yTop; + vPointl.y = vRect2.yTop; - ::WinSetWindowPos( m_hFrame + ::WinSetWindowPos( hWnd ,HWND_TOP ,vPointl.x ,vPointl.y @@ -317,7 +329,7 @@ void wxFrame::DoGetSize( { RECTL vRect; - ::WinQueryWindowRect(m_hFrame, &vRect); + ::WinQueryWindowRect(GetHWND(), &vRect); *pWidth = vRect.xRight - vRect.xLeft; *pHeight = vRect.yTop - vRect.yBottom; } // end of wxFrame::DoGetSize @@ -330,7 +342,7 @@ void wxFrame::DoGetPosition( RECTL vRect; POINTL vPoint; - ::WinQueryWindowRect(m_hFrame, &vRect); + ::WinQueryWindowRect(GetHWND(), &vRect); vPoint.x = vRect.xLeft; // @@ -350,23 +362,8 @@ void wxFrame::DoShowWindow( int bShowCmd ) { - HWND hClient = NULLHANDLE; - SWP vSwp; - - // - // Reset the window position - // - WinQueryWindowPos(m_hFrame, &vSwp); - WinSetWindowPos( GetHwnd() - ,HWND_TOP - ,vSwp.x - ,vSwp.y - ,vSwp.cx - ,vSwp.cy - ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE - ); - ::WinShowWindow(m_hFrame, (BOOL)bShowCmd); - ::WinShowWindow(GetHwnd(), (BOOL)bShowCmd); + ::WinShowWindow(GetHWND(), (BOOL)bShowCmd); + m_bIconized = bShowCmd == SWP_MINIMIZE; } // end of wxFrame::DoShowWindow bool wxFrame::Show( @@ -381,9 +378,10 @@ bool wxFrame::Show( { wxActivateEvent vEvent(wxEVT_ACTIVATE, TRUE, m_windowId); - ::WinQueryWindowPos(m_hFrame, &vSwp); + ::WinQueryWindowPos(GetHWND(), &vSwp); m_bIconized = vSwp.fl & SWP_MINIMIZE; - ::WinEnableWindow(m_hFrame, TRUE); + ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0); + ::WinEnableWindow(GetHWND(), TRUE); vEvent.SetEventObject(this); GetEventHandler()->ProcessEvent(vEvent); } @@ -434,7 +432,6 @@ void wxFrame::Restore() bool wxFrame::IsIconized() const { SWP vSwp; - bool bIconic; ::WinQueryWindowPos(GetHwnd(), &vSwp); @@ -451,7 +448,7 @@ bool wxFrame::IsMaximized() const SWP vSwp; bool bIconic; - ::WinQueryWindowPos(m_hFrame, &vSwp); + ::WinQueryWindowPos(GetHWND(), &vSwp); return (vSwp.fl & SWP_MAXIMIZE); } // end of wxFrame::IsMaximized @@ -463,12 +460,12 @@ void wxFrame::SetIcon( if ((m_icon.GetHICON()) != NULLHANDLE) { - ::WinSendMsg( m_hFrame + ::WinSendMsg( GetHWND() ,WM_SETICON ,(MPARAM)((HPOINTER)m_icon.GetHICON()) ,NULL ); - ::WinSendMsg( m_hFrame + ::WinSendMsg( GetHWND() ,WM_UPDATEFRAME ,(MPARAM)FCF_ICON ,(MPARAM)0 @@ -488,51 +485,22 @@ wxStatusBar* wxFrame::OnCreateStatusBar( SWP vSwp; ERRORID vError; wxString sError; - HWND hWnd; pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber ,lulStyle ,vId ,rName - ); - // - // The default parent set for the Statusbar is m_hWnd which, of course, - // is the handle to the client window of the frame. We don't want that, - // so we have to set the parent to actually be the Frame. - // - hWnd = pStatusBar->GetHWND(); - if (!::WinSetParent(hWnd, m_hFrame, FALSE)) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError("Error setting parent for statusbar. Error: %s\n", sError); + ); + + if( !pStatusBar ) return NULL; - } // - // Also we need to reset it positioning to enable the SHOW attribute + // to show statusbar // - if (!::WinQueryWindowPos((HWND)pStatusBar->GetHWND(), &vSwp)) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError("Error querying frame for statusbar position. Error: %s\n", sError); - return NULL; - } - if (!::WinSetWindowPos( (HWND)pStatusBar->GetHWND() - ,HWND_TOP - ,vSwp.cx - ,vSwp.cy - ,vSwp.x - ,vSwp.y - ,SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_ZORDER - )) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError("Error setting statusbar position. Error: %s\n", sError); - return NULL; - } + if( ::WinIsWindowShowing(GetHWND()) ) + ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0); + return pStatusBar; } // end of wxFrame::OnCreateStatusBar @@ -580,10 +548,10 @@ void wxFrame::PositionStatusBar() } if (!::WinSetWindowPos( m_frameStatusBar->GetHWND() ,HWND_TOP - ,nStatbarWidth - ,nStatbarHeight ,vSwp.x ,vSwp.y + ,nStatbarWidth + ,nStatbarHeight ,SWP_SIZE | SWP_MOVE | SWP_SHOW | SWP_ZORDER )) { @@ -626,61 +594,50 @@ void wxFrame::SetMenuBar( if (!pMenuBar) { DetachMenuBar(); - return; - } - - 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; + // + // Actually remove the menu from the frame + // + m_hMenu = (WXHMENU)0; + InternalSetMenuBar(); } - - // - // Set the parent and owner of the menubar to be the frame - // - if (!::WinSetParent(m_hMenu, m_hFrame, FALSE)) + else // set new non NULL menu bar { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError("Error setting parent for submenu. Error: %s\n", sError); - } + m_frameMenuBar = NULL; - if (!::WinSetOwner(m_hMenu, m_hFrame)) - { - vError = ::WinGetLastError(vHabmain); - sError = wxPMErrorToStr(vError); - wxLogError("Error setting parent for submenu. Error: %s\n", sError); + // + // 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(this); } - InternalSetMenuBar(); - - m_frameMenuBar = pMenuBar; - pMenuBar->Attach(this); // // Now resize the client to fit the new frame // - WinQueryWindowPos(m_hFrame, &vSwp); - hTitlebar = WinWindowFromID(m_hFrame, FID_TITLEBAR); + WinQueryWindowPos(GetHWND(), &vSwp); + hTitlebar = WinWindowFromID(GetHWND(), FID_TITLEBAR); WinQueryWindowPos(hTitlebar, &vSwpTitlebar); - hHScroll = WinWindowFromID(m_hFrame, FID_HORZSCROLL); + hHScroll = WinWindowFromID(GetHWND(), FID_HORZSCROLL); WinQueryWindowPos(hHScroll, &vSwpHScroll); - hVScroll = WinWindowFromID(m_hFrame, FID_VERTSCROLL); + hVScroll = WinWindowFromID(GetHWND(), FID_VERTSCROLL); WinQueryWindowPos(hVScroll, &vSwpVScroll); - hMenuBar = WinWindowFromID(m_hFrame, FID_MENU); + hMenuBar = WinWindowFromID(GetHWND(), FID_MENU); WinQueryWindowPos(hMenuBar, &vSwpMenu); WinSetWindowPos( GetHwnd() ,HWND_TOP @@ -694,7 +651,25 @@ void wxFrame::SetMenuBar( void wxFrame::InternalSetMenuBar() { - WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); + ERRORID vError; + wxString sError; + // + // Set the parent and owner of the menubar to be the frame + // + if (!::WinSetParent(m_hMenu, GetHWND(), FALSE)) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error setting parent for submenu. Error: %s\n", sError); + } + + if (!::WinSetOwner(m_hMenu, GetHWND())) + { + 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); } // end of wxFrame::InternalSetMenuBar // @@ -707,6 +682,7 @@ void wxFrame::OnSysColourChanged( SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); +#if wxUSE_STATUSBAR if (m_frameStatusBar) { wxSysColourChangedEvent vEvent2; @@ -714,6 +690,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 @@ -727,86 +704,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, GetHWND(), FALSE); + ::WinSetOwner(m_hMenu, GetHWND()); + ::WinSendMsg((HWND)GetHWND(), 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((HWND)GetHWND(), 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)GetHWND(), 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 @@ -814,35 +841,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, GetHWND(), FALSE); + ::WinSetOwner(m_hMenu, GetHWND()); + ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); + } + Maximize(m_bFsIsMaximized); + + ::WinSetWindowULong( (HWND)GetHWND() + ,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 // @@ -946,43 +989,35 @@ bool wxFrame::OS2Create( // // Create the frame window // - if ((m_hFrame = ::WinCreateWindow( hParent // Frame is parent - ,WC_FRAME // standard frame class - ,(PSZ)zTitle // Window title - ,0 // No styles - ,0, 0, 0, 0 // Window position - ,NULLHANDLE // Owner - ,HWND_TOP // Sibling - ,(ULONG)nId // ID - ,(PVOID)&vFrameCtlData // Creation data - ,NULL // Window Pres Params - )) == 0L) - { - return FALSE; - } - if (!wxWindow::OS2Create( m_hFrame - ,wxFrameClassName - ,NULL - ,0L - ,0L - ,0L - ,0L - ,0L + if (!wxWindow::OS2Create( hParent + ,WC_FRAME + ,(PSZ)zTitle + ,0 + ,0, 0, 0, 0 ,NULLHANDLE ,HWND_TOP - ,(unsigned long)FID_CLIENT - ,NULL + ,(ULONG)nId + ,(PVOID)&vFrameCtlData ,NULL )) { return FALSE; } + // + // Now need to subclass window. + // + + //SubclassWin(GetHWND()); + +// ::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( m_hFrame + + if (!::WinSetWindowPos( GetHWND() ,HWND_TOP ,nX ,nY @@ -991,11 +1026,11 @@ bool wxFrame::OS2Create( ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER )) return FALSE; - - uCtlCount = SHORT1FROMMP(::WinSendMsg(m_hFrame, WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect)); +/* + uCtlCount = SHORT1FROMMP(::WinSendMsg(GetHWND(), WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect)); for (int i = 0; i < uCtlCount; i++) { - if (vSwp[i].hwnd == m_hFrame) + 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)); @@ -1003,23 +1038,7 @@ bool wxFrame::OS2Create( memcpy(&m_vSwpVScroll, &vSwp[i], sizeof(SWP)); else if (vSwp[i].hwnd == m_hTitleBar) memcpy(&m_vSwpTitleBar, &vSwp[i], sizeof(SWP)); - } - - // - // Now set the size of the client - // - WinSetWindowPos( hClient - ,HWND_TOP - ,SV_CXSIZEBORDER/2 - ,(SV_CYSIZEBORDER/2) + m_vSwpHScroll.cy/2 - ,m_vSwp.cx - ((SV_CXSIZEBORDER + 1) + m_vSwpVScroll.cx) - ,m_vSwp.cy - ((SV_CYSIZEBORDER + 1) + m_vSwpTitleBar.cy + m_vSwpHScroll.cy/2) - ,SWP_SIZE | SWP_MOVE - ); - - // - // Set the client window's background, otherwise it is transparent! - // + }*/ return TRUE; } // end of wxFrame::OS2Create @@ -1067,6 +1086,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const { wxPoint vPoint(0, 0); +#if wxUSE_TOOLBAR if (GetToolBar()) { int nWidth; @@ -1086,6 +1106,7 @@ wxPoint wxFrame::GetClientAreaOrigin() const vPoint.y += nHeight; } } +#endif //wxUSE_TOOLBAR return vPoint; } // end of wxFrame::GetClientAreaOrigin @@ -1208,8 +1229,12 @@ bool wxFrame::OS2TranslateMessage( if (!pMenuBar ) return FALSE; +#if wxUSE_ACCEL const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable(); - return rAcceleratorTable.Translate(m_hFrame, pMsg); + return rAcceleratorTable.Translate(GetHWND(), pMsg); +#else + return FALSE; +#endif //wxUSE_ACCEL } // end of wxFrame::OS2TranslateMessage // --------------------------------------------------------------------------- @@ -1219,7 +1244,7 @@ bool wxFrame::HandlePaint() { RECTL vRect; - if (::WinQueryUpdateRect(m_hFrame, &vRect)) + if (::WinQueryUpdateRect(GetHWND(), &vRect)) { if (m_bIconized) { @@ -1229,7 +1254,7 @@ bool wxFrame::HandlePaint() HPOINTER hIcon; if (m_icon.Ok()) - hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L); + hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L); else hIcon = (HPOINTER)m_hDefaultIcon; @@ -1238,7 +1263,7 @@ bool wxFrame::HandlePaint() // is being processed // RECTL vRect2; - HPS hPs = ::WinBeginPaint(m_hFrame, NULLHANDLE, &vRect2); + HPS hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2); // // Erase background before painting or we get white background @@ -1264,12 +1289,13 @@ bool wxFrame::HandlePaint() } else { +/* DosBeep(500,500); HPS hPS; RECTL vRect; hPS = WinBeginPaint(GetHwnd(), 0L, &vRect); WinFillRect(hPS, &vRect, SYSCLR_WINDOW); - WinEndPaint(hPS); + WinEndPaint(hPS);*/ return wxWindow::HandlePaint(); } @@ -1341,8 +1367,11 @@ bool wxFrame::HandleSize( } #endif // wxUSE_NATIVE_STATUSBAR - PositionStatusBar(); +// PositionStatusBar(); +#if wxUSE_TOOLBAR PositionToolBar(); +#endif // wxUSE_TOOLBAR + wxSizeEvent vEvent( wxSize( nX ,nY ) @@ -1377,7 +1406,7 @@ bool wxFrame::HandleCommand( // // Handle here commands from menus and accelerators // - if (nCmd == 0 || nCmd == 1) + if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR) { if (wxCurrentPopupMenu) { @@ -1404,8 +1433,9 @@ bool wxFrame::HandleMenuSelect( , WXHMENU hMenu ) { - int nMenuItem; +// int nMenuItem; +/* This is wrong section according to IBM's documentation if (nFlags == 0xFFFF && hMenu == 0) { // @@ -1425,10 +1455,24 @@ bool wxFrame::HandleMenuSelect( // return FALSE; } - wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nMenuItem); +*/ - vEvent.SetEventObject(this); - return GetEventHandler()->ProcessEvent(vEvent); + 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 // --------------------------------------------------------------------------- @@ -1461,11 +1505,12 @@ MRESULT wxFrame::OS2WindowProc( WXHWND hWnd; UnpackCommand( (WXWPARAM)wParam - ,(WXLPARAM)lParam - ,&wId - ,&hWnd - ,&wCmd - ); + ,(WXLPARAM)lParam + ,&wId + ,&hWnd + ,&wCmd + ); + bProcessed = HandleCommand( wId ,wCmd ,(WXHWND)hWnd @@ -1489,6 +1534,7 @@ MRESULT wxFrame::OS2WindowProc( ,wFlags ,hMenu ); + mRc = (MRESULT)TRUE; } break; @@ -1510,7 +1556,7 @@ MRESULT wxFrame::OS2WindowProc( HPOINTER hIcon; if (m_icon.Ok()) - hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L); + hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L); else hIcon = (HPOINTER)m_hDefaultIcon; mRc = (MRESULT)hIcon; @@ -1521,6 +1567,87 @@ MRESULT wxFrame::OS2WindowProc( case WM_SIZE: bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam); break; + + case WM_QUERYFRAMECTLCOUNT: + { + USHORT itemCount = SHORT1FROMMR(OS2GetOldWndProc()(GetHWND(), uMessage, wParam, lParam)); +#if wxUSE_STATUSBAR + if(m_frameStatusBar) + ++itemCount; +#endif //wxUSE_STATUSBAR + + 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 wxUSE_STATUSBAR + 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; + } + } +#endif //wxUSE_STATUSBAR + + bProcessed = TRUE; + mRc = MRFROMSHORT(itemCount); + } + break; } if (!bProcessed ) @@ -1528,6 +1655,66 @@ MRESULT wxFrame::OS2WindowProc( ,wParam ,lParam ); - return (MRESULT)0; + return (MRESULT)mRc; } // wxFrame::OS2WindowProc + +void wxFrame::SetClient(WXHWND c_Hwnd) +{ + // Are we really need to implement it? +} + +void wxFrame::SetClient(wxWindow* c_Window) +{ + wxWindow *oldClient = this->GetClient(); + bool clientHasFocus = oldClient && (oldClient == wxWindow::FindFocus()); + + if(oldClient == c_Window) // nothing to do + return; + + if(c_Window == NULL) // just need to remove old client + { + if(oldClient == NULL) // nothing to do + return; + + if( clientHasFocus ) + this->SetFocus(); + + oldClient->Enable( FALSE ); + oldClient->Show( FALSE ); + ::WinSetWindowUShort(oldClient->GetHWND(), QWS_ID, (USHORT)oldClient->GetId()); + // to avoid OS/2 bug need to update frame + ::WinSendMsg((HWND)this->GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0); + return; + } + + // else need to change client + if( clientHasFocus ) + 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); + } +} + +wxWindow *wxFrame::GetClient() +{ + return wxFindWinFromHandle((WXHWND)::WinWindowFromID(GetHWND(), FID_CLIENT)); +}