Changed char* to wxChar*

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

diff --git a/include/wx/proplist.h b/include/wx/proplist.h
index ea93c33eb0cb6bc5e45fd26894de864a4de014ab..b21f36aa098f540b7ab60d7b55cd704626f5eb5a 100644 (file)
--- a/include/wx/proplist.h
+++ b/include/wx/proplist.h
@@ -42,11 +42,14 @@
 #ifndef _WX_PROPLIST_H_
 #define _WX_PROPLIST_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "proplist.h"
 #endif
 
+#if wxUSE_PROPSHEET
+
 #include "wx/prop.h"
+#include "wx/panel.h"
 
 #define wxPROP_BUTTON_CLOSE       1
 #define wxPROP_BUTTON_OK          2
@@ -578,5 +581,8 @@ class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator
    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 };
 
+#endif
+  // wxUSE_PROPSHEET
+
 #endif
   // _WX_PROPLIST_H_