X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3874e500deedd7b85e1056f5396f4b0986df9658..9af08eb82665ca5d28b28af50f345396a3cff717:/src/msw/toplevel.cpp diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 3ad3dc4c45..a600836ce6 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -40,13 +40,14 @@ #endif //WX_PRECOMP #include "wx/module.h" +#include "wx/dynlib.h" #include "wx/msw/private.h" -#if defined(__WXWINCE__) +#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) #include #include // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h - #if _WIN32_WCE < 400 || !defined(WCE_PLATFORM_STANDARDSDK) + #if _WIN32_WCE < 400 || !defined(__WINCE_STANDARDSDK__) #include #endif #include "wx/msw/wince/missing.h" @@ -71,8 +72,8 @@ #ifdef __WXMICROWIN__ -// static inline bool IsIconic(HWND WXUNUSED(hwnd)) { return FALSE; } -static inline bool IsZoomed(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__ @@ -85,10 +86,7 @@ wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); // globals // ---------------------------------------------------------------------------- -// list of all frames and modeless dialogs -wxWindowList wxModelessWindows; - -// the name of the default wxWindows class +// the name of the default wxWidgets class #ifdef __WXWINCE__ extern wxChar *wxCanvasClassName; #else @@ -137,15 +135,19 @@ END_EVENT_TABLE() void wxTopLevelWindowMSW::Init() { m_iconized = - m_maximizeOnShow = FALSE; + m_maximizeOnShow = false; // Data to save/restore when calling ShowFullScreen m_fsStyle = 0; m_fsOldWindowStyle = 0; - m_fsIsMaximized = FALSE; - m_fsIsShowing = FALSE; + m_fsIsMaximized = false; + m_fsIsShowing = false; m_winLastFocused = (wxWindow *)NULL; + +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + m_MenuBarHWND = 0; +#endif } WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const @@ -172,6 +174,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const } //else: WS_OVERLAPPED is 0 anyhow, so it is on by default +#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__)) // border and caption styles if ( style & wxRESIZE_BORDER ) msflags |= WS_THICKFRAME; @@ -181,6 +184,7 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const msflags |= WS_BORDER; else msflags |= WS_POPUP; +#endif // normally we consider that all windows without caption must be popups, // but CE is an exception: there windows normally do not have the caption @@ -211,11 +215,11 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const // Keep this here because it saves recoding this function in wxTinyFrame if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) ) msflags |= WS_CAPTION; - + if ( exflags ) { // there is no taskbar under CE, so omit all this -#ifndef __WXWINCE__ +#if !defined(__WXWINCE__) if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) ) { if ( style & wxFRAME_TOOL_WINDOW ) @@ -339,7 +343,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, wxLogSysError(wxT("Can't create dialog using memory template")); - return FALSE; + return false; } WXDWORD exflags; @@ -389,7 +393,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, y = (sizeDpy.y - h) / 2; } -#ifndef __WXWINCE__ +#if !defined(__WXWINCE__) || defined(__WINCE_STANDARDSDK__) if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) ) { wxLogLastError(wxT("MoveWindow")); @@ -403,7 +407,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate, SubclassWin(m_hWnd); - return TRUE; + return true; #endif // __WXMICROWIN__/!__WXMICROWIN__ } @@ -414,7 +418,17 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title, WXDWORD exflags; WXDWORD flags = MSWGetCreateWindowFlags(&exflags); - return MSWCreate(wxCanvasClassName, title, pos, size, flags, exflags); +#if !defined(__HANDHELDPC__) && ((defined(_WIN32_WCE) && _WIN32_WCE < 400) || \ + defined(__POCKETPC__) || \ + defined(__SMARTPHONE__)) + // Always expand to fit the screen in PocketPC or SmartPhone + wxSize sz(wxDefaultSize); + wxUnusedVar(size); +#else // other (including normal desktop) Windows + wxSize sz(size); +#endif + + return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags); } bool wxTopLevelWindowMSW::Create(wxWindow *parent, @@ -440,7 +454,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, SetName(name); - m_windowId = id == -1 ? NewControlId() : id; + m_windowId = id == wxID_ANY ? NewControlId() : id; wxTopLevelWindows.Append(this); @@ -498,7 +512,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, // fix we have if ( ret ) { - SendMessage + ::SendMessage ( GetHwnd(), WM_UPDATEUISTATE, @@ -507,14 +521,23 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, ); } + // Native look is full screen window on Smartphones and Standard SDK +#if defined(__WXWINCE__) + if ( style & wxMAXIMIZE ) + { + this->Maximize(); + } +#endif + +#if defined(__SMARTPHONE__) && defined(__WXWINCE__) + SetRightMenu(); // to nothing for initialization +#endif + return ret; } wxTopLevelWindowMSW::~wxTopLevelWindowMSW() { - if ( wxModelessWindows.Find(this) ) - wxModelessWindows.DeleteObject(this); - // 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 @@ -544,7 +567,7 @@ bool wxTopLevelWindowMSW::Show(bool show) { // don't use wxWindow version as we want to call DoShowWindow() ourselves if ( !wxWindowBase::Show(show) ) - return FALSE; + return false; int nShowCmd; if ( show ) @@ -554,7 +577,12 @@ bool wxTopLevelWindowMSW::Show(bool show) // show and maximize nShowCmd = SW_MAXIMIZE; - m_maximizeOnShow = FALSE; + // This is necessary, or no window appears +#ifdef __WINCE_STANDARDSDK__ + DoShowWindow(SW_SHOW); +#endif + + m_maximizeOnShow = false; } else // just show { @@ -571,11 +599,18 @@ bool wxTopLevelWindowMSW::Show(bool show) DoShowWindow(nShowCmd); +#if defined(__WXWINCE__) && (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)) + // Addornments have to be added when the frame is the correct size + wxFrame* frame = wxDynamicCast(this, wxFrame); + if (frame && frame->GetMenuBar()) + frame->GetMenuBar()->AddAdornments(GetWindowStyleFlag()); +#endif + if ( show ) { ::BringWindowToTop(GetHwnd()); - wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId); + wxActivateEvent event(wxEVT_ACTIVATE, true, m_windowId); event.SetEventObject( this ); GetEventHandler()->ProcessEvent(event); } @@ -590,7 +625,7 @@ bool wxTopLevelWindowMSW::Show(bool show) } } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -615,7 +650,7 @@ void wxTopLevelWindowMSW::Maximize(bool maximize) bool wxTopLevelWindowMSW::IsMaximized() const { #ifdef __WXWINCE__ - return FALSE; + return false; #else return ::IsZoomed(GetHwnd()) != 0; #endif @@ -629,7 +664,7 @@ void wxTopLevelWindowMSW::Iconize(bool iconize) bool wxTopLevelWindowMSW::IsIconized() const { #ifdef __WXWINCE__ - return FALSE; + return false; #else // also update the current state ((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0; @@ -652,7 +687,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) if ( show == IsFullScreen() ) { // nothing to do - return TRUE; + return true; } m_fsIsShowing = show; @@ -733,7 +768,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) rect.x, rect.y, rect.width, rect.height, flags); -#if defined(__WXWINCE__) && _WIN32_WCE < 400 +#if !defined(__HANDHELDPC__) && (defined(__WXWINCE__) && (_WIN32_WCE < 400)) ::SHFullScreen(GetHwnd(), SHFS_HIDETASKBAR | SHFS_HIDESIPBUTTON); #endif @@ -743,7 +778,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) } else // stop showing full screen { -#if defined(__WXWINCE__) && _WIN32_WCE < 400 +#if !defined(__HANDHELDPC__) && (defined(__WXWINCE__) && (_WIN32_WCE < 400)) ::SHFullScreen(GetHwnd(), SHFS_SHOWTASKBAR | SHFS_SHOWSIPBUTTON); #endif Maximize(m_fsIsMaximized); @@ -752,7 +787,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style) m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -805,24 +840,25 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable) { wxLogLastError(_T("EnableMenuItem(SC_CLOSE)")); - return FALSE; + return false; } - +#ifndef __WXWINCE__ // update appearance immediately if ( !::DrawMenuBar(GetHwnd()) ) { wxLogLastError(_T("DrawMenuBar")); } +#endif #endif // !__WXMICROWIN__ - return TRUE; + return true; } #ifndef __WXWINCE__ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region) { - wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE, + 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 @@ -832,9 +868,9 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region) if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0) { wxLogLastError(_T("SetWindowRgn")); - return FALSE; + return false; } - return TRUE; + return true; } // Windows takes ownership of the region, so @@ -859,13 +895,60 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region) if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0) { wxLogLastError(_T("SetWindowRgn")); - return FALSE; + return false; } - return TRUE; + return true; } #endif // !__WXWINCE__ +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)) + // available in the headers, check if it is supported by the system + typedef BOOL (WINAPI *FlashWindowEx_t)(FLASHWINFO *pfwi); + FlashWindowEx_t s_pfnFlashWindowEx = NULL; + if ( !s_pfnFlashWindowEx ) + { + wxDynamicLibrary dllUser32(_T("user32.dll")); + s_pfnFlashWindowEx = (FlashWindowEx_t) + dllUser32.GetSymbol(_T("FlashWindowEx")); + + // we can safely unload user32.dll here, it's goign to remain loaded as + // long as the program is running anyhow + } + + if ( s_pfnFlashWindowEx ) + { + WinStruct fwi; + fwi.hwnd = GetHwnd(); + fwi.dwFlags = FLASHW_ALL; + if ( flags & wxUSER_ATTENTION_INFO ) + { + // just flash a few times + fwi.uCount = 3; + } + else // wxUSER_ATTENTION_ERROR + { + // flash until the user notices it + fwi.dwFlags |= FLASHW_TIMERNOFG; + } + + s_pfnFlashWindowEx(&fwi); + } + else // FlashWindowEx() not available +#endif // FlashWindowEx() defined + { + wxUnusedVar(flags); +#ifndef __WXWINCE__ + ::FlashWindow(GetHwnd(), TRUE); +#endif // __WXWINCE__ + } +} + // ---------------------------------------------------------------------------- // wxTopLevelWindow event handling // ---------------------------------------------------------------------------- @@ -920,36 +1003,46 @@ void wxTopLevelWindowMSW::OnActivate(wxActivateEvent& event) } } -// the DialogProc for all wxWindows dialogs +// the DialogProc for all wxWidgets dialogs LONG APIENTRY _EXPORT wxDlgProc(HWND hDlg, UINT message, WPARAM WXUNUSED(wParam), LPARAM WXUNUSED(lParam)) { - switch ( message ) + if ( message == WM_INITDIALOG ) { - case WM_INITDIALOG: - // for this message, 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 from here as well, so fall through - // Standard SDK doesn't have aygshell.dll: see include/wx/msw/wince/libraries.h -#if defined(__WXWINCE__) && !defined(WCE_PLATFORM_STANDARDSDK) - { - SHINITDLGINFO shidi; - shidi.dwMask = SHIDIM_FLAGS; - shidi.dwFlags = SHIDIF_DONEBUTTON | - SHIDIF_SIZEDLGFULLSCREEN; - shidi.hDlg = hDlg; - SHInitDialog( &shidi ); - } + // 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 +#if defined(__WXWINCE__) && !defined(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__) + SHINITDLGINFO shidi; + shidi.dwMask = SHIDIM_FLAGS; + shidi.dwFlags = SHIDIF_SIZEDLGFULLSCREEN +#ifndef __SMARTPHONE__ + | SHIDIF_DONEBUTTON +#endif + ; + shidi.hDlg = hDlg; + SHInitDialog( &shidi ); +#else // no SHInitDialog() + wxUnusedVar(hDlg); #endif - - default: - // for all the other ones, FALSE means that we didn't process the - // message - 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; } // ============================================================================ @@ -965,7 +1058,7 @@ bool wxTLWHiddenParentModule::OnInit() ms_hwnd = NULL; ms_className = NULL; - return TRUE; + return true; } void wxTLWHiddenParentModule::OnExit()