X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c0ea335c7b1aa4ebd8b3a79dfb4be9fb20eefdb..a37e4a071ce9bbd6825fb6c6a03154d4318d2cff:/src/msw/frame.cpp diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 45df30ead7..4ed0d984d6 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -29,24 +29,22 @@ #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" #if wxUSE_STATUSBAR #include "wx/statusbr.h" - - #if wxUSE_NATIVE_STATUSBAR - #include "wx/msw/statbr95.h" - #endif + #include "wx/generic/statusbr.h" #endif // wxUSE_STATUSBAR #if wxUSE_TOOLBAR @@ -56,27 +54,28 @@ #include "wx/menuitem.h" #include "wx/log.h" +#ifdef __WXUNIVERSAL__ + #include "wx/univ/theme.h" + #include "wx/univ/colschem.h" +#endif // __WXUNIVERSAL__ + // ---------------------------------------------------------------------------- // globals // ---------------------------------------------------------------------------- -extern wxWindowList wxModelessWindows; -extern wxList WXDLLEXPORT wxPendingDelete; -extern wxChar wxFrameClassName[]; -extern wxMenu *wxCurrentPopupMenu; +#if wxUSE_MENUS_NATIVE + extern wxMenu *wxCurrentPopupMenu; +#endif // wxUSE_MENUS_NATIVE // ---------------------------------------------------------------------------- // event tables // ---------------------------------------------------------------------------- -#if !USE_SHARED_LIBRARY BEGIN_EVENT_TABLE(wxFrame, wxFrameBase) - EVT_ACTIVATE(wxFrame::OnActivate) EVT_SYS_COLOUR_CHANGED(wxFrame::OnSysColourChanged) END_EVENT_TABLE() -IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxTopLevelWindow) // ============================================================================ // implementation @@ -86,11 +85,13 @@ 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 wxFrame::m_useNativeStatusBar = TRUE; + #else + bool wxFrame::m_useNativeStatusBar = FALSE; + #endif +#endif // wxUSE_NATIVE_STATUSBAR // ---------------------------------------------------------------------------- // creation/destruction @@ -98,11 +99,16 @@ IMPLEMENT_DYNAMIC_CLASS(wxFrame, wxWindow) void wxFrame::Init() { - m_iconized = FALSE; - #if wxUSE_TOOLTIPS m_hwndToolTip = 0; #endif + + // Data to save/restore when calling ShowFullScreen + m_fsStatusBarFields = 0; + m_fsStatusBarHeight = 0; + m_fsToolBarHeight = 0; + + m_wasMinimized = FALSE; } bool wxFrame::Create(wxWindow *parent, @@ -113,236 +119,97 @@ bool wxFrame::Create(wxWindow *parent, long style, const wxString& name) { - SetName(name); - m_windowStyle = style; - m_frameMenuBar = NULL; - m_frameToolBar = NULL; - m_frameStatusBar = NULL; - - 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; - - // 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 ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) ) + return FALSE; - if (!parent) - wxTopLevelWindows.Append(this); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE)); - MSWCreate(m_windowId, parent, wxFrameClassName, this, title, - x, y, width, height, style); + wxModelessWindows.Append(this); - wxModelessWindows.Append(this); - return TRUE; + return TRUE; } wxFrame::~wxFrame() { - m_isBeingDeleted = TRUE; - wxTopLevelWindows.DeleteObject(this); + m_isBeingDeleted = TRUE; - 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 wxFrame::DoGetClientSize(int *x, int *y) const -{ - RECT rect; - ::GetClientRect(GetHwnd(), &rect); - -#if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - 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 wxFrame::DoSetClientSize(int width, int height) { - HWND hWnd = GetHwnd(); - - RECT rect; - ::GetClientRect(hWnd, &rect); - - RECT rect2; - GetWindowRect(hWnd, &rect2); - - // 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; - + // leave enough space for the status bar if we have (and show) it #if wxUSE_STATUSBAR - if ( GetStatusBar() ) - { - int statusX, statusY; - GetStatusBar()->GetClientSize(&statusX, &statusY); - actual_height += statusY; - } + wxStatusBar *statbar = GetStatusBar(); + if ( statbar && statbar->IsShown() ) + { + height += statbar->GetSize().y; + } #endif // wxUSE_STATUSBAR - wxPoint pt(GetClientAreaOrigin()); - actual_width += pt.y; - actual_height += pt.x; - - POINT point; - point.x = rect2.left; - point.y = rect2.top; - - MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE); - - wxSizeEvent event(wxSize(width, height), m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); -} + // call GetClientAreaOrigin() to take the toolbar into account + wxPoint pt = GetClientAreaOrigin(); + width += pt.x; + height += pt.y; -void wxFrame::DoGetSize(int *width, int *height) const -{ - RECT rect; - GetWindowRect(GetHwnd(), &rect); - *width = rect.right - rect.left; - *height = rect.bottom - rect.top; + wxTopLevelWindow::DoSetClientSize(width, height); } -void wxFrame::DoGetPosition(int *x, int *y) const -{ - RECT rect; - GetWindowRect(GetHwnd(), &rect); - POINT point; - point.x = rect.left; - point.y = rect.top; - - *x = point.x; - *y = point.y; -} - -// ---------------------------------------------------------------------------- -// variations around ::ShowWindow() -// ---------------------------------------------------------------------------- - -void wxFrame::DoShowWindow(int nShowCmd) +// Get size *available for subwindows* i.e. excluding menu bar, toolbar etc. +void wxFrame::DoGetClientSize(int *x, int *y) const { - ::ShowWindow(GetHwnd(), nShowCmd); + wxTopLevelWindow::DoGetClientSize(x, y); - m_iconized = nShowCmd == SW_MINIMIZE; -} + // account for the possible toolbar + wxPoint pt = GetClientAreaOrigin(); + if ( x ) + *x -= pt.x; -bool wxFrame::Show(bool show) -{ - DoShowWindow(show ? SW_SHOW : SW_HIDE); - - if ( show ) - { - ::BringWindowToTop(GetHwnd()); + if ( y ) + *y -= pt.y; - wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); - } - else +#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 wxFrame::Iconize(bool iconize) -{ - DoShowWindow(iconize ? SW_MINIMIZE : SW_RESTORE); -} - -void wxFrame::Maximize(bool maximize) -{ - DoShowWindow(maximize ? SW_MAXIMIZE : SW_RESTORE); -} - -void wxFrame::Restore() -{ - DoShowWindow(SW_RESTORE); +#endif // wxUSE_STATUSBAR } -bool wxFrame::IsIconized() const -{ - ((wxFrame *)this)->m_iconized = (::IsIconic(GetHwnd()) != 0); - return m_iconized; -} +// ---------------------------------------------------------------------------- +// wxFrame: various geometry-related functions +// ---------------------------------------------------------------------------- -// Is it maximized? -bool wxFrame::IsMaximized() const +void wxFrame::Raise() { - return (::IsZoomed(GetHwnd()) != 0); +#ifdef __WIN16__ + // no SetForegroundWindow() in Win16 + wxFrameBase::Raise(); +#else // Win32 + ::SetForegroundWindow(GetHwnd()); +#endif // Win16/32 } -void wxFrame::SetIcon(const wxIcon& icon) +// generate an artificial resize event +void wxFrame::SendSizeEvent() { - wxFrameBase::SetIcon(icon); - -#if defined(__WIN95__) - if ( m_icon.Ok() ) + if ( !m_iconized ) { - SendMessage(GetHwnd(), WM_SETICON, - (WPARAM)TRUE, (LPARAM)(HICON) m_icon.GetHICON()); + RECT r = wxGetWindowRect(GetHwnd()); + + (void)::PostMessage(GetHwnd(), WM_SIZE, + IsMaximized() ? SIZE_MAXIMIZED : SIZE_RESTORED, + MAKELPARAM(r.right - r.left, r.bottom - r.top)); } -#endif // __WIN95__ } #if wxUSE_STATUSBAR @@ -354,252 +221,178 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, wxStatusBar *statusBar = NULL; #if wxUSE_NATIVE_STATUSBAR - if ( UsesNativeStatusBar() ) + if ( !UsesNativeStatusBar() ) { - statusBar = new wxStatusBar95(this, id, style); + statusBar = (wxStatusBar *)new wxStatusBarGeneric(this, id, style); } else #endif { - statusBar = wxFrameBase::OnCreateStatusBar(number, style, id, name); + statusBar = new wxStatusBar(this, id, style, name); } + statusBar->SetFieldsCount(number); + return statusBar; } void wxFrame::PositionStatusBar() { - // native status bar positions itself - if ( m_frameStatusBar -#if wxUSE_NATIVE_STATUSBAR - && !m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95)) -#endif - ) - { - 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); - } + if ( !m_frameStatusBar || !m_frameStatusBar->IsShown() ) + return; + + 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); } #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 wxFrame::AttachMenuBar(wxMenuBar *menubar) { - if (!menu_bar) + wxFrameBase::AttachMenuBar(menubar); + + if ( !menubar ) { - DetachMenuBar(); - return; + // 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 ( menubar->GetHMenu() ) + { + m_hMenu = menubar->GetHMenu(); + } + else // no HMENU yet + { + m_hMenu = menubar->Create(); - 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(); + if ( !m_hMenu ) + { + wxFAIL_MSG( _T("failed to create menu bar") ); + return; + } + } - m_frameMenuBar = menu_bar; - menu_bar->Attach(this); + InternalSetMenuBar(); + } } void wxFrame::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) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE)); + SetBackgroundColour(wxSystemSettings::GetColour(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); } -/* - * Frame window - * - */ - -bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow *wx_win, const wxChar *title, - int x, int y, int width, int height, long style) - +// Pass TRUE to show full screen, FALSE to restore. +bool wxFrame::ShowFullScreen(bool show, 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) == wxCAPTION) - msflags = WS_OVERLAPPED; - else - msflags = WS_POPUP; - - if (style & wxMINIMIZE_BOX) - msflags |= WS_MINIMIZEBOX; - if (style & wxMAXIMIZE_BOX) - msflags |= WS_MAXIMIZEBOX; - if (style & wxTHICK_FRAME) - msflags |= WS_THICKFRAME; - if (style & wxSYSTEM_MENU) - msflags |= WS_SYSMENU; - if ((style & wxMINIMIZE) || (style & wxICONIZE)) - msflags |= WS_MINIMIZE; - if (style & wxMAXIMIZE) - msflags |= WS_MAXIMIZE; - if (style & wxCAPTION) - msflags |= WS_CAPTION; - if (style & wxCLIP_CHILDREN) - msflags |= WS_CLIPCHILDREN; - - // Keep this in wxFrame because it saves recoding this function - // in wxTinyFrame -#if wxUSE_ITSY_BITSY - if (style & wxTINY_CAPTION_VERT) - msflags |= IBS_VERTCAPTION; - if (style & wxTINY_CAPTION_HORIZ) - msflags |= IBS_HORZCAPTION; -#else - if (style & wxTINY_CAPTION_VERT) - msflags |= WS_CAPTION; - if (style & wxTINY_CAPTION_HORIZ) - msflags |= WS_CAPTION; -#endif - if ((style & wxTHICK_FRAME) == 0) - msflags |= WS_BORDER; - - WXDWORD extendedStyle = MakeExtendedStyle(style); - -#if !defined(__WIN16__) && !defined(__SC__) - if (style & wxFRAME_TOOL_WINDOW) - extendedStyle |= WS_EX_TOOLWINDOW; -#endif - - if (style & wxSTAY_ON_TOP) - extendedStyle |= WS_EX_TOPMOST; - - 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; -} + if ( IsFullScreen() == show ) + return FALSE; -// Default activation behaviour - set the focus for the first child -// subwindow found. -void wxFrame::OnActivate(wxActivateEvent& event) -{ - for ( wxWindowList::Node *node = GetChildren().GetFirst(); - node; - node = node->GetNext() ) + if (show) { - // FIXME all this is totally bogus - we need to do the same as wxPanel, - // but how to do it without duplicating the code? +#if wxUSE_TOOLBAR + wxToolBar *theToolBar = GetToolBar(); + if (theToolBar) + theToolBar->GetSize(NULL, &m_fsToolBarHeight); - // restore focus - wxWindow *child = node->GetData(); + // zap the toolbar, menubar, and statusbar - if ( !child->IsTopLevel() -#if wxUSE_TOOLBAR - && !wxDynamicCast(child, wxToolBar) + if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar) + { + 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 - && !wxDynamicCast(child, wxStatusBar) -#endif // 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) { - child->SetFocus(); - return; + //m_fsStatusBarFields = theStatusBar->GetFieldsCount(); + //SetStatusBar((wxStatusBar*) NULL); + //delete theStatusBar; + theStatusBar->Show(FALSE); } + else + m_fsStatusBarFields = 0; +#endif // wxUSE_STATUSBAR } -} - -// ---------------------------------------------------------------------------- -// 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 -// ---------------------------------------------------------------------------- - -// Checks if there is a toolbar, and returns the first free client position -wxPoint wxFrame::GetClientAreaOrigin() const -{ - wxPoint pt(0, 0); - if (GetToolBar()) + else { - int w, h; - GetToolBar()->GetSize(& w, & h); +#if wxUSE_TOOLBAR + wxToolBar *theToolBar = GetToolBar(); - if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) + // restore the toolbar, menubar, and statusbar + if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR)) { - pt.x += w; + theToolBar->SetSize(-1, m_fsToolBarHeight); + theToolBar->Show(TRUE); } - else +#endif // wxUSE_TOOLBAR + +#if wxUSE_STATUSBAR + if ( m_fsStyle & wxFULLSCREEN_NOSTATUSBAR ) { - pt.y += h; + //CreateStatusBar(m_fsStatusBarFields); + if (GetStatusBar()) + { + GetStatusBar()->Show(TRUE); + PositionStatusBar(); + } } - } - return pt; -} +#endif // wxUSE_STATUSBAR -void wxFrame::DoScreenToClient(int *x, int *y) const -{ - wxWindow::DoScreenToClient(x, y); - - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - wxPoint pt(GetClientAreaOrigin()); - *x -= pt.x; - *y -= pt.y; -} +#ifndef __WXMICROWIN__ + if ((m_fsStyle & wxFULLSCREEN_NOMENUBAR) && (m_hMenu != 0)) + SetMenu((HWND)GetHWND(), (HMENU)m_hMenu); +#endif + } -void wxFrame::DoClientToScreen(int *x, int *y) const -{ - // We may be faking the client origin. - // So a window that's really at (0, 30) may appear - // (to wxWin apps) to be at (0, 0). - wxPoint pt1(GetClientAreaOrigin()); - *x += pt1.x; - *y += pt1.y; - - wxWindow::DoClientToScreen(x, y); + return wxFrameBase::ShowFullScreen(show, style); } // ---------------------------------------------------------------------------- @@ -620,36 +413,42 @@ wxToolBar* wxFrame::CreateToolBar(long style, wxWindowID id, const wxString& nam 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() ) - { 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; + if ( toolbar->GetWindowStyleFlag() & wxTB_FLAT ) + th -= 3; } - // 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 // ---------------------------------------------------------------------------- @@ -667,13 +466,50 @@ 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 +#if wxUSE_MDI_ARCHITECTURE + && !wxDynamicCast(frame, wxMDIChildFrame) +#endif // wxUSE_MDI_ARCHITECTURE + ) { - ((wxFrame *)win)->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 // =========================================================================== @@ -687,6 +523,7 @@ bool wxFrame::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 ) @@ -694,6 +531,9 @@ bool wxFrame::MSWTranslateMessage(WXMSG* pMsg) const wxAcceleratorTable& acceleratorTable = menuBar->GetAccelTable(); return acceleratorTable.Translate(this, pMsg); +#else + return FALSE; +#endif // wxUSE_MENUS && wxUSE_ACCEL } // --------------------------------------------------------------------------- @@ -705,10 +545,12 @@ 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; + const wxIcon& icon = GetIcon(); + HICON hIcon = icon.Ok() ? GetHiconOf(icon) + : (HICON)GetDefaultIcon(); // Hold a pointer to the dc so long as the OnPaint() message // is being processed @@ -738,6 +580,7 @@ bool wxFrame::HandlePaint() return TRUE; } else + #endif { return wxWindow::HandlePaint(); } @@ -752,6 +595,7 @@ bool wxFrame::HandlePaint() bool wxFrame::HandleSize(int x, int y, WXUINT id) { bool processed = FALSE; +#ifndef __WXMICROWIN__ switch ( id ) { @@ -765,6 +609,8 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) // restore all child frames too IconizeChildFrames(FALSE); + (void)SendIconizeEvent(FALSE); + // fall through case SIZEFULLSCREEN: @@ -775,29 +621,24 @@ 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 ) { - // forward WM_SIZE to status bar control -#if wxUSE_NATIVE_STATUSBAR - if (m_frameStatusBar && m_frameStatusBar->IsKindOf(CLASSINFO(wxStatusBar95))) - { - wxSizeEvent event(wxSize(x, y), m_frameStatusBar->GetId()); - event.SetEventObject( m_frameStatusBar ); - - ((wxStatusBar95 *)m_frameStatusBar)->OnSize(event); - } -#endif // wxUSE_NATIVE_STATUSBAR - +#if wxUSE_STATUSBAR PositionStatusBar(); +#endif // wxUSE_STATUSBAR + +#if wxUSE_TOOLBAR PositionToolBar(); +#endif // wxUSE_TOOLBAR - wxSizeEvent event(wxSize(x, y), m_windowId); - event.SetEventObject( this ); - processed = GetEventHandler()->ProcessEvent(event); + processed = wxWindow::HandleSize(x, y, id); } return processed; @@ -816,6 +657,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; @@ -823,6 +665,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control) return popupMenu->MSWCommand(cmd, id); } +#endif // wxUSE_MENUS_NATIVE if ( ProcessCommand(id) ) { @@ -841,19 +684,35 @@ 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 { // 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 + DoGiveHelp(wxEmptyString, FALSE); + return FALSE; } wxMenuEvent event(wxEVT_MENU_HIGHLIGHT, item); - event.SetEventObject( this ); + event.SetEventObject(this); + + return GetEventHandler()->ProcessEvent(event); +} + +bool wxFrame::HandleMenuLoop(const wxEventType& evtType, WXWORD isPopup) +{ + // we don't have the menu id here, so we use the id to specify if the event + // was from a popup menu or a normal one + wxMenuEvent event(evtType, isPopup ? -1 : 0); + event.SetEventObject(this); return GetEventHandler()->ProcessEvent(event); } @@ -875,6 +734,10 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) processed = !Close(); break; + case WM_SIZE: + processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); + break; + case WM_COMMAND: { WORD id, cmd; @@ -886,6 +749,11 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) } break; + case WM_PAINT: + processed = HandlePaint(); + break; + +#ifndef __WXMICROWIN__ case WM_MENUSELECT: { WXWORD item, flags; @@ -896,26 +764,30 @@ long wxFrame::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) } break; - case WM_PAINT: - processed = HandlePaint(); +#ifndef __WIN16__ + case WM_ENTERMENULOOP: + processed = HandleMenuLoop(wxEVT_MENU_OPEN, wParam); break; + case WM_EXITMENULOOP: + processed = HandleMenuLoop(wxEVT_MENU_CLOSE, wParam); + break; +#endif // __WIN16__ + case WM_QUERYDRAGICON: { - HICON hIcon = m_icon.Ok() ? GetHiconOf(m_icon) - : (HICON)(m_defaultIcon); + const wxIcon& icon = GetIcon(); + HICON hIcon = icon.Ok() ? GetHiconOf(icon) + : (HICON)GetDefaultIcon(); rc = (long)hIcon; processed = rc != 0; } break; - - case WM_SIZE: - processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam); - break; +#endif // !__WXMICROWIN__ } if ( !processed ) - rc = wxWindow::MSWWindowProc(message, wParam, lParam); + rc = wxFrameBase::MSWWindowProc(message, wParam, lParam); return rc; }