X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a838ff58bfd0fd040156a16ce6fd804e20b5f46..48a102f9e553f6b05185708ddc60f61be66ff3f5:/src/msw/toplevel.cpp?ds=sidebyside diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index ae28587509..82b65ed06b 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: msw/toplevel.cpp +// Name: src/msw/toplevel.cpp // Purpose: implements wxTopLevelWindow for MSW // Author: Vadim Zeitlin // Modified by: @@ -17,10 +17,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "toplevel.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -145,9 +141,17 @@ void wxTopLevelWindowMSW::Init() m_winLastFocused = (wxWindow *)NULL; -#ifdef __SMARTPHONE__ +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) m_MenuBarHWND = 0; #endif + +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + SHACTIVATEINFO* info = new SHACTIVATEINFO; + wxZeroMemory(*info); + info->cbSize = sizeof(SHACTIVATEINFO); + + m_activateInfo = (void*) info; +#endif } WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const @@ -159,22 +163,21 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const (style & ~wxBORDER_MASK) | wxBORDER_NONE, exflags ) & ~WS_CHILD & ~WS_VISIBLE; -#if defined(__WXWINCE__) && _WIN32_WCE < 400 + // For some reason, WS_VISIBLE needs to be defined on creation for + // SmartPhone 2003. The title can fail to be displayed otherwise. +#if defined(__SMARTPHONE__) || (defined(__WXWINCE__) && _WIN32_WCE < 400) msflags |= WS_VISIBLE; + ((wxTopLevelWindowMSW*)this)->wxWindowBase::Show(true); #endif // 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 - if ( style & wxFRAME_TOOL_WINDOW ) - { - msflags |= WS_POPUP; - } - //else: WS_OVERLAPPED is 0 anyhow, so it is on by default + // creates a window with both caption and border, hence we need to use + // WS_POPUP in a few cases just to avoid having caption/border which we + // don't want -#ifndef __SMARTPHONE__ +#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) // border and caption styles if ( style & wxRESIZE_BORDER ) msflags |= WS_THICKFRAME; @@ -182,35 +185,48 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const *exflags |= WS_EX_DLGMODALFRAME; else if ( !(style & wxBORDER_NONE) ) msflags |= WS_BORDER; +#ifndef __POCKETPC__ else msflags |= WS_POPUP; +#endif #endif - // normally we consider that all windows without caption must be popups, + // normally we consider that all windows without a caption must be popups, // but CE is an exception: there windows normally do not have the caption // but shouldn't be made popups as popups can't have menus and don't look // like normal windows anyhow + + // TODO: Smartphone appears to like wxCAPTION, but we should check that + // we need it. +#if defined(__SMARTPHONE__) || !defined(__WXWINCE__) if ( style & wxCAPTION ) msflags |= WS_CAPTION; #ifndef __WXWINCE__ else msflags |= WS_POPUP; #endif // !__WXWINCE__ +#endif // next translate the individual flags if ( style & wxMINIMIZE_BOX ) msflags |= WS_MINIMIZEBOX; if ( style & wxMAXIMIZE_BOX ) msflags |= WS_MAXIMIZEBOX; + +#ifndef __WXWINCE__ if ( style & wxSYSTEM_MENU ) msflags |= WS_SYSMENU; +#endif // NB: under CE these 2 styles are not supported currently, we should // call Minimize()/Maximize() "manually" if we want to support them if ( style & wxMINIMIZE ) msflags |= WS_MINIMIZE; + +#if !defined(__POCKETPC__) if ( style & wxMAXIMIZE ) msflags |= WS_MAXIMIZE; +#endif // Keep this here because it saves recoding this function in wxTinyFrame if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) ) @@ -250,13 +266,13 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const } //else: nothing to do [here] } + + if ( GetExtraStyle() & wxFRAME_EX_CONTEXTHELP ) + *exflags |= WS_EX_CONTEXTHELP; #endif // !__WXWINCE__ if ( style & wxSTAY_ON_TOP ) *exflags |= WS_EX_TOPMOST; - - if ( GetExtraStyle() & wxFRAME_EX_CONTEXTHELP ) - *exflags |= WS_EX_CONTEXTHELP; } return msflags; @@ -296,6 +312,62 @@ WXHWND wxTopLevelWindowMSW::MSWGetParent() const return (WXHWND)hwndParent; } +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) +bool wxTopLevelWindowMSW::HandleSettingChange(WXWPARAM wParam, WXLPARAM lParam) +{ + SHACTIVATEINFO *info = (SHACTIVATEINFO*) m_activateInfo; + if ( info ) + { + SHHandleWMSettingChange(GetHwnd(), wParam, lParam, info); + } + + return wxWindowMSW::HandleSettingChange(wParam, lParam); +} +#endif + +WXLRESULT wxTopLevelWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) +{ + WXLRESULT rc = 0; + bool processed = false; + +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + switch ( message ) + { + case WM_ACTIVATE: + { + SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo; + if (info) + { + DWORD flags = 0; + if (GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) flags = SHA_INPUTDIALOG; + SHHandleWMActivate(GetHwnd(), wParam, lParam, info, flags); + } + + // This implicitly sends a wxEVT_ACTIVATE_APP event + if (wxTheApp) + wxTheApp->SetActive(wParam != 0, FindFocus()); + + break; + } + case WM_HIBERNATE: + { + if (wxTheApp) + { + wxActivateEvent event(wxEVT_HIBERNATE, true, wxID_ANY); + event.SetEventObject(wxTheApp); + processed = wxTheApp->ProcessEvent(event); + } + break; + } + } +#endif + + if ( !processed ) + rc = wxTopLevelWindowBase::MSWWindowProc(message, wParam, lParam); + + return rc; +} + bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, const wxString& title, const wxPoint& pos, @@ -361,7 +433,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, SWP_NOACTIVATE); } -#if defined(__WIN95__) +#if !defined(__WXWINCE__) // For some reason, the system menu is activated when we use the // WS_EX_CONTEXTHELP style, so let's set a reasonable icon if ( exflags & WS_EX_CONTEXTHELP ) @@ -378,7 +450,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, } } } -#endif // __WIN95__ +#endif // move the dialog to its initial position without forcing repainting int x, y, w, h; @@ -407,6 +479,11 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, SubclassWin(m_hWnd); +#ifdef __SMARTPHONE__ + // Work around title non-display glitch + Show(false); +#endif + return true; #endif // __WXMICROWIN__/!__WXMICROWIN__ } @@ -428,7 +505,9 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title, wxSize sz(size); #endif - return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags); + bool result = MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags); + + return result; } bool wxTopLevelWindowMSW::Create(wxWindow *parent, @@ -487,9 +566,11 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, // all dialogs are popups dlgTemplate->style |= WS_POPUP; +#ifndef __WXWINCE__ // force 3D-look if necessary, it looks impossibly ugly otherwise if ( style & (wxRESIZE_BORDER | wxCAPTION) ) dlgTemplate->style |= DS_MODALFRAME; +#endif ret = CreateDialog(dlgTemplate, title, pos, sizeReal); free(dlgTemplate); @@ -499,37 +580,32 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, ret = CreateFrame(title, pos, sizeReal); } +#ifndef __WXWINCE__ if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) ) { EnableCloseButton(false); } +#endif - // 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 + // for standard dialogs the dialog manager generates WM_CHANGEUISTATE + // itself but for custom windows we have to do it ourselves in order to + // make the keyboard indicators (such as underlines for accelerators and + // focus rectangles) work under Win2k+ if ( ret ) { - ::SendMessage - ( - GetHwnd(), - WM_UPDATEUISTATE, - MAKEWPARAM(UIS_INITIALIZE, UISF_HIDEFOCUS | UISF_HIDEACCEL), - 0 - ); + MSWUpdateUIState(UIS_INITIALIZE); } - // Native look is full screen window on Smartphones and Standard SDK -#if defined(__WXWINCE__) + // Note: if we include PocketPC in this test, dialogs can fail to show up, + // for example the text entry dialog in the dialogs sample. Problem with Maximise()? +#if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__WINCE_STANDARDSDK__)) if ( style & wxMAXIMIZE ) { this->Maximize(); } #endif -#ifdef __SMARTPHONE__ +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) SetRightMenu(); // to nothing for initialization #endif @@ -538,6 +614,12 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, wxTopLevelWindowMSW::~wxTopLevelWindowMSW() { +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + SHACTIVATEINFO* info = (SHACTIVATEINFO*) m_activateInfo; + delete info; + m_activateInfo = NULL; +#endif + // after destroying an owned window, Windows activates the next top level // window in Z order but it may be different from our owner (to reproduce // this simply Alt-TAB to another application and back before closing the @@ -578,7 +660,7 @@ bool wxTopLevelWindowMSW::Show(bool show) nShowCmd = SW_MAXIMIZE; // This is necessary, or no window appears -#ifdef __WINCE_STANDARDSDK__ +#if defined( __WINCE_STANDARDSDK__) || defined(__SMARTPHONE__) DoShowWindow(SW_SHOW); #endif @@ -606,25 +688,6 @@ bool wxTopLevelWindowMSW::Show(bool show) frame->GetMenuBar()->AddAdornments(GetWindowStyleFlag()); #endif - if ( show ) - { - ::BringWindowToTop(GetHwnd()); - - wxActivateEvent event(wxEVT_ACTIVATE, true, m_windowId); - event.SetEventObject( this ); - GetEventHandler()->ProcessEvent(event); - } - else // hide - { - // Try to highlight the correct window (the parent) - if ( GetParent() ) - { - HWND hWndParent = GetHwndOf(GetParent()); - if (hWndParent) - ::BringWindowToTop(hWndParent); - } - } - return true; } @@ -641,18 +704,30 @@ void wxTopLevelWindowMSW::Maximize(bool maximize) } else // hidden { - // 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 + // 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 = maximize; + + // after calling Maximize() the client code expects to get the frame + // "real" size and doesn't want to know that, because of implementation + // details, the frame isn't really maximized yet but will be only once + // it's shown, so return our size as it will be then in this case + if ( maximize ) + { + // unfortunately we don't know which display we're on yet so we + // have to use the default one + SetSize(wxGetClientDisplayRect().GetSize()); + } + //else: can't do anything in this case, we don't have the old size } } bool wxTopLevelWindowMSW::IsMaximized() const { -#ifdef __WXWINCE__ - return false; +#if defined(__SMARTPHONE__) || defined(__POCKETPC__) + return true; #else - return ::IsZoomed(GetHwnd()) != 0; + return m_maximizeOnShow || ::IsZoomed(GetHwnd()) != 0; #endif } @@ -666,10 +741,11 @@ bool wxTopLevelWindowMSW::IsIconized() const #ifdef __WXWINCE__ return false; #else - // also update the current state - ((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0; - - return m_iconized; + // don't use m_iconized, it may be briefly out of sync with the real state + // as it's only modified when we receive a WM_SIZE and we could be called + // from an event handler from one of the messages we receive before it, + // such as WM_MOVE + return ::IsIconic(GetHwnd()) != 0; #endif } @@ -733,7 +809,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) rect = wxDisplay(dpy).GetGeometry(); } else // fall back to the main desktop -#else // wxUSE_DISPLAY +#endif // wxUSE_DISPLAY { // resize to the size of the desktop wxCopyRECTToRect(wxGetWindowRect(::GetDesktopWindow()), rect); @@ -744,7 +820,6 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) rect.y = 0; #endif } -#endif // wxUSE_DISPLAY SetSize(rect); @@ -794,6 +869,16 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) // wxTopLevelWindowMSW misc // ---------------------------------------------------------------------------- +void wxTopLevelWindowMSW::SetTitle( const wxString& title) +{ + SetLabel(title); +} + +wxString wxTopLevelWindowMSW::GetTitle() const +{ + return GetLabel(); +} + void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon) { SetIcons( wxIconBundle( icon ) ); @@ -803,7 +888,7 @@ void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons) { wxTopLevelWindowBase::SetIcons(icons); -#if defined(__WIN95__) && !defined(__WXMICROWIN__) +#if !defined(__WXMICROWIN__) const wxIcon& sml = icons.GetIcon( wxSize( 16, 16 ) ); if( sml.Ok() && sml.GetWidth() == 16 && sml.GetHeight() == 16 ) { @@ -817,7 +902,7 @@ void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons) ::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG, (LPARAM)GetHiconOf(big) ); } -#endif // __WIN95__ +#endif // !__WXMICROWIN__ } bool wxTopLevelWindowMSW::EnableCloseButton(bool enable) @@ -904,10 +989,12 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region) void wxTopLevelWindowMSW::RequestUserAttention(int flags) { - // check if we can use FlashWindowEx(): unfortunately an explicit test for - // FLASHW_STOP, for example, doesn't work because MSVC6 headers do #define - // it but don't provide FlashWindowEx() declaration -#if (WINVER >= 0x0500 && (defined FLASHW_STOP)) + // check if we can use FlashWindowEx(): unfortunately a simple test for + // FLASHW_STOP doesn't work because MSVC6 headers do #define it but don't + // provide FlashWindowEx() declaration, so try to detect whether we have + // real headers for WINVER 0x0500 by checking for existence of a symbol not + // declated in MSVC6 header +#if defined(FLASHW_STOP) && defined(VK_XBUTTON1) // available in the headers, check if it is supported by the system typedef BOOL (WINAPI *FlashWindowEx_t)(FLASHWINFO *pfwi); FlashWindowEx_t s_pfnFlashWindowEx = NULL; @@ -917,7 +1004,7 @@ void wxTopLevelWindowMSW::RequestUserAttention(int flags) s_pfnFlashWindowEx = (FlashWindowEx_t) dllUser32.GetSymbol(_T("FlashWindowEx")); - // we can safely unload user32.dll here, it's goign to remain loaded as + // we can safely unload user32.dll here, it's going to remain loaded as // long as the program is running anyhow } @@ -1010,38 +1097,40 @@ wxDlgProc(HWND hDlg, WPARAM WXUNUSED(wParam), LPARAM WXUNUSED(lParam)) { - if ( message == WM_INITDIALOG ) + switch ( message ) { - // under CE, add a "Ok" button in the dialog title bar and make it full - // screen - // - // VZ: we should probably allow for overriding this, e.g. by including - // MAXIMIZED flag in the dialog style by default and doing this - // only if it is present... - - // Standard SDK doesn't have aygshell.dll: see - // include/wx/msw/wince/libraries.h + case WM_INITDIALOG: + { + // under CE, add a "Ok" button in the dialog title bar and make it full + // screen + // + // TODO: find the window for this HWND, and take into account + // wxMAXIMIZE and wxCLOSE_BOX. For now, assume both are present. + // + // Standard SDK doesn't have aygshell.dll: see + // include/wx/msw/wince/libraries.h #if defined(__WXWINCE__) && !defined(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__) - SHINITDLGINFO shidi; - shidi.dwMask = SHIDIM_FLAGS; - shidi.dwFlags = SHIDIF_SIZEDLGFULLSCREEN + SHINITDLGINFO shidi; + shidi.dwMask = SHIDIM_FLAGS; + shidi.dwFlags = SHIDIF_SIZEDLG // take account of the SIP or menubar #ifndef __SMARTPHONE__ - | SHIDIF_DONEBUTTON + | SHIDIF_DONEBUTTON #endif ; - shidi.hDlg = hDlg; - SHInitDialog( &shidi ); + shidi.hDlg = hDlg; + SHInitDialog( &shidi ); #else // no SHInitDialog() - wxUnusedVar(hDlg); + wxUnusedVar(hDlg); #endif + // for WM_INITDIALOG, returning TRUE tells system to set focus to + // the first control in the dialog box, but as we set the focus + // ourselves, we return FALSE for it as well + return FALSE; + } } // for almost all messages, returning FALSE means that we didn't process // the message - // - // for WM_INITDIALOG, returning TRUE tells system to set focus to - // the first control in the dialog box, but as we set the focus - // ourselves, we return FALSE for it as well return FALSE; } @@ -1120,5 +1209,3 @@ HWND wxTLWHiddenParentModule::GetHWND() return ms_hwnd; } - -