experimental --inplace flag implementation

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

diff --git a/include/wx/types.h b/include/wx/types.h
index 9545eae4de90f85add49053c73efdb4594f60ed7..bd785f75b57cdd863632f1af3cdb952f6447cfde 100644 (file)
--- a/include/wx/types.h
+++ b/include/wx/types.h
@@ -9,10 +9,10 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TYPESH__
-#define __TYPESH__
+#ifndef _WX_TYPESH__
+#define _WX_TYPESH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 // #pragma interface "types.h"
 #endif
 
@@ -93,5 +93,5 @@
 #define wxTYPE_USER            500
 
 #endif
-    // __TYPESH__
+    // _WX_TYPESH__