#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"
-#if defined(__WXWINCE__)
+#if defined(__WXWINCE__) && !defined(__HANDHELDPC__)
#include <ole2.h>
#include <shellapi.h>
- #if _WIN32_WCE < 400
+ // 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"
// globals
// ----------------------------------------------------------------------------
-// list of all frames and modeless dialogs
-wxWindowList wxModelessWindows;
-
-// the name of the default wxWindows class
+// the name of the default wxWidgets class
+#ifdef __WXWINCE__
+extern wxChar *wxCanvasClassName;
+#else
extern const wxChar *wxCanvasClassName;
+#endif
// ----------------------------------------------------------------------------
// wxTLWHiddenParentModule: used to manage the hidden parent window (we need a
m_fsIsShowing = FALSE;
m_winLastFocused = (wxWindow *)NULL;
+
+#ifdef __SMARTPHONE__
+ 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
+ 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
{
- if (msflags & WS_BORDER)
- msflags |= WS_OVERLAPPED;
+ msflags |= WS_POPUP;
}
+ //else: WS_OVERLAPPED is 0 anyhow, so it is on by default
+#ifndef __SMARTPHONE__
// 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
+ // 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 )
if ( style & wxSYSTEM_MENU )
msflags |= WS_SYSMENU;
- // under CE these 2 styles are not defined currently
-#ifdef WS_MINIMIZE
+ // 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;
-#endif // WS_MINIMIZE
-#ifdef WS_MAXIMIZE
if ( style & wxMAXIMIZE )
msflags |= WS_MAXIMIZE;
-#endif // WS_MAXIMIZE
// Keep this here because it saves recoding this function in wxTinyFrame
if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )
if ( exflags )
{
+ // there is no taskbar under CE, so omit all this
+#if !defined(__WXWINCE__)
if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
{
if ( style & wxFRAME_TOOL_WINDOW )
style |= wxFRAME_NO_TASKBAR;
}
- // again, support for this is missing under CE
-#ifdef WS_EX_APPWINDOW
// We have to solve 2 different problems here:
//
// 1. frames with wxFRAME_NO_TASKBAR flag shouldn't appear in the
*exflags |= WS_EX_APPWINDOW;
}
//else: nothing to do [here]
-#endif // WS_EX_APPWINDOW
}
+#endif // !__WXWINCE__
if ( style & wxSTAY_ON_TOP )
*exflags |= WS_EX_TOPMOST;
y = (sizeDpy.y - h) / 2;
}
+#if !defined(__WXWINCE__) || defined(__WINCE_STANDARDSDK__)
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(__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);
+#endif
+
+ return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
}
bool wxTopLevelWindowMSW::Create(wxWindow *parent,
);
}
+ // Native look is full screen window on Smartphones and Standard SDK
+#if defined(__WXWINCE__)
+ if ( style & wxMAXIMIZE )
+ {
+ this->Maximize();
+ }
+#endif
+
+#ifdef __SMARTPHONE__
+ SetRightMenu(); // to nothing for initialization
+#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
// show and maximize
nShowCmd = SW_MAXIMIZE;
+ // 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());
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);
return FALSE;
}
-
+#ifndef __WXWINCE__
// update appearance immediately
if ( !::DrawMenuBar(GetHwnd()) )
{
wxLogLastError(_T("DrawMenuBar"));
}
+#endif
#endif // !__WXMICROWIN__
return TRUE;
}
}
-// the DialogProc for all wxWindows dialogs
+// the DialogProc for all wxWidgets dialogs
LONG APIENTRY _EXPORT
-wxDlgProc(HWND WXUNUSED(hDlg),
+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(__WINCE_STANDARDSDK__) && !defined(__HANDHELDPC__)
+ SHINITDLGINFO shidi;
+ shidi.dwMask = SHIDIM_FLAGS;
+ shidi.dwFlags = SHIDIF_SIZEDLGFULLSCREEN
+#ifndef __SMARTPHONE__
+ | SHIDIF_DONEBUTTON
+#endif
+ ;
+ 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