X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f0500b3ee1255cc71624bc58b83d0d954b2d45e..491b5be8305968871bc289453ed088a70c3de044:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index ac077260fa..ee461db1be 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -1,6 +1,6 @@ ///////////////////////////////////////////////////////////////////////////// // Name: msw/frame.cpp -// Purpose: wxFrame +// Purpose: wxFrameMSW // Author: Julian Smart // Modified by: // Created: 01/02/97 @@ -29,15 +29,15 @@ #endif #ifndef WX_PRECOMP - #include "wx/setup.h" #include "wx/frame.h" - #include "wx/menu.h" #include "wx/app.h" + #include "wx/menu.h" #include "wx/utils.h" #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" @@ -54,6 +54,11 @@ #include "wx/menuitem.h" #include "wx/log.h" +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/colschem.h" +#endif // __WXUNIVERSAL__ + // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- @@ -61,18 +66,23 @@ extern wxWindowList wxModelessWindows; extern wxList WXDLLEXPORT wxPendingDelete; extern const wxChar *wxFrameClassName; + +#if wxUSE_MENUS_NATIVE extern wxMenu *wxCurrentPopupMenu; +#endif // wxUSE_MENUS_NATIVE // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- -BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) - EVT_ACTIVATE(wxFrame::OnActivate) - EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) +BEGIN_EVENT_TABLE(wxFrameMSW, wxFrameBase) + EVT_ACTIVATE(wxFrameMSW::OnActivate) + EVT_SYS_COLOUR_CHANGED(wxFrameMSW::OnSysColourChanged) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) +#ifndef __WXUNIVERSAL__ + IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) +#endif // ============================================================================ // implementation @@ -82,19 +92,22 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) // static class members // ---------------------------------------------------------------------------- -#if wxUSE_NATIVE_STATUSBAR - bool wxFrame::m_useNativeStatusBar = TRUE; -#else - bool wxFrame::m_useNativeStatusBar = FALSE; -#endif +#if wxUSE_STATUSBAR + #if wxUSE_NATIVE_STATUSBAR + bool wxFrameMSW::m_useNativeStatusBar = TRUE; + #else + bool wxFrameMSW::m_useNativeStatusBar = FALSE; + #endif +#endif // wxUSE_NATIVE_STATUSBAR // ---------------------------------------------------------------------------- // creation/destruction // ---------------------------------------------------------------------------- -void wxFrame::Init() +void wxFrameMSW::Init() { - m_iconized = FALSE; + m_iconized = + m_maximizeOnShow = FALSE; #if wxUSE_TOOLTIPS m_hwndToolTip = 0; @@ -106,12 +119,17 @@ 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, +bool wxFrameMSW::Create(wxWindow *parent, wxWindowID id, const wxString& title, const wxPoint& pos, @@ -121,9 +139,6 @@ bool wxFrame::Create(wxWindow *parent, { SetName(name); m_windowStyle = style; - m_frameMenuBar = NULL; - m_frameToolBar = NULL; - m_frameStatusBar = NULL; SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); @@ -141,28 +156,24 @@ 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; } -wxFrame::~wxFrame() +wxFrameMSW::~wxFrameMSW() { 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)) @@ -188,7 +199,7 @@ wxFrame::~wxFrame() } // Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. -void wxFrame::DoGetClientSize(int *x, int *y) const +void wxFrameMSW::DoGetClientSize(int *x, int *y) const { RECT rect; ::GetClientRect(GetHwnd(), &rect); @@ -214,80 +225,103 @@ void wxFrame::DoGetClientSize(int *x, int *y) const // Set the client size (i.e. leave the calculation of borders etc. // to wxWindows) -void wxFrame::DoSetClientSize(int width, int height) +void wxFrameMSW::DoSetClientSize(int width, int height) { - HWND hWnd = GetHwnd(); + HWND hWnd = GetHwnd(); - RECT rect; - ::GetClientRect(hWnd, &rect); + RECT rectClient; + ::GetClientRect(hWnd, &rectClient); - RECT rect2; - GetWindowRect(hWnd, &rect2); + 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 - int actual_width = rect2.right - rect2.left - rect.right + width; - int actual_height = rect2.bottom - rect2.top - rect.bottom + height; + // 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; #if wxUSE_STATUSBAR - if ( GetStatusBar() && GetStatusBar()->IsShown()) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - actual_height += statusY; - } + wxStatusBar *statbar = GetStatusBar(); + if ( statbar && statbar->IsShown() ) + { + // leave enough space for the status bar + height += statbar->GetSize().y; + } #endif // wxUSE_STATUSBAR - wxPoint pt(GetClientAreaOrigin()); - actual_width += pt.y; - actual_height += pt.x; + // note that this takes the toolbar into account + wxPoint pt = GetClientAreaOrigin(); + width += pt.x; + height += pt.y; - POINT point; - point.x = rect2.left; - point.y = rect2.top; - - MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE); + 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); + wxSizeEvent event(wxSize(width, height), m_windowId); + event.SetEventObject(this); + GetEventHandler()->ProcessEvent(event); } -void wxFrame::DoGetSize(int *width, int *height) const +void wxFrameMSW::DoGetSize(int *width, int *height) const { - RECT rect; - GetWindowRect(GetHwnd(), &rect); - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; + RECT rect; + ::GetWindowRect(GetHwnd(), &rect); + + *width = rect.right - rect.left; + *height = rect.bottom - rect.top; } -void wxFrame::DoGetPosition(int *x, int *y) const +void wxFrameMSW::DoGetPosition(int *x, int *y) const { - RECT rect; - GetWindowRect(GetHwnd(), &rect); - POINT point; - point.x = rect.left; - point.y = rect.top; + RECT rect; + ::GetWindowRect(GetHwnd(), &rect); - *x = point.x; - *y = point.y; + *x = rect.left; + *y = rect.top; } // ---------------------------------------------------------------------------- // variations around ::ShowWindow() // ---------------------------------------------------------------------------- -void wxFrame::DoShowWindow(int nShowCmd) +void wxFrameMSW::DoShowWindow(int nShowCmd) { ::ShowWindow(GetHwnd(), nShowCmd); m_iconized = nShowCmd == SW_MINIMIZE; } -bool wxFrame::Show(bool show) +bool wxFrameMSW::Show(bool show) { - DoShowWindow(show ? SW_SHOW : SW_HIDE); + // 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; + } + + DoShowWindow(nShowCmd); if ( show ) { @@ -297,7 +331,7 @@ bool wxFrame::Show(bool show) event.SetEventObject( this ); GetEventHandler()->ProcessEvent(event); } - else + else // hide { // Try to highlight the correct window (the parent) if ( GetParent() ) @@ -311,38 +345,58 @@ bool wxFrame::Show(bool show) return TRUE; } -void wxFrame::Iconize(bool iconize) +void wxFrameMSW::Iconize(bool iconize) { DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE); } -void wxFrame::Maximize(bool maximize) +void wxFrameMSW::Maximize(bool maximize) { - DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE); + 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 wxFrame::Restore() +void wxFrameMSW::Restore() { DoShowWindow(SW_RESTORE); } -bool wxFrame::IsIconized() const +bool wxFrameMSW::IsIconized() const { - ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0); +#ifdef __WXMICROWIN__ + // TODO + return FALSE; +#else + ((wxFrameMSW *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0); return m_iconized; +#endif } // Is it maximized? -bool wxFrame::IsMaximized() const +bool wxFrameMSW::IsMaximized() const { +#ifdef __WXMICROWIN__ + // TODO + return FALSE; +#else return (::IsZoomed(GetHwnd()) != 0); +#endif } -void wxFrame::SetIcon(const wxIcon& icon) +void wxFrameMSW::SetIcon(const wxIcon& icon) { wxFrameBase::SetIcon(icon); -#if defined(__WIN95__) +#if defined(__WIN95__) && !defined(__WXMICROWIN__) if ( m_icon.Ok() ) { SendMessage(GetHwnd(), WM_SETICON, @@ -351,8 +405,29 @@ void wxFrame::SetIcon(const wxIcon& icon) #endif // __WIN95__ } +// generate an artificial resize event +void wxFrameMSW::SendSizeEvent() +{ + RECT r; +#ifdef __WIN16__ + ::GetWindowRect(GetHwnd(), &r); +#else + if ( !::GetWindowRect(GetHwnd(), &r) ) + { + wxLogLastError(_T("GetWindowRect")); + } +#endif + + if ( !m_iconized ) + { + (void)::PostMessage(GetHwnd(), WM_SIZE, + IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED, + MAKELPARAM(r.right - r.left, r.bottom - r.top)); + } +} + #if wxUSE_STATUSBAR -wxStatusBar *wxFrame::OnCreateStatusBar(int number, +wxStatusBar *wxFrameMSW::OnCreateStatusBar(int number, long style, wxWindowID id, const wxString& name) @@ -386,7 +461,7 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, return statusBar; } -void wxFrame::PositionStatusBar() +void wxFrameMSW::PositionStatusBar() { if ( !m_frameStatusBar ) return; @@ -402,99 +477,73 @@ void wxFrame::PositionStatusBar() } #endif // wxUSE_STATUSBAR -void wxFrame::DetachMenuBar() -{ - if (m_frameMenuBar) - { - m_frameMenuBar->Detach(); - m_frameMenuBar = NULL; - } -} +#if wxUSE_MENUS_NATIVE -void wxFrame::SetMenuBar(wxMenuBar *menu_bar) +void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar) { - if (!menu_bar) - { - DetachMenuBar(); - return; - } - - m_frameMenuBar = NULL; + m_frameMenuBar = menubar; - // 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()) + if ( !menubar ) { - 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_hMenu = menu_bar->Create(); - - if ( !m_hMenu ) - return; - } + // Can set a menubar several times. + if ( menubar->GetHMenu() ) + { + m_hMenu = menubar->GetHMenu(); + } + else + { + if ( menubar->IsAttached() ) + menubar->Detach(); - InternalSetMenuBar(); + m_hMenu = menubar->Create(); - m_frameMenuBar = menu_bar; - menu_bar->Attach(this); + if ( !m_hMenu ) + return; + } -#if 0 // Old code that assumes only one call of SetMenuBar per frame. - if (!menu_bar) - { - DetachMenuBar(); - return; + InternalSetMenuBar(); } - - 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() +void wxFrameMSW::InternalSetMenuBar() { +#ifndef __WXMICROWIN__ if ( !::SetMenu(GetHwnd(), (HMENU)m_hMenu) ) { - wxLogLastError("SetMenu"); + wxLogLastError(wxT("SetMenu")); } +#endif } +#endif // wxUSE_MENUS_NATIVE + // Responds to colour changes, and passes event on to children. -void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) +void wxFrameMSW::OnSysColourChanged(wxSysColourChangedEvent& event) { SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); Refresh(); +#if wxUSE_STATUSBAR if ( m_frameStatusBar ) { wxSysColourChangedEvent event2; event2.SetEventObject( m_frameStatusBar ); m_frameStatusBar->GetEventHandler()->ProcessEvent(event2); } +#endif // wxUSE_STATUSBAR // Propagate the event to the non-top-level children wxWindow::OnSysColourChanged(event); } // Pass TRUE to show full screen, FALSE to restore. -bool wxFrame::ShowFullScreen(bool show, long style) +bool wxFrameMSW::ShowFullScreen(bool show, long style) { if (show) { @@ -504,15 +553,10 @@ bool wxFrame::ShowFullScreen(bool show, long style) m_fsIsShowing = TRUE; m_fsStyle = style; - wxToolBar *theToolBar = GetToolBar(); - wxStatusBar *theStatusBar = GetStatusBar(); - - int dummyWidth; - +#if wxUSE_TOOLBAR + wxToolBar *theToolBar = GetToolBar(); if (theToolBar) - theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight); - if (theStatusBar) - theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight); + theToolBar->GetSize(NULL, &m_fsToolBarHeight); // zap the toolbar, menubar, and statusbar @@ -521,30 +565,40 @@ bool wxFrame::ShowFullScreen(bool show, long style) theToolBar->SetSize(-1,0); theToolBar->Show(FALSE); } +#endif // wxUSE_TOOLBAR +#ifndef __WXMICROWIN__ if (style & wxFULLSCREEN_NOMENUBAR) SetMenu((HWND)GetHWND(), (HMENU) NULL); +#endif + +#if wxUSE_STATUSBAR + wxStatusBar *theStatusBar = GetStatusBar(); + if (theStatusBar) + theStatusBar->GetSize(NULL, &m_fsStatusBarHeight); // 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; +#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 + // 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; @@ -583,6 +637,7 @@ bool wxFrame::ShowFullScreen(bool show, long style) m_fsIsShowing = FALSE; +#if wxUSE_TOOLBAR wxToolBar *theToolBar = GetToolBar(); // restore the toolbar, menubar, and statusbar @@ -591,15 +646,24 @@ bool wxFrame::ShowFullScreen(bool show, long style) theToolBar->SetSize(-1, m_fsToolBarHeight); theToolBar->Show(TRUE); } +#endif // wxUSE_TOOLBAR - if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0)) +#if wxUSE_STATUSBAR + if ( m_fsStyle & wxFULLSCREEN_NOSTATUSBAR ) { - CreateStatusBar(m_fsStatusBarFields); - PositionStatusBar(); + //CreateStatusBar(m_fsStatusBarFields); + if (GetStatusBar()) + { + GetStatusBar()->Show(TRUE); + PositionStatusBar(); + } } +#endif // wxUSE_STATUSBAR +#ifndef __WXMICROWIN__ if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) SetMenu((HWND)GetHWND(), (HMENU)m_hMenu); +#endif Maximize(m_fsIsMaximized); SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle); @@ -615,7 +679,7 @@ bool wxFrame::ShowFullScreen(bool show, long style) * */ -bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title, +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) { @@ -625,10 +689,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; @@ -638,7 +709,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; @@ -647,7 +718,7 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow if (style & wxCLIP_CHILDREN) msflags |= WS_CLIPCHILDREN; - // Keep this in wxFrame because it saves recoding this function + // Keep this in wxFrameMSW because it saves recoding this function // in wxTinyFrame #if wxUSE_ITSY_BITSY && !defined(__WIN32__) if (style & wxTINY_CAPTION_VERT) @@ -665,14 +736,25 @@ 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) || + (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) ) @@ -688,39 +770,51 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow // Default activation behaviour - set the focus for the first child // subwindow found. -void wxFrame::OnActivate(wxActivateEvent& event) +void wxFrameMSW::OnActivate(wxActivateEvent& event) { - if ( !event.GetActive() ) + if ( event.GetActive() ) { - event.Skip(); + // restore focus to the child which was last focused + wxLogTrace(_T("focus"), _T("wxFrameMSW %08x activated."), m_hWnd); - return; - } - - wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); + wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() + : NULL; + if ( !parent ) + { + parent = this; + } - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) + wxSetFocusToChild(parent, &m_winLastFocused); + } + 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_winLastFocused = FindFocus(); - // 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 - ) + // so we NULL it out if it's a child from some other frame + wxWindow *win = m_winLastFocused; + while ( win ) { - child->SetFocus(); - break; + if ( win->IsTopLevel() ) + { + if ( win != this ) + { + m_winLastFocused = NULL; + } + + break; + } + + win = win->GetParent(); } + + wxLogTrace(_T("focus"), + _T("wxFrameMSW %08x deactivated, last focused: %08x."), + m_hWnd, + m_winLastFocused ? GetHwndOf(m_winLastFocused) + : NULL); + + event.Skip(); } } @@ -730,7 +824,7 @@ void wxFrame::OnActivate(wxActivateEvent& event) #if wxUSE_TOOLBAR -wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& name) +wxToolBar* wxFrameMSW::CreateToolBar(long style, wxWindowID id, const wxString& name) { if ( wxFrameBase::CreateToolBar(style, id, name) ) { @@ -740,7 +834,7 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam return m_frameToolBar; } -void wxFrame::PositionToolBar() +void wxFrameMSW::PositionToolBar() { RECT rect; ::GetClientRect(GetHwnd(), &rect); @@ -781,7 +875,7 @@ void wxFrame::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 wxFrame::IconizeChildFrames(bool bIconize) +void wxFrameMSW::IconizeChildFrames(bool bIconize) { for ( wxWindowList::Node *node = GetChildren().GetFirst(); node; @@ -789,10 +883,24 @@ void wxFrame::IconizeChildFrames(bool bIconize) { wxWindow *win = node->GetData(); + // 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) ) + wxFrameMSW *frame = wxDynamicCast(win, wxFrame); + if ( frame +#if wxUSE_MDI_ARCHITECTURE + && !wxDynamicCast(frame, wxMDIChildFrame) +#endif // wxUSE_MDI_ARCHITECTURE + ) { frame->Iconize(bIconize); } @@ -807,11 +915,12 @@ void wxFrame::IconizeChildFrames(bool bIconize) // preprocessing // --------------------------------------------------------------------------- -bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) +bool wxFrameMSW::MSWTranslateMessage(WXMSG* pMsg) { if ( wxWindow::MSWTranslateMessage(pMsg) ) return TRUE; +#if wxUSE_MENUS && wxUSE_ACCEL && !defined(__WXUNIVERSAL__) // try the menu bar accels wxMenuBar *menuBar = GetMenuBar(); if ( !menuBar ) @@ -819,17 +928,21 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); return acceleratorTable.Translate(this, pMsg); +#else + return FALSE; +#endif // wxUSE_MENUS && wxUSE_ACCEL } // --------------------------------------------------------------------------- // our private (non virtual) message handlers // --------------------------------------------------------------------------- -bool wxFrame::HandlePaint() +bool wxFrameMSW::HandlePaint() { RECT rect; if ( GetUpdateRect(GetHwnd(), &rect, FALSE) ) { +#ifndef __WXMICROWIN__ if ( m_iconized ) { HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) @@ -863,6 +976,7 @@ bool wxFrame::HandlePaint() return TRUE; } else + #endif { return wxWindow::HandlePaint(); } @@ -874,9 +988,10 @@ bool wxFrame::HandlePaint() } } -bool wxFrame::HandleSize(int x, int y, WXUINT id) +bool wxFrameMSW::HandleSize(int x, int y, WXUINT id) { bool processed = FALSE; +#ifndef __WXMICROWIN__ switch ( id ) { @@ -890,6 +1005,8 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) // restore all child frames too IconizeChildFrames(FALSE); + (void)SendIconizeEvent(FALSE); + // fall through case SIZEFULLSCREEN: @@ -900,14 +1017,22 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) // iconize all child frames too IconizeChildFrames(TRUE); + (void)SendIconizeEvent(); + m_iconized = TRUE; break; } +#endif if ( !m_iconized ) { +#if wxUSE_STATUSBAR PositionStatusBar(); +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR PositionToolBar(); +#endif // wxUSE_TOOLBAR wxSizeEvent event(wxSize(x, y), m_windowId); event.SetEventObject( this ); @@ -917,7 +1042,7 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) return processed; } -bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) +bool wxFrameMSW::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) { if ( control ) { @@ -930,6 +1055,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) // handle here commands from menus and accelerators if ( cmd == 0 || cmd == 1 ) { +#if wxUSE_MENUS_NATIVE if ( wxCurrentPopupMenu ) { wxMenu *popupMenu = wxCurrentPopupMenu; @@ -937,6 +1063,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) return popupMenu->MSWCommand(cmd, id); } +#endif // wxUSE_MENUS_NATIVE if ( ProcessCommand(id) ) { @@ -947,7 +1074,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) return FALSE; } -bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) +bool wxFrameMSW::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) { int item; if ( flags == 0xFFFF && hMenu == 0 ) @@ -955,14 +1082,26 @@ bool wxFrame::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 // 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); + } +#endif // wxUSE_STATUSBAR + return FALSE; } @@ -973,10 +1112,10 @@ bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu) } // --------------------------------------------------------------------------- -// the window proc for wxFrame +// the window proc for wxFrameMSW // --------------------------------------------------------------------------- -long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +long wxFrameMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { long rc = 0; bool processed = FALSE; @@ -1000,6 +1139,7 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) } break; +#ifndef __WXMICROWIN__ case WM_MENUSELECT: { WXWORD item, flags; @@ -1009,11 +1149,13 @@ long wxFrame::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) @@ -1022,6 +1164,7 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) processed = rc != 0; } break; +#endif case WM_SIZE: processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);