// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "toplevel.h"
#endif
#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/module.h"
#include "wx/msw/private.h"
-#include "wx/msw/winundef.h"
-
-#ifdef CreateDialog
-#undef CreateDialog
+#if defined(__WXWINCE__)
+ #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)
+ #include <aygshell.h>
+ #endif
+#include "wx/msw/wince/missing.h"
#endif
+#include "wx/msw/missing.h"
+#include "wx/msw/winundef.h"
+
#include "wx/display.h"
#ifndef ICON_BIG
// globals
// ----------------------------------------------------------------------------
-// list of all frames and modeless dialogs
-wxWindowList wxModelessWindows;
-
// the name of the default wxWindows class
+#ifdef __WXWINCE__
+extern wxChar *wxCanvasClassName;
+#else
extern const wxChar *wxCanvasClassName;
+#endif
// ----------------------------------------------------------------------------
// wxTLWHiddenParentModule: used to manage the hidden parent window (we need a
m_iconized =
m_maximizeOnShow = FALSE;
- // unlike (almost?) all other windows, frames are created hidden
- m_isShown = FALSE;
-
// Data to save/restore when calling ShowFullScreen
m_fsStyle = 0;
m_fsOldWindowStyle = 0;
(style & ~wxBORDER_MASK) | wxBORDER_NONE, exflags
) & ~WS_CHILD & ~WS_VISIBLE;
+#if defined(__WXWINCE__) && _WIN32_WCE < 400
+ msflags |= WS_VISIBLE;
+#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
- msflags |= WS_OVERLAPPED;
+ }
+ //else: WS_OVERLAPPED is 0 anyhow, so it is on by default
+#ifndef __SMARTPHONE__
// border and caption styles
if ( style & wxRESIZE_BORDER )
- {
-#ifndef __WXWINCE__
msflags |= WS_THICKFRAME;
-#endif
- }
+ else if ( exflags && ((style & wxBORDER_DOUBLE) || (style & wxBORDER_RAISED)) )
+ *exflags |= WS_EX_DLGMODALFRAME;
else if ( !(style & wxBORDER_NONE) )
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
+ // but shouldn't be made popups as popups can't have menus and don't look
+ // like normal windows anyhow
if ( style & wxCAPTION )
msflags |= WS_CAPTION;
+#ifndef __WXWINCE__
else
msflags |= WS_POPUP;
+#endif // !__WXWINCE__
// next translate the individual flags
if ( style & wxMINIMIZE_BOX )
msflags |= WS_MAXIMIZEBOX;
if ( style & wxSYSTEM_MENU )
msflags |= WS_SYSMENU;
-#ifndef __WXWINCE__
+
+ // 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;
-#endif
// Keep this here because it saves recoding this function in wxTinyFrame
-#if wxUSE_ITSY_BITSY && !defined(__WIN32__)
- if ( style & wxTINY_CAPTION_VERT )
- msflags |= IBS_VERTCAPTION;
- if ( style & wxTINY_CAPTION_HORIZ )
- msflags |= IBS_HORZCAPTION;
-#else
if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )
msflags |= WS_CAPTION;
-#endif
if ( exflags )
{
-#if !defined(__WIN16__)
+ // there is no taskbar under CE, so omit all this
+#ifndef __WXWINCE__
if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
{
if ( style & wxFRAME_TOOL_WINDOW )
{
// create the palette-like window
*exflags |= WS_EX_TOOLWINDOW;
+
+ // tool windows shouldn't appear on the taskbar (as documented)
+ style |= wxFRAME_NO_TASKBAR;
}
// We have to solve 2 different problems here:
// The second one is solved here by using WS_EX_APPWINDOW flag, the
// first one is dealt with in our MSWGetParent() method
// implementation
-#ifndef __WXWINCE__
if ( !(style & wxFRAME_NO_TASKBAR) && GetParent() )
{
// need to force the frame to appear in the taskbar
*exflags |= WS_EX_APPWINDOW;
}
-#endif
//else: nothing to do [here]
}
-#endif // !Win16
+#endif // !__WXWINCE__
if ( style & wxSTAY_ON_TOP )
*exflags |= WS_EX_TOPMOST;
-#ifdef __WIN32__
if ( GetExtraStyle() & wxFRAME_EX_CONTEXTHELP )
*exflags |= WS_EX_CONTEXTHELP;
-#endif // __WIN32__
}
return msflags;
if ( exflags )
{
::SetWindowLong(GetHwnd(), GWL_EXSTYLE, exflags);
- ::SetWindowPos(GetHwnd(), NULL, 0, 0, 0, 0,
+ ::SetWindowPos(GetHwnd(),
+ exflags & WS_EX_TOPMOST ? HWND_TOPMOST : 0,
+ 0, 0, 0, 0,
SWP_NOSIZE |
SWP_NOMOVE |
- SWP_NOZORDER |
+ (exflags & WS_EX_TOPMOST ? 0 : SWP_NOZORDER) |
SWP_NOACTIVATE);
}
// move the dialog to its initial position without forcing repainting
int x, y, w, h;
- if ( !MSWGetCreateWindowCoords(pos, size, x, y, w, h) )
- {
- x =
- w = (int)CW_USEDEFAULT;
- }
-
- // we can't use CW_USEDEFAULT here as we're not calling CreateWindow()
- // and passing CW_USEDEFAULT to MoveWindow() results in resizing the
- // window to (0, 0) size which breaks quite a lot of things, e.g. the
- // sizer calculation in wxSizer::Fit()
- if ( w == (int)CW_USEDEFAULT )
- {
- // the exact number doesn't matter, the dialog will be resized
- // again soon anyhow but it should be big enough to allow
- // calculation relying on "totalSize - clientSize > 0" work, i.e.
- // at least greater than the title bar height
- w =
- h = 100;
- }
+ (void)MSWGetCreateWindowCoords(pos, size, x, y, w, h);
if ( x == (int)CW_USEDEFAULT )
{
y = (sizeDpy.y - h) / 2;
}
+#ifndef __WXWINCE__
if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
{
wxLogLastError(wxT("MoveWindow"));
}
+#endif
if ( !title.empty() )
{
WXDWORD exflags;
WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
- return MSWCreate(wxCanvasClassName, title, pos, size, flags, 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);
+#else // other (including normal desktop) Windows
+ wxSize sz(size);
+#endif
+
+ return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
}
bool wxTopLevelWindowMSW::Create(wxWindow *parent,
long style,
const wxString& name)
{
- bool ret = false;
+ bool ret wxDUMMY_INITIALIZE(false);
// init our fields
Init();
+ wxSize sizeReal = size;
+ if ( !sizeReal.IsFullySpecified() )
+ {
+ sizeReal.SetDefaults(GetDefaultSize());
+ }
+
m_windowStyle = style;
SetName(name);
if ( style & (wxRESIZE_BORDER | wxCAPTION) )
dlgTemplate->style |= DS_MODALFRAME;
- ret = CreateDialog(dlgTemplate, title, pos, size);
+ ret = CreateDialog(dlgTemplate, title, pos, sizeReal);
free(dlgTemplate);
}
else // !dialog
{
- ret = CreateFrame(title, pos, size);
+ ret = CreateFrame(title, pos, sizeReal);
}
if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) )
EnableCloseButton(false);
}
+ // 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
+ if ( ret )
+ {
+ SendMessage
+ (
+ GetHwnd(),
+ WM_UPDATEUISTATE,
+ MAKEWPARAM(UIS_INITIALIZE, UISF_HIDEFOCUS | UISF_HIDEACCEL),
+ 0
+ );
+ }
+
+ // Native look is full screen window on Smartphones
+#ifdef __SMARTPHONE__
+ if ( style & wxMAXIMIZE )
+ Maximize();
+#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
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
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,
return FALSE;
}
-
+#ifndef __WXWINCE__
// update appearance immediately
if ( !::DrawMenuBar(GetHwnd()) )
{
wxLogLastError(_T("DrawMenuBar"));
}
+#endif
#endif // !__WXMICROWIN__
return TRUE;
}
+#ifndef __WXWINCE__
+
bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
{
-#ifdef __WXWINCE__
- return FALSE;
-#else
wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
_T("Shaped windows must be created with the wxFRAME_SHAPED style."));
return FALSE;
}
return TRUE;
-#endif
}
+#endif // !__WXWINCE__
+
// ----------------------------------------------------------------------------
// wxTopLevelWindow event handling
// ----------------------------------------------------------------------------
{
if ( event.GetActive() )
{
- // restore focus to the child which was last focused
+ // restore focus to the child which was last focused unless we already
+ // have it
wxLogTrace(_T("focus"), _T("wxTLW %08x activated."), (int) m_hWnd);
- wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
- : NULL;
- if ( !parent )
+ wxWindow *winFocus = FindFocus();
+ if ( !winFocus || wxGetTopLevelParent(winFocus) != this )
{
- parent = this;
- }
+ wxWindow *parent = m_winLastFocused ? m_winLastFocused->GetParent()
+ : NULL;
+ if ( !parent )
+ {
+ parent = this;
+ }
- wxSetFocusToChild(parent, &m_winLastFocused);
+ wxSetFocusToChild(parent, &m_winLastFocused);
+ }
}
else // deactivating
{
{
// let it know that it doesn't have focus any more
m_winLastFocused->HandleKillFocus((WXHWND)NULL);
- }
- // so we NULL it out if it's a child from some other frame
- wxWindow *win = m_winLastFocused;
- while ( win )
- {
- if ( win->IsTopLevel() )
+ // and don't remember it if it's a child from some other frame
+ if ( wxGetTopLevelParent(m_winLastFocused) != this )
{
- if ( win != this )
- {
- m_winLastFocused = NULL;
- }
-
- break;
+ m_winLastFocused = NULL;
}
-
- win = win->GetParent();
}
wxLogTrace(_T("focus"),
// the DialogProc for all wxWindows dialogs
LONG APIENTRY _EXPORT
-wxDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+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
-
- default:
- // for all the other ones, FALSE means that we didn't process the
- // message
- return FALSE;
+ // 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(WCE_PLATFORM_STANDARDSDK)
+ SHINITDLGINFO shidi;
+ shidi.dwMask = SHIDIM_FLAGS;
+ shidi.dwFlags = SHIDIF_DONEBUTTON |
+ SHIDIF_SIZEDLGFULLSCREEN;
+ shidi.hDlg = hDlg;
+ SHInitDialog( &shidi );
+#else // no SHInitDialog()
+ wxUnusedVar(hDlg);
+#endif
}
+
+ // 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;
}
// ============================================================================
projects / wxWidgets.git / blobdiff