Patch from OSAF that maintains radio button selection if Realize is recalled.

[wxWidgets.git] / src / msw / toplevel.cpp

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 2f50475dcd606e21d4f03c77d1fcfe2119f35d2d..ac97ecbbefb13c51d08f519ffc8260065df1aaa9 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -40,6 +40,7 @@
 #endif //WX_PRECOMP
 
 #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 "wx/msw/private.h"
 #if defined(__WXWINCE__) && !defined(__HANDHELDPC__)


@@ -71,8 +72,8 @@
 
 #ifdef __WXMICROWIN__
 
 
 #ifdef __WXMICROWIN__
 

-// static inline bool IsIconic(HWND WXUNUSED(hwnd)) { return FALSE; }
-static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return FALSE; }
+// static inline bool IsIconic(HWND WXUNUSED(hwnd)) { return false; }
+static inline bool IsZoomed(HWND WXUNUSED(hwnd)) { return false; }

 
 #endif // __WXMICROWIN__
 
 
 #endif // __WXMICROWIN__
 


@@ -134,15 +135,19 @@ END_EVENT_TABLE()
 void wxTopLevelWindowMSW::Init()
 {
     m_iconized =
 void wxTopLevelWindowMSW::Init()
 {
     m_iconized =

-    m_maximizeOnShow = FALSE;
+    m_maximizeOnShow = false;

 
     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;
     m_fsOldWindowStyle = 0;
 
     // Data to save/restore when calling ShowFullScreen
     m_fsStyle = 0;
     m_fsOldWindowStyle = 0;

-    m_fsIsMaximized = FALSE;
-    m_fsIsShowing = FALSE;
+    m_fsIsMaximized = false;
+    m_fsIsShowing = false;

 
     m_winLastFocused = (wxWindow *)NULL;
 
     m_winLastFocused = (wxWindow *)NULL;

+
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    m_MenuBarHWND = 0;
+#endif

 }
 
 WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
 }
 
 WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const


@@ -154,22 +159,21 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
                         (style & ~wxBORDER_MASK) | wxBORDER_NONE, exflags
                       ) & ~WS_CHILD & ~WS_VISIBLE;
 
                         (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;
     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
 #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__
+#if !(defined(__SMARTPHONE__) && defined(__WXWINCE__))

     // border and caption styles
     if ( style & wxRESIZE_BORDER )
         msflags |= WS_THICKFRAME;
     // border and caption styles
     if ( style & wxRESIZE_BORDER )
         msflags |= WS_THICKFRAME;


@@ -177,35 +181,48 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         *exflags |= WS_EX_DLGMODALFRAME;
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;
         *exflags |= WS_EX_DLGMODALFRAME;
     else if ( !(style & wxBORDER_NONE) )
         msflags |= WS_BORDER;

+#ifndef __POCKETPC__

     else
         msflags |= WS_POPUP;
     else
         msflags |= WS_POPUP;

+#endif

 #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
     // 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__
     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;
 
     // 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;
     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;
 
     // 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;
     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) )
 
     // Keep this here because it saves recoding this function in wxTinyFrame
     if ( style & (wxTINY_CAPTION_VERT | wxTINY_CAPTION_HORIZ) )


@@ -245,13 +262,13 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
             }
             //else: nothing to do [here]
         }
             }
             //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;
 #endif // !__WXWINCE__
 
         if ( style & wxSTAY_ON_TOP )
             *exflags |= WS_EX_TOPMOST;

-
-        if ( GetExtraStyle() & wxFRAME_EX_CONTEXTHELP )
-            *exflags |= WS_EX_CONTEXTHELP;

     }
 
     return msflags;
     }
 
     return msflags;


@@ -338,7 +355,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
 
         wxLogSysError(wxT("Can't create dialog using memory template"));
 
 
         wxLogSysError(wxT("Can't create dialog using memory template"));
 

-        return FALSE;
+        return false;

     }
 
     WXDWORD exflags;
     }
 
     WXDWORD exflags;


@@ -356,7 +373,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
                        SWP_NOACTIVATE);
     }
 
                        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 )
     // 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 )


@@ -373,7 +390,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
             }
         }
     }
             }
         }
     }

-#endif // __WIN95__
+#endif

 
     // move the dialog to its initial position without forcing repainting
     int x, y, w, h;
 
     // move the dialog to its initial position without forcing repainting
     int x, y, w, h;


@@ -401,8 +418,13 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
     }
 
     SubclassWin(m_hWnd);
     }
 
     SubclassWin(m_hWnd);

+    
+#ifdef __SMARTPHONE__
+    // Work around title non-display glitch
+    Show(false);
+#endif    

 
 

-    return TRUE;
+    return true;

 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 
 #endif // __WXMICROWIN__/!__WXMICROWIN__
 }
 


@@ -416,13 +438,20 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
 #if !defined(__HANDHELDPC__) && ((defined(_WIN32_WCE) && _WIN32_WCE < 400) || \
     defined(__POCKETPC__) || \
     defined(__SMARTPHONE__))
 #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);
+    // Always expand to fit the screen in PocketPC or SmartPhone
+    wxSize sz(wxDefaultSize);
+    wxUnusedVar(size);

 #else // other (including normal desktop) Windows
 #else // other (including normal desktop) Windows

-       wxSize sz(size);
+    wxSize sz(size);

 #endif
 
 #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,
 }
 
 bool wxTopLevelWindowMSW::Create(wxWindow *parent,


@@ -448,7 +477,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
 
     SetName(name);
 
 
     SetName(name);
 

-    m_windowId = id == -1 ? NewControlId() : id;
+    m_windowId = id == wxID_ANY ? NewControlId() : id;

 
     wxTopLevelWindows.Append(this);
 
 
     wxTopLevelWindows.Append(this);
 


@@ -481,9 +510,11 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         // all dialogs are popups
         dlgTemplate->style |= WS_POPUP;
 
         // 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;
         // 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 = CreateDialog(dlgTemplate, title, pos, sizeReal);
         free(dlgTemplate);


@@ -493,10 +524,12 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         ret = CreateFrame(title, pos, sizeReal);
     }
 
         ret = CreateFrame(title, pos, sizeReal);
     }
 

+#ifndef __WXWINCE__

     if ( ret && !(GetWindowStyleFlag() & wxCLOSE_BOX) )
     {
         EnableCloseButton(false);
     }
     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
 
     // for some reason we need to manually send ourselves this message as
     // otherwise the mnemonics are always shown -- even if they're configured


@@ -506,7 +539,7 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
     // fix we have
     if ( ret )
     {
     // fix we have
     if ( ret )
     {

-        SendMessage
+        ::SendMessage

         (
             GetHwnd(),
             WM_UPDATEUISTATE,
         (
             GetHwnd(),
             WM_UPDATEUISTATE,


@@ -515,12 +548,18 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
         );
     }
 
         );
     }
 

-       // 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 )
     if ( style & wxMAXIMIZE )

-       {
-           this->Maximize();
-       }
+    {
+        this->Maximize();
+    }
+#endif
+
+#if defined(__SMARTPHONE__) && defined(__WXWINCE__)
+    SetRightMenu(); // to nothing for initialization

 #endif
 
     return ret;
 #endif
 
     return ret;


@@ -557,7 +596,7 @@ bool wxTopLevelWindowMSW::Show(bool show)
 {
     // don't use wxWindow version as we want to call DoShowWindow() ourselves
     if ( !wxWindowBase::Show(show) )
 {
     // don't use wxWindow version as we want to call DoShowWindow() ourselves
     if ( !wxWindowBase::Show(show) )

-        return FALSE;
+        return false;

 
     int nShowCmd;
     if ( show )
 
     int nShowCmd;
     if ( show )


@@ -567,12 +606,12 @@ bool wxTopLevelWindowMSW::Show(bool show)
             // show and maximize
             nShowCmd = SW_MAXIMIZE;
 
             // show and maximize
             nShowCmd = SW_MAXIMIZE;
 

-                       // This is necessary, or no window appears
-#ifdef __WINCE_STANDARDSDK__
-                       DoShowWindow(SW_SHOW);
+            // This is necessary, or no window appears
+#if defined( __WINCE_STANDARDSDK__) || defined(__SMARTPHONE__)
+            DoShowWindow(SW_SHOW);

 #endif
 
 #endif
 

-            m_maximizeOnShow = FALSE;
+            m_maximizeOnShow = false;

         }
         else // just show
         {
         }
         else // just show
         {


@@ -600,7 +639,7 @@ bool wxTopLevelWindowMSW::Show(bool show)
     {
         ::BringWindowToTop(GetHwnd());
 
     {
         ::BringWindowToTop(GetHwnd());
 

-        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_windowId);
+        wxActivateEvent event(wxEVT_ACTIVATE, true, m_windowId);

         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent(event);
     }
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent(event);
     }


@@ -615,7 +654,7 @@ bool wxTopLevelWindowMSW::Show(bool show)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -640,7 +679,7 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
 #ifdef __WXWINCE__
 bool wxTopLevelWindowMSW::IsMaximized() const
 {
 #ifdef __WXWINCE__

-    return FALSE;
+    return false;

 #else
     return ::IsZoomed(GetHwnd()) != 0;
 #endif
 #else
     return ::IsZoomed(GetHwnd()) != 0;
 #endif


@@ -654,7 +693,7 @@ void wxTopLevelWindowMSW::Iconize(bool iconize)
 bool wxTopLevelWindowMSW::IsIconized() const
 {
 #ifdef __WXWINCE__
 bool wxTopLevelWindowMSW::IsIconized() const
 {
 #ifdef __WXWINCE__

-    return FALSE;
+    return false;

 #else
     // also update the current state
     ((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0;
 #else
     // also update the current state
     ((wxTopLevelWindowMSW *)this)->m_iconized = ::IsIconic(GetHwnd()) != 0;


@@ -677,7 +716,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
     if ( show == IsFullScreen() )
     {
         // nothing to do
     if ( show == IsFullScreen() )
     {
         // nothing to do

-        return TRUE;
+        return true;

     }
 
     m_fsIsShowing = show;
     }
 
     m_fsIsShowing = show;


@@ -777,7 +816,7 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
             m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
     }
 
             m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
     }
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -830,7 +869,7 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
     {
         wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
 
     {
         wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
 

-        return FALSE;
+        return false;

     }
 #ifndef __WXWINCE__
     // update appearance immediately
     }
 #ifndef __WXWINCE__
     // update appearance immediately


@@ -841,14 +880,14 @@ bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
 #endif
 #endif // !__WXMICROWIN__
 
 #endif
 #endif // !__WXMICROWIN__
 

-    return TRUE;
+    return true;

 }
 
 #ifndef __WXWINCE__
 
 bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
 {
 }
 
 #ifndef __WXWINCE__
 
 bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
 {

-    wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), FALSE,
+    wxCHECK_MSG( HasFlag(wxFRAME_SHAPED), false,

                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
     // The empty region signifies that the shape should be removed from the
                  _T("Shaped windows must be created with the wxFRAME_SHAPED style."));
 
     // The empty region signifies that the shape should be removed from the


@@ -858,9 +897,9 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
         if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0)
         {
             wxLogLastError(_T("SetWindowRgn"));
         if (::SetWindowRgn(GetHwnd(), NULL, TRUE) == 0)
         {
             wxLogLastError(_T("SetWindowRgn"));

-            return FALSE;
+            return false;

         }
         }

-        return TRUE;
+        return true;

     }
 
     // Windows takes ownership of the region, so
     }
 
     // Windows takes ownership of the region, so


@@ -885,13 +924,60 @@ bool wxTopLevelWindowMSW::SetShape(const wxRegion& region)
     if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0)
     {
         wxLogLastError(_T("SetWindowRgn"));
     if (::SetWindowRgn(GetHwnd(), hrgn, TRUE) == 0)
     {
         wxLogLastError(_T("SetWindowRgn"));

-        return FALSE;
+        return false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 #endif // !__WXWINCE__
 
 }
 
 #endif // !__WXWINCE__
 

+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))
+    // available in the headers, check if it is supported by the system
+    typedef BOOL (WINAPI *FlashWindowEx_t)(FLASHWINFO *pfwi);
+    FlashWindowEx_t s_pfnFlashWindowEx = NULL;
+    if ( !s_pfnFlashWindowEx )
+    {
+        wxDynamicLibrary dllUser32(_T("user32.dll"));
+        s_pfnFlashWindowEx = (FlashWindowEx_t)
+                                dllUser32.GetSymbol(_T("FlashWindowEx"));
+
+        // we can safely unload user32.dll here, it's goign to remain loaded as
+        // long as the program is running anyhow
+    }
+
+    if ( s_pfnFlashWindowEx )
+    {
+        WinStruct<FLASHWINFO> fwi;
+        fwi.hwnd = GetHwnd();
+        fwi.dwFlags = FLASHW_ALL;
+        if ( flags & wxUSER_ATTENTION_INFO )
+        {
+            // just flash a few times
+            fwi.uCount = 3;
+        }
+        else // wxUSER_ATTENTION_ERROR
+        {
+            // flash until the user notices it
+            fwi.dwFlags |= FLASHW_TIMERNOFG;
+        }
+
+        s_pfnFlashWindowEx(&fwi);
+    }
+    else // FlashWindowEx() not available
+#endif // FlashWindowEx() defined
+    {
+        wxUnusedVar(flags);
+#ifndef __WXWINCE__
+        ::FlashWindow(GetHwnd(), TRUE);
+#endif // __WXWINCE__
+    }
+}
+

 // ----------------------------------------------------------------------------
 // wxTopLevelWindow event handling
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindow event handling
 // ----------------------------------------------------------------------------


@@ -958,17 +1044,19 @@ wxDlgProc(HWND hDlg,
         // under CE, add a "Ok" button in the dialog title bar and make it full
         // screen
         //
         // 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;
         // 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_DONEBUTTON |
-                        SHIDIF_SIZEDLGFULLSCREEN;
+        shidi.dwFlags = SHIDIF_SIZEDLG // take account of the SIP or menubar
+#ifndef __SMARTPHONE__
+                        | SHIDIF_DONEBUTTON
+#endif
+                        ;

         shidi.hDlg = hDlg;
         SHInitDialog( &shidi );
 #else // no SHInitDialog()
         shidi.hDlg = hDlg;
         SHInitDialog( &shidi );
 #else // no SHInitDialog()


@@ -998,7 +1086,7 @@ bool wxTLWHiddenParentModule::OnInit()
     ms_hwnd = NULL;
     ms_className = NULL;
 
     ms_hwnd = NULL;
     ms_className = NULL;
 

-    return TRUE;
+    return true;

 }
 
 void wxTLWHiddenParentModule::OnExit()
 }
 
 void wxTLWHiddenParentModule::OnExit()