extern wxChar wxFrameClassName[];
extern wxMenu *wxCurrentPopupMenu;
-extern void wxAssociateWinWithHandle( HWND hWnd,wxWindow* pWin);
+extern void wxAssociateWinWithHandle( HWND hWnd
+ ,wxWindow* pWin
+ );
// ----------------------------------------------------------------------------
// event tables
sError = wxPMErrorToStr(vError);
wxLogError("Error setting parent for submenu. Error: %s\n", sError);
}
- WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
} // end of wxFrame::InternalSetMenuBar
//
if (lStyle & wxFULLSCREEN_NOMENUBAR)
{
- ::WinSetParent(m_hMenu, GetHWND(), FALSE);
- ::WinSetOwner(m_hMenu, GetHWND());
- ::WinSendMsg((HWND)GetHWND(), WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
+ ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+ ::WinSetOwner(m_hMenu, m_hFrame);
+ ::WinSendMsg((HWND)m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
}
#if wxUSE_STATUSBAR
//
// Save the 'normal' window style
//
- m_lFsOldWindowStyle = ::WinQueryWindowULong((HWND)GetHWND(), QWL_STYLE);
+ m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE);
//
- // Save the old position, width & height, maximize state
+ // Save the old position, width & height, maximize state
//
m_vFsOldSize = GetRect();
m_bFsIsMaximized = IsMaximized();
//
- // Decide which window style flags to turn off
+ // Decide which window style flags to turn off
//
LONG lNewStyle = m_lFsOldWindowStyle;
LONG lOffFlags = 0;
//
// Change our window style to be compatible with full-screen mode
//
- ::WinSetWindowULong((HWND)GetHWND(), QWL_STYLE, (ULONG)lNewStyle);
+ ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle);
//
// Resize to the size of the desktop
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);
+ ::WinSetParent(m_hMenu, m_hFrame, FALSE);
+ ::WinSetOwner(m_hMenu, m_hFrame);
+ ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0);
}
Maximize(m_bFsIsMaximized);
- ::WinSetWindowULong( (HWND)GetHWND()
+ ::WinSetWindowULong( m_hFrame
,QWL_STYLE
,(ULONG)m_lFsOldWindowStyle
);
wxAssociateWinWithHandle(m_hWnd, this);
wxAssociateWinWithHandle(m_hFrame, this);
+ m_backgroundColour.Set(wxString("GREY"));
+
+ LONG lColor = (LONG)m_backgroundColour.GetPixel();
+
+ if (!::WinSetPresParam( m_hWnd
+ ,PP_BACKGROUNDCOLOR
+ ,sizeof(LONG)
+ ,(PVOID)&lColor
+ ))
+ {
+ vError = ::WinGetLastError(vHabmain);
+ sError = wxPMErrorToStr(vError);
+ wxLogError("Error creating frame. Error: %s\n", sError);
+ return FALSE;
+ }
+
//
// Now need to subclass window. Instead of calling the SubClassWin in wxWindow
// we manually subclass here because we don't want to use the main wxWndProc
//
if (!::WinSetWindowPos( m_hWnd
,HWND_TOP
- ,nX + 20
- ,nY + 20
- ,nWidth - 60
- ,nHeight - 60
+ ,nX // + 20
+ ,nY // + 20
+ ,nWidth // - 60
+ ,nHeight // - 60
,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER
))
{
wxLogError("Error sizing client. Error: %s\n", sError);
return FALSE;
}
-
-/*
- uCtlCount = SHORT1FROMMP(::WinSendMsg(GetHWND(), WM_FORMATFRAME, (MPARAM)vSwp, (MPARAM)vRect));
- for (int i = 0; i < uCtlCount; i++)
- {
- 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));
- 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));
- }*/
return TRUE;
} // end of wxFrame::OS2Create
wxActivateEvent& rEvent
)
{
- for (wxWindowList::Node* pNode = GetChildren().GetFirst();
- pNode;
- pNode = pNode->GetNext())
+ if ( rEvent.GetActive() )
{
- // FIXME all this is totally bogus - we need to do the same as wxPanel,
- // but how to do it without duplicating the code?
+ // restore focus to the child which was last focused
+ wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd);
+
+ wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent()
+ : NULL;
+ if (!pParent)
+ {
+ pParent = this;
+ }
- // restore focus
- wxWindow* pChild = pNode->GetData();
+ wxSetFocusToChild( pParent
+ ,&m_pWinLastFocused
+ );
+ }
+ else // deactivating
+ {
+ //
+ // Remember the last focused child if it is our child
+ //
+ m_pWinLastFocused = FindFocus();
- if (!pChild->IsTopLevel()
+ for (wxWindowList::Node* pNode = GetChildren().GetFirst();
+ pNode;
+ pNode = pNode->GetNext())
+ {
+ // FIXME all this is totally bogus - we need to do the same as wxPanel,
+ // but how to do it without duplicating the code?
+
+ // restore focus
+ wxWindow* pChild = pNode->GetData();
+
+ if (!pChild->IsTopLevel()
#if wxUSE_TOOLBAR
- && !wxDynamicCast(pChild, wxToolBar)
+ && !wxDynamicCast(pChild, wxToolBar)
#endif // wxUSE_TOOLBAR
#if wxUSE_STATUSBAR
- && !wxDynamicCast(pChild, wxStatusBar)
+ && !wxDynamicCast(pChild, wxStatusBar)
#endif // wxUSE_STATUSBAR
- )
- {
- pChild->SetFocus();
- return;
+ )
+ {
+ pChild->SetFocus();
+ return;
+ }
}
}
} // end of wxFrame::OnActivate
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;
}
else
{
- return wxWindow::HandlePaint();
+ return(wxWindow::HandlePaint());
}
}
else
break;
case WM_PAINT:
- {
- HPS hPS;
- RECTL vRect;
-
- hPS = WinBeginPaint(m_hWnd, 0L, &vRect);
- ::WinFillRect(hPS, &vRect, CLR_BLUE /* SYSCLR_WINDOW */);
- ::WinEndPaint(hPS);
+ bProcessed = HandlePaint();
+ mRc = (MRESULT)FALSE;
+ break;
- mRc = (MRESULT)FALSE;
- bProcessed = TRUE;
- }
+ case WM_ERASEBACKGROUND:
+ //
+ // Returning TRUE to requests PM to paint the window background
+ // in SYSCLR_WINDOW. We capture this here because the PS returned
+ // in Frames is the PS for the whole frame, which we can't really
+ // use at all. If you want to paint a different background, do it
+ // in an OnPaint using a wxPaintDC.
+ //
+ mRc = (MRESULT)(TRUE);
break;
- case WM_COMMAND:
+ case WM_COMMAND:
{
WORD wId;
WORD wCmd;
mRc = (MRESULT)FALSE;
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;
pOldClient->Show( FALSE );
::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId());
// to avoid OS/2 bug need to update frame
- ::WinSendMsg((HWND)this->GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+ ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0);
return;
}
if( this->IsShown() )
{
this->Show();
- ::WinSendMsg(GetHWND(), WM_UPDATEFRAME, (MPARAM)~0, 0);
+ ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0);
}
}
wxWindow* wxFrame::GetClient()
{
- return wxFindWinFromHandle((WXHWND)::WinWindowFromID(GetHWND(), FID_CLIENT));
+ return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT));
}
projects / wxWidgets.git / blobdiff