fixed bug due to missing break in GetColourFromGTKWidget() (part of patch 1160117)

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 58438ba15f55108ba3b1e6cc825d439f15d0a354..09e60871b188c478e10252f4b87d6a0107570da1 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -148,6 +148,10 @@ void wxTopLevelWindowMSW::Init()
 #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
@@ -185,31 +189,42 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
         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) )
@@ -249,13 +264,13 @@ WXDWORD wxTopLevelWindowMSW::MSWGetStyle(long style, WXDWORD *exflags) const
             }
             //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;
@@ -360,7 +375,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
                        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 )
@@ -377,7 +392,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;
@@ -404,6 +419,27 @@ bool wxTopLevelWindowMSW::CreateDialog(const void *dlgTemplate,
         ::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__
@@ -509,10 +545,12 @@ 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
@@ -531,8 +569,10 @@ 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 )
     {
         this->Maximize();
@@ -548,6 +588,15 @@ bool wxTopLevelWindowMSW::Create(wxWindow *parent,
 
 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
@@ -1025,16 +1074,15 @@ wxDlgProc(HWND hDlg,
         // 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