#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 <ole2.h>
#include <shellapi.h>
// 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 <aygshell.h>
#endif
#include "wx/msw/wince/missing.h"
#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__
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
+#ifdef __POCKETPC__
+ // A dummy menubar for dialogs
+ m_menuBarHWND = 0;
+#endif
}
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;
msflags |= WS_POPUP;
#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) )
}
//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;
wxLogSysError(wxT("Can't create dialog using memory template"));
- return FALSE;
+ return false;
}
WXDWORD exflags;
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 )
}
}
}
-#endif // __WIN95__
+#endif
// move the dialog to its initial position without forcing repainting
int x, y, w, h;
y = (sizeDpy.y - h) / 2;
}
-#if !defined(__WXWINCE__) || defined(WCE_PLATFORM_STANDARDSDK)
+#if !defined(__WXWINCE__) || defined(__WINCE_STANDARDSDK__)
if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
{
wxLogLastError(wxT("MoveWindow"));
::SetWindowText(GetHwnd(), title);
}
+#ifdef __POCKETPC__
+ // Create an empty menubar so that we don't see the menubar underneath
+ SHMENUBARINFO mbi;
+
+ memset (&mbi, 0, sizeof (SHMENUBARINFO));
+ mbi.cbSize = sizeof (SHMENUBARINFO);
+ mbi.hwndParent = (HWND) GetParent()->GetHWND();
+ mbi.nToolBarId = 5000;
+ mbi.nBmpId = 0;
+ mbi.cBmpImages = 0;
+ mbi.dwFlags = 0 ; // SHCMBF_EMPTYBAR;
+ mbi.hInstRes = wxGetInstance();
+
+ if (!SHCreateMenuBar(&mbi))
+ {
+ wxFAIL_MSG( _T("SHCreateMenuBar failed") );
+ }
+
+ m_menuBarHWND = (WXHWND) mbi.hwndMB;
+#endif
+
SubclassWin(m_hWnd);
+
+#ifdef __SMARTPHONE__
+ // Work around title non-display glitch
+ Show(false);
+#endif
- return TRUE;
+ return true;
#endif // __WXMICROWIN__/!__WXMICROWIN__
}
WXDWORD exflags;
WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
-#if (defined(_WIN32_WCE) && _WIN32_WCE < 400) || \
- defined(WIN32_PLATFORM_PSPC) || \
- defined(__SMARTPHONE__)
- // Always expand to fit the screen in PocketPC or SmartPhone
- wxSize sz(wxDefaultSize);
+#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);
+ wxSize sz(size);
#endif
- return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
+ bool result = MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
+
+#ifdef __SMARTPHONE__
+ // Work around title non-display glitch
+ Show(false);
+#endif
+ return result;
}
bool wxTopLevelWindowMSW::Create(wxWindow *parent,
SetName(name);
- m_windowId = id == -1 ? NewControlId() : id;
+ m_windowId = id == wxID_ANY ? NewControlId() : id;
wxTopLevelWindows.Append(this);
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
// fix we have
if ( ret )
{
- SendMessage
+ ::SendMessage
(
GetHwnd(),
WM_UPDATEUISTATE,
);
}
- // Native look is full screen window on Smartphones
-#ifdef __SMARTPHONE__
+ // Native look is full screen window on Smartphones and Standard SDK.
+ // TODO: check that we need this (if we're passing default values to ctor).
+ // Also check that there really is a difference between PocketPC and Smartphone in this regard.
+#if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__WINCE_STANDARDSDK__))
if ( style & wxMAXIMIZE )
- Maximize();
+ {
+ this->Maximize();
+ }
+#endif
+
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+ SetRightMenu(); // to nothing for initialization
#endif
return ret;
wxTopLevelWindowMSW::~wxTopLevelWindowMSW()
{
+#ifdef __POCKETPC__
+ // Destroy the dummy menubar for dialogs
+ if (m_menuBarHWND)
+ {
+ ::DestroyWindow((HWND) m_menuBarHWND);
+ m_menuBarHWND = 0;
+ }
+#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
{
// don't use wxWindow version as we want to call DoShowWindow() ourselves
if ( !wxWindowBase::Show(show) )
- return FALSE;
+ return false;
int nShowCmd;
if ( show )
// show and maximize
nShowCmd = SW_MAXIMIZE;
- m_maximizeOnShow = FALSE;
+ // This is necessary, or no window appears
+#if defined( __WINCE_STANDARDSDK__) || defined(__SMARTPHONE__)
+ DoShowWindow(SW_SHOW);
+#endif
+
+ m_maximizeOnShow = false;
}
else // just 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);
}
}
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
bool wxTopLevelWindowMSW::IsMaximized() const
{
#ifdef __WXWINCE__
- return FALSE;
+ return false;
#else
return ::IsZoomed(GetHwnd()) != 0;
#endif
bool wxTopLevelWindowMSW::IsIconized() const
{
#ifdef __WXWINCE__
- return FALSE;
+ return false;
#else
// also update the current state
((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0;
if ( show == IsFullScreen() )
{
// nothing to do
- return TRUE;
+ return true;
}
m_fsIsShowing = show;
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
}
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);
m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
{
wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
- return FALSE;
+ return false;
}
#ifndef __WXWINCE__
// update appearance immediately
#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
if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0)
{
wxLogLastError(_T("SetWindowRgn"));
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
// Windows takes ownership of the region, so
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<FLASHWINFO> 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
// ----------------------------------------------------------------------------
// 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...
-
+ // 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(WCE_PLATFORM_STANDARDSDK)
+#if defined(__WXWINCE__) && !defined(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__)
SHINITDLGINFO shidi;
shidi.dwMask = SHIDIM_FLAGS;
- shidi.dwFlags = SHIDIF_DONEBUTTON |
- SHIDIF_SIZEDLGFULLSCREEN;
+ shidi.dwFlags = SHIDIF_SIZEDLG // take account of the SIP or menubar
+#ifndef __SMARTPHONE__
+ | SHIDIF_DONEBUTTON
+#endif
+ ;
shidi.hDlg = hDlg;
SHInitDialog( &shidi );
#else // no SHInitDialog()
ms_hwnd = NULL;
ms_className = NULL;
- return TRUE;
+ return true;
}
void wxTLWHiddenParentModule::OnExit()
projects / wxWidgets.git / blobdiff