More build system polishing.. mostly. Some stuff ported over from

[wxWidgets.git] / src / stc / scintilla / include / WinDefs.h

diff --git a/src/stc/scintilla/include/WinDefs.h b/src/stc/scintilla/include/WinDefs.h
index c56f02d8109e9e331dfb9dd93a4acdccb511fdf0..b3421c0bcceee5f6e820504a97f45699e143e1a9 100644 (file)
--- a/src/stc/scintilla/include/WinDefs.h
+++ b/src/stc/scintilla/include/WinDefs.h
@@ -1,11 +1,23 @@
 // Scintilla source code edit control
 // Scintilla source code edit control

-// WinDefs.h - the subset of definitions from Windows needed by Scintilla for GTK+
-// Copyright 1998-2000 by Neil Hodgson <neilh@scintilla.org>
+/** @file WinDefs.h
+ ** The subset of definitions from Windows needed by Scintilla for GTK+.
+ **/
+// Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org>

 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef WINDEFS_H
 #define WINDEFS_H
 
 // The License.txt file describes the conditions under which this software may be distributed.
 
 #ifndef WINDEFS_H
 #define WINDEFS_H
 

+/* Running GTK version on win32 */
+#if PLAT_GTK_WIN32
+#include "Windows.h"
+#include "Richedit.h"
+
+/* Name conflicts */
+#undef DrawText
+#undef FindText
+#else
+

 #define WORD short
 #define WPARAM unsigned long
 #define LPARAM long
 #define WORD short
 #define WPARAM unsigned long
 #define LPARAM long


@@ -180,4 +192,6 @@ struct FORMATRANGE {
 //#define LOWORD(x) (x & 0xffff)
 //#define HIWORD(x) (x >> 16)
 
 //#define LOWORD(x) (x & 0xffff)
 //#define HIWORD(x) (x >> 16)
 

+#endif /* !_MSC_VER */
+

 #endif
 #endif