X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83a21afbcb5335b0f07fa4e2e1aaa1711c2b7dca..e5ee4c908b9dbcf07f0441aa74d8635b7343be4d:/include/wx/prop.h diff --git a/include/wx/prop.h b/include/wx/prop.h index 9afa515b19..9207cb2d93 100644 --- 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" @@ -26,6 +28,7 @@ #include "wx/textctrl.h" #include "wx/gdicmn.h" #include "wx/layout.h" +#include "wx/sizer.h" class wxWindow; class wxProperty; @@ -67,9 +70,6 @@ class WXDLLEXPORT wxPropertySheet: public wxObject // Clear all properties virtual void Clear(void); - virtual bool Save(ostream& str); - virtual bool Load(ostream& str); - virtual void UpdateAllViews(wxPropertyView *thisView = NULL); inline virtual wxList& GetProperties(void) const { return (wxList&) m_properties; } @@ -231,8 +231,8 @@ class WXDLLEXPORT wxPropertyValue: public wxObject virtual wxPropertyValue *NewCopy(void) const; virtual void Copy(wxPropertyValue& copyFrom); - virtual void WritePropertyClause(ostream& stream); // Write this expression as a top-level clause - virtual void WritePropertyType(ostream& stream); // Write as any other subexpression + virtual void WritePropertyClause(wxString &stream); // Write this expression as a top-level clause + virtual void WritePropertyType(wxString &stream); // Write as any other subexpression // Append an expression to a list virtual void Append(wxPropertyValue *expr); @@ -336,5 +336,8 @@ class WXDLLEXPORT wxProperty: public wxObject inline bool IsEnabled(void) const { return m_enabled; } }; +#endif + // wxUSE_PROPSHEET + #endif // _WX_PROP_H_