X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0adbe0ffd7c1f1d3fd21926092d6fafd4fc47dc..4a46a5df879c4f820d0a0a435b34c7d5e4793991:/src/msw/toplevel.cpp?ds=sidebyside diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 0720766612..e77677c7d4 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -45,7 +45,7 @@ #ifdef __WXMICROWIN__ -static inline bool IsIconic(HWND WXUNUSED(hwnd)) { return FALSE; } +// static inline bool IsIconic(HWND WXUNUSED(hwnd)) { return FALSE; } static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return FALSE; } #endif // __WXMICROWIN__ @@ -104,36 +104,43 @@ void wxTopLevelWindowMSW::Init() long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const { long style = GetWindowStyle(); - long msflags = 0; // first select the kind of window being created + // + // note that if we don't set WS_POPUP, Windows assumes WS_OVERLAPPED and + // creates a window with both caption and border, hence we also test it + // below in some other cases + long msflags; + if ( style & wxFRAME_TOOL_WINDOW ) + msflags = WS_POPUP; + else + msflags = WS_OVERLAPPED; + + // border and caption styles + if ( style & wxRESIZE_BORDER ) + msflags |= WS_THICKFRAME; + else if ( !(style & wxBORDER_NONE) ) + msflags |= WS_BORDER; + else + msflags |= WS_POPUP; + if ( style & wxCAPTION ) - { - if ( style & wxFRAME_TOOL_WINDOW ) - msflags |= WS_POPUPWINDOW; - else - msflags |= WS_OVERLAPPED; - } + msflags |= WS_CAPTION; else - { msflags |= WS_POPUP; - } // next translate the individual flags 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 ) msflags |= WS_MINIMIZE; if ( style & wxMAXIMIZE ) msflags |= WS_MAXIMIZE; - if ( style & wxCAPTION ) - msflags |= WS_CAPTION; + if ( style & wxCLIP_CHILDREN ) msflags |= WS_CLIPCHILDREN; @@ -152,30 +159,33 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const { *exflags = 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) || (style & wxFRAME_NO_TASKBAR) ) - *exflags |= WS_EX_TOOLWINDOW; - else if ( !(style & wxFRAME_NO_TASKBAR) ) - *exflags |= WS_EX_APPWINDOW; -#endif + if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ) + { + // 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 ( (style & wxFRAME_TOOL_WINDOW) || (style & wxFRAME_NO_TASKBAR) ) + *exflags |= WS_EX_TOOLWINDOW; + else if ( !(style & wxFRAME_NO_TASKBAR) ) + *exflags |= WS_EX_APPWINDOW; + } +#endif // !Win16 if ( style & wxSTAY_ON_TOP ) *exflags |= WS_EX_TOPMOST; #ifdef __WIN32__ - if ( m_exStyle & wxFRAME_EX_CONTEXTHELP ) - *exflags |= WS_EX_CONTEXTHELP; + if ( m_exStyle & wxFRAME_EX_CONTEXTHELP ) + *exflags |= WS_EX_CONTEXTHELP; #endif // __WIN32__ } return msflags; } -bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate, +bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, const wxString& title, const wxPoint& pos, const wxSize& size) @@ -192,18 +202,32 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate, if ( !parent && !(GetWindowStyleFlag() & wxDIALOG_NO_PARENT) ) { parent = wxTheApp->GetTopWindow(); + + if ( parent ) + { + // don't use transient windows as parents, this is dangerous as it + // can lead to a crash if the parent is destroyed before the child + // + // also don't use the window which is currently hidden as then the + // dialog would be hidden as well + if ( (parent->GetExtraStyle() & wxWS_EX_TRANSIENT) || + !parent->IsShown() ) + { + parent = NULL; + } + } } - m_hWnd = (WXHWND)::CreateDialog(wxGetInstance(), - dlgTemplate, + m_hWnd = (WXHWND)::CreateDialogIndirect(wxGetInstance(), + (DLGTEMPLATE*)dlgTemplate, parent ? GetHwndOf(parent) : NULL, (DLGPROC)wxDlgProc); if ( !m_hWnd ) { - wxFAIL_MSG(_("Did you forget to include wx/msw/wx.rc in your resources?")); + wxFAIL_MSG(_("Failed to create dialog. Incorrect DLGTEMPLATE?")); - wxLogSysError(_("Can't create dialog using template '%s'"), dlgTemplate); + wxLogSysError(_("Can't create dialog using memory template")); return FALSE; } @@ -242,28 +266,39 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate, // move the dialog to its initial position without forcing repainting int x, y, w, h; - if ( MSWGetCreateWindowCoords(pos, size, x, y, w, h) ) + if ( !MSWGetCreateWindowCoords(pos, size, x, y, w, h) ) { - // we can't use CW_USEDEFAULT here as we're not calling CreateWindow() - // and passing CW_USEDEFAULT to MoveWindow() results in resizing the - // window to (0, 0) size which breaks quite a lot of things, e.g. the - // sizer calculation in wxSizer::Fit() - if ( w == CW_USEDEFAULT ) - { - // the exact number doesn't matter, the dialog will be resized - // again soon anyhow but it should be big enough to allow - // calculation relying on "totalSize - clientSize > 0" work, i.e. - // at least greater than the title bar height - w = - h = 100; - } + x = + w = (int)CW_USEDEFAULT; + } - if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) ) - { - wxLogLastError(wxT("MoveWindow")); - } + // we can't use CW_USEDEFAULT here as we're not calling CreateWindow() + // and passing CW_USEDEFAULT to MoveWindow() results in resizing the + // window to (0, 0) size which breaks quite a lot of things, e.g. the + // sizer calculation in wxSizer::Fit() + if ( w == (int)CW_USEDEFAULT ) + { + // the exact number doesn't matter, the dialog will be resized + // again soon anyhow but it should be big enough to allow + // calculation relying on "totalSize - clientSize > 0" work, i.e. + // at least greater than the title bar height + w = + h = 100; + } + + if ( x == (int)CW_USEDEFAULT ) + { + // centre it on the screen - what else can we do? + wxSize sizeDpy = wxGetDisplaySize(); + + x = (sizeDpy.x - w) / 2; + y = (sizeDpy.y - h) / 2; + } + + if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) ) + { + wxLogLastError(wxT("MoveWindow")); } - //else: leave it at default position if ( !title.empty() ) { @@ -323,15 +358,24 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, // with & without captions under MSWindows, resizeable or not (but a // resizeable dialog always has caption - otherwise it would look too // strange) - const wxChar *dlgTemplate; + int dlgsize = sizeof(DLGTEMPLATE) + (sizeof(WORD) * 3); + DLGTEMPLATE* dlgTemplate = (DLGTEMPLATE*)malloc( dlgsize ); + memset (dlgTemplate, 0, dlgsize ); + dlgTemplate->x = 34; + dlgTemplate->y = 22; + dlgTemplate->cx = 144; + dlgTemplate->cy = 75; + if ( style & wxRESIZE_BORDER ) - dlgTemplate = wxT("wxResizeableDialog"); + dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU | WS_THICKFRAME; else if ( style & wxCAPTION ) - dlgTemplate = wxT("wxCaptionDialog"); + dlgTemplate->style = DS_MODALFRAME | WS_CAPTION | WS_POPUP | WS_SYSMENU; else - dlgTemplate = wxT("wxNoCaptionDialog"); + dlgTemplate->style = WS_POPUP; - return CreateDialog(dlgTemplate, title, pos, size); + bool ret = CreateDialog(dlgTemplate, title, pos, size); + free(dlgTemplate); + return ret; } else // !dialog { @@ -358,42 +402,6 @@ wxTopLevelWindowMSW::~wxTopLevelWindowMSW() } } -// ---------------------------------------------------------------------------- -// wxTopLevelWindowMSW geometry -// ---------------------------------------------------------------------------- - -void wxTopLevelWindowMSW::DoSetClientSize(int width, int height) -{ - HWND hWnd = GetHwnd(); - - RECT rectClient; - ::GetClientRect(hWnd, &rectClient); - - 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 - width += rectTotal.right - rectTotal.left - rectClient.right; - height += rectTotal.bottom - rectTotal.top - rectClient.bottom; - - // note that calling GetClientAreaOrigin() takes the toolbar into account - wxPoint pt = GetClientAreaOrigin(); - width += pt.x; - height += pt.y; - - if ( !::MoveWindow(hWnd, rectTotal.left, rectTotal.top, - width, height, TRUE /* redraw */) ) - { - wxLogLastError(_T("MoveWindow")); - } - - wxSizeEvent event(wxSize(width, height), m_windowId); - event.SetEventObject(this); - (void)GetEventHandler()->ProcessEvent(event); -} - // ---------------------------------------------------------------------------- // wxTopLevelWindowMSW showing // ---------------------------------------------------------------------------- @@ -584,3 +592,37 @@ void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon) } #endif // __WIN95__ } + +bool wxTopLevelWindowMSW::EnableCloseButton(bool enable) +{ +#ifndef __WXMICROWIN__ + // get system (a.k.a. window) menu + HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */); + if ( !hmenu ) + { + wxLogLastError(_T("GetSystemMenu")); + + return FALSE; + } + + // enabling/disabling the close item from it also automatically + // disables/enables the close title bar button + if ( ::EnableMenuItem(hmenu, SC_CLOSE, + MF_BYCOMMAND | + (enable ? MF_ENABLED : MF_GRAYED)) == -1 ) + { + wxLogLastError(_T("EnableMenuItem(SC_CLOSE)")); + + return FALSE; + } + + // update appearance immediately + if ( !::DrawMenuBar(GetHwnd()) ) + { + wxLogLastError(_T("DrawMenuBar")); + } +#endif // !__WXMICROWIN__ + + return TRUE; +} +