added missing conditional compilation test for wxUSE_PROPSHEET

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/prop.h b/include/wx/prop.h
index 109b51a4ad83b0c8a698666cc02dc87dfb18dc22..9207cb2d93b3704b88defbd6252e3ba4809ad455 100644 (file)
--- a/include/wx/prop.h
+++ b/include/wx/prop.h
@@ -16,6 +16,8 @@
 #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_

diff --git a/include/wx/propform.h b/include/wx/propform.h
index 3b3b1ad85953b775790dc94366685bc525250f07..426bd05a526d8af9138bc9f8548336513e6ff0c6 100644 (file)
--- a/include/wx/propform.h
+++ b/include/wx/propform.h
@@ -16,6 +16,8 @@
 #pragma interface "propform.h"
 #endif
 
+#if wxUSE_PROPSHEET
+
 #include "wx/prop.h"
 
 ////
@@ -324,5 +326,8 @@ private:
     DECLARE_CLASS(wxPropertyFormFrame)
 };
 
+#endif
+  // wxUSE_PROPSHEET
+
 #endif
   // _WX_PROPFORM_H_

diff --git a/include/wx/proplist.h b/include/wx/proplist.h
index ea93c33eb0cb6bc5e45fd26894de864a4de014ab..21be88015a31fe99ce38215c85e7063ed83e4e0b 100644 (file)
--- a/include/wx/proplist.h
+++ b/include/wx/proplist.h
@@ -46,6 +46,8 @@
 #pragma interface "proplist.h"
 #endif
 
+#if wxUSE_PROPSHEET
+
 #include "wx/prop.h"
 
 #define wxPROP_BUTTON_CLOSE       1
@@ -578,5 +580,8 @@ class WXDLLEXPORT wxListOfStringsListValidator: public wxPropertyListValidator
    void OnEdit(wxProperty *property, wxPropertyListView *view, wxWindow *parentWindow);
 };
 
+#endif
+  // wxUSE_PROPSHEET
+
 #endif
   // _WX_PROPLIST_H_