X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12447831a8ebc506f730cafac6f6ef13f243b7d2..55826fcf4fd863d48ac28789d99bbb5c8a8d4c7e:/src/msw/toplevel.cpp diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index d737b9a679..b12a323c5a 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -6,7 +6,7 @@ // Created: 24.09.01 // RCS-ID: $Id$ // Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com) -// License: wxWindows license +// License: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -38,9 +38,11 @@ #include "wx/containr.h" // wxSetFocusToChild() #endif //WX_PRECOMP +#include "wx/module.h" + #include "wx/msw/private.h" -#include "wx/popupwin.h" +#include "wx/display.h" #ifndef ICON_BIG #define ICON_BIG 1 @@ -76,8 +78,32 @@ wxWindowList wxModelessWindows; // the name of the default wxWindows class extern const wxChar *wxCanvasClassName; -// the hidden parent for wxFRAME_NO_TASKBAR unowned frames -wxWindow *wxTopLevelWindowMSW::ms_hiddenParent = NULL; +// ---------------------------------------------------------------------------- +// wxTLWHiddenParentModule: used to manage the hidden parent window (we need a +// module to ensure that the window is always deleted) +// ---------------------------------------------------------------------------- + +class wxTLWHiddenParentModule : public wxModule +{ +public: + // module init/finalize + virtual bool OnInit(); + virtual void OnExit(); + + // get the hidden window (creates on demand) + static HWND GetHWND(); + +private: + // the HWND of the hidden parent + static HWND ms_hwnd; + + // the class used to create it + static const wxChar *ms_className; + + DECLARE_DYNAMIC_CLASS(wxTLWHiddenParentModule) +}; + +IMPLEMENT_DYNAMIC_CLASS(wxTLWHiddenParentModule, wxModule) // ============================================================================ // wxTopLevelWindowMSW implementation @@ -115,7 +141,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const WXDWORD msflags = wxWindow::MSWGetStyle ( (style & ~wxBORDER_MASK) | wxBORDER_NONE, exflags - ) & ~WS_CHILD; + ) & ~WS_CHILD & ~WS_VISIBLE; // first select the kind of window being created // @@ -165,7 +191,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const if ( exflags ) { -#if !defined(__WIN16__) && !defined(__SC__) +#if !defined(__WIN16__) if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ) { if ( style & wxFRAME_TOOL_WINDOW ) @@ -213,38 +239,32 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const // parent HWND or it would be always on top of its parent which is not what // we usually want (in fact, we only want it for frames with the // wxFRAME_FLOAT_ON_PARENT flag) - wxWindow *parent; + HWND hwndParent = NULL; if ( HasFlag(wxFRAME_FLOAT_ON_PARENT) ) { - parent = GetParent(); + const wxWindow *parent = GetParent(); - // this flag doesn't make sense then and will be ignored - wxASSERT_MSG( parent, - _T("wxFRAME_FLOAT_ON_PARENT but no parent?") ); - } - else // don't float on parent, must not be owned - { - parent = NULL; + if ( !parent ) + { + // this flag doesn't make sense then and will be ignored + wxFAIL_MSG( _T("wxFRAME_FLOAT_ON_PARENT but no parent?") ); + } + else + { + hwndParent = GetHwndOf(parent); + } } + //else: don't float on parent, must not be owned // now deal with the 2nd taskbar-related problem (see comments above in // MSWGetStyle()) - if ( HasFlag(wxFRAME_NO_TASKBAR) && !parent ) + if ( HasFlag(wxFRAME_NO_TASKBAR) && !hwndParent ) { - if ( !ms_hiddenParent ) - { - ms_hiddenParent = new wxTopLevelWindowMSW(NULL, -1, _T("")); - - // we shouldn't leave it in wxTopLevelWindows or we wouldn't - // terminate the app when the last user-created frame is deleted -- - // see ~wxTopLevelWindowMSW - wxTopLevelWindows.DeleteObject(ms_hiddenParent); - } - - parent = ms_hiddenParent; + // use hidden parent + hwndParent = wxTLWHiddenParentModule::GetHWND(); } - return parent ? parent->GetHWND() : NULL; + return (WXHWND)hwndParent; } bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, @@ -290,9 +310,9 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, if ( !m_hWnd ) { - wxFAIL_MSG(_("Failed to create dialog. Incorrect DLGTEMPLATE?")); + wxFAIL_MSG(wxT("Failed to create dialog. Incorrect DLGTEMPLATE?")); - wxLogSysError(_("Can't create dialog using memory template")); + wxLogSysError(wxT("Can't create dialog using memory template")); return FALSE; } @@ -394,6 +414,8 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, long style, const wxString& name) { + bool ret = false; + // init our fields Init(); @@ -438,28 +460,24 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, if ( style & (wxRESIZE_BORDER | wxCAPTION) ) dlgTemplate->style |= DS_MODALFRAME; - bool ret = CreateDialog(dlgTemplate, title, pos, size); + ret = CreateDialog(dlgTemplate, title, pos, size); free(dlgTemplate); - - return ret; } else // !dialog { - return CreateFrame(title, pos, size); + ret = CreateFrame(title, pos, size); } -} -wxTopLevelWindowMSW::~wxTopLevelWindowMSW() -{ - if ( this == ms_hiddenParent ) + if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) ) { - // stop [infinite] recursion which would otherwise happen when we do - // "delete ms_hiddenParent" below - return; + EnableCloseButton(false); } - wxTopLevelWindows.DeleteObject(this); + return ret; +} +wxTopLevelWindowMSW::~wxTopLevelWindowMSW() +{ if ( wxModelessWindows.Find(this) ) wxModelessWindows.DeleteObject(this); @@ -475,23 +493,6 @@ wxTopLevelWindowMSW::~wxTopLevelWindowMSW() ::BringWindowToTop(GetHwndOf(parent)); } } - - // If this is the last top-level window, exit. - if ( wxTheApp && (wxTopLevelWindows.Number() == 0) ) - { - if ( ms_hiddenParent ) - { - delete ms_hiddenParent; - ms_hiddenParent = NULL; - } - - wxTheApp->SetTopWindow(NULL); - - if ( wxTheApp->GetExitOnFrameDelete() ) - { - ::PostQuitMessage(0); - } - } } // ---------------------------------------------------------------------------- @@ -523,7 +524,10 @@ bool wxTopLevelWindowMSW::Show(bool show) } else // just show { - nShowCmd = SW_SHOW; + if ( GetWindowStyle() & wxFRAME_TOOL_WINDOW ) + nShowCmd = SW_SHOWNA; + else + nShowCmd = SW_SHOW; } } else // hide @@ -570,7 +574,7 @@ void wxTopLevelWindowMSW::Maximize(bool maximize) { // 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; + m_maximizeOnShow = maximize; } } @@ -603,18 +607,22 @@ void wxTopLevelWindowMSW::Restore() bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) { - if (show) + if ( show == IsFullScreen() ) { - if (IsFullScreen()) - return FALSE; + // nothing to do + return TRUE; + } + + m_fsIsShowing = show; - m_fsIsShowing = TRUE; + if ( show ) + { m_fsStyle = style; // zap the frame borders // save the 'normal' window style - m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE); + m_fsOldWindowStyle = GetWindowLong(GetHwnd(), GWL_STYLE); // save the old position, width & height, maximize state m_fsOldSize = GetRect(); @@ -627,44 +635,64 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) if (style & wxFULLSCREEN_NOBORDER) offFlags |= WS_BORDER | WS_THICKFRAME; if (style & wxFULLSCREEN_NOCAPTION) - offFlags |= (WS_CAPTION | WS_SYSMENU); + offFlags |= WS_CAPTION | WS_SYSMENU; - newStyle &= (~offFlags); + newStyle &= ~offFlags; // change our window style to be compatible with full-screen mode - ::SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle); + ::SetWindowLong(GetHwnd(), GWL_STYLE, newStyle); - // resize to the size of the desktop - int width, height; - - RECT rect = wxGetWindowRect(::GetDesktopWindow()); - width = rect.right - rect.left; - height = rect.bottom - rect.top; + wxRect rect; +#if wxUSE_DISPLAY + // resize to the size of the display containing us + int dpy = wxDisplay::GetFromWindow(this); + if ( dpy != wxNOT_FOUND ) + { + rect = wxDisplay(dpy).GetGeometry(); + } + else // fall back to the main desktop +#else // wxUSE_DISPLAY + { + // resize to the size of the desktop + wxCopyRECTToRect(wxGetWindowRect(::GetDesktopWindow()), rect); + } +#endif // wxUSE_DISPLAY - SetSize(width, height); + SetSize(rect); // now flush the window style cache and actually go full-screen - SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED); + long flags = SWP_FRAMECHANGED; - wxSizeEvent event(wxSize(width, height), GetId()); - GetEventHandler()->ProcessEvent(event); + // showing the frame full screen should also show it if it's still + // hidden + if ( !IsShown() ) + { + // don't call wxWindow version to avoid flicker from calling + // ::ShowWindow() -- we're going to show the window at the correct + // location directly below -- but do call the wxWindowBase version + // to sync the internal m_isShown flag + wxWindowBase::Show(); - return TRUE; - } - else - { - if (!IsFullScreen()) - return FALSE; + flags |= SWP_SHOWWINDOW; + } - m_fsIsShowing = FALSE; + SetWindowPos(GetHwnd(), HWND_TOP, + rect.x, rect.y, rect.width, rect.height, + flags); + // finally send an event allowing the window to relayout itself &c + wxSizeEvent event(rect.GetSize(), GetId()); + GetEventHandler()->ProcessEvent(event); + } + else // stop showing full screen + { Maximize(m_fsIsMaximized); - SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle); - SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y, + SetWindowLong(GetHwnd(),GWL_STYLE, m_fsOldWindowStyle); + SetWindowPos(GetHwnd(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y, m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED); - - return TRUE; } + + return TRUE; } // ---------------------------------------------------------------------------- @@ -704,9 +732,9 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable) HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */); if ( !hmenu ) { - wxLogLastError(_T("GetSystemMenu")); - - return FALSE; + // no system menu at all -- ok if we want to remove the close button + // anyhow, but bad if we want to show it + return !enable; } // enabling/disabling the close item from it also automatically @@ -730,6 +758,50 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable) return TRUE; } +bool wxTopLevelWindowMSW::SetShape(const wxRegion& region) +{ + wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE, + _T("Shaped windows must be created with the wxFRAME_SHAPED style.")); + + // The empty region signifies that the shape should be removed from the + // window. + if ( region.IsEmpty() ) + { + if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0) + { + wxLogLastError(_T("SetWindowRgn")); + return FALSE; + } + return TRUE; + } + + // Windows takes ownership of the region, so + // we'll have to make a copy of the region to give to it. + DWORD noBytes = ::GetRegionData(GetHrgnOf(region), 0, NULL); + RGNDATA *rgnData = (RGNDATA*) new char[noBytes]; + ::GetRegionData(GetHrgnOf(region), noBytes, rgnData); + HRGN hrgn = ::ExtCreateRegion(NULL, noBytes, rgnData); + delete[] (char*) rgnData; + + // SetWindowRgn expects the region to be in coordinants + // relative to the window, not the client area. Figure + // out the offset, if any. + RECT rect; + DWORD dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE); + DWORD dwExStyle = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE); + ::GetClientRect(GetHwnd(), &rect); + ::AdjustWindowRectEx(&rect, dwStyle, FALSE, dwExStyle); + ::OffsetRgn(hrgn, -rect.left, -rect.top); + + // Now call the shape API with the new region. + if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0) + { + wxLogLastError(_T("SetWindowRgn")); + return FALSE; + } + return TRUE; +} + // ---------------------------------------------------------------------------- // wxTopLevelWindow event handling // ---------------------------------------------------------------------------- @@ -741,7 +813,7 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) if ( event.GetActive() ) { // restore focus to the child which was last focused - wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), m_hWnd); + wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd); wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() : NULL; @@ -757,6 +829,12 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) // remember the last focused child if it is our child m_winLastFocused = FindFocus(); + if ( m_winLastFocused ) + { + // let it know that it doesn't have focus any more + m_winLastFocused->HandleKillFocus((WXHWND)NULL); + } + // so we NULL it out if it's a child from some other frame wxWindow *win = m_winLastFocused; while ( win ) @@ -776,9 +854,9 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) wxLogTrace(_T("focus"), _T("wxTLW %08x deactivated, last focused: %08x."), - m_hWnd, - m_winLastFocused ? GetHwndOf(m_winLastFocused) - : NULL); + (int) m_hWnd, + (int) (m_winLastFocused ? GetHwndOf(m_winLastFocused) + : NULL)); event.Skip(); } @@ -802,3 +880,80 @@ wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) } } +// ============================================================================ +// wxTLWHiddenParentModule implementation +// ============================================================================ + +HWND wxTLWHiddenParentModule::ms_hwnd = NULL; + +const wxChar *wxTLWHiddenParentModule::ms_className = NULL; + +bool wxTLWHiddenParentModule::OnInit() +{ + ms_hwnd = NULL; + ms_className = NULL; + + return TRUE; +} + +void wxTLWHiddenParentModule::OnExit() +{ + if ( ms_hwnd ) + { + if ( !::DestroyWindow(ms_hwnd) ) + { + wxLogLastError(_T("DestroyWindow(hidden TLW parent)")); + } + + ms_hwnd = NULL; + } + + if ( ms_className ) + { + if ( !::UnregisterClass(ms_className, wxGetInstance()) ) + { + wxLogLastError(_T("UnregisterClass(\"wxTLWHiddenParent\")")); + } + + ms_className = NULL; + } +} + +/* static */ +HWND wxTLWHiddenParentModule::GetHWND() +{ + if ( !ms_hwnd ) + { + if ( !ms_className ) + { + static const wxChar *HIDDEN_PARENT_CLASS = _T("wxTLWHiddenParent"); + + WNDCLASS wndclass; + wxZeroMemory(wndclass); + + wndclass.lpfnWndProc = DefWindowProc; + wndclass.hInstance = wxGetInstance(); + wndclass.lpszClassName = HIDDEN_PARENT_CLASS; + + if ( !::RegisterClass(&wndclass) ) + { + wxLogLastError(_T("RegisterClass(\"wxTLWHiddenParent\")")); + } + else + { + ms_className = HIDDEN_PARENT_CLASS; + } + } + + ms_hwnd = ::CreateWindow(ms_className, _T(""), 0, 0, 0, 0, 0, NULL, + (HMENU)NULL, wxGetInstance(), NULL); + if ( !ms_hwnd ) + { + wxLogLastError(_T("CreateWindow(hidden TLW parent)")); + } + } + + return ms_hwnd; +} + +