salframe.cxx (af1486d9) salframe.cxx (e0343f61)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 669 unchanged lines hidden (view full) ---

678 // Parent setzen (Owner)
679 if ( hWndParent != 0 && hWndParent != HWND_DESKTOP )
680 WinSetOwner( hWndFrame, hWndParent );
681
682 Os2SalFrame* pParentFrame = GetWindowPtr( hWndParent );
683 if ( pParentFrame )
684 pFrame->mpParentFrame = pParentFrame;
685
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 669 unchanged lines hidden (view full) ---

678 // Parent setzen (Owner)
679 if ( hWndParent != 0 && hWndParent != HWND_DESKTOP )
680 WinSetOwner( hWndFrame, hWndParent );
681
682 Os2SalFrame* pParentFrame = GetWindowPtr( hWndParent );
683 if ( pParentFrame )
684 pFrame->mpParentFrame = pParentFrame;
685
686 // Icon setzen (YD win32 does it in the class registration)
687 if ( nFrameFlags & FCF_MINBUTTON )
688 WinSendMsg( hWndFrame, WM_SETICON, (MPARAM)pInst->mhAppIcon, (MPARAM)0 );
686 // since os2 windows always have a close button, always set icon
687 WinSendMsg( hWndFrame, WM_SETICON, (MPARAM)pInst->mhAppIcon, (MPARAM)0 );
689
690 // If we have an Window with an Caption Bar and without
691 // an MaximizeBox, we change the SystemMenu
692 if ( (nFrameFlags & (FCF_TITLEBAR | FCF_MAXBUTTON)) == (FCF_TITLEBAR) )
693 {
694 HWND hSysMenu = WinWindowFromID( hWndFrame, FID_SYSMENU );
695 if ( hSysMenu )
696 {

--- 3069 unchanged lines hidden --- 		688
689 // If we have an Window with an Caption Bar and without
690 // an MaximizeBox, we change the SystemMenu
691 if ( (nFrameFlags & (FCF_TITLEBAR | FCF_MAXBUTTON)) == (FCF_TITLEBAR) )
692 {
693 HWND hSysMenu = WinWindowFromID( hWndFrame, FID_SYSMENU );
694 if ( hSysMenu )
695 {

--- 3069 unchanged lines hidden ---