X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a12b404f849a8ce2d28290899379a1f934a9af1..0d1dff0172e94487c4aa2d830c714f93be73c7ec:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 2a738679e0..1bf777979b 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: msw/frame.cpp -// Purpose: wxFrameMSW +// Purpose: wxFrame // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -63,8 +63,6 @@ // globals // ---------------------------------------------------------------------------- -extern wxWindowList wxModelessWindows; -extern wxList WXDLLEXPORT wxPendingDelete; extern const wxChar *wxFrameClassName; #if wxUSE_MENUS_NATIVE @@ -75,13 +73,12 @@ extern wxMenu *wxCurrentPopupMenu; // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxFrameMSW, wxFrameBase) - EVT_ACTIVATE(wxFrameMSW::OnActivate) - EVT_SYS_COLOUR_CHANGED(wxFrameMSW::OnSysColourChanged) +BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) + EVT_ACTIVATE(wxFrame::OnActivate) + EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrameMSW, wxWindow) -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW) +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) // ============================================================================ // implementation @@ -93,9 +90,9 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW) #if wxUSE_STATUSBAR #if wxUSE_NATIVE_STATUSBAR - bool wxFrameMSW::m_useNativeStatusBar = TRUE; + bool wxFrame::m_useNativeStatusBar = TRUE; #else - bool wxFrameMSW::m_useNativeStatusBar = FALSE; + bool wxFrame::m_useNativeStatusBar = FALSE; #endif #endif // wxUSE_NATIVE_STATUSBAR @@ -103,32 +100,24 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxFrameMSW) // creation/destruction // ---------------------------------------------------------------------------- -void wxFrameMSW::Init() +void wxFrame::Init() { - m_iconized = - m_maximizeOnShow = FALSE; - #if wxUSE_TOOLTIPS m_hwndToolTip = 0; #endif // Data to save/restore when calling ShowFullScreen - m_fsStyle = 0; - m_fsOldWindowStyle = 0; m_fsStatusBarFields = 0; m_fsStatusBarHeight = 0; m_fsToolBarHeight = 0; // m_fsMenu = 0; - m_fsIsMaximized = FALSE; - m_fsIsShowing = FALSE; - m_winLastFocused = (wxWindow *)NULL; + m_wasMinimized = FALSE; - // unlike (almost?) all other windows, frames are created hidden - m_isShown = FALSE; + m_winLastFocused = (wxWindow *)NULL; } -bool wxFrameMSW::Create(wxWindow *parent, +bool wxFrame::Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos, @@ -136,288 +125,93 @@ bool wxFrameMSW::Create(wxWindow *parent, long style, const wxString& name) { - SetName(name); - m_windowStyle = style; -#if wxUSE_MENUS - m_frameMenuBar = NULL; -#endif // wxUSE_MENUS -#if wxUSE_TOOLBAR - m_frameToolBar = NULL; -#endif // wxUSE_TOOLBAR -#if wxUSE_STATUSBAR - m_frameStatusBar = NULL; -#endif // wxUSE_STATUSBAR - - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); - - if ( id > -1 ) - m_windowId = id; - else - m_windowId = (int)NewControlId(); - - if (parent) parent->AddChild(this); - - int x = pos.x; - int y = pos.y; - int width = size.x; - int height = size.y; - - m_iconized = FALSE; - - wxTopLevelWindows.Append(this); + if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) + return FALSE; - MSWCreate(m_windowId, parent, wxFrameClassName, this, title, - x, y, width, height, style); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - wxModelessWindows.Append(this); + wxModelessWindows.Append(this); - return TRUE; + return TRUE; } -wxFrameMSW::~wxFrameMSW() +wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; - wxTopLevelWindows.DeleteObject(this); + m_isBeingDeleted = TRUE; - // the ~wxToolBar() code relies on the previous line to be executed before - // this one, i.e. the frame should remove itself from wxTopLevelWindows - // before destorying its toolbar - DeleteAllBars(); - - if (wxTheApp && (wxTopLevelWindows.Number() == 0)) - { - wxTheApp->SetTopWindow(NULL); - - if (wxTheApp->GetExitOnFrameDelete()) - { - PostQuitMessage(0); - } - } - - wxModelessWindows.DeleteObject(this); - - // For some reason, wxWindows can activate another task altogether - // when a frame is destroyed after a modal dialog has been invoked. - // Try to bring the parent to the top. - // MT:Only do this if this frame is currently the active window, else weird - // things start to happen - if ( wxGetActiveWindow() == this ) - if (GetParent() && GetParent()->GetHWND()) - ::BringWindowToTop((HWND) GetParent()->GetHWND()); + DeleteAllBars(); } -// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. -void wxFrameMSW::DoGetClientSize(int *x, int *y) const -{ - RECT rect; - ::GetClientRect(GetHwnd(), &rect); - -#if wxUSE_STATUSBAR - if ( GetStatusBar() && GetStatusBar()->IsShown() ) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - rect.bottom -= statusY; - } -#endif // wxUSE_STATUSBAR - - wxPoint pt(GetClientAreaOrigin()); - rect.bottom -= pt.y; - rect.right -= pt.x; - - if ( x ) - *x = rect.right; - if ( y ) - *y = rect.bottom; -} +// ---------------------------------------------------------------------------- +// wxFrame client size calculations +// ---------------------------------------------------------------------------- -// Set the client size (i.e. leave the calculation of borders etc. -// to wxWindows) -void wxFrameMSW::DoSetClientSize(int width, int height) +void wxFrame::DoSetClientSize(int width, int height) { - HWND hWnd = GetHwnd(); - - RECT rectClient; - ::GetClientRect(hWnd, &rectClient); - - RECT rectTotal; - ::GetWindowRect(hWnd, &rectTotal); - - // Find the difference between the entire window (title bar and all) - // and the client area; add this to the new client size to move the - // window - width += rectTotal.right - rectTotal.left - rectClient.right; - height += rectTotal.bottom - rectTotal.top - rectClient.bottom; - + // leave enough space for the status bar if we have (and show) it #if wxUSE_STATUSBAR wxStatusBar *statbar = GetStatusBar(); if ( statbar && statbar->IsShown() ) { - // leave enough space for the status bar height += statbar->GetSize().y; } #endif // wxUSE_STATUSBAR - // note that this takes the toolbar into account + // call GetClientAreaOrigin() to take the toolbar into account wxPoint pt = GetClientAreaOrigin(); width += pt.x; height += pt.y; - if ( !::MoveWindow(hWnd, rectTotal.left, rectTotal.top, - width, height, TRUE /* redraw */) ) - { - wxLogLastError(_T("MoveWindow")); - } - - wxSizeEvent event(wxSize(width, height), m_windowId); - event.SetEventObject(this); - GetEventHandler()->ProcessEvent(event); + wxTopLevelWindow::DoSetClientSize(width, height); } -void wxFrameMSW::DoGetSize(int *width, int *height) const -{ - RECT rect; - ::GetWindowRect(GetHwnd(), &rect); - - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; -} - -void wxFrameMSW::DoGetPosition(int *x, int *y) const -{ - RECT rect; - ::GetWindowRect(GetHwnd(), &rect); - - *x = rect.left; - *y = rect.top; -} - -// ---------------------------------------------------------------------------- -// variations around ::ShowWindow() -// ---------------------------------------------------------------------------- - -void wxFrameMSW::DoShowWindow(int nShowCmd) -{ - ::ShowWindow(GetHwnd(), nShowCmd); - - m_iconized = nShowCmd == SW_MINIMIZE; -} - -bool wxFrameMSW::Show(bool show) +// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. +void wxFrame::DoGetClientSize(int *x, int *y) const { - // don't use wxWindow version as we want to call DoShowWindow() - if ( !wxWindowBase::Show(show) ) - return FALSE; - - int nShowCmd; - if ( show ) - { - if ( m_maximizeOnShow ) - { - // show and maximize - nShowCmd = SW_MAXIMIZE; - - m_maximizeOnShow = FALSE; - } - else // just show - { - nShowCmd = SW_SHOW; - } - } - else // hide - { - nShowCmd = SW_HIDE; - } + wxTopLevelWindow::DoGetClientSize(x, y); - DoShowWindow(nShowCmd); + // account for the possible toolbar + wxPoint pt = GetClientAreaOrigin(); + if ( x ) + *x -= pt.x; - if ( show ) - { - ::BringWindowToTop(GetHwnd()); + if ( y ) + *y -= pt.y; - wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); - } - else // hide +#if wxUSE_STATUSBAR + // adjust client area height to take the status bar into account + if ( y ) { - // Try to highlight the correct window (the parent) - if ( GetParent() ) + wxStatusBar *statbar = GetStatusBar(); + if ( statbar && statbar->IsShown() ) { - HWND hWndParent = GetHwndOf(GetParent()); - if (hWndParent) - ::BringWindowToTop(hWndParent); + *y -= statbar->GetClientSize().y; } } - - return TRUE; -} - -void wxFrameMSW::Iconize(bool iconize) -{ - DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE); -} - -void wxFrameMSW::Maximize(bool maximize) -{ - if ( IsShown() ) - { - // just maximize it directly - DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE); - } - else // hidden - { - // we can't maximize the hidden frame because it shows it as well, so - // just remember that we should do it later in this case - m_maximizeOnShow = TRUE; - } -} - -void wxFrameMSW::Restore() -{ - DoShowWindow(SW_RESTORE); -} - -bool wxFrameMSW::IsIconized() const -{ - ((wxFrameMSW *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0); - return m_iconized; +#endif // wxUSE_STATUSBAR } -// Is it maximized? -bool wxFrameMSW::IsMaximized() const -{ - return (::IsZoomed(GetHwnd()) != 0); -} +// ---------------------------------------------------------------------------- +// wxFrame: various geometry-related functions +// ---------------------------------------------------------------------------- -void wxFrameMSW::SetIcon(const wxIcon& icon) +void wxFrame::Raise() { - wxFrameBase::SetIcon(icon); - -#if defined(__WIN95__) - if ( m_icon.Ok() ) - { - SendMessage(GetHwnd(), WM_SETICON, - (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON()); - } -#endif // __WIN95__ +#ifdef __WIN16__ + // no SetForegroundWindow() in Win16 + wxFrameBase::Raise(); +#else // Win32 + ::SetForegroundWindow(GetHwnd()); +#endif // Win16/32 } // generate an artificial resize event -void wxFrameMSW::SendSizeEvent() +void wxFrame::SendSizeEvent() { - RECT r; -#ifdef __WIN16__ - ::GetWindowRect(GetHwnd(), &r); -#else - if ( !::GetWindowRect(GetHwnd(), &r) ) - { - wxLogLastError(_T("GetWindowRect")); - } -#endif - if ( !m_iconized ) { + RECT r = wxGetWindowRect(GetHwnd()); + (void)::PostMessage(GetHwnd(), WM_SIZE, IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED, MAKELPARAM(r.right - r.left, r.bottom - r.top)); @@ -425,7 +219,7 @@ void wxFrameMSW::SendSizeEvent() } #if wxUSE_STATUSBAR -wxStatusBar *wxFrameMSW::OnCreateStatusBar(int number, +wxStatusBar *wxFrame::OnCreateStatusBar(int number, long style, wxWindowID id, const wxString& name) @@ -443,25 +237,14 @@ wxStatusBar *wxFrameMSW::OnCreateStatusBar(int number, statusBar = new wxStatusBar(this, id, style, name); } - // Set the height according to the font and the border size - wxClientDC dc(statusBar); - dc.SetFont(statusBar->GetFont()); - - wxCoord y; - dc.GetTextExtent(_T("X"), NULL, &y ); - - int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY()); - - statusBar->SetSize(-1, -1, -1, height); - statusBar->SetFieldsCount(number); return statusBar; } -void wxFrameMSW::PositionStatusBar() +void wxFrame::PositionStatusBar() { - if ( !m_frameStatusBar ) + if ( !m_frameStatusBar || !m_frameStatusBar->IsShown() ) return; int w, h; @@ -475,24 +258,12 @@ void wxFrameMSW::PositionStatusBar() } #endif // wxUSE_STATUSBAR -void wxFrameMSW::DetachMenuBar() -{ -#if wxUSE_MENUS - if ( m_frameMenuBar ) - { - m_frameMenuBar->Detach(); - m_frameMenuBar = NULL; - } -#endif // wxUSE_MENUS -} +#if wxUSE_MENUS_NATIVE -void wxFrameMSW::SetMenuBar(wxMenuBar *menubar) +void wxFrame::AttachMenuBar(wxMenuBar *menubar) { -#if wxUSE_MENUS - // detach the old menu bar in any case - DetachMenuBar(); + wxFrameBase::AttachMenuBar(menubar); -#if wxUSE_MENUS_NATIVE if ( !menubar ) { // actually remove the menu from the frame @@ -506,45 +277,37 @@ void wxFrameMSW::SetMenuBar(wxMenuBar *menubar) { m_hMenu = menubar->GetHMenu(); } - else + else // no HMENU yet { - if (menubar->IsAttached()) - menubar->Detach(); - m_hMenu = menubar->Create(); if ( !m_hMenu ) + { + wxFAIL_MSG( _T("failed to create menu bar") ); return; + } } InternalSetMenuBar(); } -#endif // wxUSE_MENUS_NATIVE - - if ( menubar ) - { - m_frameMenuBar = menubar; - menubar->Attach((wxFrame *)this); - } -#endif // wxUSE_MENUS } -#if wxUSE_MENUS_NATIVE - -void wxFrameMSW::InternalSetMenuBar() +void wxFrame::InternalSetMenuBar() { +#ifndef __WXMICROWIN__ if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) { wxLogLastError(wxT("SetMenu")); } +#endif } #endif // wxUSE_MENUS_NATIVE // Responds to colour changes, and passes event on to children. -void wxFrameMSW::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); #if wxUSE_STATUSBAR @@ -561,16 +324,13 @@ void wxFrameMSW::OnSysColourChanged(wxSysColourChangedEvent& event) } // Pass TRUE to show full screen, FALSE to restore. -bool wxFrameMSW::ShowFullScreen(bool show, long style) +bool wxFrame::ShowFullScreen(bool show, long style) { + if ( IsFullScreen() == show ) + return FALSE; + if (show) { - if (IsFullScreen()) - return FALSE; - - m_fsIsShowing = TRUE; - m_fsStyle = style; - #if wxUSE_TOOLBAR wxToolBar *theToolBar = GetToolBar(); if (theToolBar) @@ -585,8 +345,10 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style) } #endif // wxUSE_TOOLBAR +#ifndef __WXMICROWIN__ if (style & wxFULLSCREEN_NOMENUBAR) SetMenu((HWND)GetHWND(), (HMENU) NULL); +#endif #if wxUSE_STATUSBAR wxStatusBar *theStatusBar = GetStatusBar(); @@ -604,55 +366,9 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style) else m_fsStatusBarFields = 0; #endif // wxUSE_STATUSBAR - - // zap the frame borders - - // save the 'normal' window style - m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE); - - // save the old position, width & height, maximize state - m_fsOldSize = GetRect(); - m_fsIsMaximized = IsMaximized(); - - // decide which window style flags to turn off - LONG newStyle = m_fsOldWindowStyle; - LONG offFlags = 0; - - if (style & wxFULLSCREEN_NOBORDER) - offFlags |= WS_BORDER; - if (style & wxFULLSCREEN_NOCAPTION) - offFlags |= (WS_CAPTION | WS_SYSMENU); - - newStyle &= (~offFlags); - - // change our window style to be compatible with full-screen mode - SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle); - - // resize to the size of the desktop - int width, height; - - RECT rect; - ::GetWindowRect(GetDesktopWindow(), &rect); - width = rect.right - rect.left; - height = rect.bottom - rect.top; - - SetSize(width, height); - - // now flush the window style cache and actually go full-screen - SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED); - - wxSizeEvent event(wxSize(width, height), GetId()); - GetEventHandler()->ProcessEvent(event); - - return TRUE; } else { - if (!IsFullScreen()) - return FALSE; - - m_fsIsShowing = FALSE; - #if wxUSE_TOOLBAR wxToolBar *theToolBar = GetToolBar(); @@ -676,120 +392,23 @@ bool wxFrameMSW::ShowFullScreen(bool show, long style) } #endif // wxUSE_STATUSBAR +#ifndef __WXMICROWIN__ if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) SetMenu((HWND)GetHWND(), (HMENU)m_hMenu); - - Maximize(m_fsIsMaximized); - SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle); - SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y, - m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED); - - return TRUE; - } -} - -/* - * Frame window - * - */ - -bool wxFrameMSW::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title, - int x, int y, int width, int height, long style) - -{ - m_defaultIcon = (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. - - DWORD msflags = 0; - if ( style & wxCAPTION ) - { - if ( style & wxFRAME_TOOL_WINDOW ) - msflags |= WS_POPUPWINDOW; - else - 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 ) - 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 wxFrameMSW because it saves recoding this function - // in wxTinyFrame -#if wxUSE_ITSY_BITSY && !defined(__WIN32__) - 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; - - WXDWORD extendedStyle = MakeExtendedStyle(style); - - // make all frames appear in the win9x shell taskbar unless - // wxFRAME_TOOL_WINDOW or wxFRAME_NO_TASKBAR is given - without giving them - // WS_EX_APPWINDOW style, the child (i.e. owned) frames wouldn't appear in it -#if !defined(__WIN16__) && !defined(__SC__) - if ( (style & wxFRAME_TOOL_WINDOW) || - (style & wxFRAME_NO_TASKBAR) ) - extendedStyle |= WS_EX_TOOLWINDOW; - else if ( !(style & wxFRAME_NO_TASKBAR) ) - extendedStyle |= WS_EX_APPWINDOW; -#endif - - if (style & wxSTAY_ON_TOP) - extendedStyle |= WS_EX_TOPMOST; - -#ifndef __WIN16__ - if (m_exStyle & wxFRAME_EX_CONTEXTHELP) - extendedStyle |= WS_EX_CONTEXTHELP; #endif - - m_iconized = FALSE; - if ( !wxWindow::MSWCreate(id, parent, wclass, wx_win, title, x, y, width, height, - msflags, NULL, extendedStyle) ) - return FALSE; - - // 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; + } + + return wxFrameBase::ShowFullScreen(show, style); } // Default activation behaviour - set the focus for the first child // subwindow found. -void wxFrameMSW::OnActivate(wxActivateEvent& event) +void wxFrame::OnActivate(wxActivateEvent& event) { if ( event.GetActive() ) { // restore focus to the child which was last focused - wxLogTrace(_T("focus"), _T("wxFrameMSW %08x activated."), m_hWnd); + wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() : NULL; @@ -823,7 +442,7 @@ void wxFrameMSW::OnActivate(wxActivateEvent& event) } wxLogTrace(_T("focus"), - _T("wxFrameMSW %08x deactivated, last focused: %08x."), + _T("wxFrame %08x deactivated, last focused: %08x."), m_hWnd, m_winLastFocused ? GetHwndOf(m_winLastFocused) : NULL); @@ -838,7 +457,7 @@ void wxFrameMSW::OnActivate(wxActivateEvent& event) #if wxUSE_TOOLBAR -wxToolBar* wxFrameMSW::CreateToolBar(long style, wxWindowID id, const wxString& name) +wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) { if ( wxFrameBase::CreateToolBar(style, id, name) ) { @@ -848,38 +467,42 @@ wxToolBar* wxFrameMSW::CreateToolBar(long style, wxWindowID id, const wxString& return m_frameToolBar; } -void wxFrameMSW::PositionToolBar() +void wxFrame::PositionToolBar() { - RECT rect; - ::GetClientRect(GetHwnd(), &rect); + wxToolBar *toolbar = GetToolBar(); + if ( toolbar && toolbar->IsShown() ) + { + // don't call our (or even wxTopLevelWindow) version because we want + // the real (full) client area size, not excluding the tool/status bar + int width, height; + wxWindow::DoGetClientSize(&width, &height); #if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - rect.bottom -= statusY; - } + wxStatusBar *statbar = GetStatusBar(); + if ( statbar && statbar->IsShown() ) + { + height -= statbar->GetClientSize().y; + } #endif // wxUSE_STATUSBAR - if ( GetToolBar() && GetToolBar()->IsShown() ) - { int tw, th; - GetToolBar()->GetSize(&tw, &th); + toolbar->GetSize(&tw, &th); - if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) + if ( toolbar->GetWindowStyleFlag() & wxTB_VERTICAL ) { - th = rect.bottom; + th = height; } else { - tw = rect.right; + tw = width; } - // Use the 'real' MSW position here - GetToolBar()->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); + // use the 'real' MSW position here, don't offset relativly to the + // client area origin + toolbar->SetSize(0, 0, tw, th, wxSIZE_NO_ADJUSTMENTS); } } + #endif // wxUSE_TOOLBAR // ---------------------------------------------------------------------------- @@ -889,7 +512,7 @@ void wxFrameMSW::PositionToolBar() // 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 wxFrameMSW::IconizeChildFrames(bool bIconize) +void wxFrame::IconizeChildFrames(bool bIconize) { for ( wxWindowList::Node *node = GetChildren().GetFirst(); node; @@ -909,18 +532,38 @@ void wxFrameMSW::IconizeChildFrames(bool bIconize) // the child MDI frames are a special case and should not be touched by // the parent frame - instead, they are managed by the user - wxFrameMSW *frame = wxDynamicCast(win, wxFrameMSW); + wxFrame *frame = wxDynamicCast(win, wxFrame); if ( frame #if wxUSE_MDI_ARCHITECTURE && !wxDynamicCast(frame, wxMDIChildFrame) #endif // wxUSE_MDI_ARCHITECTURE ) { - frame->Iconize(bIconize); + // 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 ) + { + // note that we shouldn't touch the hidden frames neither + // because iconizing/restoring them would show them as a side + // effect + frame->m_wasMinimized = frame->IsIconized() || !frame->IsShown(); + } + + // this test works for both iconizing and restoring + if ( !frame->m_wasMinimized ) + frame->Iconize(bIconize); } } } +WXHICON wxFrame::GetDefaultIcon() const +{ + return (WXHICON)(wxSTD_FRAME_ICON ? wxSTD_FRAME_ICON + : wxDEFAULT_FRAME_ICON); +} + // =========================================================================== // message processing // =========================================================================== @@ -929,7 +572,7 @@ void wxFrameMSW::IconizeChildFrames(bool bIconize) // preprocessing // --------------------------------------------------------------------------- -bool wxFrameMSW::MSWTranslateMessage(WXMSG* pMsg) +bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) { if ( wxWindow::MSWTranslateMessage(pMsg) ) return TRUE; @@ -951,15 +594,16 @@ bool wxFrameMSW::MSWTranslateMessage(WXMSG* pMsg) // our private (non virtual) message handlers // --------------------------------------------------------------------------- -bool wxFrameMSW::HandlePaint() +bool wxFrame::HandlePaint() { RECT rect; if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) { +#ifndef __WXMICROWIN__ if ( m_iconized ) { HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) - : (HICON)m_defaultIcon; + : (HICON)GetDefaultIcon(); // Hold a pointer to the dc so long as the OnPaint() message // is being processed @@ -989,6 +633,7 @@ bool wxFrameMSW::HandlePaint() return TRUE; } else + #endif { return wxWindow::HandlePaint(); } @@ -1000,9 +645,10 @@ bool wxFrameMSW::HandlePaint() } } -bool wxFrameMSW::HandleSize(int x, int y, WXUINT id) +bool wxFrame::HandleSize(int x, int y, WXUINT id) { bool processed = FALSE; +#ifndef __WXMICROWIN__ switch ( id ) { @@ -1033,6 +679,7 @@ bool wxFrameMSW::HandleSize(int x, int y, WXUINT id) m_iconized = TRUE; break; } +#endif if ( !m_iconized ) { @@ -1052,7 +699,7 @@ bool wxFrameMSW::HandleSize(int x, int y, WXUINT id) return processed; } -bool wxFrameMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) +bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) { if ( control ) { @@ -1084,7 +731,7 @@ bool wxFrameMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) return FALSE; } -bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) +bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) { int item; if ( flags == 0xFFFF && hMenu == 0 ) @@ -1092,10 +739,12 @@ bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) // menu was removed from screen item = -1; } +#ifndef __WXMICROWIN__ else if ( !(flags & MF_POPUP) && !(flags & MF_SEPARATOR) ) { item = nItem; } +#endif else { #if wxUSE_STATUSBAR @@ -1120,10 +769,10 @@ bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) } // --------------------------------------------------------------------------- -// the window proc for wxFrameMSW +// the window proc for wxFrame // --------------------------------------------------------------------------- -long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { long rc = 0; bool processed = FALSE; @@ -1147,6 +796,7 @@ long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) } break; +#ifndef __WXMICROWIN__ case WM_MENUSELECT: { WXWORD item, flags; @@ -1156,19 +806,22 @@ long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) processed = HandleMenuSelect(item, flags, hmenu); } break; +#endif case WM_PAINT: processed = HandlePaint(); break; +#ifndef __WXMICROWIN__ case WM_QUERYDRAGICON: { HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) - : (HICON)(m_defaultIcon); + : (HICON)GetDefaultIcon(); rc = (long)hIcon; processed = rc != 0; } break; +#endif case WM_SIZE: processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);