#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__
// globals
// ----------------------------------------------------------------------------
-// the name of the default wxWindows class
+// the name of the default wxWidgets class
#ifdef __WXWINCE__
extern wxChar *wxCanvasClassName;
#else
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
}
//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;
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
// 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 )
wxLogSysError(wxT("Can't create dialog using memory template"));
- return FALSE;
+ return false;
}
WXDWORD exflags;
y = (sizeDpy.y - h) / 2;
}
-#ifndef __WXWINCE__
+#if !defined(__WXWINCE__) || defined(__WINCE_STANDARDSDK__)
if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
{
wxLogLastError(wxT("MoveWindow"));
SubclassWin(m_hWnd);
- 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(WIN32_PLATFORM_WFSP)
- // 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);
SetName(name);
- m_windowId = id == -1 ? NewControlId() : id;
+ m_windowId = id == wxID_ANY ? NewControlId() : id;
wxTopLevelWindows.Append(this);
// fix we have
if ( ret )
{
- SendMessage
+ ::SendMessage
(
GetHwnd(),
WM_UPDATEUISTATE,
);
}
+ // 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;
}
{
// 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
+#ifdef __WINCE_STANDARDSDK__
+ 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
// ----------------------------------------------------------------------------
}
}
-// the DialogProc for all wxWindows dialogs
+// the DialogProc for all wxWidgets dialogs
LONG APIENTRY _EXPORT
wxDlgProc(HWND hDlg,
UINT message,
// 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_SIZEDLGFULLSCREEN
+#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