X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d0512bd8f4bdf548e0385b21f54f14b68b4b174..2035e10e83324c6925d12725b842768f6e2b00a2:/src/msw/frame.cpp?ds=inline diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index aa75762ebc..4e528223ee 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -37,16 +37,14 @@ #include "wx/dialog.h" #include "wx/settings.h" #include "wx/dcclient.h" + #include "wx/mdi.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 @@ -62,21 +60,19 @@ extern wxWindowList wxModelessWindows; extern wxList WXDLLEXPORT wxPendingDelete; -extern wxChar wxFrameClassName[]; +extern const wxChar *wxFrameClassName; extern wxMenu *wxCurrentPopupMenu; // ---------------------------------------------------------------------------- // 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 // ============================================================================ // implementation @@ -103,6 +99,16 @@ void wxFrame::Init() #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; } bool wxFrame::Create(wxWindow *parent, @@ -188,7 +194,7 @@ void wxFrame::DoGetClientSize(int *x, int *y) const ::GetClientRect(GetHwnd(), &rect); #if wxUSE_STATUSBAR - if ( GetStatusBar() ) + if ( GetStatusBar() && GetStatusBar()->IsShown() ) { int statusX, statusY; GetStatusBar()->GetClientSize(&statusX, &statusY); @@ -225,7 +231,7 @@ void wxFrame::DoSetClientSize(int width, int height) int actual_height = rect2.bottom - rect2.top - rect.bottom + height; #if wxUSE_STATUSBAR - if ( GetStatusBar() ) + if ( GetStatusBar() && GetStatusBar()->IsShown()) { int statusX, statusY; GetStatusBar()->GetClientSize(&statusX, &statusY); @@ -356,14 +362,27 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, #if wxUSE_NATIVE_STATUSBAR if ( UsesNativeStatusBar() ) { - statusBar = new wxStatusBar95(this, id, style); + statusBar = (wxStatusBar *)new wxStatusBar95(this, id, style); statusBar->SetFieldsCount(number); } else #endif { - statusBar = wxFrameBase::OnCreateStatusBar(number, style, id, name); + statusBar = (wxStatusBar *)new wxStatusBarGeneric(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; @@ -371,22 +390,17 @@ wxStatusBar *wxFrame::OnCreateStatusBar(int number, 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 ) + 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 @@ -407,6 +421,38 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar) 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(); + } + else + { + menu_bar->Detach(); + + m_hMenu = menu_bar->Create(); + + if ( !m_hMenu ) + return; + } + + InternalSetMenuBar(); + + m_frameMenuBar = menu_bar; + menu_bar->Attach(this); + +#if 0 // Old code that assumes only one call of SetMenuBar per frame. + if (!menu_bar) + { + DetachMenuBar(); + return; + } + wxCHECK_RET( !menu_bar->GetFrame(), wxT("this menubar is already attached") ); if (m_frameMenuBar) @@ -421,6 +467,7 @@ void wxFrame::SetMenuBar(wxMenuBar *menu_bar) m_frameMenuBar = menu_bar; menu_bar->Attach(this); +#endif } void wxFrame::InternalSetMenuBar() @@ -448,6 +495,123 @@ void wxFrame::OnSysColourChanged(wxSysColourChangedEvent& event) wxWindow::OnSysColourChanged(event); } +// Pass TRUE to show full screen, FALSE to restore. +bool wxFrame::ShowFullScreen(bool show, long style) +{ + if (show) + { + if (IsFullScreen()) + return FALSE; + + m_fsIsShowing = TRUE; + m_fsStyle = style; + + wxToolBar *theToolBar = GetToolBar(); + wxStatusBar *theStatusBar = GetStatusBar(); + + int dummyWidth; + + if (theToolBar) + theToolBar->GetSize(&dummyWidth, &m_fsToolBarHeight); + if (theStatusBar) + theStatusBar->GetSize(&dummyWidth, &m_fsStatusBarHeight); + + // zap the toolbar, menubar, and statusbar + + if ((style & wxFULLSCREEN_NOTOOLBAR) && theToolBar) + { + theToolBar->SetSize(-1,0); + theToolBar->Show(FALSE); + } + + if (style & wxFULLSCREEN_NOMENUBAR) + SetMenu((HWND)GetHWND(), (HMENU) NULL); + + // Save the number of fields in the statusbar + if ((style & wxFULLSCREEN_NOSTATUSBAR) && theStatusBar) + { + m_fsStatusBarFields = theStatusBar->GetFieldsCount(); + SetStatusBar((wxStatusBar*) NULL); + delete theStatusBar; + } + else + m_fsStatusBarFields = 0; + + // 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; + + wxToolBar *theToolBar = GetToolBar(); + + // restore the toolbar, menubar, and statusbar + if (theToolBar && (m_fsStyle & wxFULLSCREEN_NOTOOLBAR)) + { + theToolBar->SetSize(-1, m_fsToolBarHeight); + theToolBar->Show(TRUE); + } + + if ((m_fsStyle & wxFULLSCREEN_NOSTATUSBAR) && (m_fsStatusBarFields > 0)) + { + CreateStatusBar(m_fsStatusBarFields); + PositionStatusBar(); + } + + 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 * @@ -487,7 +651,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) @@ -528,6 +692,15 @@ bool wxFrame::MSWCreate(int id, wxWindow *parent, const wxChar *wclass, wxWindow // subwindow found. void wxFrame::OnActivate(wxActivateEvent& event) { + if ( !event.GetActive() ) + { + event.Skip(); + + return; + } + + wxLogTrace(_T("focus"), _T("wxFrame %08x activated."), m_hWnd); + for ( wxWindowList::Node *node = GetChildren().GetFirst(); node; node = node->GetNext() ) @@ -548,60 +721,9 @@ void wxFrame::OnActivate(wxActivateEvent& event) ) { child->SetFocus(); - return; - } - } -} - -// ---------------------------------------------------------------------------- -// 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()) - { - int w, h; - GetToolBar()->GetSize(& w, & h); - - if (GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL) - { - pt.x += w; - } - else - { - pt.y += h; + break; } } - return pt; -} - -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; -} - -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); } // ---------------------------------------------------------------------------- @@ -634,7 +756,7 @@ void wxFrame::PositionToolBar() } #endif // wxUSE_STATUSBAR - if ( GetToolBar() ) + if ( GetToolBar() && GetToolBar()->IsShown() ) { int tw, th; GetToolBar()->GetSize(&tw, &th); @@ -669,9 +791,12 @@ void wxFrame::IconizeChildFrames(bool bIconize) { wxWindow *win = node->GetData(); - if ( win->IsKindOf(CLASSINFO(wxFrame)) ) + // 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); } } } @@ -783,17 +908,6 @@ bool wxFrame::HandleSize(int x, int y, WXUINT id) 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 - PositionStatusBar(); PositionToolBar();