Committed a couple of IPC changes I forgot to do

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

diff --git a/include/wx/prop.h b/include/wx/prop.h
index 109b51a4ad83b0c8a698666cc02dc87dfb18dc22..6ddf2f3b5f0a2b3b9a528c2b1c1b76101810b80d 100644 (file)
--- a/include/wx/prop.h
+++ b/include/wx/prop.h
@@ -12,10 +12,12 @@
 #ifndef _WX_PROP_H_
 #define _WX_PROP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "prop.h"
 #endif
 
+#if wxUSE_PROPSHEET
+
 #include "wx/defs.h"
 #include "wx/string.h"
 #include "wx/hash.h"
@@ -334,5 +336,8 @@ class WXDLLEXPORT wxProperty: public wxObject
   inline bool IsEnabled(void) const { return m_enabled; }
 };
 
+#endif
+  // wxUSE_PROPSHEET
+
 #endif
   // _WX_PROP_H_