X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a2327a9f80fa3240ab652da8f95a66b5c25576de..1fc8878582bcdab2a90b95fb713c4d088a0e2a57:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index d698638b4f..501b0fe8b6 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -37,6 +37,8 @@ #include "wx/dialog.h" #include "wx/settings.h" #include "wx/dcclient.h" + #include "wx/mdi.h" + #include "wx/panel.h" #endif // WX_PRECOMP #include "wx/msw/private.h" @@ -105,9 +107,14 @@ void wxFrame::Init() m_fsStatusBarFields = 0; m_fsStatusBarHeight = 0; m_fsToolBarHeight = 0; -// m_fsMenu = 0; +// m_fsMenu = 0; m_fsIsMaximized = FALSE; m_fsIsShowing = FALSE; + + m_winLastFocused = (wxWindow *)NULL; + + // unlike (almost?) all other windows, frames are created hidden + m_isShown = FALSE; } bool wxFrame::Create(wxWindow *parent, @@ -140,20 +147,13 @@ bool wxFrame::Create(wxWindow *parent, m_iconized = 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) - parent = NULL; - - if (!parent) - wxTopLevelWindows.Append(this); + wxTopLevelWindows.Append(this); MSWCreate(m_windowId, parent, wxFrameClassName, this, title, x, y, width, height, style); wxModelessWindows.Append(this); + return TRUE; } @@ -162,6 +162,9 @@ wxFrame::~wxFrame() m_isBeingDeleted = TRUE; wxTopLevelWindows.DeleteObject(this); + // 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)) @@ -286,6 +289,10 @@ void wxFrame::DoShowWindow(int nShowCmd) bool wxFrame::Show(bool show) { + // don't use wxWindow version as we want to call DoShowWindow() + if ( !wxWindowBase::Show(show) ) + return FALSE; + DoShowWindow(show ? SW_SHOW : SW_HIDE); if ( show ) @@ -359,30 +366,28 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, wxStatusBar *statusBar = NULL; #if wxUSE_NATIVE_STATUSBAR - if ( UsesNativeStatusBar() ) + if ( !UsesNativeStatusBar() ) { - statusBar = (wxStatusBar *)new wxStatusBar95(this, id, style); - - statusBar->SetFieldsCount(number); + statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style); } else #endif { - statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style, name); + 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()); + // 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 ); + wxCoord y; + dc.GetTextExtent(_T("X"), NULL, &y ); - int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY()); + int height = (int)( (11*y)/10 + 2*statusBar->GetBorderY()); - statusBar->SetSize(-1, -1, -1, height); + statusBar->SetSize(-1, -1, -1, height); - statusBar->SetFieldsCount(number); - } + statusBar->SetFieldsCount(number); return statusBar; } @@ -392,103 +397,70 @@ void wxFrame::PositionStatusBar() if ( !m_frameStatusBar ) return; - // native status bar positions itself, but we must forward the WM_SIZE - // messages to it -#if wxUSE_NATIVE_STATUSBAR - wxStatusBar95 *sb = wxDynamicCast(m_frameStatusBar, wxStatusBar95); - if ( sb ) - { - wxSizeEvent event(GetSize(), sb->GetId()); - event.SetEventObject(sb); + int w, h; + GetClientSize(&w, &h); + int sw, sh; + m_frameStatusBar->GetSize(&sw, &sh); - sb->GetEventHandler()->ProcessEvent(event); - } - else -#endif // wxUSE_NATIVE_STATUSBAR - { - 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); - } + // 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); } #endif // wxUSE_STATUSBAR void wxFrame::DetachMenuBar() { - if (m_frameMenuBar) + if ( m_frameMenuBar ) { m_frameMenuBar->Detach(); m_frameMenuBar = NULL; } } -void wxFrame::SetMenuBar(wxMenuBar *menu_bar) +void wxFrame::SetMenuBar(wxMenuBar *menubar) { - if (!menu_bar) + if ( !menubar ) { DetachMenuBar(); - return; - } - - m_frameMenuBar = NULL; - // 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 (menu_bar->GetHMenu()) - { - m_hMenu = menu_bar->GetHMenu(); + // actually remove the menu from the frame + m_hMenu = (WXHMENU)0; + InternalSetMenuBar(); } - else + else // set new non NULL menu bar { - menu_bar->Detach(); + m_frameMenuBar = NULL; - m_hMenu = menu_bar->Create(); + // 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 ( menubar->GetHMenu() ) + { + m_hMenu = menubar->GetHMenu(); + } + else + { + menubar->Detach(); - if ( !m_hMenu ) - return; - } + m_hMenu = menubar->Create(); - InternalSetMenuBar(); + if ( !m_hMenu ) + return; + } - m_frameMenuBar = menu_bar; - menu_bar->Attach(this); + InternalSetMenuBar(); -#if 0 // Old code that assumes only one call of SetMenuBar per frame. - if (!menu_bar) - { - DetachMenuBar(); - return; + m_frameMenuBar = menubar; + menubar->Attach(this); } - - wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") ); - - if (m_frameMenuBar) - delete m_frameMenuBar; - - m_hMenu = menu_bar->Create(); - - if ( !m_hMenu ) - return; - - InternalSetMenuBar(); - - m_frameMenuBar = menu_bar; - menu_bar->Attach(this); -#endif } void wxFrame::InternalSetMenuBar() { if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) { - wxLogLastError("SetMenu"); + wxLogLastError(wxT("SetMenu")); } } @@ -520,8 +492,8 @@ bool wxFrame::ShowFullScreen(bool show, long style) m_fsIsShowing = TRUE; m_fsStyle = style; - wxToolBar *theToolBar = GetToolBar(); - wxStatusBar *theStatusBar = GetStatusBar(); + wxToolBar *theToolBar = GetToolBar(); + wxStatusBar *theStatusBar = GetStatusBar(); int dummyWidth; @@ -544,9 +516,10 @@ bool wxFrame::ShowFullScreen(bool show, long style) // Save the number of fields in the statusbar if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar) { - m_fsStatusBarFields = theStatusBar->GetFieldsCount(); - SetStatusBar((wxStatusBar*) NULL); - delete theStatusBar; + //m_fsStatusBarFields = theStatusBar->GetFieldsCount(); + //SetStatusBar((wxStatusBar*) NULL); + //delete theStatusBar; + theStatusBar->Show(FALSE); } else m_fsStatusBarFields = 0; @@ -556,11 +529,11 @@ bool wxFrame::ShowFullScreen(bool show, long style) // save the 'normal' window style m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE); - // save the old position, width & height, maximize state + // save the old position, width & height, maximize state m_fsOldSize = GetRect(); - m_fsIsMaximized = IsMaximized(); + m_fsIsMaximized = IsMaximized(); - // decide which window style flags to turn off + // decide which window style flags to turn off LONG newStyle = m_fsOldWindowStyle; LONG offFlags = 0; @@ -608,10 +581,14 @@ bool wxFrame::ShowFullScreen(bool show, long style) theToolBar->Show(TRUE); } - if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0)) + if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR)) // && (m_fsStatusBarFields > 0)) { - CreateStatusBar(m_fsStatusBarFields); - PositionStatusBar(); + //CreateStatusBar(m_fsStatusBarFields); + if (GetStatusBar()) + { + GetStatusBar()->Show(TRUE); + PositionStatusBar(); + } } if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) @@ -641,10 +618,17 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow // could be the culprit. But without it, you can get a lot of flicker. DWORD msflags = 0; - if ((style & wxCAPTION) == wxCAPTION) - msflags = WS_OVERLAPPED; + if ( style & wxCAPTION ) + { + if ( style & wxFRAME_TOOL_WINDOW ) + msflags |= WS_POPUPWINDOW; + else + msflags |= WS_OVERLAPPED; + } else - msflags = WS_POPUP; + { + msflags |= WS_POPUP; + } if (style & wxMINIMIZE_BOX) msflags |= WS_MINIMIZEBOX; @@ -654,7 +638,7 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow msflags |= WS_THICKFRAME; if (style & wxSYSTEM_MENU) msflags |= WS_SYSMENU; - if ((style & wxMINIMIZE) || (style & wxICONIZE)) + if ( style & wxMINIMIZE ) msflags |= WS_MINIMIZE; if (style & wxMAXIMIZE) msflags |= WS_MAXIMIZE; @@ -665,7 +649,7 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow // Keep this in wxFrame because it saves recoding this function // in wxTinyFrame -#if wxUSE_ITSY_BITSY +#if wxUSE_ITSY_BITSY && !defined(__WIN32__) if (style & wxTINY_CAPTION_VERT) msflags |= IBS_VERTCAPTION; if (style & wxTINY_CAPTION_HORIZ) @@ -681,14 +665,24 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow 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) - extendedStyle |= WS_EX_TOOLWINDOW; + if ( style & wxFRAME_TOOL_WINDOW ) + 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) ) @@ -706,37 +700,32 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow // subwindow found. void wxFrame::OnActivate(wxActivateEvent& event) { - if ( !event.GetActive() ) + if ( event.GetActive() ) { - event.Skip(); + // restore focus to the child which was last focused + wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); - return; + wxSetFocusToChild(this, &m_winLastFocused); } - - wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); - - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) + else { - // 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(); - - if ( !child->IsTopLevel() -#if wxUSE_TOOLBAR - && !wxDynamicCast(child, wxToolBar) -#endif // wxUSE_TOOLBAR -#if wxUSE_STATUSBAR - && !wxDynamicCast(child, wxStatusBar) -#endif // wxUSE_STATUSBAR - ) + // remember the last focused child + m_winLastFocused = FindFocus(); + while ( m_winLastFocused ) { - child->SetFocus(); - break; + if ( GetChildren().Find(m_winLastFocused) ) + break; + + m_winLastFocused = m_winLastFocused->GetParent(); } + + wxLogTrace(_T("focus"), + _T("wxFrame %08x deactivated, last focused: %08x."), + m_hWnd, + m_winLastFocused ? GetHwndOf(m_winLastFocused) + : NULL); + + event.Skip(); } } @@ -805,9 +794,22 @@ void wxFrame::IconizeChildFrames(bool bIconize) { wxWindow *win = node->GetData(); - if ( win->IsKindOf(CLASSINFO(wxFrame)) ) + // iconizing the frames with this style under Win95 shell puts them at + // the bottom of the screen (as the MDI children) instead of making + // them appear in the taskbar because they are, by virtue of this + // style, not managed by the taskbar - instead leave Windows take care + // of them +#ifdef __WIN95__ + if ( win->GetWindowStyle() & wxFRAME_TOOL_WINDOW ) + continue; +#endif // Win95 + + // the child MDI frames are a special case and should not be touched by + // the parent frame - instead, they are managed by the user + wxFrame *frame = wxDynamicCast(win, wxFrame); + if ( frame && !wxDynamicCast(frame, wxMDIChildFrame) ) { - ((wxFrame *)win)->Iconize(bIconize); + frame->Iconize(bIconize); } } } @@ -975,7 +977,15 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) else { // don't give hints for separators (doesn't make sense) nor for the - // items opening popup menus (they don't have them anyhow) + // items opening popup menus (they don't have them anyhow) but do clear + // the status line - otherwise, we would be left with the help message + // for the previous item which doesn't apply any more + wxStatusBar *statbar = GetStatusBar(); + if ( statbar ) + { + statbar->SetStatusText(wxEmptyString); + } + return FALSE; }