fixed xpm colour parsing bug due to case sensitive colour name comparison

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 4b4259a099378f54778b3151a96fe46e059d6b72..5b2aaf7a99338797ec03eb567e02d72bb82952ae 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -192,6 +192,36 @@ bool wxDialog::Create(wxWindow *parent,
     return TRUE;
 }
 
+bool wxDialog::EnableCloseButton(bool enable)
+{
+    // 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/enabling the close title bar button
+    if ( !::EnableMenuItem(hmenu, SC_CLOSE,
+                           MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)) )
+    {
+        wxLogLastError(_T("DeleteMenu(SC_CLOSE)"));
+
+        return FALSE;
+    }
+
+    // update appearance immediately
+    if ( !::DrawMenuBar(GetHwnd()) )
+    {
+        wxLogLastError(_T("DrawMenuBar"));
+    }
+
+    return TRUE;
+}
+
 void wxDialog::SetModal(bool flag)
 {
     if ( flag )
@@ -594,6 +624,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
             processed = !Close();
             break;
 
+#ifndef __WXMICROWIN__
         case WM_SETCURSOR:
             // we want to override the busy cursor for modal dialogs:
             // typically, wxBeginBusyCursor() is called and then a modal dialog
@@ -619,6 +650,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 rc = FALSE;
             }
             break;
+#endif
     }
 
     if ( !processed )