X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33ac7e6f01acbac1cff0ad400d8ea7f0bfd0a62f..491b5be8305968871bc289453ed088a70c3de044:/src/msw/dialog.cpp

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 4b4259a099..bc03783404 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -170,12 +170,30 @@ bool wxDialog::Create(wxWindow *parent,
         dlg = wxT("wxCaptionDialog");
     else
         dlg = wxT("wxNoCaptionDialog");
+
+#ifdef __WXMICROWIN__
+    extern const wxChar *wxFrameClassName;
+    
+    int msflags = WS_OVERLAPPED|WS_POPUP;
+    if (style & wxCAPTION)
+        msflags |= WS_CAPTION;
+    if (style & wxCLIP_CHILDREN)
+        msflags |= WS_CLIPCHILDREN;
+    if ((style & wxTHICK_FRAME) == 0)
+      msflags |= WS_BORDER;
+    MSWCreate(m_windowId, parent, wxFrameClassName, this, NULL,
+              x, y, width, height,
+              msflags,
+              NULL,
+              extendedStyle);
+
+#else
     MSWCreate(m_windowId, parent, NULL, this, NULL,
               x, y, width, height,
               0, // style is not used if we have dlg template
               dlg,
               extendedStyle);
-
+#endif
     HWND hwnd = (HWND)GetHWND();
 
     if ( !hwnd )
@@ -185,13 +203,47 @@ bool wxDialog::Create(wxWindow *parent,
         return FALSE;
     }
 
+#ifndef __WXMICROWIN__
     SubclassWin(GetHWND());
-
+#endif
+    
     SetWindowText(hwnd, title);
 
     return TRUE;
 }
 
+bool wxDialog::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/enabling the close title bar button
+    if ( !::EnableMenuItem(hmenu, SC_CLOSE,
+                           MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)) )
+    {
+        wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
+
+        return FALSE;
+    }
+
+    // update appearance immediately
+    if ( !::DrawMenuBar(GetHwnd()) )
+    {
+        wxLogLastError(_T("DrawMenuBar"));
+    }
+#endif
+    
+    return TRUE;
+}
+
 void wxDialog::SetModal(bool flag)
 {
     if ( flag )
@@ -594,6 +646,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 +672,7 @@ long wxDialog::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
                 rc = FALSE;
             }
             break;
+#endif
     }
 
     if ( !processed )