(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
*exflags |= WS_EX_DLGMODALFRAME;
else if ( !(style & wxBORDER_NONE) )
msflags |= WS_BORDER;
+#ifndef __POCKETPC__
else
msflags |= WS_POPUP;
+#endif
#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;
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__
wxSize sz(size);
#endif
- return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
+ bool result = MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
+
+ return result;
}
bool wxTopLevelWindowMSW::Create(wxWindow *parent,
// all dialogs are popups
dlgTemplate->style |= WS_POPUP;
+#ifndef __WXWINCE__
// 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
);
}
- // Native look is full screen window on Smartphones and Standard SDK
-#if defined(__WXWINCE__)
+ // 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 )
{
this->Maximize();
nShowCmd = SW_MAXIMIZE;
// This is necessary, or no window appears
-#ifdef __WINCE_STANDARDSDK__
+#if defined( __WINCE_STANDARDSDK__) || defined(__SMARTPHONE__)
DoShowWindow(SW_SHOW);
#endif
// 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
+
+ // we don't know which display we're on yet so use the default one
+ SetSize(wxGetClientDisplayRect().GetSize());
}
}
#ifdef __WXWINCE__
return false;
#else
- return ::IsZoomed(GetHwnd()) != 0;
+ return m_maximizeOnShow || ::IsZoomed(GetHwnd()) != 0;
#endif
}
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);
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))
+ // 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
}
// 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(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__)
SHINITDLGINFO shidi;
shidi.dwMask = SHIDIM_FLAGS;
- shidi.dwFlags = SHIDIF_SIZEDLGFULLSCREEN
+ shidi.dwFlags = SHIDIF_SIZEDLG // take account of the SIP or menubar
#ifndef __SMARTPHONE__
| SHIDIF_DONEBUTTON
#endif
projects / wxWidgets.git / blobdiff