X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0e320a79f187558effb04d92020b470372bbe456..91b4bd63177025704dd39679a2a7c4198eeb7909:/src/os2/frame.cpp?ds=sidebyside diff --git a/src/os2/frame.cpp b/src/os2/frame.cpp index 0a15c650af..a273ada371 100644 --- a/src/os2/frame.cpp +++ b/src/os2/frame.cpp @@ -1,562 +1,1461 @@ ///////////////////////////////////////////////////////////////////////////// // Name: frame.cpp // Purpose: wxFrame -// Author: AUTHOR +// Author: David Webster // Modified by: -// Created: ??/??/98 +// Created: 10/27/99 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR +// Copyright: (c) David Webster // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "frame.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#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" + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/dialog.h" + #include "wx/settings.h" + #include "wx/dcclient.h" + #include "wx/mdi.h" +#endif // WX_PRECOMP + +#include "wx/os2/private.h" + +#if wxUSE_STATUSBAR + #include "wx/statusbr.h" + #include "wx/generic/statusbr.h" +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR + #include "wx/toolbar.h" +#endif // wxUSE_TOOLBAR -#include "wx/frame.h" -#include "wx/statusbr.h" -#include "wx/toolbar.h" #include "wx/menuitem.h" -#include "wx/menu.h" -#include "wx/dcclient.h" -#include "wx/dialog.h" -#include "wx/settings.h" -#include "wx/app.h" - -extern wxList wxModelessWindows; -extern wxList wxPendingDelete; - -#if !USE_SHARED_LIBRARY -BEGIN_EVENT_TABLE(wxFrame, wxWindow) - EVT_SIZE(wxFrame::OnSize) - EVT_ACTIVATE(wxFrame::OnActivate) - EVT_MENU_HIGHLIGHT_ALL(wxFrame::OnMenuHighlight) - EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) - EVT_IDLE(wxFrame::OnIdle) - EVT_CLOSE(wxFrame::OnCloseWindow) -END_EVENT_TABLE() +#include "wx/log.h" -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif +// ---------------------------------------------------------------------------- +// globals +// ---------------------------------------------------------------------------- -#if wxUSE_NATIVE_STATUSBAR -bool wxFrame::m_useNativeStatusBar = TRUE; -#else -bool wxFrame::m_useNativeStatusBar = FALSE; +extern wxWindowList wxModelessWindows; +extern wxList WXDLLEXPORT wxPendingDelete; + +#if wxUSE_MENUS_NATIVE +extern wxMenu *wxCurrentPopupMenu; #endif -wxFrame::wxFrame() -{ - m_frameToolBar = NULL ; - m_frameMenuBar = NULL; - m_frameStatusBar = NULL; +extern void wxAssociateWinWithHandle( HWND hWnd + ,wxWindowOS2* pWin + ); - m_windowParent = NULL; - m_iconized = FALSE; -} +// ---------------------------------------------------------------------------- +// event tables +// ---------------------------------------------------------------------------- -bool wxFrame::Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name) -{ - if (!parent) - wxTopLevelWindows.Append(this); +BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) + EVT_ACTIVATE(wxFrame::OnActivate) + EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) +END_EVENT_TABLE() - SetName(name); - m_windowStyle = style; - m_frameMenuBar = NULL; - m_frameToolBar = NULL ; - m_frameStatusBar = NULL; +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); +// ============================================================================ +// implementation +// ============================================================================ - if ( id > -1 ) - m_windowId = id; - else - m_windowId = (int)NewControlId(); +// ---------------------------------------------------------------------------- +// static class members +// ---------------------------------------------------------------------------- +#if wxUSE_STATUSBAR - if (parent) parent->AddChild(this); +#if wxUSE_NATIVE_STATUSBAR + bool wxFrame::m_bUseNativeStatusBar = TRUE; +#else + bool wxFrame::m_bUseNativeStatusBar = FALSE; +#endif - wxModelessWindows.Append(this); +#endif //wxUSE_STATUSBAR - // TODO: create frame. +// ---------------------------------------------------------------------------- +// creation/destruction +// ---------------------------------------------------------------------------- - return FALSE; -} +void wxFrame::Init() +{ + m_nFsStatusBarFields = 0; + m_nFsStatusBarHeight = 0; + m_nFsToolBarHeight = 0; + m_hWndToolTip = 0L; + m_bWasMinimized = FALSE; + m_pWinLastFocused = NULL; + + + m_frameMenuBar = NULL; + m_frameToolBar = NULL; + m_frameStatusBar = NULL; + + m_hTitleBar = NULLHANDLE; + m_hHScroll = NULLHANDLE; + m_hVScroll = NULLHANDLE; + + // + // Initialize SWP's + // + 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)); + m_bIconized = FALSE; + +} // end of wxFrame::Init + +bool wxFrame::Create( + wxWindow* pParent +, wxWindowID vId +, const wxString& rsTitle +, const wxPoint& rPos +, const wxSize& rSize +, long lStyle +, const wxString& rsName +) +{ + if (!wxTopLevelWindow::Create( pParent + ,vId + ,rsTitle + ,rPos + ,rSize + ,lStyle + ,rsName + )) + return FALSE; + wxModelessWindows.Append(this); + return TRUE; +} // end of wxFrame::Create wxFrame::~wxFrame() { - wxTopLevelWindows.DeleteObject(this); - - if (m_frameStatusBar) - delete m_frameStatusBar; - if (m_frameMenuBar) - delete m_frameMenuBar; - -/* Check if it's the last top-level window */ - - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) - { - wxTheApp->SetTopWindow(NULL); - - if (wxTheApp->GetExitOnFrameDelete()) - { - // TODO signal to the app that we're going to close - } - } - - wxModelessWindows.DeleteObject(this); -} + m_isBeingDeleted = TRUE; + DeleteAllBars(); +} // end of wxFrame::~wxFrame +// // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. -void wxFrame::GetClientSize(int *x, int *y) const +// +void wxFrame::DoGetClientSize( + int* pX +, int* pY +) const { - // TODO -} - + wxTopLevelWindow::DoGetClientSize( pX + ,pY + ); + // + // 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 (that is called in + // wxWindow's GetClient size from above) is all that is needed! + // +} // end of wxFrame::DoGetClientSize + +// // Set the client size (i.e. leave the calculation of borders etc. // to wxWindows) -void wxFrame::SetClientSize(int width, int height) +// +void wxFrame::DoSetClientSize( + int nWidth +, int nHeight +) { - // TODO -} - -void wxFrame::GetSize(int *width, int *height) const + wxStatusBar* pStatusBar = GetStatusBar(); + + // + // Statusbars are not part of the OS/2 Client but parent frame + // so no statusbar consideration + // + wxTopLevelWindow::DoSetClientSize( nWidth + ,nHeight + ); +} // end of wxFrame::DoSetClientSize + +// ---------------------------------------------------------------------------- +// wxFrame: various geometry-related functions +// ---------------------------------------------------------------------------- + +void wxFrame::Raise() { - // TODO + wxFrameBase::Raise(); + ::WinSetWindowPos( (HWND) GetParent()->GetHWND() + ,HWND_TOP + ,0 + ,0 + ,0 + ,0 + ,SWP_ZORDER + ); } -void wxFrame::GetPosition(int *x, int *y) const +#if wxUSE_STATUSBAR +wxStatusBar* wxFrame::OnCreateStatusBar( + int nNumber +, long lulStyle +, wxWindowID vId +, const wxString& rName +) { - // TODO -} + wxStatusBar* pStatusBar = NULL; + SWP vSwp; + ERRORID vError; + wxString sError; + + pStatusBar = wxFrameBase::OnCreateStatusBar( nNumber + ,lulStyle + ,vId + ,rName + ); + + if( !pStatusBar ) + return NULL; -void wxFrame::SetSize(int x, int y, int width, int height, int sizeFlags) -{ - // TODO -} + wxClientDC vDC(pStatusBar); + int nY; -bool wxFrame::Show(bool show) -{ - // TODO - return FALSE; -} + // + // Set the height according to the font and the border size + // + vDC.SetFont(pStatusBar->GetFont()); // Screws up the menues for some reason + vDC.GetTextExtent( "X" + ,NULL + ,&nY + ); + + int nHeight = ((11 * nY) / 10 + 2 * pStatusBar->GetBorderY()); + + pStatusBar->SetSize( -1 + ,-1 + ,-1 + ,nHeight + ); + + ::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::Iconize(bool iconize) +void wxFrame::PositionStatusBar() { - // TODO -} + SWP vSwp; + ERRORID vError; + wxString sError; + + // + // Native status bar positions itself + // + if (m_frameStatusBar) + { + int nWidth; + int nY; + int nStatbarWidth; + int nStatbarHeight; + HWND hWndClient; + RECTL vRect; + RECTL vFRect; + + ::WinQueryWindowRect(m_hFrame, &vRect); + nY = vRect.yTop; + ::WinMapWindowPoints(m_hFrame, HWND_DESKTOP, (PPOINTL)&vRect, 2); + vFRect = vRect; + ::WinCalcFrameRect(m_hFrame, &vRect, TRUE); + nWidth = vRect.xRight - vRect.xLeft; + nY = nY - (vRect.yBottom - vFRect.yBottom); + + m_frameStatusBar->GetSize( &nStatbarWidth + ,&nStatbarHeight + ); + + nY= nY - nStatbarHeight; + // + // 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( vRect.xLeft - vFRect.xLeft + ,nY + ,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 -// Equivalent to maximize/restore in Windows -void wxFrame::Maximize(bool maximize) +#if wxUSE_MENUS_NATIVE +void wxFrame::DetachMenuBar() { - // TODO -} + if (m_frameMenuBar) + { + m_frameMenuBar->Detach(); + m_frameMenuBar = NULL; + } +} // end of wxFrame::DetachMenuBar -bool wxFrame::IsIconized() const +void wxFrame::SetMenuBar( + wxMenuBar* pMenuBar +) { - // TODO - return FALSE; -} + 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(); -// Is the frame maximized? -bool wxFrame::IsMaximized(void) const -{ - // TODO - return FALSE; -} + // + // Actually remove the menu from the frame + // + m_hMenu = (WXHMENU)0; + InternalSetMenuBar(); + } + else // set new non NULL menu bar + { + m_frameMenuBar = NULL; -void wxFrame::SetTitle(const wxString& title) + // + // 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((wxFrame*)this); + } +} // end of wxFrame::SetMenuBar + +void wxFrame::AttachMenuBar( + wxMenuBar* pMenubar +) { - // TODO -} + wxFrameBase::AttachMenuBar(pMenubar); -wxString wxFrame::GetTitle() const + m_frameMenuBar = pMenubar; + + if (!pMenubar) + { + // + // Actually remove the menu from the frame + // + m_hMenu = (WXHMENU)0; + InternalSetMenuBar(); + } + else // Set new non NULL menu bar + { + // + // Can set a menubar several times. + // + if (pMenubar->GetHMenu()) + { + m_hMenu = pMenubar->GetHMenu(); + } + else + { + if (pMenubar->IsAttached()) + pMenubar->Detach(); + + m_hMenu = pMenubar->Create(); + + if (!m_hMenu) + return; + } + InternalSetMenuBar(); + } +} // end of wxFrame::AttachMenuBar + +void wxFrame::InternalSetMenuBar() { - // TODO - return wxString(""); -} + 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); + } -void wxFrame::SetIcon(const wxIcon& icon) + 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 +#endif // wxUSE_MENUS_NATIVE + +// +// Responds to colour changes, and passes event on to children +// +void wxFrame::OnSysColourChanged( + wxSysColourChangedEvent& rEvent +) { - m_icon = icon; - // TODO -} + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); + Refresh(); + +#if wxUSE_STATUSBAR + if (m_frameStatusBar) + { + wxSysColourChangedEvent vEvent2; + + vEvent2.SetEventObject(m_frameStatusBar); + m_frameStatusBar->GetEventHandler()->ProcessEvent(vEvent2); + } +#endif //wxUSE_STATUSBAR -wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, - const wxString& name) + // + // Propagate the event to the non-top-level children + // + wxWindow::OnSysColourChanged(rEvent); +} // end of wxFrame::OnSysColourChanged + +// Pass TRUE to show full screen, FALSE to restore. +bool wxFrame::ShowFullScreen( + bool bShow +, long lStyle +) { - wxStatusBar *statusBar = NULL; + if (bShow) + { + if (IsFullScreen()) + return FALSE; - statusBar = new wxStatusBar(this, id, wxPoint(0, 0), wxSize(100, 20), - style, name); + m_bFsIsShowing = TRUE; + m_lFsStyle = lStyle; - // Set the height according to the font and the border size - wxClientDC dc(statusBar); - dc.SetFont(statusBar->GetFont()); +#if wxUSE_TOOLBAR + wxToolBar* pTheToolBar = GetToolBar(); +#endif //wxUSE_TOOLBAR - long x, y; - dc.GetTextExtent("X", &x, &y); +#if wxUSE_STATUSBAR + wxStatusBar* pTheStatusBar = GetStatusBar(); +#endif //wxUSE_STATUSBAR - int height = (int)( (y * 1.1) + 2* statusBar->GetBorderY()); + int nDummyWidth; - statusBar->SetSize(-1, -1, 100, height); +#if wxUSE_TOOLBAR + if (pTheToolBar) + pTheToolBar->GetSize(&nDummyWidth, &m_nFsToolBarHeight); +#endif //wxUSE_TOOLBAR - statusBar->SetFieldsCount(number); - return statusBar; -} +#if wxUSE_STATUSBAR + if (pTheStatusBar) + pTheStatusBar->GetSize(&nDummyWidth, &m_nFsStatusBarHeight); +#endif //wxUSE_STATUSBAR -wxStatusBar* wxFrame::CreateStatusBar(int number, long style, wxWindowID id, - const wxString& name) -{ - // Calling CreateStatusBar twice is an error. - wxCHECK_MSG( m_frameStatusBar == NULL, FALSE, - "recreating status bar in wxFrame" ); - - m_frameStatusBar = OnCreateStatusBar(number, style, id, - name); - if ( m_frameStatusBar ) - { - PositionStatusBar(); - return m_frameStatusBar; - } - else - return NULL; -} +#if wxUSE_TOOLBAR + // + // Zap the toolbar, menubar, and statusbar + // + if ((lStyle & wxFULLSCREEN_NOTOOLBAR) && pTheToolBar) + { + pTheToolBar->SetSize(-1,0); + pTheToolBar->Show(FALSE); + } +#endif //wxUSE_TOOLBAR -void wxFrame::SetStatusText(const wxString& text, int number) -{ - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set text for" ); + 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); + } - m_frameStatusBar->SetStatusText(text, number); -} +#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 + ); + + // + // 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; -void wxFrame::SetStatusWidths(int n, const int widths_field[]) -{ - wxCHECK_RET( m_frameStatusBar != NULL, "no statusbar to set widths for" ); + m_bFsIsShowing = FALSE; - m_frameStatusBar->SetStatusWidths(n, widths_field); - PositionStatusBar(); -} +#if wxUSE_TOOLBAR + wxToolBar* pTheToolBar = GetToolBar(); -void wxFrame::PositionStatusBar() -{ - int w, h; - GetClientSize(&w, &h); - int sw, sh; - m_frameStatusBar->GetSize(&sw, &sh); - - // 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, h, w, sh); -} + // + // Restore the toolbar, menubar, and statusbar + // + if (pTheToolBar && (m_lFsStyle & wxFULLSCREEN_NOTOOLBAR)) + { + pTheToolBar->SetSize(-1, m_nFsToolBarHeight); + pTheToolBar->Show(TRUE); + } +#endif //wxUSE_TOOLBAR -void wxFrame::SetMenuBar(wxMenuBar *menuBar) +#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 +// +// +// Default activation behaviour - set the focus for the first child +// subwindow found. +// +void wxFrame::OnActivate( + wxActivateEvent& rEvent +) { - if (!menuBar) + if ( rEvent.GetActive() ) { - m_frameMenuBar = NULL; - return; - } - - m_frameMenuBar = menuBar; + // restore focus to the child which was last focused + wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); - // TODO -} + wxWindow* pParent = m_pWinLastFocused ? m_pWinLastFocused->GetParent() + : NULL; + if (!pParent) + { + pParent = this; + } -void wxFrame::Fit() -{ - // Work out max. size - wxNode *node = GetChildren().First(); - int max_width = 0; - int max_height = 0; - while (node) - { - // Find a child that's a subwindow, but not a dialog box. - wxWindow *win = (wxWindow *)node->Data(); - - if (!win->IsKindOf(CLASSINFO(wxFrame)) && - !win->IsKindOf(CLASSINFO(wxDialog))) - { - int width, height; - int x, y; - win->GetSize(&width, &height); - win->GetPosition(&x, &y); - - if ((x + width) > max_width) - max_width = x + width; - if ((y + height) > max_height) - max_height = y + height; - } - node = node->Next(); - } - SetClientSize(max_width, max_height); -} + wxSetFocusToChild( pParent + ,&m_pWinLastFocused + ); + } + else // deactivating + { + // + // 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* pChild = pNode->GetData(); + + if (!pChild->IsTopLevel() +#if wxUSE_TOOLBAR + && !wxDynamicCast(pChild, wxToolBar) +#endif // wxUSE_TOOLBAR +#if wxUSE_STATUSBAR + && !wxDynamicCast(pChild, wxStatusBar) +#endif // wxUSE_STATUSBAR + ) + { + pChild->SetFocus(); + return; + } + } + } +} // end of wxFrame::OnActivate + +// ---------------------------------------------------------------------------- +// wxFrame size management: we exclude the areas taken by menu/status/toolbars +// from the client area, so the client area is what's really available for the +// frame contents +// ---------------------------------------------------------------------------- -// Responds to colour changes, and passes event on to children. -void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) +// Checks if there is a toolbar, and returns the first free client position +wxPoint wxFrame::GetClientAreaOrigin() const { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); - Refresh(); + wxPoint vPoint(0, 0); - if ( m_frameStatusBar ) +#if wxUSE_TOOLBAR + if (GetToolBar()) { - wxSysColourChangedEvent event2; - event2.SetEventObject( m_frameStatusBar ); - m_frameStatusBar->ProcessEvent(event2); + int nWidth; + int nHeight; + + GetToolBar()->GetSize( &nWidth + ,&nHeight + ); + + if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) + { + vPoint.x += nWidth; + } + else + { + // PM is backwards from windows + vPoint.y += nHeight; + } } +#endif //wxUSE_TOOLBAR + return vPoint; +} // end of wxFrame::GetClientAreaOrigin - // Propagate the event to the non-top-level children - wxWindow::OnSysColourChanged(event); -} +// ---------------------------------------------------------------------------- +// tool/status bar stuff +// ---------------------------------------------------------------------------- -// Default resizing behaviour - if only ONE subwindow, -// resize to client rectangle size -void wxFrame::OnSize(wxSizeEvent& event) +#if wxUSE_TOOLBAR + +wxToolBar* wxFrame::CreateToolBar( + long lStyle +, wxWindowID vId +, const wxString& rName +) { - // if we're using constraints - do use them - #if wxUSE_CONSTRAINTS - if ( GetAutoLayout() ) { - Layout(); - return; - } - #endif - - // do we have _exactly_ one child? - wxWindow *child = NULL; - for ( wxNode *node = GetChildren().First(); node; node = node->Next() ) - { - wxWindow *win = (wxWindow *)node->Data(); - if ( !win->IsKindOf(CLASSINFO(wxFrame)) && - !win->IsKindOf(CLASSINFO(wxDialog)) && - (win != GetStatusBar()) && - (win != GetToolBar()) ) - { - if ( child ) - return; // it's our second subwindow - nothing to do - child = win; - } - } - - if ( child ) { - // we have exactly one child - set it's size to fill the whole frame - int clientW, clientH; - GetClientSize(&clientW, &clientH); - - int x = 0; - int y = 0; - - child->SetSize(x, y, clientW, clientH); - } -} + if (wxFrameBase::CreateToolBar( lStyle + ,vId + ,rName + )) + { + PositionToolBar(); + } + return m_frameToolBar; +} // end of wxFrame::CreateToolBar -// Default activation behaviour - set the focus for the first child -// subwindow found. -void wxFrame::OnActivate(wxActivateEvent& event) +void wxFrame::PositionToolBar() { - for(wxNode *node = GetChildren().First(); node; node = node->Next()) - { - // Find a child that's a subwindow, but not a dialog box. - wxWindow *child = (wxWindow *)node->Data(); - if (!child->IsKindOf(CLASSINFO(wxFrame)) && - !child->IsKindOf(CLASSINFO(wxDialog))) + HWND hWndClient; + RECTL vRect; + + ::WinQueryWindowRect(GetHwnd(), &vRect); + +#if wxUSE_STATUSBAR + if (GetStatusBar()) { - child->SetFocus(); - return; + int nStatusX; + int nStatusY; + + GetStatusBar()->GetClientSize( &nStatusX + ,&nStatusY + ); + // PM is backwards from windows + vRect.yBottom += nStatusY; } - } -} +#endif // wxUSE_STATUSBAR -// The default implementation for the close window event. + if ( m_frameToolBar ) + { + int nToolbarWidth; + int nToolbarHeight; -void wxFrame::OnCloseWindow(wxCloseEvent& event) -{ - this->Destroy(); -} + m_frameToolBar->GetSize( &nToolbarWidth + ,&nToolbarHeight + ); -// Destroy the window (delayed, if a managed window) -bool wxFrame::Destroy() -{ - if (!wxPendingDelete.Member(this)) - wxPendingDelete.Append(this); - return TRUE; -} + if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) + { + nToolbarHeight = vRect.yBottom; + } + else + { + nToolbarWidth = vRect.xRight; + } -// Default menu selection behaviour - display a help string -void wxFrame::OnMenuHighlight(wxMenuEvent& event) + // + // 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 +) { - if (GetStatusBar()) - { - if (event.GetMenuId() == -1) - SetStatusText(""); - else + for (wxWindowList::Node* pNode = GetChildren().GetFirst(); + pNode; + pNode = pNode->GetNext() ) { - wxMenuBar *menuBar = GetMenuBar(); - if (menuBar) - { - wxString helpString(menuBar->GetHelpString(event.GetMenuId())); - if (helpString != "") - SetStatusText(helpString); - } + wxWindow* pWin = pNode->GetData(); + wxFrame* pFrame = wxDynamicCast(pWin, wxFrame); + + if ( pFrame +#if wxUSE_MDI_ARCHITECTURE + && !wxDynamicCast(pFrame, wxMDIChildFrame) +#endif // wxUSE_MDI_ARCHITECTURE + ) + { + // + // We don't want to restore the child frames which had been + // iconized even before we were iconized, so save the child frame + // status when iconizing the parent frame and check it when + // restoring it. + // + if (bIconize) + { + pFrame->m_bWasMinimized = pFrame->IsIconized(); + } + + // + // This test works for both iconizing and restoring + // + if (!pFrame->m_bWasMinimized) + pFrame->Iconize(bIconize); + } } - } -} +} // end of wxFrame::IconizeChildFrames -wxMenuBar *wxFrame::GetMenuBar() const +WXHICON wxFrame::GetDefaultIcon() const { - return m_frameMenuBar; + return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON + : wxDEFAULT_FRAME_ICON); } - -void wxFrame::Centre(int direction) +// =========================================================================== +// message processing +// =========================================================================== + +// --------------------------------------------------------------------------- +// preprocessing +// --------------------------------------------------------------------------- +bool wxFrame::OS2TranslateMessage( + WXMSG* pMsg +) { - int display_width, display_height, width, height, x, y; - wxDisplaySize(&display_width, &display_height); + // + // try the menu bar accels + // + wxMenuBar* pMenuBar = GetMenuBar(); - GetSize(&width, &height); - GetPosition(&x, &y); + if (!pMenuBar) + return FALSE; - if (direction & wxHORIZONTAL) - x = (int)((display_width - width)/2); - if (direction & wxVERTICAL) - y = (int)((display_height - height)/2); - - SetSize(x, y, width, height); -} +#if wxUSE_ACCEL && wxUSE_MENUS_NATIVE + const wxAcceleratorTable& rAcceleratorTable = pMenuBar->GetAccelTable(); + return rAcceleratorTable.Translate(GetHWND(), pMsg); +#else + return FALSE; +#endif //wxUSE_ACCEL +} // end of wxFrame::OS2TranslateMessage -// Call this to simulate a menu command -void wxFrame::Command(int id) +// --------------------------------------------------------------------------- +// our private (non virtual) message handlers +// --------------------------------------------------------------------------- +bool wxFrame::HandlePaint() { - ProcessCommand(id); -} + RECTL vRect; + + if (::WinQueryUpdateRect(GetHWND(), &vRect)) + { + if (m_bIconized) + { + // + // 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 + // + RECTL vRect2; + HPS hPs = ::WinBeginPaint(GetHwnd(), NULLHANDLE, &vRect2); + + // + // Erase background before painting or we get white background + // + OS2DefWindowProc(WM_ERASEBACKGROUND, (MPARAM)hPs, (MPARAM)&vRect2); + + if (hIcon) + { + HWND hWndClient; + RECTL vRect3; + + ::WinQueryWindowRect(GetHwnd(), &vRect3); + + static const int nIconWidth = 32; + static const int nIconHeight = 32; + int nIconX = (int)((vRect3.xRight - nIconWidth)/2); + int nIconY = (int)((vRect3.yBottom + nIconHeight)/2); + + ::WinDrawPointer(hPs, nIconX, nIconY, hIcon, DP_NORMAL); + } + ::WinEndPaint(hPs); + return TRUE; + } + else + { + if (!wxWindow::HandlePaint()) + { + HPS hPS; + RECTL vRect; + + hPS = ::WinBeginPaint( GetHwnd() + ,NULLHANDLE + ,&vRect + ); + if(hPS) + { + ::GpiCreateLogColorTable( hPS + ,0L + ,LCOLF_CONSECRGB + ,0L + ,(LONG)wxTheColourDatabase->m_nSize + ,(PLONG)wxTheColourDatabase->m_palTable + ); + ::GpiCreateLogColorTable( hPS + ,0L + ,LCOLF_RGB + ,0L + ,0L + ,NULL + ); + + ::WinFillRect( hPS + ,&vRect + ,GetBackgroundColour().GetPixel() + ); + ::WinEndPaint(hPS); + } + } + return TRUE; + } + } + else + { + // nothing to paint - processed + return TRUE; + } + return FALSE; +} // end of wxFrame::HandlePaint -void wxFrame::ProcessCommand(int id) +bool wxFrame::HandleSize( + int nX +, int nY +, WXUINT nId +) { - wxCommandEvent commandEvent(wxEVENT_TYPE_MENU_COMMAND, id); - commandEvent.SetInt( id ); - commandEvent.SetEventObject( this ); - - wxMenuBar *bar = GetMenuBar() ; - if (!bar) - return; - -/* TODO: check the menu item if required - wxMenuItem *item = bar->FindItemForId(id) ; - if (item && item->IsCheckable()) - { - bar->Check(id,!bar->Checked(id)) ; - } -*/ - - wxEvtHandler* evtHandler = GetEventHandler(); - evtHandler->ProcessEvent(commandEvent); -} + bool bProcessed = FALSE; -// Checks if there is a toolbar, and returns the first free client position -wxPoint wxFrame::GetClientAreaOrigin() const + switch (nId) + { + 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_bIconized ) + break; + + // + // restore all child frames too + // + IconizeChildFrames(FALSE); + (void)SendIconizeEvent(FALSE); + + // + // fall through + // + + case kSizeMax: + m_bIconized = FALSE; + break; + + case kSizeMin: + // + // Iconize all child frames too + // + IconizeChildFrames(TRUE); + (void)SendIconizeEvent(); + m_bIconized = TRUE; + break; + } + + if (!m_bIconized) + { + // + // forward WM_SIZE to status bar control + // +#if wxUSE_NATIVE_STATUSBAR + if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))) + { + wxSizeEvent vEvent( wxSize( nX + ,nY + ) + ,m_frameStatusBar->GetId() + ); + + vEvent.SetEventObject(m_frameStatusBar); + m_frameStatusBar->OnSize(vEvent); + } +#endif // wxUSE_NATIVE_STATUSBAR + + PositionStatusBar(); +#if wxUSE_TOOLBAR + PositionToolBar(); +#endif // wxUSE_TOOLBAR + + wxSizeEvent vEvent( wxSize( nX + ,nY + ) + ,m_windowId + ); + + vEvent.SetEventObject(this); + bProcessed = GetEventHandler()->ProcessEvent(vEvent); + AlterChildPos(); + } + return bProcessed; +} // end of wxFrame::HandleSize + +bool wxFrame::HandleCommand( + WXWORD nId +, WXWORD nCmd +, WXHWND hControl +) { - wxPoint pt(0, 0); - if (GetToolBar()) + if (hControl) { - int w, h; - GetToolBar()->GetSize(& w, & h); + // + // In case it's e.g. a toolbar. + // + wxWindow* pWin = wxFindWinFromHandle(hControl); + + if (pWin) + return pWin->OS2Command( nCmd + ,nId + ); + } - if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) + // + // Handle here commands from menus and accelerators + // + if (nCmd == CMDSRC_MENU || nCmd == CMDSRC_ACCELERATOR) + { +#if wxUSE_MENUS_NATIVE + if (wxCurrentPopupMenu) { - pt.x += w; + wxMenu* pPopupMenu = wxCurrentPopupMenu; + + wxCurrentPopupMenu = NULL; + + return pPopupMenu->OS2Command( nCmd + ,nId + ); + return TRUE; } - else +#endif + + if (ProcessCommand(nId)) { - pt.y += h; + return TRUE; } } - return pt; -} + return FALSE; +} // end of wxFrame::HandleCommand -void wxFrame::ScreenToClient(int *x, int *y) const +bool wxFrame::HandleMenuSelect( + WXWORD nItem +, WXWORD nFlags +, WXHMENU hMenu +) { - wxWindow::ScreenToClient(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; -} + if( !nFlags ) + { + MENUITEM mItem; + MRESULT rc; -void wxFrame::ClientToScreen(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::ClientToScreen(x, y); -} + rc = ::WinSendMsg(hMenu, MM_QUERYITEM, MPFROM2SHORT(nItem, TRUE), (MPARAM)&mItem); + + if(rc && !(mItem.afStyle & (MIS_SUBMENU | MIS_SEPARATOR))) + { + wxMenuEvent vEvent(wxEVT_MENU_HIGHLIGHT, nItem); -wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) + vEvent.SetEventObject(this); + GetEventHandler()->ProcessEvent(vEvent); // return value would be ignored by PM + } + } + return TRUE; +} // end of wxFrame::HandleMenuSelect + +// --------------------------------------------------------------------------- +// Main Frame window proc +// --------------------------------------------------------------------------- +MRESULT EXPENTRY wxFrameMainWndProc( + HWND hWnd +, ULONG ulMsg +, MPARAM wParam +, MPARAM lParam +) { - wxCHECK_MSG( m_frameToolBar == NULL, FALSE, - "recreating toolbar in wxFrame" ); + MRESULT rc = (MRESULT)0; + bool bProcessed = FALSE; + wxFrame* pWnd = NULL; - wxToolBar* toolBar = OnCreateToolBar(style, id, name); - if (toolBar) + pWnd = (wxFrame*) wxFindWinFromHandle((WXHWND) hWnd); + switch (ulMsg) { - SetToolBar(toolBar); - PositionToolBar(); - return toolBar; + 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()) + { + pWnd->SetHWND((WXHWND) hWnd); + rc = pWnd->OS2DefWindowProc(ulMsg, wParam, lParam ); + pWnd->SetHWND(0); } else { - return NULL; + if (pWnd) + rc = pWnd->OS2WindowProc(ulMsg, wParam, lParam); + else + rc = ::WinDefWindowProc(hWnd, ulMsg, wParam, lParam); } -} + return rc; +} // end of wxFrameWndProc + +MRESULT wxFrame::OS2WindowProc( + WXUINT uMessage +, WXWPARAM wParam +, WXLPARAM lParam +) +{ + MRESULT mRc = 0L; + bool bProcessed = FALSE; + + switch (uMessage) + { + case WM_CLOSE: + // + // If we can't close, tell the system that we processed the + // message - otherwise it would close us + // + bProcessed = !Close(); + break; + + case WM_PAINT: + bProcessed = HandlePaint(); + mRc = (MRESULT)FALSE; + break; + + 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 wId; + WORD wCmd; + WXHWND hWnd; + + UnpackCommand( (WXWPARAM)wParam + ,(WXLPARAM)lParam + ,&wId + ,&hWnd + ,&wCmd + ); + + bProcessed = HandleCommand( wId + ,wCmd + ,(WXHWND)hWnd + ); + } + break; + + case WM_MENUSELECT: + { + WXWORD wItem; + WXWORD wFlags; + WXHMENU hMenu; + + UnpackMenuSelect( wParam + ,lParam + ,&wItem + ,&wFlags + ,&hMenu + ); + bProcessed = HandleMenuSelect( wItem + ,wFlags + ,hMenu + ); + mRc = (MRESULT)TRUE; + } + break; + + 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 CM_QUERYDRAGIMAGE: + { + 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; + } + + if (!bProcessed ) + mRc = wxWindow::OS2WindowProc( uMessage + ,wParam + ,lParam + ); + return (MRESULT)mRc; +} // wxFrame::OS2WindowProc -wxToolBar* wxFrame::OnCreateToolBar(long style, wxWindowID id, const wxString& name) +void wxFrame::SetClient(WXHWND c_Hwnd) { - return new wxToolBar(this, id, wxDefaultPosition, wxDefaultSize, style, name); + // Duh...nothing to do under OS/2 } -void wxFrame::PositionToolBar() +void wxFrame::SetClient( + wxWindow* pWindow +) { - int cw, ch; + 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; - // TODO: we actually need to use the low-level client size, before - // the toolbar/status bar were added. - // So DEFINITELY replace the line below with something appropriate. + 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; + } - GetClientSize(& cw, &ch); + // + // Else need to change client + // + if(bClientHasFocus) + this->SetFocus(); - if ( GetStatusBar() ) + ::WinEnableWindowUpdate((HWND)GetHWND(), FALSE); + if(pOldClient) { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - ch -= statusY; + pOldClient->Enable(FALSE); + pOldClient->Show(FALSE); + ::WinSetWindowUShort(pOldClient->GetHWND(), QWS_ID, (USHORT)pOldClient->GetId()); } - - if (GetToolBar()) + 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() ) { - int tw, th; - GetToolBar()->GetSize(& tw, & th); - - if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) - { - // Use the 'real' position. wxSIZE_NO_ADJUSTMENTS - // means, pretend we don't have toolbar/status bar, so we - // have the original client size. - GetToolBar()->SetSize(0, 0, tw, ch, wxSIZE_NO_ADJUSTMENTS); - } - else - { - // Use the 'real' position - GetToolBar()->SetSize(0, 0, cw, th, wxSIZE_NO_ADJUSTMENTS); - } + this->Show(); + ::WinSendMsg(m_hFrame, WM_UPDATEFRAME, (MPARAM)~0, 0); } } +wxWindow* wxFrame::GetClient() +{ + return wxFindWinFromHandle((WXHWND)::WinWindowFromID(m_hFrame, FID_CLIENT)); +}