X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2736a5def914682896defac92891509ab691c299..6afa47d63d56094958ed4d2528bf45ad67340954:/src/msw/toplevel.cpp diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp index 16a7ee5209..2376e815e6 100644 --- a/src/msw/toplevel.cpp +++ b/src/msw/toplevel.cpp @@ -41,6 +41,16 @@ #include "wx/module.h" #include "wx/msw/private.h" + +#if defined(__WXWINCE__) + #include + #include + #if _WIN32_WCE < 400 + #include + #endif +#include "wx/msw/wince/missing.h" +#endif + #include "wx/msw/winundef.h" // This can't be undefed in winundef.h or @@ -445,7 +455,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent, long style, const wxString& name) { - bool ret = false; + bool ret wxDUMMY_INITIALIZE(false); // init our fields Init(); @@ -697,10 +707,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 +740,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,