#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
#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))
// border and caption styles
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;
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;
::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;
#endif // __WXMICROWIN__/!__WXMICROWIN__
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,
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__)
+ // 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 )
{
this->Maximize();
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
nShowCmd = SW_MAXIMIZE;
// This is necessary, or no window appears
-#ifdef __WINCE_STANDARDSDK__
+#if defined( __WINCE_STANDARDSDK__) || defined(__SMARTPHONE__)
DoShowWindow(SW_SHOW);
#endif
// 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