more synonyms for UCS-2/4

[wxWidgets.git] / include / wx / types.h

diff --git a/include/wx/types.h b/include/wx/types.h
index 9545eae4de90f85add49053c73efdb4594f60ed7..499d98d9f4bdd591b0885a790cddff1228ac49ef 100644 (file)
--- a/include/wx/types.h
+++ b/include/wx/types.h
@@ -5,14 +5,14 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TYPESH__
-#define __TYPESH__
+#ifndef _WX_TYPESH__
+#define _WX_TYPESH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 // #pragma interface "types.h"
 #endif
 
@@ -93,5 +93,5 @@
 #define wxTYPE_USER            500
 
 #endif
-    // __TYPESH__
+    // _WX_TYPESH__