X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0fe536e3f6784c350fd8bf3793d8300499bf4ff4..29149a64916d6fdc53e445adca9ef83bc58fb6c3:/src/os2/frame.cpp diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index 6041cc2b5a..838197f4d4 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -13,6 +13,15 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP + #include "wx/defs.h" + #include "wx/object.h" + #include "wx/dynarray.h" + #include "wx/list.h" + #include "wx/hash.h" + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/event.h" #include "wx/setup.h" #include "wx/frame.h" #include "wx/menu.h" @@ -46,6 +55,10 @@ extern wxList WXDLLEXPORT wxPendingDelete; extern wxChar wxFrameClassName[]; extern wxMenu *wxCurrentPopupMenu; +extern void wxAssociateWinWithHandle( HWND hWnd + ,wxWindow* pWin + ); + // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- @@ -64,13 +77,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) // ---------------------------------------------------------------------------- // static class members // ---------------------------------------------------------------------------- +#if wxUSE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR - bool wxFrame::m_useNativeStatusBar = TRUE; + bool wxFrame::m_bUseNativeStatusBar = TRUE; #else - bool wxFrame::m_useNativeStatusBar = FALSE; + bool wxFrame::m_bUseNativeStatusBar = FALSE; #endif +#endif //wxUSE_STATUSBAR + // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- @@ -80,7 +96,7 @@ void wxFrame::Init() m_bIconized = FALSE; #if wxUSE_TOOLTIPS - m_hHwndToolTip = 0; + m_hWndToolTip = 0; #endif // Data to save/restore when calling ShowFullScreen m_lFsStyle = 0L; @@ -90,6 +106,25 @@ void wxFrame::Init() m_nFsToolBarHeight = 0; m_bFsIsMaximized = FALSE; m_bFsIsShowing = FALSE; + m_bIsShown = FALSE; + m_pWinLastFocused = (wxWindow *)NULL; + + m_hFrame = NULL; + m_hTitleBar = NULL; + m_hHScroll = NULL; + m_hVScroll = NULL; + + // + // 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( @@ -98,7 +133,7 @@ bool wxFrame::Create( , const wxString& rsTitle , const wxPoint& rPos , const wxSize& rSize -, long lStyle +, long lulStyle , const wxString& rsName ) { @@ -106,12 +141,18 @@ bool wxFrame::Create( int nY = rPos.y; int nWidth = rSize.x; int nHeight = rSize.y; + bool bOk = FALSE; SetName(rsName); - m_windowStyle = lStyle; + m_windowStyle = lulStyle; m_frameMenuBar = NULL; +#if wxUSE_TOOLBAR m_frameToolBar = NULL; +#endif //wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR m_frameStatusBar = NULL; +#endif //wxUSE_STATUSBAR SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); @@ -125,37 +166,33 @@ bool wxFrame::Create( m_bIconized = FALSE; - // - // We pass NULL as parent to MSWCreate because frames with parents behave - // very strangely under Win95 shell. - // Alteration by JACS: keep normal Windows behaviour (float on top of parent) - // with this style. - // if ((m_windowStyle & wxFRAME_FLOAT_ON_PARENT) == 0) pParent = NULL; - if (!pParent) - wxTopLevelWindows.Append(this); - - OS2Create( m_windowId - ,pParent - ,wxFrameClassName - ,this - ,rsTitle - ,nX - ,nY - ,nWidth - ,nHeight - ,lStyle - ); - - wxModelessWindows.Append(this); - return TRUE; + bOk = OS2Create( m_windowId + ,pParent + ,wxFrameClassName + ,this + ,rsTitle + ,nX + ,nY + ,nWidth + ,nHeight + ,lulStyle + ); + if (bOk) + { + if (!pParent) + wxTopLevelWindows.Append(this); + wxModelessWindows.Append(this); + } + return(bOk); } // end of wxFrame::Create wxFrame::~wxFrame() { m_isBeingDeleted = TRUE; + wxTopLevelWindows.DeleteObject(this); DeleteAllBars(); @@ -166,9 +203,10 @@ wxFrame::~wxFrame() if (wxTheApp->GetExitOnFrameDelete()) { - ::WinPostMsg(GetHwnd(), WM_QUIT, 0, 0); + ::WinPostMsg(NULL, WM_QUIT, 0, 0); } } + wxModelessWindows.DeleteObject(this); // @@ -203,45 +241,22 @@ void wxFrame::DoGetClientSize( , int* pY ) const { - // - // OS/2 PM's coordinates go from bottom-left not - // top-left thus the += instead of the -= - // RECTL vRect; - HWND hWndClient; + ::WinQueryWindowRect(GetHwnd(), &vRect); // - // PM has no GetClientRect that inherantly knows about the client window - // We have to explicitly go fetch it! + // No need to use statusbar code as in WIN32 as the FORMATFRAME + // window procedure ensures PM knows about the new frame client + // size internally. A ::WinQueryWindowRect is all that is needed! // - hWndClient = ::WinWindowFromId(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); - -#if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - int nStatusX - int nStatusY; - - GetStatusBar()->GetClientSize( &nStatusX - ,&nStatusY - ); - vRect.yBottom += nStatusY; - } -#endif // wxUSE_STATUSBAR - - wxPoint vPoint(GetClientAreaOrigin()); - - vRect.bottom += pt.y; - vRect.right -= pt.x; if (pX) - *pX = vRect.xRight; + *pX = vRect.xRight - vRect.xLeft; if (pY) - *pY = vRect.yBottom; + *pY = vRect.yTop - vRect.yBottom; } // end of wxFrame::DoGetClientSize -// +// // Set the client size (i.e. leave the calculation of borders etc. // to wxWindows) // @@ -251,14 +266,11 @@ void wxFrame::DoSetClientSize( ) { HWND hWnd = GetHwnd(); - HWND hWndClient; RECTL vRect; - RECT vRect2; + RECTL vRect2; - hWndClient = ::WinWindowFromId(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); - - ::WinQueryWindowRect(hWnd, &vRect2); + ::WinQueryWindowRect(GetHwnd(), &vRect); + ::WinQueryWindowRect(GetHwnd(), &vRect2); // // Find the difference between the entire window (title bar and all) @@ -288,7 +300,7 @@ void wxFrame::DoSetClientSize( POINTL vPointl; vPointl.x = vRect2.xLeft; - vPoint.y = vRect2.yTop; + vPointl.y = vRect2.yTop; ::WinSetWindowPos( hWnd ,HWND_TOP @@ -315,7 +327,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 @@ -326,18 +338,12 @@ void wxFrame::DoGetPosition( ) const { RECTL vRect; - POINT vPoint; + POINTL vPoint; - ::WinQueryWindowRect(GetHwnd(), &vRect); - vPoint.x = vRect.xLeft; - - // - // OS/2 is backwards [WIN32 it is vRect.yTop] - // - vPoint.y = vRect.yBottom; + ::WinQueryWindowRect(m_hFrame, &vRect); - *pX = vPoint.x; - *pY = vPoint.y; + *pX = vRect.xRight - vRect.xLeft; + *pY = vRect.yTop - vRect.yBottom; } // end of wxFrame::DoGetPosition // ---------------------------------------------------------------------------- @@ -345,31 +351,29 @@ void wxFrame::DoGetPosition( // ---------------------------------------------------------------------------- void wxFrame::DoShowWindow( - int nShowCmd + int bShowCmd ) { - ::WinShowWindow(GetHwnd(), nShowCmd); - m_bIconized = nShowCmd == SWP_MINIMIZE; + ::WinShowWindow(m_hFrame, (BOOL)bShowCmd); + m_bIconized = bShowCmd == SWP_MINIMIZE; } // end of wxFrame::DoShowWindow bool wxFrame::Show( bool bShow ) { - DoShowWindow(show ? SWP_SHOW : SW_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; + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + ::WinEnableWindow(m_hFrame, TRUE); vEvent.SetEventObject(this); GetEventHandler()->ProcessEvent(vEvent); } @@ -382,15 +386,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; @@ -417,10 +424,9 @@ void wxFrame::Restore() bool wxFrame::IsIconized() const { SWP vSwp; - bool bIconic; - ::WinQueryWindowPos(GetHwnd(), &vSwp) - + ::WinQueryWindowPos(m_hFrame, &vSwp); + if (vSwp.fl & SWP_MINIMIZE) ((wxFrame*)this)->m_bIconized = TRUE; else @@ -434,7 +440,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 @@ -444,53 +450,83 @@ void wxFrame::SetIcon( { wxFrameBase::SetIcon(rIcon); - if (m_icon.Ok()) + if ((m_icon.GetHICON()) != NULLHANDLE) { - WinSendMessage( GetHwnd() - ,WM_SETICON - ,(HICON) m_icon.GetHICON() - ,NULL - ) + ::WinSendMsg( m_hFrame + ,WM_SETICON + ,(MPARAM)((HPOINTER)m_icon.GetHICON()) + ,NULL + ); + ::WinSendMsg( m_hFrame + ,WM_UPDATEFRAME + ,(MPARAM)FCF_ICON + ,(MPARAM)0 + ); } } // end of wxFrame::SetIcon #if wxUSE_STATUSBAR wxStatusBar* wxFrame::OnCreateStatusBar( int nNumber -, long lStyle +, long lulStyle , wxWindowID vId , const wxString& rName ) { wxStatusBar* pStatusBar = NULL; + SWP vSwp; + ERRORID vError; + wxString sError; pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber - ,lStyle + ,lulStyle ,vId ,rName - ); + ); + + if( !pStatusBar ) + return NULL; + + ::WinSetParent( pStatusBar->GetHWND() + ,m_hFrame + ,FALSE + ); + ::WinSetOwner( pStatusBar->GetHWND() + ,m_hFrame + ); + // + // to show statusbar + // + if(::WinIsWindowShowing(m_hFrame)) + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + return pStatusBar; } // end of wxFrame::OnCreateStatusBar void wxFrame::PositionStatusBar() { + SWP vSwp; + ERRORID vError; + wxString sError; + // // Native status bar positions itself // if (m_frameStatusBar) { - int nWidth - int nHeight; - int nStatbarWidth + int nWidth; + int nStatbarWidth; int nStatbarHeight; HWND hWndClient; RECTL vRect; + RECTL vFRect; - hWndClient = ::WinWindowFromId(GetHwnd(), FID_CLIENT); - ::WinQueryWindowRect(hWndClient, &vRect); + ::WinQueryWindowRect(m_hFrame, &vRect); + ::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2); + vFRect = vRect; + ::WinCalcFrameRect(m_hFrame, &vRect, TRUE); nWidth = vRect.xRight - vRect.xLeft; - nHeight = vRect.xTop - vRect.xBottom; - + m_frameStatusBar->GetSize( &nStatbarWidth ,&nStatbarHeight ); @@ -499,11 +535,18 @@ void wxFrame::PositionStatusBar() // Since we wish the status bar to be directly under the client area, // we use the adjusted sizes without using wxSIZE_NO_ADJUSTMENTS. // - m_frameStatusBar->SetSize( 0 - ,nHeight + m_frameStatusBar->SetSize( vRect.xLeft - vFRect.xLeft + ,vRect.yBottom - vFRect.yBottom ,nWidth ,nStatbarHeight ); + if (!::WinQueryWindowPos(m_frameStatusBar->GetHWND(), &vSwp)) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error setting parent for StautsBar. Error: %s\n", sError); + return; + } } } // end of wxFrame::PositionStatusBar #endif // wxUSE_STATUSBAR @@ -518,175 +561,547 @@ void wxFrame::DetachMenuBar() } // end of wxFrame::DetachMenuBar void wxFrame::SetMenuBar( - wxMenuBar* pMenuBbar + wxMenuBar* pMenuBar ) { + ERRORID vError; + wxString sError; + 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(); - return; - } - wxCHECK_RET(!pMenuBar->GetFrame(), wxT("this menubar is already attached")); - - if (m_frameMenuBar) - delete m_frameMenuBar; - - m_hMenu = pMenuBbar->Create(); - m_ulMenubarId = pMenubar->GetMenubarId(); - if (m_ulMenubarId != FID_MENU) - { - ::WinSetWIndowUShort( m_hMenu - ,QWS_ID - ,(unsigned short(m_ulMenubarId) - ); + // + // Actually remove the menu from the frame + // + m_hMenu = (WXHMENU)0; + InternalSetMenuBar(); } + else // set new non NULL menu bar + { + m_frameMenuBar = NULL; - if (!m_hMenu) - return; - - InternalSetMenuBar(); - - m_frameMenuBar = menu_bar; - menu_bar->Attach(this); + // + // Can set a menubar several times. + // TODO: how to prevent a memory leak if you have a currently-unattached + // menubar? wxWindows assumes that the frame will delete the menu (otherwise + // there are problems for MDI). + // + if (pMenuBar->GetHMenu()) + { + m_hMenu = pMenuBar->GetHMenu(); + } + else + { + pMenuBar->Detach(); + m_hMenu = pMenuBar->Create(); + if (!m_hMenu) + return; + } + InternalSetMenuBar(); + m_frameMenuBar = pMenuBar; + pMenuBar->Attach(this); + } } // end of wxFrame::SetMenuBar void wxFrame::InternalSetMenuBar() { - - ::WinPostMsg( GetHwnd() - ,WM_UPDATEFRAME - ,FCF_MENU - ,NULL - ); + ERRORID vError; + wxString sError; + // + // 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); + } + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)FCF_MENU, (MPARAM)0); } // end of wxFrame::InternalSetMenuBar -// Responds to colour changes, and passes event on to children. -void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) +// +// Responds to colour changes, and passes event on to children +// +void wxFrame::OnSysColourChanged( + wxSysColourChangedEvent& rEvent +) { -// TODO: -/* SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); - if ( m_frameStatusBar ) +#if wxUSE_STATUSBAR + if (m_frameStatusBar) { - wxSysColourChangedEvent event2; - event2.SetEventObject( m_frameStatusBar ); - m_frameStatusBar->GetEventHandler()->ProcessEvent(event2); + wxSysColourChangedEvent vEvent2; + + vEvent2.SetEventObject(m_frameStatusBar); + m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2); } +#endif //wxUSE_STATUSBAR + // // Propagate the event to the non-top-level children - wxWindow::OnSysColourChanged(event); -*/ -} + // + wxWindow::OnSysColourChanged(rEvent); +} // end of wxFrame::OnSysColourChanged -/* - * Frame window - * - */ +// Pass TRUE to show full screen, FALSE to restore. +bool wxFrame::ShowFullScreen( + bool bShow +, long lStyle +) +{ + if (bShow) + { + if (IsFullScreen()) + return FALSE; + + m_bFsIsShowing = TRUE; + m_lFsStyle = lStyle; + +#if wxUSE_TOOLBAR + wxToolBar* pTheToolBar = GetToolBar(); +#endif //wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR + wxStatusBar* pTheStatusBar = GetStatusBar(); +#endif //wxUSE_STATUSBAR + + int nDummyWidth; + +#if wxUSE_TOOLBAR + if (pTheToolBar) + pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight); +#endif //wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR + if (pTheStatusBar) + pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight); +#endif //wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR + // + // Zap the toolbar, menubar, and statusbar + // + if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar) + { + pTheToolBar->SetSize(-1,0); + pTheToolBar->Show(FALSE); + } +#endif //wxUSE_TOOLBAR + + if (lStyle & wxFULLSCREEN_NOMENUBAR) + { + ::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 number of fields in the statusbar + // + if ((lStyle & wxFULLSCREEN_NOSTATUSBAR) && pTheStatusBar) + { + m_nFsStatusBarFields = pTheStatusBar->GetFieldsCount(); + SetStatusBar((wxStatusBar*) NULL); + delete pTheStatusBar; + } + else + m_nFsStatusBarFields = 0; +#endif //wxUSE_STATUSBAR + + // + // Zap the frame borders + // + + // + // Save the 'normal' window style + // + m_lFsOldWindowStyle = ::WinQueryWindowULong(m_hFrame, QWL_STYLE); + + // + // Save the old position, width & height, maximize state + // + m_vFsOldSize = GetRect(); + m_bFsIsMaximized = IsMaximized(); + + // + // Decide which window style flags to turn off + // + LONG lNewStyle = m_lFsOldWindowStyle; + LONG lOffFlags = 0; + + if (lStyle & wxFULLSCREEN_NOBORDER) + lOffFlags |= FCF_BORDER; + if (lStyle & wxFULLSCREEN_NOCAPTION) + lOffFlags |= (FCF_TASKLIST | FCF_SYSMENU); + + lNewStyle &= (~lOffFlags); + + // + // Change our window style to be compatible with full-screen mode + // + ::WinSetWindowULong((HWND)m_hFrame, QWL_STYLE, (ULONG)lNewStyle); + + // + // Resize to the size of the desktop + int nWidth; + int nHeight; + + RECTL vRect; + + ::WinQueryWindowRect(HWND_DESKTOP, &vRect); + nWidth = vRect.xRight - vRect.xLeft; + // + // Rmember OS/2 is backwards! + // + nHeight = vRect.yTop - vRect.yBottom; + + SetSize( nWidth + ,nHeight + ); -bool wxFrame::OS2Create(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title, - int x, int y, int width, int height, long style) + // + // Now flush the window style cache and actually go full-screen + // + ::WinSetWindowPos( (HWND) GetParent()->GetHWND() + ,HWND_TOP + ,0 + ,0 + ,nWidth + ,nHeight + ,SWP_SIZE | SWP_SHOW + ); + + wxSizeEvent vEvent( wxSize( nWidth + ,nHeight + ) + ,GetId() + ); + + GetEventHandler()->ProcessEvent(vEvent); + return TRUE; + } + else + { + if (!IsFullScreen()) + return FALSE; + + m_bFsIsShowing = FALSE; + +#if wxUSE_TOOLBAR + wxToolBar* pTheToolBar = GetToolBar(); + + // + // Restore the toolbar, menubar, and statusbar + // + if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR)) + { + pTheToolBar->SetSize(-1, m_nFsToolBarHeight); + pTheToolBar->Show(TRUE); + } +#endif //wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR + if ((m_lFsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_nFsStatusBarFields > 0)) + { + CreateStatusBar(m_nFsStatusBarFields); +// PositionStatusBar(); + } +#endif //wxUSE_STATUSBAR + if ((m_lFsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 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( m_hFrame + ,QWL_STYLE + ,(ULONG)m_lFsOldWindowStyle + ); + ::WinSetWindowPos( (HWND) GetParent()->GetHWND() + ,HWND_TOP + ,m_vFsOldSize.x + ,m_vFsOldSize.y + ,m_vFsOldSize.width + ,m_vFsOldSize.height + ,SWP_SIZE | SWP_SHOW + ); + return TRUE; + } +} // end of wxFrame::ShowFullScreen + +// +// Frame window +// +bool wxFrame::OS2Create( + int nId +, wxWindow* pParent +, const wxChar* zWclass +, wxWindow* pWxWin +, const wxChar* zTitle +, int nX +, int nY +, int nWidth +, int nHeight +, long ulStyle +) { - m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON); - - // If child windows aren't properly drawn initially, WS_CLIPCHILDREN - // could be the culprit. But without it, you can get a lot of flicker. - -// TODO: -/* - DWORD msflags = 0; - if ((style & wxCAPTION) == wxCAPTION) - msflags = WS_OVERLAPPED; - else - msflags = WS_POPUP; - - if (style & wxMINIMIZE_BOX) - msflags |= WS_MINIMIZEBOX; - if (style & wxMAXIMIZE_BOX) - msflags |= WS_MAXIMIZEBOX; - if (style & wxTHICK_FRAME) - msflags |= WS_THICKFRAME; - if (style & wxSYSTEM_MENU) - msflags |= WS_SYSMENU; - if ((style & wxMINIMIZE) || (style & wxICONIZE)) - msflags |= WS_MINIMIZE; - if (style & wxMAXIMIZE) - msflags |= WS_MAXIMIZE; - if (style & wxCAPTION) - msflags |= WS_CAPTION; - if (style & wxCLIP_CHILDREN) - msflags |= WS_CLIPCHILDREN; - - // Keep this in wxFrame because it saves recoding this function - // in wxTinyFrame -#if wxUSE_ITSY_BITSY - if (style & wxTINY_CAPTION_VERT) - msflags |= IBS_VERTCAPTION; - if (style & wxTINY_CAPTION_HORIZ) - msflags |= IBS_HORZCAPTION; -#else - if (style & wxTINY_CAPTION_VERT) - msflags |= WS_CAPTION; - if (style & wxTINY_CAPTION_HORIZ) - msflags |= WS_CAPTION; -#endif - if ((style & wxTHICK_FRAME) == 0) - msflags |= WS_BORDER; + ULONG ulCreateFlags = 0L; + ULONG ulStyleFlags = 0L; + ULONG ulExtraFlags = 0L; + FRAMECDATA vFrameCtlData; + HWND hParent = NULLHANDLE; + HWND hTitlebar = NULLHANDLE; + HWND hHScroll = NULLHANDLE; + HWND hVScroll = NULLHANDLE; + HWND hFrame = NULLHANDLE; + HWND hClient = NULLHANDLE; + SWP vSwp[10]; + RECTL vRect[10]; + USHORT uCtlCount; + ERRORID vError; + wxString sError; + + m_hDefaultIcon = (WXHICON) (wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON : wxDEFAULT_FRAME_ICON); - WXDWORD extendedStyle = MakeExtendedStyle(style); + if (pParent) + hParent = GetWinHwnd(pParent); + else + hParent = HWND_DESKTOP; -#if !defined(__WIN16__) && !defined(__SC__) - if (style & wxFRAME_TOOL_WINDOW) - extendedStyle |= WS_EX_TOOLWINDOW; -#endif + if (ulStyle == wxDEFAULT_FRAME_STYLE) + ulCreateFlags = FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU | + FCF_MINMAX | FCF_TASKLIST; + else + { + if ((ulStyle & wxCAPTION) == wxCAPTION) + ulCreateFlags = FCF_TASKLIST; + else + ulCreateFlags = FCF_NOMOVEWITHOWNER; + + if ((ulStyle & wxVSCROLL) == wxVSCROLL) + ulCreateFlags |= FCF_VERTSCROLL; + if ((ulStyle & wxHSCROLL) == wxHSCROLL) + ulCreateFlags |= FCF_HORZSCROLL; + if (ulStyle & wxMINIMIZE_BOX) + ulCreateFlags |= FCF_MINBUTTON; + if (ulStyle & wxMAXIMIZE_BOX) + ulCreateFlags |= FCF_MAXBUTTON; + if (ulStyle & wxTHICK_FRAME) + ulCreateFlags |= FCF_DLGBORDER; + if (ulStyle & wxSYSTEM_MENU) + ulCreateFlags |= FCF_SYSMENU; + if (ulStyle & wxCAPTION) + ulCreateFlags |= FCF_TASKLIST; + if (ulStyle & wxCLIP_CHILDREN) + { + // Invalid for frame windows under PM + } - if (style & wxSTAY_ON_TOP) - extendedStyle |= WS_EX_TOPMOST; + if (ulStyle & wxTINY_CAPTION_VERT) + ulCreateFlags |= FCF_TASKLIST; + if (ulStyle & wxTINY_CAPTION_HORIZ) + ulCreateFlags |= FCF_TASKLIST; - m_iconized = FALSE; - if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height, - msflags, NULL, extendedStyle) ) - return FALSE; + if ((ulStyle & wxTHICK_FRAME) == 0) + ulCreateFlags |= FCF_BORDER; + if (ulStyle & wxFRAME_TOOL_WINDOW) + ulExtraFlags = kFrameToolWindow; - // Seems to be necessary if we use WS_POPUP - // style instead of WS_OVERLAPPED - if (width > -1 && height > -1) - ::PostMessage(GetHwnd(), WM_SIZE, SIZE_RESTORED, MAKELPARAM(width, height)); -*/ - return TRUE; -} + if (ulStyle & wxSTAY_ON_TOP) + ulCreateFlags |= FCF_SYSMODAL; + } + if ((ulStyle & wxMINIMIZE) || (ulStyle & wxICONIZE)) + ulStyleFlags |= WS_MINIMIZED; + if (ulStyle & wxMAXIMIZE) + ulStyleFlags |= WS_MAXIMIZED; + + // + // Clear the visible flag, we always call show + // + ulStyleFlags &= (unsigned long)~WS_VISIBLE; + m_bIconized = FALSE; + + // + // Set the frame control block + // + vFrameCtlData.cb = sizeof(vFrameCtlData); + vFrameCtlData.flCreateFlags = ulCreateFlags; + vFrameCtlData.hmodResources = 0L; + vFrameCtlData.idResources = 0; + + // + // Create the frame window: We break ranks with other ports now + // and instead of calling down into the base wxWindow class' OS2Create + // we do all our own stuff here. We will set the needed pieces + // of wxWindow manually, here. + // + + hFrame = ::WinCreateStdWindow( hParent + ,ulStyleFlags // frame-window style + ,&ulCreateFlags // window style + ,(PSZ)zWclass // class name + ,(PSZ)zTitle // window title + ,0L // default client style + ,NULLHANDLE // resource in executable file + ,0 // resource id + ,&hClient // receives client window handle + ); + if (!hFrame) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error creating frame. Error: %s\n", sError); + return FALSE; + } + + // + // wxWindow class' m_hWnd set here and needed associations + // + m_hFrame = hFrame; + m_hWnd = hClient; + 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 + // by default + // + m_fnOldWndProc = (WXFARPROC) ::WinSubclassWindow(m_hFrame, (PFNWP)wxFrameMainWndProc); + + // + // Now size everything. If adding a menu the client will need to be resized. + // + + if (!::WinSetWindowPos( m_hFrame + ,HWND_TOP + ,nX + ,nY + ,nWidth + ,nHeight + ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER + )) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error sizing frame. Error: %s\n", sError); + return FALSE; + } + // + // We may have to be smarter here when variable sized toolbars are added! + // + if (!::WinSetWindowPos( m_hWnd + ,HWND_TOP + ,nX // + 20 + ,nY // + 20 + ,nWidth // - 60 + ,nHeight // - 60 + ,SWP_SIZE | SWP_MOVE | SWP_ACTIVATE | SWP_ZORDER + )) + { + vError = ::WinGetLastError(vHabmain); + sError = wxPMErrorToStr(vError); + wxLogError("Error sizing client. Error: %s\n", sError); + return FALSE; + } + return TRUE; +} // end of wxFrame::OS2Create +// // Default activation behaviour - set the focus for the first child // subwindow found. -void wxFrame::OnActivate(wxActivateEvent& event) +// +void wxFrame::OnActivate( + wxActivateEvent& rEvent +) { - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) + if ( rEvent.GetActive() ) + { + // 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; + } + + wxSetFocusToChild( pParent + ,&m_pWinLastFocused + ); + } + else // deactivating { - // FIXME all this is totally bogus - we need to do the same as wxPanel, - // but how to do it without duplicating the code? + // + // Remember the last focused child if it is our child + // + m_pWinLastFocused = FindFocus(); + + 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 *child = node->GetData(); + // restore focus + wxWindow* pChild = pNode->GetData(); - if ( !child->IsTopLevel() + if (!pChild->IsTopLevel() #if wxUSE_TOOLBAR - && !wxDynamicCast(child, wxToolBar) + && !wxDynamicCast(pChild, wxToolBar) #endif // wxUSE_TOOLBAR #if wxUSE_STATUSBAR - && !wxDynamicCast(child, wxStatusBar) + && !wxDynamicCast(pChild, wxStatusBar) #endif // wxUSE_STATUSBAR - ) - { - child->SetFocus(); - return; + ) + { + pChild->SetFocus(); + return; + } } } -} +} // end of wxFrame::OnActivate // ---------------------------------------------------------------------------- // wxFrame size management: we exclude the areas taken by menu/status/toolbars @@ -697,47 +1112,31 @@ void wxFrame::OnActivate(wxActivateEvent& event) // Checks if there is a toolbar, and returns the first free client position wxPoint wxFrame::GetClientAreaOrigin() const { - wxPoint pt(0, 0); + wxPoint vPoint(0, 0); + +#if wxUSE_TOOLBAR if (GetToolBar()) { - int w, h; - GetToolBar()->GetSize(& w, & h); + int nWidth; + int nHeight; + + GetToolBar()->GetSize( &nWidth + ,&nHeight + ); if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) { - pt.x += w; + vPoint.x += nWidth; } else { - pt.y += h; + // PM is backwards from windows + vPoint.y += nHeight; } } - return pt; -} - -void wxFrame::DoScreenToClient(int *x, int *y) const -{ - wxWindow::DoScreenToClient(x, y); - - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - wxPoint pt(GetClientAreaOrigin()); - *x -= pt.x; - *y -= pt.y; -} - -void wxFrame::DoClientToScreen(int *x, int *y) const -{ - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - wxPoint pt1(GetClientAreaOrigin()); - *x += pt1.x; - *y += pt1.y; - - wxWindow::DoClientToScreen(x, y); -} +#endif //wxUSE_TOOLBAR + return vPoint; +} // end of wxFrame::GetClientAreaOrigin // ---------------------------------------------------------------------------- // tool/status bar stuff @@ -745,74 +1144,99 @@ void wxFrame::DoClientToScreen(int *x, int *y) const #if wxUSE_TOOLBAR -wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) +wxToolBar* wxFrame::CreateToolBar( + long lStyle +, wxWindowID vId +, const wxString& rName +) { - if ( wxFrameBase::CreateToolBar(style, id, name) ) + if (wxFrameBase::CreateToolBar( lStyle + ,vId + ,rName + )) { PositionToolBar(); } - return m_frameToolBar; -} +} // end of wxFrame::CreateToolBar void wxFrame::PositionToolBar() { -// TODO: -/* - RECT rect; - ::GetClientRect(GetHwnd(), &rect); + HWND hWndClient; + RECTL vRect; + + ::WinQueryWindowRect(GetHwnd(), &vRect); #if wxUSE_STATUSBAR - if ( GetStatusBar() ) + if (GetStatusBar()) { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - rect.bottom -= statusY; + int nStatusX; + int nStatusY; + + GetStatusBar()->GetClientSize( &nStatusX + ,&nStatusY + ); + // PM is backwards from windows + vRect.yBottom += nStatusY; } #endif // wxUSE_STATUSBAR - if ( GetToolBar() ) + if ( m_frameToolBar ) { - int tw, th; - GetToolBar()->GetSize(&tw, &th); + int nToolbarWidth; + int nToolbarHeight; - if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) + m_frameToolBar->GetSize( &nToolbarWidth + ,&nToolbarHeight + ); + + if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) { - th = rect.bottom; + nToolbarHeight = vRect.yBottom; } else { - tw = rect.right; + nToolbarWidth = vRect.xRight; } - // Use the 'real' MSW position here - GetToolBar()->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); + // + // Use the 'real' PM position here + // + GetToolBar()->SetSize( 0 + ,0 + ,nToolbarWidth + ,nToolbarHeight + ,wxSIZE_NO_ADJUSTMENTS + ); } -*/ -} +} // end of wxFrame::PositionToolBar #endif // wxUSE_TOOLBAR // ---------------------------------------------------------------------------- // frame state (iconized/maximized/...) // ---------------------------------------------------------------------------- +// // propagate our state change to all child frames: this allows us to emulate X // Windows behaviour where child frames float independently of the parent one // on the desktop, but are iconized/restored with it -void wxFrame::IconizeChildFrames(bool bIconize) +// +void wxFrame::IconizeChildFrames( + bool bIconize +) { - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) + for (wxWindowList::Node* pNode = GetChildren().GetFirst(); + pNode; + pNode = pNode->GetNext() ) { - wxWindow *win = node->GetData(); + wxWindow* pWin = pNode->GetData(); - if ( win->IsKindOf(CLASSINFO(wxFrame)) ) + if (pWin->IsKindOf(CLASSINFO(wxFrame)) ) { - ((wxFrame *)win)->Iconize(bIconize); + ((wxFrame *)pWin)->Iconize(bIconize); } } -} +} // end of wxFrame::IconizeChildFrames // =========================================================================== // message processing @@ -821,69 +1245,79 @@ void wxFrame::IconizeChildFrames(bool bIconize) // --------------------------------------------------------------------------- // preprocessing // --------------------------------------------------------------------------- - -bool wxFrame::OS2TranslateMessage(WXMSG* pMsg) +bool wxFrame::OS2TranslateMessage( + WXMSG* pMsg +) { -// TODO: -/* - if ( wxWindow::OS2TranslateMessage(pMsg) ) - return TRUE; -*/ + // // try the menu bar accels - wxMenuBar *menuBar = GetMenuBar(); - if ( !menuBar ) + // + wxMenuBar* pMenuBar = GetMenuBar(); + + if (!pMenuBar ) return FALSE; - const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); - return acceleratorTable.Translate(this, pMsg); -} +#if wxUSE_ACCEL + const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable(); + return rAcceleratorTable.Translate(GetHWND(), pMsg); +#else + return FALSE; +#endif //wxUSE_ACCEL +} // end of wxFrame::OS2TranslateMessage // --------------------------------------------------------------------------- // our private (non virtual) message handlers // --------------------------------------------------------------------------- - bool wxFrame::HandlePaint() { -// TODO: -/* - RECT rect; - if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) + RECTL vRect; + + if (::WinQueryUpdateRect(GetHWND(), &vRect)) { - if ( m_iconized ) + if (m_bIconized) { - HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) - : (HICON)m_defaultIcon; + // + // Icons in PM are the same as "pointers" + // + HPOINTER hIcon; + + if (m_icon.Ok()) + hIcon = (HPOINTER)::WinSendMsg(m_hFrame, WM_QUERYICON, 0L, 0L); + else + hIcon = (HPOINTER)m_hDefaultIcon; + // // Hold a pointer to the dc so long as the OnPaint() message // is being processed - PAINTSTRUCT ps; - HDC hdc = ::BeginPaint(GetHwnd(), &ps); + // + RECTL vRect2; + HPS hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2); + // // Erase background before painting or we get white background - MSWDefWindowProc(WM_ICONERASEBKGND, (WORD)(LONG)ps.hdc, 0L); + // + OS2DefWindowProc(WM_ERASEBACKGROUND, (MPARAM)hPs, (MPARAM)&vRect2); - if ( hIcon ) + if (hIcon) { - RECT rect; - ::GetClientRect(GetHwnd(), &rect); + HWND hWndClient; + RECTL vRect3; - // FIXME: why hardcoded? - static const int icon_width = 32; - static const int icon_height = 32; + ::WinQueryWindowRect(GetHwnd(), &vRect3); - int icon_x = (int)((rect.right - icon_width)/2); - int icon_y = (int)((rect.bottom - icon_height)/2); + static const int nIconWidth = 32; + static const int nIconHeight = 32; + int nIconX = (int)((vRect3.xRight - nIconWidth)/2); + int nIconY = (int)((vRect3.yBottom + nIconHeight)/2); - ::DrawIcon(hdc, icon_x, icon_y, hIcon); + ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL); } - - ::EndPaint(GetHwnd(), &ps); - + ::WinEndPaint(hPs); return TRUE; } else { - return wxWindow::HandlePaint(); + return(wxWindow::HandlePaint()); } } else @@ -891,188 +1325,456 @@ bool wxFrame::HandlePaint() // nothing to paint - processed return TRUE; } -*/ return FALSE; -} +} // end of wxFrame::HandlePaint -bool wxFrame::HandleSize(int x, int y, WXUINT id) +bool wxFrame::HandleSize( + int nX +, int nY +, WXUINT nId +) { - bool processed = FALSE; + bool bProcessed = FALSE; -// TODO: -/* - switch ( id ) + switch (nId) { - case SIZENORMAL: - // only do it it if we were iconized before, otherwise resizing the + case kSizeNormal: + // + // Only do it it if we were iconized before, otherwise resizing the // parent frame has a curious side effect of bringing it under it's // children - if ( !m_iconized ) + if (!m_bIconized ) break; + // // restore all child frames too + // IconizeChildFrames(FALSE); + (void)SendIconizeEvent(FALSE); + // // fall through + // - case SIZEFULLSCREEN: - m_iconized = FALSE; + case kSizeMax: + m_bIconized = FALSE; break; - case SIZEICONIC: - // iconize all child frames too + case kSizeMin: + // + // Iconize all child frames too + // IconizeChildFrames(TRUE); - - m_iconized = TRUE; + (void)SendIconizeEvent(); + m_bIconized = TRUE; break; } - if ( !m_iconized ) + if (!m_bIconized) { + // // forward WM_SIZE to status bar control + // #if wxUSE_NATIVE_STATUSBAR if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))) { - wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId()); - event.SetEventObject( m_frameStatusBar ); + wxSizeEvent vEvent( wxSize( nX + ,nY + ) + ,m_frameStatusBar->GetId() + ); - ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event); + vEvent.SetEventObject(m_frameStatusBar); + m_frameStatusBar->OnSize(vEvent); } #endif // wxUSE_NATIVE_STATUSBAR PositionStatusBar(); +#if wxUSE_TOOLBAR PositionToolBar(); +#endif // wxUSE_TOOLBAR - wxSizeEvent event(wxSize(x, y), m_windowId); - event.SetEventObject( this ); - processed = GetEventHandler()->ProcessEvent(event); + wxSizeEvent vEvent( wxSize( nX + ,nY + ) + ,m_windowId + ); + + vEvent.SetEventObject(this); + bProcessed = GetEventHandler()->ProcessEvent(vEvent); } -*/ - return processed; -} + return bProcessed; +} // end of wxFrame::HandleSize -bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) +bool wxFrame::HandleCommand( + WXWORD nId +, WXWORD nCmd +, WXHWND hControl +) { -// TODO: -/* - if ( control ) + if (hControl) { + // // In case it's e.g. a toolbar. - wxWindow *win = wxFindWinFromHandle(control); - if ( win ) - return win->MSWCommand(cmd, id); + // + wxWindow* pWin = wxFindWinFromHandle(hControl); + + if (pWin) + return pWin->OS2Command( nCmd + ,nId + ); } - // handle here commands from menus and accelerators - if ( cmd == 0 || cmd == 1 ) + // + // Handle here commands from menus and accelerators + // + if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR) { - if ( wxCurrentPopupMenu ) + if (wxCurrentPopupMenu) { - wxMenu *popupMenu = wxCurrentPopupMenu; + wxMenu* pPopupMenu = wxCurrentPopupMenu; + wxCurrentPopupMenu = NULL; - return popupMenu->MSWCommand(cmd, id); + return pPopupMenu->OS2Command( nCmd + ,nId + ); } - if ( ProcessCommand(id) ) + if (ProcessCommand(nId)) { return TRUE; } } -*/ return FALSE; -} +} // end of wxFrame::HandleCommand -bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) +bool wxFrame::HandleMenuSelect( + WXWORD nItem +, WXWORD nFlags +, WXHMENU hMenu +) { - int item; - if ( flags == 0xFFFF && hMenu == 0 ) + if( !nFlags ) { - // menu was removed from screen - item = -1; + MENUITEM mItem; + MRESULT rc; + + rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem); + + if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR))) + { + wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nItem); + + vEvent.SetEventObject(this); + GetEventHandler()->ProcessEvent(vEvent); // return value would be ignored by PM + } } -// TODO: -/* - else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) ) + return TRUE; +} // end of wxFrame::HandleMenuSelect + +// --------------------------------------------------------------------------- +// Main Frame window proc +// --------------------------------------------------------------------------- +MRESULT EXPENTRY wxFrameMainWndProc( + HWND hWnd +, ULONG ulMsg +, MPARAM wParam +, MPARAM lParam +) +{ + MRESULT rc = (MRESULT)0; + bool bProcessed = FALSE; + wxFrame* pWnd = NULL; + + pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); + switch (ulMsg) + { + case WM_QUERYFRAMECTLCOUNT: + if(pWnd && pWnd->m_fnOldWndProc) + { + USHORT uItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam)); + + rc = MRFROMSHORT(uItemCount); + } + break; + + case WM_FORMATFRAME: +///////////////////////////////////////////////////////////////////////////////// +// Applications that subclass frame controls may find that the frame is already +// subclassed the number of frame controls is variable. +// The WM_FORMATFRAME and WM_QUERYFRAMECTLCOUNT messages must always be +// subclassed by calling the previous window procedure and modifying its result. +//////////////////////////////////////////////////////////////////////////////// + { + int nItemCount; + int i; + PSWP pSWP = NULL; + SWP vSwpStb; + RECTL vRectl; + RECTL vRstb; + int nHeight=0; + + pSWP = (PSWP)PVOIDFROMMP(wParam); + nItemCount = SHORT1FROMMR(pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam)); + if(pWnd->m_frameStatusBar) + { + ::WinQueryWindowRect(pWnd->m_frameStatusBar->GetHWND(), &vRstb); + pWnd->m_frameStatusBar->GetSize(NULL, &nHeight); + ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl); + ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2); + vRstb = vRectl; + ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE); + + vSwpStb.x = vRectl.xLeft - vRstb.xLeft; + vSwpStb.y = vRectl.yBottom - vRstb.yBottom; + vSwpStb.cx = vRectl.xRight - vRectl.xLeft - 1; //?? -1 ?? + vSwpStb.cy = nHeight; + vSwpStb.fl = SWP_SIZE |SWP_MOVE | SWP_SHOW; + vSwpStb.hwnd = pWnd->m_frameStatusBar->GetHWND(); + vSwpStb.hwndInsertBehind = HWND_TOP; + } + ::WinQueryWindowRect(pWnd->m_hFrame, &vRectl); + ::WinMapWindowPoints(pWnd->m_hFrame, HWND_DESKTOP, (PPOINTL)&vRectl, 2); + ::WinCalcFrameRect(pWnd->m_hFrame, &vRectl, TRUE); + ::WinMapWindowPoints(HWND_DESKTOP, pWnd->m_hFrame, (PPOINTL)&vRectl, 2); + for(i = 0; i < nItemCount; i++) + { + if(pWnd->m_hWnd && pSWP[i].hwnd == pWnd->m_hWnd) + { + pSWP[i].x = vRectl.xLeft; + pSWP[i].y = vRectl.yBottom + nHeight; + pSWP[i].cx = vRectl.xRight - vRectl.xLeft; + pSWP[i].cy = vRectl.yTop - vRectl.yBottom - nHeight; + pSWP[i].fl = SWP_SIZE | SWP_MOVE | SWP_SHOW; + pSWP[i].hwndInsertBehind = HWND_TOP; + } + } + bProcessed = TRUE; + rc = MRFROMSHORT(nItemCount); + } + break; + + default: + if(pWnd && pWnd->m_fnOldWndProc) + rc = pWnd->m_fnOldWndProc(hWnd, ulMsg, wParam, lParam); + else + rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); + } + return rc; +} // end of wxFrameMainWndProc + +MRESULT EXPENTRY wxFrameWndProc( + HWND hWnd +, ULONG ulMsg +, MPARAM wParam +, MPARAM lParam +) +{ + // + // Trace all ulMsgs - useful for the debugging + // + HWND parentHwnd; + wxFrame* pWnd = NULL; + + parentHwnd = WinQueryWindow(hWnd,QW_PARENT); + pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); + + // + // When we get the first message for the HWND we just created, we associate + // it with wxWindow stored in wxWndHook + // + + MRESULT rc = (MRESULT)0; + bool bProcessed = FALSE; + + // + // Stop right here if we don't have a valid handle in our wxWindow object. + // + if (pWnd && !pWnd->GetHWND()) { - item = nItem; + pWnd->SetHWND((WXHWND) hWnd); + rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam ); + pWnd->SetHWND(0); } else { - // don't give hints for separators (doesn't make sense) nor for the - // items opening popup menus (they don't have them anyhow) - return FALSE; + if (pWnd) + rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam); + else + rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); } -*/ - wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item); - event.SetEventObject( this ); - - return GetEventHandler()->ProcessEvent(event); -} - -// --------------------------------------------------------------------------- -// the window proc for wxFrame -// --------------------------------------------------------------------------- + return rc; +} // end of wxFrameWndProc -MRESULT wxFrame::OS2WindowProc(HWND hwnd, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +MRESULT wxFrame::OS2WindowProc( + WXUINT uMessage +, WXWPARAM wParam +, WXLPARAM lParam +) { - long rc = 0; - bool processed = FALSE; + MRESULT mRc = 0L; + bool bProcessed = FALSE; -// TODO: -/* - switch ( message ) + switch (uMessage) { case WM_CLOSE: - // if we can't close, tell the system that we processed the + // + // If we can't close, tell the system that we processed the // message - otherwise it would close us - processed = !Close(); + // + bProcessed = !Close(); + break; + + case WM_PAINT: + bProcessed = HandlePaint(); + mRc = (MRESULT)FALSE; break; - case WM_COMMAND: + 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: { - WORD id, cmd; - WXHWND hwnd; - UnpackCommand((WXWPARAM)wParam, (WXLPARAM)lParam, - &id, &hwnd, &cmd); + WORD wId; + WORD wCmd; + WXHWND hWnd; + + UnpackCommand( (WXWPARAM)wParam + ,(WXLPARAM)lParam + ,&wId + ,&hWnd + ,&wCmd + ); - processed = HandleCommand(id, cmd, (WXHWND)hwnd); + bProcessed = HandleCommand( wId + ,wCmd + ,(WXHWND)hWnd + ); } break; case WM_MENUSELECT: { - WXWORD item, flags; - WXHMENU hmenu; - UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu); - - processed = HandleMenuSelect(item, flags, hmenu); + WXWORD wItem; + WXWORD wFlags; + WXHMENU hMenu; + + UnpackMenuSelect( wParam + ,lParam + ,&wItem + ,&wFlags + ,&hMenu + ); + bProcessed = HandleMenuSelect( wItem + ,wFlags + ,hMenu + ); + mRc = (MRESULT)TRUE; } break; - case WM_PAINT: - processed = HandlePaint(); + case WM_SIZE: + { + SHORT nScxold = SHORT1FROMMP(wParam); // Old horizontal size. + SHORT nScyold = SHORT2FROMMP(wParam); // Old vertical size. + SHORT nScxnew = SHORT1FROMMP(lParam); // New horizontal size. + SHORT nScynew = SHORT2FROMMP(lParam); // New vertical size. + + lParam = MRFROM2SHORT( nScxnew - 20 + ,nScynew - 30 + ); + } + bProcessed = HandleSize(LOWORD(lParam), HIWORD(lParam), (WXUINT)wParam); + mRc = (MRESULT)FALSE; break; - case WM_QUERYDRAGICON: + case CM_QUERYDRAGIMAGE: { - HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) - : (HICON)(m_defaultIcon); - rc = (long)hIcon; - processed = rc != 0; + HPOINTER hIcon; + + if (m_icon.Ok()) + hIcon = (HPOINTER)::WinSendMsg(GetHWND(), WM_QUERYICON, 0L, 0L); + else + hIcon = (HPOINTER)m_hDefaultIcon; + mRc = (MRESULT)hIcon; + bProcessed = mRc != 0; } break; + } - case WM_SIZE: - processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); - break; + if (!bProcessed ) + mRc = wxWindow::OS2WindowProc( uMessage + ,wParam + ,lParam + ); + return (MRESULT)mRc; +} // wxFrame::OS2WindowProc + +void wxFrame::SetClient(WXHWND c_Hwnd) +{ + // Duh...nothing to do under OS/2 +} + +void wxFrame::SetClient( + wxWindow* pWindow +) +{ + wxWindow* pOldClient = this->GetClient(); + bool bClientHasFocus = pOldClient && (pOldClient == wxWindow::FindFocus()); + + if(pOldClient == pWindow) // nothing to do + return; + if(pWindow == NULL) // just need to remove old client + { + if(pOldClient == NULL) // nothing to do + return; + + if(bClientHasFocus ) + this->SetFocus(); + + pOldClient->Enable( FALSE ); + pOldClient->Show( FALSE ); + ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId()); + // to avoid OS/2 bug need to update frame + ::WinSendMsg((HWND)this->GetFrame(), WM_UPDATEFRAME, (MPARAM)~0, 0); + return; } - if ( !processed ) - rc = wxWindow::MSWWindowProc(message, wParam, lParam); + // + // Else need to change client + // + if(bClientHasFocus) + this->SetFocus(); - return rc; -*/ - return (MRESULT)0; + ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE); + if(pOldClient) + { + pOldClient->Enable(FALSE); + pOldClient->Show(FALSE); + ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId()); + } + pWindow->Reparent(this); + ::WinSetWindowUShort(pWindow->GetHWND(), QWS_ID, FID_CLIENT); + ::WinEnableWindowUpdate((HWND)GetHWND(), TRUE); + pWindow->Enable(); + pWindow->Show(); // ensure client is showing + if( this->IsShown() ) + { + this->Show(); + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); + } } +wxWindow* wxFrame::GetClient() +{ + return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT)); +}