Disconnect "hide" menu signal to fix menu destruction in wxGTK.

[wxWidgets.git] / include / wx / msw / chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index db029d3d0ef4e206ad9de972ff78e430cba46918..eabc05bdf6e7ce1763c3a9168938bf8fab71b1c7 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -254,10 +254,6 @@
 #   define wxUSE_DEBUG_NEW_ALWAYS 0
 #endif
 
 #   define wxUSE_DEBUG_NEW_ALWAYS 0
 #endif
 

-/* compiling src/msw/gdiplus.cpp results in "macro expansion too long" error */
-#undef wxUSE_GRAPHICS_CONTEXT
-#define wxUSE_GRAPHICS_CONTEXT 0
-

 #endif /* __BORLANDC__ */
 
 /* DMC++ doesn't have definitions for date picker control, so use generic control
 #endif /* __BORLANDC__ */
 
 /* DMC++ doesn't have definitions for date picker control, so use generic control


@@ -406,19 +402,20 @@
 #   endif
 #endif /* !wxUSE_ACTIVEX */
 
 #   endif
 #endif /* !wxUSE_ACTIVEX */
 

+#if !wxUSE_THREADS
+#   if wxUSE_FSWATCHER
+#       ifdef wxABORT_ON_CONFIG_ERROR
+#           error "wxFileSystemWatcher requires wxThread under MSW"
+#       else
+#           undef wxUSE_FSWATCHER
+#           define wxUSE_FSWATCHER 0
+#       endif
+#   endif
+#endif /* !wxUSE_THREADS */
+

 #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
 #   undef wxUSE_POSTSCRIPT
 #   define wxUSE_POSTSCRIPT 1
 #endif
 
 #if defined(__WXUNIVERSAL__) && wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT
 #   undef wxUSE_POSTSCRIPT
 #   define wxUSE_POSTSCRIPT 1
 #endif
 

-/*
-   Currently only recent MSVC compilers can build the new events code under
-   Windows.
- */
-#ifdef wxHAS_EVENT_BIND
-#   if !wxCHECK_VISUALC_VERSION(7)
-#       undef wxHAS_EVENT_BIND
-#   endif
-#endif
-

 #endif /* _WX_MSW_CHKCONF_H_ */
 #endif /* _WX_MSW_CHKCONF_H_ */