///////////////////////////////////////////////////////////////////////////////
-// Name: msw/toplevel.cpp
+// Name: src/msw/toplevel.cpp
// Purpose: implements wxTopLevelWindow for MSW
// Author: Vadim Zeitlin
// Modified by:
// 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"
#pragma hdrstop
#endif
+#include "wx/toplevel.h"
+
#ifndef WX_PRECOMP
#include "wx/app.h"
- #include "wx/toplevel.h"
#include "wx/dialog.h"
#include "wx/string.h"
#include "wx/log.h"
#include "wx/intl.h"
#include "wx/frame.h"
#include "wx/containr.h" // wxSetFocusToChild()
+ #include "wx/module.h"
#endif //WX_PRECOMP
-#include "wx/module.h"
#include "wx/dynlib.h"
#include "wx/msw/private.h"
#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(__WINCE_STANDARDSDK__)
- #include <aygshell.h>
- #endif
-#include "wx/msw/wince/missing.h"
+ #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(__WINCE_STANDARDSDK__)
+ #include <aygshell.h>
+ #endif
#endif
-#include "wx/msw/missing.h"
#include "wx/msw/winundef.h"
+#include "wx/msw/missing.h"
#include "wx/display.h"
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
(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__
// border and caption styles
- if ( style & wxRESIZE_BORDER )
+ if ( ( style & wxRESIZE_BORDER ) && !IsAlwaysMaximized())
msflags |= WS_THICKFRAME;
else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) )
*exflags |= WS_EX_DLGMODALFRAME;
else if ( !(style & wxBORDER_NONE) )
msflags |= WS_BORDER;
+#ifndef __POCKETPC__
else
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;
+
+ // WS_EX_CONTEXTHELP is incompatible with WS_MINIMIZEBOX and WS_MAXIMIZEBOX
+ // and is ignored if we specify both of them, but chances are that if we
+ // use wxWS_EX_CONTEXTHELP, we really do want to have the context help
+ // button while wxMINIMIZE/wxMAXIMIZE are included by default, so the help
+ // takes precedence
+ if ( !(GetExtraStyle() & wxWS_EX_CONTEXTHELP) )
+ {
+ 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 ( style & wxMAXIMIZE )
msflags |= WS_MAXIMIZE;
}
//else: nothing to do [here]
}
+
+ if ( GetExtraStyle() & wxWS_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;
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,
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;
SubclassWin(m_hWnd);
+#ifdef __SMARTPHONE__
+ // Work around title non-display glitch
+ Show(false);
+#endif
+
return true;
#endif // __WXMICROWIN__/!__WXMICROWIN__
}
WXDWORD exflags;
WXDWORD flags = MSWGetCreateWindowFlags(&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);
+ const wxSize sz = IsAlwaysMaximized() ? wxDefaultSize : size;
+
+#ifndef __WXWINCE__
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ exflags |= WS_EX_LAYOUTRTL;
#endif
return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
// all dialogs are popups
dlgTemplate->style |= WS_POPUP;
+#ifndef __WXWINCE__
+ if ( wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft )
+ {
+ dlgTemplate->dwExtendedStyle |= WS_EX_LAYOUTRTL;
+ }
+
// 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);
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__)
- if ( style & wxMAXIMIZE )
+ // 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 ) || IsAlwaysMaximized() )
{
this->Maximize();
}
#endif
-#ifdef __SMARTPHONE__
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
SetRightMenu(); // to nothing for initialization
#endif
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
nShowCmd = SW_MAXIMIZE;
// This is necessary, or no window appears
-#ifdef __WINCE_STANDARDSDK__
+#if defined( __WINCE_STANDARDSDK__) || defined(__SMARTPHONE__)
DoShowWindow(SW_SHOW);
#endif
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);
- }
- }
+ // we only set pending size if we're maximized before being shown, now that
+ // we're shown we don't need it any more (it is reset in size event handler
+ // for child windows but we have to do it ourselves for this parent window)
+ m_pendingSize = wxDefaultSize;
return true;
}
}
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 )
+ {
+ // we must only change pending size here, and not call SetSize()
+ // because otherwise Windows would think that this (full screen)
+ // size is the natural size for the frame and so would use it when
+ // the user clicks on "restore" title bar button instead of the
+ // correct initial frame size
+ //
+ // NB: unfortunately we don't know which display we're on yet so we
+ // have to use the default one
+ m_pendingSize = 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;
-#else
- return ::IsZoomed(GetHwnd()) != 0;
+ return IsAlwaysMaximized() ||
+#if !defined(__SMARTPHONE__) && !defined(__POCKETPC__)
+ (::IsZoomed(GetHwnd()) != 0) ||
#endif
+ m_maximizeOnShow;
}
void wxTopLevelWindowMSW::Iconize(bool iconize)
#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
}
DoShowWindow(SW_RESTORE);
}
+void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
+{
+ if ( dir == wxLayout_Default )
+ dir = wxTheApp->GetLayoutDirection();
+
+ if ( dir != wxLayout_Default )
+ wxTopLevelWindowBase::SetLayoutDirection(dir);
+}
+
+// ----------------------------------------------------------------------------
+// wxTopLevelWindowMSW geometry
+// ----------------------------------------------------------------------------
+
+#ifndef __WXWINCE__
+
+void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
+{
+ if ( IsIconized() )
+ {
+ WINDOWPLACEMENT wp;
+ wp.length = sizeof(WINDOWPLACEMENT);
+ if ( ::GetWindowPlacement(GetHwnd(), &wp) )
+ {
+ RECT& rc = wp.rcNormalPosition;
+
+ // the position returned by GetWindowPlacement() is in workspace
+ // coordinates except for windows with WS_EX_TOOLWINDOW style
+ if ( !HasFlag(wxFRAME_TOOL_WINDOW) )
+ {
+ // we must use the correct display for the translation as the
+ // task bar might be shown on one display but not the other one
+ int n = wxDisplay::GetFromWindow(this);
+ wxDisplay dpy(n == wxNOT_FOUND ? 0 : n);
+ const wxPoint ptOfs = dpy.GetClientArea().GetPosition() -
+ dpy.GetGeometry().GetPosition();
+
+ rc.left += ptOfs.x;
+ rc.top += ptOfs.y;
+ }
+
+ if ( x )
+ *x = rc.left;
+ if ( y )
+ *y = rc.top;
+
+ return;
+ }
+
+ wxLogLastError(_T("GetWindowPlacement"));
+ }
+ //else: normal case
+
+ wxTopLevelWindowBase::DoGetPosition(x, y);
+}
+
+void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
+{
+ if ( IsIconized() )
+ {
+ WINDOWPLACEMENT wp;
+ wp.length = sizeof(WINDOWPLACEMENT);
+ if ( ::GetWindowPlacement(GetHwnd(), &wp) )
+ {
+ const RECT& rc = wp.rcNormalPosition;
+
+ if ( width )
+ *width = rc.right - rc.left;
+ if ( height )
+ *height = rc.bottom - rc.top;
+
+ return;
+ }
+
+ wxLogLastError(_T("GetWindowPlacement"));
+ }
+ //else: normal case
+
+ wxTopLevelWindowBase::DoGetSize(width, height);
+}
+
+#endif // __WXWINCE__
+
// ----------------------------------------------------------------------------
// wxTopLevelWindowMSW fullscreen
// ----------------------------------------------------------------------------
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);
rect.y = 0;
#endif
}
-#endif // wxUSE_DISPLAY
SetSize(rect);
// wxTopLevelWindowMSW misc
// ----------------------------------------------------------------------------
-void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon)
+void wxTopLevelWindowMSW::SetTitle( const wxString& title)
+{
+ SetLabel(title);
+}
+
+wxString wxTopLevelWindowMSW::GetTitle() const
{
- SetIcons( wxIconBundle( icon ) );
+ return GetLabel();
}
void wxTopLevelWindowMSW::SetIcons(const wxIconBundle& icons)
{
wxTopLevelWindowBase::SetIcons(icons);
-#if defined(__WIN95__) && !defined(__WXMICROWIN__)
- const wxIcon& sml = icons.GetIcon( wxSize( 16, 16 ) );
- if( sml.Ok() && sml.GetWidth() == 16 && sml.GetHeight() == 16 )
+#if !defined(__WXMICROWIN__)
+ const wxIcon& sml = icons.GetIconOfExactSize(16);
+ if( sml.Ok() )
{
::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_SMALL,
(LPARAM)GetHiconOf(sml) );
}
- const wxIcon& big = icons.GetIcon( wxSize( 32, 32 ) );
- if( big.Ok() && big.GetWidth() == 32 && big.GetHeight() == 32 )
+ const wxIcon& big = icons.GetIconOfExactSize(32);
+ if( big.Ok() )
{
::SendMessage( GetHwndOf( this ), WM_SETICON, ICON_BIG,
(LPARAM)GetHiconOf(big) );
}
-#endif // __WIN95__
+#endif // !__WXMICROWIN__
}
bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
{
#if !defined(__WXMICROWIN__)
// get system (a.k.a. window) menu
- HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */);
+ HMENU hmenu = GetSystemMenu(GetHwnd(), FALSE /* get it */);
if ( !hmenu )
{
// no system menu at all -- ok if we want to remove the close button
void wxTopLevelWindowMSW::RequestUserAttention(int flags)
{
- // check if we can use FlashWindowEx()
-#ifdef 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;
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
}
s_pfnFlashWindowEx(&fwi);
}
else // FlashWindowEx() not available
-#endif // FLASHW_STOP
+#endif // FlashWindowEx() defined
{
wxUnusedVar(flags);
-
+#ifndef __WXWINCE__
::FlashWindow(GetHwnd(), TRUE);
+#endif // __WXWINCE__
+ }
+}
+
+// ---------------------------------------------------------------------------
+
+bool wxTopLevelWindowMSW::SetTransparent(wxByte alpha)
+{
+ typedef DWORD (WINAPI *PSETLAYEREDWINDOWATTR)(HWND, DWORD, BYTE, DWORD);
+ static PSETLAYEREDWINDOWATTR pSetLayeredWindowAttributes = NULL;
+
+ if ( pSetLayeredWindowAttributes == NULL )
+ {
+ wxDynamicLibrary dllUser32(_T("user32.dll"));
+ pSetLayeredWindowAttributes = (PSETLAYEREDWINDOWATTR)
+ dllUser32.GetSymbol(wxT("SetLayeredWindowAttributes"));
+ }
+ if ( pSetLayeredWindowAttributes == NULL )
+ return false;
+
+ LONG exstyle = GetWindowLong(GetHwnd(), GWL_EXSTYLE);
+
+ // if setting alpha to fully opaque then turn off the layered style
+ if (alpha == 255)
+ {
+ SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyle & ~WS_EX_LAYERED);
+ Refresh();
+ return true;
}
+
+ // Otherwise, set the layered style if needed and set the alpha value
+ if ((exstyle & WS_EX_LAYERED) == 0 )
+ SetWindowLong(GetHwnd(), GWL_EXSTYLE, exstyle | WS_EX_LAYERED);
+
+ return pSetLayeredWindowAttributes(GetHwnd(), 0, (BYTE)alpha, LWA_ALPHA) != 0;
+}
+
+bool wxTopLevelWindowMSW::CanSetTransparent()
+{
+ // The API is available on win2k and above
+
+ static int os_type = -1;
+ static int ver_major = -1;
+
+ if (os_type == -1)
+ os_type = ::wxGetOsVersion(&ver_major);
+
+ return (os_type == wxOS_WINDOWS_NT && ver_major >= 5);
}
// ----------------------------------------------------------------------------
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;
}
return ms_hwnd;
}
-
-
projects / wxWidgets.git / blobdiff