1. moved InheritAttributes() from wxControl to wxWindow

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

diff --git a/include/wx/types.h b/include/wx/types.h
index 962783f38785343e31ac36c977518c2bbff41103..2c3c965512b5939bc9743f2a6a8d4cf0938a74e7 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$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TYPESH__
 #define _WX_TYPESH__
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TYPESH__
 #define _WX_TYPESH__
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 // #pragma interface "types.h"
 #endif
 
 // #pragma interface "types.h"
 #endif