Simplify the code that adds underlining to the layout combo.

[lyx.git] / src / support / os_win32.h

diff --git a/src/support/os_win32.h b/src/support/os_win32.h
index 4933a2482e6456da937ff3aeec9b310ce5accbb1..42016f7094eb7f33abe56afd7fb77b4fdcd8d5ee 100644 (file)
--- a/src/support/os_win32.h
+++ b/src/support/os_win32.h
@@ -29,20 +29,25 @@
  * in <windef.h> under MinGW and Cygwin.
  * It is missing in earlier versions of the MinGW w32api headers.
  *
- * We need to #include <windef.h> now to make available the
+ * We need to #include <windows.h> now to make available the
  * DWORD, HMODULE et al. typedefs, so first define WINVER, _WIN32_IE.
  *
  * Note: __CYGWIN__ can be defined here if building in _WIN32 mode.
  */
 #if defined(__MINGW32__)  || defined(__CYGWIN__) || defined(__CYGWIN32__)
-# if defined(WINVER) && WINVER < 0x0500
-#  error WINVER must be >= 0x0500
+# if defined(WINVER)
+#  if WINVER < 0x0500
+#   error WINVER must be >= 0x0500
+#  endif
+# else
+#  define WINVER 0x0500
 # endif
-# define WINVER 0x0500
 # define _WIN32_IE 0x0500
 #endif
 
-#include <windef.h>
+#include <windows.h>
+#include <tchar.h>
+#include <psapi.h>
 
 
 namespace lyx {
@@ -74,7 +79,7 @@ public:
        ~GetFolderPath();
 
        /** Wrapper for SHGetFolderPathA, returning
-        *  the path asscociated with @c id.
+        *  the path asscociated with @c id in utf8 encoding.
         */
        std::string const operator()(folder_id id) const;
 private: