Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Loads of framework and dll fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Webster
2000-03-09 21:10:00 +00:00
parent 60b8078990
commit 426d574504
6 changed files with 125 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/os2/frame.cpp
View File

@@ -339,30 +339,37 @@ void wxFrame::DoGetPosition(
// ----------------------------------------------------------------------------
void wxFrame::DoShowWindow(
int nShowCmd
int bShowCmd
)
{
::WinShowWindow(GetHwnd(), nShowCmd);
m_bIconized = nShowCmd == SWP_MINIMIZE;
HWND hClient;
hClient = ::WinWindowFromID(GetHwnd(), FID_CLIENT);
::WinShowWindow(GetHwnd(), (BOOL)bShowCmd);
::WinShowWindow(hClient, (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);
::WinQueryWindowPos(GetHwnd(), &vSwp);
m_bIconized = vSwp & SWP_MINIMIZE;
::WinSetWindowPos( (HWND) GetHWND()
,HWND_TOP
,0
,0
,0
,0
,SWP_ZORDER
,vSwp.x
,vSwp.y
,vSwp.cx
,vSwp.cy
,SWP_ZORDER | SWP_ACTIVATE | SWP_SHOW | SWP_MOVE
);
vEvent.SetEventObject(this);
GetEventHandler()->ProcessEvent(vEvent);
@@ -376,14 +383,16 @@ bool wxFrame::Show(
{
HWND hWndParent = GetHwndOf(GetParent());
::WinQueryWindowPos(hWndParent, &vSwp);
m_bIconized = vSwp & 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
);
}
}
@@ -438,11 +447,11 @@ void wxFrame::SetIcon(
{
wxFrameBase::SetIcon(rIcon);
if (m_icon.Ok())
if ((m_icon.GetHICON()) != NULLHANDLE)
{
::WinSendMsg( GetHwnd()
,WM_SETICON
,(MPARAM)((HICON)m_icon.GetHICON())
,(MPARAM)((HPOINTER)m_icon.GetHICON())
,NULL
);
::WinSendMsg( GetHwnd()