X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f23208caccf81b0b34c5c11b466c6bd64fdf0f9d..dbaf885e8725529ba66653aabe5f7f20bc1f28db:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index 0adff13a4b..31ce6652e5 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -90,6 +90,18 @@ void wxFrame::Init() m_nFsToolBarHeight = 0; m_bFsIsMaximized = FALSE; m_bFsIsShowing = FALSE; + + // + // 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( @@ -160,7 +172,7 @@ wxFrame::~wxFrame() if (wxTheApp->GetExitOnFrameDelete()) { - ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0); + ::WinPostMsg(m_hFrame, WM_QUIT, 0, 0); } } wxModelessWindows.DeleteObject(this); @@ -202,14 +214,12 @@ void wxFrame::DoGetClientSize( // top-left thus the += instead of the -= // RECTL vRect; - HWND hWndClient; // // PM has no GetClientRect that inherantly knows about the client window // We have to explicitly go fetch it! // - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); + ::WinQueryWindowRect(GetHwnd(), &vRect); #if wxUSE_STATUSBAR if ( GetStatusBar() ) @@ -245,14 +255,12 @@ void wxFrame::DoSetClientSize( ) { HWND hWnd = GetHwnd(); - HWND hWndClient; RECTL vRect; RECTL vRect2; - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); + ::WinQueryWindowRect(GetHwnd(), &vRect); - ::WinQueryWindowRect(hWnd, &vRect2); + ::WinQueryWindowRect(m_hFrame, &vRect2); // // Find the difference between the entire window (title bar and all) @@ -284,7 +292,7 @@ void wxFrame::DoSetClientSize( vPointl.x = vRect2.xLeft; vPoint.y = vRect2.yTop; - ::WinSetWindowPos( hWnd + ::WinSetWindowPos( m_hFrame ,HWND_TOP ,vPointl.x ,vPointl.y @@ -309,7 +317,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 @@ -322,7 +330,7 @@ void wxFrame::DoGetPosition( RECTL vRect; POINTL vPoint; - ::WinQueryWindowRect(GetHwnd(), &vRect); + ::WinQueryWindowRect(m_hFrame, &vRect); vPoint.x = vRect.xLeft; // @@ -339,31 +347,43 @@ void wxFrame::DoGetPosition( // ---------------------------------------------------------------------------- void wxFrame::DoShowWindow( - int nShowCmd + int bShowCmd ) { - ::WinShowWindow(GetHwnd(), nShowCmd); - m_bIconized = nShowCmd == SWP_MINIMIZE; + 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); } // end of wxFrame::DoShowWindow bool wxFrame::Show( bool bShow ) { - DoShowWindow(bShow ? SWP_SHOW : SWP_HIDE); + SWP vSwp; + + DoShowWindow((int)bShow); 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; + ::WinEnableWindow(m_hFrame, TRUE); vEvent.SetEventObject(this); GetEventHandler()->ProcessEvent(vEvent); } @@ -376,15 +396,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; @@ -428,7 +451,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 @@ -438,14 +461,14 @@ void wxFrame::SetIcon( { wxFrameBase::SetIcon(rIcon); - if (m_icon.Ok()) + if ((m_icon.GetHICON()) != NULLHANDLE) { - ::WinSendMsg( GetHwnd() + ::WinSendMsg( m_hFrame ,WM_SETICON - ,(MPARAM)((HICON)m_icon.GetHICON()) + ,(MPARAM)((HPOINTER)m_icon.GetHICON()) ,NULL ); - ::WinSendMsg( GetHwnd() + ::WinSendMsg( m_hFrame ,WM_UPDATEFRAME ,(MPARAM)FCF_ICON ,(MPARAM)0 @@ -485,8 +508,7 @@ void wxFrame::PositionStatusBar() HWND hWndClient; RECTL vRect; - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); + ::WinQueryWindowRect(GetHwnd(), &vRect); nWidth = vRect.xRight - vRect.xLeft; nHeight = vRect.yTop - vRect.yBottom; @@ -520,6 +542,20 @@ void wxFrame::SetMenuBar( wxMenuBar* pMenuBar ) { + ERRORID vError; + wxString sError; + HWND hClient = NULLHANDLE; + HWND hFrame = NULLHANDLE; + 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(); @@ -546,15 +582,52 @@ void wxFrame::SetMenuBar( return; } + // + // 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); + } + + if (!::WinSetOwner(m_hMenu, m_hFrame)) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error setting parent for submenu. Error: %s\n", sError); + } 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(hTitlebar, &vSwpTitlebar); + hHScroll = WinWindowFromID(m_hFrame, FID_HORZSCROLL); + WinQueryWindowPos(hHScroll, &vSwpHScroll); + hVScroll = WinWindowFromID(m_hFrame, FID_VERTSCROLL); + WinQueryWindowPos(hVScroll, &vSwpVScroll); + hMenuBar = WinWindowFromID(m_hFrame, 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() { - WinSendMsg((HWND)GetHwnd(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); + WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); } // end of wxFrame::InternalSetMenuBar // @@ -727,19 +800,16 @@ bool wxFrame::OS2Create( FRAMECDATA vFrameCtlData; HWND hParent = NULLHANDLE; HWND hClient = NULLHANDLE; + HWND hFrame = NULLHANDLE; HWND hTitlebar = NULLHANDLE; HWND hHScroll = NULLHANDLE; HWND hVScroll = NULLHANDLE; - SWP vSwp; - SWP vSwpTitlebar; - SWP vSwpVScroll; - SWP vSwpHScroll; + SWP vSwp[10]; + RECTL vRect[10]; + USHORT uCtlCount; m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON); - memset(&vSwp, '\0', sizeof(SWP)); - memset(&vSwpTitlebar, '\0', sizeof(SWP)); - memset(&vSwpVScroll, '\0', sizeof(SWP)); - memset(&vSwpHScroll, '\0', sizeof(SWP)); + if (pParent) hParent = GetWinHwnd(pParent); else @@ -805,39 +875,35 @@ bool wxFrame::OS2Create( // // Create the frame window // - if (!wxWindow::OS2Create( hParent - ,WC_FRAME - ,zTitle - ,ulStyleFlags - ,(long)nX - ,(long)nY - ,(long)nWidth - ,(long)nHeight - ,NULLHANDLE - ,HWND_TOP - ,(long)nId - ,(void*)&vFrameCtlData - ,NULL - )) + 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; } - // - // Create the client window. We must call the API from here rather than - // the static base class create because we need a separate handle - // - if ((hClient = ::WinCreateWindow( GetHwnd() // Frame is parent - ,zWclass // Custom client class - ,NULL // Window title - ,0 // No styles - ,0, 0, 0, 0 // Window position - ,NULLHANDLE // Owner - ,HWND_TOP // Sibling - ,FID_CLIENT // standard client ID - ,NULL // Creation data - ,NULL // Window Pres Params - )) == 0L) + if (!wxWindow::OS2Create( m_hFrame + ,wxFrameClassName + ,NULL + ,0L + ,0L + ,0L + ,0L + ,0L + ,NULLHANDLE + ,HWND_TOP + ,(unsigned long)FID_CLIENT + ,NULL + ,NULL + )) { return FALSE; } @@ -845,7 +911,7 @@ bool wxFrame::OS2Create( // // 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 @@ -855,32 +921,34 @@ bool wxFrame::OS2Create( )) return FALSE; - WinQueryWindowPos(GetHwnd(), &vSwp); - - if (ulCreateFlags & FCF_TITLEBAR) + uCtlCount = SHORT1FROMMP(::WinSendMsg(m_hFrame, WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect)); + for (int i = 0; i < uCtlCount; i++) { - hTitlebar = WinWindowFromID(GetHwnd(), FID_TITLEBAR); - WinQueryWindowPos(hTitlebar, &vSwpTitlebar); + if (vSwp[i].hwnd == m_hFrame) + 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)); } - if (ulCreateFlags & FCF_HORZSCROLL) - { - hHScroll = WinWindowFromID(GetHwnd(), FID_HORZSCROLL); - WinQueryWindowPos(hHScroll, &vSwpHScroll); - } - if (ulCreateFlags & FCF_VERTSCROLL) - { - hVScroll = WinWindowFromID(GetHwnd(), FID_VERTSCROLL); - WinQueryWindowPos(hVScroll, &vSwpVScroll); - } - if (!::WinSetWindowPos( hClient - ,HWND_TOP - ,SV_CXSIZEBORDER - ,(SV_CYSIZEBORDER - 1) + vSwpHScroll.cy - ,vSwp.cx - ((SV_CXSIZEBORDER * 2) + vSwpVScroll.cx) - ,vSwp.cy - ((SV_CYSIZEBORDER * 2) + 1 + vSwpTitlebar.cy + vSwpHScroll.cy) - ,SWP_SIZE | SWP_MOVE - )) - return FALSE; + + // + // 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 @@ -977,8 +1045,7 @@ void wxFrame::PositionToolBar() HWND hWndClient; RECTL vRect; - hWndClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); + ::WinQueryWindowRect(GetHwnd(), &vRect); #if wxUSE_STATUSBAR if (GetStatusBar()) @@ -1083,7 +1150,7 @@ bool wxFrame::HandlePaint() { RECTL vRect; - if (::WinQueryUpdateRect(GetHwnd(), &vRect)) + if (::WinQueryUpdateRect(m_hFrame, &vRect)) { if (m_bIconized) { @@ -1093,7 +1160,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; @@ -1102,7 +1169,7 @@ bool wxFrame::HandlePaint() // is being processed // RECTL vRect2; - HPS hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2); + HPS hPs = ::WinBeginPaint(m_hFrame, NULLHANDLE, &vRect2); // // Erase background before painting or we get white background @@ -1114,8 +1181,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; @@ -1354,12 +1420,21 @@ MRESULT wxFrame::OS2WindowProc( bProcessed = HandlePaint(); break; + case WM_ERASEBACKGROUND: + // + // Return TRUE to request PM to paint the window background + // in SYSCLR_WINDOW. + // + bProcessed = TRUE; + mRc = (MRESULT)(TRUE); + break; + case CM_QUERYDRAGIMAGE: { 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; mRc = (MRESULT)hIcon;