changes to match listctrl.h changes (forgot to commit yesterday, sorry)

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

diff --git a/src/msw/toplevel.cpp b/src/msw/toplevel.cpp
index 8874a8d15634d733962f2ff6cd165d40cc518733..6c7b38718b045dfd99e91fbd67516772be35c4c3 100644 (file)
--- a/src/msw/toplevel.cpp
+++ b/src/msw/toplevel.cpp
@@ -152,16 +152,19 @@ long wxTopLevelWindowMSW::MSWGetCreateWindowFlags(long *exflags) const
     {
         *exflags = MakeExtendedStyle(style);
 
     {
         *exflags = MakeExtendedStyle(style);
 

-        // make all frames appear in the win9x shell taskbar unless
-        // wxFRAME_TOOL_WINDOW or wxFRAME_NO_TASKBAR is given - without giving
-        // them WS_EX_APPWINDOW style, the child (i.e. owned) frames wouldn't
-        // appear in it

 #if !defined(__WIN16__) && !defined(__SC__)
 #if !defined(__WIN16__) && !defined(__SC__)

-        if ( (style & wxFRAME_TOOL_WINDOW) || (style & wxFRAME_NO_TASKBAR) )
-            *exflags |= WS_EX_TOOLWINDOW;
-        else if ( !(style & wxFRAME_NO_TASKBAR) )
-            *exflags |= WS_EX_APPWINDOW;
-#endif
+        if ( !(GetExtraStyle() & wxTOPLEVEL_EX_DIALOG) )
+        {
+            // make all frames appear in the win9x shell taskbar unless
+            // wxFRAME_TOOL_WINDOW or wxFRAME_NO_TASKBAR is given - without
+            // giving them WS_EX_APPWINDOW style, the child (i.e. owned) frames
+            // wouldn't appear in it
+            if ( (style & wxFRAME_TOOL_WINDOW) || (style & wxFRAME_NO_TASKBAR) )
+                *exflags |= WS_EX_TOOLWINDOW;
+            else if ( !(style & wxFRAME_NO_TASKBAR) )
+                *exflags |= WS_EX_APPWINDOW;
+        }
+#endif // !Win16

 
         if ( style & wxSTAY_ON_TOP )
             *exflags |= WS_EX_TOPMOST;
 
         if ( style & wxSTAY_ON_TOP )
             *exflags |= WS_EX_TOPMOST;


@@ -193,8 +196,9 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
     {
         parent = wxTheApp->GetTopWindow();
 
     {
         parent = wxTheApp->GetTopWindow();
 

-        // but don't use the window which is about to be destroyed as parent
-        if ( parent->IsBeingDeleted() )
+        // but don't use the window which is currently hidden as then the
+        // dialog would be hidden as well
+        if ( parent && !parent->IsShown() )

         {
             parent = NULL;
         }
         {
             parent = NULL;
         }


@@ -254,7 +258,7 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
         // and passing CW_USEDEFAULT to MoveWindow() results in resizing the
         // window to (0, 0) size which breaks quite a lot of things, e.g. the
         // sizer calculation in wxSizer::Fit()
         // and passing CW_USEDEFAULT to MoveWindow() results in resizing the
         // window to (0, 0) size which breaks quite a lot of things, e.g. the
         // sizer calculation in wxSizer::Fit()

-        if ( w == CW_USEDEFAULT )
+        if ( w == (int)CW_USEDEFAULT )

         {
             // the exact number doesn't matter, the dialog will be resized
             // again soon anyhow but it should be big enough to allow
         {
             // the exact number doesn't matter, the dialog will be resized
             // again soon anyhow but it should be big enough to allow


@@ -264,6 +268,13 @@ bool wxTopLevelWindowMSW::CreateDialog(const wxChar *dlgTemplate,
             h = 100;
         }
 
             h = 100;
         }
 

+        if ( x == (int)CW_USEDEFAULT )
+        {
+            // well, where should we put it? maybe centre it on screen?
+            x =
+            y = 0;
+        }
+

         if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
         {
             wxLogLastError(wxT("MoveWindow"));
         if ( !::MoveWindow(GetHwnd(), x, y, w, h, FALSE) )
         {
             wxLogLastError(wxT("MoveWindow"));


@@ -590,3 +601,37 @@ void wxTopLevelWindowMSW::SetIcon(const wxIcon& icon)
     }
 #endif // __WIN95__
 }
     }
 #endif // __WIN95__
 }

+
+bool wxTopLevelWindowMSW::EnableCloseButton(bool enable)
+{
+#ifndef __WXMICROWIN__
+    // get system (a.k.a. window) menu
+    HMENU hmenu = ::GetSystemMenu(GetHwnd(), FALSE /* get it */);
+    if ( !hmenu )
+    {
+        wxLogLastError(_T("GetSystemMenu"));
+
+        return FALSE;
+    }
+
+    // enabling/disabling the close item from it also automatically
+    // disables/enables the close title bar button
+    if ( ::EnableMenuItem(hmenu, SC_CLOSE,
+                          MF_BYCOMMAND |
+                          (enable ? MF_ENABLED : MF_GRAYED)) == -1 )
+    {
+        wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
+
+        return FALSE;
+    }
+
+    // update appearance immediately
+    if ( !::DrawMenuBar(GetHwnd()) )
+    {
+        wxLogLastError(_T("DrawMenuBar"));
+    }
+#endif // !__WXMICROWIN__
+
+    return TRUE;
+}
+