1. libunicows support in configure

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

diff --git a/src/msw/dialog.cpp b/src/msw/dialog.cpp
index 5f70961052596e3b54d6167458f29fad46ba173c..ac887e8c85b402bf88938ecb512e06eb3971cd48 100644 (file)
--- a/src/msw/dialog.cpp
+++ b/src/msw/dialog.cpp
@@ -41,7 +41,7 @@
 #include "wx/msw/private.h"
 #include "wx/log.h"
 
-#if wxUSE_COMMON_DIALOGS
+#if wxUSE_COMMON_DIALOGS && !defined(__WXMICROWIN__)
     #include <commdlg.h>
 #endif
 
@@ -122,37 +122,7 @@ bool wxDialog::Create(wxWindow *parent,
     if ( !wxTopLevelWindow::Create(parent, id, title, pos, size, style, name) )
         return FALSE;
 
-    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
+    SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
 
     return TRUE;
 }
@@ -320,18 +290,6 @@ bool wxDialog::Show(bool show)
                 {
                     // use it
                     m_parent = parent;
-
-                    // VZ: to make dialog behave properly we should reparent
-                    //     the dialog for Windows as well - unfortunately,
-                    //     following the docs for SetParent() results in this
-                    //     code which plainly doesn't work
-#if 0
-                    long dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
-                    dwStyle &= ~WS_POPUP;
-                    dwStyle |= WS_CHILD;
-                    ::SetWindowLong(GetHwnd(), GWL_STYLE, dwStyle);
-                    ::SetParent(GetHwnd(), GetHwndOf(parent));
-#endif // 0
                 }
             }