diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp
index 3686b3978a..7b2fbb4e74 100644
--- a/src/common/sizer.cpp
+++ b/src/common/sizer.cpp
@@ -383,6 +383,9 @@ wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
     wxRect rect = wxGetClientDisplayRect();
     wxSize sizeMax (rect.width,rect.height);
 
+    // Sorry, but this bit is wrong -- it makes a window that should just be
+    // able to fit onto the screen, not fit on the screen. -- JACS
+#if 0
     // Make the max size a bit smaller than the visible portion of
     // the screen.  A window which takes the entire screen doesn't
     // look very nice either
@@ -391,6 +394,7 @@ wxSize wxSizer::GetMaxWindowSize( wxWindow *WXUNUSED(window) )
 
     sizeMax.y *= 9;
     sizeMax.y /= 10;
+#endif
 
     return sizeMax;
 }
diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 5b2aaf7a99..ee00bfd5de 100644
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -208,7 +208,7 @@ bool wxDialog::EnableCloseButton(bool enable)
     if ( !::EnableMenuItem(hmenu, SC_CLOSE,
                            MF_BYCOMMAND | (enable ? MF_ENABLED : MF_GRAYED)) )
     {
-        wxLogLastError(_T("DeleteMenu(SC_CLOSE)"));
+        wxLogLastError(_T("EnableMenuItem(SC_CLOSE)"));
 
         return FALSE;
     }