Remove wxRTTI macro for wxComboBox from Motif port.

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

diff --git a/include/wx/msw/libraries.h b/include/wx/msw/libraries.h
index 827f6824363ee238a0ded412820428d53c387d9e..9173fe812593920aaf66420b99376f15a71e7762 100644 (file)
--- a/include/wx/msw/libraries.h
+++ b/include/wx/msw/libraries.h
@@ -1,37 +1,27 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/libraries.h
-// Purpose:     Pragmas for linking libs conditionally
-// Author:      Michael Wetherell
-// Modified by:
-// RCS-ID:      $Id$
-// Copyright:   (c) 2005 Michael Wetherell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
+/*
+ * Name:        wx/msw/libraries.h
+ * Purpose:     Pragmas for linking libs conditionally
+ * Author:      Michael Wetherell
+ * Modified by:
+ * RCS-ID:      $Id$
+ * Copyright:   (c) 2005 Michael Wetherell
+ * Licence:     wxWindows licence
+ */
 
 #ifndef _WX_MSW_LIBRARIES_H_
 #define _WX_MSW_LIBRARIES_H_
 
-// Notes:
-//
-// In general the preferred place to add libs is in the bakefiles. This file
-// can be used where libs must be added conditionally, for those compilers that
-// support a way to do that.
+/*
+ * Notes:
+ *
+ * In general the preferred place to add libs is in the bakefiles. This file
+ * can be used where libs must be added conditionally, for those compilers that
+ * support a way to do that.
+ */
 
-// Newer versions of VC++ support the /GS option which add buffer overflow
-// checks. This adds into the generated code calls to support functions in in
-// the runtime library.
-//
-// Starting with VC++ 8 this option is on by default, and code such as the
-// runtime library that we need to link is compiled with it. Some versions of
-// the runtime library don't include the support code, and a separate library
-// bufferoverflowu.lib must be linked. If all versions of VC++ 8 that can
-// compile wxWidgets have this lib we can link it here, if not then this will
-// have to be removed.
-//
-// More information: http://support.microsoft.com/?id=894573
-
-#if defined __VISUALC__ && __VISUALC__ >= 1400
-    #pragma comment(lib,"bufferoverflowu.lib")
+/* VC++ 5 didn't include oleacc.lib, though it came with the PSDK */
+#if defined __VISUALC__ && (wxUSE_ACCESSIBILITY || __VISUALC__ >= 1200)
+#pragma comment(lib, "oleacc")
 #endif
 
-#endif // _WX_MSW_LIBRARIES_H_
+#endif /* _WX_MSW_LIBRARIES_H_ */