X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b086de1460fd46c21a432ac3d8dec2759e5d05a..67e2efca87e3d3142ca545d9855748da15eac894:/src/os2/toplevel.cpp diff --git a/src/os2/toplevel.cpp b/src/os2/toplevel.cpp index 7596ef7dcc..a77cb0a375 100644 --- a/src/os2/toplevel.cpp +++ b/src/os2/toplevel.cpp @@ -35,6 +35,7 @@ #include "wx/log.h" #include "wx/intl.h" #include "wx/frame.h" + #include "wx/control.h" #endif //WX_PRECOMP #include "wx/os2/private.h" @@ -55,6 +56,7 @@ wxWindowList wxModelessWindows; extern void wxAssociateWinWithHandle( HWND hWnd ,wxWindowOS2* pWin ); +bool wxTopLevelWindowOS2::m_sbInitialized = FALSE; // ============================================================================ // wxTopLevelWindowMSW implementation @@ -110,22 +112,24 @@ void wxTopLevelWindowOS2::Init() memset(&m_vSwpClient, 0, sizeof(SWP)); } // end of wxTopLevelWindowIOS2::Init -long wxTopLevelWindowOS2::OS2GetCreateWindowFlags( - long* plExflags +WXDWORD wxTopLevelWindowOS2::OS2GetStyle( + long lStyle +, WXDWORD* pdwExflags ) const { - long lStyle = GetWindowStyle(); - long lMsflags = 0; + long lMsflags = wxWindow::OS2GetStyle( (lStyle & ~wxBORDER_MASK) | wxBORDER_NONE + ,pdwExflags + ); if (lStyle == wxDEFAULT_FRAME_STYLE) - lMsflags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | - FCF_MINMAX | FCF_TASKLIST; + lMsflags |= FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | + FCF_MINMAX | FCF_TASKLIST; else { if ((lStyle & wxCAPTION) == wxCAPTION) - lMsflags = FCF_TASKLIST; + lMsflags |= FCF_TASKLIST; else - lMsflags = FCF_NOMOVEWITHOWNER; + lMsflags |= FCF_NOMOVEWITHOWNER; if ((lStyle & wxVSCROLL) == wxVSCROLL) lMsflags |= FCF_VERTSCROLL; @@ -154,7 +158,7 @@ long wxTopLevelWindowOS2::OS2GetCreateWindowFlags( if ((lStyle & wxTHICK_FRAME) == 0) lMsflags |= FCF_BORDER; if (lStyle & wxFRAME_TOOL_WINDOW) - *plExflags = kFrameToolWindow; + *pdwExflags = kFrameToolWindow; if (lStyle & wxSTAY_ON_TOP) lMsflags |= FCF_SYSMODAL; @@ -268,6 +272,19 @@ bool wxTopLevelWindowOS2::CreateDialog( nX = (vSizeDpy.x - nWidth) / 2; nY = (vSizeDpy.y - nHeight) / 2; } + m_backgroundColour.Set(wxString("LIGHT GREY")); + + LONG lColor = (LONG)m_backgroundColour.GetPixel(); + + if (!::WinSetPresParam( m_hWnd + ,PP_BACKGROUNDCOLOR + ,sizeof(LONG) + ,(PVOID)&lColor + )) + { + return FALSE; + } + ::WinSetWindowPos( GetHwnd() ,HWND_TOP ,nX @@ -276,10 +293,8 @@ bool wxTopLevelWindowOS2::CreateDialog( ,nHeight ,SWP_MOVE | SWP_SIZE | SWP_ZORDER | SWP_SHOW ); - if (!rsTitle.IsNull()) - { - ::WinSetWindowText(GetHwnd(), rsTitle.c_str()); - } + ::WinQueryWindowPos(GetHwnd(), GetSwp()); + m_hFrame = m_hWnd; SubclassWin(m_hWnd); return TRUE; } // end of wxTopLevelWindowOS2::CreateDialog @@ -290,8 +305,8 @@ bool wxTopLevelWindowOS2::CreateFrame( , const wxSize& rSize ) { - long lExflags; - long lFlags = OS2GetCreateWindowFlags(&lExflags); + WXDWORD lExflags; + WXDWORD lFlags = OS2GetCreateWindowFlags(&lExflags); long lStyle = GetWindowStyleFlag(); int nX = rPos.x; int nY = rPos.y; @@ -354,7 +369,7 @@ bool wxTopLevelWindowOS2::CreateFrame( wxAssociateWinWithHandle(m_hWnd, this); wxAssociateWinWithHandle(m_hFrame, this); - m_backgroundColour.Set(wxString("GREY")); + m_backgroundColour.Set(wxString("MEDIUM GREY")); LONG lColor = (LONG)m_backgroundColour.GetPixel(); @@ -406,6 +421,14 @@ bool wxTopLevelWindowOS2::CreateFrame( wxLogError("Error sizing frame. Error: %s\n", sError); return FALSE; } + lStyle = ::WinQueryWindowULong( m_hWnd + ,QWL_STYLE + ); + lStyle |= WS_CLIPCHILDREN; + ::WinSetWindowULong( m_hWnd + ,QWL_STYLE + ,lStyle + ); return TRUE; } // end of wxTopLevelWindowOS2::CreateFrame @@ -481,64 +504,6 @@ wxTopLevelWindowOS2::~wxTopLevelWindowOS2() } } // end of wxTopLevelWindowOS2::~wxTopLevelWindowOS2 -// -// IF we have child controls in the Frame's client we need to alter -// the y position, because, OS/2 controls are positioned relative to -// wxWindows orgin (top left) not the OS/2 origin (bottom left) -// -void wxTopLevelWindowOS2::AlterChildPos() -{ - // - // OS/2 is the only OS concerned about this - // - wxWindow* pChild = NULL; - wxControl* pCtrl = NULL; - RECTL vRect; - SWP vSwp; - - ::WinQueryWindowRect(GetHwnd(), &vRect); - for (wxWindowList::Node* pNode = GetChildren().GetFirst(); - pNode; - pNode = pNode->GetNext()) - { - wxWindow* pChild = pNode->GetData(); - - ::WinQueryWindowPos(pChild->GetHWND(), &vSwp); - vSwp.y += (vRect.yTop - m_vSwpClient.cy); - if (pChild->IsKindOf(CLASSINFO(wxControl))) - { - pCtrl = wxDynamicCast(pChild, wxControl); - // - // Must deal with controls that have margins like ENTRYFIELD. The SWP - // struct of such a control will have and origin offset from its intended - // position by the width of the margins. - // - vSwp.y -= pCtrl->GetYComp(); - vSwp.x -= pCtrl->GetXComp(); - } - ::WinSetWindowPos( pChild->GetHWND() - ,HWND_TOP - ,vSwp.x - ,vSwp.y - ,vSwp.cx - ,vSwp.cy - ,SWP_MOVE - ); - ::WinQueryWindowPos(pChild->GetHWND(), &vSwp); - pChild = NULL; - } - ::WinQueryWindowPos(GetHwnd(), &m_vSwpClient); -} // end of wxTopLevelWindowOS2::AlterChildPos - -void wxTopLevelWindowOS2::UpdateInternalSize( - wxWindow* pChild -, int nHeight -) -{ - pChild->MoveChildren(m_vSwpClient.cy - nHeight); - ::WinQueryWindowPos(GetHwnd(), &m_vSwpClient); -} // end of wxTopLevelWindowOS2::UpdateInternalSize - // ---------------------------------------------------------------------------- // wxTopLevelWindowOS2 client size // ---------------------------------------------------------------------------- @@ -587,7 +552,12 @@ void wxTopLevelWindowOS2::DoShowWindow( int nShowCmd ) { - ::WinShowWindow(m_hFrame, (BOOL)nShowCmd); + ::WinShowWindow(m_hFrame, (BOOL)(nShowCmd & SWP_SHOW)); + + // + // Need to artificially send a size event as wxApps often expect to do some + // final child control sizing + SendSizeEvent(); m_bIconized = nShowCmd == SWP_MINIMIZE; } // end of wxTopLevelWindowOS2::DoShowWindow @@ -603,12 +573,12 @@ bool wxTopLevelWindowOS2::Show( { if (m_bMaximizeOnShow) { - nShowCmd = SWP_SHOW; + nShowCmd = SWP_MAXIMIZE; m_bMaximizeOnShow = FALSE; } else { - nShowCmd = SWP_HIDE; + nShowCmd = SWP_SHOW; } } else // hide @@ -625,7 +595,13 @@ bool wxTopLevelWindowOS2::Show( m_bIconized = vSwp.fl & SWP_MINIMIZE; ::WinQueryWindowPos(m_hWnd, &m_vSwpClient); ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + ::WinQueryWindowPos(m_hWnd, &vSwp); ::WinEnableWindow(m_hFrame, TRUE); + + // + // Deal with children + // + MoveChildren(m_vSwpClient.cy - vSwp.cy); vEvent.SetEventObject(this); GetEventHandler()->ProcessEvent(vEvent); } @@ -711,6 +687,21 @@ void wxTopLevelWindowOS2::Restore() DoShowWindow(SWP_RESTORE); } // end of wxTopLevelWindowOS2::Restore +// generate an artificial resize event +void wxTopLevelWindowOS2::SendSizeEvent() +{ + if (!m_bIconized) + { + RECTL vRect = wxGetWindowRect(GetHwnd()); + + (void)::WinPostMsg( m_hFrame + ,WM_SIZE + ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom) + ,MPFROM2SHORT(vRect.xRight - vRect.xLeft, vRect.yTop - vRect.yBottom) + ); + } +} // end of wxTopLevelWindowOS2::SendSizeEvent + // ---------------------------------------------------------------------------- // wxTopLevelWindowOS2 fullscreen // ----------------------------------------------------------------------------