X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4d3253b5923de972846b09814623d7b05e9d4d1..7848088476db284a94f19eeb24411b45d676ac46:/src/msw/toplevel.cpp?ds=inline diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 41d5a0d46a..e3dccf8050 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -41,14 +41,18 @@ #include "wx/module.h" #include "wx/msw/private.h" -#include "wx/msw/winundef.h" - -// This can't be undefed in winundef.h or -// there are further errors -#if defined(__WXWINCE__) && defined(CreateDialog) -#undef CreateDialog +#if defined(__WXWINCE__) + #include + #include + #if _WIN32_WCE < 400 + #include + #endif +#include "wx/msw/wince/missing.h" #endif +#include "wx/msw/missing.h" +#include "wx/msw/winundef.h" + #include "wx/display.h" #ifndef ICON_BIG @@ -129,9 +133,6 @@ void wxTopLevelWindowMSW::Init() m_iconized = m_maximizeOnShow = FALSE; - // unlike (almost?) all other windows, frames are created hidden - m_isShown = FALSE; - // Data to save/restore when calling ShowFullScreen m_fsStyle = 0; m_fsOldWindowStyle = 0; @@ -159,34 +160,24 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const msflags |= WS_POPUP; else { -#ifdef __WXWINCE__ if (msflags & WS_BORDER) -#endif msflags |= WS_OVERLAPPED; } // border and caption styles if ( style & wxRESIZE_BORDER ) - { -#ifndef __WXWINCE__ msflags |= WS_THICKFRAME; -#endif - } else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) ) *exflags |= WS_EX_DLGMODALFRAME; else if ( !(style & wxBORDER_NONE) ) msflags |= WS_BORDER; -#ifndef __WXWINCE__ else msflags |= WS_POPUP; -#endif if ( style & wxCAPTION ) msflags |= WS_CAPTION; -#ifndef __WXWINCE__ else msflags |= WS_POPUP; -#endif // next translate the individual flags if ( style & wxMINIMIZE_BOX ) @@ -195,27 +186,23 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const msflags |= WS_MAXIMIZEBOX; if ( style & wxSYSTEM_MENU ) msflags |= WS_SYSMENU; -#ifndef __WXWINCE__ + + // under CE these 2 styles are not defined currently +#ifdef WS_MINIMIZE if ( style & wxMINIMIZE ) msflags |= WS_MINIMIZE; +#endif // WS_MINIMIZE +#ifdef WS_MAXIMIZE if ( style & wxMAXIMIZE ) msflags |= WS_MAXIMIZE; -#endif +#endif // WS_MAXIMIZE // Keep this here because it saves recoding this function in wxTinyFrame -#if wxUSE_ITSY_BITSY && !defined(__WIN32__) - if ( style & wxTINY_CAPTION_VERT ) - msflags |= IBS_VERTCAPTION; - if ( style & wxTINY_CAPTION_HORIZ ) - msflags |= IBS_HORZCAPTION; -#else if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) ) msflags |= WS_CAPTION; -#endif if ( exflags ) { -#if !defined(__WIN16__) if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ) { if ( style & wxFRAME_TOOL_WINDOW ) @@ -227,6 +214,8 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const style |= wxFRAME_NO_TASKBAR; } + // again, support for this is missing under CE +#ifdef WS_EX_APPWINDOW // We have to solve 2 different problems here: // // 1. frames with wxFRAME_NO_TASKBAR flag shouldn't appear in the @@ -239,24 +228,20 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const // The second one is solved here by using WS_EX_APPWINDOW flag, the // first one is dealt with in our MSWGetParent() method // implementation -#ifndef __WXWINCE__ if ( !(style & wxFRAME_NO_TASKBAR) && GetParent() ) { // need to force the frame to appear in the taskbar *exflags |= WS_EX_APPWINDOW; } -#endif //else: nothing to do [here] +#endif // WS_EX_APPWINDOW } -#endif // !Win16 if ( style & wxSTAY_ON_TOP ) *exflags |= WS_EX_TOPMOST; -#ifdef __WIN32__ if ( GetExtraStyle() & wxFRAME_EX_CONTEXTHELP ) *exflags |= WS_EX_CONTEXTHELP; -#endif // __WIN32__ } return msflags; @@ -382,25 +367,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, // move the dialog to its initial position without forcing repainting int x, y, w, h; - if ( !MSWGetCreateWindowCoords(pos, size, x, y, w, h) ) - { - x = - w = (int)CW_USEDEFAULT; - } - - // 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; - } + (void)MSWGetCreateWindowCoords(pos, size, x, y, w, h); if ( x == (int)CW_USEDEFAULT ) { @@ -445,11 +412,17 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, long style, const wxString& name) { - bool ret = false; + bool ret wxDUMMY_INITIALIZE(false); // init our fields Init(); + wxSize sizeReal = size; + if ( !sizeReal.IsFullySpecified() ) + { + sizeReal.SetDefaults(GetDefaultSize()); + } + m_windowStyle = style; SetName(name); @@ -491,12 +464,12 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, if ( style & (wxRESIZE_BORDER | wxCAPTION) ) dlgTemplate->style |= DS_MODALFRAME; - ret = CreateDialog(dlgTemplate, title, pos, size); + ret = CreateDialog(dlgTemplate, title, pos, sizeReal); free(dlgTemplate); } else // !dialog { - ret = CreateFrame(title, pos, size); + ret = CreateFrame(title, pos, sizeReal); } if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) ) @@ -504,6 +477,23 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, EnableCloseButton(false); } + // for some reason we need to manually send ourselves this message as + // otherwise the mnemonics are always shown -- even if they're configured + // to be hidden until "Alt" is pressed in the control panel + // + // this could indicate a bug somewhere else but for now this is the only + // fix we have + if ( ret ) + { + SendMessage + ( + GetHwnd(), + WM_UPDATEUISTATE, + MAKEWPARAM(UIS_INITIALIZE, UISF_HIDEFOCUS | UISF_HIDEACCEL), + 0 + ); + } + return ret; } @@ -697,10 +687,13 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) else // fall back to the main desktop #else // wxUSE_DISPLAY { - // FIXME: implement for WinCE -#ifndef __WXWINCE__ // resize to the size of the desktop wxCopyRECTToRect(wxGetWindowRect(::GetDesktopWindow()), rect); +#ifdef __WXWINCE__ + // FIXME: size of the bottom menu (toolbar) + // should be taken in account + rect.height += rect.y; + rect.y = 0; #endif } #endif // wxUSE_DISPLAY @@ -727,12 +720,19 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) rect.x, rect.y, rect.width, rect.height, flags); +#if defined(__WXWINCE__) && _WIN32_WCE < 400 + ::SHFullScreen(GetHwnd(), SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON); +#endif + // finally send an event allowing the window to relayout itself &c wxSizeEvent event(rect.GetSize(), GetId()); GetEventHandler()->ProcessEvent(event); } else // stop showing full screen { +#if defined(__WXWINCE__) && _WIN32_WCE < 400 + ::SHFullScreen(GetHwnd(), SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON); +#endif Maximize(m_fsIsMaximized); SetWindowLong(GetHwnd(),GWL_STYLE, m_fsOldWindowStyle); SetWindowPos(GetHwnd(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y, @@ -805,11 +805,10 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable) return TRUE; } +#ifndef __WXWINCE__ + bool wxTopLevelWindowMSW::SetShape(const wxRegion& region) { -#ifdef __WXWINCE__ - return FALSE; -#else wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE, _T("Shaped windows must be created with the wxFRAME_SHAPED style.")); @@ -850,9 +849,10 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region) return FALSE; } return TRUE; -#endif } +#endif // !__WXWINCE__ + // ---------------------------------------------------------------------------- // wxTopLevelWindow event handling // ---------------------------------------------------------------------------- @@ -863,17 +863,22 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) { if ( event.GetActive() ) { - // restore focus to the child which was last focused -// wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd); + // restore focus to the child which was last focused unless we already + // have it + wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd); - wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() - : NULL; - if ( !parent ) + wxWindow *winFocus = FindFocus(); + if ( !winFocus || wxGetTopLevelParent(winFocus) != this ) { - parent = this; - } + wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent() + : NULL; + if ( !parent ) + { + parent = this; + } - wxSetFocusToChild(parent, &m_winLastFocused); + wxSetFocusToChild(parent, &m_winLastFocused); + } } else // deactivating { @@ -884,23 +889,12 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) { // 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 ) - { - if ( win->IsTopLevel() ) + // and don't remember it if it's a child from some other frame + if ( wxGetTopLevelParent(m_winLastFocused) != this ) { - if ( win != this ) - { - m_winLastFocused = NULL; - } - - break; + m_winLastFocused = NULL; } - - win = win->GetParent(); } wxLogTrace(_T("focus"),