need to overload assertEquals(int,short) too to resolve ambiguity

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

diff --git a/include/wx/types.h b/include/wx/types.h
index 9545eae4de90f85add49053c73efdb4594f60ed7..c7917efbe7964394c544c67679aeb498c4ad1ec7 100644 (file)
--- a/include/wx/types.h
+++ b/include/wx/types.h
@@ -5,16 +5,12 @@
 // 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__
-
-#ifdef __GNUG__
-// #pragma interface "types.h"
-#endif
+#ifndef _WX_TYPESH__
+#define _WX_TYPESH__
 
 // Types of objects
 #define wxTYPE_ANY             0
@@ -93,5 +89,5 @@
 #define wxTYPE_USER            500
 
 #endif
-    // __TYPESH__
+    // _WX_TYPESH__